Skip to content

Commit 6ec670a

Browse files
Rebase against the upstream 356d9f0
vscode-upstream-sha1: 356d9f0
2 parents fdd8874 + 356d9f0 commit 6ec670a

8,512 files changed

Lines changed: 1919839 additions & 86674 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.rebase/override/code/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"@vscode/l10n-dev": "0.0.18",
66
"@vscode/test-cli": "^0.0.12",
77
"@vscode/test-web": "^0.0.77",
8-
"eslint": "^9.39.3"
8+
"eslint": "^9.39.3",
9+
"tar": "^7.5.11"
910
}
1011
}

code/.agents/skills/launch/SKILL.md

Lines changed: 374 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"features": {
3-
"ghcr.io/devcontainers/features/desktop-lite:1": {
4-
"version": "1.0.8",
5-
"resolved": "ghcr.io/devcontainers/features/desktop-lite@sha256:e7dc4d37ab9e3d6e7ebb221bac741f5bfe07dae47025399d038b17af2ed8ddb7",
6-
"integrity": "sha256:e7dc4d37ab9e3d6e7ebb221bac741f5bfe07dae47025399d038b17af2ed8ddb7"
3+
"ghcr.io/devcontainers/features/desktop-lite:": {
4+
"version": "1.2.8",
5+
"resolved": "ghcr.io/devcontainers/features/desktop-lite@sha256:14ac23fd59afab939e6562ba6a1f42a659a805e4c574a1be23b06f28eb3b0b71",
6+
"integrity": "sha256:14ac23fd59afab939e6562ba6a1f42a659a805e4c574a1be23b06f28eb3b0b71"
77
},
8-
"ghcr.io/devcontainers/features/rust:1": {
9-
"version": "1.3.3",
10-
"resolved": "ghcr.io/devcontainers/features/rust@sha256:2521a8eeb4911bfcb22557c8394870ea22eb790d8e52219ddc5182f62d388995",
11-
"integrity": "sha256:2521a8eeb4911bfcb22557c8394870ea22eb790d8e52219ddc5182f62d388995"
8+
"ghcr.io/devcontainers/features/rust:": {
9+
"version": "1.5.0",
10+
"resolved": "ghcr.io/devcontainers/features/rust@sha256:0c55e65f2e3df736e478f26ee4d5ed41bae6b54dac1318c443e31444c8ed283c",
11+
"integrity": "sha256:0c55e65f2e3df736e478f26ee4d5ed41bae6b54dac1318c443e31444c8ed283c"
1212
}
1313
}
1414
}

code/.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"dockerfile": "Dockerfile"
55
},
66
"features": {
7-
"ghcr.io/devcontainers/features/desktop-lite:1": {},
8-
"ghcr.io/devcontainers/features/rust:1": {}
7+
"ghcr.io/devcontainers/features/desktop-lite:": {},
8+
"ghcr.io/devcontainers/features/rust:": {}
99
},
1010
"containerEnv": {
1111
"DISPLAY": "" // Allow the Dev Containers extension to set DISPLAY, post-create.sh will add it back in ~/.bashrc and ~/.zshrc if not set.

code/.eslint-ignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
**/extensions/**/*.d.ts
44
**/extensions/**/build/**
55
**/extensions/**/colorize-fixtures/**
6+
**/extensions/copilot/**
67
**/extensions/css-language-features/server/test/pathCompletionFixtures/**
78
**/extensions/html-language-features/server/lib/jquery.d.ts
89
**/extensions/html-language-features/server/src/test/pathCompletionFixtures/**
@@ -18,8 +19,6 @@
1819
**/extensions/terminal-suggest/src/shell/fishBuiltinsCache.ts
1920
**/extensions/terminal-suggest/third_party/**
2021
**/extensions/typescript-language-features/test-workspace/**
21-
**/extensions/typescript-language-features/extension.webpack.config.js
22-
**/extensions/typescript-language-features/extension-browser.webpack.config.js
2322
**/extensions/typescript-language-features/package-manager/node-maintainer/**
2423
**/extensions/vscode-api-tests/testWorkspace/**
2524
**/extensions/vscode-api-tests/testWorkspace2/**
@@ -33,7 +32,6 @@
3332
**/src/typings/**/*.d.ts
3433
**/src/vs/*/**/*.d.ts
3534
**/src/vs/base/test/common/filters.perf.data.js
36-
**/src/vs/loader.js
3735
**/test/unit/assert.js
3836
**/test/automation/out/**
3937
**/typings/**

0 commit comments

Comments
 (0)