Merge pull request #286 from vasily-kirichenko/fix-if-dicective-on-first-line

Fix compiler directive on first line & compound directives

Author: nojaf

src/Fantomas.Tests/CompilerDirectivesTests.fs

@@ -259,3 +259,29 @@ let x = 1
 let x = 1
 #endif
 """
+
+[<Test>]
+let ``should handle #if on the first line``() =
+    formatSourceString false """
+#if INTERACTIVE
+let x = 1
+#endif
+"""  config
+    |> should equal """
+#if INTERACTIVE
+let x = 1
+#endif
+"""
+
+[<Test>]
+let ``should handle combined #if``() =
+    formatSourceString false """
+#if INTERACTIVE || (FOO && BAR) || BUZZ
+let x = 1
+#endif
+"""  config
+    |> should equal """
+#if INTERACTIVE || (FOO && BAR) || BUZZ
+let x = 1
+#endif
+"""

src/Fantomas.Tests/FormattingPropertyTests.fs

@@ -450,7 +450,9 @@ let rec shrinkSynExpr = function
     | SynExpr.MatchLambda(_, _, clauses, _, _) -> 
         seq { yield! Seq.collect collectSynMatchClause clauses }
     | SynExpr.TryWith(expr, _, clauses, _, _, _, _)
-    | SynExpr.Match(_, expr, clauses, _, _) -> 
+    | SynExpr.Match(_, expr, clauses, _, _) ->
+    // TODO: Add include support for MatchBang, add unit test first! See https://github.com/fsprojects/fantomas/issues/262
+    //| SynExpr.MatchBang(_, expr, clauses, _, _) -> 
         seq { yield! collectSynExpr expr; yield! Seq.collect collectSynMatchClause clauses }
     | SynExpr.LetOrUse(_, _, bindings, expr, _) -> 
         seq { yield! Seq.collect collectSynBinding bindings; yield! collectSynExpr expr }

src/Fantomas/TokenMatcher.fs

@@ -345,7 +345,17 @@ let (|Ident|_|) = function
     | Wrapped(RawIdent tokText) -> Some tokText
     | _ -> None
 
-let (|PreprocessorDirectiveChunk|_|) = function
+let (|PreprocessorDirectiveChunk|_|) tokens =
+   match tokens with
+   /// #if FOO || BAR && BUZZ
+   | PreprocessorKeywordToken "#if" t1 :: 
+     SpaceToken t2 ::
+     Ident t3 ::
+     Wrapped (Space t4) ::
+     moreOrigTokens -> 
+        Some ([t1; t2; t3 + t4], moreOrigTokens)
+   
+   // #if FOO
    | PreprocessorKeywordToken "#if" t1 :: 
      SpaceToken t2 ::
      Ident t3 ::
@@ -431,17 +441,17 @@ let (|OpenChunk|_|) = function
 
 /// Assume that originalText and newText are derived from the same AST. 
 /// Pick all comments and directives from originalText to insert into newText               
-let integrateComments isPreserveEOL CompilationDefines (originalText : string) (newText : string) =
+let integrateComments isPreserveEOL compilationDefines (originalText : string) (newText : string) =
     let trim (txt : string) = 
         if not isPreserveEOL then txt
         else Regex.Replace(String.normalizeNewLine txt, @"[ \t]+$", "", RegexOptions.Multiline)
 
     let trimOrig = trim originalText
     let trimNew = trim newText
 
-    let origTokens = tokenize CompilationDefines trimOrig |> markStickiness |> Seq.toList
+    let origTokens = tokenize compilationDefines trimOrig |> markStickiness |> Seq.toList
     //Seq.iter (fun (Marked(_, s, t)) -> Console.WriteLine("sticky information: {0} -- {1}", s, t)) origTokens
-    let newTokens = tokenize CompilationDefines trimNew |> Seq.toList
+    let newTokens = tokenize compilationDefines trimNew |> Seq.toList
 
     let buffer = System.Text.StringBuilder()
     let column = ref 0
@@ -604,6 +614,7 @@ let integrateComments isPreserveEOL CompilationDefines (originalText : string) (
                         newTokens
                     | [] -> []
                 else newTokens
+                
             loop moreOrigTokens moreNewTokens
 
         // Inject inactive code