Skip to content

Commit f15e622

Browse files
SublimefulSublimeful
authored
Merge branch 'main' into main
2 parents f8cc13b + 177a6ea commit f15e622

File tree

335 files changed

+2754
-4340
lines changed

Some content is hidden

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

335 files changed

+2754
-4340
lines changed

‎.devcontainer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Next, let's try debugging.
9999

100100
2. Go to your local VS Code client, and use the **Run / Debug** view to launch the **VS Code** configuration. (Typically the default, so you can likely just press <kbd>F5</kbd>).
101101

102-
> **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../../.vscode/launch.json). However, running `./scripts/code.sh` first will set up Electron which will usually solve timeout issues.
102+
> **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../.vscode/launch.json). However, running `./scripts/code.sh` first will set up Electron which will usually solve timeout issues.
103103
104104
3. After a bit, Code - OSS will appear with the debugger attached!
105105

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ extends:
337337
- ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
338338
- CompileCLI
339339
pool:
340-
name: 1es-windows-2019-x64
340+
name: 1es-windows-2022-x64
341341
os: windows
342342
jobs:
343343
- ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:

‎build/lib/layersChecker.js renamed to ‎build/checker/layersChecker.js

Lines changed: 2 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/lib/layersChecker.ts renamed to ‎build/checker/layersChecker.ts

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -172,22 +172,6 @@ const RULES: IRule[] = [
172172
]
173173
},
174174

175-
// Common: vs/workbench/api/common/extHostExtensionService.ts
176-
{
177-
target: '**/vs/workbench/api/common/extHostExtensionService.ts',
178-
allowedTypes: [
179-
...CORE_TYPES,
180-
181-
// Safe access to global
182-
'global'
183-
],
184-
disallowedTypes: NATIVE_TYPES,
185-
disallowedDefinitions: [
186-
'lib.dom.d.ts', // no DOM
187-
'@types/node' // no node.js
188-
]
189-
},
190-
191175
// Common: vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts
192176
{
193177
target: '**/vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts',
@@ -229,16 +213,6 @@ const RULES: IRule[] = [
229213
]
230214
},
231215

232-
// Browser (editor contrib)
233-
{
234-
target: '**/src/vs/editor/contrib/**',
235-
allowedTypes: CORE_TYPES,
236-
disallowedTypes: NATIVE_TYPES,
237-
disallowedDefinitions: [
238-
'@types/node' // no node.js
239-
]
240-
},
241-
242216
// node.js
243217
{
244218
target: '**/vs/**/node/**',
@@ -318,7 +292,7 @@ function checkFile(program: ts.Program, sourceFile: ts.SourceFile, rule: IRule)
318292

319293
if (rule.disallowedTypes?.some(disallowed => disallowed === text)) {
320294
const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
321-
console.log(`[build/lib/layersChecker.ts]: Reference to type '${text}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1}). Learn more about our source code organization at https://github.com/microsoft/vscode/wiki/Source-Code-Organization.`);
295+
console.log(`[build/checker/layersChecker.ts]: Reference to type '${text}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1}). Learn more about our source code organization at https://github.com/microsoft/vscode/wiki/Source-Code-Organization.`);
322296

323297
hasErrors = true;
324298
return;
@@ -345,7 +319,7 @@ function checkFile(program: ts.Program, sourceFile: ts.SourceFile, rule: IRule)
345319
if (definitionFileName.indexOf(disallowedDefinition) >= 0) {
346320
const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
347321

348-
console.log(`[build/lib/layersChecker.ts]: Reference to symbol '${text}' from '${disallowedDefinition}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1}) Learn more about our source code organization at https://github.com/microsoft/vscode/wiki/Source-Code-Organization.`);
322+
console.log(`[build/checker/layersChecker.ts]: Reference to symbol '${text}' from '${disallowedDefinition}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1}) Learn more about our source code organization at https://github.com/microsoft/vscode/wiki/Source-Code-Organization.`);
349323

350324
hasErrors = true;
351325
return;

‎build/checker/tsconfig.desktop.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"extends": "./tsconfig.web.json",
3+
"include": [
4+
"../../src/**/common/**/*.ts",
5+
"../../src/**/browser/**/*.ts",
6+
"../../src/**/electron-sandbox/**/*.ts",
7+
"../../src/typings/*.d.ts",
8+
"../../src/vs/monaco.d.ts",
9+
"../../src/vscode-dts/vscode.proposed.*.d.ts",
10+
"../../src/vscode-dts/vscode.d.ts",
11+
"../../node_modules/@webgpu/types/dist/index.d.ts",
12+
"../../node_modules/@types/trusted-types/index.d.ts",
13+
"../../node_modules/@types/wicg-file-system-access/index.d.ts"
14+
],
15+
"exclude": [
16+
"../../src/**/test/**",
17+
"../../src/**/fixtures/**",
18+
"../../src/vs/base/parts/sandbox/electron-sandbox/preload.ts", // Preload scripts for Electron sandbox
19+
"../../src/vs/base/parts/sandbox/electron-sandbox/preload-aux.ts" // have limited access to node.js APIs
20+
]
21+
}

‎build/checker/tsconfig.server.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"extends": "../../src/tsconfig.base.json",
3+
"compilerOptions": {
4+
"lib": [
5+
"ES2022"
6+
],
7+
"types": [
8+
"node"
9+
],
10+
"noEmit": true,
11+
"skipLibCheck": true
12+
},
13+
"include": [
14+
"../../src/**/common/**/*.ts",
15+
"../../src/**/node/**/*.ts",
16+
"../../src/typings/*.d.ts",
17+
"../../src/vs/monaco.d.ts",
18+
"../../src/vscode-dts/vscode.proposed.*.d.ts",
19+
"../../src/vscode-dts/vscode.d.ts",
20+
"../../node_modules/@types/trusted-types/index.d.ts",
21+
],
22+
"exclude": [
23+
"../../src/**/test/**",
24+
"../../src/**/fixtures/**"
25+
]
26+
}

‎build/checker/tsconfig.web.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"extends": "../../src/tsconfig.base.json",
3+
"compilerOptions": {
4+
"lib": [
5+
"ES2022",
6+
"DOM",
7+
"DOM.Iterable"
8+
],
9+
"types": [],
10+
"noEmit": true,
11+
"skipLibCheck": true
12+
},
13+
"include": [
14+
"../../src/**/common/**/*.ts",
15+
"../../src/**/browser/**/*.ts",
16+
"../../src/typings/*.d.ts",
17+
"../../src/vs/monaco.d.ts",
18+
"../../src/vscode-dts/vscode.proposed.*.d.ts",
19+
"../../src/vscode-dts/vscode.d.ts",
20+
"../../node_modules/@webgpu/types/dist/index.d.ts",
21+
"../../node_modules/@types/trusted-types/index.d.ts",
22+
"../../node_modules/@types/wicg-file-system-access/index.d.ts"
23+
],
24+
"exclude": [
25+
"../../src/**/test/**",
26+
"../../src/**/fixtures/**"
27+
]
28+
}

