Skip to content

Commit

Permalink
move vscode.d.ts and vscode.proposed.d.ts into src/vscode-dts-folder,
Browse files Browse the repository at this point in the history 
#131165
  • Loading branch information
@jrieken
jrieken committed Nov 9, 2021
1 parent 799d82f commit 9254a8c
Show file tree
Hide file tree
Showing 40 changed files with 66 additions and 64 deletions.
2 changes: 1 addition & 1 deletion build/azure-pipelines/publish-types/update-types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}`);

Expand Down
2 changes: 1 addition & 1 deletion build/gulpfile.vscode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 });

Expand Down
2 changes: 1 addition & 1 deletion extensions/configuration-editing/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference types='@types/node'/>
4 changes: 2 additions & 2 deletions extensions/css-language-features/client/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*--------------------------------------------------------------------------------------------*/
/// <reference path='../../../../../src/vs/vscode.d.ts'/>
/// <reference path="../../../../../src/vs/vscode.proposed.d.ts" />
/// <reference path='../../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference path="../../../../../src/vscode-dts/vscode.proposed.d.ts" />
2 changes: 1 addition & 1 deletion extensions/debug-auto-launch/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference types='@types/node'/>
4 changes: 2 additions & 2 deletions extensions/debug-server-ready/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.proposed.d.ts'/>
/// <reference types='@types/node'/>
2 changes: 1 addition & 1 deletion extensions/emmet/src/typings/refs.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference types='@types/node'/>
2 changes: 1 addition & 1 deletion extensions/extension-editing/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
4 changes: 2 additions & 2 deletions extensions/git/src/typings/refs.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.proposed.d.ts'/>
/// <reference path="../../../types/lib.textEncoder.d.ts" />
4 changes: 2 additions & 2 deletions extensions/github-authentication/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.proposed.d.ts'/>
4 changes: 2 additions & 2 deletions extensions/github/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.proposed.d.ts'/>

declare module 'tunnel';
2 changes: 1 addition & 1 deletion extensions/grunt/src/typings/refs.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference types='@types/node'/>
2 changes: 1 addition & 1 deletion extensions/gulp/src/typings/refs.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference types='@types/node'/>
4 changes: 2 additions & 2 deletions extensions/html-language-features/client/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../../src/vs/vscode.d.ts'/>
/// <reference path="../../../../../src/vs/vscode.proposed.d.ts" />
/// <reference path='../../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference path="../../../../../src/vscode-dts/vscode.proposed.d.ts" />
4 changes: 2 additions & 2 deletions extensions/image-preview/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.proposed.d.ts'/>
4 changes: 2 additions & 2 deletions extensions/ipynb/src/types.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/


/// <reference path='../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path='../../../src/vscode-dts/vscode.d.ts'/>
/// <reference path='../../../src/vscode-dts/vscode.proposed.d.ts'/>

declare module '@enonic/fnv-plus';
2 changes: 1 addition & 1 deletion extensions/jake/src/typings/refs.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference types='@types/node'/>
4 changes: 2 additions & 2 deletions extensions/json-language-features/client/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../../src/vs/vscode.d.ts'/>
/// <reference path="../../../../../src/vs/vscode.proposed.d.ts" />
/// <reference path='../../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference path="../../../../../src/vscode-dts/vscode.proposed.d.ts" />
4 changes: 2 additions & 2 deletions extensions/markdown-language-features/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.proposed.d.ts'/>

declare module 'markdown-it-front-matter';
2 changes: 1 addition & 1 deletion extensions/markdown-math/src/types.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*--------------------------------------------------------------------------------------------*/
/// <reference path='../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../src/vscode-dts/vscode.d.ts'/>
2 changes: 1 addition & 1 deletion extensions/merge-conflict/src/typings/refs.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference types='@types/node'/>
4 changes: 2 additions & 2 deletions extensions/microsoft-authentication/src/typings/refs.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.proposed.d.ts'/>
4 changes: 2 additions & 2 deletions extensions/npm/src/typings/refs.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.proposed.d.ts'/>
/// <reference types='@types/node'/>
4 changes: 2 additions & 2 deletions extensions/php-language-features/src/typings/refs.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference types='@types/node'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.proposed.d.ts'/>
4 changes: 2 additions & 2 deletions extensions/search-result/src/typings/refs.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.proposed.d.ts'/>
4 changes: 2 additions & 2 deletions extensions/simple-browser/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.proposed.d.ts'/>
3 changes: 2 additions & 1 deletion extensions/typescript-language-features/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.proposed.d.ts'/>
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
6 changes: 4 additions & 2 deletions extensions/typescript-language-features/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
},
Expand Down
4 changes: 2 additions & 2 deletions extensions/vscode-api-tests/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path="../../../../src/vs/vscode.d.ts" />
/// <reference path="../../../../src/vs/vscode.proposed.d.ts" />
/// <reference path="../../../../src/vscode-dts/vscode.d.ts" />
/// <reference path="../../../../src/vscode-dts/vscode.proposed.d.ts" />
/// <reference types='@types/node'/>
5 changes: 2 additions & 3 deletions extensions/vscode-colorize-tests/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path="../../../../src/vs/vscode.d.ts" />
/// <reference path="../../../../src/vs/vscode.proposed.d.ts" />
/// <reference path="../../../../src/vscode-dts/vscode.d.ts" />
/// <reference path="../../../../src/vscode-dts/vscode.proposed.d.ts" />
/// <reference types='@types/node'/>

3 changes: 1 addition & 2 deletions extensions/vscode-custom-editor-tests/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path="../../../../src/vs/vscode.d.ts" />
/// <reference path="../../../../src/vscode-dts/vscode.d.ts" />
/// <reference types='@types/node'/>

5 changes: 2 additions & 3 deletions extensions/vscode-notebook-tests/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path="../../../../src/vs/vscode.d.ts" />
/// <reference path="../../../../src/vs/vscode.proposed.d.ts" />
/// <reference path="../../../../src/vscode-dts/vscode.d.ts" />
/// <reference path="../../../../src/vscode-dts/vscode.proposed.d.ts" />
/// <reference types='@types/node'/>

4 changes: 2 additions & 2 deletions extensions/vscode-test-resolver/src/typings/ref.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/// <reference path="../../../../src/vs/vscode.d.ts" />
/// <reference path="../../../../src/vs/vscode.proposed.d.ts" />
/// <reference path="../../../../src/vscode-dts/vscode.d.ts" />
/// <reference path="../../../../src/vscode-dts/vscode.proposed.d.ts" />
/// <reference types='@types/node'/>
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions scripts/generate-definitelytyped.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion src/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
},
"include": [
"./typings",
"./vs"
"./vs",
"vscode-dts/vscode.proposed.d.ts",
"vscode-dts/vscode.d.ts"
]
}
2 changes: 1 addition & 1 deletion src/tsconfig.vscode-dts.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
],
},
"include": [
"vs/vscode.d.ts"
"vscode-dts/vscode.d.ts"
]
}
4 changes: 2 additions & 2 deletions src/tsconfig.vscode-proposed-dts.json
View file
Original file line number Diff line number Diff line change
@@ -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",
]
}
0 src/vs/vscode.d.ts → src/vscode-dts/vscode.d.ts
View file
File renamed without changes.
0 src/vs/vscode.proposed.d.ts → src/vscode-dts/vscode.proposed.d.ts
View file
File renamed without changes.

0 comments on commit 9254a8c

Please sign in to comment.