From 4148bc3ce3733fb826efb629143e96a61ecd72f7 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sun, 15 Nov 2026 08:11:36 +0100 Subject: [PATCH] Require a minimum vscode version of 1.107.0 --- package-lock.json | 35 +++++++---------------------------- package.json | 8 +++----- src/disabledLanguages.ts | 25 ------------------------- src/extension.ts | 11 ----------- 4 files changed, 10 insertions(+), 69 deletions(-) delete mode 100644 src/disabledLanguages.ts diff --git a/package-lock.json b/package-lock.json index 9912498..164b50d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,29 +1,27 @@ { "name": "parse-tree", - "version": "0.59.0", + "version": "0.60.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "parse-tree", - "version": "0.59.0", + "version": "0.60.0", "license": "MIT", "dependencies": { - "semver": "^7.8.5", "web-tree-sitter": "^0.27.1" }, "devDependencies": { "@cursorless/tree-sitter-wasms": "^0.12.0", "@types/node": "^24.19.2", - "@types/semver": "^7.8.0", - "@types/vscode": "1.98.0", + "@types/vscode": "1.107.0", "oxfmt": "^0.74.0", "oxlint": "^1.89.0", "oxlint-tsgolint": "^7.0.2001", "typescript": "^7.0.2" }, "engines": { - "vscode": "^1.98.0" + "vscode": "^1.107.0" } }, "node_modules/@cursorless/tree-sitter-wasms": { @@ -821,17 +819,10 @@ "undici-types": ">=7.24.0 <7.24.7" } }, - "node_modules/@types/semver": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.8.0.tgz", - "integrity": "sha512-1mAINjtQCXXeLkJ9ehXkwOcBpqtLxiVtKhpUf83DdRNdQKV0iXZpaHYqRr7nj+wvxuJzoAmAwXI+sCNMv1CzLQ==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/vscode": { - "version": "1.98.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.98.0.tgz", - "integrity": "sha512-+KuiWhpbKBaG2egF+51KjbGWatTH5BbmWQjSLMDCssb4xF8FJnW4nGH4nuAdOOfMbpD0QlHtI+C3tPq+DoKElg==", + "version": "1.107.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.107.0.tgz", + "integrity": "sha512-XS8YE1jlyTIowP64+HoN30OlC1H9xqSlq1eoLZUgFEC8oUTO6euYZxti1xRiLSfZocs4qytTzR6xCBYtioQTCg==", "dev": true, "license": "MIT" }, @@ -1298,18 +1289,6 @@ "@oxlint-tsgolint/win32-x64": "7.0.2004" } }, - "node_modules/semver": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", - "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/tinypool": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-2.2.0.tgz", diff --git a/package.json b/package.json index 61644c8..c1a14a1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "parse-tree", "displayName": "Parse tree", "description": "Access document syntax using tree-sitter", - "version": "0.59.0", + "version": "0.60.0", "publisher": "pokey", "repository": { "type": "git", @@ -16,7 +16,7 @@ "workspace" ], "engines": { - "vscode": "^1.98.0" + "vscode": "^1.107.0" }, "categories": [ "Programming Languages", @@ -94,14 +94,12 @@ "fix:fmt": "oxfmt ." }, "dependencies": { - "semver": "^7.8.5", "web-tree-sitter": "^0.27.1" }, "devDependencies": { "@cursorless/tree-sitter-wasms": "^0.12.0", "@types/node": "^24.19.2", - "@types/semver": "^7.8.0", - "@types/vscode": "1.98.0", + "@types/vscode": "1.107.0", "oxfmt": "^0.74.0", "oxlint-tsgolint": "^7.0.2001", "oxlint": "^1.89.0", diff --git a/src/disabledLanguages.ts b/src/disabledLanguages.ts deleted file mode 100644 index 1278aad..0000000 --- a/src/disabledLanguages.ts +++ /dev/null @@ -1,25 +0,0 @@ -import * as semver from "semver"; -import * as vscode from "vscode"; - -/** - * FIXME: On newer vscode versions some Tree sitter parser throws memory errors - * https://github.com/cursorless-dev/cursorless/issues/2879 - * https://github.com/cursorless-dev/vscode-parse-tree/issues/110 - */ - -const isProblemVersion = - semver.lt(vscode.version, "1.107.0") && semver.gte(vscode.version, "1.98.0"); - -const disabledLanguages = new Set(isProblemVersion ? ["latex", "swift"] : []); - -export function isLanguageDisabled(languageId: string): boolean { - return disabledLanguages.has(languageId); -} - -export function throwIfLanguageIsDisabled(languageId: string): void { - if (isLanguageDisabled(languageId)) { - throw new Error( - `${languageId} is disabled on vscode versions 1.98.0 through 1.06.3. See https://github.com/cursorless-dev/cursorless/issues/2879`, - ); - } -} diff --git a/src/extension.ts b/src/extension.ts index 439e767..01fbd02 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -9,10 +9,6 @@ import type { import { window, workspace } from "vscode"; import type { Tree, Node } from "web-tree-sitter"; import { Parser, Query, Language as TreeSitterLanguage } from "web-tree-sitter"; -import { - isLanguageDisabled, - throwIfLanguageIsDisabled, -} from "./disabledLanguages"; import { DeprecatedError, LanguageStillLoadingError, @@ -63,11 +59,6 @@ export function activate(context: ExtensionContext): ReturnValue { return true; } - // Disabled on certain vscode versions due to memory errors in tree-sitter parsers - if (isLanguageDisabled(languageId)) { - return false; - } - const absolute = getWasmPath(context.extensionPath, language.module); const wasm = path.relative(process.cwd(), absolute); @@ -140,7 +131,6 @@ export function activate(context: ExtensionContext): ReturnValue { // Language definition exists, but the parser is not loaded. Could be a race // condition or a disabled language. if (language.parser == null) { - throwIfLanguageIsDisabled(document.languageId); throw new LanguageStillLoadingError(document.languageId); } @@ -218,7 +208,6 @@ export function activate(context: ExtensionContext): ReturnValue { function createQuery(languageId: string, source: string): Query | undefined { const language = languages[languageId]?.parser?.language; if (language == null) { - throwIfLanguageIsDisabled(languageId); return undefined; } return new Query(language, source);