Skip to content

Commit 6e79a73

Browse files
justschenjustschen
authored
Merge branch 'main' into justin/hitmonchan
2 parents ddedba2 + 8ef2f68 commit 6e79a73

File tree

239 files changed

+5604
-1853
lines changed

Some content is hidden

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

239 files changed

+5604
-1853
lines changed

‎.vscode/settings.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -177,5 +177,6 @@
177177
"*": "error",
178178
"ts": "warning",
179179
"eslint": "warning"
180-
}
180+
},
181+
"editor.experimental.preferTreeSitter.typescript": true
181182
}

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

-16
Original file line numberDiff line numberDiff line change
@@ -119,22 +119,6 @@ steps:
119119
ArtifactServices.Symbol.UseAAD: false
120120
displayName: Publish Symbols
121121

122-
- task: CopyFiles@2
123-
inputs:
124-
SourceFolder: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release
125-
Contents: 'code.*'
126-
TargetFolder: $(Agent.TempDirectory)/binskim-cli
127-
displayName: Copy files for BinSkim
128-
129-
- task: BinSkim@4
130-
inputs:
131-
InputType: Basic
132-
Function: analyze
133-
TargetPattern: guardianGlob
134-
AnalyzeTargetGlob: $(Agent.TempDirectory)/binskim-cli/*.*
135-
AnalyzeSymPath: $(Agent.TempDirectory)/binskim-cli
136-
displayName: Run BinSkim
137-
138122
- powershell: |
139123
. build/azure-pipelines/win32/exec.ps1
140124
$ErrorActionPreference = "Stop"

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ extends:
169169
tsa:
170170
enabled: true
171171
configFile: $(Build.SourcesDirectory)/build/azure-pipelines/config/tsaoptions.json
172+
binskim:
173+
analyzeTargetGlob: '+:file|$(Agent.BuildDirectory)/VSCode-*/**/*.exe;+:file|$(Agent.BuildDirectory)/VSCode-*/**/*.node;+:file|$(Agent.BuildDirectory)/VSCode-*/**/*.dll;-:file|**/VSCodeSetup*.exe'
172174
codeql:
173175
runSourceLanguagesInSourceAnalysis: true
174176
compiled:
@@ -316,13 +318,13 @@ extends:
316318
VSCODE_BUILD_WIN32_ARM64: ${{ parameters.VSCODE_BUILD_WIN32_ARM64 }}
317319

318320
- ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_COMPILE_ONLY, false)) }}:
319-
- stage: CustomSDL
321+
- stage: APIScan
320322
dependsOn: []
321323
pool:
322324
name: 1es-windows-2019-x64
323325
os: windows
324326
jobs:
325-
- job: WindowsSDL
327+
- job: WindowsAPIScan
326328
steps:
327329
- template: build/azure-pipelines/win32/sdl-scan-win32.yml@self
328330
parameters:

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ steps:
145145
exec { npm run gulp "vscode-win32-$(VSCODE_ARCH)-min-ci" }
146146
exec { npm run gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
147147
echo "##vso[task.setvariable variable=BUILT_CLIENT]true"
148-
echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)"
148+
echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(Agent.BuildDirectory)/VSCode-win32-$(VSCODE_ARCH)"
149149
env:
150150
GITHUB_TOKEN: "$(github-distro-mixin-password)"
151151
displayName: Build client
@@ -156,7 +156,7 @@ steps:
156156
exec { npm run gulp "vscode-reh-win32-$(VSCODE_ARCH)-min-ci" }
157157
mv ..\vscode-reh-win32-$(VSCODE_ARCH) ..\vscode-server-win32-$(VSCODE_ARCH) # TODO@joaomoreno
158158
echo "##vso[task.setvariable variable=BUILT_SERVER]true"
159-
echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(CodeSigningFolderPath),$(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)"
159+
echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(CodeSigningFolderPath),$(Agent.BuildDirectory)/vscode-server-win32-$(VSCODE_ARCH)"
160160
env:
161161
GITHUB_TOKEN: "$(github-distro-mixin-password)"
162162
displayName: Build server
@@ -196,10 +196,10 @@ steps:
196196
$ErrorActionPreference = "Stop"
197197
$ArtifactName = (gci -Path "$(Build.ArtifactStagingDirectory)/cli" | Select-Object -last 1).FullName
198198
Expand-Archive -Path $ArtifactName -DestinationPath "$(Build.ArtifactStagingDirectory)/cli"
199-
$AppProductJson = Get-Content -Raw -Path "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)\resources\app\product.json" | ConvertFrom-Json
199+
$AppProductJson = Get-Content -Raw -Path "$(Agent.BuildDirectory)\VSCode-win32-$(VSCODE_ARCH)\resources\app\product.json" | ConvertFrom-Json
200200
$CliAppName = $AppProductJson.tunnelApplicationName
201201
$AppName = $AppProductJson.applicationName
202-
Move-Item -Path "$(Build.ArtifactStagingDirectory)/cli/$AppName.exe" -Destination "$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)/bin/$CliAppName.exe"
202+
Move-Item -Path "$(Build.ArtifactStagingDirectory)/cli/$AppName.exe" -Destination "$(Agent.BuildDirectory)/VSCode-win32-$(VSCODE_ARCH)/bin/$CliAppName.exe"
203203
displayName: Move VS Code CLI
204204
205205
- task: UseDotNet@2

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

