Skip to content

Commit 4b5db32

Browse files
isidornisidorn
authored
Merge branch 'main' into isidor/courageous-yak
2 parents 6c24374 + ac34ea3 commit 4b5db32

File tree

91 files changed

+2247
-446
lines changed

Some content is hidden

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

91 files changed

+2247
-446
lines changed

‎.vscode/notebooks/endgame.github-issues

Lines changed: 1 addition & 1 deletion
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-copilot repo:microsoft/vscode-copilot-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 repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"June 2023\""
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-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-python-debugger repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"June 2023\""
1111
},
1212
{
1313
"kind": 1,

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

Lines changed: 1 addition & 1 deletion
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-copilot repo:microsoft/vscode-copilot-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 repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"June 2023\"\n\n$MINE=assignee:@me"
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-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-python-debugger repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n repo:microsoft/vscode-remote-tunnels\n\n$MILESTONE=milestone:\"June 2023\"\n\n$MINE=assignee:@me"
1111
},
1212
{
1313
"kind": 1,

‎ThirdPartyNotices.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1895,7 +1895,7 @@ SOFTWARE.
18951895

18961896
---------------------------------------------------------
18971897

1898-
microsoft/vscode-mssql 1.19.0 - MIT
1898+
microsoft/vscode-mssql 1.20.0 - MIT
18991899
https://github.com/microsoft/vscode-mssql
19001900

19011901
------------------------------------------ START OF LICENSE -----------------------------------------

‎build/azure-pipelines/alpine/product-build-alpine.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ steps:
107107
TARGET=$([ "$VSCODE_ARCH" == "x64" ] && echo "linux-alpine" || echo "alpine-arm64")
108108
yarn gulp vscode-reh-$TARGET-min-ci
109109
yarn gulp vscode-reh-web-$TARGET-min-ci
110+
env:
111+
GITHUB_TOKEN: "$(github-distro-mixin-password)"
110112
displayName: Build
111113
112114
- script: |

‎build/gulpfile.reh.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,10 @@ function getNodeChecksum(nodeVersion, platform, arch) {
138138
break;
139139

140140
case 'darwin':
141+
case 'alpine':
141142
case 'linux':
142143
expectedName = `node-v${nodeVersion}-${platform}-${arch}.tar.gz`;
143144
break;
144-
145-
case 'alpine':
146-
expectedName = `${platform}-${arch}/node`;
147-
break;
148145
}
149146

150147
const nodeJsChecksums = fs.readFileSync(path.join(REPO_ROOT, 'build', 'checksums', 'nodejs.txt'), 'utf8');
@@ -157,6 +154,13 @@ function getNodeChecksum(nodeVersion, platform, arch) {
157154
return undefined;
158155
}
159156

157+
function extractAlpinefromDocker(nodeVersion, platform, arch) {
158+
const imageName = arch === 'arm64' ? 'arm64v8/node' : 'node';
159+
log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from docker image ${imageName}`);
160+
const contents = cp.execSync(`docker run --rm ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
161+
return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]);
162+
}
163+
160164
const { nodeVersion, internalNodeVersion } = getNodeVersion();
161165

162166
BUILD_TARGETS.forEach(({ platform, arch }) => {
@@ -219,18 +223,14 @@ function nodejs(platform, arch) {
219223
.pipe(filter('**/node'))
220224
.pipe(util.setExecutableBit('**'))
221225
.pipe(rename('node'));
222-
case 'alpine': {
223-
const imageName = arch === 'arm64' ? 'arm64v8/node' : 'node';
224-
log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from docker image ${imageName}`);
225-
const contents = cp.execSync(`docker run --rm ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
226-
if (checksumSha256) {
227-
const actualSHA256Checksum = crypto.createHash('sha256').update(contents).digest('hex');
228-
if (actualSHA256Checksum !== checksumSha256) {
229-
throw new Error(`Checksum mismatch for node.js from docker image (expected ${options.checksumSha256}, actual ${actualSHA256Checksum}))`);
230-
}
231-
}
232-
return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]);
233-
}
226+
case 'alpine':
227+
return product.nodejsRepository !== 'https://nodejs.org' ?
228+
fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `node-v${nodeVersion}-${platform}-${arch}.tar.gz`, checksumSha256 })
229+
.pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
230+
.pipe(filter('**/node'))
231+
.pipe(util.setExecutableBit('**'))
232+
.pipe(rename('node'))
233+
: extractAlpinefromDocker(nodeVersion, platform, arch);
234234
}
235235
}
236236

