Merge pull request #1915 from ahoppen/ahoppen/less-generation

Don’t generate BasicFormat+Extensions.swift and SyntaxClassifcation.swift

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift

@@ -46,8 +46,7 @@ public let ATTRIBUTE_NODES: [Node] = [
         name: "AttributeName",
         kind: .node(kind: .type),
         nameForDiagnostics: "name",
-        documentation: "The name of the attribute.",
-        classification: "Attribute"
+        documentation: "The name of the attribute."
       ),
       Child(
         name: "LeftParen",
@@ -191,8 +190,7 @@ public let ATTRIBUTE_NODES: [Node] = [
     children: [
       Child(
         name: "AvailabilityVersionRestriction",
-        kind: .node(kind: .availabilityVersionRestriction),
-        classification: "Keyword"
+        kind: .node(kind: .availabilityVersionRestriction)
       ),
       Child(
         name: "TrailingComma",

CodeGeneration/Sources/SyntaxSupport/AvailabilityNodes.swift

@@ -118,8 +118,7 @@ public let AVAILABILITY_NODES: [Node] = [
         kind: .token(choices: [.token(tokenKind: "IdentifierToken")]),
         nameForDiagnostics: "platform",
         documentation:
-          "The name of the OS on which the availability should be restricted or 'swift' if the availability should be restricted based on a Swift version.",
-        classification: "Keyword"
+          "The name of the OS on which the availability should be restricted or 'swift' if the availability should be restricted based on a Swift version."
       ),
       Child(
         name: "Version",

CodeGeneration/Sources/SyntaxSupport/Child.swift

@@ -61,10 +61,7 @@ public class Child {
   public let kind: ChildKind
   public let nameForDiagnostics: String?
   public let documentation: String?
-  public let forceClassification: Bool
-  public let isIndented: Bool
   public let isOptional: Bool
-  public let classification: SyntaxClassification?
 
   public var syntaxNodeKind: SyntaxNodeKind {
     switch kind {
@@ -166,10 +163,7 @@ public class Child {
     kind: ChildKind,
     nameForDiagnostics: String? = nil,
     documentation: String? = nil,
-    isOptional: Bool = false,
-    classification: String? = nil,
-    forceClassification: Bool = false,
-    isIndented: Bool = false
+    isOptional: Bool = false
   ) {
     if let firstCharInName = name.first {
       precondition(firstCharInName.isUppercase == true, "The first letter of a child’s name should be uppercase")
@@ -179,9 +173,6 @@ public class Child {
     self.kind = kind
     self.nameForDiagnostics = nameForDiagnostics
     self.documentation = documentation
-    self.classification = classificationByName(classification)
-    self.forceClassification = forceClassification
-    self.isIndented = isIndented
     self.isOptional = isOptional
   }
 }

CodeGeneration/Sources/SyntaxSupport/Classification.swift

@@ -71,8 +71,7 @@ public let COMMON_NODES: [Node] = [
       Child(
         name: "Statements",
         kind: .collection(kind: .codeBlockItemList, collectionElementName: "Statement"),
-        nameForDiagnostics: "statements",
-        isIndented: true
+        nameForDiagnostics: "statements"
       ),
       Child(
         name: "RightBrace",

CodeGeneration/Sources/SyntaxSupport/CommonNodes.swift

@@ -56,8 +56,7 @@ public let DECL_NODES: [Node] = [
       ),
       Child(
         name: "Accessors",
-        kind: .collection(kind: .accessorList, collectionElementName: "Accessor"),
-        isIndented: true
+        kind: .collection(kind: .accessorList, collectionElementName: "Accessor")
       ),
       Child(
         name: "RightBrace",
@@ -543,8 +542,7 @@ public let DECL_NODES: [Node] = [
           .keyword(text: "static"),
           .keyword(text: "unowned"),
           .keyword(text: "weak"),
-        ]),
-        classification: "Attribute"
+        ])
       ),
       Child(
         name: "Detail",
@@ -681,8 +679,7 @@ public let DECL_NODES: [Node] = [
         name: "ParameterList",
         kind: .collection(kind: .enumCaseParameterList, collectionElementName: "Parameter"),
         nameForDiagnostics: "parameters",
-        documentation: "The actual parameters.",
-        isIndented: true
+        documentation: "The actual parameters."
       ),
       Child(
         name: "RightParen",
@@ -1130,15 +1127,13 @@ public let DECL_NODES: [Node] = [
     children: [
       Child(
         name: "PoundKeyword",
-        kind: .token(choices: [.token(tokenKind: "PoundIfToken"), .token(tokenKind: "PoundElseifToken"), .token(tokenKind: "PoundElseToken")]),
-        classification: "BuildConfigId"
+        kind: .token(choices: [.token(tokenKind: "PoundIfToken"), .token(tokenKind: "PoundElseifToken"), .token(tokenKind: "PoundElseToken")])
       ),
       Child(
         name: "Condition",
         kind: .node(kind: .expr),
         nameForDiagnostics: "condition",
-        isOptional: true,
-        classification: "BuildConfigId"
+        isOptional: true
       ),
       Child(
         name: "Elements",
@@ -1182,8 +1177,7 @@ public let DECL_NODES: [Node] = [
       ),
       Child(
         name: "PoundEndif",
-        kind: .token(choices: [.token(tokenKind: "PoundEndifToken")]),
-        classification: "BuildConfigId"
+        kind: .token(choices: [.token(tokenKind: "PoundEndifToken")])
       ),
     ]
   ),
@@ -1509,8 +1503,7 @@ public let DECL_NODES: [Node] = [
       ),
       Child(
         name: "Members",
-        kind: .collection(kind: .memberDeclList, collectionElementName: "Member"),
-        isIndented: true
+        kind: .collection(kind: .memberDeclList, collectionElementName: "Member")
       ),
       Child(
         name: "RightBrace",
@@ -1600,8 +1593,7 @@ public let DECL_NODES: [Node] = [
       ),
       Child(
         name: "Identifier",
-        kind: .token(choices: [.token(tokenKind: "BinaryOperatorToken"), .token(tokenKind: "PrefixOperatorToken"), .token(tokenKind: "PostfixOperatorToken")]),
-        classification: "OperatorIdentifier"
+        kind: .token(choices: [.token(tokenKind: "BinaryOperatorToken"), .token(tokenKind: "PrefixOperatorToken"), .token(tokenKind: "PostfixOperatorToken")])
       ),
       Child(
         name: "OperatorPrecedenceAndTypes",
@@ -1652,8 +1644,7 @@ public let DECL_NODES: [Node] = [
       Child(
         name: "ParameterList",
         kind: .collection(kind: .functionParameterList, collectionElementName: "Parameter"),
-        nameForDiagnostics: "parameters",
-        isIndented: true
+        nameForDiagnostics: "parameters"
       ),
       Child(
         name: "RightParen",
@@ -1824,8 +1815,7 @@ public let DECL_NODES: [Node] = [
       Child(
         name: "AssociativityLabel",
         deprecatedName: "AssociativityKeyword",
-        kind: .token(choices: [.keyword(text: "associativity")]),
-        classification: "Keyword"
+        kind: .token(choices: [.keyword(text: "associativity")])
       ),
       Child(
         name: "Colon",
@@ -1942,8 +1932,7 @@ public let DECL_NODES: [Node] = [
         name: "HigherThanOrLowerThanLabel",
         deprecatedName: "HigherThanOrLowerThan",
         kind: .token(choices: [.keyword(text: "higherThan"), .keyword(text: "lowerThan")]),
-        documentation: "The relation to specified other precedence groups.",
-        classification: "Keyword"
+        documentation: "The relation to specified other precedence groups."
       ),
       Child(
         name: "Colon",

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

@@ -53,8 +53,7 @@ public let EXPR_NODES: [Node] = [
       ),
       Child(
         name: "Elements",
-        kind: .collection(kind: .arrayElementList, collectionElementName: "Element"),
-        isIndented: true
+        kind: .collection(kind: .arrayElementList, collectionElementName: "Element")
       ),
       Child(
         name: "RightSquare",
@@ -447,8 +446,7 @@ public let EXPR_NODES: [Node] = [
         name: "ParameterList",
         kind: .collection(kind: .closureParameterList, collectionElementName: "Parameter"),
         nameForDiagnostics: "parameters",
-        documentation: "The actual parameters.",
-        isIndented: true
+        documentation: "The actual parameters."
       ),
       Child(
         name: "RightParen",
@@ -478,8 +476,7 @@ public let EXPR_NODES: [Node] = [
       ),
       Child(
         name: "Statements",
-        kind: .collection(kind: .codeBlockItemList, collectionElementName: "Statement"),
-        isIndented: true
+        kind: .collection(kind: .codeBlockItemList, collectionElementName: "Statement")
       ),
       Child(
         name: "RightBrace",
@@ -648,8 +645,7 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "ValueExpression",
         kind: .node(kind: .expr),
-        nameForDiagnostics: "value",
-        isIndented: true
+        nameForDiagnostics: "value"
       ),
       Child(
         name: "TrailingComma",
@@ -680,8 +676,7 @@ public let EXPR_NODES: [Node] = [
             name: "Elements",
             kind: .node(kind: .dictionaryElementList)
           ),
-        ]),
-        isIndented: true
+        ])
       ),
       Child(
         name: "RightSquare",
@@ -745,19 +740,15 @@ public let EXPR_NODES: [Node] = [
       ),
       Child(
         name: "LeftParen",
-        kind: .token(choices: [.token(tokenKind: "LeftParenToken")]),
-        classification: "StringInterpolationAnchor",
-        forceClassification: true
+        kind: .token(choices: [.token(tokenKind: "LeftParenToken")])
       ),
       Child(
         name: "Expressions",
         kind: .collection(kind: .tupleExprElementList, collectionElementName: "Expression")
       ),
       Child(
         name: "RightParen",
-        kind: .token(choices: [.token(tokenKind: "RightParenToken")]),
-        classification: "StringInterpolationAnchor",
-        forceClassification: true
+        kind: .token(choices: [.token(tokenKind: "RightParenToken")])
       ),
     ]
   ),
@@ -816,8 +807,7 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "ArgumentList",
         kind: .collection(kind: .tupleExprElementList, collectionElementName: "Argument"),
-        nameForDiagnostics: "arguments",
-        isIndented: true
+        nameForDiagnostics: "arguments"
       ),
       Child(
         name: "RightParen",
@@ -1630,8 +1620,7 @@ public let EXPR_NODES: [Node] = [
       ),
       Child(
         name: "Statements",
-        kind: .collection(kind: .codeBlockItemList, collectionElementName: "Statement"),
-        isIndented: true
+        kind: .collection(kind: .codeBlockItemList, collectionElementName: "Statement")
       ),
     ]
   ),
@@ -1805,8 +1794,7 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "Elements",
         deprecatedName: "ElementList",
-        kind: .collection(kind: .tupleExprElementList, collectionElementName: "Element"),
-        isIndented: true
+        kind: .collection(kind: .tupleExprElementList, collectionElementName: "Element")
       ),
       Child(
         name: "RightParen",