Skip to content

Tree sitter r update #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EagleoutIce merged 3 commits into from
Apr 7, 2026
Merged

Tree sitter r update #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1db88a
update tree-sitter
Ellpeck Apr 7, 2026
2e1c9f7
also display tree-sitter version in footer
Ellpeck Apr 7, 2026
be0ea9f
update flowr and remove explicit tree-sitter-r dep
Ellpeck Apr 7, 2026
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
70 changes: 29 additions & 41 deletions package-lock.json
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,8 +761,8 @@
},
"scripts": {
"vscode:prepublish": "npm run package && npm run package-web",
"copy-wasm-node": "mkdir -p dist/node && cp node_modules/web-tree-sitter/tree-sitter.wasm dist/node && cp node_modules/@eagleoutice/tree-sitter-r/tree-sitter-r.wasm dist/node",
"copy-wasm-web": "mkdir -p dist/web && cp node_modules/web-tree-sitter/tree-sitter.wasm dist/web && cp node_modules/@eagleoutice/tree-sitter-r/tree-sitter-r.wasm dist/web",
"copy-wasm-node": "mkdir -p dist/node && cp node_modules/web-tree-sitter/tree-sitter.wasm dist/node && cp node_modules/@davisvaughan/tree-sitter-r/tree-sitter-r.wasm dist/node",
"copy-wasm-web": "mkdir -p dist/web && cp node_modules/web-tree-sitter/tree-sitter.wasm dist/web && cp node_modules/@davisvaughan/tree-sitter-r/tree-sitter-r.wasm dist/web",
"precompile": "npm run copy-wasm-node",
"compile": "webpack",
"prepackage": "npm run copy-wasm-node",
Expand All @@ -786,7 +786,7 @@
"watch-web": "webpack --watch"
},
"dependencies": {
"@eagleoutice/flowr": "^2.10.1",
"@eagleoutice/flowr": "^2.10.3",
"assert": "^2.1.0",
"browserify-zlib": "^0.2.0",
"constants-browserify": "^1.0.0",
Expand Down
7 changes: 6 additions & 1 deletion src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { deepMergeObject } from '@eagleoutice/flowr/util/objects';
import { registerLintCommands } from './lint';
import { NoTelemetry, registerTelemetry, telemetry, TelemetryEvent } from './telemetry';
import { registerHoverOverValues } from './hover-values';
import { TreeSitterExecutor } from '@eagleoutice/flowr/r-bridge/lang-4.x/tree-sitter/tree-sitter-executor';

/**
* Public-facing API for the flowR extension, which includes a variety of helpful utilities.
Expand Down Expand Up @@ -191,7 +192,11 @@ export function updateStatusBar() {
} else if(flowrSession instanceof FlowrInternalSession) {
text.push(`$(console) flowR ${flowrSession.state}`);
if(flowrSession.state === 'active') {
tooltip.push(`R version ${flowrSession.rVersion} \nflowR version ${flowrVersion().toString()} \nEngine ${flowrSession.parser?.name}`);
let info = `R version ${flowrSession.rVersion} \nflowR version ${flowrVersion().toString()} \nEngine ${flowrSession.parser?.name}`;
if(flowrSession.parser instanceof TreeSitterExecutor) {
info += ` version ${flowrSession.parser.treeSitterVersion()}`;
}
tooltip.push(info);
}
if(flowrSession.working){
text.push('$(loading~spin) Analyzing');
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
"exclude": [
"test-workspace"
]
}
}
Loading