Skip to content

Commit 7ae2857

Browse files
connor4312connor4312
committed
Merge remote-tracking branch 'origin/main' into pr/r3m0t/166191
2 parents e4d0fee + 387bab6 commit 7ae2857

File tree

816 files changed

+17377
-8853
lines changed

Some content is hidden

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

816 files changed

+17377
-8853
lines changed

‎.github/classifier.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@
7878
"file-watcher": {"assign": ["bpasero"]},
7979
"font-rendering": {"assign": []},
8080
"formatting": {"assign": []},
81+
"getting-started": {"assign": ["bhavyaus"]},
8182
"ghost-text": {"assign": ["hediet"]},
8283
"git": {"assign": ["lszomoru"]},
8384
"gpu": {"assign": ["deepak1556"]},
8485
"grammar": {"assign": ["mjbvz"]},
8586
"grid-view": {"assign": ["joaomoreno"]},
8687
"html": {"assign": ["aeschli"]},
87-
"i18n": {"assign": []},
8888
"icon-brand": {"assign": []},
8989
"icons-product": {"assign": ["daviddossett"]},
9090
"inlay-hints": {"assign": ["jrieken", "hediet"]},

‎.github/workflows/codeql.yml

-48
This file was deleted.

‎.vscode/notebooks/endgame.github-issues

+1-1
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/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n\r\n\r\n$MILESTONE=milestone:\"October 2022\""
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n\n\n$MILESTONE=milestone:\"November 2022\""
1111
},
1212
{
1313
"kind": 1,

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

+1-1
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/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n\r\n\r\n$MILESTONE=milestone:\"October 2022\"\r\n\r\n$MINE=assignee:@me"
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n\n\n$MILESTONE=milestone:\"November 2022\"\n\n$MINE=assignee:@me"
1111
},
1212
{
1313
"kind": 1,

‎.vscode/notebooks/verification.github-issues

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{
1313
"kind": 2,
1414
"language": "github-issues",
15-
"value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n\n$milestone=milestone:\"May 2022\""
15+
"value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n\n$milestone=milestone:\"November 2022\""
1616
},
1717
{
1818
"kind": 1,

‎.vscode/settings.json

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"search.exclude": {
1919
"**/node_modules": true,
2020
"**/bower_components": true,
21+
"cli/target/**": true,
2122
".build/**": true,
2223
"out/**": true,
2324
"out-build/**": true,

‎build/.moduleignore

+5-2
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,11 @@ prebuild-install/**/*
147147
**/*.ts
148148
!typescript/**/*.d.ts
149149

150+
# Exclude TS files that aren't needed by TS extension
151+
typescript/lib/tsc.js
152+
typescript/lib/typescriptServices.js
153+
typescript/lib/tsserverlibrary.js
154+
150155
jschardet/index.js
151156
jschardet/src/**
152157
jschardet/dist/jschardet.js
@@ -167,5 +172,3 @@ xterm-addon-*/src/**
167172
xterm-addon-*/fixtures/**
168173
xterm-addon-*/out/**
169174
xterm-addon-*/out-test/**
170-
171-

‎build/azure-pipelines/cli/prepare.js

+26-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/azure-pipelines/cli/prepare.ts

+25-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as fs from 'fs';
88
import * as path from 'path';
99
import * as packageJson from '../../../package.json';
1010

11-
const root = path.dirname(path.dirname(path.dirname(__dirname)));
11+
const root = process.env.VSCODE_CLI_PREPARE_ROOT || path.dirname(path.dirname(path.dirname(__dirname)));
1212
const readJSON = (path: string) => JSON.parse(fs.readFileSync(path, 'utf8'));
1313

1414
let productJsonPath: string;
@@ -19,8 +19,7 @@ if (isOSS) {
1919
productJsonPath = path.join(root, 'quality', process.env.VSCODE_QUALITY!, 'product.json');
2020
}
2121

22-
23-
console.log('Loading product.json from', productJsonPath);
22+
console.error('Loading product.json from', productJsonPath);
2423
const product = readJSON(productJsonPath);
2524
const allProductsAndQualities = isOSS ? [product] : fs.readdirSync(path.join(root, 'quality'))
2625
.map(quality => ({ quality, json: readJSON(path.join(root, 'quality', quality, 'product.json')) }));
@@ -48,7 +47,10 @@ const setLauncherEnvironmentVars = () => {
4847
['VSCODE_CLI_QUALITY', product.quality],
4948
['VSCODE_CLI_NAME_SHORT', product.nameShort],
5049
['VSCODE_CLI_NAME_LONG', product.nameLong],
50+
['VSCODE_CLI_QUALITYLESS_PRODUCT_NAME', product.nameLong.replace(/ - [a-z]+$/i, '')],
51+
['VSCODE_CLI_DOCUMENTATION_URL', product.documentationUrl],
5152
['VSCODE_CLI_APPLICATION_NAME', product.applicationName],
53+
['VSCODE_CLI_EDITOR_WEB_URL', product.tunnelApplicationConfig?.editorWebUrl],
5254
['VSCODE_CLI_COMMIT', commit],
5355
[
5456
'VSCODE_CLI_WIN32_APP_IDS',
@@ -58,19 +60,34 @@ const setLauncherEnvironmentVars = () => {
5860
.map(([, value]) => String(value).replace(/[{}]/g, ''))),
5961
),
6062
],
63+
[
64+
'VSCODE_CLI_NAME_LONG_MAP',
65+
!isOSS && JSON.stringify(makeQualityMap(json => json.nameLong)),
66+
],
67+
[
68+
'VSCODE_CLI_APPLICATION_NAME_MAP',
69+
!isOSS && JSON.stringify(makeQualityMap(json => json.applicationName)),
70+
],
71+
[
72+
'VSCODE_CLI_SERVER_NAME_MAP',
73+
!isOSS && JSON.stringify(makeQualityMap(json => json.serverApplicationName)),
74+
],
6175
[
6276
'VSCODE_CLI_QUALITY_DOWNLOAD_URIS',
6377
!isOSS && JSON.stringify(makeQualityMap(json => json.downloadUrl)),
6478
],
6579
]);
6680

67-
console.log(JSON.stringify([...vars].reduce((obj, kv) => ({...obj, [kv[0]]: kv[1]}), {})));
68-
69-
for (const [key, value] of vars) {
70-
if (value) {
71-
console.log(`##vso[task.setvariable variable=${key}]${value}`);
81+
if (process.env.VSCODE_CLI_PREPARE_OUTPUT === 'json') {
82+
console.log(JSON.stringify([...vars].filter(([, v]) => !!v)));
83+
} else {
84+
for (const [key, value] of vars) {
85+
if (value) {
86+
console.log(`##vso[task.setvariable variable=${key}]${value}`);
87+
}
7288
}
7389
}
90+
7491
};
7592

7693
if (require.main === module) {

0 commit comments

Comments
 (0)