Remove text_choices and model the text choices in token_choices

Author: ahoppen

Sources/SwiftSyntax/generated/Keyword.swift

@@ -147,7 +147,8 @@ public enum Keyword: UInt8, Hashable {
 
   case before
 
-<<<<<<< HEAD
+  case block
+  
   case `break`
 
   case `case`
@@ -162,6 +163,8 @@ public enum Keyword: UInt8, Hashable {
 
   case convention
 
+  case cType
+  
   case `default`
 
   case `defer`
@@ -200,6 +203,8 @@ public enum Keyword: UInt8, Hashable {
 
   case `false`
 
+  case file
+  
   case `fileprivate`
 
   case final
@@ -242,8 +247,12 @@ public enum Keyword: UInt8, Hashable {
 
   case lazy
 
+  case left
+  
   case `let`
 
+  case line
+  
   case lowerThan
 
   case macro
@@ -391,261 +400,6 @@ public enum Keyword: UInt8, Hashable {
   case wrt
 
   case yield
-=======
-  case block = 61
-  
-  case `break` = 62
-  
-  case `case` = 63
-  
-  case `catch` = 64
-  
-  case `class` = 65
-  
-  case `continue` = 66
-  
-  case convenience = 67
-  
-  case convention = 68
-  
-  case cType = 69
-  
-  case `default` = 70
-  
-  case `defer` = 71
-  
-  case `deinit` = 72
-  
-  case deprecated = 73
-  
-  case derivative = 74
-  
-  case didSet = 75
-  
-  case differentiable = 76
-  
-  case distributed = 77
-  
-  case `do` = 78
-  
-  case dynamic = 79
-  
-  case each = 80
-  
-  case `else` = 81
-  
-  case `enum` = 82
-  
-  case escaping = 83
-  
-  case exclusivity = 84
-  
-  case exported = 85
-  
-  case `extension` = 86
-  
-  case `fallthrough` = 87
-  
-  case `false` = 88
-  
-  case file = 89
-  
-  case `fileprivate` = 90
-  
-  case final = 91
-  
-  case `for` = 92
-  
-  case `func` = 93
-  
-  case get = 94
-  
-  case `guard` = 95
-  
-  case higherThan = 96
-  
-  case `if` = 97
-  
-  case `import` = 98
-  
-  case `in` = 99
-  
-  case indirect = 100
-  
-  case infix = 101
-  
-  case `init` = 102
-  
-  case inline = 103
-  
-  case `inout` = 104
-  
-  case `internal` = 105
-  
-  case introduced = 106
-  
-  case `is` = 107
-  
-  case isolated = 108
-  
-  case kind = 109
-  
-  case lazy = 110
-  
-  case left = 111
-  
-  case `let` = 112
-  
-  case line = 113
-  
-  case lowerThan = 114
-  
-  case macro = 115
-  
-  case message = 116
-  
-  case metadata = 117
-  
-  case module = 118
-  
-  case mutableAddressWithNativeOwner = 119
-  
-  case mutableAddressWithOwner = 120
-  
-  case mutating = 121
-  
-  case `nil` = 122
-  
-  case noasync = 123
-  
-  case noDerivative = 124
-  
-  case noescape = 125
-  
-  case nonisolated = 126
-  
-  case nonmutating = 127
-  
-  case objc = 128
-  
-  case obsoleted = 129
-  
-  case of = 130
-  
-  case open = 131
-  
-  case `operator` = 132
-  
-  case optional = 133
-  
-  case override = 134
-  
-  case package = 135
-  
-  case postfix = 136
-  
-  case `precedencegroup` = 137
-  
-  case prefix = 138
-  
-  case `private` = 139
-  
-  case `Protocol` = 140
-  
-  case `protocol` = 141
-  
-  case `public` = 142
-  
-  case reasync = 143
-  
-  case renamed = 144
-  
-  case `repeat` = 145
-  
-  case required = 146
-  
-  case `rethrows` = 147
-  
-  case `return` = 148
-  
-  case reverse = 149
-  
-  case safe = 150
-  
-  case `self` = 151
-  
-  case `Self` = 152
-  
-  case Sendable = 153
-  
-  case set = 154
-  
-  case some = 155
-  
-  case sourceFile = 156
-  
-  case spi = 157
-  
-  case spiModule = 158
-  
-  case `static` = 159
-  
-  case `struct` = 160
-  
-  case `subscript` = 161
-  
-  case `super` = 162
-  
-  case swift = 163
-  
-  case `switch` = 164
-  
-  case target = 165
-  
-  case `throw` = 166
-  
-  case `throws` = 167
-  
-  case transpose = 168
-  
-  case `true` = 169
-  
-  case `try` = 170
-  
-  case `Type` = 171
-  
-  case `typealias` = 172
-  
-  case unavailable = 173
-  
-  case unchecked = 174
-  
-  case unowned = 175
-  
-  case unsafe = 176
-  
-  case unsafeAddress = 177
-  
-  case unsafeMutableAddress = 178
-  
-  case `var` = 179
-  
-  case visibility = 180
-  
-  case weak = 181
-  
-  case `where` = 182
-  
-  case `while` = 183
-  
-  case willSet = 184
-  
-  case witness_method = 185
-  
-  case wrt = 186
-  
-  case yield = 187
->>>>>>> a7a0ff37 (Remove text_choices and model the text choides in token_choices)
 
   @_spi(RawSyntax) public init?(_ text: SyntaxText) {
     switch text.count {
@@ -1265,7 +1019,6 @@ public enum Keyword: UInt8, Hashable {
   /// table is significantly faster. Ideally, we could also get the compiler to
   /// constant-evaluate `Keyword.spi.defaultText` to a `SyntaxText` but I don't
   /// see how that's possible right now.
-<<<<<<< HEAD
   private static let keywordTextLookupTable: [SyntaxText] = [
     "__consuming", 
     "__owned", 
@@ -1328,13 +1081,15 @@ public enum Keyword: UInt8, Hashable {
     "available", 
     "await", 
     "before", 
+    "block", 
     "break", 
     "case", 
     "catch", 
     "class", 
     "continue", 
     "convenience", 
     "convention", 
+    "cType", 
     "default", 
     "defer", 
     "deinit", 
@@ -1354,6 +1109,7 @@ public enum Keyword: UInt8, Hashable {
     "extension", 
     "fallthrough", 
     "false", 
+    "file", 
     "fileprivate", 
     "final", 
     "for", 
@@ -1375,7 +1131,9 @@ public enum Keyword: UInt8, Hashable {
     "isolated", 
     "kind", 
     "lazy", 
+    "left", 
     "let", 
+    "line", 
     "lowerThan", 
     "macro", 
     "message", 
@@ -1451,9 +1209,6 @@ public enum Keyword: UInt8, Hashable {
     "wrt", 
     "yield", 
   ]
-=======
-  private static let keywordTextLookupTable: [SyntaxText] = ["__consuming", "__owned", "__setter_access", "__shared", "_alignment", "_backDeploy", "_borrow", "_cdecl", "_Class", "_compilerInitialized", "_const", "_documentation", "_dynamicReplacement", "_effects", "_expose", "_forward", "_implements", "_linear", "_local", "_modify", "_move", "_NativeClass", "_NativeRefCountedObject", "_noMetadata", "_nonSendable", "_objcImplementation", "_objcRuntimeName", "_opaqueReturnTypeOf", "_optimize", "_originallyDefinedIn", "_PackageDescription", "_private", "_projectedValueProperty", "_read", "_RefCountedObject", "_semantics", "_silgen_name", "_specialize", "_spi", "_spi_available", "_swift_native_objc_runtime_base", "_Trivial", "_TrivialAtMost", "_typeEraser", "_unavailableFromAsync", "_UnknownLayout", "actor", "addressWithNativeOwner", "addressWithOwner", "any", "Any", "as", "assignment", "associatedtype", "associativity", "async", "autoclosure", "availability", "available", "await", "before", "block", "break", "case", "catch", "class", "continue", "convenience", "convention", "cType", "default", "defer", "deinit", "deprecated", "derivative", "didSet", "differentiable", "distributed", "do", "dynamic", "each", "else", "enum", "escaping", "exclusivity", "exported", "extension", "fallthrough", "false", "file", "fileprivate", "final", "for", "func", "get", "guard", "higherThan", "if", "import", "in", "indirect", "infix", "init", "inline", "inout", "internal", "introduced", "is", "isolated", "kind", "lazy", "left", "let", "line", "lowerThan", "macro", "message", "metadata", "module", "mutableAddressWithNativeOwner", "mutableAddressWithOwner", "mutating", "nil", "noasync", "noDerivative", "noescape", "nonisolated", "nonmutating", "objc", "obsoleted", "of", "open", "operator", "optional", "override", "package", "postfix", "precedencegroup", "prefix", "private", "Protocol", "protocol", "public", "reasync", "renamed", "repeat", "required", "rethrows", "return", "reverse", "safe", "self", "Self", "Sendable", "set", "some", "sourceFile", "spi", "spiModule", "static", "struct", "subscript", "super", "swift", "switch", "target", "throw", "throws", "transpose", "true", "try", "Type", "typealias", "unavailable", "unchecked", "unowned", "unsafe", "unsafeAddress", "unsafeMutableAddress", "var", "visibility", "weak", "where", "while", "willSet", "witness_method", "wrt", "yield"]
->>>>>>> a7a0ff37 (Remove text_choices and model the text choides in token_choices)
 
   @_spi(RawSyntax)
   public var defaultText: SyntaxText {