Don’t generate SyntaxClassification.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,9 +61,7 @@ public class Child {
   public let kind: ChildKind
   public let nameForDiagnostics: String?
   public let documentation: String?
-  public let forceClassification: Bool
   public let isOptional: Bool
-  public let classification: SyntaxClassification?
 
   public var syntaxNodeKind: SyntaxNodeKind {
     switch kind {
@@ -165,9 +163,7 @@ public class Child {
     kind: ChildKind,
     nameForDiagnostics: String? = nil,
     documentation: String? = nil,
-    isOptional: Bool = false,
-    classification: String? = nil,
-    forceClassification: 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")
@@ -177,8 +173,6 @@ public class Child {
     self.kind = kind
     self.nameForDiagnostics = nameForDiagnostics
     self.documentation = documentation
-    self.classification = classificationByName(classification)
-    self.forceClassification = forceClassification
     self.isOptional = isOptional
   }
 }

CodeGeneration/Sources/SyntaxSupport/Classification.swift

@@ -542,8 +542,7 @@ public let DECL_NODES: [Node] = [
           .keyword(text: "static"),
           .keyword(text: "unowned"),
           .keyword(text: "weak"),
-        ]),
-        classification: "Attribute"
+        ])
       ),
       Child(
         name: "Detail",
@@ -1128,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",
@@ -1180,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")])
       ),
     ]
   ),
@@ -1597,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",
@@ -1820,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",
@@ -1938,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

@@ -740,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")])
       ),
     ]
   ),

CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

