Skip to content
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

Update to VSCode 1.88 #384

Merged
merged 8 commits into from
Apr 9, 2024
Merged

Update to VSCode 1.88 #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
da5d37f
doc: update upgrade guide
Apr 8, 2024
13cefb9
fix: properly delete arg after using it
Apr 8, 2024
7d05745
lib!: update to VSCode 1.88
Apr 8, 2024
ad725a1
fix: import style
Apr 8, 2024
f9ef1ee
cleanup: stop trying to detect module side effects, assume true
Apr 8, 2024
b229818
fix: add missing new service
Apr 9, 2024
63778b7
fix(demo): update VSCode api usage
Apr 9, 2024
16c7201
lib: update all dependencies
Apr 9, 2024
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
58 changes: 30 additions & 28 deletions demo/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 demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
"devDependencies": {
"@codingame/esbuild-import-meta-url-plugin": "^1.0.2",
"@codingame/monaco-vscode-rollup-vsix-plugin": "file:../dist/rollup-vsix-plugin",
"@types/dockerode": "^3.3.26",
"@types/dockerode": "^3.3.28",
"@types/express": "^4.17.21",
"@types/node": "^20.11.4",
"@types/wicg-file-system-access": "^2023.10.5",
"@types/ws": "^8.5.10",
"ts-node": "^10.9.2",
"typescript": "~5.4.3",
"vite": "~5.2.6"
"typescript": "~5.4.4",
"vite": "~5.2.8"
},
"dependencies": {
"@codingame/monaco-vscode-accessibility-service-override": "file:../dist/service-override-accessibility",
Expand Down
19 changes: 5 additions & 14 deletions demo/src/features/testing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,20 +266,11 @@ void getApi().then(async api => {
run.appendOutput(`Completed ${test.id}\r\n`)
}

run.coverageProvider = {
provideFileCoverage () {
const coverage: vscode.FileCoverage[] = []
for (const [uri, statements] of coveredLines) {
coverage.push(
api.FileCoverage.fromDetails(
api.Uri.parse(uri),
statements.filter((s): s is vscode.StatementCoverage => s != null)
)
)
}

return coverage
}
for (const [uri, statements] of coveredLines) {
run.addCoverage(api.FileCoverage.fromDetails(
api.Uri.parse(uri),
statements.filter((s): s is vscode.StatementCoverage => s != null)
))
}

run.end()
Expand Down
2 changes: 1 addition & 1 deletion docs/vscode_monaco_upgrade.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
- Wait for the new vscode version to be downloaded and built
- Run `npm run update-vscode-dependencies` to update the vscode dependencies we use to the same versions as VSCode
- Run `npm install` (might need to update/add the npm override for `xterm` in the `package.json` to fix the invalid peer deps)
- Fix errors, adapt code, build, include the `vscode.patch` into this commit
- Fix errors, adapt code, build, include the `vscode-patches` directory into this commit
- Do not hesitate to run the eslint autofix, it gets rid of the majority of your errors
- Implement missing services. This is easily observable seem when running the demo (see next point)
- Update demo
Expand Down
Loading