diff --git a/build/azure-pipelines/publish-types/update-types.ts b/build/azure-pipelines/publish-types/update-types.ts index eae002e23a76c..7ccd976dba585 100644 --- a/build/azure-pipelines/publish-types/update-types.ts +++ b/build/azure-pipelines/publish-types/update-types.ts @@ -16,7 +16,7 @@ try { .toString() .trim(); - const dtsUri = `https://raw.githubusercontent.com/microsoft/vscode/${tag}/src/vs/vscode.d.ts`; + const dtsUri = `https://raw.githubusercontent.com/microsoft/vscode/${tag}/src/vscode-dts/vscode.d.ts`; const outPath = path.resolve(process.cwd(), 'DefinitelyTyped/types/vscode/index.d.ts'); cp.execSync(`curl ${dtsUri} --output ${outPath}`); diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index fbf4739f2ff61..8a21b910c2f11 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -214,7 +214,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op const license = gulp.src(['LICENSES.chromium.html', product.licenseFileName, 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.', allowEmpty: true }); // TODO the API should be copied to `out` during compile, not here - const api = gulp.src('src/vs/vscode.d.ts').pipe(rename('out/vs/vscode.d.ts')); + const api = gulp.src('src/vscode-dts/vscode.d.ts').pipe(rename('out/vscode-dts/vscode.d.ts')); const telemetry = gulp.src('.build/telemetry/**', { base: '.build/telemetry', dot: true }); diff --git a/extensions/configuration-editing/src/typings/ref.d.ts b/extensions/configuration-editing/src/typings/ref.d.ts index bc057c5587839..e8ebf283d047f 100644 --- a/extensions/configuration-editing/src/typings/ref.d.ts +++ b/extensions/configuration-editing/src/typings/ref.d.ts @@ -3,5 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// +/// /// diff --git a/extensions/css-language-features/client/src/typings/ref.d.ts b/extensions/css-language-features/client/src/typings/ref.d.ts index de602d3f8d61b..c68621d616e92 100644 --- a/extensions/css-language-features/client/src/typings/ref.d.ts +++ b/extensions/css-language-features/client/src/typings/ref.d.ts @@ -2,5 +2,5 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// diff --git a/extensions/debug-auto-launch/src/typings/ref.d.ts b/extensions/debug-auto-launch/src/typings/ref.d.ts index bc057c5587839..e8ebf283d047f 100644 --- a/extensions/debug-auto-launch/src/typings/ref.d.ts +++ b/extensions/debug-auto-launch/src/typings/ref.d.ts @@ -3,5 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// +/// /// diff --git a/extensions/debug-server-ready/src/typings/ref.d.ts b/extensions/debug-server-ready/src/typings/ref.d.ts index 954bab971e334..bdca46ef93271 100644 --- a/extensions/debug-server-ready/src/typings/ref.d.ts +++ b/extensions/debug-server-ready/src/typings/ref.d.ts @@ -3,6 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// /// diff --git a/extensions/emmet/src/typings/refs.d.ts b/extensions/emmet/src/typings/refs.d.ts index bc057c5587839..e8ebf283d047f 100644 --- a/extensions/emmet/src/typings/refs.d.ts +++ b/extensions/emmet/src/typings/refs.d.ts @@ -3,5 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// +/// /// diff --git a/extensions/extension-editing/src/typings/ref.d.ts b/extensions/extension-editing/src/typings/ref.d.ts index 216911a680eb2..dea675744e879 100644 --- a/extensions/extension-editing/src/typings/ref.d.ts +++ b/extensions/extension-editing/src/typings/ref.d.ts @@ -3,4 +3,4 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// +/// diff --git a/extensions/git/src/typings/refs.d.ts b/extensions/git/src/typings/refs.d.ts index 312efe5a30f5b..05d6e39569737 100644 --- a/extensions/git/src/typings/refs.d.ts +++ b/extensions/git/src/typings/refs.d.ts @@ -3,6 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// /// diff --git a/extensions/github-authentication/src/typings/ref.d.ts b/extensions/github-authentication/src/typings/ref.d.ts index c9849d48e083f..73456ee2b527e 100644 --- a/extensions/github-authentication/src/typings/ref.d.ts +++ b/extensions/github-authentication/src/typings/ref.d.ts @@ -3,5 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// diff --git a/extensions/github/src/typings/ref.d.ts b/extensions/github/src/typings/ref.d.ts index 04ba79d86bf46..8047b3bb310dd 100644 --- a/extensions/github/src/typings/ref.d.ts +++ b/extensions/github/src/typings/ref.d.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// declare module 'tunnel'; diff --git a/extensions/grunt/src/typings/refs.d.ts b/extensions/grunt/src/typings/refs.d.ts index bc057c5587839..e8ebf283d047f 100644 --- a/extensions/grunt/src/typings/refs.d.ts +++ b/extensions/grunt/src/typings/refs.d.ts @@ -3,5 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// +/// /// diff --git a/extensions/gulp/src/typings/refs.d.ts b/extensions/gulp/src/typings/refs.d.ts index bc057c5587839..e8ebf283d047f 100644 --- a/extensions/gulp/src/typings/refs.d.ts +++ b/extensions/gulp/src/typings/refs.d.ts @@ -3,5 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// +/// /// diff --git a/extensions/html-language-features/client/src/typings/ref.d.ts b/extensions/html-language-features/client/src/typings/ref.d.ts index be1d1b0b77614..de091643edf67 100644 --- a/extensions/html-language-features/client/src/typings/ref.d.ts +++ b/extensions/html-language-features/client/src/typings/ref.d.ts @@ -3,5 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// diff --git a/extensions/image-preview/src/typings/ref.d.ts b/extensions/image-preview/src/typings/ref.d.ts index c9849d48e083f..73456ee2b527e 100644 --- a/extensions/image-preview/src/typings/ref.d.ts +++ b/extensions/image-preview/src/typings/ref.d.ts @@ -3,5 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// diff --git a/extensions/ipynb/src/types.d.ts b/extensions/ipynb/src/types.d.ts index ac4e1dce678c3..df25bfdcb20a0 100644 --- a/extensions/ipynb/src/types.d.ts +++ b/extensions/ipynb/src/types.d.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// declare module '@enonic/fnv-plus'; diff --git a/extensions/jake/src/typings/refs.d.ts b/extensions/jake/src/typings/refs.d.ts index bc057c5587839..e8ebf283d047f 100644 --- a/extensions/jake/src/typings/refs.d.ts +++ b/extensions/jake/src/typings/refs.d.ts @@ -3,5 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// +/// /// diff --git a/extensions/json-language-features/client/src/typings/ref.d.ts b/extensions/json-language-features/client/src/typings/ref.d.ts index be1d1b0b77614..de091643edf67 100644 --- a/extensions/json-language-features/client/src/typings/ref.d.ts +++ b/extensions/json-language-features/client/src/typings/ref.d.ts @@ -3,5 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// diff --git a/extensions/markdown-language-features/src/typings/ref.d.ts b/extensions/markdown-language-features/src/typings/ref.d.ts index 70164f82d42de..a945700c7bfa9 100644 --- a/extensions/markdown-language-features/src/typings/ref.d.ts +++ b/extensions/markdown-language-features/src/typings/ref.d.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// declare module 'markdown-it-front-matter'; diff --git a/extensions/markdown-math/src/types.d.ts b/extensions/markdown-math/src/types.d.ts index 7aa684dcb6e08..d65c27c9b7c51 100644 --- a/extensions/markdown-math/src/types.d.ts +++ b/extensions/markdown-math/src/types.d.ts @@ -2,4 +2,4 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// +/// diff --git a/extensions/merge-conflict/src/typings/refs.d.ts b/extensions/merge-conflict/src/typings/refs.d.ts index bc057c5587839..e8ebf283d047f 100644 --- a/extensions/merge-conflict/src/typings/refs.d.ts +++ b/extensions/merge-conflict/src/typings/refs.d.ts @@ -3,5 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// +/// /// diff --git a/extensions/microsoft-authentication/src/typings/refs.d.ts b/extensions/microsoft-authentication/src/typings/refs.d.ts index c9849d48e083f..73456ee2b527e 100644 --- a/extensions/microsoft-authentication/src/typings/refs.d.ts +++ b/extensions/microsoft-authentication/src/typings/refs.d.ts @@ -3,5 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// diff --git a/extensions/npm/src/typings/refs.d.ts b/extensions/npm/src/typings/refs.d.ts index 954bab971e334..bdca46ef93271 100644 --- a/extensions/npm/src/typings/refs.d.ts +++ b/extensions/npm/src/typings/refs.d.ts @@ -3,6 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// /// diff --git a/extensions/php-language-features/src/typings/refs.d.ts b/extensions/php-language-features/src/typings/refs.d.ts index 57b50520144ea..26b3e541d3d82 100644 --- a/extensions/php-language-features/src/typings/refs.d.ts +++ b/extensions/php-language-features/src/typings/refs.d.ts @@ -3,6 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// +/// /// -/// +/// diff --git a/extensions/search-result/src/typings/refs.d.ts b/extensions/search-result/src/typings/refs.d.ts index c9849d48e083f..73456ee2b527e 100644 --- a/extensions/search-result/src/typings/refs.d.ts +++ b/extensions/search-result/src/typings/refs.d.ts @@ -3,5 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// diff --git a/extensions/simple-browser/src/typings/ref.d.ts b/extensions/simple-browser/src/typings/ref.d.ts index c9849d48e083f..73456ee2b527e 100644 --- a/extensions/simple-browser/src/typings/ref.d.ts +++ b/extensions/simple-browser/src/typings/ref.d.ts @@ -3,5 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// diff --git a/extensions/typescript-language-features/src/typings/ref.d.ts b/extensions/typescript-language-features/src/typings/ref.d.ts index 43a9cadf25022..ff021d2e76bde 100644 --- a/extensions/typescript-language-features/src/typings/ref.d.ts +++ b/extensions/typescript-language-features/src/typings/ref.d.ts @@ -3,4 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// +/// +/// diff --git a/extensions/typescript-language-features/tsconfig.json b/extensions/typescript-language-features/tsconfig.json index 055ffd316ffe4..2e3170fe47bab 100644 --- a/extensions/typescript-language-features/tsconfig.json +++ b/extensions/typescript-language-features/tsconfig.json @@ -3,10 +3,12 @@ "compilerOptions": { "outDir": "./out", "experimentalDecorators": true, - "types": ["node"], + "types": [ + "node" + ], "paths": { "vscode": [ - "../../src/vs/vscode.d.ts" + "../../src/vsode/vscode.d.ts" ] } }, diff --git a/extensions/vscode-api-tests/src/typings/ref.d.ts b/extensions/vscode-api-tests/src/typings/ref.d.ts index e3e47385d6634..097a47bc89c8c 100644 --- a/extensions/vscode-api-tests/src/typings/ref.d.ts +++ b/extensions/vscode-api-tests/src/typings/ref.d.ts @@ -3,6 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// /// diff --git a/extensions/vscode-colorize-tests/src/typings/ref.d.ts b/extensions/vscode-colorize-tests/src/typings/ref.d.ts index a17099ac50c08..097a47bc89c8c 100644 --- a/extensions/vscode-colorize-tests/src/typings/ref.d.ts +++ b/extensions/vscode-colorize-tests/src/typings/ref.d.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// /// - diff --git a/extensions/vscode-custom-editor-tests/src/typings/ref.d.ts b/extensions/vscode-custom-editor-tests/src/typings/ref.d.ts index bf67b19225d11..97ab478208cbf 100644 --- a/extensions/vscode-custom-editor-tests/src/typings/ref.d.ts +++ b/extensions/vscode-custom-editor-tests/src/typings/ref.d.ts @@ -3,6 +3,5 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// +/// /// - diff --git a/extensions/vscode-notebook-tests/src/typings/ref.d.ts b/extensions/vscode-notebook-tests/src/typings/ref.d.ts index a17099ac50c08..097a47bc89c8c 100644 --- a/extensions/vscode-notebook-tests/src/typings/ref.d.ts +++ b/extensions/vscode-notebook-tests/src/typings/ref.d.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// /// - diff --git a/extensions/vscode-test-resolver/src/typings/ref.d.ts b/extensions/vscode-test-resolver/src/typings/ref.d.ts index e3e47385d6634..097a47bc89c8c 100644 --- a/extensions/vscode-test-resolver/src/typings/ref.d.ts +++ b/extensions/vscode-test-resolver/src/typings/ref.d.ts @@ -3,6 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// /// diff --git a/package.json b/package.json index 7e0c2e6edd892..e6a02348d7684 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "download-builtin-extensions-cg": "node build/lib/builtInExtensionsCG.js", "monaco-compile-check": "tsc -p src/tsconfig.monaco.json --noEmit", "tsec-compile-check": "node node_modules/tsec/bin/tsec -p src/tsconfig.tsec.json", - "vscode-dts-compile-check": "node node_modules/tsec/bin/tsec -p src/tsconfig.vscode-dts.json && node node_modules/tsec/bin/tsec -p src/tsconfig.vscode-proposed-dts.json", + "vscode-dts-compile-check": "tsc -p src/tsconfig.vscode-dts.json && tsc -p src/tsconfig.vscode-proposed-dts.json", "valid-layers-check": "node build/lib/layersChecker.js", "update-distro": "node build/npm/update-distro.js", "web": "node resources/web/code-web.js", diff --git a/scripts/generate-definitelytyped.sh b/scripts/generate-definitelytyped.sh index 1b139ebbf79a8..226515da2db63 100755 --- a/scripts/generate-definitelytyped.sh +++ b/scripts/generate-definitelytyped.sh @@ -22,10 +22,10 @@ header="// Type definitions for Visual Studio Code ${1} * See https://code.visualstudio.com/api for more information */" -if [ -f ./src/vs/vscode.d.ts ]; then +if [ -f ./src/vscode-dts/vscode.d.ts ]; then echo "$header" > index.d.ts - sed "1,4d" ./src/vs/vscode.d.ts >> index.d.ts + sed "1,4d" ./src/vscode-dts/vscode.d.ts >> index.d.ts echo "Generated index.d.ts for version ${1}." else - echo "Can't find ./src/vs/vscode.d.ts. Run this script at vscode root." + echo "Can't find ./src/vscode-dts/vscode.d.ts. Run this script at vscode root." fi diff --git a/src/tsconfig.json b/src/tsconfig.json index 425d1e815ac87..11423e45e61c0 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -24,6 +24,8 @@ }, "include": [ "./typings", - "./vs" + "./vs", + "vscode-dts/vscode.proposed.d.ts", + "vscode-dts/vscode.d.ts" ] } diff --git a/src/tsconfig.vscode-dts.json b/src/tsconfig.vscode-dts.json index 1ff4ea3efa040..4ae9bc7643a37 100644 --- a/src/tsconfig.vscode-dts.json +++ b/src/tsconfig.vscode-dts.json @@ -17,6 +17,6 @@ ], }, "include": [ - "vs/vscode.d.ts" + "vscode-dts/vscode.d.ts" ] } diff --git a/src/tsconfig.vscode-proposed-dts.json b/src/tsconfig.vscode-proposed-dts.json index 4a641eabdb5b2..802e37e567efb 100644 --- a/src/tsconfig.vscode-proposed-dts.json +++ b/src/tsconfig.vscode-proposed-dts.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.vscode-dts.json", "include": [ - "vs/vscode.d.ts", - "vs/vscode.proposed.d.ts", + "vscode-dts/vscode.d.ts", + "vscode-dts/vscode.proposed.d.ts", ] } diff --git a/src/vs/vscode.d.ts b/src/vscode-dts/vscode.d.ts similarity index 100% rename from src/vs/vscode.d.ts rename to src/vscode-dts/vscode.d.ts diff --git a/src/vs/vscode.proposed.d.ts b/src/vscode-dts/vscode.proposed.d.ts similarity index 100% rename from src/vs/vscode.proposed.d.ts rename to src/vscode-dts/vscode.proposed.d.ts