Skip to content

Commit d412f01

Browse files
connor4312connor4312
committed
Merge remote-tracking branch 'origin/master' into connor4312/allow-multiple-dynamic
2 parents 3a9d44e + a6d014f commit d412f01

107 files changed

Lines changed: 1264 additions & 723 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/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,6 @@
7676
"[typescript]": {
7777
"editor.defaultFormatter": "vscode.typescript-language-features"
7878
},
79-
"typescript.tsc.autoDetect": "off"
79+
"typescript.tsc.autoDetect": "off",
80+
"typescript.tsserver.useSeparateSyntaxServer": "dynamic"
8081
}

‎build/azure-pipelines/common/extract-telemetry.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ git clone --depth 1 https://github.com/Microsoft/vscode-node-debug2.git
1010
git clone --depth 1 https://github.com/Microsoft/vscode-node-debug.git
1111
git clone --depth 1 https://github.com/Microsoft/vscode-html-languageservice.git
1212
git clone --depth 1 https://github.com/Microsoft/vscode-json-languageservice.git
13-
$BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --sourceDir $BUILD_SOURCESDIRECTORY --excludedDir $BUILD_SOURCESDIRECTORY/extensions --outputDir . --applyEndpoints
14-
$BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --config $BUILD_SOURCESDIRECTORY/build/azure-pipelines/common/telemetry-config.json -o .
13+
node $BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --sourceDir $BUILD_SOURCESDIRECTORY --excludedDir $BUILD_SOURCESDIRECTORY/extensions --outputDir . --applyEndpoints
14+
node $BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --config $BUILD_SOURCESDIRECTORY/build/azure-pipelines/common/telemetry-config.json -o .
1515
mkdir -p $BUILD_SOURCESDIRECTORY/.build/telemetry
1616
mv declarations-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-core.json
1717
mv config-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-extensions.json
1818
cd ..
19-
rm -rf extraction
19+
rm -rf extraction

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ steps:
218218
restoreSolution: 'build\azure-pipelines\win32\ESRPClient\packages.config'
219219
feedsToUse: config
220220
nugetConfigPath: 'build\azure-pipelines\win32\ESRPClient\NuGet.config'
221-
externalFeedCredentials: 3fc0b7f7-da09-4ae7-a9c8-d69824b1819b
221+
externalFeedCredentials: 'ESRP Nuget'
222222
restoreDirectory: packages
223223

224224
- task: ESRPImportCertTask@1

‎build/lib/eslint/vscode-dts-literal-or-types.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ module.exports = new class ApiLiteralOrTypes {
1313
create(context) {
1414
return {
1515
['TSTypeAnnotation TSUnionType TSLiteralType']: (node) => {
16+
var _a;
17+
if (((_a = node.literal) === null || _a === void 0 ? void 0 : _a.type) === 'TSNullKeyword') {
18+
return;
19+
}
1620
context.report({
1721
node: node,
1822
messageId: 'useEnum'

‎build/lib/eslint/vscode-dts-literal-or-types.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
1515
create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
1616
return {
1717
['TSTypeAnnotation TSUnionType TSLiteralType']: (node: any) => {
18+
if (node.literal?.type === 'TSNullKeyword') {
19+
return;
20+
}
1821
context.report({
1922
node: node,
2023
messageId: 'useEnum'

‎build/lib/extensions.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ function scanBuiltinExtensions(extensionsRoot, forWeb) {
280280
const changelog = children.filter(child => /^changelog(\.txt|\.md|)$/i.test(child))[0];
281281
scannedExtensions.push({
282282
extensionPath: extensionFolder,
283-
packageJSON: packageJSON,
284-
packagsNLSPath: packageNLS ? path.join(extensionFolder, packageNLS) : undefined,
283+
packageJSON,
284+
packageNLSPath: packageNLS ? path.join(extensionFolder, packageNLS) : undefined,
285285
readmePath: readme ? path.join(extensionFolder, readme) : undefined,
286286
changelogPath: changelog ? path.join(extensionFolder, changelog) : undefined,
287287
});

‎build/lib/extensions.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ export function packageMarketplaceWebExtensionsStream(builtInExtensions: IBuiltI
311311
export interface IScannedBuiltinExtension {
312312
extensionPath: string,
313313
packageJSON: any,
314-
packagsNLSPath?: string,
314+
packageNLSPath?: string,
315315
readmePath?: string,
316316
changelogPath?: string,
317317
}
@@ -335,8 +335,8 @@ export function scanBuiltinExtensions(extensionsRoot: string, forWeb: boolean):
335335
const changelog = children.filter(child => /^changelog(\.txt|\.md|)$/i.test(child))[0];
336336
scannedExtensions.push({
337337
extensionPath: extensionFolder,
338-
packageJSON: packageJSON,
339-
packagsNLSPath: packageNLS ? path.join(extensionFolder, packageNLS) : undefined,
338+
packageJSON,
339+
packageNLSPath: packageNLS ? path.join(extensionFolder, packageNLS) : undefined,
340340
readmePath: readme ? path.join(extensionFolder, readme) : undefined,
341341
changelogPath: changelog ? path.join(extensionFolder, changelog) : undefined,
342342
});

‎build/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"minimist": "^1.2.3",
4545
"request": "^2.85.0",
4646
"terser": "4.3.8",
47-
"typescript": "^4.0.0-dev.20200615",
47+
"typescript": "^4.0.0-dev.20200622",
4848
"vsce": "1.48.0",
4949
"vscode-telemetry-extractor": "^1.6.0",
5050
"xml2js": "^0.4.17"

‎build/win32/code.iss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@ begin
11321132
end;
11331133
end;
11341134
1135-
// http://stackoverflow.com/a/23838239/261019
1135+
// https://stackoverflow.com/a/23838239/261019
11361136
procedure Explode(var Dest: TArrayOfString; Text: String; Separator: String);
11371137
var
11381138
i, p: Integer;

‎build/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2530,10 +2530,10 @@ typescript@^3.0.1:
25302530
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
25312531
integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
25322532

2533-
typescript@^4.0.0-dev.20200615:
2534-
version "4.0.0-dev.20200615"
2535-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200615.tgz#5c06a0d5f25a29a018767970c6531fbbed7240e3"
2536-
integrity sha512-OD7KRTLimUwW5E1xHsAqXNjw0O0Krk9CgRVFYkqANv4fZisaN1LJI06u30D5QiNnHBzm2nBSzZIAhjj4MUqaRA==
2533+
typescript@^4.0.0-dev.20200622:
2534+
version "4.0.0-dev.20200622"
2535+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200622.tgz#33e0ffaf880b1f16bde5bc4eeb1863e52c4d7f75"
2536+
integrity sha512-KWXppG2OKfq5cDAEkc0wA7uemXnF/Af4v0j08plUCKk20rt9wYU2rU9EB53/XlVeZgV2hwpbH9hIFyeB4dWvdg==
25372537

25382538
typical@^4.0.0:
25392539
version "4.0.0"

0 commit comments

Comments
 (0)