Re-enable latex and swift for vscode versions >= 1.107.0

Author: AndreasArvidsson

copy-assets.sh

@@ -1 +1 @@
-cp -r node_modules/@cursorless/tree-sitter-wasms/out parsers
+cp -r node_modules/@cursorless/tree-sitter-wasms/out/. parsers/

package-lock.json

@@ -2,7 +2,7 @@
   "name": "parse-tree",
   "displayName": "Parse tree",
   "description": "Access document syntax using tree-sitter",
-  "version": "0.47.0",
+  "version": "0.48.0",
   "publisher": "pokey",
   "repository": {
     "type": "git",
@@ -89,6 +89,10 @@
     "prettier": "prettier --write --list-different .",
     "lint": "eslint src && prettier --check ."
   },
+  "dependencies": {
+    "semver": "^7.7.3",
+    "web-tree-sitter": "^0.25.10"
+  },
   "devDependencies": {
     "@cursorless/tree-sitter-wasms": "0.7.0",
     "@eslint/js": "^9.31.0",
@@ -102,9 +106,5 @@
     "prettier": "^3.6.2",
     "typescript-eslint": "^8.41.0",
     "typescript": "^5.9.3"
-  },
-  "dependencies": {
-    "semver": "^7.7.3",
-    "web-tree-sitter": "^0.25.10"
   }
 }

package.json

@@ -80,14 +80,15 @@ export function activate(context: vscode.ExtensionContext) {
    * https://github.com/cursorless-dev/cursorless/issues/2879
    * https://github.com/cursorless-dev/vscode-parse-tree/issues/110
    */
-  const disabledLanguages = semver.gte(vscode.version, "1.98.0")
-    ? new Set(["latex", "swift"])
-    : null;
+  const disabledLanguages =
+    semver.lt(vscode.version, "1.107.0") && semver.gte(vscode.version, "1.98.0")
+      ? new Set(["latex", "swift"])
+      : null;
 
   const validateGetLanguage = (languageId: string) => {
     if (disabledLanguages?.has(languageId)) {
       throw new Error(
-        `${languageId} is disabled on vscode versions >= 1.98.0. See https://github.com/cursorless-dev/cursorless/issues/2879`,
+        `${languageId} is disabled on vscode versions 1.98.0 through 1.06.3. See https://github.com/cursorless-dev/cursorless/issues/2879`
       );
     }
   };
@@ -117,7 +118,7 @@ export function activate(context: vscode.ExtensionContext) {
       absolute = path.join(
         context.extensionPath,
         "parsers",
-        language.module + ".wasm",
+        language.module + ".wasm"
       );
     }
 
@@ -186,7 +187,7 @@ export function activate(context: vscode.ExtensionContext) {
 
   function updateTree(
     parser: treeSitter.Parser,
-    edit: vscode.TextDocumentChangeEvent,
+    edit: vscode.TextDocumentChangeEvent
   ) {
     if (edit.contentChanges.length === 0) {
       return;
@@ -239,20 +240,20 @@ export function activate(context: vscode.ExtensionContext) {
   async function openIfVisible(document: vscode.TextDocument) {
     if (
       vscode.window.visibleTextEditors.some(
-        (editor) => editor.document.uri.toString() === document.uri.toString(),
+        (editor) => editor.document.uri.toString() === document.uri.toString()
       )
     ) {
       await open(document);
     }
   }
 
   context.subscriptions.push(
-    vscode.window.onDidChangeVisibleTextEditors(colorAllOpen),
+    vscode.window.onDidChangeVisibleTextEditors(colorAllOpen)
   );
   context.subscriptions.push(vscode.workspace.onDidChangeTextDocument(edit));
   context.subscriptions.push(vscode.workspace.onDidCloseTextDocument(close));
   context.subscriptions.push(
-    vscode.workspace.onDidOpenTextDocument(openIfVisible),
+    vscode.workspace.onDidOpenTextDocument(openIfVisible)
   );
 
   // Don't wait for the initial color, it takes too long to inspect the themes and causes VSCode extension host to hang
@@ -263,7 +264,7 @@ export function activate(context: vscode.ExtensionContext) {
 
     if (ret == null) {
       const document = vscode.workspace.textDocuments.find(
-        (textDocument) => textDocument.uri.toString() === uri.toString(),
+        (textDocument) => textDocument.uri.toString() === uri.toString()
       );
 
       if (document == null) {
@@ -297,15 +298,15 @@ export function activate(context: vscode.ExtensionContext) {
      */
     getLanguage(languageId: string): treeSitter.Language | undefined {
       console.warn(
-        "vscode-parse-tree: getLanguage is deprecated, use createQuery(languageId, source) instead.",
+        "vscode-parse-tree: getLanguage is deprecated, use createQuery(languageId, source) instead."
       );
       validateGetLanguage(languageId);
       return languages[languageId]?.parser?.language ?? undefined;
     },
 
     createQuery(
       languageId: string,
-      source: string,
+      source: string
     ): treeSitter.Query | undefined {
       const language = languages[languageId]?.parser?.language;
       if (language == null) {