Merge pull request #3168 from beccadax/mod-squad-non-experimental

Author: beccadax

CodeGeneration/Sources/SyntaxSupport/CommonNodes.swift

@@ -333,7 +333,6 @@ public let COMMON_NODES: [Node] = [
   Node(
     kind: .moduleSelector,
     base: .syntax,
-    experimentalFeature: .moduleSelector,
     nameForDiagnostics: "module selector",
     children: [
       Child(

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

@@ -1559,7 +1559,6 @@ public let DECL_NODES: [Node] = [
       Child(
         name: "moduleSelector",
         kind: .node(kind: .moduleSelector),
-        experimentalFeature: .moduleSelector,
         isOptional: true
       ),
       Child(
@@ -1600,12 +1599,15 @@ public let DECL_NODES: [Node] = [
       ),
     ],
     childHistory: [
+      [
+        "moduleSelector": .introduced
+      ],
       [
         "pound": .renamed(from: "poundToken"),
         "macroName": .renamed(from: "macro"),
         "genericArgumentClause": .renamed(from: "genericArguments"),
         "arguments": .renamed(from: "argumentList"),
-      ]
+      ],
     ]
   ),
 

CodeGeneration/Sources/SyntaxSupport/ExperimentalFeatures.swift

@@ -22,7 +22,6 @@ public enum ExperimentalFeature: String, CaseIterable {
   case keypathWithMethodMembers
   case oldOwnershipOperatorSpellings
   case defaultIsolationPerFile
-  case moduleSelector
   case borrowAndMutateAccessors
 
   /// The name of the feature as it is written in the compiler's `Features.def` file.
@@ -46,8 +45,6 @@ public enum ExperimentalFeature: String, CaseIterable {
       return "OldOwnershipOperatorSpellings"
     case .defaultIsolationPerFile:
       return "DefaultIsolationPerFile"
-    case .moduleSelector:
-      return "ModuleSelector"
     case .borrowAndMutateAccessors:
       return "BorrowAndMutateAccessors"
     }
@@ -74,8 +71,6 @@ public enum ExperimentalFeature: String, CaseIterable {
       return "`_move` and `_borrow` as ownership operators"
     case .defaultIsolationPerFile:
       return "set default actor isolation for a file"
-    case .moduleSelector:
-      return "Module selector syntax (`ModName::identifier`)"
     case .borrowAndMutateAccessors:
       return "borrow and mutate accessors"
     }

CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

@@ -1005,7 +1005,6 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "moduleSelector",
         kind: .node(kind: .moduleSelector),
-        experimentalFeature: .moduleSelector,
         isOptional: true
       ),
       Child(
@@ -1029,10 +1028,13 @@ public let EXPR_NODES: [Node] = [
       ),
     ],
     childHistory: [
+      [
+        "moduleSelector": .introduced
+      ],
       [
         "baseName": .renamed(from: "identifier"),
         "argumentNames": .renamed(from: "declNameArguments"),
-      ]
+      ],
     ]
   ),
 
@@ -1367,7 +1369,6 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "moduleSelector",
         kind: .node(kind: .moduleSelector),
-        experimentalFeature: .moduleSelector,
         isOptional: true
       ),
       Child(
@@ -1408,12 +1409,15 @@ public let EXPR_NODES: [Node] = [
       ),
     ],
     childHistory: [
+      [
+        "moduleSelector": .introduced
+      ],
       [
         "pound": .renamed(from: "poundToken"),
         "macroName": .renamed(from: "macro"),
         "genericArgumentClause": .renamed(from: "genericArguments"),
         "arguments": .renamed(from: "argumentList"),
-      ]
+      ],
     ]
   ),
 

CodeGeneration/Sources/SyntaxSupport/Traits.swift

@@ -95,7 +95,6 @@ public let TRAITS: [Trait] = [
       Child(
         name: "moduleSelector",
         kind: .node(kind: .moduleSelector),
-        experimentalFeature: .moduleSelector,
         isOptional: true
       ),
       Child(name: "macroName", kind: .token(choices: [.token(.identifier)])),
@@ -107,12 +106,15 @@ public let TRAITS: [Trait] = [
       Child(name: "additionalTrailingClosures", kind: .node(kind: .multipleTrailingClosureElementList)),
     ],
     childHistory: [
+      [
+        "moduleSelector": .introduced
+      ],
       [
         "pound": .renamed(from: "poundToken"),
         "macroName": .renamed(from: "macro"),
         "arguments": .renamed(from: "argumentList"),
         "genericArgumentClause": .renamed(from: "genericArguments"),
-      ]
+      ],
     ]
   ),
   Trait(

CodeGeneration/Sources/SyntaxSupport/TypeNodes.swift

@@ -368,7 +368,6 @@ public let TYPE_NODES: [Node] = [
       Child(
         name: "moduleSelector",
         kind: .node(kind: .moduleSelector),
-        experimentalFeature: .moduleSelector,
         nameForDiagnostics: "module selector",
         isOptional: true
       ),
@@ -382,6 +381,11 @@ public let TYPE_NODES: [Node] = [
         kind: .node(kind: .genericArgumentClause),
         isOptional: true
       ),
+    ],
+    childHistory: [
+      [
+        "moduleSelector": .introduced
+      ]
     ]
   ),
 
@@ -521,7 +525,6 @@ public let TYPE_NODES: [Node] = [
       Child(
         name: "moduleSelector",
         kind: .node(kind: .moduleSelector),
-        experimentalFeature: .moduleSelector,
         nameForDiagnostics: "module selector",
         isOptional: true
       ),
@@ -539,6 +542,11 @@ public let TYPE_NODES: [Node] = [
         kind: .node(kind: .genericArgumentClause),
         isOptional: true
       ),
+    ],
+    childHistory: [
+      [
+        "moduleSelector": .introduced
+      ]
     ]
   ),
 

Sources/SwiftParser/Lexer/Cursor.swift

@@ -990,7 +990,7 @@ extension Lexer.Cursor {
 
   private mutating func lexNormalColon() -> Lexer.Result {
     _ = self.advance()
-    guard self.experimentalFeatures.contains(.moduleSelector) && self.peek() == ":" else {
+    guard self.peek() == ":" else {
       return Lexer.Result(.colon)
     }