+1-30
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,6 @@ steps:
102102
- powershell: npm run compile
103103
displayName: Compile
104104

105-
- powershell: |
106-
Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.exe"
107-
Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.dll"
108-
Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.node"
109-
Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.pdb"
110-
displayName: List files
111-
112105
- powershell: npm run gulp "vscode-symbols-win32-${{ parameters.VSCODE_ARCH }}"
113106
env:
114107
GITHUB_TOKEN: "$(github-distro-mixin-password)"
@@ -119,16 +112,7 @@ steps:
119112
Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.dll"
120113
Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.node"
121114
Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.pdb"
122-
displayName: List files again
123-
124-
- task: BinSkim@4
125-
inputs:
126-
InputType: "Basic"
127-
Function: "analyze"
128-
TargetPattern: "guardianGlob"
129-
AnalyzeIgnorePdbLoadError: true
130-
AnalyzeTargetGlob: '$(Agent.BuildDirectory)\scanbin\**.dll;$(Agent.BuildDirectory)\scanbin\**.exe;$(Agent.BuildDirectory)\scanbin\**.node'
131-
AnalyzeLocalSymbolDirectories: '$(Agent.BuildDirectory)\scanbin\VSCode-win32-${{ parameters.VSCODE_ARCH }}\pdb'
115+
displayName: List files
132116
133117
- task: CopyFiles@2
134118
displayName: 'Collect Symbols for API Scan'
@@ -139,19 +123,6 @@ steps:
139123
flattenFolders: true
140124
condition: succeeded()
141125

142-
- task: PublishSymbols@2
143-
inputs:
144-
IndexSources: false
145-
SymbolsFolder: '$(Agent.BuildDirectory)\symbols'
146-
SearchPattern: '**\*.pdb'
147-
SymbolServerType: TeamServices
148-
SymbolsProduct: 'code'
149-
ArtifactServices.Symbol.AccountName: microsoft
150-
ArtifactServices.Symbol.PAT: $(System.AccessToken)
151-
ArtifactServices.Symbol.UseAAD: false
152-
displayName: Publish Symbols
153-
condition: succeeded()
154-
155126
- task: APIScan@2
156127
inputs:
157128
softwareFolder: $(Agent.BuildDirectory)\scanbin

‎build/lib/layersChecker.js

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

‎build/lib/layersChecker.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ const CORE_TYPES = [
8080

8181
// webcrypto has been available since Node.js 19, but still live in dom.d.ts
8282
'Crypto',
83-
'SubtleCrypto'
83+
'SubtleCrypto',
84+
'JsonWebKey',
8485
];
8586