‎build/lib/i18n.resources.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,10 @@
525525
{
526526
"name": "vs/workbench/services/issue",
527527
"project": "vscode-workbench"
528+
},
529+
{
530+
"name": "vs/workbench/services/secrets",
531+
"project": "vscode-workbench"
528532
}
529533
]
530534
}

‎build/lib/stylelint/vscode-known-variables.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,7 @@
706706
"--tab-dirty-border-top-color",
707707
"--tabs-border-bottom-color",
708708
"--tab-sizing-current-width",
709+
"--tab-sizing-fixed-min-width",
709710
"--tab-sizing-fixed-max-width",
710711
"--testMessageDecorationFontFamily",
711712
"--testMessageDecorationFontSize",
@@ -747,4 +748,4 @@
747748
"--z-index-run-button-container",
748749
"--zoom-factor"
749750
]
750-
}
751+
}

‎cglicenses.json

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,5 +392,143 @@
392392
"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
393393
"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
394394
]
395+
},
396+
{
397+
"name": "anstyle",
398+
"fullLicenseText": [
399+
"This software is released under the MIT license:",
400+
"",
401+
"Permission is hereby granted, free of charge, to any person obtaining a copy of",
402+
"this software and associated documentation files (the \"Software\"), to deal in",
403+
"the Software without restriction, including without limitation the rights to",
404+
"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
405+
"the Software, and to permit persons to whom the Software is furnished to do so,",
406+
"subject to the following conditions:",
407+
"",
408+
"The above copyright notice and this permission notice shall be included in all",
409+
"copies or substantial portions of the Software.",
410+
"",
411+
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
412+
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
413+
"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
414+
"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
415+
"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
416+
"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
417+
]
418+
},
419+
{
420+
"name": "anstyle-query",
421+
"fullLicenseText": [
422+
"This software is released under the MIT license:",
423+
"",
424+
"Permission is hereby granted, free of charge, to any person obtaining a copy of",
425+
"this software and associated documentation files (the \"Software\"), to deal in",
426+
"the Software without restriction, including without limitation the rights to",
427+
"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
428+
"the Software, and to permit persons to whom the Software is furnished to do so,",
429+
"subject to the following conditions:",
430+
"",
431+
"The above copyright notice and this permission notice shall be included in all",
432+
"copies or substantial portions of the Software.",
433+
"",
434+
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
435+
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
436+
"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
437+
"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
438+
"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
439+
"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
440+
]
441+
},
442+
{
443+
"name": "anstyle-parse",
444+
"fullLicenseText": [
445+
"This software is released under the MIT license:",
446+
"",
447+
"Permission is hereby granted, free of charge, to any person obtaining a copy of",
448+
"this software and associated documentation files (the \"Software\"), to deal in",
449+
"the Software without restriction, including without limitation the rights to",
450+
"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
451+
"the Software, and to permit persons to whom the Software is furnished to do so,",
452+
"subject to the following conditions:",
453+
"",
454+
"The above copyright notice and this permission notice shall be included in all",
455+
"copies or substantial portions of the Software.",
456+
"",
457+
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
458+
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
459+
"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
460+
"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
461+
"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
462+
"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
463+
]
464+
},
465+
{
466+
"name": "anstyle-wincon",
467+
"fullLicenseText": [
468+
"This software is released under the MIT license:",
469+
"",
470+
"Permission is hereby granted, free of charge, to any person obtaining a copy of",
471+
"this software and associated documentation files (the \"Software\"), to deal in",
472+
"the Software without restriction, including without limitation the rights to",
473+
"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
474+
"the Software, and to permit persons to whom the Software is furnished to do so,",
475+
"subject to the following conditions:",
476+
"",
477+
"The above copyright notice and this permission notice shall be included in all",
478+
"copies or substantial portions of the Software.",
479+
"",
480+
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
481+
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
482+
"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
483+
"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
484+
"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
485+
"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
486+
]
487+
},
488+
{
489+
"name": "anstream",
490+
"fullLicenseText": [
491+
"This software is released under the MIT license:",
492+
"",
493+
"Permission is hereby granted, free of charge, to any person obtaining a copy of",
494+
"this software and associated documentation files (the \"Software\"), to deal in",
495+
"the Software without restriction, including without limitation the rights to",
496+
"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
497+
"the Software, and to permit persons to whom the Software is furnished to do so,",
498+
"subject to the following conditions:",
499+
"",
500+
"The above copyright notice and this permission notice shall be included in all",
501+
"copies or substantial portions of the Software.",
502+
"",
503+
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
504+
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
505+
"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
506+
"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
507+
"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
508+
"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
509+
]
510+
},
511+
{
512+
"name": "colorchoice",
513+
"fullLicenseText": [
514+
"This software is released under the MIT license:",
515+
"",
516+
"Permission is hereby granted, free of charge, to any person obtaining a copy of",
517+
"this software and associated documentation files (the \"Software\"), to deal in",
518+
"the Software without restriction, including without limitation the rights to",
519+
"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of",
520+
"the Software, and to permit persons to whom the Software is furnished to do so,",
521+
"subject to the following conditions:",
522+
"",
523+
"The above copyright notice and this permission notice shall be included in all",
524+
"copies or substantial portions of the Software.",
525+
"",
526+
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
527+
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS",
528+
"FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR",
529+
"COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER",
530+
"IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN",
531+
"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
532+
]
395533
}
396534
]

