Skip to content
This repository was archived by the owner on Jan 26, 2024. It is now read-only.

Commit 8b33586

Browse files
enginelessccenginelesscc
committed
Merge remote-tracking branch 'upstream/main'
2 parents 93c2ff6 + 764bcce commit 8b33586

File tree

402 files changed

+11608
-4601
lines changed

Some content is hidden

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

402 files changed

+11608
-4601
lines changed

‎.eslintrc.json

+40-2
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,8 @@
428428
"vs/workbench/api/~",
429429
"vs/workbench/~",
430430
"vs/workbench/services/*/~",
431-
"vs/workbench/contrib/*/~"
431+
"vs/workbench/contrib/*/~",
432+
"vs/workbench/contrib/terminalContrib/*/~"
432433
]
433434
},
434435
{
@@ -476,6 +477,35 @@
476477
} // node module allowed even in /browser/
477478
]
478479
},
480+
{
481+
"target": "src/vs/workbench/contrib/terminalContrib/*/~",
482+
"restrictions": [
483+
"vs/base/~",
484+
"vs/base/parts/*/~",
485+
"vs/platform/*/~",
486+
"vs/editor/~",
487+
"vs/editor/contrib/*/~",
488+
"vs/workbench/~",
489+
"vs/workbench/services/*/~",
490+
"vs/workbench/contrib/*/~",
491+
// Only allow terminalContrib to import from itself, this works because
492+
// terminalContrib is one extra folder deep
493+
"vs/workbench/contrib/terminalContrib/*/~",
494+
"vscode-notebook-renderer", // Type only import
495+
{
496+
"when": "hasBrowser",
497+
"pattern": "xterm"
498+
}, // node module allowed even in /browser/
499+
{
500+
"when": "hasBrowser",
501+
"pattern": "xterm-addon-*"
502+
}, // node module allowed even in /browser/
503+
{
504+
"when": "hasBrowser",
505+
"pattern": "vscode-textmate"
506+
} // node module allowed even in /browser/
507+
]
508+
},
479509
{
480510
"target": "src/vs/code/~",
481511
"restrictions": [
@@ -512,6 +542,13 @@
512542
"vs/server/~"
513543
]
514544
},
545+
{
546+
"target": "src/vs/workbench/contrib/terminal/terminal.all.ts",
547+
"layer": "browser",
548+
"restrictions": [
549+
"vs/workbench/contrib/**"
550+
]
551+
},
515552
{
516553
"target": "src/vs/workbench/workbench.common.main.ts",
517554
"layer": "browser",
@@ -525,7 +562,8 @@
525562
"vs/workbench/~",
526563
"vs/workbench/api/~",
527564
"vs/workbench/services/*/~",
528-
"vs/workbench/contrib/*/~"
565+
"vs/workbench/contrib/*/~",
566+
"vs/workbench/contrib/terminal/terminal.all"
529567
]
530568
},
531569
{

‎.github/classifier.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"editor-bracket-matching": {"assign": ["hediet"]},
4141
"editor-clipboard": {"assign": ["alexdima", "rebornix"]},
4242
"editor-code-actions": {"assign": ["mjbvz"]},
43-
"editor-color-picker": {"assign": ["rebornix"]},
43+
"editor-color-picker": {"assign": ["aiday-mar"]},
4444
"editor-columnselect": {"assign": ["alexdima"]},
4545
"editor-commands": {"assign": ["alexdima"]},
4646
"editor-comments": {"assign": ["alexdima"]},
@@ -51,7 +51,7 @@
5151
"editor-find": {"assign": ["rebornix"]},
5252
"editor-folding": {"assign": ["aeschli"]},
5353
"editor-highlight": {"assign": ["alexdima"]},
54-
"editor-hover": {"assign": ["alexdima"]},
54+
"editor-hover": {"assign": ["aiday-mar"]},
5555
"editor-indent-detection": {"assign": ["alexdima"]},
5656
"editor-indent-guides": {"assign": ["hediet"]},
5757
"editor-input": {"assign": ["alexdima"]},
@@ -65,7 +65,7 @@
6565
"editor-RTL": {"assign": ["alexdima"]},
6666
"editor-scrollbar": {"assign": ["alexdima"]},
6767
"editor-sorting": {"assign": ["alexdima"]},
68-
"editor-sticky-scroll": {"assign": ["jrieken"]},
68+
"editor-sticky-scroll": {"assign": ["aiday-mar"]},
6969
"editor-symbols": {"assign": ["jrieken"]},
7070
"editor-synced-region": {"assign": ["aeschli"]},
7171
"editor-textbuffer": {"assign": ["alexdima", "rebornix"]},
@@ -114,6 +114,7 @@
114114
"issue-reporter": {"assign": ["TylerLeonhardt"]},
115115
"javascript": {"assign": ["mjbvz"]},
116116
"json": {"assign": ["aeschli"]},
117+
"json-sorting": {"assign": ["aiday-mar"]},
117118
"keybindings": {"assign": ["alexdima"]},
118119
"keybindings-editor": {"assign": ["sandy081"]},
119120
"keyboard-layout": {"assign": ["alexdima"]},

‎.vscode/notebooks/api.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": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"February 2023\""
10+
"value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"March 2023\""
1111
},
1212
{
1313
"kind": 1,

‎build/azure-pipelines/darwin/cli-build-darwin.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ steps:
1313
displayName: Download openssl prebuilt
1414
inputs:
1515
command: custom
16-
customCommand: pack @vscode-internal/[email protected].3
16+
customCommand: pack @vscode-internal/[email protected].5
1717
customRegistry: useFeed
1818
customFeed: 'Monaco/openssl-prebuilt'
1919
workingDir: $(Build.ArtifactStagingDirectory)
2020

2121
- script: |
2222
set -e
2323
mkdir $(Build.ArtifactStagingDirectory)/openssl
24-
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.3.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
24+
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
2525
displayName: Extract openssl prebuilt
2626
2727
- task: NodeTool@0
@@ -53,14 +53,14 @@ steps:
5353
VSCODE_CLI_TARGET: x86_64-apple-darwin
5454
VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_darwin_x64_cli
5555
VSCODE_CLI_ENV:
56-
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/lib
57-
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/include
56+
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/lib
57+
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/include
5858

5959
- ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}:
6060
- template: ../cli/cli-compile-and-publish.yml
6161
parameters:
6262
VSCODE_CLI_TARGET: aarch64-apple-darwin
6363
VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_darwin_arm64_cli
6464
VSCODE_CLI_ENV:
65-
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/lib
66-
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/include
65+
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/lib
66+
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/include

