Skip to content

Commit 366aee0

Browse files
rebornixrebornix
committed
Merge remote-tracking branch 'upstream/master' into rebornix/keyboardlayouts
2 parents 4925b0f + f7db1dc commit 366aee0

229 files changed

Lines changed: 4345 additions & 2733 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.

‎.github/classifier.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
editor-symbols: [],
5353
editor-textbuffer: [],
5454
editor-wrapping: [],
55-
emmet: [ octref, ramya-rao-a ],
55+
emmet: [ octref ],
5656
error-list: [],
5757
explorer-custom: [],
5858
extension-host: [],

‎.vscode/settings.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,8 @@
5656
"url": "./.vscode/cglicenses.schema.json"
5757
}
5858
],
59-
"git.ignoreLimitWarning": true
60-
}
59+
"git.ignoreLimitWarning": true,
60+
"remote.extensionKind": {
61+
"msjsdiag.debugger-for-chrome": "workspace"
62+
}
63+
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ resources:
99
jobs:
1010
- job: Windows
1111
condition: eq(variables['VSCODE_BUILD_WIN32'], 'true')
12+
timeoutInMinutes: 120
1213
pool:
1314
vmImage: VS2017-Win2016
1415
variables:
@@ -18,6 +19,7 @@ jobs:
1819

1920
- job: Windows32
2021
condition: eq(variables['VSCODE_BUILD_WIN32_32BIT'], 'true')
22+
timeoutInMinutes: 120
2123
pool:
2224
vmImage: VS2017-Win2016
2325
variables:
@@ -27,6 +29,7 @@ jobs:
2729

2830
- job: Linux
2931
condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
32+
timeoutInMinutes: 120
3033
pool:
3134
vmImage: 'Ubuntu-16.04'
3235
variables:
@@ -37,6 +40,7 @@ jobs:
3740

3841
- job: LinuxSnap
3942
condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
43+
timeoutInMinutes: 120
4044
pool:
4145
vmImage: 'Ubuntu-16.04'
4246
variables:
@@ -48,6 +52,7 @@ jobs:
4852

4953
- job: LinuxArmhf
5054
condition: eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true')
55+
timeoutInMinutes: 120
5156
pool:
5257
vmImage: 'Ubuntu-16.04'
5358
variables:
@@ -57,12 +62,14 @@ jobs:
5762

5863
- job: macOS
5964
condition: eq(variables['VSCODE_BUILD_MACOS'], 'true')
65+
timeoutInMinutes: 120
6066
pool:
6167
vmImage: macOS 10.13
6268
steps:
6369
- template: darwin/product-build-darwin.yml
6470

6571
- job: Mooncake
72+
timeoutInMinutes: 120
6673
pool:
6774
vmImage: 'Ubuntu-16.04'
6875
condition: true

‎build/gulpfile.vscode.win32.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const zipDir = arch => path.join(repoPath, '.build', `win32-${arch}`, 'archive')
2525
const zipPath = arch => path.join(zipDir(arch), `VSCode-win32-${arch}.zip`);
2626
const setupDir = (arch, target) => path.join(repoPath, '.build', `win32-${arch}`, `${target}-setup`);
2727
const issPath = path.join(__dirname, 'win32', 'code.iss');
28-
const innoSetupPath = path.join(path.dirname(path.dirname(require.resolve('innosetup-compiler'))), 'bin', 'ISCC.exe');
28+
const innoSetupPath = path.join(path.dirname(path.dirname(require.resolve('innosetup'))), 'bin', 'ISCC.exe');
2929
const signPS1 = path.join(repoPath, 'build', 'azure-pipelines', 'win32', 'sign.ps1');
3030

