Backport changed newline parsing in code spans

ocaml-ppx · Nov 27, 2024 · e5bcd2f · e5bcd2f
1 parent 6ff121f
commit e5bcd2f
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/test/passing/refs.default/doc_comments-no-wrap.mli.err b/test/passing/refs.default/doc_comments-no-wrap.mli.err
@@ -7,7 +7,7 @@ Warning: doc_comments-no-wrap.mli:110 exceeds the margin
 Warning: doc_comments-no-wrap.mli:115 exceeds the margin
 Warning: doc_comments-no-wrap.mli:124 exceeds the margin
 Warning: doc_comments-no-wrap.mli:328 exceeds the margin
-Warning: doc_comments-no-wrap.mli:384 exceeds the margin
-Warning: doc_comments-no-wrap.mli:556 exceeds the margin
-Warning: doc_comments-no-wrap.mli:625 exceeds the margin
-Warning: doc_comments-no-wrap.mli:648 exceeds the margin
+Warning: doc_comments-no-wrap.mli:383 exceeds the margin
+Warning: doc_comments-no-wrap.mli:555 exceeds the margin
+Warning: doc_comments-no-wrap.mli:624 exceeds the margin
+Warning: doc_comments-no-wrap.mli:647 exceeds the margin
diff --git a/test/passing/refs.default/doc_comments-no-wrap.mli.ref b/test/passing/refs.default/doc_comments-no-wrap.mli.ref
@@ -377,8 +377,7 @@ end
 
 (** {%html:<p>Raw markup</p>%} {%Without language%} {%other:Other language%} *)
 
-(** [Multi
-     Line]
+(** [Multi Line]
 
     [ A lot of    spaces ]
 

diff --git a/test/passing/refs.default/doc_comments.mli.err b/test/passing/refs.default/doc_comments.mli.err
@@ -7,7 +7,7 @@ Warning: doc_comments.mli:110 exceeds the margin
 Warning: doc_comments.mli:115 exceeds the margin
 Warning: doc_comments.mli:124 exceeds the margin
 Warning: doc_comments.mli:328 exceeds the margin
-Warning: doc_comments.mli:384 exceeds the margin
-Warning: doc_comments.mli:556 exceeds the margin
-Warning: doc_comments.mli:625 exceeds the margin
-Warning: doc_comments.mli:648 exceeds the margin
+Warning: doc_comments.mli:383 exceeds the margin
+Warning: doc_comments.mli:555 exceeds the margin
+Warning: doc_comments.mli:624 exceeds the margin
+Warning: doc_comments.mli:647 exceeds the margin
diff --git a/test/passing/refs.default/doc_comments.mli.ref b/test/passing/refs.default/doc_comments.mli.ref
@@ -377,8 +377,7 @@ end
 
 (** {%html:<p>Raw markup</p>%} {%Without language%} {%other:Other language%} *)
 
-(** [Multi
-     Line]
+(** [Multi Line]
 
     [ A lot of    spaces ]
 

diff --git a/test/passing/refs.default/js_source.ml.err b/test/passing/refs.default/js_source.ml.err
@@ -2,4 +2,4 @@ Warning: js_source.ml:122 exceeds the margin
 Warning: js_source.ml:156 exceeds the margin
 Warning: js_source.ml:229 exceeds the margin
 Warning: js_source.ml:327 exceeds the margin
-Warning: js_source.ml:809 exceeds the margin
+Warning: js_source.ml:808 exceeds the margin
diff --git a/test/passing/refs.default/js_source.ml.ref b/test/passing/refs.default/js_source.ml.ref
@@ -750,8 +750,7 @@ let _ =
 
 (*$ (* *) *)
 
-(** xxxxxxxxxxxxxxxxxxxxxxxxxxx [xxxxxxx
-    xxxx]
+(** xxxxxxxxxxxxxxxxxxxxxxxxxxx [xxxxxxx xxxx]
     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx [xxxxxxx] *)
 
 (*    Hand-aligned comment

diff --git a/vendor/odoc-parser/lexer.mll b/vendor/odoc-parser/lexer.mll
@@ -649,13 +649,16 @@ and code_span buffer nesting_level start_offset input = parse
     { Buffer.add_char buffer c;
       code_span buffer nesting_level start_offset input lexbuf }
 
-  | newline newline
+  | newline horizontal_space* (newline horizontal_space*)+
     { warning
         input
         (Parse_error.not_allowed
           ~what:(Token.describe (`Blank_line "\n\n"))
           ~in_what:(Token.describe (`Code_span "")));
-      Buffer.add_char buffer '\n';
+      Buffer.add_char buffer ' ';
+      code_span buffer nesting_level start_offset input lexbuf }
+  | newline horizontal_space*
+    { Buffer.add_char buffer ' ';
       code_span buffer nesting_level start_offset input lexbuf }
 
   | eof