attempt to adjust printing of #line directives.

The way it was done breaks syntax coloring in VS: # 123 "file.name" // broken vs #line 123 "file.name" // fixed see dotnet/fsharp#6400
smoothdeveloper · May 9, 2019 · 7fb41bb · 7fb41bb
1 parent 64d0229
commit 7fb41bb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/FsLex/fslex.fs b/src/FsLex/fslex.fs
@@ -113,13 +113,13 @@ let main() =
     let printLinesIfCodeDefined (code,pos:Position) =
         if pos <> Position.Empty  // If bottom code is unspecified, then position is empty.        
         then 
-            cfprintfn os "# %d \"%s\"" pos.Line pos.FileName
+            cfprintfn os "%s" (Position.MakeLineDirective pos)
             cfprintfn os "%s" code
 
     printLinesIfCodeDefined spec.TopCode
     let code = fst spec.TopCode
     lineCount := !lineCount + code.Replace("\r","").Split([| '\n' |]).Length
-    cfprintfn os "# %d \"%s\"" !lineCount output
+    cfprintfn os "%s" (Position.MakeSimpleLineDirective !lineCount output)
 
     cfprintfn os "let trans : uint16[] array = "
     cfprintfn os "    [| "
@@ -210,19 +210,19 @@ let main() =
         cfprintfn os "  match _fslex_tables.Interpret(%d,lexbuf) with" startNode.Id
         actions |> Seq.iteri (fun i (code:string, pos) -> 
             cfprintfn os "  | %d -> ( " i
-            cfprintfn os "# %d \"%s\"" pos.Line pos.FileName
+            cfprintfn os "%s" (Position.MakeLineDirective pos)
             let lines = code.Split([| '\r'; '\n' |], StringSplitOptions.RemoveEmptyEntries)
             for line in lines do
                 cfprintfn os "               %s" line
-            cfprintfn os "# %d \"%s\"" !lineCount output
+            cfprintfn os "%s" (Position.MakeSimpleLineDirective !lineCount output)
             cfprintfn os "          )")
         cfprintfn os "  | _ -> failwith \"%s\"" ident
 
 
     cfprintfn os ""
 
     printLinesIfCodeDefined spec.BottomCode
-    cfprintfn os "# 3000000 \"%s\"" output
+    cfprintfn os "%s" (Position.MakeSimpleLineDirective 3000000 output)
 
   with e -> 
     eprintf "FSLEX: error FSL000: %s" (match e with Failure s -> s | e -> e.ToString())

diff --git a/src/FsLexYacc.Runtime/Lexing.fs b/src/FsLexYacc.Runtime/Lexing.fs
@@ -62,6 +62,14 @@ namespace FSharp.Text.Lexing
             let pos = pos
             {pos with pos_cnum = pos.pos_cnum + by}
 
+        static member MakeSimpleLineDirective line fileName =
+            sprintf 
+                "#line %d \"%s\" // " // todo: add optional line text as a comment
+                    line
+                    fileName
+
+        static member MakeLineDirective (pos: Position) = Position.MakeSimpleLineDirective pos.Line pos.FileName
+
         static member Empty = 
             { pos_fname="" 
               pos_lnum= 0 

diff --git a/src/FsLexYacc.Runtime/Lexing.fsi b/src/FsLexYacc.Runtime/Lexing.fsi
@@ -82,6 +82,9 @@ type Position =
      /// Get a position corresponding to the first line (line number 1) in a given file
      static member FirstLine : filename:string -> Position
 
+     static member MakeSimpleLineDirective : line: int -> filename: string -> string
+     static member MakeLineDirective : pos: Position -> string
+
 [<Sealed>]
 #if INTERNALIZED_FSLEXYACC_RUNTIME
 type internal LexBuffer<'char> =
@@ -143,6 +146,7 @@ type LexBuffer<'char> =
     /// Create a lex buffer suitable for use with ASCII byte lexing that reads byte inputs from the given binary reader
     static member FromBinaryReader: System.IO.BinaryReader -> LexBuffer<byte>
 
+
 
 /// The type of tables for an ascii lexer generated by fslex.
 [<Sealed>]