8687
// Types that are defined in a common layer but are known to be only

‎build/lib/propertyInitOrderChecker.js

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

‎build/lib/propertyInitOrderChecker.ts

-5
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,12 @@ const ignored = new Set([
5656
'vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.ts',
5757
'vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts',
5858
'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts',
59-
'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts',
60-
'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.ts',
6159
'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts',
62-
'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.ts',
63-
'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.ts',
6460
'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.ts',
6561
'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.ts',
6662
'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.ts',
6763
'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/originalEditorInlineDiffView.ts',
6864
'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts',
69-
'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts',
7065
'vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts',
7166
'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts',
7267
'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts',

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

+2
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@
232232
"--vscode-editorGutter-commentGlyphForeground",
233233
"--vscode-editorGutter-commentRangeForeground",
234234
"--vscode-editorGutter-commentUnresolvedGlyphForeground",
235+
"--vscode-editorGutter-itemGlyphForeground",
236+
"--vscode-editorGutter-itemBackground",
235237
"--vscode-editorGutter-deletedBackground",
236238
"--vscode-editorGutter-foldingControlForeground",
237239
"--vscode-editorGutter-modifiedBackground",

‎build/win32/Cargo.lock

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

‎build/win32/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "inno_updater"
3-
version = "0.12.1"
3+
version = "0.13.2"
44
authors = ["Microsoft <monacotools@microsoft.com>"]
55
build = "build.rs"
66

‎build/win32/inno_updater.exe

2 KB
Binary file not shown.

‎extensions/git/src/decorators.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,4 @@ export function debounce(delay: number): Function {
9898
this[timerKey] = setTimeout(() => fn.apply(this, args), delay);
9999
};
100100
});
101-
}
101+
}

‎extensions/markdown-language-features/preview-src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ onceDocumentLoaded(() => {
6868
getRawData('data-initial-md-content'),
6969
'text/html'
7070
);
71-
document.body.appendChild(markDownHtml.body);
71+
document.body.append(...markDownHtml.body.children);
7272

7373
// Restore
7474
const scrollProgress = state.scrollProgress;

‎package-lock.json

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

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"@types/semver": "^7.5.8",
7676
"@vscode/deviceid": "^0.1.1",
7777
"@vscode/iconv-lite-umd": "0.7.0",
78-
"@vscode/policy-watcher": "^1.2.0",
78+
"@vscode/policy-watcher": "^1.2.1",
7979
"@vscode/proxy-agent": "^0.32.0",
8080
"@vscode/ripgrep": "^1.15.11",
8181
"@vscode/spdlog": "^0.15.0",
@@ -104,7 +104,7 @@
104104
"native-is-elevated": "0.7.0",
105105
"native-keymap": "^3.3.5",
106106
"native-watchdog": "^1.4.1",
107-
"node-pty": "1.1.0-beta30",
107+
"node-pty": "1.1.0-beta31",
108108
"open": "^8.4.2",
109109
"tas-client-umd": "0.2.0",
110110
"v8-inspect-profiler": "^0.1.1",

‎remote/package-lock.json

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

‎remote/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"kerberos": "2.1.1",
3333
"minimist": "^1.2.6",
3434
"native-watchdog": "^1.4.1",
35-
"node-pty": "1.1.0-beta30",
35+
"node-pty": "1.1.0-beta31",
3636
"tas-client-umd": "0.2.0",
3737
"vscode-oniguruma": "1.7.0",
3838
"vscode-regexpp": "^3.1.0",

‎src/vs/base/browser/ui/dialog/dialog.css

+4
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@
7171
white-space: normal;
7272
}
7373

74+
.monaco-dialog-box .dialog-message-row .dialog-message-container ul {
75+
padding-inline-start: 20px; /* reduce excessive indent of list items in the dialog */
76+
}
77+
7478
/** Dialog: Message */
7579
.monaco-dialog-box .dialog-message-row .dialog-message-container .dialog-message {
7680
line-height: 22px;

0 commit comments

Comments
 (0)