Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion copy-assets.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cp -r node_modules/@cursorless/tree-sitter-wasms/out parsers
cp -r node_modules/@cursorless/tree-sitter-wasms/out/. parsers/
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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"
}
}
9 changes: 5 additions & 4 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`,
);
}
};
Expand Down