Skip to content

Commit 018e9a2

Browse files
rebornixrebornix
committed
Merge remote-tracking branch 'origin/master' into rebornix/diff-2
2 parents 4ffd7a9 + 9e7b2b8 commit 018e9a2

297 files changed

Lines changed: 6755 additions & 9442 deletions

File tree

Some content is hidden

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

‎.vscode/launch.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
"type": "node",
242242
"request": "launch",
243243
"name": "VS Code (Web)",
244-
"program": "${workspaceFolder}/resources/serverless/code-web.js",
244+
"program": "${workspaceFolder}/resources/web/code-web.js",
245245
"presentation": {
246246
"group": "0_vscode",
247247
"order": 2

‎build/gulpfile.hygiene.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ const copyrightFilter = [
119119
'!resources/linux/snap/snapcraft.yaml',
120120
'!resources/linux/snap/electron-launch',
121121
'!resources/win32/bin/code.js',
122+
'!resources/web/code-web.js',
122123
'!resources/completions/**',
123124
'!extensions/markdown-language-features/media/highlight.css',
124125
'!extensions/html-language-features/server/src/modes/typescript/*',
125126
'!extensions/*/server/bin/*',
126-
'!src/vs/editor/test/node/classification/typescript-test.ts',
127-
'!resources/serverless/code-web.js'
127+
'!src/vs/editor/test/node/classification/typescript-test.ts'
128128
];
129129

130130
const jsHygieneFilter = [

‎build/lib/extensions.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ function packageLocalExtensionsStream(forWeb) {
224224
const extensionName = path.basename(extensionPath);
225225
return { name: extensionName, path: extensionPath, manifestPath: absoluteManifestPath };
226226
})
227-
.filter(({ name }) => (name === 'vscode-web-playground' ? forWeb : true)) // package vscode-web-playground only for web
228227
.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
229228
.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
230229
.filter(({ manifestPath }) => (forWeb ? isWebExtension(require(manifestPath)) : true)));

‎build/lib/extensions.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ export function packageLocalExtensionsStream(forWeb: boolean): Stream {
275275
const extensionName = path.basename(extensionPath);
276276
return { name: extensionName, path: extensionPath, manifestPath: absoluteManifestPath };
277277
})
278-
.filter(({ name }) => (name === 'vscode-web-playground' ? forWeb : true)) // package vscode-web-playground only for web
279278
.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
280279
.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
281280
.filter(({ manifestPath }) => (forWeb ? isWebExtension(require(manifestPath)) : true))

‎build/win32/code.iss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Source: "{#ProductJsonPath}"; DestDir: "{code:GetDestDir}\resources\app"; Flags:
8989

9090
[Icons]
9191
Name: "{group}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; AppUserModelID: "{#AppUserId}"
92-
Name: "{commondesktop}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; Tasks: desktopicon; AppUserModelID: "{#AppUserId}"
92+
Name: "{autodesktop}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; Tasks: desktopicon; AppUserModelID: "{#AppUserId}"
9393
Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; Tasks: quicklaunchicon; AppUserModelID: "{#AppUserId}"
9494

9595
[Run]

‎extensions/css-language-features/server/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"main": "./out/node/cssServerMain",
1111
"browser": "./dist/browser/cssServerMain",
1212
"dependencies": {
13-
"vscode-css-languageservice": "^4.3.1",
13+
"vscode-css-languageservice": "^4.3.3",
1414
"vscode-languageserver": "7.0.0-next.3",
1515
"vscode-uri": "^2.1.2"
1616
},

‎extensions/css-language-features/server/test/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
2121
reporterEnabled: 'spec, mocha-junit-reporter',
2222
mochaJunitReporterReporterOptions: {
2323
testsuitesTitle: `${suite} ${process.platform}`,
24-
mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
24+
mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${process.arch}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
2525
}
2626
};
2727
}

‎extensions/css-language-features/server/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -696,10 +696,10 @@ to-regex-range@^5.0.1:
696696
dependencies:
697697
is-number "^7.0.0"
698698

699-
vscode-css-languageservice@^4.3.1:
700-
version "4.3.1"
701-
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.3.1.tgz#a78755b28b8a0cbb1681121f0fa372860f34ef6b"
702-
integrity sha512-Vdz2cyoTP2tLWikhFdouK8dAQ3gVhLPxsFkIscM30Quh6rd/YejTeZEYC/W+b0iKumHYebDeo1GUFbf0ptySRw==
699+
vscode-css-languageservice@^4.3.3:
700+
version "4.3.3"
701+
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.3.3.tgz#fcb8c7442ae7bb8fbe6ff1d3a514be8248bfb52f"
702+
integrity sha512-b2b+0oHvPmBHygDtOXX3xBvpQCa6eIQSvXnGDNSDmIC1894ZTJ2yX10vjplOO/PvV7mwhyvGPwHyY4X2HGxtKw==
703703
dependencies:
704704
vscode-languageserver-textdocument "^1.0.1"
705705
vscode-languageserver-types "3.16.0-next.2"

‎extensions/debug-auto-launch/.vscode/launch.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "Extension",
9+
"type": "extensionHost",
10+
"request": "launch",
11+
"skipFiles": ["<node_internals>/**"],
12+
"args": [
13+
"--extensionDevelopmentPath=${workspaceFolder}",
14+
],
15+
"outFiles": [
16+
"${workspaceFolder}/out/**/*.js",
17+
],
18+
}
19+
]
20+
}

‎extensions/debug-auto-launch/package.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@
3535
],
3636
"description": "%debug.node.autoAttach.description%",
3737
"default": "disabled"
38+
},
39+
"debug.javascript.usePreviewAutoAttach": {
40+
"scope": "window",
41+
"type": "boolean",
42+
"default": true,
43+
"description": "%debug.javascript.usePreviewAutoAttach%"
3844
}
3945
}
4046
},

0 commit comments

Comments
 (0)