@@ -15,7 +15,6 @@ public class TokenSpec {
   public let name: String
   public let nameForDiagnostics: String
   public let text: String?
-  public let classification: SyntaxClassification?
   public let isKeyword: Bool
   public let associatedValueClass: String?
 
@@ -33,14 +32,12 @@ public class TokenSpec {
     name: String,
     nameForDiagnostics: String,
     text: String? = nil,
-    classification: String = "None",
     isKeyword: Bool = false,
     associatedValueClass: String? = nil
   ) {
     self.name = name
     self.nameForDiagnostics = nameForDiagnostics
     self.text = text
-    self.classification = classificationByName(classification)
     self.isKeyword = isKeyword
     self.associatedValueClass = associatedValueClass
   }
@@ -50,14 +47,12 @@ public class PoundKeywordSpec: TokenSpec {
   init(
     name: String,
     nameForDiagnostics: String? = nil,
-    text: String,
-    classification: String = "Keyword"
+    text: String
   ) {
     super.init(
       name: name,
       nameForDiagnostics: nameForDiagnostics ?? text,
       text: text,
-      classification: classification,
       isKeyword: true
     )
   }
@@ -69,16 +64,14 @@ public class PoundObjectLiteralSpec: PoundKeywordSpec {
   init(
     name: String,
     text: String,
-    classification: String = "ObjectLiteral",
     nameForDiagnostics: String,
     `protocol`: String
   ) {
     self.`protocol` = `protocol`
     super.init(
       name: name,
       nameForDiagnostics: nameForDiagnostics,
-      text: text,
-      classification: classification
+      text: text
     )
   }
 }
@@ -88,42 +81,36 @@ public class PoundConfigSpec: PoundKeywordSpec {}
 public class PoundDirectiveKeywordSpec: PoundKeywordSpec {
   init(
     name: String,
-    text: String,
-    classification: String = "PoundDirectiveKeyword"
+    text: String
   ) {
     super.init(
       name: name,
-      text: text,
-      classification: classification
+      text: text
     )
   }
 }
 
 public class PoundConditionalDirectiveKeywordSpec: PoundDirectiveKeywordSpec {
   override init(
     name: String,
-    text: String,
-    classification: String = "PoundDirectiveKeyword"
+    text: String
   ) {
     super.init(
       name: name,
-      text: text,
-      classification: classification
+      text: text
     )
   }
 }
 
 public class PunctuatorSpec: TokenSpec {
   init(
     name: String,
-    text: String,
-    classification: String = "None"
+    text: String
   ) {
     super.init(
       name: name,
       nameForDiagnostics: text,
       text: text,
-      classification: classification,
       isKeyword: false
     )
   }
@@ -135,30 +122,30 @@ public class MiscSpec: TokenSpec {}
 
 public let SYNTAX_TOKENS: [TokenSpec] = [
   PunctuatorSpec(name: "Arrow", text: "->"),
-  PunctuatorSpec(name: "AtSign", text: "@", classification: "Attribute"),
+  PunctuatorSpec(name: "AtSign", text: "@"),
   PunctuatorSpec(name: "Backslash", text: "\\"),
   PunctuatorSpec(name: "Backtick", text: "`"),
-  MiscSpec(name: "BinaryOperator", nameForDiagnostics: "binary operator", classification: "OperatorIdentifier"),
+  MiscSpec(name: "BinaryOperator", nameForDiagnostics: "binary operator"),
   PunctuatorSpec(name: "Colon", text: ":"),
   PunctuatorSpec(name: "Comma", text: ","),
-  MiscSpec(name: "DollarIdentifier", nameForDiagnostics: "dollar identifier", classification: "DollarIdentifier"),
+  MiscSpec(name: "DollarIdentifier", nameForDiagnostics: "dollar identifier"),
   PunctuatorSpec(name: "Ellipsis", text: "..."),
   MiscSpec(name: "EndOfFile", nameForDiagnostics: "end of file", text: ""),
   PunctuatorSpec(name: "Equal", text: "="),
   PunctuatorSpec(name: "ExclamationMark", text: "!"),
-  MiscSpec(name: "ExtendedRegexDelimiter", nameForDiagnostics: "extended delimiter", classification: "RegexLiteral"),
-  LiteralSpec(name: "FloatingLiteral", nameForDiagnostics: "floating literal", classification: "FloatingLiteral"),
-  MiscSpec(name: "Identifier", nameForDiagnostics: "identifier", classification: "Identifier"),
+  MiscSpec(name: "ExtendedRegexDelimiter", nameForDiagnostics: "extended delimiter"),
+  LiteralSpec(name: "FloatingLiteral", nameForDiagnostics: "floating literal"),
+  MiscSpec(name: "Identifier", nameForDiagnostics: "identifier"),
   PunctuatorSpec(name: "InfixQuestionMark", text: "?"),
-  LiteralSpec(name: "IntegerLiteral", nameForDiagnostics: "integer literal", classification: "IntegerLiteral"),
-  MiscSpec(name: "Keyword", nameForDiagnostics: "keyword", classification: "Keyword", associatedValueClass: "Keyword"),
+  LiteralSpec(name: "IntegerLiteral", nameForDiagnostics: "integer literal"),
+  MiscSpec(name: "Keyword", nameForDiagnostics: "keyword", associatedValueClass: "Keyword"),
   PunctuatorSpec(name: "LeftAngle", text: "<"),
   PunctuatorSpec(name: "LeftBrace", text: "{"),
   PunctuatorSpec(name: "LeftParen", text: "("),
   PunctuatorSpec(name: "LeftSquare", text: "["),
-  PunctuatorSpec(name: "MultilineStringQuote", text: "\"\"\"", classification: "StringLiteral"),
+  PunctuatorSpec(name: "MultilineStringQuote", text: "\"\"\""),
   PunctuatorSpec(name: "Period", text: "."),
-  MiscSpec(name: "PostfixOperator", nameForDiagnostics: "postfix operator", classification: "OperatorIdentifier"),
+  MiscSpec(name: "PostfixOperator", nameForDiagnostics: "postfix operator"),
   PunctuatorSpec(name: "PostfixQuestionMark", text: "?"),
   PunctuatorSpec(name: "Pound", text: "#"),
   PoundConfigSpec(name: "PoundAvailable", text: "#available"),
@@ -169,18 +156,18 @@ public let SYNTAX_TOKENS: [TokenSpec] = [
   PoundDirectiveKeywordSpec(name: "PoundSourceLocation", text: "#sourceLocation"),
   PoundConfigSpec(name: "PoundUnavailable", text: "#unavailable"),
   PunctuatorSpec(name: "PrefixAmpersand", text: "&"),
-  MiscSpec(name: "PrefixOperator", nameForDiagnostics: "prefix operator", classification: "OperatorIdentifier"),
+  MiscSpec(name: "PrefixOperator", nameForDiagnostics: "prefix operator"),
   MiscSpec(name: "RawStringDelimiter", nameForDiagnostics: "raw string delimiter"),
-  MiscSpec(name: "RegexLiteralPattern", nameForDiagnostics: "regex pattern", classification: "RegexLiteral"),
-  PunctuatorSpec(name: "RegexSlash", text: "/", classification: "RegexLiteral"),
+  MiscSpec(name: "RegexLiteralPattern", nameForDiagnostics: "regex pattern"),
+  PunctuatorSpec(name: "RegexSlash", text: "/"),
   PunctuatorSpec(name: "RightAngle", text: ">"),
   PunctuatorSpec(name: "RightBrace", text: "}"),
   PunctuatorSpec(name: "RightParen", text: ")"),
   PunctuatorSpec(name: "RightSquare", text: "]"),
   PunctuatorSpec(name: "Semicolon", text: ";"),
-  PunctuatorSpec(name: "SingleQuote", text: "\'", classification: "StringLiteral"),
-  PunctuatorSpec(name: "StringQuote", text: "\"", classification: "StringLiteral"),
-  MiscSpec(name: "StringSegment", nameForDiagnostics: "string segment", classification: "StringLiteral"),
+  PunctuatorSpec(name: "SingleQuote", text: "\'"),
+  PunctuatorSpec(name: "StringQuote", text: "\""),
+  MiscSpec(name: "StringSegment", nameForDiagnostics: "string segment"),
   MiscSpec(name: "Unknown", nameForDiagnostics: "token"),
   MiscSpec(name: "Wildcard", nameForDiagnostics: "wildcard", text: "_"),
 ]