TypeScript support

ChimeHQ · Dec 6, 2024 · a7ba9e0 · a7ba9e0
1 parent a4f6e1b
commit a7ba9e0
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 4 deletions.
diff --git a/Configurations/NonSwiftWorkaround.xcconfig b/Configurations/NonSwiftWorkaround.xcconfig
@@ -25,4 +25,5 @@ OTHER_SWIFT_FLAGS = $(inherited) -Xcc -fmodule-map-file=$(GENERATED_MODULEMAP_DI
 OTHER_SWIFT_FLAGS = $(inherited) -Xcc -fmodule-map-file=$(GENERATED_MODULEMAP_DIR)/TreeSitterPython.modulemap
 OTHER_SWIFT_FLAGS = $(inherited) -Xcc -fmodule-map-file=$(GENERATED_MODULEMAP_DIR)/TreeSitterRuby.modulemap
 OTHER_SWIFT_FLAGS = $(inherited) -Xcc -fmodule-map-file=$(GENERATED_MODULEMAP_DIR)/TreeSitterRust.modulemap
+OTHER_SWIFT_FLAGS = $(inherited) -Xcc -fmodule-map-file=$(GENERATED_MODULEMAP_DIR)/TreeSitterTypeScript.modulemap
 OTHER_SWIFT_FLAGS = $(inherited) -Xcc -fmodule-map-file=$(GENERATED_MODULEMAP_DIR)/TreeSitterSwift.modulemap
diff --git a/Dependencies/Package.swift b/Dependencies/Package.swift
@@ -29,6 +29,7 @@ let package = Package(
 		.package(url: "https://github.com/tree-sitter/tree-sitter-python", branch: "master"),
 		.package(url: "https://github.com/tree-sitter/tree-sitter-ruby", branch: "master"),
 		.package(url: "https://github.com/tree-sitter/tree-sitter-rust", branch: "master"),
+		.package(url: "https://github.com/tree-sitter/tree-sitter-typescript", branch: "master"),
 		.package(url: "https://github.com/alex-pinkus/tree-sitter-swift", branch: "with-generated-files"),
 	],
 	targets: [
@@ -52,6 +53,7 @@ let package = Package(
 				.product(name: "TreeSitterPython", package: "tree-sitter-python"),
 				.product(name: "TreeSitterRuby", package: "tree-sitter-ruby"),
 				.product(name: "TreeSitterRust", package: "tree-sitter-rust"),
+				.product(name: "TreeSitterTypeScript", package: "tree-sitter-typescript"),
 				.product(name: "TreeSitterSwift", package: "tree-sitter-swift"),
 			]
 		),

diff --git a/Dependencies/Sources/TreeSitterParsers/TreeSitterParsers.swift b/Dependencies/Sources/TreeSitterParsers/TreeSitterParsers.swift
@@ -16,4 +16,5 @@
 @_exported import TreeSitterPython
 @_exported import TreeSitterRuby
 @_exported import TreeSitterRust
+@_exported import TreeSitterTypeScript
 @_exported import TreeSitterSwift
diff --git a/Edit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Edit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "2c533b6dafa208983e2c3996abe8ef2b3eb75356e0c996ea3d9ee4ef4da06719",
+  "originHash" : "a425ffff3c05722e5d50ef8ce30dc82d4392cf636f759db35d39aac4e657e178",
   "pins" : [
     {
       "identity" : "asyncxpcconnection",
@@ -411,6 +411,15 @@
         "revision" : "eda05af7ac41adb4eb19c346883c0fa32fe3bdd8"
       }
     },
+    {
+      "identity" : "tree-sitter-typescript",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tree-sitter/tree-sitter-typescript",
+      "state" : {
+        "branch" : "master",
+        "revision" : "45af49560396d67a710b21a3ce315fcaa09006ff"
+      }
+    },
     {
       "identity" : "windowtreatment",
       "kind" : "remoteSourceControl",

diff --git a/Edit/Modules/SyntaxService/LanguageProfile+Profiles.swift b/Edit/Modules/SyntaxService/LanguageProfile+Profiles.swift
@@ -80,6 +80,11 @@ extension LanguageProfile {
 			return LanguageProfile.swiftProfile
 		}
 
+		// special-case this type to allow the same extension to be used by default
+		if utType.conforms(to: .typescriptSource) || utType.conforms(to: .mpeg2TransportStream) {
+			return LanguageProfile.typeScriptProfile
+		}
+
 		return LanguageProfile.genericProfile
 	}
 }
