[Parser] Include all AST nodes from every #if region in ParserUnit

include/swift/AST/SourceFile.h

@@ -98,6 +98,9 @@ class SourceFile final : public FileUnit {
 
     /// Validate the new SwiftSyntax parser diagnostics.
     ValidateNewParserDiagnostics = 1 << 6,
+
+    /// Consider every #if ... #endif region active.
+    PoundIfAllActive = 1 << 7,
   };
   using ParsingOptions = OptionSet<ParsingFlags>;
 

lib/Parse/ParseIfConfig.cpp

@@ -834,6 +834,11 @@ Result Parser::parseIfConfigRaw(
       // determined solely by which block has the completion token.
       !ideInspectionClauseLoc.isValid();
 
+  // For constructing syntactic structures, we need AST nodes even for
+  // non-active regions.
+  bool allActive = SF.getParsingOptions().contains(
+      SourceFile::ParsingFlags::PoundIfAllActive);
+
   bool foundActive = false;
   bool isVersionCondition = false;
   CharSourceRange activeBodyRange;
@@ -893,6 +898,9 @@ Result Parser::parseIfConfigRaw(
     if (ideInspectionClauseLoc.isValid() && !foundActive)
       isActive = (ClauseLoc == ideInspectionClauseLoc);
 
+    if (allActive)
+      isActive = true;
+
     foundActive |= isActive;
 
     if (!Tok.isAtStartOfLine() && Tok.isNot(tok::eof)) {

lib/Parse/ParseStmt.cpp

@@ -381,7 +381,7 @@ ParserStatus Parser::parseBraceItems(SmallVectorImpl<ASTNode> &Entries,
                             IsFollowingGuard);
 
             if (IsActive)
-              activeElements = std::move(elements);
+              activeElements.append(elements);
           });
       if (IfConfigResult.hasCodeCompletion() && isIDEInspectionFirstPass()) {
         consumeDecl(BeginParserPosition, IsTopLevel);

lib/Parse/Parser.cpp

@@ -1145,6 +1145,7 @@ struct ParserUnit::Implementation {
     auto parsingOpts = SourceFile::getDefaultParsingOptions(LangOpts);
     parsingOpts |= ParsingFlags::DisableDelayedBodies;
     parsingOpts |= ParsingFlags::DisablePoundIfEvaluation;
+    parsingOpts |= ParsingFlags::PoundIfAllActive;
 
     auto *M = ModuleDecl::createEmpty(Ctx.getIdentifier(ModuleName), Ctx);
     SF = new (Ctx) SourceFile(*M, SFKind, BufferID, parsingOpts);

test/IDE/coloring_configs.swift

@@ -1,5 +1,326 @@
 // RUN: %target-swift-ide-test -syntax-coloring -source-filename %s -D CONF | %FileCheck %s
 
+// CHECK: <kw>var</kw> f : <type>Int</type>
+var f : Int
+
+// CHECK: <#kw>#if</#kw> os(macOS)
+#if os(macOS)
+#endif
+
+// CHECK: <#kw>#if</#kw> CONF
+#if CONF
+  // CHECK: <kw>var</kw> x : <type>Int</type>
+  var x : Int
+// CHECK: <#kw>#else</#kw>
+#else
+  // CHECK: <kw>var</kw> x : <type>Float</type>
+  var x : Float
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> CONF
+#if CONF
+  // CHECK: <kw>var</kw> x2 : <type>Int</type>
+  var x2 : Int
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> !CONF
+#if !CONF
+  // CHECK: <kw>var</kw> x3 : <type>Int</type>
+  var x3 : Int
+// CHECK: <#kw>#else</#kw>
+#else
+  // CHECK: <kw>var</kw> x3 : <type>Float</type>
+  var x3 : Float
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> !CONF
+#if !CONF
+  // CHECK: <kw>var</kw> x4 : <type>Int</type>
+  var x4 : Int
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> CONF
+#if CONF
+  // CHECK: <kw>var</kw> y1 : <type>Int</type>
+  var y1 : Int
+// CHECK: <#kw>#elseif</#kw> BAZ
+#elseif BAZ
+  // CHECK: <kw>var</kw> y1 : <type>String</type>
+  var y1 : String
+// CHECK: <#kw>#else</#kw>
+#else
+  // CHECK: <kw>var</kw> y1 : <type>Float</type>
+  var y1 : Float
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> !CONF
+#if !CONF
+  // CHECK: <kw>var</kw> y2 : <type>Int</type>
+  var y2 : Int
+// CHECK: <#kw>#elseif</#kw> BAZ
+#elseif BAZ
+  // CHECK: <kw>var</kw> y2 : <type>String</type>
+  var y2 : String
+// CHECK: <#kw>#else</#kw>
+#else
+  // CHECK: <kw>var</kw> y2 : <type>Float</type>
+  var y2 : Float
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> !CONF
+#if !CONF
+  // CHECK: <kw>var</kw> y3 : <type>Int</type>
+  var y3 : Int
+// CHECK: <#kw>#elseif</#kw> CONF
+#elseif CONF
+  // CHECK: <kw>var</kw> y3 : <type>String</type>
+  var y3 : String
+// CHECK: <#kw>#else</#kw>
+#else
+  // CHECK: <kw>var</kw> y3 : <type>Float</type>
+  var y3 : Float
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <kw>var</kw> l : <type>Int</type>
+var l : Int
+
+// CHECK: <kw>class</kw> C1 {
+class C1 {
+  // CHECK: <kw>var</kw> f : <type>Int</type>
+  var f : Int
+
+// CHECK: <#kw>#if</#kw> CONF
+#if CONF
+  // CHECK: <kw>var</kw> x : <type>Int</type>
+  var x : Int
+// CHECK: <#kw>#else</#kw>
+#else
+  // CHECK: <kw>var</kw> x : <type>Float</type>
+  var x : Float
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> CONF
+#if CONF
+  // CHECK: <kw>var</kw> x2 : <type>Int</type>
+  var x2 : Int
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> !CONF
+#if !CONF
+  // CHECK: <kw>var</kw> x3 : <type>Int</type>
+  var x3 : Int
+// CHECK: <#kw>#else</#kw>
+#else
+  // CHECK: <kw>var</kw> x3 : <type>Float</type>
+  var x3 : Float
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> !CONF
+#if !CONF
+  // CHECK: <kw>var</kw> x4 : <type>Int</type>
+  var x4 : Int
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> CONF
+#if CONF
+  // CHECK: <kw>var</kw> y1 : <type>Int</type>
+  var y1 : Int
+// CHECK: <#kw>#elseif</#kw> BAZ
+#elseif BAZ
+  // CHECK: <kw>var</kw> y1 : <type>String</type>
+  var y1 : String
+// CHECK: <#kw>#else</#kw>
+#else
+  // CHECK: <kw>var</kw> y1 : <type>Float</type>
+  var y1 : Float
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> !CONF
+#if !CONF
+  // CHECK: <kw>var</kw> y2 : <type>Int</type>
+  var y2 : Int
+// CHECK: <#kw>#elseif</#kw> BAZ
+#elseif BAZ
+  // CHECK: <kw>var</kw> y2 : <type>String</type>
+  var y2 : String
+// CHECK: <#kw>#else</#kw>
+#else
+  // CHECK: <kw>var</kw> y2 : <type>Float</type>
+  var y2 : Float
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> !CONF
+#if !CONF
+  // CHECK: <kw>var</kw> y3 : <type>Int</type>
+  var y3 : Int
+// CHECK: <#kw>#elseif</#kw> CONF
+#elseif CONF
+  // CHECK: <kw>var</kw> y3 : <type>String</type>
+  var y3 : String
+// CHECK: <#kw>#else</#kw>
+#else
+  // CHECK: <kw>var</kw> y3 : <type>Float</type>
+  var y3 : Float
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+  // CHECK: <kw>var</kw> l : <type>Int</type>
+  var l : Int
+}
+
+// CHECK: <kw>func</kw> test1() {
+func test1() {
+  // CHECK: <kw>var</kw> f : <type>Int</type>
+  var f : Int
+
+// CHECK: <#kw>#if</#kw> CONF
+#if CONF
+  // CHECK: <kw>var</kw> x : <type>Int</type>
+  var x : Int
+// CHECK: <#kw>#else</#kw>
+#else
+  // CHECK: <kw>var</kw> x : <type>Float</type>
+  var x : Float
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> CONF
+#if CONF
+  // CHECK: <kw>var</kw> x2 : <type>Int</type>
+  var x2 : Int
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> !CONF
+#if !CONF
+  // CHECK: <kw>var</kw> x3 : <type>Int</type>
+  var x3 : Int
+// CHECK: <#kw>#else</#kw>
+#else
+  // CHECK: <kw>var</kw> x3 : <type>Float</type>
+  var x3 : Float
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> !CONF
+#if !CONF
+  // CHECK: <kw>var</kw> x4 : <type>Int</type>
+  var x4 : Int
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> CONF
+#if CONF
+  // CHECK: <kw>var</kw> y1 : <type>Int</type>
+  var y1 : Int
+// CHECK: <#kw>#elseif</#kw> BAZ
+#elseif BAZ
+  // CHECK: <kw>var</kw> y1 : <type>String</type>
+  var y1 : String
+// CHECK: <#kw>#else</#kw>
+#else
+  // CHECK: <kw>var</kw> y1 : <type>Float</type>
+  var y1 : Float
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> !CONF
+#if !CONF
+  // CHECK: <kw>var</kw> y2 : <type>Int</type>
+  var y2 : Int
+// CHECK: <#kw>#elseif</#kw> BAZ
+#elseif BAZ
+  // CHECK: <kw>var</kw> y2 : <type>String</type>
+  var y2 : String
+// CHECK: <#kw>#else</#kw>
+#else
+  // CHECK: <kw>var</kw> y2 : <type>Float</type>
+  var y2 : Float
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+// CHECK: <#kw>#if</#kw> !CONF
+#if !CONF
+  // CHECK: <kw>var</kw> y3 : <type>Int</type>
+  var y3 : Int
+// CHECK: <#kw>#elseif</#kw> CONF
+#elseif CONF
+  // CHECK: <kw>var</kw> y3 : <type>String</type>
+  var y3 : String
+// CHECK: <#kw>#else</#kw>
+#else
+  // CHECK: <kw>var</kw> y3 : <type>Float</type>
+  var y3 : Float
+// CHECK: <#kw>#endif</#kw>
+#endif
+
+  // CHECK: <kw>var</kw> l : <type>Int</type>
+  var l : Int
+}
+
+// CHECK: <kw>class</kw> C2 {
+class C2 {
+  // CHECK: <#kw>#if</#kw> os(iOS)
+  #if os(iOS)
+  // CHECK: <kw>func</kw> foo() {}
+  func foo() {}
+  #endif
+}
+
+class NestedPoundIf {
+// CHECK: <kw>class</kw> NestedPoundIf {
+    func foo1() {
+// CHECK: <kw>func</kw> foo1() {
+        #if os(macOS)
+// CHECK: <#kw>#if</#kw> os(macOS)
+          var a = 1
+// CHECK: <kw>var</kw> a = <int>1</int>
+            #if USE_METAL
+// CHECK: <#kw>#if</#kw> USE_METAL
+              var b = 2
+// CHECK: <kw>var</kw> b = <int>2</int>
+              #if os(iOS)
+// CHECK: <#kw>#if</#kw> os(iOS)
+                var c = 3
+// CHECK: <kw>var</kw> c = <int>3</int>
+              #else
+// CHECK: <#kw>#else</#kw>
+                var c = 3
+// CHECK: <kw>var</kw> c = <int>3</int>
+              #endif
+// CHECK: <#kw>#endif</#kw>
+            #else
+// CHECK: <#kw>#else</#kw>
+              var b = 2
+// CHECK: <kw>var</kw> b = <int>2</int>
+            #endif
+// CHECK: <#kw>#endif</#kw>
+           #else
+// CHECK: <#kw>#else</#kw>
+            var a = 1
+// CHECK: <kw>var</kw> a = <int>1</int>
+        #endif
+// CHECK: <#kw>#endif</#kw>
+    }
+    func foo2() {}
+// CHECK: <kw>func</kw> foo2() {}
+    func foo3() {}
+// CHECK: <kw>func</kw> foo3() {}
+}
+
 // CHECK: <#kw>#error</#kw>(<str>"Error"</str>)
 #error("Error")
 // CHECK: <#kw>#warning</#kw>(<str>"Warning"</str>)

test/IDE/coloring_unclosed_hash_if.swift

@@ -0,0 +1,14 @@
+// RUN: %target-swift-ide-test -syntax-coloring -source-filename %s | %FileCheck %s
+// RUN: %target-swift-ide-test -syntax-coloring -typecheck -source-filename %s | %FileCheck %s
+
+// CHECK: <#kw>#if</#kw> d
+// CHECK-NEXT: <kw>func</kw> bar() {
+// CHECK-NEXT: <#kw>#if</#kw> d
+// CHECK-NEXT: }
+// CHECK-NEXT: <kw>func</kw> foo() {}
+
+#if d
+func bar() {
+  #if d
+}
+func foo() {}