‎extensions/markdown-language-features/package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,12 @@
498498
"%configuration.copyIntoWorkspace.never%"
499499
]
500500
},
501+
"markdown.editor.pasteUrlAsFormattedLink.enabled": {
502+
"type": "boolean",
503+
"scope": "resource",
504+
"markdownDescription": "%configuration.markdown.editor.pasteUrlAsFormattedLink.enabled%",
505+
"default": true
506+
},
501507
"markdown.validate.enabled": {
502508
"type": "boolean",
503509
"scope": "resource",

‎extensions/markdown-language-features/package.nls.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"configuration.markdown.editor.drop.copyIntoWorkspace": "Controls if files outside of the workspace that are dropped into a Markdown editor should be copied into the workspace.\n\nUse `#markdown.copyFiles.destination#` to configure where copied dropped files should be created",
4242
"configuration.markdown.editor.filePaste.enabled": "Enable pasting files into a Markdown editor to create Markdown links. Requires enabling `#editor.pasteAs.enabled#`.",
4343
"configuration.markdown.editor.filePaste.copyIntoWorkspace": "Controls if files outside of the workspace that are pasted into a Markdown editor should be copied into the workspace.\n\nUse `#markdown.copyFiles.destination#` to configure where copied files should be created.",
44+
"configuration.markdown.editor.pasteUrlAsFormattedLink.enabled": "Controls if a Markdown link is created when a URL is pasted into the Markdown editor.",
4445
"configuration.copyIntoWorkspace.mediaFiles": "Try to copy external image and video files into the workspace.",
4546
"configuration.copyIntoWorkspace.never": "Do not copy external files into the workspace.",
4647
"configuration.markdown.validate.enabled.description": "Enable all error reporting in Markdown files.",

0 commit comments

Comments
 (0)