Skip to content

Commit 6d0c807

Browse files
alexdimaalexdima
authored
Merge branch 'main' into hediet/integrated-mule
2 parents 53afa42 + e3cc677 commit 6d0c807

File tree

506 files changed

+12192
-4903
lines changed

Some content is hidden

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

506 files changed

+12192
-4903
lines changed

‎.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
**/extensions/notebook-renderers/renderer-out/index.js
1414
**/extensions/simple-browser/media/index.js
1515
**/extensions/typescript-language-features/test-workspace/**
16+
**/extensions/typescript-language-features/extension.webpack.config.js
17+
**/extensions/typescript-language-features/extension-browser.webpack.config.js
18+
**/extensions/typescript-language-features/web/**
1619
**/extensions/vscode-api-tests/testWorkspace/**
1720
**/extensions/vscode-api-tests/testWorkspace2/**
1821
**/fixtures/**

‎.github/classifier.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
"rename": {"assign": ["jrieken"]},
134134
"scm": {"assign": ["lszomoru"]},
135135
"screencast-mode": {"assign": ["lszomoru"]},
136-
"search": {"assign": ["roblourens", "andreamah"]},
136+
"search": {"assign": ["andreamah"]},
137137
"search-editor": {"assign": ["roblourens"]},
138138
"search-replace": {"assign": ["sandy081"]},
139139
"semantic-tokens": {"assign": ["alexdima", "aeschli"]},

‎.github/workflows/pr-chat.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
displayName: "Azure Key Vault: Get Secrets"
99
inputs:
1010
azureSubscription: "vscode-builds-subscription"
11-
KeyVaultName: vscode
11+
KeyVaultName: vscode-build-secrets
1212
SecretsFilter: "ESRP-PKI,esrp-aad-username,esrp-aad-password"
1313

1414
- task: UseDotNet@2
@@ -20,16 +20,16 @@ steps:
2020
displayName: "Use ESRP client"
2121

2222
- ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}:
23-
- task: DownloadPipelineArtifact@2
24-
displayName: Download artifacts
25-
inputs:
26-
artifact: ${{ target }}
27-
path: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}
23+
- task: DownloadPipelineArtifact@2
24+
displayName: Download artifacts
25+
inputs:
26+
artifact: ${{ target }}
27+
path: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}
2828

29-
- task: ExtractFiles@1
30-
inputs:
31-
archiveFilePatterns: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/*.zip
32-
destinationFolder: $(Build.ArtifactStagingDirectory)/sign/${{ target }}
29+
- task: ExtractFiles@1
30+
inputs:
31+
archiveFilePatterns: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/*.zip
32+
destinationFolder: $(Build.ArtifactStagingDirectory)/sign/${{ target }}
3333

3434
- powershell: |
3535
. build/azure-pipelines/win32/exec.ps1
@@ -49,17 +49,17 @@ steps:
4949
displayName: "Code sign"
5050
5151
- ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}:
52-
- powershell: |
53-
$ASSET_ID = "${{ target }}".replace("unsigned_", "");
54-
echo "##vso[task.setvariable variable=ASSET_ID]$ASSET_ID"
55-
displayName: Set asset id variable
52+
- powershell: |
53+
$ASSET_ID = "${{ target }}".replace("unsigned_", "");
54+
echo "##vso[task.setvariable variable=ASSET_ID]$ASSET_ID"
55+
displayName: Set asset id variable
5656
57-
- task: ArchiveFiles@2
58-
inputs:
59-
rootFolderOrFile: $(Build.ArtifactStagingDirectory)/sign/${{ target }}/code.exe
60-
includeRootFolder: false
61-
archiveType: zip
62-
archiveFile: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip
57+
- task: ArchiveFiles@2
58+
inputs:
59+
rootFolderOrFile: $(Build.ArtifactStagingDirectory)/sign/${{ target }}/code.exe
60+
includeRootFolder: false
61+
archiveType: zip
62+
archiveFile: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip
6363

64-
- publish: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip
65-
artifact: $(ASSET_ID)
64+
- publish: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip
65+
artifact: $(ASSET_ID)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ const setLauncherEnvironmentVars = () => {
4242
['VSCODE_CLI_VERSION', packageJson.version],
4343
['VSCODE_CLI_UPDATE_ENDPOINT', product.updateUrl],
4444
['VSCODE_CLI_QUALITY', product.quality],
45+
['VSCODE_CLI_NAME_SHORT', product.nameShort],
46+
['VSCODE_CLI_NAME_LONG', product.nameLong],
47+
['VSCODE_CLI_APPLICATION_NAME', product.applicationName],
4548
['VSCODE_CLI_COMMIT', commit],
4649
[
4750
'VSCODE_CLI_WIN32_APP_IDS',

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ const setLauncherEnvironmentVars = () => {
4646
['VSCODE_CLI_VERSION', packageJson.version],
4747
['VSCODE_CLI_UPDATE_ENDPOINT', product.updateUrl],
4848
['VSCODE_CLI_QUALITY', product.quality],
49+
['VSCODE_CLI_NAME_SHORT', product.nameShort],
50+
['VSCODE_CLI_NAME_LONG', product.nameLong],
51+
['VSCODE_CLI_APPLICATION_NAME', product.applicationName],
4952
['VSCODE_CLI_COMMIT', commit],
5053
[
5154
'VSCODE_CLI_WIN32_APP_IDS',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ steps:
1313
displayName: "Azure Key Vault: Get Secrets"
1414
inputs:
1515
azureSubscription: "vscode-builds-subscription"
16-
KeyVaultName: vscode
16+
KeyVaultName: vscode-build-secrets
1717
SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
1818

1919
- script: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
displayName: "Azure Key Vault: Get Secrets"
88
inputs:
99
azureSubscription: "vscode-builds-subscription"
10-
KeyVaultName: vscode
10+
KeyVaultName: vscode-build-secrets
1111
SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
1212

1313
- script: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
displayName: "Azure Key Vault: Get Secrets"
88
inputs:
99
azureSubscription: "vscode-builds-subscription"
10-
KeyVaultName: vscode
10+
KeyVaultName: vscode-build-secrets
1111
SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key"
1212

1313
- script: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ steps:
2727
displayName: "Azure Key Vault: Get Secrets"
2828
inputs:
2929
azureSubscription: "vscode-builds-subscription"
30-
KeyVaultName: vscode
30+
KeyVaultName: vscode-build-secrets
3131
SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key"
3232

3333
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ steps:
1515
displayName: "Azure Key Vault: Get Secrets"
1616
inputs:
1717
azureSubscription: "vscode-builds-subscription"
18-
KeyVaultName: vscode
18+
KeyVaultName: vscode-build-secrets
1919
SecretsFilter: "github-distro-mixin-password"
2020

2121
- script: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ steps:
1313
displayName: "Azure Key Vault: Get Secrets"
1414
inputs:
1515
azureSubscription: "vscode-builds-subscription"
16-
KeyVaultName: vscode
16+
KeyVaultName: vscode-build-secrets
1717
SecretsFilter: "github-distro-mixin-password"
1818

1919
- script: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
displayName: "Azure Key Vault: Get Secrets"
88
inputs:
99
azureSubscription: "vscode-builds-subscription"
10-
KeyVaultName: vscode
10+
KeyVaultName: vscode-build-secrets
1111
SecretsFilter: "github-distro-mixin-password"
1212

1313
- task: DownloadPipelineArtifact@2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ steps:
2727
displayName: "Azure Key Vault: Get Secrets"
2828
inputs:
2929
azureSubscription: "vscode-builds-subscription"
30-
KeyVaultName: vscode
30+
KeyVaultName: vscode-build-secrets
3131
SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
3232

3333
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
displayName: "Azure Key Vault: Get Secrets"
1313
inputs:
1414
azureSubscription: "vscode-builds-subscription"
15-
KeyVaultName: vscode
15+
KeyVaultName: vscode-build-secrets
1616
SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
1717

1818
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:

‎build/azure-pipelines/mixin-distro-posix.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,37 @@ parameters:
44

55
steps:
66
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
7-
- task: AzureKeyVault@1
8-
displayName: "Azure Key Vault: Get Secrets"
9-
inputs:
10-
azureSubscription: "vscode-builds-subscription"
11-
KeyVaultName: vscode
12-
SecretsFilter: "github-distro-mixin-password"
7+
- task: AzureKeyVault@1
8+
displayName: "Azure Key Vault: Get Secrets"
9+
inputs:
10+
azureSubscription: "vscode-builds-subscription"
11+
KeyVaultName: vscode-build-secrets
12+
SecretsFilter: "github-distro-mixin-password"
1313

1414
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
15-
- script: |
16-
set -e
17-
cat << EOF > ~/.netrc
18-
machine github.com
19-
login vscode
20-
password $(github-distro-mixin-password)
21-
EOF
15+
- script: |
16+
set -e
17+
cat << EOF > ~/.netrc
18+
machine github.com
19+
login vscode
20+
password $(github-distro-mixin-password)
21+
EOF
2222
23-
git config user.email "[email protected]"
24-
git config user.name "VSCode"
25-
displayName: Prepare tooling
23+
git config user.email "[email protected]"
24+
git config user.name "VSCode"
25+
displayName: Prepare tooling
2626
2727
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
28-
- script: |
29-
set -e
30-
git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
31-
echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
32-
git checkout FETCH_HEAD
33-
condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
34-
displayName: Checkout override commit
28+
- script: |
29+
set -e
30+
git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
31+
echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
32+
git checkout FETCH_HEAD
33+
condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
34+
displayName: Checkout override commit
3535
3636
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
37-
- script: |
38-
set -e
39-
git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
40-
displayName: Merge distro
37+
- script: |
38+
set -e
39+
git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
40+
displayName: Merge distro

‎build/azure-pipelines/mixin-distro-win32.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,37 @@ parameters:
44

55
steps:
66
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
7-
- task: AzureKeyVault@1
8-
displayName: "Azure Key Vault: Get Secrets"
9-
inputs:
10-
azureSubscription: "vscode-builds-subscription"
11-
KeyVaultName: vscode
12-
SecretsFilter: "github-distro-mixin-password"
7+
- task: AzureKeyVault@1
8+
displayName: "Azure Key Vault: Get Secrets"
9+
inputs:
10+
azureSubscription: "vscode-builds-subscription"
11+
KeyVaultName: vscode-build-secrets
12+
SecretsFilter: "github-distro-mixin-password"
1313

1414
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
15-
- powershell: |
16-
. build/azure-pipelines/win32/exec.ps1
17-
$ErrorActionPreference = "Stop"
18-
"machine github.com`nlogin vscode`npassword $(github-distro-mixin-password)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
15+
- powershell: |
16+
. build/azure-pipelines/win32/exec.ps1
17+
$ErrorActionPreference = "Stop"
18+
"machine github.com`nlogin vscode`npassword $(github-distro-mixin-password)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
1919
20-
exec { git config user.email "[email protected]" }
21-
exec { git config user.name "VSCode" }
22-
displayName: Prepare tooling
20+
exec { git config user.email "[email protected]" }
21+
exec { git config user.name "VSCode" }
22+
displayName: Prepare tooling
2323
2424
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
25-
- powershell: |
26-
. build/azure-pipelines/win32/exec.ps1
27-
$ErrorActionPreference = "Stop"
25+
- powershell: |
26+
. build/azure-pipelines/win32/exec.ps1
27+
$ErrorActionPreference = "Stop"
2828
29-
exec { git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $(VSCODE_DISTRO_REF) }
30-
Write-Host "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
31-
exec { git checkout FETCH_HEAD }
32-
condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
33-
displayName: Checkout override commit
29+
exec { git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $(VSCODE_DISTRO_REF) }
30+
Write-Host "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
31+
exec { git checkout FETCH_HEAD }
32+
condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
33+
displayName: Checkout override commit
3434
3535
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
36-
- powershell: |
37-
. build/azure-pipelines/win32/exec.ps1
38-
$ErrorActionPreference = "Stop"
39-
exec { git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") }
40-
displayName: Merge distro
36+
- powershell: |
37+
. build/azure-pipelines/win32/exec.ps1
38+
$ErrorActionPreference = "Stop"
39+
exec { git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") }
40+
displayName: Merge distro

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
displayName: "Azure Key Vault: Get Secrets"
88
inputs:
99
azureSubscription: "vscode-builds-subscription"
10-
KeyVaultName: vscode
10+
KeyVaultName: vscode-build-secrets
1111
SecretsFilter: "github-distro-mixin-password"
1212

1313
# allow-any-unicode-next-line

‎build/azure-pipelines/sdl-scan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ stages:
5353
displayName: "Azure Key Vault: Get Secrets"
5454
inputs:
5555
azureSubscription: "vscode-builds-subscription"
56-
KeyVaultName: vscode
56+
KeyVaultName: vscode-build-secrets
5757
SecretsFilter: "github-distro-mixin-password"
5858

5959
- powershell: |
@@ -167,7 +167,7 @@ stages:
167167
displayName: "Azure Key Vault: Get Secrets"
168168
inputs:
169169
azureSubscription: "vscode-builds-subscription"
170-
KeyVaultName: vscode
170+
KeyVaultName: vscode-build-secrets
171171
SecretsFilter: "github-distro-mixin-password"
172172

173173
- script: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
displayName: "Azure Key Vault: Get Secrets"
88
inputs:
99
azureSubscription: "vscode-builds-subscription"
10-
KeyVaultName: vscode
10+
KeyVaultName: vscode-build-secrets
1111
SecretsFilter: "github-distro-mixin-password"
1212

1313
- task: DownloadPipelineArtifact@2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ steps:
3232
displayName: "Azure Key Vault: Get Secrets"
3333
inputs:
3434
azureSubscription: "vscode-builds-subscription"
35-
KeyVaultName: vscode
35+
KeyVaultName: vscode-build-secrets
3636
SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
3737

3838
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:

‎build/gulpfile.extensions.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ const compilations = [
6464
'references-view/tsconfig.json',
6565
'simple-browser/tsconfig.json',
6666
'typescript-language-features/test-workspace/tsconfig.json',
67+
'typescript-language-features/web/tsconfig.json',
6768
'typescript-language-features/tsconfig.json',
6869
'vscode-api-tests/tsconfig.json',
6970
'vscode-colorize-tests/tsconfig.json',

0 commit comments

Comments
 (0)