‎build/filters.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ module.exports.indentationFilter = [
103103
'!extensions/vscode-api-tests/testWorkspace2/**',
104104
'!build/monaco/**',
105105
'!build/win32/**',
106+
'!build/checker/**',
106107

107108
// except multiple specific files
108109
'!**/package.json',

‎build/gulpfile.reh.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
257257
const src = gulp.src(sourceFolderName + '/**', { base: '.' })
258258
.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); }))
259259
.pipe(util.setExecutableBit(['**/*.sh']))
260-
.pipe(filter(['**', '!**/*.js.map']));
260+
.pipe(filter(['**', '!**/*.{js,css}.map']));
261261

262262
const workspaceExtensionPoints = ['debuggers', 'jsonValidation'];
263263
const isUIExtension = (manifest) => {
@@ -298,7 +298,7 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
298298
const extensions = gulp.src(extensionPaths, { base: '.build', dot: true });
299299
const extensionsCommonDependencies = gulp.src('.build/extensions/node_modules/**', { base: '.build', dot: true });
300300
const sources = es.merge(src, extensions, extensionsCommonDependencies)
301-
.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
301+
.pipe(filter(['**', '!**/*.{js,css}.map'], { dot: true }));
302302

303303
let version = packageJson.version;
304304
const quality = product.quality;
@@ -333,7 +333,7 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
333333
const dependenciesSrc = productionDependencies.map(d => path.relative(REPO_ROOT, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]).flat();
334334
const deps = gulp.src(dependenciesSrc, { base: 'remote', dot: true })
335335
// filter out unnecessary files, no source maps in server build
336-
.pipe(filter(['**', '!**/package-lock.json', '!**/*.js.map']))
336+
.pipe(filter(['**', '!**/package-lock.json', '!**/*.{js,css}.map']))
337337
.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
338338
.pipe(util.cleanNodeModules(path.join(__dirname, `.moduleignore.${process.platform}`)))
339339
.pipe(jsFilter)

‎build/gulpfile.vscode.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
244244
const extensions = gulp.src(['.build/extensions/**', ...platformSpecificBuiltInExtensionsExclusions], { base: '.build', dot: true });
245245

246246
const sources = es.merge(src, extensions)
247-
.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
247+
.pipe(filter(['**', '!**/*.{js,css}.map'], { dot: true }));
248248

249249
let version = packageJson.version;
250250
const quality = product.quality;
@@ -289,7 +289,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
289289
const dependenciesSrc = productionDependencies.map(d => path.relative(root, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat().concat('!**/*.mk');
290290

291291
const deps = gulp.src(dependenciesSrc, { base: '.', dot: true })
292-
.pipe(filter(['**', `!**/${config.version}/**`, '!**/bin/darwin-arm64-87/**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.js.map']))
292+
.pipe(filter(['**', `!**/${config.version}/**`, '!**/bin/darwin-arm64-87/**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.{js,css}.map']))
293293
.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
294294
.pipe(util.cleanNodeModules(path.join(__dirname, `.moduleignore.${process.platform}`)))
295295
.pipe(jsFilter)

0 commit comments

Comments
 (0)