‎build/azure-pipelines/linux/cli-build-linux.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@ steps:
2222
displayName: Download openssl prebuilt
2323
inputs:
2424
command: custom
25-
customCommand: pack @vscode-internal/[email protected].3
25+
customCommand: pack @vscode-internal/[email protected].5
2626
customRegistry: useFeed
2727
customFeed: 'Monaco/openssl-prebuilt'
2828
workingDir: $(Build.ArtifactStagingDirectory)
2929

3030
- script: |
3131
set -e
3232
mkdir $(Build.ArtifactStagingDirectory)/openssl
33-
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.3.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
33+
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
3434
displayName: Extract openssl prebuilt
3535
3636
# inspired by: https://github.com/emk/rust-musl-builder/blob/main/Dockerfile
3737
- ${{ if or(eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true), eq(parameters.VSCODE_BUILD_ALPINE, true)) }}:
3838
- bash: |
3939
set -e
4040
sudo apt-get update
41-
sudo apt-get install -yq build-essential musl-dev musl-tools linux-libc-dev pkgconf xutils-dev
41+
sudo apt-get install -yq build-essential musl-dev musl-tools linux-libc-dev pkgconf xutils-dev lld
4242
sudo ln -s "/usr/bin/g++" "/usr/bin/musl-g++" || echo "link exists"
4343
displayName: Install musl build dependencies
4444
@@ -91,8 +91,9 @@ steps:
9191
VSCODE_CLI_ENV:
9292
CXX_aarch64-unknown-linux-musl: musl-g++
9393
CC_aarch64-unknown-linux-musl: musl-gcc
94-
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/lib
95-
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/include
94+
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux-musl/lib
95+
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux-musl/include
96+
OPENSSL_STATIC: '1'
9697

9798
- ${{ if eq(parameters.VSCODE_BUILD_ALPINE, true) }}:
9899
- template: ../cli/cli-compile-and-publish.yml
@@ -102,8 +103,9 @@ steps:
102103
VSCODE_CLI_ENV:
103104
CXX_aarch64-unknown-linux-musl: musl-g++
104105
CC_aarch64-unknown-linux-musl: musl-gcc
105-
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/lib
106-
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/include
106+
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux-musl/lib
107+
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux-musl/include
108+
OPENSSL_STATIC: '1'
107109

108110
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
109111
- template: ../cli/cli-compile-and-publish.yml

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

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ schedules:
66
branches:
77
include:
88
- main
9-
- joao/web
109

1110
trigger:
1211
branches:

‎build/azure-pipelines/win32/cli-build-win32.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ steps:
1616
displayName: Download openssl prebuilt
1717
inputs:
1818
command: custom
19-
customCommand: pack @vscode-internal/[email protected].3
19+
customCommand: pack @vscode-internal/[email protected].5
2020
customRegistry: useFeed
2121
customFeed: 'Monaco/openssl-prebuilt'
2222
workingDir: $(Build.ArtifactStagingDirectory)
2323

2424
- powershell: |
2525
mkdir $(Build.ArtifactStagingDirectory)/openssl
26-
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.3.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
26+
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
2727
displayName: Extract openssl prebuilt
2828
2929
- task: NodeTool@0

0 commit comments

Comments
 (0)