Merge pull request swiftlang#3133 from rintaro/parse-attr-nested-if-rdar157211447

[SwiftParser] Handle nested '#if' in attribute list correctly

Author: rintaro

Sources/SwiftParser/Lookahead.swift

@@ -254,7 +254,9 @@ extension Parser.Lookahead {
           didSeeAnyAttributes = true
           _ = self.consumeAttributeList()
         case .poundIf:
-          _ = self.consumeIfConfigOfAttributes()
+          if self.consumeIfConfigOfAttributes() {
+            didSeeAnyAttributes = true
+          }
         default:
           break ATTRIBUTE_LOOP
         }

Tests/SwiftParserTest/DirectiveTests.swift

@@ -157,6 +157,42 @@ final class DirectiveTests: ParserTestCase {
     )
   }
 
+  func testPoundIfNestedStructure() {
+    assertParse(
+      """
+      #if true
+      #if true
+      @frozen
+      #endif
+      #endif
+      public struct S {}
+      """,
+      substructure: AttributeListSyntax([
+        .ifConfigDecl(
+          IfConfigDeclSyntax(clauses: [
+            IfConfigClauseSyntax(
+              poundKeyword: .poundIfToken(),
+              condition: ExprSyntax("true"),
+              elements: .attributes([
+                .ifConfigDecl(
+                  IfConfigDeclSyntax(clauses: [
+                    IfConfigClauseSyntax(
+                      poundKeyword: .poundIfToken(),
+                      condition: ExprSyntax("true"),
+                      elements: .attributes([
+                        .attribute("@frozen")
+                      ])
+                    )
+                  ])
+                )
+              ])
+            )
+          ])
+        )
+      ])
+    )
+  }
+
   func testHasAttribute() {
     assertParse(
       """