diff --git a/extensions/css-language-features/client/tsconfig.json b/extensions/css-language-features/client/tsconfig.json index e6a92d451d8..573b24b4aa6 100644 --- a/extensions/css-language-features/client/tsconfig.json +++ b/extensions/css-language-features/client/tsconfig.json @@ -5,7 +5,6 @@ }, "include": [ "src/**/*", - "../../../src/vscode-dts/vscode.d.ts", - "../../../src/vscode-dts/vscode.proposed.*.d.ts", + "../../../src/vscode-dts/vscode.d.ts" ] } diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json index 7c3b8e75472..88994a67f44 100644 --- a/extensions/css-language-features/package.json +++ b/extensions/css-language-features/package.json @@ -17,7 +17,6 @@ ], "main": "./client/out/node/cssClientMain", "browser": "./client/dist/browser/cssClientMain", - "enableProposedApi": true, "capabilities": { "virtualWorkspaces": true, "untrustedWorkspaces": { diff --git a/extensions/debug-server-ready/package.json b/extensions/debug-server-ready/package.json index e5c69df006b..64aa227aa53 100644 --- a/extensions/debug-server-ready/package.json +++ b/extensions/debug-server-ready/package.json @@ -18,7 +18,9 @@ "supported": true } }, - "enableProposedApi": true, + "enabledApiProposals": [ + "terminalDataWriteEvent" + ], "main": "./out/extension", "scripts": { "compile": "gulp compile-extension:debug-server-ready", diff --git a/extensions/debug-server-ready/tsconfig.json b/extensions/debug-server-ready/tsconfig.json index ea25ee33fda..9bf747283ca 100644 --- a/extensions/debug-server-ready/tsconfig.json +++ b/extensions/debug-server-ready/tsconfig.json @@ -10,6 +10,6 @@ "include": [ "src/**/*", "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts", + "../../src/vscode-dts/vscode.proposed.terminalDataWriteEvent.d.ts", ] } diff --git a/extensions/git/package.json b/extensions/git/package.json index adacad15ae9..e14ea0dc12a 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -9,7 +9,13 @@ "vscode": "^1.5.0" }, "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", - "enableProposedApi": true, + "enabledApiProposals": [ + "diffCommand", + "scmActionButton", + "scmSelectedProvider", + "scmValidation", + "timeline" + ], "categories": [ "Other" ], diff --git a/extensions/git/tsconfig.json b/extensions/git/tsconfig.json index c64e35be794..99129079e48 100644 --- a/extensions/git/tsconfig.json +++ b/extensions/git/tsconfig.json @@ -10,7 +10,11 @@ "include": [ "src/**/*", "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts", + "../../src/vscode-dts/vscode.proposed.diffCommand.d.ts", + "../../src/vscode-dts/vscode.proposed.scmActionButton.d.ts", + "../../src/vscode-dts/vscode.proposed.scmSelectedProvider.d.ts", + "../../src/vscode-dts/vscode.proposed.scmValidation.d.ts", + "../../src/vscode-dts/vscode.proposed.timeline.d.ts", "../types/lib.textEncoder.d.ts" ] } diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json index 45c6a4b5175..2dbf469fd26 100644 --- a/extensions/github-authentication/package.json +++ b/extensions/github-authentication/package.json @@ -9,7 +9,6 @@ "vscode": "^1.41.0" }, "icon": "images/icon.png", - "enableProposedApi": true, "categories": [ "Other" ], diff --git a/extensions/github-authentication/tsconfig.json b/extensions/github-authentication/tsconfig.json index 4d6c63c3a86..d7aed1836ee 100644 --- a/extensions/github-authentication/tsconfig.json +++ b/extensions/github-authentication/tsconfig.json @@ -9,7 +9,6 @@ }, "include": [ "src/**/*", - "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../src/vscode-dts/vscode.d.ts" ] } diff --git a/extensions/github/package.json b/extensions/github/package.json index f21080ab6f1..5e3e72a7b1c 100644 --- a/extensions/github/package.json +++ b/extensions/github/package.json @@ -9,7 +9,6 @@ "vscode": "^1.41.0" }, "icon": "images/icon.png", - "enableProposedApi": true, "categories": [ "Other" ], diff --git a/extensions/github/tsconfig.json b/extensions/github/tsconfig.json index 4d6c63c3a86..d7aed1836ee 100644 --- a/extensions/github/tsconfig.json +++ b/extensions/github/tsconfig.json @@ -9,7 +9,6 @@ }, "include": [ "src/**/*", - "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../src/vscode-dts/vscode.d.ts" ] } diff --git a/extensions/html-language-features/client/tsconfig.json b/extensions/html-language-features/client/tsconfig.json index f71a7ae175e..573b24b4aa6 100644 --- a/extensions/html-language-features/client/tsconfig.json +++ b/extensions/html-language-features/client/tsconfig.json @@ -5,7 +5,6 @@ }, "include": [ "src/**/*", - "../../../src/vscode-dts/vscode.d.ts", - "../../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../../src/vscode-dts/vscode.d.ts" ] } diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json index ddaf33bcb65..07bbfe29e9a 100644 --- a/extensions/html-language-features/package.json +++ b/extensions/html-language-features/package.json @@ -1,5 +1,4 @@ { - "enableProposedApi": true, "name": "html-language-features", "displayName": "%displayName%", "description": "%description%", diff --git a/extensions/image-preview/package.json b/extensions/image-preview/package.json index c9aa3d23a85..8b730de9790 100644 --- a/extensions/image-preview/package.json +++ b/extensions/image-preview/package.json @@ -9,7 +9,6 @@ "version": "1.0.0", "publisher": "vscode", "icon": "icon.png", - "enableProposedApi": true, "license": "MIT", "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", "engines": { diff --git a/extensions/image-preview/tsconfig.json b/extensions/image-preview/tsconfig.json index deb0d3842a3..c5194e2e33c 100644 --- a/extensions/image-preview/tsconfig.json +++ b/extensions/image-preview/tsconfig.json @@ -6,7 +6,6 @@ }, "include": [ "src/**/*", - "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../src/vscode-dts/vscode.d.ts" ] } diff --git a/extensions/ipynb/package.json b/extensions/ipynb/package.json index cffba92357d..b31a322dff3 100644 --- a/extensions/ipynb/package.json +++ b/extensions/ipynb/package.json @@ -8,7 +8,10 @@ "engines": { "vscode": "^1.57.0" }, - "enableProposedApi": true, + "enabledApiProposals": [ + "notebookEditor", + "notebookEditorEdit" + ], "activationEvents": [ "onNotebook:jupyter-notebook" ], @@ -36,16 +39,16 @@ ] } ], - "grammars": [ - { - "language": "jupyter", - "scopeName": "source.jupyter", - "path": "./syntaxes/jupyter.tmLanguage.json", - "embeddedLanguages": { - "source.json": "json" - } - } - ], + "grammars": [ + { + "language": "jupyter", + "scopeName": "source.jupyter", + "path": "./syntaxes/jupyter.tmLanguage.json", + "embeddedLanguages": { + "source.json": "json" + } + } + ], "notebooks": [ { "type": "jupyter-notebook", @@ -59,10 +62,10 @@ } ] }, - "scripts": { - "compile": "npx gulp compile-extension:ipynb", - "watch": "npx gulp watch-extension:ipynb" - }, + "scripts": { + "compile": "npx gulp compile-extension:ipynb", + "watch": "npx gulp watch-extension:ipynb" + }, "dependencies": { "@enonic/fnv-plus": "^1.3.0", "detect-indent": "^6.0.0", @@ -72,8 +75,8 @@ "@jupyterlab/coreutils": "^3.1.0", "@types/uuid": "^8.3.1" }, - "repository": { - "type": "git", - "url": "https://github.com/microsoft/vscode.git" - } + "repository": { + "type": "git", + "url": "https://github.com/microsoft/vscode.git" + } } diff --git a/extensions/ipynb/tsconfig.json b/extensions/ipynb/tsconfig.json index 1e72bb74947..2032bf87b0d 100644 --- a/extensions/ipynb/tsconfig.json +++ b/extensions/ipynb/tsconfig.json @@ -9,6 +9,7 @@ "include": [ "src/**/*", "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../src/vscode-dts/vscode.proposed.notebookEditor.d.ts", + "../../src/vscode-dts/vscode.proposed.notebookEditorEdit.d.ts", ] } diff --git a/extensions/json-language-features/client/tsconfig.json b/extensions/json-language-features/client/tsconfig.json index f71a7ae175e..573b24b4aa6 100644 --- a/extensions/json-language-features/client/tsconfig.json +++ b/extensions/json-language-features/client/tsconfig.json @@ -5,7 +5,6 @@ }, "include": [ "src/**/*", - "../../../src/vscode-dts/vscode.d.ts", - "../../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../../src/vscode-dts/vscode.d.ts" ] } diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json index 91dcbb8d554..6a6fb61c9a6 100644 --- a/extensions/json-language-features/package.json +++ b/extensions/json-language-features/package.json @@ -16,7 +16,6 @@ ], "main": "./client/out/node/jsonClientMain", "browser": "./client/dist/browser/jsonClientMain", - "enableProposedApi": true, "capabilities": { "virtualWorkspaces": true, "untrustedWorkspaces": { diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json index ba2157fde37..3734ba11aaf 100644 --- a/extensions/markdown-language-features/package.json +++ b/extensions/markdown-language-features/package.json @@ -5,7 +5,6 @@ "version": "1.0.0", "icon": "icon.png", "publisher": "vscode", - "enableProposedApi": true, "license": "MIT", "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", "engines": { diff --git a/extensions/markdown-language-features/tsconfig.json b/extensions/markdown-language-features/tsconfig.json index 5bede697077..fcd79775de5 100644 --- a/extensions/markdown-language-features/tsconfig.json +++ b/extensions/markdown-language-features/tsconfig.json @@ -5,7 +5,6 @@ }, "include": [ "src/**/*", - "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../src/vscode-dts/vscode.d.ts" ] } diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json index ef97ae07a9b..33e5eb749fc 100644 --- a/extensions/microsoft-authentication/package.json +++ b/extensions/microsoft-authentication/package.json @@ -12,7 +12,6 @@ "categories": [ "Other" ], - "enableProposedApi": true, "activationEvents": [ "onAuthenticationRequest:microsoft" ], diff --git a/extensions/microsoft-authentication/tsconfig.json b/extensions/microsoft-authentication/tsconfig.json index d8764400622..51edc522bc6 100644 --- a/extensions/microsoft-authentication/tsconfig.json +++ b/extensions/microsoft-authentication/tsconfig.json @@ -18,7 +18,6 @@ ], "include": [ "src/**/*", - "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../src/vscode-dts/vscode.d.ts" ] } diff --git a/extensions/npm/package.json b/extensions/npm/package.json index 3e85fc13ae1..fbc75dd0fb5 100644 --- a/extensions/npm/package.json +++ b/extensions/npm/package.json @@ -8,7 +8,6 @@ "engines": { "vscode": "0.10.x" }, - "enableProposedApi": true, "icon": "images/npm_icon.png", "categories": [ "Other" diff --git a/extensions/npm/tsconfig.json b/extensions/npm/tsconfig.json index 3ef85d919ec..7234fdfeb97 100644 --- a/extensions/npm/tsconfig.json +++ b/extensions/npm/tsconfig.json @@ -8,7 +8,6 @@ }, "include": [ "src/**/*", - "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../src/vscode-dts/vscode.d.ts" ] } diff --git a/extensions/php-language-features/package.json b/extensions/php-language-features/package.json index 8447f019786..03176a05573 100644 --- a/extensions/php-language-features/package.json +++ b/extensions/php-language-features/package.json @@ -9,7 +9,6 @@ "engines": { "vscode": "0.10.x" }, - "enableProposedApi": true, "activationEvents": [ "onLanguage:php" ], diff --git a/extensions/php-language-features/tsconfig.json b/extensions/php-language-features/tsconfig.json index 3ef85d919ec..7234fdfeb97 100644 --- a/extensions/php-language-features/tsconfig.json +++ b/extensions/php-language-features/tsconfig.json @@ -8,7 +8,6 @@ }, "include": [ "src/**/*", - "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../src/vscode-dts/vscode.d.ts" ] } diff --git a/extensions/search-result/package.json b/extensions/search-result/package.json index d7f9aa4a138..fe64cfa8fe0 100644 --- a/extensions/search-result/package.json +++ b/extensions/search-result/package.json @@ -3,7 +3,6 @@ "displayName": "%displayName%", "description": "%description%", "version": "1.0.0", - "enableProposedApi": true, "publisher": "vscode", "license": "MIT", "icon": "images/icon.png", diff --git a/extensions/search-result/tsconfig.json b/extensions/search-result/tsconfig.json index ab6639e3a9d..f0f7c00adf5 100644 --- a/extensions/search-result/tsconfig.json +++ b/extensions/search-result/tsconfig.json @@ -5,7 +5,6 @@ }, "include": [ "src/**/*", - "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../src/vscode-dts/vscode.d.ts" ] } diff --git a/extensions/simple-browser/package.json b/extensions/simple-browser/package.json index a1b2560bbc9..ea0fd90265b 100644 --- a/extensions/simple-browser/package.json +++ b/extensions/simple-browser/package.json @@ -2,7 +2,9 @@ "name": "simple-browser", "displayName": "%displayName%", "description": "%description%", - "enableProposedApi": true, + "enabledApiProposals": [ + "externalUriOpener" + ], "version": "1.0.0", "icon": "media/icon.png", "publisher": "vscode", diff --git a/extensions/simple-browser/tsconfig.json b/extensions/simple-browser/tsconfig.json index deb0d3842a3..bd370826678 100644 --- a/extensions/simple-browser/tsconfig.json +++ b/extensions/simple-browser/tsconfig.json @@ -7,6 +7,6 @@ "include": [ "src/**/*", "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../src/vscode-dts/vscode.proposed.externalUriOpener.d.ts", ] } diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json index 280a5fe744e..3eaf31c0c5d 100644 --- a/extensions/typescript-language-features/package.json +++ b/extensions/typescript-language-features/package.json @@ -7,9 +7,11 @@ "publisher": "vscode", "license": "MIT", "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", - "enableProposedApi": true, "enabledApiProposals": [ - "languageStatus" + "inlayHints", + "languageStatus", + "resolvers", + "workspaceTrust" ], "capabilities": { "virtualWorkspaces": { diff --git a/extensions/typescript-language-features/tsconfig.json b/extensions/typescript-language-features/tsconfig.json index 2d5e8c31a3b..07d4066f89b 100644 --- a/extensions/typescript-language-features/tsconfig.json +++ b/extensions/typescript-language-features/tsconfig.json @@ -10,7 +10,9 @@ "include": [ "src/**/*", "../../src/vscode-dts/vscode.d.ts", + "../../src/vscode-dts/vscode.proposed.inlayHints.d.ts", "../../src/vscode-dts/vscode.proposed.languageStatus.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../src/vscode-dts/vscode.proposed.resolvers.d.ts", + "../../src/vscode-dts/vscode.proposed.workspaceTrust.d.ts", ] } diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json index dcdd8b608a9..a4b8c32909a 100644 --- a/extensions/vscode-api-tests/package.json +++ b/extensions/vscode-api-tests/package.json @@ -4,7 +4,54 @@ "version": "0.0.1", "publisher": "vscode", "license": "MIT", - "enableProposedApi": true, + "enabledApiProposals": [ + "authSession", + "customEditorMove", + "diffCommand", + "documentFiltersExclusive", + "editorInsets", + "extensionRuntime", + "externalUriOpener", + "fileSearchProvider", + "findTextInFiles", + "fsChunks", + "inlayHints", + "inlineCompletions", + "languageStatus", + "notebookCellExecutionState", + "notebookConcatTextDocument", + "notebookContentProvider", + "notebookControllerKind", + "notebookDebugOptions", + "notebookDeprecated", + "notebookEditor", + "notebookEditorDecorationType", + "notebookEditorEdit", + "notebookLiveShare", + "notebookMessaging", + "notebookMime", + "portsAttributes", + "quickPickSortByLabel", + "resolvers", + "scmActionButton", + "scmSelectedProvider", + "scmValidation", + "tabs", + "taskPresentationGroup", + "terminalDataWriteEvent", + "terminalDimensions", + "terminalLocation", + "terminalNameChangeEvent", + "testCoverage", + "testObserver", + "textDocumentNotebook", + "textSearchProvider", + "timeline", + "tokenInformation", + "treeViewDragAndDrop", + "treeViewReveal", + "workspaceTrust" + ], "private": true, "activationEvents": [], "main": "./out/extension", diff --git a/extensions/vscode-colorize-tests/package.json b/extensions/vscode-colorize-tests/package.json index b2ce2e9d9cf..b27439bf8b6 100644 --- a/extensions/vscode-colorize-tests/package.json +++ b/extensions/vscode-colorize-tests/package.json @@ -9,7 +9,6 @@ "onLanguage:json" ], "main": "./out/colorizerTestMain", - "enableProposedApi": true, "engines": { "vscode": "*" }, diff --git a/extensions/vscode-colorize-tests/tsconfig.json b/extensions/vscode-colorize-tests/tsconfig.json index 3ef85d919ec..7234fdfeb97 100644 --- a/extensions/vscode-colorize-tests/tsconfig.json +++ b/extensions/vscode-colorize-tests/tsconfig.json @@ -8,7 +8,6 @@ }, "include": [ "src/**/*", - "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../src/vscode-dts/vscode.d.ts" ] } diff --git a/extensions/vscode-custom-editor-tests/package.json b/extensions/vscode-custom-editor-tests/package.json index acdd4adcb9e..778f5c56cf0 100644 --- a/extensions/vscode-custom-editor-tests/package.json +++ b/extensions/vscode-custom-editor-tests/package.json @@ -9,7 +9,6 @@ "onCustomEditor:testWebviewEditor.abc" ], "main": "./out/extension", - "enableProposedApi": true, "engines": { "vscode": "^1.48.0" }, diff --git a/extensions/vscode-notebook-tests/package.json b/extensions/vscode-notebook-tests/package.json index cc0264bb1a3..3cf93067634 100644 --- a/extensions/vscode-notebook-tests/package.json +++ b/extensions/vscode-notebook-tests/package.json @@ -9,7 +9,20 @@ "*" ], "main": "./out/extension", - "enableProposedApi": true, + "enabledApiProposals": [ + "notebookCellExecutionState", + "notebookConcatTextDocument", + "notebookContentProvider", + "notebookControllerKind", + "notebookDebugOptions", + "notebookDeprecated", + "notebookEditor", + "notebookEditorDecorationType", + "notebookEditorEdit", + "notebookLiveShare", + "notebookMessaging", + "notebookMime" + ], "engines": { "vscode": "^1.25.0" }, diff --git a/extensions/vscode-notebook-tests/tsconfig.json b/extensions/vscode-notebook-tests/tsconfig.json index 3ef85d919ec..c9c35c63299 100644 --- a/extensions/vscode-notebook-tests/tsconfig.json +++ b/extensions/vscode-notebook-tests/tsconfig.json @@ -9,6 +9,6 @@ "include": [ "src/**/*", "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../src/vscode-dts/vscode.proposed.notebook*.d.ts" ] } diff --git a/extensions/vscode-test-resolver/package.json b/extensions/vscode-test-resolver/package.json index 99a836fd6c2..76946671bda 100644 --- a/extensions/vscode-test-resolver/package.json +++ b/extensions/vscode-test-resolver/package.json @@ -4,7 +4,9 @@ "version": "0.0.1", "publisher": "vscode", "license": "MIT", - "enableProposedApi": true, + "enabledApiProposals": [ + "resolvers" + ], "private": true, "engines": { "vscode": "^1.25.0" diff --git a/extensions/vscode-test-resolver/tsconfig.json b/extensions/vscode-test-resolver/tsconfig.json index 3ef85d919ec..f9a183ef9e1 100644 --- a/extensions/vscode-test-resolver/tsconfig.json +++ b/extensions/vscode-test-resolver/tsconfig.json @@ -9,6 +9,6 @@ "include": [ "src/**/*", "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.*.d.ts" + "../../src/vscode-dts/vscode.proposed.resolvers.d.ts" ] }