3131
function packageInnoSetup(iss, options, cb) {

‎extensions/markdown-language-features/src/features/previewContentProvider.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,17 +197,17 @@ export class MarkdownContentProvider {
197197
private getCspForResource(resource: vscode.Uri, nonce: string): string {
198198
switch (this.cspArbiter.getSecurityLevelForResource(resource)) {
199199
case MarkdownPreviewSecurityLevel.AllowInsecureContent:
200-
return `<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-resource: http: https: data:; media-src vscode-resource: http: https: data:; script-src 'nonce-${nonce}'; style-src 'self' vscode-resource: 'unsafe-inline' http: https: data:; font-src vscode-resource: http: https: data:;">`;
200+
return `<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' vscode-resource: http: https: data:; media-src 'self' vscode-resource: http: https: data:; script-src 'nonce-${nonce}'; style-src 'self' vscode-resource: 'unsafe-inline' http: https: data:; font-src 'self' vscode-resource: http: https: data:;">`;
201201

202202
case MarkdownPreviewSecurityLevel.AllowInsecureLocalContent:
203-
return `<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-resource: https: data: http://localhost:* http://127.0.0.1:*; media-src vscode-resource: https: data: http://localhost:* http://127.0.0.1:*; script-src 'nonce-${nonce}'; style-src 'self' vscode-resource: 'unsafe-inline' https: data: http://localhost:* http://127.0.0.1:*; font-src vscode-resource: https: data: http://localhost:* http://127.0.0.1:*;">`;
203+
return `<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' vscode-resource: https: data: http://localhost:* http://127.0.0.1:*; media-src 'self' vscode-resource: https: data: http://localhost:* http://127.0.0.1:*; script-src 'nonce-${nonce}'; style-src 'self' vscode-resource: 'unsafe-inline' https: data: http://localhost:* http://127.0.0.1:*; font-src 'self' vscode-resource: https: data: http://localhost:* http://127.0.0.1:*;">`;
204204

205205
case MarkdownPreviewSecurityLevel.AllowScriptsAndAllContent:
206206
return '';
207207

208208
case MarkdownPreviewSecurityLevel.Strict:
209209
default:
210-
return `<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-resource: https: data:; media-src vscode-resource: https: data:; script-src 'nonce-${nonce}'; style-src 'self' vscode-resource: 'unsafe-inline' https: data:; font-src vscode-resource: https: data:;">`;
210+
return `<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' vscode-resource: https: data:; media-src 'self' vscode-resource: https: data:; script-src 'nonce-${nonce}'; style-src 'self' vscode-resource: 'unsafe-inline' https: data:; font-src 'self' vscode-resource: https: data:;">`;
211211
}
212212
}
213213
}

‎extensions/typescript-language-features/src/utils/versionProvider.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,13 @@ export class TypeScriptVersionProvider {
155155

156156
private getContributedVersion(extensionId: string, pathToTs: readonly string[]): TypeScriptVersion | undefined {
157157
try {
158-
const { extensionPath } = vscode.extensions.getExtension(extensionId)!;
159-
const typescriptPath = path.join(extensionPath, ...pathToTs, 'typescript', 'lib');
160-
const bundledVersion = new TypeScriptVersion(typescriptPath, '');
161-
if (bundledVersion.isValid) {
162-
return bundledVersion;
158+
const extension = vscode.extensions.getExtension(extensionId);
159+
if (extension) {
160+
const typescriptPath = path.join(extension.extensionPath, ...pathToTs, 'typescript', 'lib');
161+
const bundledVersion = new TypeScriptVersion(typescriptPath, '');
162+
if (bundledVersion.isValid) {
163+
return bundledVersion;
164+
}
163165
}
164166
} catch {
165167
// noop

‎extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ suite('window namespace tests', () => {
569569
});
570570
});
571571

572-
suite('Terminal', () => {
572+
(process.platform === 'win32' ? suite.skip /* https://github.com/microsoft/vscode/issues/75689 */ : suite)('Terminal', () => {
573573
test('sendText immediately after createTerminal should not throw', () => {
574574
const terminal = window.createTerminal();
575575
assert.doesNotThrow(terminal.sendText.bind(terminal, 'echo "foo"'));

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.36.0",
4-
"distro": "8a2c96a9296c1b8112a4d0e74c0b10063c1a8d44",
4+
"distro": "c1ec2234fb5dc62f2bf9689f41dc1cd0a507a581",
55
"author": {
66
"name": "Microsoft Corporation"
77
},
@@ -26,7 +26,7 @@
2626
"monaco-compile-check": "tsc -p src/tsconfig.monaco.json --noEmit",
2727
"strict-initialization-watch": "tsc --watch -p src/tsconfig.json --noEmit --strictPropertyInitialization",
2828
"web": "node resources/server/bin-dev/code-web.js --port 9888",
29-
"web-selfhost": "node resources/server/bin-dev/code-web.js --port 9777 --selfhost --folder .",
29+
"web-selfhost": "node resources/server/bin-dev/code-web.js --port 9777 --selfhost",
3030
"install-server": "node build/npm/install-server.js"
3131
},
3232
"dependencies": {
@@ -54,7 +54,7 @@
5454
"vscode-ripgrep": "^1.2.5",
5555
"vscode-sqlite3": "4.0.7",
5656
"vscode-textmate": "^4.1.1",
57-
"xterm": "3.15.0-beta34",
57+
"xterm": "3.15.0-beta42",
5858
"xterm-addon-search": "0.1.0-beta6",
5959
"xterm-addon-web-links": "0.1.0-beta10",
6060
"yauzl": "^2.9.2",
@@ -108,7 +108,7 @@
108108
"gulp-vinyl-zip": "^2.1.2",
109109
"http-server": "^0.11.1",
110110
"husky": "^0.13.1",
111-
"innosetup-compiler": "^5.5.60",
111+
"innosetup": "5.6.1",
112112
"is": "^3.1.0",
113113
"istanbul": "^0.3.17",
114114
"jsdom-no-contextify": "^3.1.0",

‎remote/package.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"keytar": "4.2.1",
1313
"minimist": "1.2.0",
1414
"native-watchdog": "1.0.0",
15-
"node-pty": "0.8.1",
15+
"node-pty": "0.9.0-beta17",
1616
"onigasm-umd": "^2.2.2",
1717
"semver": "^5.5.0",
1818
"spdlog": "^0.9.0",
@@ -21,13 +21,14 @@
2121
"vscode-proxy-agent": "0.4.0",
2222
"vscode-ripgrep": "^1.2.5",
2323
"vscode-textmate": "^4.1.1",
24-
"yauzl": "^2.9.2",
25-
"yazl": "^2.4.3",
2624
"xterm": "3.15.0-beta34",
2725
"xterm-addon-search": "0.1.0-beta6",
28-
"xterm-addon-web-links": "0.1.0-beta10"
26+
"xterm-addon-web-links": "0.1.0-beta10",
27+
"yauzl": "^2.9.2",
28+
"yazl": "^2.4.3"
2929
},
3030
"optionalDependencies": {
31-
"vscode-windows-ca-certs": "0.1.0"
31+
"vscode-windows-ca-certs": "0.1.0",
32+
"vscode-windows-registry": "1.0.1"
3233
}
3334
}

‎remote/yarn.lock‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -599,11 +599,6 @@ ms@2.0.0:
599599
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
600600
integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
601601

602-
nan@2.12.1:
603-
version "2.12.1"
604-
resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552"
605-
integrity sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==
606-
607602
nan@2.8.0:
608603
version "2.8.0"
609604
resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
@@ -614,7 +609,7 @@ nan@^2.10.0:
614609
resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
615610
integrity sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==
616611

617-
nan@^2.12.1, nan@^2.14.0:
612+
nan@^2.12.1, nan@^2.13.2, nan@^2.14.0:
618613
version "2.14.0"
619614
resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
620615
integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
@@ -636,12 +631,12 @@ node-addon-api@1.6.2:
636631
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.6.2.tgz#d8aad9781a5cfc4132cc2fecdbdd982534265217"
637632
integrity sha512-479Bjw9nTE5DdBSZZWprFryHGjUaQC31y1wHo19We/k0BZlrmhqQitWoUL0cD8+scljCbIUL+E58oRDEakdGGA==
638633

639-
node-pty@0.8.1:
640-
version "0.8.1"
641-
resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.8.1.tgz#94b457bec013e7a09b8d9141f63b0787fa25c23f"
642-
integrity sha512-j+/g0Q5dR+vkELclpJpz32HcS3O/3EdPSGPvDXJZVJQLCvgG0toEbfmymxAEyQyZEpaoKHAcoL+PvKM+4N9nlw==
634+
node-pty@0.9.0-beta17:
635+
version "0.9.0-beta17"
636+
resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.9.0-beta17.tgz#9b490df86a8124dea595e9fbedeaaf4b2eedbbcb"
637+
integrity sha512-E94XwIs3JxLKAboquHY9Kytbbj/T/tJtRpQoAUdfPE7UXRta/NV+xdmRNhZkeU9jCji+plm656GbYFievgNPkQ==
643638
dependencies:
644-
nan "2.12.1"
639+
nan "^2.13.2"
645640

646641
noop-logger@^0.1.1:
647642
version "0.1.1"
@@ -1117,6 +1112,13 @@ vscode-windows-ca-certs@0.1.0:
11171112
dependencies:
11181113
node-addon-api "1.6.2"
11191114

1115+
vscode-windows-registry@1.0.1:
1116+
version "1.0.1"
1117+
resolved "https://registry.yarnpkg.com/vscode-windows-registry/-/vscode-windows-registry-1.0.1.tgz#bc9f765563eb6dc1c9ad9a41f9eaacc84dfadc7c"
1118+
integrity sha512-q0aKXi9Py1OBdmXIJJFeJBzpPJMMUxMJNBU9FysWIXEwJyMQGEVevKzM2J3Qz/cHSc5LVqibmoUWzZ7g+97qRg==
1119+
dependencies:
1120+
nan "^2.12.1"
1121+
11201122
which-pm-runs@^1.0.0:
11211123
version "1.0.0"
11221124
resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"

0 commit comments

Comments
 (0)