Restore TokenApplication.Action facility

ChimeHQ · Jan 28, 2024 · e27baf2 · e27baf2
1 parent b024a31
commit e27baf2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/Sources/Neon/Token.swift b/Sources/Neon/Token.swift
@@ -19,21 +19,22 @@ extension Token: CustomDebugStringConvertible {
 }
 
 public struct TokenApplication: Hashable, Sendable {
+	public enum Action: Sendable, Hashable {
+		case replace
+		case apply
+	}
+
 	public let tokens: [Token]
 	public let range: NSRange?
+	public let action: Action
 
-	public init(tokens: [Token], range: NSRange? = nil) {
+	public init(tokens: [Token], range: NSRange? = nil, action: Action = .replace) {
 		self.tokens = tokens
 		self.range = range
+		self.action = action
 	}
-}
 
-extension TokenApplication: ExpressibleByArrayLiteral {
-	public typealias ArrayLiteralElement = Token
-
-	public init(arrayLiteral elements: Token...) {
-		self.init(tokens: elements)
-	}
+	public static let noChange = TokenApplication(tokens: [], action: .apply)
 }
 
 public typealias TokenProvider = HybridValueProvider<NSRange, TokenApplication>

diff --git a/Sources/Neon/TreeSitterClient+Neon.swift b/Sources/Neon/TreeSitterClient+Neon.swift
@@ -29,7 +29,7 @@ extension TreeSitterClient {
 
 					return TokenApplication(namedRanges: namedRanges, nameMap: nameMap, range: range)
 				} catch {
-					return []
+					return .noChange
 				}
 			},
 			mainActorAsyncValue: { [highlightsProvider] range in
@@ -38,7 +38,7 @@ extension TreeSitterClient {
 
 					return TokenApplication(namedRanges: namedRanges, nameMap: nameMap, range: range)
 				} catch {
-					return []
+					return .noChange
 				}
 			}
 		)