Preserve back ticks for ident after dynamic operator. Fixes fsproject…

…s#937.
nojaf · Aug 16, 2020 · 7dfd6b5 · 7dfd6b5
1 parent ee6dd12
commit 7dfd6b5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/Fantomas.Tests/DynamicOperatorTests.fs b/src/Fantomas.Tests/DynamicOperatorTests.fs
@@ -32,4 +32,12 @@ let fieldColor (fieldNameX: string) =
     then IsDanger
     else NoColor
     |> Input.Color
-"""
+"""
+
+[<Test>]
+let ``preserve back ticks from checked keyword, 937`` () =
+    formatSourceString false "let toggle = unbox<bool> (e.target?``checked``)"  config
+    |> prepend newline
+    |> should equal """
+let toggle = unbox<bool> (e.target?``checked``)
+"""
diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -3185,6 +3185,9 @@ and genConst (c:SynConst) (r:range) =
                 !- stringContent
             | None, Some({ ContentBefore = [Keyword({TokenInfo = { TokenName = "KEYWORD_STRING"; }; Content = kw})] }) ->
                 !- kw
+            | None, Some({ ContentBefore = [Keyword({TokenInfo = { TokenName = "QMARK" }})]
+                           ContentItself = Some (IdentBetweenTicks ibt) }) ->
+                !- ibt
             | None, Some({ ContentBefore = [Keyword({TokenInfo = { TokenName = "QMARK" }})] }) ->
                 !- s
             | _ ->

diff --git a/src/Fantomas/Trivia.fs b/src/Fantomas/Trivia.fs
@@ -363,7 +363,8 @@ let private addTriviaToTriviaNode
                 | MainNode("SynExpr.Ident")
                 | MainNode("SynPat.Named")
                 | MainNode("SynPat.LongIdent")
-                | MainNode("Ident") -> true
+                | MainNode("Ident")
+                | MainNode("SynExpr.Const") -> true
                 | _ -> false
             isIdent && (t.Range.StartColumn = range.StartColumn || t.Range.StartColumn = range.StartColumn + 1) && t.Range.StartLine = range.StartLine
         )