@@ -177,14 +182,19 @@ extension LanguageProfile {
 		language: Language(tree_sitter_ruby())
 	)
 
+	static let rustProfile = LanguageProfile(
+		RootLanguage.rust,
+		language: Language(tree_sitter_rust())
+	)
+
 	static let swiftProfile = LanguageProfile(
 		RootLanguage.swift,
 		language: Language(tree_sitter_swift())
 	)
 
-	static let rustProfile = LanguageProfile(
-		RootLanguage.rust,
-		language: Language(tree_sitter_rust())
+	static let typeScriptProfile = LanguageProfile(
+		RootLanguage.typeScript,
+		language: Language(tree_sitter_typescript())
 	)
 
 	static let genericProfile = LanguageProfile(

diff --git a/Edit/Modules/SyntaxService/RootLanguage.swift b/Edit/Modules/SyntaxService/RootLanguage.swift
@@ -26,6 +26,7 @@ public enum RootLanguage: Hashable, CaseIterable, Sendable {
 	case ruby
 	case rust
 	case swift
+	case typeScript
 
 	var typeIdentifier: UTType {
 		switch self {
@@ -47,6 +48,7 @@ public enum RootLanguage: Hashable, CaseIterable, Sendable {
 		case .python: .pythonScript
 		case .ruby: .rubyScript
 		case .rust: .rustSource
+		case .typeScript: .typescriptSource
 		case .swift: .swiftSource
 		}
 	}
@@ -97,6 +99,8 @@ extension RootLanguage: RawRepresentable {
 			self = .rust
 		case "swift":
 			self = .swift
+		case "typescript":
+			self = .typeScript
 		default:
 			return nil
 		}
@@ -142,6 +146,8 @@ extension RootLanguage: RawRepresentable {
 			"Rust"
 		case .swift:
 			"Swift"
+		case .typeScript:
+			"TypeScript"
 		}
 	}
 }
diff --git a/Edit/Modules/SyntaxService/SyntaxService.swift b/Edit/Modules/SyntaxService/SyntaxService.swift
@@ -171,6 +171,7 @@ extension SyntaxService {
 					let queryParams = try self.highlightsQueryParams(for: range)
 					let namedRanges = try await client.highlightsProvider.async(queryParams)
 
+					print("names:", namedRanges)
 					return TokenApplication(namedRanges: namedRanges, range: range)
 				} catch {
 					self.logger.warning("Failed to get highlighting: \(error)")

diff --git a/Edit/Resources/Info.plist b/Edit/Resources/Info.plist
@@ -292,6 +292,36 @@
 				</array>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.source-code</string>
+			</array>
+			<key>UTTypeIdentifier</key>
+			<string>org.typescriptlang.source</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>ts</string>
+				</array>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.source-code</string>
+			</array>
+			<key>UTTypeIdentifier</key>
+			<string>org.typescriptlang.jsx-source</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>tsx</string>
+				</array>
+			</dict>
+		</dict>
 	</array>
 </dict>
 </plist>
diff --git a/EditIntents/HighlightIntent.swift b/EditIntents/HighlightIntent.swift
@@ -29,6 +29,7 @@ extension RootLanguage: AppEnum {
 			.ruby: "Ruby",
 			.rust: "Rust",
 			.swift: "Swift",
+			.typeScript: "TypeScript",
 		]
 	}
 }

diff --git a/QuickLookPreview/Info.plist b/QuickLookPreview/Info.plist
@@ -32,6 +32,7 @@
 				<string>public.shell-script</string>
 				<string>public.swift-source</string>
 				<string>com.netscape.javascript-source</string>
+				<string>org.typescriptlang.source</string>
 			</array>
 			<key>QLSupportsSearchableItems</key>
 			<false/>