Skip to content

Commit 1e8eb7f

Browse files
RomanNikitenkoRomanNikitenko
committed
Rebase against the upstream 85460c3
vscode-upstream-sha1: 85460c3
2 parents 3cacc47 + 85460c3 commit 1e8eb7f

499 files changed

Lines changed: 28578 additions & 5925 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.

‎code/.eslint-ignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
**/extensions/notebook-renderers/renderer-out/index.js
1414
**/extensions/simple-browser/media/index.js
1515
**/extensions/terminal-suggest/src/completions/upstream/**
16+
**/extensions/terminal-suggest/src/shell/zshBuiltinsCache.ts
1617
**/extensions/terminal-suggest/third_party/**
1718
**/extensions/typescript-language-features/test-workspace/**
1819
**/extensions/typescript-language-features/extension.webpack.config.js

‎code/.github/workflows/telemetry.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
node-version: 'lts/*'
1515

1616
- name: 'Run vscode-telemetry-extractor'
17-
run: 'npx --package=@vscode/telemetry-extractor --yes vscode-telemetry-extractor -s .'
17+
run: 'npx --package=@vscode/telemetry-extractor@1.14.0 --yes vscode-telemetry-extractor -s .'
1818
env:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎code/.vscode-test.js‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const { defineConfig } = require('@vscode/test-cli');
1919
* A list of extension folders who have opted into tests, or configuration objects.
2020
* Edit me to add more!
2121
*
22-
* @type {Array<string | (Partial<import("@vscode/test-cli").TestConfiguration> & { label: string })>}
22+
* @type {Array<Partial<import("@vscode/test-cli").TestConfiguration> & { label: string }>}
2323
*/
2424
const extensions = [
2525
{
@@ -65,6 +65,20 @@ const extensions = [
6565
{
6666
label: 'microsoft-authentication',
6767
mocha: { timeout: 60_000 }
68+
},
69+
{
70+
label: 'vscode-api-tests-folder',
71+
extensionDevelopmentPath: `extensions/vscode-api-tests`,
72+
workspaceFolder: `extensions/vscode-api-tests/testWorkspace`,
73+
mocha: { timeout: 60_000 },
74+
files: 'extensions/vscode-api-tests/out/singlefolder-tests/**/*.test.js',
75+
},
76+
{
77+
label: 'vscode-api-tests-workspace',
78+
extensionDevelopmentPath: `extensions/vscode-api-tests`,
79+
workspaceFolder: `extensions/vscode-api-tests/testworkspace.code-workspace`,
80+
mocha: { timeout: 60_000 },
81+
files: 'extensions/vscode-api-tests/out/workspace-tests/**/*.test.js',
6882
}
6983
];
7084

@@ -75,9 +89,12 @@ const defaultLaunchArgs = process.env.API_TESTS_EXTRA_ARGS?.split(' ') || [
7589

7690
const config = defineConfig(extensions.map(extension => {
7791
/** @type {import('@vscode/test-cli').TestConfiguration} */
78-
const config = typeof extension === 'object'
79-
? { files: `extensions/${extension.label}/out/**/*.test.js`, ...extension }
80-
: { files: `extensions/${extension}/out/**/*.test.js`, label: extension };
92+
const config = {
93+
platform: 'desktop',
94+
files: `extensions/${extension.label}/out/**/*.test.js`,
95+
extensionDevelopmentPath: `extensions/${extension.label}`,
96+
...extension,
97+
};
8198

8299
config.mocha ??= {};
83100
if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {

‎code/.vscode/notebooks/endgame.github-issues‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"February 2025\""
10+
"value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\r\n\r\n$MILESTONE=milestone:\"February 2025\""
1111
},
1212
{
1313
"kind": 1,
@@ -97,7 +97,7 @@
9797
{
9898
"kind": 2,
9999
"language": "github-issues",
100-
"value": "$REPOS $MILESTONE is:issue is:closed reason:completed label:verification-needed -label:verified"
100+
"value": "$REPOS $MILESTONE is:issue is:closed reason:completed label:verification-needed -label:verified -label:on-testplan"
101101
},
102102
{
103103
"kind": 1,

‎code/.vscode/notebooks/my-endgame.github-issues‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
{
6363
"kind": 2,
6464
"language": "github-issues",
65-
"value": "$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request label:verification-needed -label:verified"
65+
"value": "$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request label:verification-needed -label:verified -label:on-testplan"
6666
},
6767
{
6868
"kind": 1,
@@ -87,7 +87,7 @@
8787
{
8888
"kind": 2,
8989
"language": "github-issues",
90-
"value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed -assignee:@me -label:verified -label:z-author-verified label:feature-request label:verification-needed -label:verification-steps-needed -label:unreleased"
90+
"value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed -assignee:@me -label:verified -label:z-author-verified label:feature-request label:verification-needed -label:verification-steps-needed -label:unreleased -label:on-testplan"
9191
},
9292
{
9393
"kind": 1,

0 commit comments

Comments
 (0)