diff --git a/.devcontainer/README.md b/.devcontainer/README.md index 9050664fcee..47d682f8a8e 100644 --- a/.devcontainer/README.md +++ b/.devcontainer/README.md @@ -1,6 +1,6 @@ # Code - OSS Development Container -[![Open in Remote - Containers](https://img.shields.io/static/v1?label=Remote%20-%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode) +[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode) This repository includes configuration for a development container for working with Code - OSS in a local container or using [GitHub Codespaces](https://github.com/features/codespaces). @@ -8,21 +8,21 @@ This repository includes configuration for a development container for working w ## Quick start - local -If you already have VS Code and Docker installed, you can click the badge above or [here](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode) to get started. Clicking these links will cause VS Code to automatically install the Remote - Containers extension if needed, clone the source code into a container volume, and spin up a dev container for use. +If you already have VS Code and Docker installed, you can click the badge above or [here](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode) to get started. Clicking these links will cause VS Code to automatically install the Dev Containers extension if needed, clone the source code into a container volume, and spin up a dev container for use. 1. Install Docker Desktop or Docker for Linux on your local machine. (See [docs](https://aka.ms/vscode-remote/containers/getting-started) for additional details.) -2. **Important**: Docker needs at least **4 Cores and 8 GB of RAM** to run a full build. If you are on macOS, or are using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item and going to **Preferences/Settings > Resources > Advanced**. +2. **Important**: Docker needs at least **4 Cores and 8 GB of RAM** to run a full build with **9 GB of RAM** being recommended. If you are on macOS, or are using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item and going to **Preferences/Settings > Resources > Advanced**. > **Note:** The [Resource Monitor](https://marketplace.visualstudio.com/items?itemName=mutantdino.resourcemonitor) extension is included in the container so you can keep an eye on CPU/Memory in the status bar. -3. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the [Remote - Containers](https://aka.ms/vscode-remote/download/containers) extension. +3. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the [Dev Containers](https://aka.ms/vscode-remote/download/containers) extension. - ![Image of Remote - Containers extension](https://microsoft.github.io/vscode-remote-release/images/remote-containers-extn.png) + ![Image of Dev Containers extension](https://microsoft.github.io/vscode-remote-release/images/remote-containers-extn.png) - > **Note:** The Remote - Containers extension requires the Visual Studio Code distribution of Code - OSS. See the [FAQ](https://aka.ms/vscode-remote/faq/license) for details. + > **Note:** The Dev Containers extension requires the Visual Studio Code distribution of Code - OSS. See the [FAQ](https://aka.ms/vscode-remote/faq/license) for details. -4. Press Ctrl/Cmd + Shift + P or F1 and select **Remote-Containers: Clone Repository in Container Volume...**. +4. Press Ctrl/Cmd + Shift + P or F1 and select **Dev Containers: Clone Repository in Container Volume...**. > **Tip:** While you can use your local source tree instead, operations like `yarn install` can be slow on macOS or when using the Hyper-V engine on Windows. We recommend the "clone repository in container" approach instead since it uses "named volume" rather than the local filesystem. diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3e40ce61f95..63b61fb7a10 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,9 +6,18 @@ "overrideCommand": false, "runArgs": [ "--init", "--security-opt", "seccomp=unconfined", "--shm-size=1g"], - "settings": { - "resmon.show.battery": false, - "resmon.show.cpufreq": false + // VS Code extensions and settings + "customizations": { + "vscode": { + "settings": { + "resmon.show.battery": false, + "resmon.show.cpufreq": false + }, + "extensions": [ + "dbaeumer.vscode-eslint", + "mutantdino.resourcemonitor" + ] + } }, // noVNC, VNC @@ -24,17 +33,12 @@ } }, - "extensions": [ - "dbaeumer.vscode-eslint", - "mutantdino.resourcemonitor" - ], - // Optionally loads a cached yarn install for the repo "postCreateCommand": ".devcontainer/cache/restore-diff.sh", "remoteUser": "node", "hostRequirements": { - "memory": "8gb" + "memory": "9gb" } } diff --git a/.eslintignore b/.eslintignore index 1c49d5b8846..af5f9a4940b 100644 --- a/.eslintignore +++ b/.eslintignore @@ -6,6 +6,7 @@ **/extensions/css-language-features/server/test/pathCompletionFixtures/** **/extensions/html-language-features/server/lib/jquery.d.ts **/extensions/html-language-features/server/src/test/pathCompletionFixtures/** +**/extensions/ipynb/notebook-out/** **/extensions/markdown-language-features/media/** **/extensions/markdown-language-features/notebook-out/** **/extensions/markdown-math/notebook-out/** @@ -25,10 +26,7 @@ **/src/typings/**/*.d.ts **/src/vs/*/**/*.d.ts **/src/vs/base/test/common/filters.perf.data.js -**/src/vs/css.build.js -**/src/vs/css.js **/src/vs/loader.js -**/src/vs/nls.build.js -**/src/vs/nls.js **/test/unit/assert.js +**/test/automation/out/** **/typings/** diff --git a/build/lib/eslint/code-import-patterns.ts b/.eslintplugin/code-import-patterns.ts similarity index 98% rename from build/lib/eslint/code-import-patterns.ts rename to .eslintplugin/code-import-patterns.ts index 72b63a45b35..c9a24c849d7 100644 --- a/build/lib/eslint/code-import-patterns.ts +++ b/.eslintplugin/code-import-patterns.ts @@ -6,10 +6,10 @@ import * as eslint from 'eslint'; import { TSESTree } from '@typescript-eslint/experimental-utils'; import * as path from 'path'; -import * as minimatch from 'minimatch'; +import minimatch from 'minimatch'; import { createImportRuleListener } from './utils'; -const REPO_ROOT = path.normalize(path.join(__dirname, '../../../')); +const REPO_ROOT = path.normalize(path.join(__dirname, '../')); interface ConditionalPattern { when?: 'hasBrowser' | 'hasNode' | 'test'; diff --git a/build/lib/eslint/code-layering.ts b/.eslintplugin/code-layering.ts similarity index 100% rename from build/lib/eslint/code-layering.ts rename to .eslintplugin/code-layering.ts diff --git a/build/lib/eslint/code-no-look-behind-regex.ts b/.eslintplugin/code-no-look-behind-regex.ts similarity index 99% rename from build/lib/eslint/code-no-look-behind-regex.ts rename to .eslintplugin/code-no-look-behind-regex.ts index ef3959e39c6..800b59b6479 100644 --- a/build/lib/eslint/code-no-look-behind-regex.ts +++ b/.eslintplugin/code-no-look-behind-regex.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as eslint from 'eslint'; import { TSESTree } from '@typescript-eslint/experimental-utils'; import * as ESTree from 'estree'; diff --git a/build/lib/eslint/code-no-nls-in-standalone-editor.ts b/.eslintplugin/code-no-nls-in-standalone-editor.ts similarity index 100% rename from build/lib/eslint/code-no-nls-in-standalone-editor.ts rename to .eslintplugin/code-no-nls-in-standalone-editor.ts diff --git a/build/lib/eslint/code-no-standalone-editor.ts b/.eslintplugin/code-no-standalone-editor.ts similarity index 100% rename from build/lib/eslint/code-no-standalone-editor.ts rename to .eslintplugin/code-no-standalone-editor.ts diff --git a/build/lib/eslint/code-no-test-only.ts b/.eslintplugin/code-no-test-only.ts similarity index 100% rename from build/lib/eslint/code-no-test-only.ts rename to .eslintplugin/code-no-test-only.ts diff --git a/build/lib/eslint/code-no-unexternalized-strings.ts b/.eslintplugin/code-no-unexternalized-strings.ts similarity index 98% rename from build/lib/eslint/code-no-unexternalized-strings.ts rename to .eslintplugin/code-no-unexternalized-strings.ts index 056a99868ea..d0c30527f7c 100644 --- a/build/lib/eslint/code-no-unexternalized-strings.ts +++ b/.eslintplugin/code-no-unexternalized-strings.ts @@ -51,7 +51,7 @@ export = new class NoUnexternalizedStrings implements eslint.Rule.RuleModule { key = keyNode.value; } else if (keyNode.type === AST_NODE_TYPES.ObjectExpression) { - for (let property of keyNode.properties) { + for (const property of keyNode.properties) { if (property.type === AST_NODE_TYPES.Property && !property.computed) { if (property.key.type === AST_NODE_TYPES.Identifier && property.key.name === 'key') { if (isStringLiteral(property.value)) { @@ -97,7 +97,7 @@ export = new class NoUnexternalizedStrings implements eslint.Rule.RuleModule { // (2) // report all invalid NLS keys if (!key.match(NoUnexternalizedStrings._rNlsKeys)) { - for (let value of values) { + for (const value of values) { context.report({ loc: value.call.loc, messageId: 'badKey', data: { key } }); } } diff --git a/build/lib/eslint/code-no-unused-expressions.ts b/.eslintplugin/code-no-unused-expressions.ts similarity index 99% rename from build/lib/eslint/code-no-unused-expressions.ts rename to .eslintplugin/code-no-unused-expressions.ts index f5f0728836e..450365de2c6 100644 --- a/build/lib/eslint/code-no-unused-expressions.ts +++ b/.eslintplugin/code-no-unused-expressions.ts @@ -11,8 +11,6 @@ * @author Michael Ficarra */ -'use strict'; - import * as eslint from 'eslint'; import { TSESTree } from '@typescript-eslint/experimental-utils'; import * as ESTree from 'estree'; diff --git a/build/lib/eslint/code-translation-remind.ts b/.eslintplugin/code-translation-remind.ts similarity index 100% rename from build/lib/eslint/code-translation-remind.ts rename to .eslintplugin/code-translation-remind.ts diff --git a/.eslintplugin/index.js b/.eslintplugin/index.js new file mode 100644 index 00000000000..9f45316837a --- /dev/null +++ b/.eslintplugin/index.js @@ -0,0 +1,12 @@ +const glob = require('glob'); +const path = require('path'); + +require('ts-node').register({ experimentalResolver: true, transpileOnly: true }); + +// Re-export all .ts files as rules +const rules = {}; +glob.sync(`${__dirname}/*.ts`).forEach((file) => { + rules[path.basename(file, '.ts')] = require(file); +}); + +exports.rules = rules; diff --git a/.eslintplugin/tsconfig.json b/.eslintplugin/tsconfig.json new file mode 100644 index 00000000000..0da715fd036 --- /dev/null +++ b/.eslintplugin/tsconfig.json @@ -0,0 +1,26 @@ +{ + "compilerOptions": { + "target": "es2020", + "lib": [ + "ES2020" + ], + "module": "commonjs", + "esModuleInterop": true, + "alwaysStrict": true, + "allowJs": true, + "strict": true, + "exactOptionalPropertyTypes": false, + "useUnknownInCatchVariables": false, + "noUnusedLocals": true, + "noUnusedParameters": true, + "newLine": "lf", + "noEmit": true + }, + "include": [ + "**/*.ts", + "**/*.js" + ], + "exclude": [ + "node_modules/**" + ] +} diff --git a/build/lib/eslint/utils.ts b/.eslintplugin/utils.ts similarity index 100% rename from build/lib/eslint/utils.ts rename to .eslintplugin/utils.ts diff --git a/build/lib/eslint/vscode-dts-cancellation.ts b/.eslintplugin/vscode-dts-cancellation.ts similarity index 94% rename from build/lib/eslint/vscode-dts-cancellation.ts rename to .eslintplugin/vscode-dts-cancellation.ts index 66f184214b9..6e253a898ca 100644 --- a/build/lib/eslint/vscode-dts-cancellation.ts +++ b/.eslintplugin/vscode-dts-cancellation.ts @@ -20,7 +20,7 @@ export = new class ApiProviderNaming implements eslint.Rule.RuleModule { ['TSInterfaceDeclaration[id.name=/.+Provider/] TSMethodSignature[key.name=/^(provide|resolve).+/]']: (node: any) => { let found = false; - for (let param of (node).params) { + for (const param of (node).params) { if (param.type === AST_NODE_TYPES.Identifier) { found = found || param.name === 'token'; } diff --git a/build/lib/eslint/vscode-dts-create-func.ts b/.eslintplugin/vscode-dts-create-func.ts similarity index 100% rename from build/lib/eslint/vscode-dts-create-func.ts rename to .eslintplugin/vscode-dts-create-func.ts diff --git a/build/lib/eslint/vscode-dts-event-naming.ts b/.eslintplugin/vscode-dts-event-naming.ts similarity index 96% rename from build/lib/eslint/vscode-dts-event-naming.ts rename to .eslintplugin/vscode-dts-event-naming.ts index 956ba346087..5e767c6e257 100644 --- a/build/lib/eslint/vscode-dts-event-naming.ts +++ b/.eslintplugin/vscode-dts-event-naming.ts @@ -88,11 +88,10 @@ export = new class ApiEventNaming implements eslint.Rule.RuleModule { if (def.type === AST_NODE_TYPES.Identifier) { return def; - } else if ((def.type === AST_NODE_TYPES.TSPropertySignature || def.type === AST_NODE_TYPES.Property) && def.key.type === AST_NODE_TYPES.Identifier) { + } else if ((def.type === AST_NODE_TYPES.TSPropertySignature || def.type === AST_NODE_TYPES.PropertyDefinition) && def.key.type === AST_NODE_TYPES.Identifier) { return def.key; } return this.getIdent(def.parent); } }; - diff --git a/build/lib/eslint/vscode-dts-interface-naming.ts b/.eslintplugin/vscode-dts-interface-naming.ts similarity index 100% rename from build/lib/eslint/vscode-dts-interface-naming.ts rename to .eslintplugin/vscode-dts-interface-naming.ts diff --git a/build/lib/eslint/vscode-dts-literal-or-types.ts b/.eslintplugin/vscode-dts-literal-or-types.ts similarity index 100% rename from build/lib/eslint/vscode-dts-literal-or-types.ts rename to .eslintplugin/vscode-dts-literal-or-types.ts diff --git a/build/lib/eslint/vscode-dts-provider-naming.ts b/.eslintplugin/vscode-dts-provider-naming.ts similarity index 100% rename from build/lib/eslint/vscode-dts-provider-naming.ts rename to .eslintplugin/vscode-dts-provider-naming.ts diff --git a/build/lib/eslint/vscode-dts-region-comments.ts b/.eslintplugin/vscode-dts-region-comments.ts similarity index 100% rename from build/lib/eslint/vscode-dts-region-comments.ts rename to .eslintplugin/vscode-dts-region-comments.ts diff --git a/build/lib/eslint/vscode-dts-use-thenable.ts b/.eslintplugin/vscode-dts-use-thenable.ts similarity index 100% rename from build/lib/eslint/vscode-dts-use-thenable.ts rename to .eslintplugin/vscode-dts-use-thenable.ts diff --git a/build/lib/eslint/vscode-dts-vscode-in-comments.ts b/.eslintplugin/vscode-dts-vscode-in-comments.ts similarity index 100% rename from build/lib/eslint/vscode-dts-vscode-in-comments.ts rename to .eslintplugin/vscode-dts-vscode-in-comments.ts diff --git a/.eslintrc.json b/.eslintrc.json index da169cdcc0c..9b8f2c61094 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -8,12 +8,19 @@ "plugins": [ "@typescript-eslint", "jsdoc", - "header" + "header", + "local" ], "rules": { "constructor-super": "warn", "curly": "warn", "eqeqeq": "warn", + "prefer-const": [ + "warn", + { + "destructuring": "all" + } + ], "no-buffer-constructor": "warn", "no-caller": "warn", "no-case-declarations": "warn", @@ -55,17 +62,17 @@ ] } ], - "code-no-unused-expressions": [ + "local/code-no-unused-expressions": [ "warn", { "allowTernary": true } ], - "code-translation-remind": "warn", - "code-no-nls-in-standalone-editor": "warn", - "code-no-standalone-editor": "warn", - "code-no-unexternalized-strings": "warn", - "code-layering": [ + "local/code-translation-remind": "warn", + "local/code-no-nls-in-standalone-editor": "warn", + "local/code-no-standalone-editor": "warn", + "local/code-no-unexternalized-strings": "warn", + "local/code-layering": [ "warn", { "common": [], @@ -116,8 +123,8 @@ "**/*.test.ts" ], "rules": { - "code-no-test-only": "error", - "code-no-unexternalized-strings": "off" + "local/code-no-test-only": "error", + "local/code-no-unexternalized-strings": "off" } }, { @@ -126,14 +133,14 @@ "**/vscode.proposed.*.d.ts" ], "rules": { - "vscode-dts-create-func": "warn", - "vscode-dts-literal-or-types": "warn", - "vscode-dts-interface-naming": "warn", - "vscode-dts-cancellation": "warn", - "vscode-dts-use-thenable": "warn", - "vscode-dts-region-comments": "warn", - "vscode-dts-vscode-in-comments": "warn", - "vscode-dts-provider-naming": [ + "local/vscode-dts-create-func": "warn", + "local/vscode-dts-literal-or-types": "warn", + "local/vscode-dts-interface-naming": "warn", + "local/vscode-dts-cancellation": "warn", + "local/vscode-dts-use-thenable": "warn", + "local/vscode-dts-region-comments": "warn", + "local/vscode-dts-vscode-in-comments": "warn", + "local/vscode-dts-provider-naming": [ "warn", { "allowed": [ @@ -148,7 +155,7 @@ ] } ], - "vscode-dts-event-naming": [ + "local/vscode-dts-event-naming": [ "warn", { "allowed": [ @@ -194,8 +201,8 @@ "src/**/*.ts" ], "rules": { - "code-no-look-behind-regex": "warn", - "code-import-patterns": [ + "local/code-no-look-behind-regex": "warn", + "local/code-import-patterns": [ "warn", { // imports that are allowed in all files of layers: @@ -214,13 +221,11 @@ // - electron-main "when": "hasNode", "allow": [ - "@microsoft/applicationinsights-web", "@parcel/watcher", "@vscode/sqlite3", "@vscode/vscode-languagedetection", "@vscode/ripgrep", "@vscode/iconv-lite-umd", - "applicationinsights", "assert", "child_process", "console", @@ -255,6 +260,7 @@ "windows-process-tree", "worker_threads", "xterm", + "xterm-addon-canvas", "xterm-addon-search", "xterm-addon-serialize", "xterm-addon-unicode11", @@ -269,6 +275,7 @@ // imports that are allowed in all /test/ files "when": "test", "allow": [ + "vs/css.build", "assert", "sinon", "sinon-test" @@ -323,7 +330,9 @@ "vs/base/~", "vs/base/parts/*/~", "vs/platform/*/~", - "tas-client-umd" // node module allowed even in /common/ + "tas-client-umd", // node module allowed even in /common/ + "@microsoft/1ds-core-js",// node module allowed even in /common/ + "@microsoft/1ds-post-js" // node module allowed even in /common/ ] }, { @@ -437,8 +446,7 @@ }, // TODO@layers "tas-client-umd", // node module allowed even in /common/ "vscode-textmate", // node module allowed even in /common/ - "@vscode/vscode-languagedetection", // node module allowed even in /common/ - "@microsoft/applicationinsights-web" // node module allowed even in /common/ + "@vscode/vscode-languagedetection" // node module allowed even in /common/ ] }, { @@ -479,6 +487,14 @@ { "when": "hasBrowser", "pattern": "vs/workbench/workbench.web.main" + }, + { + "when": "hasBrowser", + "pattern": "vs/workbench/~" + }, + { + "when": "hasBrowser", + "pattern": "vs/workbench/services/*/~" } ] }, @@ -529,7 +545,7 @@ ] }, { - "target": "src/vs/workbench/{workbench.sandbox.main.ts,workbench.desktop.sandbox.main.ts}", + "target": "src/vs/workbench/workbench.desktop.main.ts", "layer": "electron-sandbox", "restrictions": [ "vs/base/*/~", @@ -542,26 +558,7 @@ "vs/workbench/api/~", "vs/workbench/services/*/~", "vs/workbench/contrib/*/~", - "vs/workbench/workbench.common.main", - "vs/workbench/workbench.sandbox.main" - ] - }, - { - "target": "src/vs/workbench/workbench.desktop.main.ts", - "layer": "electron-browser", - "restrictions": [ - "vs/base/*/~", - "vs/base/parts/*/~", - "vs/platform/*/~", - "vs/editor/~", - "vs/editor/contrib/*/~", - "vs/editor/editor.all", - "vs/workbench/~", - "vs/workbench/api/~", - "vs/workbench/services/*/~", - "vs/workbench/contrib/*/~", - "vs/workbench/workbench.common.main", - "vs/workbench/workbench.sandbox.main" + "vs/workbench/workbench.common.main" ] }, { @@ -569,7 +566,7 @@ "restrictions": [] }, { - "target": "src/vs/{css.d.ts,monaco.d.ts,nls.d.ts,nls.mock.ts}", + "target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.ts,nls.build.ts,nls.mock.ts}", "restrictions": [] }, { @@ -588,7 +585,7 @@ "test/**/*.ts" ], "rules": { - "code-import-patterns": [ + "local/code-import-patterns": [ "warn", { "target": "test/smoke/**", diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 8a44ce8c7ac..ce9e17c1c96 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -13,10 +13,10 @@ Does this issue occur when all extensions are disabled?: Yes/No -- VS Code Version: -- OS Version: +- VS Code Version: +- OS Version: Steps to Reproduce: -1. -2. +1. +2. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 51e7f366043..35dab07012c 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -3,3 +3,6 @@ contact_links: - name: Question url: https://stackoverflow.com/questions/tagged/visual-studio-code about: Please ask and answer questions here. + - name: Extension Development + url: https://github.com/microsoft/vscode-discussions/discussions/5 + about: Please use this for extension development questions and ideas. diff --git a/.github/classifier.json b/.github/classifier.json index 5b5625f6e93..ca0e4f86467 100644 --- a/.github/classifier.json +++ b/.github/classifier.json @@ -1,6 +1,6 @@ { - "$schema": "https://raw.githubusercontent.com/microsoft/vscode-github-triage-actions/master/classifier-deep/apply/apply-labels/deep-classifier-config.schema.json", - "vacation": ["RMacfarlane", "eamodio"], + "$schema": "https://raw.githubusercontent.com/microsoft/vscode-github-triage-actions/stable/classifier-deep/apply/apply-labels/deep-classifier-config.schema.json", + "vacation": [], "assignees": { "nameToOverrideAccuracyOf": {"accuracy": 0.8} }, @@ -18,12 +18,12 @@ "callhierarchy": {"assign": ["jrieken"]}, "code-lens": {"assign": ["jrieken"]}, "color-palette": {"assign": []}, - "comments": {"assign": ["rebornix"]}, + "comments": {"assign": ["alexr00"]}, "config": {"assign": ["sandy081"]}, "context-keys": {"assign": []}, "css-less-scss": {"assign": ["aeschli"]}, "custom-editors": {"assign": ["mjbvz"]}, - "debug": {"assign": ["weinand"]}, + "debug": {"assign": ["roblourens"]}, "dialogs": {"assign": ["sbatten"]}, "diff-editor": {"assign": ["alexdima"]}, "dropdown": {"assign": []}, @@ -58,6 +58,7 @@ "editor-scrollbar": {"assign": ["alexdima"]}, "editor-symbols": {"assign": ["jrieken"]}, "editor-synced-region": {"assign": ["aeschli"]}, + "editor-sticky-scroll": {"assign": ["jrieken"]}, "editor-textbuffer": {"assign": ["alexdima", "rebornix"]}, "editor-theming": {"assign": ["alexdima"]}, "editor-wordnav": {"assign": ["alexdima"]}, @@ -85,7 +86,7 @@ "html": {"assign": ["aeschli"]}, "i18n": {"assign": []}, "icon-brand": {"assign": []}, - "icons-product": {"assign": ["misolori"]}, + "icons-product": {"assign": ["daviddossett"]}, "inlay-hints": {"assign": ["jrieken", "hediet"]}, "inline-completions": {"assign": ["hediet"]}, "install-update": {"assign": []}, @@ -132,7 +133,7 @@ "rename": {"assign": ["jrieken"]}, "scm": {"assign": ["lszomoru"]}, "screencast-mode": {"assign": ["lszomoru"]}, - "search": {"assign": ["roblourens"]}, + "search": {"assign": ["roblourens", "andreamah"]}, "search-editor": {"assign": ["roblourens"]}, "search-replace": {"assign": ["sandy081"]}, "semantic-tokens": {"assign": ["alexdima", "aeschli"]}, @@ -145,7 +146,7 @@ "snippets": {"assign": ["jrieken"]}, "splitview": {"assign": ["joaomoreno"]}, "suggest": {"assign": ["jrieken"]}, - "tasks": {"assign": ["alexr00"], "accuracy": 0.85}, + "tasks": {"assign": ["meganrogge"], "accuracy": 0.85}, "telemetry": {"assign": []}, "themes": {"assign": ["aeschli"]}, "timeline": {"assign": ["lramos15"]}, @@ -158,7 +159,7 @@ "undo-redo": {"assign": ["alexdima"]}, "unit-test": {"assign": []}, "uri": {"assign": ["jrieken"]}, - "ux": {"assign": ["misolori"]}, + "ux": {"assign": ["daviddossett"]}, "variable-resolving": {"assign": []}, "vscode-build": {"assign": []}, "web": {"assign": []}, diff --git a/.github/commands.json b/.github/commands.json index 68a50baae95..5ade58ab38a 100644 --- a/.github/commands.json +++ b/.github/commands.json @@ -11,34 +11,51 @@ "action": "updateLabels", "addLabel": "*question" }, + { + "type": "comment", + "name": "dev-question", + "allowUsers": [ + "cleidigh", + "usernamehw", + "gjsjohnmurray", + "IllusionMH" + ], + "action": "updateLabels", + "addLabel": "*dev-question" + }, { "type": "label", "name": "*question", "action": "close", + "reason": "not_planned", "comment": "We closed this issue because it is a question about using VS Code rather than an issue or feature request. Please search for help on [StackOverflow](https://aka.ms/vscodestackoverflow), where the community has already answered thousands of similar questions. You may find their [guide on asking a new question](https://aka.ms/vscodestackoverflowquestion) helpful if your question has not already been asked. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!" }, { "type": "label", "name": "*dev-question", "action": "close", - "comment": "We have a great developer community [over on slack](https://aka.ms/vscode-dev-community) where extension authors help each other. This is a great place for you to ask questions and find support.\n\nHappy Coding!" + "reason": "not_planned", + "comment": "We have a great extension developer community over on [GitHub discussions](https://github.com/microsoft/vscode-discussions/discussions) and [Slack](https://aka.ms/vscode-dev-community) where extension authors help each other. This is a great place for you to ask questions and find support.\n\nHappy Coding!" }, { "type": "label", "name": "*extension-candidate", "action": "close", + "reason": "not_planned", "comment": "We try to keep VS Code lean and we think the functionality you're asking for is great for a VS Code extension. Maybe you can already find one that suits you in the [VS Code Marketplace](https://aka.ms/vscodemarketplace). Just in case, in a few simple steps you can get started [writing your own extension](https://aka.ms/vscodewritingextensions). See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!" }, { "type": "label", "name": "*not-reproducible", "action": "close", + "reason": "not_planned", "comment": "We closed this issue because we are unable to reproduce the problem with the steps you describe. Chances are we've already fixed your problem in a recent version of VS Code. If not, please ask us to reopen the issue and provide us with more detail. Our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) might help you with that.\n\nHappy Coding!" }, { "type": "label", "name": "*out-of-scope", "action": "close", + "reason": "not_planned", "comment": "We closed this issue because we [don't plan to address it](https://aka.ms/vscode-out-of-scope) in the foreseeable future. If you disagree and feel that this issue is crucial: we are happy to listen and to reconsider.\n\nIf you wonder what we are up to, please see our [roadmap](https://aka.ms/vscoderoadmap) and [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nThanks for your understanding, and happy coding!" }, { @@ -57,29 +74,16 @@ "type": "label", "name": "*caused-by-extension", "action": "close", - "comment": "This issue is caused by an extension, please file it with the repository (or contact) the extension has linked in its overview in VS Code or the [marketplace](https://aka.ms/vscodemarketplace) for VS Code. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!" + "reason": "not_planned", + "comment": "This issue is caused by an extension, please file it with the repository (or contact) the extension has linked in its overview in VS Code or the [marketplace](https://aka.ms/vscodemarketplace) for VS Code. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting). If you don't know which extension is causing the problem, you can run `Help: Start extension bisect` from the command palette (F1) to help identify the problem extension.\n\nHappy Coding!" }, { "type": "label", "name": "*as-designed", "action": "close", + "reason": "not_planned", "comment": "The described behavior is how it is expected to work. If you disagree, please explain what is expected and what is not in more detail. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!" }, - { - "type": "label", - "name": "notebook", - "regex": "notebook.*", - "assign": [ - "rebornix" - ] - }, - { - "type": "label", - "name": "notebook-triage", - "regex": "notebook.*", - "action": "updateLabels", - "addLabel": "notebook-triage" - }, { "type": "label", "name": "L10N", @@ -104,6 +108,7 @@ "type": "label", "name": "*duplicate", "action": "close", + "reason": "not_planned", "comment": "Thanks for creating this issue! We figured it's covering the same as another one we already have. Thus, we closed this one as a duplicate. You can search for [similar existing issues](${duplicateQuery}). See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!" }, { @@ -154,7 +159,7 @@ "IllusionMH" ], "action": "updateLabels", - "addLabel": "~needs more info" + "addLabel": "~info-needed" }, { "type": "comment", @@ -165,14 +170,14 @@ "gjsjohnmurray", "IllusionMH" ], - "addLabel": "needs more info", + "addLabel": "info-needed", "comment": "Thanks for creating this issue regarding performance! Please follow this guide to help us diagnose performance issues: https://github.com/microsoft/vscode/wiki/Performance-Issues \n\nHappy Coding!" }, { "type": "comment", "name": "jsDebugLogs", "action": "updateLabels", - "addLabel": "needs more info", + "addLabel": "info-needed", "comment": "Please collect trace logs using the following instructions:\n\n> If you're able to, add `\"trace\": true` to your `launch.json` and reproduce the issue. The location of the log file on your disk will be written to the Debug Console. Share that with us.\n>\n> ⚠ī¸ This log file will not contain source code, but will contain file paths. You can drop it into https://microsoft.github.io/vscode-pwa-analyzer/index.html to see what it contains. If you'd rather not share the log publicly, you can email it to connor@xbox.com" }, { @@ -185,22 +190,23 @@ "IllusionMH" ], "action": "close", + "reason": "completed", "addLabel": "unreleased" }, { "type": "label", - "name": "~needs more info", + "name": "~info-needed", "action": "updateLabels", - "addLabel": "needs more info", - "removeLabel": "~needs more info", + "addLabel": "info-needed", + "removeLabel": "~info-needed", "comment": "Thanks for creating this issue! We figured it's missing some basic information or in some other way doesn't follow our [issue reporting guidelines](https://aka.ms/vscodeissuereporting). Please take the time to review these and update the issue.\n\nHappy Coding!" }, { "type": "label", - "name": "~needs version info", + "name": "~version-info-needed", "action": "updateLabels", - "addLabel": "needs more info", - "removeLabel": "~needs version info", + "addLabel": "info-needed", + "removeLabel": "~version-info-needed", "comment": "Thanks for creating this issue! We figured it's missing some basic information, such as a version number, or in some other way doesn't follow our [issue reporting guidelines](https://aka.ms/vscodeissuereporting). Please take the time to review these and update the issue.\n\nHappy Coding!" }, { @@ -222,6 +228,7 @@ "type": "label", "name": "*off-topic", "action": "close", + "reason": "not_planned", "comment": "Thanks for creating this issue. We think this issue is unactionable or unrelated to the goals of this project. Please follow our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!" }, { @@ -234,6 +241,7 @@ "IllusionMH" ], "action": "close", + "reason": "not_planned", "addLabel": "*caused-by-extension", "comment": "It looks like this is caused by the Python extension. Please file the issue to the [Python extension repository](https://github.com/microsoft/vscode-python). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!" }, @@ -247,6 +255,7 @@ "IllusionMH" ], "action": "close", + "reason": "not_planned", "addLabel": "*caused-by-extension", "comment": "It looks like this is caused by the Jupyter extension. Please file the issue to the [Jupyter extension repository](https://github.com/microsoft/vscode-jupyter). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!" }, @@ -260,6 +269,7 @@ "IllusionMH" ], "action": "close", + "reason": "not_planned", "addLabel": "*caused-by-extension", "comment": "It looks like this is caused by the C extension. Please file the issue to the [C extension repository](https://github.com/microsoft/vscode-cpptools). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!" }, @@ -273,6 +283,7 @@ "IllusionMH" ], "action": "close", + "reason": "not_planned", "addLabel": "*caused-by-extension", "comment": "It looks like this is caused by the C++ extension. Please file the issue to the [C++ extension repository](https://github.com/microsoft/vscode-cpptools). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!" }, @@ -286,6 +297,7 @@ "IllusionMH" ], "action": "close", + "reason": "not_planned", "addLabel": "*caused-by-extension", "comment": "It looks like this is caused by the C++ extension. Please file the issue to the [C++ extension repository](https://github.com/microsoft/vscode-cpptools). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!" }, @@ -299,6 +311,7 @@ "IllusionMH" ], "action": "close", + "reason": "not_planned", "addLabel": "*caused-by-extension", "comment": "It looks like this is caused by the TypeScript language service. Please file the issue to the [TypeScript repository](https://github.com/microsoft/TypeScript/). Make sure to check their [contributing guidelines](https://github.com/microsoft/TypeScript/blob/master/CONTRIBUTING.md) and provide relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!" }, @@ -312,6 +325,7 @@ "IllusionMH" ], "action": "close", + "reason": "not_planned", "addLabel": "*caused-by-extension", "comment": "It looks like this is caused by the TypeScript/JavaScript language service. Please file the issue to the [TypeScript repository](https://github.com/microsoft/TypeScript/). Make sure to check their [contributing guidelines](https://github.com/microsoft/TypeScript/blob/master/CONTRIBUTING.md) and provide relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!" }, @@ -325,6 +339,7 @@ "IllusionMH" ], "action": "close", + "reason": "not_planned", "addLabel": "*caused-by-extension", "comment": "It looks like this is caused by the C# extension. Please file the issue to the [C# extension repository](https://github.com/OmniSharp/omnisharp-vscode.git). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!" }, @@ -351,6 +366,7 @@ "IllusionMH" ], "action": "close", + "reason": "not_planned", "addLabel": "*caused-by-extension", "comment": "It looks like this is caused by the PowerShell extension. Please file the issue to the [PowerShell extension repository](https://github.com/PowerShell/vscode-powershell). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!" }, @@ -364,6 +380,7 @@ "IllusionMH" ], "action": "close", + "reason": "not_planned", "addLabel": "*caused-by-extension", "comment": "It looks like this is caused by the LiveShare extension. Please file the issue to the [LiveShare repository](https://github.com/MicrosoftDocs/live-share). Make sure to check their [contributing guidelines](https://github.com/MicrosoftDocs/live-share/blob/master/CONTRIBUTING.md) and provide relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!" }, @@ -377,6 +394,7 @@ "IllusionMH" ], "action": "close", + "reason": "not_planned", "addLabel": "*caused-by-extension", "comment": "It looks like this is caused by the Docker extension. Please file the issue to the [Docker extension repository](https://github.com/microsoft/vscode-docker). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!" }, @@ -390,6 +408,7 @@ "IllusionMH" ], "action": "close", + "reason": "not_planned", "addLabel": "*caused-by-extension", "comment": "It looks like this is caused by the Java extension. Please file the issue to the [Java extension repository](https://github.com/redhat-developer/vscode-java). Make sure to check their [troubleshooting instructions](https://github.com/redhat-developer/vscode-java/wiki/Troubleshooting) and provide relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!" }, @@ -403,9 +422,24 @@ "IllusionMH" ], "action": "close", + "reason": "not_planned", "addLabel": "*caused-by-extension", "comment": "It looks like this is caused by the Java Debugger extension. Please file the issue to the [Java Debugger repository](https://github.com/microsoft/vscode-java-debug). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!" }, + { + "type": "comment", + "name": "extCodespaces", + "allowUsers": [ + "cleidigh", + "usernamehw", + "gjsjohnmurray", + "IllusionMH" + ], + "action": "close", + "reason": "not_planned", + "addLabel": "*caused-by-extension", + "comment": "It looks like this is caused by the Codespaces extension. Please file the issue in the [Codespaces Discussion Forum](http://aka.ms/ghcs-feedback). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!" + }, { "type": "comment", "name": "gifPlease", @@ -416,7 +450,7 @@ "IllusionMH" ], "action": "comment", - "addLabel": "needs more info", + "addLabel": "info-needed", "comment": "Thanks for reporting this issue! Unfortunately, it's hard for us to understand what issue you're seeing. Please help us out by providing a screen recording showing exactly what isn't working as expected. While we can work with most standard formats, `.gif` files are preferred as they are displayed inline on GitHub. You may find https://gifcap.dev helpful as a browser-based gif recording tool.\n\nIf the issue depends on keyboard input, you can help us by enabling screencast mode for the recording (`Developer: Toggle Screencast Mode` in the command palette).\n\nHappy coding!" }, { @@ -439,6 +473,15 @@ "type": "label", "name": "*workspace-trust-docs", "action": "close", + "reason": "not_planned", "comment": "This issue appears to be the result of the new workspace trust feature shipped in June 2021. This security-focused feature has major impact on the functionality of VS Code. Due to the volume of issues, we ask that you take some time to review our [comprehensive documentation](https://aka.ms/vscode-workspace-trust) on the feature. If your issue is still not resolved, please let us know." + }, + { + "type": "label", + "name": "~verification-steps-needed", + "action": "updateLabels", + "addLabel": "verification-steps-needed", + "removeLabel": "~verification-steps-needed", + "comment": "Friendly ping! Looks like this issue requires some further steps to be verified. Please provide us with the steps necessary to verify this issue." } ] diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000000..5ace4600a1f --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 19314029215..5335e645320 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -5,5 +5,3 @@ * Ensure that the code is up-to-date with the `main` branch. * Include a description of the proposed changes and how to test them. --> - -This PR fixes # diff --git a/.github/workflows/bad-tag.yml b/.github/workflows/bad-tag.yml index e996639dfbd..ba4e0524ccc 100644 --- a/.github/workflows/bad-tag.yml +++ b/.github/workflows/bad-tag.yml @@ -8,7 +8,7 @@ jobs: if: github.event.ref == '1.999.0' steps: - name: Checkout Actions - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: "microsoft/vscode-github-triage-actions" ref: stable diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index 0d94b83350a..12e802e9c74 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -1,12 +1,14 @@ name: Basic checks -on: - push: - branches: - - main - pull_request: - branches: - - main +on: workflow_dispatch + +# on: +# push: +# branches: +# - main +# pull_request: +# branches: +# - main jobs: main: @@ -22,8 +24,6 @@ jobs: # TODO: rename azure-pipelines/linux/xvfb.init to github-actions - name: Setup Build Environment run: | - sudo apt-get update - sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1 sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb sudo chmod +x /etc/init.d/xvfb sudo update-rc.d xvfb defaults @@ -41,8 +41,7 @@ jobs: uses: actions/cache@v3 with: path: "**/node_modules" - key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }} - restore-keys: ${{ runner.os }}-cacheNodeModules21- + key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }} - name: Get yarn cache directory path id: yarnCacheDirPath if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} @@ -62,10 +61,7 @@ jobs: run: yarn --frozen-lockfile --network-timeout 180000 - name: Compile and Download - run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions - - - name: Compile Integration Tests - run: yarn --cwd test/integration/browser compile + run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" - name: Run Unit Tests id: electron-unit-tests @@ -97,8 +93,7 @@ jobs: uses: actions/cache@v3 with: path: "**/node_modules" - key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }} - restore-keys: ${{ runner.os }}-cacheNodeModules21- + key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }} - name: Get yarn cache directory path id: yarnCacheDirPath if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} @@ -117,9 +112,6 @@ jobs: ELECTRON_SKIP_BINARY_DOWNLOAD: 1 run: yarn --frozen-lockfile --network-timeout 180000 - - name: Download Playwright - run: yarn playwright-install - - name: Run Hygiene Checks run: yarn gulp hygiene @@ -163,8 +155,7 @@ jobs: uses: actions/cache@v3 with: path: "**/node_modules" - key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }} - restore-keys: ${{ runner.os }}-cacheNodeModules21- + key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }} - name: Get yarn cache directory path id: yarnCacheDirPath if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9317a9e382..fbc0876623d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" - name: Cache node_modules archive id: cacheNodeModules - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ".build/node_modules_cache" key: "${{ runner.os }}-cacheNodeModulesArchive-${{ steps.nodeModulesCacheKey.outputs.value }}" @@ -49,7 +49,7 @@ jobs: run: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache yarn directory if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.yarnCacheDirPath.outputs.dir }} key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }} @@ -122,18 +122,17 @@ jobs: run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" - name: Cache node modules id: cacheNodeModules - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: "**/node_modules" - key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }} - restore-keys: ${{ runner.os }}-cacheNodeModules21- + key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }} - name: Get yarn cache directory path id: yarnCacheDirPath if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} run: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache yarn directory if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.yarnCacheDirPath.outputs.dir }} key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }} @@ -194,18 +193,17 @@ jobs: run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" - name: Cache node modules id: cacheNodeModules - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: "**/node_modules" - key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }} - restore-keys: ${{ runner.os }}-cacheNodeModules21- + key: ${{ runner.os }}-cacheNodeModulesMacOS-${{ steps.nodeModulesCacheKey.outputs.value }} - name: Get yarn cache directory path id: yarnCacheDirPath if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} run: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache yarn directory if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.yarnCacheDirPath.outputs.dir }} key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }} @@ -268,18 +266,17 @@ jobs: run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" - name: Cache node modules id: cacheNodeModules - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: "**/node_modules" - key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }} - restore-keys: ${{ runner.os }}-cacheNodeModules21- + key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }} - name: Get yarn cache directory path id: yarnCacheDirPath if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} run: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache yarn directory if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.yarnCacheDirPath.outputs.dir }} key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 6c5d2999898..f64aa7df15c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -24,14 +24,14 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: javascript # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -45,4 +45,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/deep-classifier-runner.yml b/.github/workflows/deep-classifier-runner.yml index bae2eeb1967..a966318ddef 100644 --- a/.github/workflows/deep-classifier-runner.yml +++ b/.github/workflows/deep-classifier-runner.yml @@ -46,7 +46,7 @@ jobs: uses: ./actions/classifier-deep/apply/apply-labels with: configPath: classifier - allowLabels: "needs more info|new release|error-telemetry|*english-please|translation-required" + allowLabels: "info-needed|new release|error-telemetry|*english-please|translation-required" appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}} manifestDbConnectionString: ${{secrets.MANIFEST_DB_CONNECTION_STRING}} token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}} diff --git a/.github/workflows/devcontainer-cache.yml b/.github/workflows/devcontainer-cache.yml index db9b3fa7866..b1b4c53b77b 100644 --- a/.github/workflows/devcontainer-cache.yml +++ b/.github/workflows/devcontainer-cache.yml @@ -23,7 +23,7 @@ jobs: - name: Azure CLI login id: az_login - uses: azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a + uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 with: creds: ${{ secrets.AZ_ACR_CREDS }} diff --git a/.github/workflows/english-please.yml b/.github/workflows/english-please.yml index da8ca03ddd8..2f24b039125 100644 --- a/.github/workflows/english-please.yml +++ b/.github/workflows/english-please.yml @@ -24,6 +24,6 @@ jobs: token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}} cognitiveServicesAPIKey: ${{secrets.AZURE_TEXT_TRANSLATOR_KEY}} nonEnglishLabel: "*english-please" - needsMoreInfoLabel: "needs more info" + needsMoreInfoLabel: "info-needed" translatorRequestedLabelPrefix: "translation-required-" translatorRequestedLabelColor: "c29cff" diff --git a/.github/workflows/monaco-editor.yml b/.github/workflows/monaco-editor.yml index e52713a3e99..ba7c85809f5 100644 --- a/.github/workflows/monaco-editor.yml +++ b/.github/workflows/monaco-editor.yml @@ -29,7 +29,7 @@ jobs: run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" - name: Cache node modules id: cacheNodeModules - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: "**/node_modules" key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }} @@ -40,7 +40,7 @@ jobs: run: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache yarn directory if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.yarnCacheDirPath.outputs.dir }} key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }} diff --git a/.github/workflows/needs-more-info-closer.yml b/.github/workflows/needs-more-info-closer.yml index 5e1f5b5c548..65805be0d51 100644 --- a/.github/workflows/needs-more-info-closer.yml +++ b/.github/workflows/needs-more-info-closer.yml @@ -1,4 +1,4 @@ -name: Needs More Info Closer +name: info-needed Closer on: schedule: - cron: 20 11 * * * # 4:20am Redmond @@ -17,12 +17,12 @@ jobs: ref: stable - name: Install Actions run: npm install --production --prefix ./actions - - name: Run Needs More Info Closer + - name: Run info-needed Closer uses: ./actions/needs-more-info-closer with: appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}} token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}} - label: needs more info + label: info-needed closeDays: 7 additionalTeam: "cleidigh|usernamehw|gjsjohnmurray|IllusionMH" closeComment: "This issue has been closed automatically because it needs more information and has not had recent activity. See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines.\n\nHappy Coding!" diff --git a/.github/workflows/no-yarn-lock-changes.yml b/.github/workflows/no-yarn-lock-changes.yml index ebd735bf7e5..300a98ad998 100644 --- a/.github/workflows/no-yarn-lock-changes.yml +++ b/.github/workflows/no-yarn-lock-changes.yml @@ -18,8 +18,9 @@ jobs: run: | echo "user: ${{ github.event.pull_request.user.login }}" echo "role: ${{ fromJson(steps.get_permissions.outputs.data).permission }}" + echo "is dependabot: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}" echo "should_run: ${{ !contains(fromJson('["admin", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) }}" - echo "::set-output name=should_run::${{ !contains(fromJson('["admin", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) }}" + echo "::set-output name=should_run::${{ !contains(fromJson('["admin", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) && github.event.pull_request.user.login != 'dependabot[bot]' }}" - name: Get file changes uses: trilom/file-changes-action@ce38c8ce2459ca3c303415eec8cb0409857b4272 if: ${{ steps.control.outputs.should_run == 'true' }} diff --git a/.github/workflows/on-label.yml b/.github/workflows/on-label.yml index 25f7a67c7a1..9771860d437 100644 --- a/.github/workflows/on-label.yml +++ b/.github/workflows/on-label.yml @@ -71,7 +71,8 @@ jobs: if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item') uses: ./actions/test-plan-item-validator with: - appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}} + token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}} + refLabel: on-testplan label: testplan-item invalidLabel: invalid-testplan-item comment: Invalid test plan item. See errors below and the [test plan item spec](https://github.com/microsoft/vscode/wiki/Writing-Test-Plan-Items) for more information. This comment will go away when the issues are resolved. @@ -85,6 +86,6 @@ jobs: token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}} cognitiveServicesAPIKey: ${{secrets.AZURE_TEXT_TRANSLATOR_KEY}} nonEnglishLabel: "*english-please" - needsMoreInfoLabel: "needs more info" + needsMoreInfoLabel: "info-needed" translatorRequestedLabelPrefix: "translation-required-" translatorRequestedLabelColor: "c29cff" diff --git a/.github/workflows/on-open.yml b/.github/workflows/on-open.yml index af70c86caa0..8fef95d9e83 100644 --- a/.github/workflows/on-open.yml +++ b/.github/workflows/on-open.yml @@ -59,6 +59,16 @@ jobs: appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}} cognitiveServicesAPIKey: ${{secrets.AZURE_TEXT_TRANSLATOR_KEY}} nonEnglishLabel: "*english-please" - needsMoreInfoLabel: "needs more info" + needsMoreInfoLabel: "info-needed" translatorRequestedLabelPrefix: "translation-required-" translatorRequestedLabelColor: "c29cff" + # source of truth in ./test-plan-item-validator.yml + - name: Run Test Plan Item Validator + uses: ./actions/test-plan-item-validator + with: + token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}} + refLabel: on-testplan + label: testplan-item + invalidLabel: invalid-testplan-item + comment: Invalid test plan item. See errors below and the [test plan item spec](https://github.com/microsoft/vscode/wiki/Writing-Test-Plan-Items) for more information. This comment will go away when the issues are resolved. + diff --git a/.github/workflows/pr-chat.yml b/.github/workflows/pr-chat.yml index 13803fda778..0acad98dc13 100644 --- a/.github/workflows/pr-chat.yml +++ b/.github/workflows/pr-chat.yml @@ -9,7 +9,7 @@ jobs: if: ${{ !github.event.pull_request.draft }} steps: - name: Checkout Actions - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: "microsoft/vscode-github-triage-actions" ref: stable @@ -21,5 +21,6 @@ jobs: with: token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}} slack_token: ${{ secrets.SLACK_TOKEN }} + slack_user_token: ${{ secrets.SLACK_USER_TOKEN }} slack_bot_name: "VSCodeBot" notification_channel: codereview diff --git a/.github/workflows/rich-navigation.yml b/.github/workflows/rich-navigation.yml index da11ba22759..dd92342ef3a 100644 --- a/.github/workflows/rich-navigation.yml +++ b/.github/workflows/rich-navigation.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/cache@v2 + - uses: actions/cache@v3 id: caching-stage name: Cache VS Code dependencies with: diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml new file mode 100644 index 00000000000..83e511eeb94 --- /dev/null +++ b/.github/workflows/telemetry.yml @@ -0,0 +1,17 @@ +name: 'Telemetry' +on: + pull_request: +jobs: + check-metdata: + name: 'Check metadata' + runs-on: 'ubuntu-latest' + + steps: + - uses: 'actions/checkout@v3' + + - uses: 'actions/setup-node@v3' + with: + node-version: 'lts/*' + + - name: 'Run vscode-telemetry-extractor' + run: 'npx --package=@vscode/telemetry-extractor --yes vscode-telemetry-extractor -s .' diff --git a/.github/workflows/test-plan-item-validator.yml b/.github/workflows/test-plan-item-validator.yml index 82bd093e039..d3b9284f9ae 100644 --- a/.github/workflows/test-plan-item-validator.yml +++ b/.github/workflows/test-plan-item-validator.yml @@ -3,7 +3,7 @@ on: issues: types: [edited] -# also edit in ./on-label.yml +# also edit in ./on-label.yml and ./on-open.yml jobs: main: runs-on: ubuntu-latest @@ -22,7 +22,8 @@ jobs: if: contains(github.event.issue.labels.*.name, 'testplan-item') || contains(github.event.issue.labels.*.name, 'invalid-testplan-item') uses: ./actions/test-plan-item-validator with: + token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}} + refLabel: on-testplan label: testplan-item - appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}} invalidLabel: invalid-testplan-item comment: Invalid test plan item. See errors below and the [test plan item spec](https://github.com/microsoft/vscode/wiki/Writing-Test-Plan-Items) for more information. This comment will go away when the issues are resolved. diff --git a/.gitignore b/.gitignore index 738d6793fa9..c338e141c8d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ yarn-error.log vscode.lsif vscode.db /.profile-oss +/cli/target diff --git a/.mailmap b/.mailmap index d4542abf73c..4834393cff7 100644 --- a/.mailmap +++ b/.mailmap @@ -1,6 +1,4 @@ -Eric Amodio Eric Amodio -Eric Amodio Eric Amodio Daniel Imms Daniel Imms -Tanha Kabir Tanha Kabir Raymond Zhao Tyler Leonhardt Tyler Leonhardt +JoÃŖo Moreno JoÃŖo Moreno diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 00000000000..0cf077e6b4c --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +16.14 diff --git a/.vscode/cglicenses.schema.json b/.vscode/cglicenses.schema.json index 8c0ee740102..8131a35217a 100644 --- a/.vscode/cglicenses.schema.json +++ b/.vscode/cglicenses.schema.json @@ -55,6 +55,31 @@ } } } + }, + { + "type": "object", + "required": [ + "name", + "fullLicenseTextUri" + ], + "properties": { + "name": { + "type": "string", + "description": "The name of the dependency" + }, + "fullLicenseTextUri": { + "type": "string", + "description": "The URI to the license text of this repository", + "format": "uri" + }, + "prependLicenseText": { + "type": "array", + "description": "A piece of text to prepend to the auto-detected license text of the dependency", + "items": { + "type": "string" + } + } + } } ] } diff --git a/.vscode/cgmanifest.schema.json b/.vscode/cgmanifest.schema.json deleted file mode 100644 index 2e719b02396..00000000000 --- a/.vscode/cgmanifest.schema.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "type": "object", - "properties": { - "registrations": { - "type": "array", - "items": { - "type": "object", - "properties": { - "component": { - "oneOf": [ - { - "type": "object", - "required": [ - "type", - "git" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "git" - ] - }, - "git": { - "type": "object", - "required": [ - "name", - "repositoryUrl", - "commitHash" - ], - "properties": { - "name": { - "type": "string" - }, - "repositoryUrl": { - "type": "string" - }, - "commitHash": { - "type": "string" - } - } - } - } - }, - { - "type": "object", - "required": [ - "type", - "npm" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "npm" - ] - }, - "npm": { - "type": "object", - "required": [ - "name", - "version" - ], - "properties": { - "name": { - "type": "string" - }, - "version": { - "type": "string" - } - } - } - } - }, - { - "type": "object", - "required": [ - "type", - "other" - ], - "properties": { - "type": { - "type": "string", - "enum": [ - "other" - ] - }, - "other": { - "type": "object", - "required": [ - "name", - "downloadUrl", - "version" - ], - "properties": { - "name": { - "type": "string" - }, - "downloadUrl": { - "type": "string" - }, - "version": { - "type": "string" - } - } - } - } - } - ] - }, - "repositoryUrl": { - "type": "string", - "description": "The git url of the component" - }, - "version": { - "type": "string", - "description": "The version of the component" - }, - "license": { - "type": "string", - "description": "The name of the license" - }, - "developmentDependency": { - "type": "boolean", - "description": "This component is inlined in the vscode repo and **is not shipped**." - }, - "isOnlyProductionDependency": { - "type": "boolean", - "description": "This component is shipped and **is not inlined in the vscode repo**." - }, - "licenseDetail": { - "type": "array", - "items": { - "type": "string" - }, - "description": "The license text" - } - } - } - } - } -} diff --git a/.vscode/launch.json b/.vscode/launch.json index dd295c02db4..3bf8c67198f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -16,11 +16,7 @@ "request": "attach", "restart": true, "name": "Attach to Extension Host", - // set to a large number: if there is an issue we're debugging that keeps - // the extension host from coming up, or the renderer is paused/crashes - // before it happens, developers will get an annoying alert, e.g. #126826. - // This can be set to 0 in 1.59. - "timeout": 999999999, + "timeout": 0, "port": 5870, "outFiles": [ "${workspaceFolder}/out/**/*.js", @@ -28,12 +24,12 @@ ] }, { - "type": "pwa-chrome", + "type": "chrome", "request": "attach", "name": "Attach to Shared Process", "timeout": 30000, "port": 9222, - "urlFilter": "*sharedProcess.html*", + "urlFilter": "*sharedProcess*.html*", "presentation": { "hidden": true } @@ -71,6 +67,7 @@ "name": "Attach to Main Process", "timeout": 30000, "port": 5875, + "continueOnAttach": true, "outFiles": [ "${workspaceFolder}/out/**/*.js" ], @@ -96,6 +93,23 @@ "order": 6 } }, + { + "type": "extensionHost", + "request": "launch", + "name": "VS Code Configuration Editing Tests", + "runtimeExecutable": "${execPath}", + "args": [ + "--extensionDevelopmentPath=${workspaceFolder}/extensions/configuration-editing", + "--extensionTestsPath=${workspaceFolder}/extensions/configuration-editing/out/test" + ], + "outFiles": [ + "${workspaceFolder}/out/**/*.js" + ], + "presentation": { + "group": "5_tests", + "order": 6 + } + }, { "type": "extensionHost", "request": "launch", @@ -189,25 +203,7 @@ } }, { - "type": "extensionHost", - "request": "launch", - "name": "VS Code Custom Editor Tests", - "runtimeExecutable": "${execPath}", - "args": [ - "${workspaceFolder}/extensions/vscode-custom-editor-tests/test-workspace", - "--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-custom-editor-tests", - "--extensionTestsPath=${workspaceFolder}/extensions/vscode-custom-editor-tests/out/test" - ], - "outFiles": [ - "${workspaceFolder}/out/**/*.js" - ], - "presentation": { - "group": "5_tests", - "order": 6 - } - }, - { - "type": "pwa-chrome", + "type": "chrome", "request": "attach", "name": "Attach to VS Code", "browserAttachLocation": "workspace", @@ -221,7 +217,7 @@ "perScriptSourcemaps": "yes" }, { - "type": "pwa-chrome", + "type": "chrome", "request": "launch", "name": "Launch VS Code Internal", "windows": { @@ -234,16 +230,17 @@ "runtimeExecutable": "${workspaceFolder}/scripts/code.sh" }, "port": 9222, - "timeout": 20000, + "timeout": 0, "env": { "VSCODE_EXTHOST_WILL_SEND_SOCKET": null, "VSCODE_SKIP_PRELAUNCH": "1" }, "cleanUp": "wholeBrowser", - "urlFilter": "*workbench.html*", + "urlFilter": "*workbench*.html*", "runtimeArgs": [ - "--inspect=5875", + "--inspect-brk=5875", "--no-cached-data", + "--crash-reporter-directory=${workspaceFolder}/.profile-oss/crashes", // for general runtime freezes: https://github.com/microsoft/vscode/issues/127861#issuecomment-904144910 "--disable-features=CalculateNativeWinOcclusion", ], @@ -262,7 +259,7 @@ } }, { - "type": "pwa-node", + "type": "node", "request": "launch", "name": "VS Code Server (Web)", "runtimeExecutable": "${workspaceFolder}/scripts/code-server.sh", @@ -278,7 +275,7 @@ } }, { - "type": "pwa-node", + "type": "node", "request": "launch", "name": "Main Process", "attachSimplePort": 5875, @@ -299,7 +296,7 @@ } }, { - "type": "pwa-chrome", + "type": "chrome", "request": "launch", "outFiles": [], "perScriptSourcemaps": "yes", @@ -312,7 +309,7 @@ } }, { - "type": "pwa-msedge", + "type": "msedge", "request": "launch", "outFiles": [], "perScriptSourcemaps": "yes", @@ -325,6 +322,33 @@ "order": 3 } }, + { + "type": "chrome", + "request": "launch", + "outFiles": [], + "perScriptSourcemaps": "yes", + "name": "VS Code Web (Chrome)", + "url": "http://localhost:8080", + "preLaunchTask": "Run code web", + "presentation": { + "group": "0_vscode", + "order": 3 + } + }, + { + "type": "msedge", + "request": "launch", + "outFiles": [], + "perScriptSourcemaps": "yes", + "name": "VS Code Web (Edge)", + "url": "http://localhost:8080", + "pauseForSourceMap": false, + "preLaunchTask": "Run code web", + "presentation": { + "group": "0_vscode", + "order": 3 + } + }, { "type": "node", "request": "launch", @@ -407,7 +431,7 @@ } }, { - "type": "pwa-node", + "type": "node", "request": "launch", "name": "Run Unit Tests", "program": "${workspaceFolder}/test/unit/electron/index.js", @@ -437,7 +461,7 @@ } }, { - "type": "pwa-node", + "type": "node", "request": "launch", "name": "Run Unit Tests For Current File", "program": "${workspaceFolder}/test/unit/electron/index.js", @@ -472,10 +496,9 @@ "type": "node", "request": "launch", "name": "Launch Smoke Test", - "program": "${workspaceFolder}/test/smoke/out/main.js", + "program": "${workspaceFolder}/test/smoke/test/index.js", "cwd": "${workspaceFolder}/test/smoke", "timeout": 240000, - "port": 9999, "args": [ "-l", "${workspaceFolder}/.build/electron/Code - OSS.app/Contents/MacOS/Electron" @@ -516,9 +539,10 @@ } }, { - "name": "Search and Renderer processes", + "name": "Search, Renderer, and Main processes", "configurations": [ "Launch VS Code Internal", + "Attach to Main Process", "Attach to Search Process" ], "presentation": { @@ -527,9 +551,10 @@ } }, { - "name": "Renderer and Extension Host processes", + "name": "Renderer, Extension Host, and Main processes", "configurations": [ "Launch VS Code Internal", + "Attach to Main Process", "Attach to Extension Host" ], "presentation": { @@ -560,10 +585,11 @@ } }, { - "name": "Launch VS Code", + "name": "Renderer and Main processes", "stopAll": true, "configurations": [ "Launch VS Code Internal", + "Attach to Main Process" ], "preLaunchTask": "Ensure Prelaunch Dependencies" }, diff --git a/.vscode/notebooks/api.github-issues b/.vscode/notebooks/api.github-issues index 1b3790c8cc9..9bf483dbbcc 100644 --- a/.vscode/notebooks/api.github-issues +++ b/.vscode/notebooks/api.github-issues @@ -7,7 +7,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"May 2022\"" + "value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"October 2022\"" }, { "kind": 1, diff --git a/.vscode/notebooks/endgame.github-issues b/.vscode/notebooks/endgame.github-issues index 48195c79000..82e9dbfbb8b 100644 --- a/.vscode/notebooks/endgame.github-issues +++ b/.vscode/notebooks/endgame.github-issues @@ -7,7 +7,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-unpkg\r\n\r\n$MILESTONE=milestone:\"May 2022\"" + "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n\r\n\r\n$MILESTONE=milestone:\"October 2022\"" }, { "kind": 1, @@ -32,7 +32,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS -$MILESTONE is:issue is:closed label:bug label:insiders-released -label:verified -label:*duplicate -label:*as-designed -label:z-author-verified -label:on-testplan" + "value": "$REPOS -$MILESTONE is:issue is:closed reason:completed label:bug label:insiders-released -label:verified -label:*duplicate -label:*as-designed -label:z-author-verified -label:on-testplan" }, { "kind": 1, @@ -42,7 +42,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS -$MILESTONE is:issue is:closed label:feature-request label:insiders-released -label:on-testplan -label:verified -label:*duplicate" + "value": "$REPOS -$MILESTONE is:issue is:closed reason:completed label:feature-request label:insiders-released -label:on-testplan -label:verified -label:*duplicate" }, { "kind": 1, @@ -62,7 +62,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS $MILESTONE is:issue is:closed label:feature-request -label:verification-needed -label:on-testplan -label:verified -label:*duplicate" + "value": "$REPOS $MILESTONE is:issue is:closed reason:completed label:feature-request -label:verification-needed -label:on-testplan -label:verified -label:*duplicate" }, { "kind": 1, @@ -97,7 +97,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS $MILESTONE is:issue is:closed label:verification-needed -label:verified" + "value": "$REPOS $MILESTONE is:issue is:closed reason:completed label:verification-needed -label:verified" }, { "kind": 1, @@ -112,7 +112,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS $MILESTONE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -label:z-author-verified -label:unreleased" + "value": "$REPOS $MILESTONE is:issue is:closed reason:completed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -label:z-author-verified -label:unreleased" }, { "kind": 1, @@ -122,7 +122,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS $MILESTONE is:issue is:closed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -label:z-author-verified label:unreleased" + "value": "$REPOS $MILESTONE is:issue is:closed reason:completed sort:updated-asc label:bug -label:verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -label:z-author-verified label:unreleased" }, { "kind": 1, diff --git a/.vscode/notebooks/inbox.github-issues b/.vscode/notebooks/inbox.github-issues index ad451a6f91a..10d7fd63e54 100644 --- a/.vscode/notebooks/inbox.github-issues +++ b/.vscode/notebooks/inbox.github-issues @@ -7,7 +7,7 @@ { "kind": 2, "language": "github-issues", - "value": "$inbox -label:\"needs more info\" sort:created-desc" + "value": "$inbox -label:\"info-needed\" sort:created-desc" }, { "kind": 2, diff --git a/.vscode/notebooks/my-endgame.github-issues b/.vscode/notebooks/my-endgame.github-issues index 4ce504b017f..3bfee2f4e4c 100644 --- a/.vscode/notebooks/my-endgame.github-issues +++ b/.vscode/notebooks/my-endgame.github-issues @@ -7,7 +7,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\n\n$MILESTONE=milestone:\"May 2022\"\n\n$MINE=assignee:@me" + "value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n\r\n\r\n$MILESTONE=milestone:\"October 2022\"\r\n\r\n$MINE=assignee:@me" }, { "kind": 1, @@ -42,7 +42,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS $MILESTONE $MINE is:issue is:closed label:feature-request -label:verification-needed -label:on-testplan -label:verified -label:*duplicate" + "value": "$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request -label:verification-needed -label:on-testplan -label:verified -label:*duplicate" }, { "kind": 1, @@ -62,7 +62,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS $MILESTONE $MINE is:issue is:closed label:feature-request label:verification-needed -label:verified" + "value": "$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request label:verification-needed -label:verified" }, { "kind": 1, @@ -87,7 +87,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS $MILESTONE -$MINE is:issue is:closed -assignee:@me -label:verified -label:z-author-verified label:feature-request label:verification-needed" + "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed -assignee:@me -label:verified -label:z-author-verified label:feature-request label:verification-needed -label:verification-steps-needed -label:unreleased" }, { "kind": 1, @@ -147,7 +147,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS $MILESTONE -$MINE is:issue is:closed author:@me sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:needs-triage -label:verification-found" + "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed author:@me sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:triage-needed -label:verification-found" }, { "kind": 1, @@ -157,7 +157,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS $MILESTONE -$MINE is:issue is:closed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:bamurtaugh -author:bpasero -author:chrisdias -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:dynamicwebpaige -author:eamodio -author:egamma -author:fiveisprime -author:greazer -author:gregvanl -author:hediet -author:IanMatthewHuff -author:isidorn -author:ItalyPaleAle -author:JacksonKearl -author:joaomoreno -author:joyceerhl -author:jrieken -author:karrtikr-author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:ornellaalt -author:orta -author:rchiodo -author:rebornix -author:roblourens -author:rzhao271 -author:sana-ajani -author:sandy081 -author:sbatten -author:stevencl -author:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:kimadeline -author:amunger" + "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:andreamah -author:bamurtaugh -author:bpasero -author:chrisdias -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:gregvanl -author:hediet -author:IanMatthewHuff -author:isidorn -author:joaomoreno -author:joyceerhl -author:jrieken -author:karrtikr -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger" }, { "kind": 1, @@ -167,7 +167,7 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS $MILESTONE -$MINE is:issue is:closed -author:@me sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found" + "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed -author:@me sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:error-telemetry -label:verification-steps-needed -label:verification-found" }, { "kind": 1, @@ -177,6 +177,6 @@ { "kind": 2, "language": "github-issues", - "value": "repo:microsoft/vscode $MILESTONE $MINE is:issue is:closed label:feature-request -label:on-release-notes" + "value": "repo:microsoft/vscode $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request -label:on-release-notes" } ] \ No newline at end of file diff --git a/.vscode/notebooks/my-work.github-issues b/.vscode/notebooks/my-work.github-issues index 143697b0c4e..69d50e05965 100644 --- a/.vscode/notebooks/my-work.github-issues +++ b/.vscode/notebooks/my-work.github-issues @@ -7,7 +7,7 @@ { "kind": 2, "language": "github-issues", - "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce\n\n// current milestone name\n$milestone=milestone:\"May 2022\"" + "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n\n\n// current milestone name\n$milestone=milestone:\"October 2022\"" }, { "kind": 1, @@ -92,7 +92,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repos assignee:@me is:open type:issue -label:bug -label:\"needs more info\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream -label:polish -label:testplan-item -label:error-telemetry" + "value": "$repos assignee:@me is:open type:issue -label:bug -label:\"info-needed\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream -label:polish -label:testplan-item -label:error-telemetry" }, { "kind": 1, @@ -102,7 +102,7 @@ { "kind": 2, "language": "github-issues", - "value": "repo:microsoft/vscode assignee:@me is:open type:issue -label:\"needs more info\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:code-lens -label:color-palette -label:comments -label:config -label:context-keys -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-RTL -label:editor-scrollbar -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:engineering -label:error-list -label:extension-host -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:gpu -label:grammar -label:grid-view -label:html -label:i18n -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-window -label:ipc -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list -label:live-server -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:network -label:notebook -label:notebook-api -label:notebook-celltoolbar -label:notebook-diff -label:notebook-dnd -label:notebook-folding -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-keybinding -label:notebook-layout -label:notebook-markdown -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-statusbar -label:open-editors -label:opener -label:outline -label:output -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remotehub -label:rename -label:sandbox -label:sash -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview -label:suggest -label:sync-error-handling -label:table -label:tasks -label:telemetry -label:terminal -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-links -label:terminal-local-echo -label:terminal-profiles -label:terminal-reconnection -label:terminal-rendering -label:terminal-tabs -label:terminal-winpty -label:testing -label:themes -label:timeline -label:timeline-git -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typehierarchy -label:typescript -label:undo-redo -label:uri -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-build -label:vscode-website -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-feedback -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom" + "value": "repo:microsoft/vscode assignee:@me is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:code-lens -label:color-palette -label:comments -label:config -label:context-keys -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-RTL -label:editor-scrollbar -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:engineering -label:error-list -label:extension-host -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:gpu -label:grammar -label:grid-view -label:html -label:i18n -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-window -label:ipc -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list -label:live-server -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:network -label:notebook -label:notebook-api -label:notebook-celltoolbar -label:notebook-diff -label:notebook-dnd -label:notebook-folding -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-keybinding -label:notebook-layout -label:notebook-markdown -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-statusbar -label:open-editors -label:opener -label:outline -label:output -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remotehub -label:rename -label:sandbox -label:sash -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview -label:suggest -label:sync-error-handling -label:table -label:tasks -label:telemetry -label:terminal -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-links -label:terminal-local-echo -label:terminal-profiles -label:terminal-reconnection -label:terminal-rendering -label:terminal-tabs -label:terminal-winpty -label:testing -label:themes -label:timeline -label:timeline-git -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typehierarchy -label:typescript -label:undo-redo -label:uri -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-build -label:vscode-website -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-feedback -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom" }, { "kind": 1, @@ -112,7 +112,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repos assignee:@me is:open label:\"needs more info\"" + "value": "$repos assignee:@me is:open label:\"info-needed\"" }, { "kind": 1, diff --git a/.vscode/notebooks/verification.github-issues b/.vscode/notebooks/verification.github-issues index 7015a401be5..5c6354a4e72 100644 --- a/.vscode/notebooks/verification.github-issues +++ b/.vscode/notebooks/verification.github-issues @@ -2,7 +2,7 @@ { "kind": 1, "language": "markdown", - "value": "### Bug Verification Queries\n\nBefore shipping we want to verify _all_ bugs. That means when a bug is fixed we check that the fix actually works. It's always best to start with bugs that you have filed and the proceed with bugs that have been filed from users outside the development team. " + "value": "### Bug Verification Queries\r\n\r\nBefore shipping we want to verify _all_ bugs. That means when a bug is fixed we check that the fix actually works. It's always best to start with bugs that you have filed and the proceed with bugs that have been filed from users outside the development team. " }, { "kind": 1, @@ -12,7 +12,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-jupyter repo:microsoft/vscode-python\n$milestone=milestone:\"May 2022\"" + "value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-l10n\n$milestone=milestone:\"May 2022\"" }, { "kind": 1, @@ -22,7 +22,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repos $milestone is:closed -assignee:@me label:bug -label:verified -label:*duplicate author:@me" + "value": "$repos $milestone is:closed reason:completed -assignee:@me label:bug -label:verified -label:*duplicate author:@me" }, { "kind": 1, @@ -32,7 +32,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repos $milestone is:closed -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand -author:rzhao271 -author:kieferrm -author:TylerLeonhardt -author:bamurtaugh -author:hediet -author:joyceerhl -author:rchiodo -author:IanMatthewHuff" + "value": "$repos $milestone is:closed reason:completed -assignee:@me label:bug -label:verified -label:*duplicate -author:@me -assignee:@me label:bug -label:verified -author:@me -author:aeschli -author:alexdima -author:alexr00 -author:bpasero -author:chrisdias -author:chrmarti -author:connor4312 -author:dbaeumer -author:deepak1556 -author:eamodio -author:egamma -author:gregvanl -author:isidorn -author:JacksonKearl -author:joaomoreno -author:jrieken -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:RMacfarlane -author:roblourens -author:sana-ajani -author:sandy081 -author:sbatten -author:Tyriar -author:weinand -author:rzhao271 -author:kieferrm -author:TylerLeonhardt -author:bamurtaugh -author:hediet -author:joyceerhl -author:rchiodo -author:IanMatthewHuff" }, { "kind": 1, @@ -42,6 +42,6 @@ { "kind": 2, "language": "github-issues", - "value": "$repos $milestone is:closed -assignee:@me label:bug -label:verified -label:*duplicate" + "value": "$repos $milestone is:closed reason:completed -assignee:@me label:bug -label:verified -label:*duplicate" } ] \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index e698d02574e..eea3f45f764 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,6 +6,7 @@ ".build": true, ".profile-oss": true, "**/.DS_Store": true, + "cli/target": true, "build/**/*.js": { "when": "$(basename).ts" } @@ -41,11 +42,6 @@ } } ], - "eslint.options": { - "rulePaths": [ - "./build/lib/eslint" - ] - }, "typescript.tsdk": "node_modules/typescript/lib", "npm.exclude": "**/extensions/**", "npm.packageManager": "yarn", @@ -57,7 +53,7 @@ "fileMatch": [ "cgmanifest.json" ], - "url": "./.vscode/cgmanifest.schema.json" + "url": "https://json.schemastore.org/component-detection-manifest.json", }, { "fileMatch": [ @@ -69,10 +65,13 @@ "git.ignoreLimitWarning": true, "git.branchProtection": [ "main", + "distro", "release/*" ], "git.branchProtectionPrompt": "alwaysCommitToNewBranch", "git.branchRandomName.enable": true, + "git.pullBeforeCheckout": true, + "git.mergeEditor": true, "remote.extensionKind": { "msjsdiag.debugger-for-chrome": "workspace" }, @@ -89,6 +88,13 @@ "editor.defaultFormatter": "vscode.typescript-language-features", "editor.formatOnSave": true }, + "[rust]": { + "editor.defaultFormatter": "rust-lang.rust-analyzer", + "editor.formatOnSave": true, + }, + "rust-analyzer.linkedProjects": [ + "cli/Cargo.toml" + ], "typescript.tsc.autoDetect": "off", "testing.autoRun.mode": "rerun", "conventionalCommits.scopes": [ @@ -101,11 +107,7 @@ "git", "sash" ], - "editor.quickSuggestions": { - "other": "inline", - "comments": "inline", - "strings": "inline" - }, "githubPullRequests.assignCreated": "${user}", - "githubPullRequests.defaultMergeMethod": "squash" + "githubPullRequests.defaultMergeMethod": "squash", + "application.experimental.rendererProfiling": true } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 885f825cc2e..59b1893c293 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -203,6 +203,28 @@ "reveal": "never" } }, + { + "type": "shell", + "command": "./scripts/code-web.sh", + "windows": { + "command": ".\\scripts\\code-web.bat" + }, + "args": ["--port", "8080", "--browser", "none"], + "label": "Run code web", + "isBackground": true, + "problemMatcher": { + "pattern": { + "regexp": "" + }, + "background": { + "beginsPattern": ".*node .*", + "endsPattern": "Listening on .*" + } + }, + "presentation": { + "reveal": "never" + } + }, { "type": "npm", "script": "eslint", diff --git a/.yarnrc b/.yarnrc index 78ab1d5e2b7..f5edf10bc83 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1,4 +1,4 @@ disturl "https://electronjs.org/headers" -target "17.4.6" +target "19.0.17" runtime "electron" build_from_source "true" diff --git a/README.md b/README.md index ba8f7224ff7..0c7c6236c42 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ please see the document [How to Contribute](https://github.com/microsoft/vscode/ * [Request a new feature](CONTRIBUTING.md) * Upvote [popular feature requests](https://github.com/microsoft/vscode/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc) * [File an issue](https://github.com/microsoft/vscode/issues) +* Connect with the extension author community on [GitHub Discussions](https://github.com/microsoft/vscode-discussions/discussions) or [Slack](https://aka.ms/vscode-dev-community) * Follow [@code](https://twitter.com/code) and let us know what you think! See our [wiki](https://github.com/microsoft/vscode/wiki/Feedback-Channels) for a description of each of these channels and information on some other available community-driven channels. @@ -57,10 +58,10 @@ VS Code includes a set of built-in extensions located in the [extensions](extens ## Development Container -This repository includes a Visual Studio Code Remote - Containers / GitHub Codespaces development container. +This repository includes a Visual Studio Code Dev Containers / GitHub Codespaces development container. -- For [Remote - Containers](https://aka.ms/vscode-remote/download/containers), use the **Remote-Containers: Clone Repository in Container Volume...** command which creates a Docker volume for better disk I/O on macOS and Windows. - - If you already have VS Code and Docker installed, you can also click [here](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode) to get started. This will cause VS Code to automatically install the Remote - Containers extension if needed, clone the source code into a container volume, and spin up a dev container for use. +- For [Dev Containers](https://aka.ms/vscode-remote/download/containers), use the **Dev Containers: Clone Repository in Container Volume...** command which creates a Docker volume for better disk I/O on macOS and Windows. + - If you already have VS Code and Docker installed, you can also click [here](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode) to get started. This will cause VS Code to automatically install the Dev Containers extension if needed, clone the source code into a container volume, and spin up a dev container for use. - For Codespaces, install the [GitHub Codespaces](https://marketplace.visualstudio.com/items?itemName=GitHub.codespaces) extension in VS Code, and use the **Codespaces: Create New Codespace** command. Docker / the Codespace should have at least **4 Cores and 6 GB of RAM (8 GB recommended)** to run full build. See the [development container README](.devcontainer/README.md) for more information. diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 0fca6a19272..a48785b38fa 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -1,83 +1,66 @@ -microsoft-vscode +NOTICES -THIRD-PARTY SOFTWARE NOTICES AND INFORMATION -Do Not Translate or Localize - -This project incorporates components from the projects listed below. The original copyright notices and the licenses under which Microsoft received such components are set forth below. Microsoft reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise. - -1. atom/language-clojure version 0.22.8 (https://github.com/atom/language-clojure) -2. atom/language-coffee-script version 0.49.3 (https://github.com/atom/language-coffee-script) -3. atom/language-css version 0.45.0 (https://github.com/atom/language-css) -4. atom/language-java version 0.32.1 (https://github.com/atom/language-java) -5. atom/language-sass version 0.62.1 (https://github.com/atom/language-sass) -6. atom/language-shellscript version 0.28.2 (https://github.com/atom/language-shellscript) -7. atom/language-xml version 0.35.2 (https://github.com/atom/language-xml) -8. better-go-syntax version 1.0.0 (https://github.com/jeff-hykin/better-go-syntax/ ) -9. Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes) -10. daaain/Handlebars version 1.8.0 (https://github.com/daaain/Handlebars) -11. dart-lang/dart-syntax-highlight (https://github.com/dart-lang/dart-syntax-highlight) -12. davidrios/pug-tmbundle (https://github.com/davidrios/pug-tmbundle) -13. definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped) -14. demyte/language-cshtml version 0.3.0 (https://github.com/demyte/language-cshtml) -15. Document Object Model version 4.0.0 (https://www.w3.org/DOM/) -16. dompurify version 2.3.1 (https://github.com/cure53/DOMPurify) -17. dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage) -18. expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation) -19. fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle) -20. freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift) -21. HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/) -22. Ikuyadeu/vscode-R version 2.3.8 (https://github.com/Ikuyadeu/vscode-R) -23. Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site) -24. ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar) -25. James-Yu/LaTeX-Workshop version 8.19.1 (https://github.com/James-Yu/LaTeX-Workshop) -26. jeff-hykin/cpp-textmate-grammar version 1.12.11 (https://github.com/jeff-hykin/cpp-textmate-grammar) -27. jeff-hykin/cpp-textmate-grammar version 1.15.6 (https://github.com/jeff-hykin/cpp-textmate-grammar) -28. jlelong/vscode-latex-basics version 1.3.0 (https://github.com/jlelong/vscode-latex-basics) -29. js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify) -30. JuliaEditorSupport/atom-language-julia version 0.22.1 (https://github.com/JuliaEditorSupport/atom-language-julia) -31. Jxck/assert version 1.0.0 (https://github.com/Jxck/assert) -32. language-docker (https://github.com/moby/moby) -33. language-less version 0.34.2 (https://github.com/atom/language-less) -34. language-php version 0.48.1 (https://github.com/atom/language-php) -35. MagicStack/MagicPython version 1.1.1 (https://github.com/MagicStack/MagicPython) -36. marked version 4.0.16 (https://github.com/markedjs/marked) -37. mdn-data version 1.1.12 (https://github.com/mdn/data) -38. microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/microsoft/TypeScript-TmLanguage) -39. microsoft/vscode-JSON.tmLanguage (https://github.com/microsoft/vscode-JSON.tmLanguage) -40. microsoft/vscode-markdown-tm-grammar version 1.0.0 (https://github.com/microsoft/vscode-markdown-tm-grammar) -41. microsoft/vscode-mssql version 1.10.1 (https://github.com/microsoft/vscode-mssql) -42. mmims/language-batchfile version 0.7.6 (https://github.com/mmims/language-batchfile) -43. NVIDIA/cuda-cpp-grammar (https://github.com/NVIDIA/cuda-cpp-grammar) -44. PowerShell/EditorSyntax version 1.0.0 (https://github.com/PowerShell/EditorSyntax) -45. rust-syntax version 0.5.0 (https://github.com/dustypomerleau/rust-syntax) -46. semver version 5.5.0 (https://github.com/npm/node-semver) -47. seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui) -48. shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage) -49. sumneko/lua.tmbundle version 1.0.0 (https://github.com/sumneko/lua.tmbundle) -50. textmate/asp.vb.net.tmbundle (https://github.com/textmate/asp.vb.net.tmbundle) -51. textmate/c.tmbundle (https://github.com/textmate/c.tmbundle) -52. textmate/diff.tmbundle (https://github.com/textmate/diff.tmbundle) -53. textmate/git.tmbundle (https://github.com/textmate/git.tmbundle) -54. textmate/groovy.tmbundle (https://github.com/textmate/groovy.tmbundle) -55. textmate/html.tmbundle (https://github.com/textmate/html.tmbundle) -56. textmate/ini.tmbundle (https://github.com/textmate/ini.tmbundle) -57. textmate/javascript.tmbundle (https://github.com/textmate/javascript.tmbundle) -58. textmate/markdown.tmbundle (https://github.com/textmate/markdown.tmbundle) -59. textmate/perl.tmbundle (https://github.com/textmate/perl.tmbundle) -60. textmate/ruby.tmbundle (https://github.com/textmate/ruby.tmbundle) -61. textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle) -62. trond-snekvik/vscode-rst version 1.5.1 (https://github.com/trond-snekvik/vscode-rst) -63. TypeScript-TmLanguage version 0.1.8 (https://github.com/microsoft/TypeScript-TmLanguage) -64. TypeScript-TmLanguage version 1.0.0 (https://github.com/microsoft/TypeScript-TmLanguage) -65. Unicode version 12.0.0 (https://home.unicode.org/) -66. vscode-codicons version 0.0.14 (https://github.com/microsoft/vscode-codicons) -67. vscode-logfile-highlighter version 2.11.0 (https://github.com/emilast/vscode-logfile-highlighter) -68. vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift) -69. Web Background Synchronization (https://github.com/WICG/background-sync) +This repository incorporates material as listed below or described in the code. -%% atom/language-clojure NOTICES AND INFORMATION BEGIN HERE -========================================= + +--------------------------------------------------------- + +@iktakahiro/markdown-it-katex 4.0.2 - MIT +https://github.com/mjbvz/markdown-it-katex + +The MIT License (MIT) + +Copyright (c) 2016 Waylon Flinn + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +--- + +The MIT License (MIT) + +Copyright (c) 2018 Takahiro Ethan Ikeuchi @iktakahiro + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +--------------------------------------------------------- + +--------------------------------------------------------- + +atom/language-clojure 0.22.8 - MIT +https://github.com/atom/language-clojure + Copyright (c) 2014 GitHub Inc. Permission is hereby granted, free of charge, to any person obtaining @@ -125,11 +108,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF atom/language-clojure NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +atom/language-coffee-script 0.49.3 - MIT +https://github.com/atom/language-coffee-script -%% atom/language-coffee-script NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2014 GitHub Inc. @@ -180,11 +165,13 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF atom/language-coffee-script NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +atom/language-css 0.45.1 - GitHub License +https://github.com/atom/language-css -%% atom/language-css NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) 2014 GitHub Inc. Permission is hereby granted, free of charge, to any person obtaining @@ -216,11 +203,13 @@ Permission to copy, use, modify, sell and distribute this software is granted. This software is provided "as is" without express or implied warranty, and with no claim as to its suitability for any purpose. -========================================= -END OF atom/language-css NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +atom/language-java 0.32.1 - MIT +https://github.com/atom/language-java -%% atom/language-java NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2014 GitHub Inc. @@ -253,11 +242,13 @@ Permission to copy, use, modify, sell and distribute this software is granted. This software is provided "as is" without express or implied warranty, and with no claim as to its suitability for any purpose. -========================================= -END OF atom/language-java NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +atom/language-sass 0.62.1 - MIT +https://github.com/atom/language-sass -%% atom/language-sass NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2014 GitHub Inc. @@ -306,11 +297,13 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF atom/language-sass NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +atom/language-shellscript 0.28.2 - MIT +https://github.com/atom/language-shellscript -%% atom/language-shellscript NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2014 GitHub Inc. @@ -343,11 +336,13 @@ Permission to copy, use, modify, sell and distribute this software is granted. This software is provided "as is" without express or implied warranty, and with no claim as to its suitability for any purpose. -========================================= -END OF atom/language-shellscript NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +atom/language-xml 0.35.2 - MIT +https://github.com/atom/language-xml -%% atom/language-xml NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2014 GitHub Inc. @@ -380,11 +375,13 @@ Permission to copy, use, modify, sell and distribute this software is granted. This software is provided "as is" without express or implied warranty, and with no claim as to its suitability for any purpose. -========================================= -END OF atom/language-xml NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +better-go-syntax 1.0.0 - MIT +https://github.com/jeff-hykin/better-go-syntax/ -%% better-go-syntax NOTICES AND INFORMATION BEGIN HERE -========================================= MIT License Copyright (c) 2019 Jeff Hykin @@ -406,11 +403,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF better-go-syntax NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +Colorsublime-Themes 0.1.0 +https://github.com/Colorsublime/Colorsublime-Themes -%% Colorsublime-Themes NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) 2015 Colorsublime.com Permission is hereby granted, free of charge, to any person obtaining a copy @@ -430,11 +429,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF Colorsublime-Themes NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +daaain/Handlebars 1.8.0 - MIT +https://github.com/daaain/Handlebars -%% daaain/Handlebars NOTICES AND INFORMATION BEGIN HERE -========================================= -- Credits Adapted from the great sublime-text-handlebars package by Nicholas Westlake. @@ -452,11 +453,13 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF daaain/Handlebars NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +dart-lang/dart-syntax-highlight 0.0.0 - BSD +https://github.com/dart-lang/dart-syntax-highlight -%% dart-lang/dart-syntax-highlight NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright 2020, the Dart project authors. Redistribution and use in source and binary forms, with or without @@ -484,11 +487,13 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -========================================= -END OF dart-lang/dart-syntax-highlight NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +davidrios/pug-tmbundle 0.0.0 - MIT +https://github.com/davidrios/pug-tmbundle -%% davidrios/pug-tmbundle NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2016 David Rios @@ -509,11 +514,13 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF davidrios/pug-tmbundle NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +definitelytyped - MIT +https://github.com/DefinitelyTyped/DefinitelyTyped -%% definitelytyped NOTICES AND INFORMATION BEGIN HERE -========================================= This project is licensed under the MIT license. Copyrights are respective of each contributor listed at the beginning of each definition file. @@ -522,38 +529,13 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF definitelytyped NOTICES AND INFORMATION +--------------------------------------------------------- -%% demyte/language-cshtml NOTICES AND INFORMATION BEGIN HERE -========================================= -The MIT License (MIT) +--------------------------------------------------------- -Copyright (c) 2014 James Summerton +Document Object Model 4.0.0 - W3C License +https://www.w3.org/DOM/ -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF demyte/language-cshtml NOTICES AND INFORMATION - -%% Document Object Model NOTICES AND INFORMATION BEGIN HERE -========================================= W3C License This work is being provided by the copyright holders under the following license. By obtaining and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions. @@ -570,11 +552,13 @@ FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENT W COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT. The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the work without specific, written prior permission. Title to copyright in this work will at all times remain with copyright holders. -========================================= -END OF Document Object Model NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +dompurify 2.3.1 - Apache 2.0 +https://github.com/cure53/DOMPurify -%% dompurify NOTICES AND INFORMATION BEGIN HERE -========================================= DOMPurify Copyright 2015 Mario Heiderich @@ -952,11 +936,13 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -========================================= -END OF dompurify NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +dotnet/csharp-tmLanguage 0.1.0 - MIT +https://github.com/dotnet/csharp-tmLanguage -%% dotnet/csharp-tmLanguage NOTICES AND INFORMATION BEGIN HERE -========================================= MIT License Copyright (c) 2016 .NET Foundation @@ -978,11 +964,42 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF dotnet/csharp-tmLanguage NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +dotnet/razor-tooling 1.0.0 - MIT +https://github.com/dotnet/razor-tooling + +MIT License + +Copyright (c) .NET Foundation and Contributors +All Rights Reserved + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +--------------------------------------------------------- + +--------------------------------------------------------- + +expand-abbreviation 0.5.8 - MIT +https://github.com/emmetio/expand-abbreviation -%% expand-abbreviation NOTICES AND INFORMATION BEGIN HERE -========================================= MIT License Copyright (c) 2017 Emmet.io @@ -1004,11 +1021,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF expand-abbreviation NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +fadeevab/make.tmbundle 0.0.0 - TextMate Bundle License +https://github.com/fadeevab/make.tmbundle -%% fadeevab/make.tmbundle NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) textmate-make.tmbundle project authors If not otherwise specified (see below), files in this repository fall under the following license: @@ -1022,11 +1041,13 @@ An exception is made for files in readable text which contain their own license or files where an accompanying file exists (in the same directory) with a "-license" suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example "tidy" is accompanied by "tidy-license.txt". -========================================= -END OF fadeevab/make.tmbundle NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +freebroccolo/atom-language-swift 0.0.0 - MIT +https://github.com/freebroccolo/atom-language-swift -%% freebroccolo/atom-language-swift NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2014 Darin Morrison @@ -1047,11 +1068,13 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF freebroccolo/atom-language-swift NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +HTML 5.1 W3C Working Draft 08 October 2015 - W3C Document License +http://www.w3.org/TR/2015/WD-html51-20151008/ -%% HTML 5.1 W3C Working Draft NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright Š 2015 W3CÂŽ (MIT, ERCIM, Keio, Beihang). This software or document includes material copied from or derived from HTML 5.1 W3C Working Draft (http://www.w3.org/TR/2015/WD-html51-20151008/.) @@ -1065,11 +1088,13 @@ DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF. The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to this document or its contents without specific, written prior permission. Title to copyright in this document will at all times remain with copyright holders. -========================================= -END OF HTML 5.1 W3C Working Draft NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +Ikuyadeu/vscode-R 2.3.8 - MIT +https://github.com/Ikuyadeu/vscode-R -%% Ikuyadeu/vscode-R NOTICES AND INFORMATION BEGIN HERE -========================================= MIT License Copyright (c) 2022 REditorSupport @@ -1091,11 +1116,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF Ikuyadeu/vscode-R NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +Ionic documentation 1.2.4 - Apache2 +https://github.com/ionic-team/ionic-site -%% Ionic documentation NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright Drifty Co. http://drifty.com/. Apache License @@ -1153,11 +1180,13 @@ If the Work includes a "NOTICE" text file as part of its distribution, then any 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS -========================================= -END OF Ionic documentation NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +ionide/ionide-fsgrammar 0.0.0 - MIT +https://github.com/ionide/ionide-fsgrammar -%% ionide/ionide-fsgrammar NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2015 Krzysztof Cieslak @@ -1179,11 +1208,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF ionide/ionide-fsgrammar NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +James-Yu/LaTeX-Workshop 8.19.1 - MIT +https://github.com/James-Yu/LaTeX-Workshop -%% James-Yu/LaTeX-Workshop NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2016 James Yu @@ -1205,11 +1236,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF James-Yu/LaTeX-Workshop NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +jeff-hykin/better-c-syntax 1.13.2 - MIT +https://github.com/jeff-hykin/better-c-syntax -%% jeff-hykin/cpp-textmate-grammar NOTICES AND INFORMATION BEGIN HERE -========================================= MIT License Copyright (c) 2019 Jeff Hykin @@ -1231,11 +1264,97 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF jeff-hykin/cpp-textmate-grammar NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +jeff-hykin/better-cpp-syntax 1.15.23 - MIT +https://github.com/jeff-hykin/better-cpp-syntax + +MIT License + +Copyright (c) 2019 Jeff Hykin + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +--------------------------------------------------------- + +--------------------------------------------------------- + +jeff-hykin/better-objc-syntax 0.2.0 - MIT +https://github.com/jeff-hykin/better-objc-syntax + +MIT License + +Copyright (c) 2019 Jeff Hykin + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +--------------------------------------------------------- + +--------------------------------------------------------- + +jeff-hykin/better-objcpp-syntax 0.1.0 - MIT +https://github.com/jeff-hykin/better-objcpp-syntax + +MIT License + +Copyright (c) 2019 Jeff Hykin + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +--------------------------------------------------------- + +--------------------------------------------------------- + +jlelong/vscode-latex-basics 1.4.0 - MIT +https://github.com/jlelong/vscode-latex-basics -%% jlelong/vscode-latex-basics NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) vscode-latex-basics authors If not otherwise specified (see below), files in this repository fall under the MIT License @@ -1254,11 +1373,13 @@ included in VSCode and falls under the license described in markdown-latex-combi The file syntaxes/cpp-grammar-bailout.tmLanguage.json is generated from https://github.com/jeff-hykin/better-cpp-syntax and falls under the license described in cpp-bailout-license.txt. -========================================= -END OF jlelong/vscode-latex-basics NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +js-beautify 1.6.8 - MIT +https://github.com/beautify-web/js-beautify -%% js-beautify NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors. @@ -1268,11 +1389,13 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF js-beautify NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +JuliaEditorSupport/atom-language-julia 0.22.1 - MIT +https://github.com/JuliaEditorSupport/atom-language-julia -%% JuliaEditorSupport/atom-language-julia NOTICES AND INFORMATION BEGIN HERE -========================================= The atom-language-julia package is licensed under the MIT "Expat" License: > Copyright (c) 2015 @@ -1295,11 +1418,13 @@ The atom-language-julia package is licensed under the MIT "Expat" License: > CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, > TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE > SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF JuliaEditorSupport/atom-language-julia NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +Jxck/assert 1.0.0 - MIT +https://github.com/Jxck/assert -%% Jxck/assert NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2011 Jxck @@ -1323,11 +1448,13 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF Jxck/assert NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +language-docker 0.0.0 - Apache2 +https://github.com/moby/moby -%% language-docker NOTICES AND INFORMATION BEGIN HERE -========================================= Apache License Version 2.0, January 2004 https://www.apache.org/licenses/ @@ -1518,11 +1645,13 @@ Apache License WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -========================================= -END OF language-docker NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +language-less 0.34.2 - MIT +https://github.com/atom/language-less -%% language-less NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2014 GitHub Inc. @@ -1570,11 +1699,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF language-less NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +language-php 0.48.1 - MIT +https://github.com/atom/language-php -%% language-php NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2014 GitHub Inc. @@ -1607,11 +1738,13 @@ Permission to copy, use, modify, sell and distribute this software is granted. This software is provided "as is" without express or implied warranty, and with no claim as to its suitability for any purpose. -========================================= -END OF language-php NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +MagicStack/MagicPython 1.1.1 - MIT +https://github.com/MagicStack/MagicPython -%% MagicStack/MagicPython NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License Copyright (c) 2015-present MagicStack Inc. http://magic.io @@ -1633,11 +1766,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF MagicStack/MagicPython NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +marked 4.1.0 - MIT +https://github.com/markedjs/marked -%% marked NOTICES AND INFORMATION BEGIN HERE -========================================= information ## Contribution License Agreement @@ -1682,11 +1817,13 @@ Redistribution and use in source and binary forms, with or without modification, * Neither the name "Markdown" nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. This software is provided by the copyright holders and contributors "as is" and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the copyright owner or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage. -========================================= -END OF marked NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +mdn-data 1.1.12 - MPL +https://github.com/mdn/data -%% mdn-data NOTICES AND INFORMATION BEGIN HERE -========================================= Mozilla Public License Version 2.0 Copyright (c) 2018 Mozilla Corporation @@ -2063,11 +2200,13 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -========================================= -END OF mdn-data NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +microsoft/TypeScript-TmLanguage 0.0.1 - MIT +https://github.com/microsoft/TypeScript-TmLanguage -%% microsoft/TypeScript-TmLanguage NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) Microsoft Corporation All rights reserved. @@ -2090,11 +2229,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF microsoft/TypeScript-TmLanguage NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +microsoft/vscode-JSON.tmLanguage 0.0.0 - MIT +https://github.com/microsoft/vscode-JSON.tmLanguage -%% microsoft/vscode-JSON.tmLanguage NOTICES AND INFORMATION BEGIN HERE -========================================= vscode-JSON.tmLanguage Copyright (c) Microsoft Corporation @@ -2114,11 +2255,13 @@ THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF microsoft/vscode-JSON.tmLanguage NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +microsoft/vscode-markdown-tm-grammar 1.0.0 - MIT +https://github.com/microsoft/vscode-markdown-tm-grammar -%% microsoft/vscode-markdown-tm-grammar NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) Microsoft 2018 @@ -2140,11 +2283,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF microsoft/vscode-markdown-tm-grammar NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +microsoft/vscode-mssql 1.16.0 - MIT +https://github.com/microsoft/vscode-mssql -%% microsoft/vscode-mssql NOTICES AND INFORMATION BEGIN HERE -========================================= ------------------------------------------ START OF LICENSE ----------------------------------------- vscode-mssql Copyright (c) Microsoft Corporation @@ -2155,11 +2300,13 @@ Copyright (c) 2016 Microsoft The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ----------------------------------------------- END OF LICENSE ----------------------------------------- -========================================= -END OF microsoft/vscode-mssql NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +mmims/language-batchfile 0.7.6 - MIT +https://github.com/mmims/language-batchfile -%% mmims/language-batchfile NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2021 Michael Mims @@ -2181,11 +2328,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF mmims/language-batchfile NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +NVIDIA/cuda-cpp-grammar 0.0.0 - MIT +https://github.com/NVIDIA/cuda-cpp-grammar -%% NVIDIA/cuda-cpp-grammar NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright 2021 NVIDIA Corporation @@ -2195,11 +2344,13 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF NVIDIA/cuda-cpp-grammar NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +PowerShell/EditorSyntax 1.0.0 - MIT +https://github.com/PowerShell/EditorSyntax -%% PowerShell/EditorSyntax NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) Microsoft Corporation All rights reserved. @@ -2223,11 +2374,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF PowerShell/EditorSyntax NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +rust-syntax 0.5.0 - MIT +https://github.com/dustypomerleau/rust-syntax -%% rust-syntax NOTICES AND INFORMATION BEGIN HERE -========================================= MIT License Copyright (c) 2020 Dustin Pomerleau @@ -2249,11 +2402,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF rust-syntax NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +semver 5.5.0 - The ISC License +https://github.com/npm/node-semver -%% semver NOTICES AND INFORMATION BEGIN HERE -========================================= The ISC License Copyright (c) Isaac Z. Schlueter and Contributors @@ -2269,11 +2424,13 @@ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -========================================= -END OF semver NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +seti-ui 0.1.0 +https://github.com/jesseweed/seti-ui -%% seti-ui NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) 2014 Jesse Weed Permission is hereby granted, free of charge, to any person obtaining @@ -2294,11 +2451,13 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF seti-ui NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +shaders-tmLanguage 0.1.0 - MIT +https://github.com/tgjones/shaders-tmLanguage -%% shaders-tmLanguage NOTICES AND INFORMATION BEGIN HERE -========================================= MIT License Copyright (c) 2017 Tim Jones @@ -2320,11 +2479,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF shaders-tmLanguage NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +sumneko/lua.tmbundle 1.0.0 - TextMate Bundle License +https://github.com/sumneko/lua.tmbundle -%% sumneko/lua.tmbundle NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) sumneko-lua.tmbundle project authors If not otherwise specified (see below), files in this repository fall under the following license: @@ -2338,11 +2499,13 @@ An exception is made for files in readable text which contain their own license or files where an accompanying file exists (in the same directory) with a "-license" suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example "tidy" is accompanied by "tidy-license.txt". -========================================= -END OF sumneko/lua.tmbundle NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +textmate/asp.vb.net.tmbundle 0.0.0 - TextMate Bundle License +https://github.com/textmate/asp.vb.net.tmbundle -%% textmate/asp.vb.net.tmbundle NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) textmate-asp.vb.net.tmbundle project authors If not otherwise specified (see below), files in this folder fall under the following license: @@ -2356,11 +2519,13 @@ An exception is made for files in readable text which contain their own license or files where an accompanying file exists (in the same directory) with a "-license" suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example "tidy" is accompanied by "tidy-license.txt". -========================================= -END OF textmate/asp.vb.net.tmbundle NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +textmate/c.tmbundle 0.0.0 - TextMate Bundle License +https://github.com/textmate/c.tmbundle -%% textmate/c.tmbundle NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) textmate-c.tmbundle authors If not otherwise specified (see below), files in this repository fall under the following license: @@ -2374,11 +2539,13 @@ An exception is made for files in readable text which contain their own license or files where an accompanying file exists (in the same directory) with a "-license" suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example "tidy" is accompanied by "tidy-license.txt". -========================================= -END OF textmate/c.tmbundle NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +textmate/diff.tmbundle 0.0.0 - TextMate Bundle License +https://github.com/textmate/diff.tmbundle -%% textmate/diff.tmbundle NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) textmate-diff.tmbundle project authors If not otherwise specified (see below), files in this repository fall under the following license: @@ -2392,11 +2559,13 @@ An exception is made for files in readable text which contain their own license or files where an accompanying file exists (in the same directory) with a "-license" suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example "tidy" is accompanied by "tidy-license.txt". -========================================= -END OF textmate/diff.tmbundle NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +textmate/git.tmbundle 0.0.0 - MIT +https://github.com/textmate/git.tmbundle -%% textmate/git.tmbundle NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2008 Tim Harper @@ -2419,11 +2588,13 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF textmate/git.tmbundle NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +textmate/groovy.tmbundle 0.0.0 - TextMate Bundle License +https://github.com/textmate/groovy.tmbundle -%% textmate/groovy.tmbundle NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) textmate-groovy.tmbundle project authors If not otherwise specified (see below), files in this repository fall under the following license: @@ -2437,11 +2608,13 @@ An exception is made for files in readable text which contain their own license or files where an accompanying file exists (in the same directory) with a "-license" suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example "tidy" is accompanied by "tidy-license.txt". -========================================= -END OF textmate/groovy.tmbundle NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +textmate/html.tmbundle 0.0.0 - TextMate Bundle License +https://github.com/textmate/html.tmbundle -%% textmate/html.tmbundle NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) textmate-html.tmbundle project authors If not otherwise specified (see below), files in this repository fall under the following license: @@ -2455,11 +2628,13 @@ An exception is made for files in readable text which contain their own license or files where an accompanying file exists (in the same directory) with a "-license" suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example "tidy" is accompanied by "tidy-license.txt". -========================================= -END OF textmate/html.tmbundle NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +textmate/ini.tmbundle 0.0.0 - TextMate Bundle License +https://github.com/textmate/ini.tmbundle -%% textmate/ini.tmbundle NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) textmate-ini.tmbundle project authors If not otherwise specified (see below), files in this folder fall under the following license: @@ -2473,11 +2648,13 @@ An exception is made for files in readable text which contain their own license or files where an accompanying file exists (in the same directory) with a "-license" suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example "tidy" is accompanied by "tidy-license.txt". -========================================= -END OF textmate/ini.tmbundle NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +textmate/javascript.tmbundle 0.0.0 - TextMate Bundle License +https://github.com/textmate/javascript.tmbundle -%% textmate/javascript.tmbundle NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) textmate-javascript.tmbundle project authors If not otherwise specified (see below), files in this repository fall under the following license: @@ -2491,11 +2668,13 @@ An exception is made for files in readable text which contain their own license or files where an accompanying file exists (in the same directory) with a "-license" suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example "tidy" is accompanied by "tidy-license.txt". -========================================= -END OF textmate/javascript.tmbundle NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +textmate/markdown.tmbundle 0.0.0 - TextMate Bundle License +https://github.com/textmate/markdown.tmbundle -%% textmate/markdown.tmbundle NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) markdown.tmbundle authors If not otherwise specified (see below), files in this repository fall under the following license: @@ -2509,11 +2688,13 @@ An exception is made for files in readable text which contain their own license or files where an accompanying file exists (in the same directory) with a "-license" suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example "tidy" is accompanied by "tidy-license.txt". -========================================= -END OF textmate/markdown.tmbundle NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +textmate/perl.tmbundle 0.0.0 - TextMate Bundle License +https://github.com/textmate/perl.tmbundle -%% textmate/perl.tmbundle NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) textmate-perl.tmbundle project authors If not otherwise specified (see below), files in this repository fall under the following license: @@ -2527,11 +2708,13 @@ An exception is made for files in readable text which contain their own license or files where an accompanying file exists (in the same directory) with a "-license" suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example "tidy" is accompanied by "tidy-license.txt". -========================================= -END OF textmate/perl.tmbundle NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +textmate/ruby.tmbundle 0.0.0 - TextMate Bundle License +https://github.com/textmate/ruby.tmbundle -%% textmate/ruby.tmbundle NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) textmate-ruby.tmbundle project authors If not otherwise specified (see below), files in this folder fall under the following license: @@ -2545,11 +2728,13 @@ An exception is made for files in readable text which contain their own license or files where an accompanying file exists (in the same directory) with a "-license" suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example "tidy" is accompanied by "tidy-license.txt". -========================================= -END OF textmate/ruby.tmbundle NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +textmate/yaml.tmbundle 0.0.0 - TextMate Bundle License +https://github.com/textmate/yaml.tmbundle -%% textmate/yaml.tmbundle NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) 2015 FichteFoll Permission is hereby granted, free of charge, to any person obtaining a copy @@ -2568,11 +2753,13 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF textmate/yaml.tmbundle NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +trond-snekvik/vscode-rst 1.5.1 - MIT +https://github.com/trond-snekvik/vscode-rst -%% trond-snekvik/vscode-rst NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright 2021 Trond Snekvik @@ -2582,11 +2769,14 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF trond-snekvik/vscode-rst NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +TypeScript-TmLanguage 0.1.8 - MIT +TypeScript-TmLanguage 1.0.0 - MIT +https://github.com/microsoft/TypeScript-TmLanguage -%% TypeScript-TmLanguage NOTICES AND INFORMATION BEGIN HERE -========================================= Copyright (c) Microsoft Corporation All rights reserved. @@ -2609,11 +2799,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF TypeScript-TmLanguage NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +Unicode 12.0.0 - UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE +https://home.unicode.org/ -%% Unicode NOTICES AND INFORMATION BEGIN HERE -========================================= Unicode Data Files include all data files under the directories https://www.unicode.org/Public/, https://www.unicode.org/reports/, https://cldr.unicode.org, https://github.com/unicode-org/icu, and @@ -2669,11 +2861,13 @@ Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. -========================================= -END OF Unicode NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +vscode-codicons 0.0.14 - MIT and Creative Commons Attribution 4.0 +https://github.com/microsoft/vscode-codicons -%% vscode-codicons NOTICES AND INFORMATION BEGIN HERE -========================================= Attribution 4.0 International ======================================================================= @@ -3069,11 +3263,13 @@ the avoidance of doubt, this paragraph does not form part of the public licenses. Creative Commons may be contacted at creativecommons.org. -========================================= -END OF vscode-codicons NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +vscode-logfile-highlighter 2.15.0 - MIT +https://github.com/emilast/vscode-logfile-highlighter -%% vscode-logfile-highlighter NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2015 emilast @@ -3095,11 +3291,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF vscode-logfile-highlighter NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +vscode-swift 0.0.1 - MIT +https://github.com/owensd/vscode-swift -%% vscode-swift NOTICES AND INFORMATION BEGIN HERE -========================================= The MIT License (MIT) Copyright (c) 2015 David Owens II @@ -3120,11 +3318,41 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -========================================= -END OF vscode-swift NOTICES AND INFORMATION +--------------------------------------------------------- + +--------------------------------------------------------- + +vscode-win32-app-container-tokens +https://github.com/microsoft/vscode-win32-app-container-tokens + +MIT License + +Copyright (c) Microsoft Corporation. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE +--------------------------------------------------------- + +--------------------------------------------------------- + +Web Background Synchronization - Apache2 +https://github.com/WICG/background-sync -%% Web Background Synchronization NOTICES AND INFORMATION BEGIN HERE -========================================= Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -3326,5 +3554,4 @@ Apache License WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -========================================= -END OF Web Background Synchronization NOTICES AND INFORMATION \ No newline at end of file +--------------------------------------------------------- \ No newline at end of file diff --git a/build/.cachesalt b/build/.cachesalt index 30d07f23725..4f9c24c0470 100644 --- a/build/.cachesalt +++ b/build/.cachesalt @@ -1 +1 @@ -2022-05-10T08:20:50.162Z +2022-08-01T11:24:47.411Z diff --git a/build/.moduleignore b/build/.moduleignore index a2e1b715e1b..1a1461b2330 100644 --- a/build/.moduleignore +++ b/build/.moduleignore @@ -48,6 +48,11 @@ native-watchdog/build/** native-watchdog/src/** !native-watchdog/build/Release/*.node +node-vsce-sign/** +!node-vsce-sign/src/main.js +!node-vsce-sign/package.json +!node-vsce-sign/bin/** + spdlog/binding.gyp spdlog/build/** spdlog/deps/** @@ -122,10 +127,6 @@ vscode-windows-ca-certs/**/* node-addon-api/**/* prebuild-install/**/* -@microsoft/applicationinsights*/** -@microsoft/dynamicproto-js/** -!@microsoft/applicationinsights-web/dist/applicationinsights-web.min.js - # other node modules **/docs/** diff --git a/build/.webignore b/build/.webignore index f55882ba9d4..1a5b3ee2c10 100644 --- a/build/.webignore +++ b/build/.webignore @@ -20,6 +20,9 @@ vscode-textmate/webpack.config.js xterm/src/** +xterm-addon-canvas/src/** +xterm-addon-canvas/out/** + xterm-addon-search/src/** xterm-addon-search/out/** xterm-addon-search/fixtures/** @@ -33,6 +36,3 @@ xterm-addon-webgl/out/** # This makes sure the model is included in the package !@vscode/vscode-languagedetection/model/** -@microsoft/applicationinsights*/** -@microsoft/dynamicproto-js/** -!@microsoft/applicationinsights-web/dist/applicationinsights-web.min.js \ No newline at end of file diff --git a/build/azure-pipelines/cli/cli-compile-and-publish.yml b/build/azure-pipelines/cli/cli-compile-and-publish.yml new file mode 100644 index 00000000000..4c152a2481b --- /dev/null +++ b/build/azure-pipelines/cli/cli-compile-and-publish.yml @@ -0,0 +1,45 @@ +parameters: + - name: VSCODE_CLI_TARGET + type: string + - name: VSCODE_CLI_ARTIFACT + type: string + - name: VSCODE_CLI_ENV + type: object + default: {} + +steps: + - script: cargo build --release --target ${{ parameters.VSCODE_CLI_TARGET }} --bin=code + displayName: Compile ${{ parameters.VSCODE_CLI_TARGET }} + workingDirectory: $(Build.SourcesDirectory)/cli + env: + CARGO_NET_GIT_FETCH_WITH_CLI: true + ${{ each pair in parameters.VSCODE_CLI_ENV }}: + ${{ pair.key }}: ${{ pair.value }} + + - ${{ if or(contains(parameters.VSCODE_CLI_TARGET, '-windows-'), contains(parameters.VSCODE_CLI_TARGET, '-darwin')) }}: + - task: ArchiveFiles@2 + inputs: + ${{ if contains(parameters.VSCODE_CLI_TARGET, '-windows-') }}: + rootFolderOrFile: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code.exe + ${{ if contains(parameters.VSCODE_CLI_TARGET, '-darwin') }}: + rootFolderOrFile: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code + includeRootFolder: false + archiveType: zip + archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.zip + + - publish: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.zip + artifact: ${{ parameters.VSCODE_CLI_ARTIFACT }} + displayName: Publish ${{ parameters.VSCODE_CLI_ARTIFACT }} artifact + + - ${{ else }}: + - task: ArchiveFiles@2 + inputs: + rootFolderOrFile: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code + includeRootFolder: false + archiveType: tar + tarCompression: gz + archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.tar.gz + + - publish: $(Build.ArtifactStagingDirectory)/${{ parameters.VSCODE_CLI_ARTIFACT }}.tar.gz + artifact: ${{ parameters.VSCODE_CLI_ARTIFACT }} + displayName: Publish ${{ parameters.VSCODE_CLI_ARTIFACT }} artifact diff --git a/build/azure-pipelines/cli/cli-darwin-sign.yml b/build/azure-pipelines/cli/cli-darwin-sign.yml new file mode 100644 index 00000000000..b8f9e965133 --- /dev/null +++ b/build/azure-pipelines/cli/cli-darwin-sign.yml @@ -0,0 +1,40 @@ +parameters: + - name: VSCODE_CLI_ARTIFACTS + type: object + default: [] + +steps: + - task: UseDotNet@2 + inputs: + version: 2.x + + - task: EsrpClientTool@1 + displayName: Download ESRPClient + + - ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}: + - task: DownloadPipelineArtifact@2 + displayName: Download ${{ target }} + inputs: + artifact: ${{ target }} + path: $(Build.ArtifactStagingDirectory)/pkg/${{ target }} + + - script: | + set -e + node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-sign $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Build.ArtifactStagingDirectory)/pkg "*.zip" + displayName: Codesign + + - script: | + set -e + node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-notarize $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Build.ArtifactStagingDirectory)/pkg "*.zip" + displayName: Notarize + + - ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}: + - script: | + set -e + ASSET_ID=$(echo "${{ target }}" | sed "s/unsigned_//") + mv $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/${{ target }}.zip $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/$ASSET_ID.zip + echo "##vso[task.setvariable variable=ASSET_ID]$ASSET_ID" + displayName: Set asset id variable + + - publish: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/$(ASSET_ID).zip + artifact: $(ASSET_ID) diff --git a/build/azure-pipelines/cli/cli-win32-sign.yml b/build/azure-pipelines/cli/cli-win32-sign.yml new file mode 100644 index 00000000000..26e303c2842 --- /dev/null +++ b/build/azure-pipelines/cli/cli-win32-sign.yml @@ -0,0 +1,65 @@ +parameters: + - name: VSCODE_CLI_ARTIFACTS + type: object + default: [] + +steps: + - task: AzureKeyVault@1 + displayName: "Azure Key Vault: Get Secrets" + inputs: + azureSubscription: "vscode-builds-subscription" + KeyVaultName: vscode + SecretsFilter: "ESRP-PKI,esrp-aad-username,esrp-aad-password" + + - task: UseDotNet@2 + displayName: "Use .NET" + inputs: + version: 3.x + + - task: EsrpClientTool@1 + displayName: "Use ESRP client" + + - ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}: + - task: DownloadPipelineArtifact@2 + displayName: Download artifacts + inputs: + artifact: ${{ target }} + path: $(Build.ArtifactStagingDirectory)/pkg/${{ target }} + + - task: ExtractFiles@1 + inputs: + archiveFilePatterns: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/*.zip + destinationFolder: $(Build.ArtifactStagingDirectory)/sign/${{ target }} + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $EsrpClientTool = (gci -directory -filter EsrpClientTool_* $(Agent.RootDirectory)\_tasks | Select-Object -last 1).FullName + $EsrpCliZip = (gci -recurse -filter esrpcli.*.zip $EsrpClientTool | Select-Object -last 1).FullName + mkdir -p $(Agent.TempDirectory)\esrpcli + Expand-Archive -Path $EsrpCliZip -DestinationPath $(Agent.TempDirectory)\esrpcli + $EsrpCliDllPath = (gci -recurse -filter esrpcli.dll $(Agent.TempDirectory)\esrpcli | Select-Object -last 1).FullName + echo "##vso[task.setvariable variable=EsrpCliDllPath]$EsrpCliDllPath" + displayName: Find ESRP CLI + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { node build\azure-pipelines\common\sign $env:EsrpCliDllPath windows $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Build.ArtifactStagingDirectory)/sign "*.exe" } + displayName: "Code sign" + + - ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}: + - powershell: | + $ASSET_ID = "${{ target }}".replace("unsigned_", ""); + echo "##vso[task.setvariable variable=ASSET_ID]$ASSET_ID" + displayName: Set asset id variable + + - task: ArchiveFiles@2 + inputs: + rootFolderOrFile: $(Build.ArtifactStagingDirectory)/sign/${{ target }}/code.exe + includeRootFolder: false + archiveType: zip + archiveFile: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip + + - publish: $(Build.ArtifactStagingDirectory)/$(ASSET_ID).zip + artifact: $(ASSET_ID) diff --git a/build/azure-pipelines/cli/install-rust-posix.yml b/build/azure-pipelines/cli/install-rust-posix.yml new file mode 100644 index 00000000000..e32a8eedadf --- /dev/null +++ b/build/azure-pipelines/cli/install-rust-posix.yml @@ -0,0 +1,37 @@ +parameters: + - name: channel + type: string + default: stable + - name: targets + default: [] + type: object + +# Todo: use 1ES pipeline once extension is installed in ADO + +steps: + - script: | + set -e + curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain $RUSTUP_TOOLCHAIN + echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin" + env: + RUSTUP_TOOLCHAIN: ${{ parameters.channel }} + displayName: "Install Rust" + + - script: | + set -e + rustup default $RUSTUP_TOOLCHAIN + rustup update $RUSTUP_TOOLCHAIN + env: + RUSTUP_TOOLCHAIN: ${{ parameters.channel }} + displayName: "Set Rust version" + + - ${{ each target in parameters.targets }}: + - script: rustup target add ${{ target }} + displayName: "Adding Rust target '${{ target }}'" + + - script: | + set -e + rustc --version + cargo --version + rustup --version + displayName: "Check Rust versions" diff --git a/build/azure-pipelines/cli/install-rust-win32.yml b/build/azure-pipelines/cli/install-rust-win32.yml new file mode 100644 index 00000000000..a1a250dcfbf --- /dev/null +++ b/build/azure-pipelines/cli/install-rust-win32.yml @@ -0,0 +1,38 @@ +parameters: + - name: channel + type: string + default: stable + - name: targets + default: [] + type: object + +# Todo: use 1ES pipeline once extension is installed in ADO + +steps: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + Invoke-WebRequest -Uri "https://win.rustup.rs" -Outfile $(Build.ArtifactStagingDirectory)/rustup-init.exe + exec { $(Build.ArtifactStagingDirectory)/rustup-init.exe -y --profile minimal --default-toolchain $env:RUSTUP_TOOLCHAIN --default-host x86_64-pc-windows-msvc } + echo "##vso[task.prependpath]$env:USERPROFILE\.cargo\bin" + env: + RUSTUP_TOOLCHAIN: ${{ parameters.channel }} + displayName: "Install Rust" + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + exec { rustup default $RUSTUP_TOOLCHAIN } + exec { rustup update $RUSTUP_TOOLCHAIN } + env: + RUSTUP_TOOLCHAIN: ${{ parameters.channel }} + displayName: "Set Rust version" + + - ${{ each target in parameters.targets }}: + - script: rustup target add ${{ target }} + displayName: "Adding Rust target '${{ target }}'" + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + exec { rustc --version } + exec { cargo --version } + exec { rustup --version } + displayName: "Check Rust versions" diff --git a/build/azure-pipelines/cli/prepare.js b/build/azure-pipelines/cli/prepare.js new file mode 100644 index 00000000000..b0cb2e6152a --- /dev/null +++ b/build/azure-pipelines/cli/prepare.js @@ -0,0 +1,66 @@ +"use strict"; +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +Object.defineProperty(exports, "__esModule", { value: true }); +const getVersion_1 = require("../../lib/getVersion"); +const fs = require("fs"); +const path = require("path"); +const packageJson = require("../../../package.json"); +const root = path.dirname(path.dirname(path.dirname(__dirname))); +const readJSON = (path) => JSON.parse(fs.readFileSync(path, 'utf8')); +let productJsonPath; +const isOSS = process.env.VSCODE_QUALITY === 'oss' || !process.env.VSCODE_QUALITY; +if (isOSS) { + productJsonPath = path.join(root, 'product.json'); +} +else { + productJsonPath = path.join(root, 'quality', process.env.VSCODE_QUALITY, 'product.json'); +} +console.log('Loading product.json from', productJsonPath); +const product = readJSON(productJsonPath); +const allProductsAndQualities = isOSS ? [product] : fs.readdirSync(path.join(root, 'quality')) + .map(quality => ({ quality, json: readJSON(path.join(root, 'quality', quality, 'product.json')) })); +const commit = (0, getVersion_1.getVersion)(root); +const makeQualityMap = (m) => { + const output = {}; + for (const { quality, json } of allProductsAndQualities) { + output[quality] = m(json, quality); + } + return output; +}; +/** + * Sets build environment variables for the CLI for current contextual info. + */ +const setLauncherEnvironmentVars = () => { + const vars = new Map([ + ['VSCODE_CLI_REMOTE_LICENSE_TEXT', product.serverLicense?.join('\\n')], + ['VSCODE_CLI_REMOTE_LICENSE_PROMPT', product.serverLicensePrompt], + ['VSCODE_CLI_AI_KEY', product.aiConfig?.cliKey], + ['VSCODE_CLI_AI_ENDPOINT', product.aiConfig?.cliEndpoint], + ['VSCODE_CLI_VERSION', packageJson.version], + ['VSCODE_CLI_UPDATE_ENDPOINT', product.updateUrl], + ['VSCODE_CLI_QUALITY', product.quality], + ['VSCODE_CLI_COMMIT', commit], + [ + 'VSCODE_CLI_WIN32_APP_IDS', + !isOSS && JSON.stringify(makeQualityMap(json => Object.entries(json) + .filter(([key]) => /^win32.*AppId$/.test(key)) + .map(([, value]) => String(value).replace(/[{}]/g, '')))), + ], + [ + 'VSCODE_CLI_QUALITY_DOWNLOAD_URIS', + !isOSS && JSON.stringify(makeQualityMap(json => json.downloadUrl)), + ], + ]); + console.log(JSON.stringify([...vars].reduce((obj, kv) => ({ ...obj, [kv[0]]: kv[1] }), {}))); + for (const [key, value] of vars) { + if (value) { + console.log(`##vso[task.setvariable variable=${key}]${value}`); + } + } +}; +if (require.main === module) { + setLauncherEnvironmentVars(); +} diff --git a/build/azure-pipelines/cli/prepare.ts b/build/azure-pipelines/cli/prepare.ts new file mode 100644 index 00000000000..53f33d08568 --- /dev/null +++ b/build/azure-pipelines/cli/prepare.ts @@ -0,0 +1,75 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { getVersion } from '../../lib/getVersion'; +import * as fs from 'fs'; +import * as path from 'path'; +import * as packageJson from '../../../package.json'; + +const root = path.dirname(path.dirname(path.dirname(__dirname))); +const readJSON = (path: string) => JSON.parse(fs.readFileSync(path, 'utf8')); + +let productJsonPath: string; +const isOSS = process.env.VSCODE_QUALITY === 'oss' || !process.env.VSCODE_QUALITY; +if (isOSS) { + productJsonPath = path.join(root, 'product.json'); +} else { + productJsonPath = path.join(root, 'quality', process.env.VSCODE_QUALITY!, 'product.json'); +} + + +console.log('Loading product.json from', productJsonPath); +const product = readJSON(productJsonPath); +const allProductsAndQualities = isOSS ? [product] : fs.readdirSync(path.join(root, 'quality')) + .map(quality => ({ quality, json: readJSON(path.join(root, 'quality', quality, 'product.json')) })); +const commit = getVersion(root); + +const makeQualityMap = (m: (productJson: any, quality: string) => T): Record => { + const output: Record = {}; + for (const { quality, json } of allProductsAndQualities) { + output[quality] = m(json, quality); + } + return output; +}; + +/** + * Sets build environment variables for the CLI for current contextual info. + */ +const setLauncherEnvironmentVars = () => { + const vars = new Map([ + ['VSCODE_CLI_REMOTE_LICENSE_TEXT', product.serverLicense?.join('\\n')], + ['VSCODE_CLI_REMOTE_LICENSE_PROMPT', product.serverLicensePrompt], + ['VSCODE_CLI_AI_KEY', product.aiConfig?.cliKey], + ['VSCODE_CLI_AI_ENDPOINT', product.aiConfig?.cliEndpoint], + ['VSCODE_CLI_VERSION', packageJson.version], + ['VSCODE_CLI_UPDATE_ENDPOINT', product.updateUrl], + ['VSCODE_CLI_QUALITY', product.quality], + ['VSCODE_CLI_COMMIT', commit], + [ + 'VSCODE_CLI_WIN32_APP_IDS', + !isOSS && JSON.stringify( + makeQualityMap(json => Object.entries(json) + .filter(([key]) => /^win32.*AppId$/.test(key)) + .map(([, value]) => String(value).replace(/[{}]/g, ''))), + ), + ], + [ + 'VSCODE_CLI_QUALITY_DOWNLOAD_URIS', + !isOSS && JSON.stringify(makeQualityMap(json => json.downloadUrl)), + ], + ]); + + console.log(JSON.stringify([...vars].reduce((obj, kv) => ({...obj, [kv[0]]: kv[1]}), {}))); + + for (const [key, value] of vars) { + if (value) { + console.log(`##vso[task.setvariable variable=${key}]${value}`); + } + } +}; + +if (require.main === module) { + setLauncherEnvironmentVars(); +} diff --git a/build/azure-pipelines/cli/test.yml b/build/azure-pipelines/cli/test.yml new file mode 100644 index 00000000000..70eb714c1d9 --- /dev/null +++ b/build/azure-pipelines/cli/test.yml @@ -0,0 +1,21 @@ +parameters: + - name: VSCODE_CLI_TARGETS + default: [] + type: object + - name: VSCODE_CLI_RUST_CHANNEL + type: string + default: stable + +steps: + - template: ./install-rust-posix.yml + parameters: + targets: [] + channel: ${{ parameters.VSCODE_CLI_RUST_CHANNEL }} + + - script: rustup component add clippy && cargo clippy -- -D warnings + workingDirectory: cli + displayName: Clippy lint + + - script: cargo test + workingDirectory: cli + displayName: Run unit tests diff --git a/build/azure-pipelines/common/computeBuiltInDepsCacheKey.js b/build/azure-pipelines/common/computeBuiltInDepsCacheKey.js new file mode 100644 index 00000000000..abc90f6ed2c --- /dev/null +++ b/build/azure-pipelines/common/computeBuiltInDepsCacheKey.js @@ -0,0 +1,15 @@ +"use strict"; +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +Object.defineProperty(exports, "__esModule", { value: true }); +const fs = require("fs"); +const path = require("path"); +const crypto = require("crypto"); +const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../../product.json'), 'utf8')); +const shasum = crypto.createHash('sha1'); +for (const ext of productjson.builtInExtensions) { + shasum.update(`${ext.name}@${ext.version}`); +} +process.stdout.write(shasum.digest('hex')); diff --git a/build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts b/build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts new file mode 100644 index 00000000000..f0554361607 --- /dev/null +++ b/build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts @@ -0,0 +1,17 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as fs from 'fs'; +import * as path from 'path'; +import * as crypto from 'crypto'; + +const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../../product.json'), 'utf8')); +const shasum = crypto.createHash('sha1'); + +for (const ext of productjson.builtInExtensions) { + shasum.update(`${ext.name}@${ext.version}`); +} + +process.stdout.write(shasum.digest('hex')); diff --git a/build/azure-pipelines/common/computeNodeModulesCacheKey.js b/build/azure-pipelines/common/computeNodeModulesCacheKey.js index d15ceb6ef08..6cfa9323e71 100644 --- a/build/azure-pipelines/common/computeNodeModulesCacheKey.js +++ b/build/azure-pipelines/common/computeNodeModulesCacheKey.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); const fs = require("fs"); const path = require("path"); @@ -14,7 +14,7 @@ shasum.update(fs.readFileSync(path.join(ROOT, 'build/.cachesalt'))); shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc'))); shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc'))); // Add `package.json` and `yarn.lock` files -for (let dir of dirs) { +for (const dir of dirs) { const packageJsonPath = path.join(ROOT, dir, 'package.json'); const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString()); const relevantPackageJsonSections = { diff --git a/build/azure-pipelines/common/computeNodeModulesCacheKey.ts b/build/azure-pipelines/common/computeNodeModulesCacheKey.ts index 2eed5fe7adb..751f928da9f 100644 --- a/build/azure-pipelines/common/computeNodeModulesCacheKey.ts +++ b/build/azure-pipelines/common/computeNodeModulesCacheKey.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as fs from 'fs'; import * as path from 'path'; import * as crypto from 'crypto'; @@ -19,7 +17,7 @@ shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc'))); shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc'))); // Add `package.json` and `yarn.lock` files -for (let dir of dirs) { +for (const dir of dirs) { const packageJsonPath = path.join(ROOT, dir, 'package.json'); const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString()); const relevantPackageJsonSections = { diff --git a/build/azure-pipelines/common/createAsset.js b/build/azure-pipelines/common/createAsset.js index 57207e25cfe..10f1503f666 100644 --- a/build/azure-pipelines/common/createAsset.js +++ b/build/azure-pipelines/common/createAsset.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); const fs = require("fs"); const crypto = require("crypto"); @@ -43,6 +43,8 @@ function getPlatform(product, os, arch, type) { throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); } return arch === 'ia32' ? 'server-win32-web' : `server-win32-${arch}-web`; + case 'cli': + return `cli-win32-${arch}`; default: throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); } @@ -52,6 +54,8 @@ function getPlatform(product, os, arch, type) { return `server-alpine-${arch}`; case 'web': return `server-alpine-${arch}-web`; + case 'cli': + return `cli-alpine-${arch}`; default: throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); } @@ -74,6 +78,8 @@ function getPlatform(product, os, arch, type) { return `linux-deb-${arch}`; case 'rpm-package': return `linux-rpm-${arch}`; + case 'cli': + return `cli-linux-${arch}`; default: throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); } @@ -94,6 +100,8 @@ function getPlatform(product, os, arch, type) { return 'server-darwin-web'; } return `server-darwin-${arch}-web`; + case 'cli': + return `cli-darwin-${arch}`; default: throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); } @@ -150,11 +158,6 @@ async function main() { const blobServiceClient = new storage_blob_1.BlobServiceClient(`https://vscode.blob.core.windows.net`, credential, storagePipelineOptions); const containerClient = blobServiceClient.getContainerClient(quality); const blobClient = containerClient.getBlockBlobClient(blobName); - const blobExists = await blobClient.exists(); - if (blobExists) { - console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`); - return; - } const blobOptions = { blobHTTPHeaders: { blobContentType: mime.lookup(filePath), @@ -162,29 +165,42 @@ async function main() { blobCacheControl: 'max-age=31536000, public' } }; - const uploadPromises = [ - (0, retry_1.retry)(async () => { + const uploadPromises = []; + if (await blobClient.exists()) { + console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`); + } + else { + uploadPromises.push((0, retry_1.retry)(async () => { await blobClient.uploadFile(filePath, blobOptions); console.log('Blob successfully uploaded to Azure storage.'); - }) - ]; + })); + } const shouldUploadToMooncake = /true/i.test(process.env['VSCODE_PUBLISH_TO_MOONCAKE'] ?? 'true'); if (shouldUploadToMooncake) { const mooncakeCredential = new identity_1.ClientSecretCredential(process.env['AZURE_MOONCAKE_TENANT_ID'], process.env['AZURE_MOONCAKE_CLIENT_ID'], process.env['AZURE_MOONCAKE_CLIENT_SECRET']); const mooncakeBlobServiceClient = new storage_blob_1.BlobServiceClient(`https://vscode.blob.core.chinacloudapi.cn`, mooncakeCredential, storagePipelineOptions); const mooncakeContainerClient = mooncakeBlobServiceClient.getContainerClient(quality); const mooncakeBlobClient = mooncakeContainerClient.getBlockBlobClient(blobName); - uploadPromises.push((0, retry_1.retry)(async () => { - await mooncakeBlobClient.uploadFile(filePath, blobOptions); - console.log('Blob successfully uploaded to Mooncake Azure storage.'); - })); - console.log('Uploading blobs to Azure storage and Mooncake Azure storage...'); + if (await mooncakeBlobClient.exists()) { + console.log(`Mooncake Blob ${quality}, ${blobName} already exists, not publishing again.`); + } + else { + uploadPromises.push((0, retry_1.retry)(async () => { + await mooncakeBlobClient.uploadFile(filePath, blobOptions); + console.log('Blob successfully uploaded to Mooncake Azure storage.'); + })); + } + if (uploadPromises.length) { + console.log('Uploading blobs to Azure storage and Mooncake Azure storage...'); + } } else { - console.log('Uploading blobs to Azure storage...'); + if (uploadPromises.length) { + console.log('Uploading blobs to Azure storage...'); + } } await Promise.all(uploadPromises); - console.log('All blobs successfully uploaded.'); + console.log(uploadPromises.length ? 'All blobs successfully uploaded.' : 'No blobs to upload.'); const assetUrl = `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`; const blobPath = new URL(assetUrl).pathname; const mooncakeUrl = `${process.env['MOONCAKE_CDN_URL']}${blobPath}`; diff --git a/build/azure-pipelines/common/createAsset.ts b/build/azure-pipelines/common/createAsset.ts index 769b50e079d..139338dd24b 100644 --- a/build/azure-pipelines/common/createAsset.ts +++ b/build/azure-pipelines/common/createAsset.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as fs from 'fs'; import { Readable } from 'stream'; import * as crypto from 'crypto'; @@ -58,6 +56,8 @@ function getPlatform(product: string, os: string, arch: string, type: string): s throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); } return arch === 'ia32' ? 'server-win32-web' : `server-win32-${arch}-web`; + case 'cli': + return `cli-win32-${arch}`; default: throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); } @@ -67,6 +67,8 @@ function getPlatform(product: string, os: string, arch: string, type: string): s return `server-alpine-${arch}`; case 'web': return `server-alpine-${arch}-web`; + case 'cli': + return `cli-alpine-${arch}`; default: throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); } @@ -89,6 +91,8 @@ function getPlatform(product: string, os: string, arch: string, type: string): s return `linux-deb-${arch}`; case 'rpm-package': return `linux-rpm-${arch}`; + case 'cli': + return `cli-linux-${arch}`; default: throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); } @@ -109,6 +113,8 @@ function getPlatform(product: string, os: string, arch: string, type: string): s return 'server-darwin-web'; } return `server-darwin-${arch}-web`; + case 'cli': + return `cli-darwin-${arch}`; default: throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); } @@ -180,12 +186,6 @@ async function main(): Promise { const blobServiceClient = new BlobServiceClient(`https://vscode.blob.core.windows.net`, credential, storagePipelineOptions); const containerClient = blobServiceClient.getContainerClient(quality); const blobClient = containerClient.getBlockBlobClient(blobName); - const blobExists = await blobClient.exists(); - - if (blobExists) { - console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`); - return; - } const blobOptions: BlockBlobParallelUploadOptions = { blobHTTPHeaders: { @@ -195,12 +195,15 @@ async function main(): Promise { } }; - const uploadPromises: Promise[] = [ - retry(async () => { + const uploadPromises: Promise[] = []; + if (await blobClient.exists()) { + console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`); + } else { + uploadPromises.push(retry(async () => { await blobClient.uploadFile(filePath, blobOptions); console.log('Blob successfully uploaded to Azure storage.'); - }) - ]; + })); + } const shouldUploadToMooncake = /true/i.test(process.env['VSCODE_PUBLISH_TO_MOONCAKE'] ?? 'true'); @@ -210,18 +213,27 @@ async function main(): Promise { const mooncakeContainerClient = mooncakeBlobServiceClient.getContainerClient(quality); const mooncakeBlobClient = mooncakeContainerClient.getBlockBlobClient(blobName); - uploadPromises.push(retry(async () => { - await mooncakeBlobClient.uploadFile(filePath, blobOptions); - console.log('Blob successfully uploaded to Mooncake Azure storage.'); - })); + if (await mooncakeBlobClient.exists()) { + console.log(`Mooncake Blob ${quality}, ${blobName} already exists, not publishing again.`); + } else { + uploadPromises.push(retry(async () => { + await mooncakeBlobClient.uploadFile(filePath, blobOptions); + console.log('Blob successfully uploaded to Mooncake Azure storage.'); + })); + } - console.log('Uploading blobs to Azure storage and Mooncake Azure storage...'); + if (uploadPromises.length) { + console.log('Uploading blobs to Azure storage and Mooncake Azure storage...'); + } } else { - console.log('Uploading blobs to Azure storage...'); + if (uploadPromises.length) { + console.log('Uploading blobs to Azure storage...'); + } } await Promise.all(uploadPromises); - console.log('All blobs successfully uploaded.'); + + console.log(uploadPromises.length ? 'All blobs successfully uploaded.' : 'No blobs to upload.'); const assetUrl = `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`; const blobPath = new URL(assetUrl).pathname; diff --git a/build/azure-pipelines/common/createBuild.js b/build/azure-pipelines/common/createBuild.js index 57bb87fedcf..afff1f111b3 100644 --- a/build/azure-pipelines/common/createBuild.js +++ b/build/azure-pipelines/common/createBuild.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); const identity_1 = require("@azure/identity"); const cosmos_1 = require("@azure/cosmos"); diff --git a/build/azure-pipelines/common/createBuild.ts b/build/azure-pipelines/common/createBuild.ts index 8b1db94c412..512f3610116 100644 --- a/build/azure-pipelines/common/createBuild.ts +++ b/build/azure-pipelines/common/createBuild.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import { ClientSecretCredential } from '@azure/identity'; import { CosmosClient } from '@azure/cosmos'; import { retry } from './retry'; diff --git a/build/azure-pipelines/common/installPlaywright.js b/build/azure-pipelines/common/installPlaywright.js index af4bd5fb54c..dbc5835243f 100644 --- a/build/azure-pipelines/common/installPlaywright.js +++ b/build/azure-pipelines/common/installPlaywright.js @@ -3,10 +3,9 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -Object.defineProperty(exports, "__esModule", { value: true }); -const retry_1 = require("./retry"); +process.env.DEBUG = 'pw:install'; // enable logging for this (https://github.com/microsoft/playwright/issues/17394) const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/server'); async function install() { - await (0, retry_1.retry)(() => installDefaultBrowsersForNpmInstall()); + await installDefaultBrowsersForNpmInstall(); } install(); diff --git a/build/azure-pipelines/common/installPlaywright.ts b/build/azure-pipelines/common/installPlaywright.ts index 5d837a55413..742b6e0e399 100644 --- a/build/azure-pipelines/common/installPlaywright.ts +++ b/build/azure-pipelines/common/installPlaywright.ts @@ -3,11 +3,12 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { retry } from './retry'; +process.env.DEBUG='pw:install'; // enable logging for this (https://github.com/microsoft/playwright/issues/17394) + const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/server'); async function install() { - await retry(() => installDefaultBrowsersForNpmInstall()); + await installDefaultBrowsersForNpmInstall(); } install(); diff --git a/build/azure-pipelines/common/listNodeModules.js b/build/azure-pipelines/common/listNodeModules.js index 540569c79b5..644aa83d552 100644 --- a/build/azure-pipelines/common/listNodeModules.js +++ b/build/azure-pipelines/common/listNodeModules.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); const fs = require("fs"); const path = require("path"); diff --git a/build/azure-pipelines/common/listNodeModules.ts b/build/azure-pipelines/common/listNodeModules.ts index 2ed6294477a..aca461f8b5f 100644 --- a/build/azure-pipelines/common/listNodeModules.ts +++ b/build/azure-pipelines/common/listNodeModules.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as fs from 'fs'; import * as path from 'path'; diff --git a/build/azure-pipelines/common/releaseBuild.js b/build/azure-pipelines/common/releaseBuild.js index 26dacf4d731..eba9b2dc8b7 100644 --- a/build/azure-pipelines/common/releaseBuild.js +++ b/build/azure-pipelines/common/releaseBuild.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); const identity_1 = require("@azure/identity"); const cosmos_1 = require("@azure/cosmos"); @@ -28,22 +28,25 @@ async function getConfig(client, quality) { } return res.resources[0]; } -async function main() { +async function main(force) { const commit = process.env['VSCODE_DISTRO_COMMIT'] || getEnv('BUILD_SOURCEVERSION'); const quality = getEnv('VSCODE_QUALITY'); const aadCredentials = new identity_1.ClientSecretCredential(process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], process.env['AZURE_CLIENT_SECRET']); const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], aadCredentials }); - const config = await getConfig(client, quality); - console.log('Quality config:', config); - if (config.frozen) { - console.log(`Skipping release because quality ${quality} is frozen.`); - return; + if (!force) { + const config = await getConfig(client, quality); + console.log('Quality config:', config); + if (config.frozen) { + console.log(`Skipping release because quality ${quality} is frozen.`); + return; + } } console.log(`Releasing build ${commit}...`); const scripts = client.database('builds').container(quality).scripts; await (0, retry_1.retry)(() => scripts.storedProcedure('releaseBuild').execute('', [commit])); } -main().then(() => { +const [, , force] = process.argv; +main(force === 'true').then(() => { console.log('Build successfully released'); process.exit(0); }, err => { diff --git a/build/azure-pipelines/common/releaseBuild.ts b/build/azure-pipelines/common/releaseBuild.ts index 064ac639e60..68476cc2952 100644 --- a/build/azure-pipelines/common/releaseBuild.ts +++ b/build/azure-pipelines/common/releaseBuild.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import { ClientSecretCredential } from '@azure/identity'; import { CosmosClient } from '@azure/cosmos'; import { retry } from './retry'; @@ -43,19 +41,22 @@ async function getConfig(client: CosmosClient, quality: string): Promise return res.resources[0] as Config; } -async function main(): Promise { +async function main(force: boolean): Promise { const commit = process.env['VSCODE_DISTRO_COMMIT'] || getEnv('BUILD_SOURCEVERSION'); const quality = getEnv('VSCODE_QUALITY'); const aadCredentials = new ClientSecretCredential(process.env['AZURE_TENANT_ID']!, process.env['AZURE_CLIENT_ID']!, process.env['AZURE_CLIENT_SECRET']!); const client = new CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT']!, aadCredentials }); - const config = await getConfig(client, quality); - console.log('Quality config:', config); + if (!force) { + const config = await getConfig(client, quality); - if (config.frozen) { - console.log(`Skipping release because quality ${quality} is frozen.`); - return; + console.log('Quality config:', config); + + if (config.frozen) { + console.log(`Skipping release because quality ${quality} is frozen.`); + return; + } } console.log(`Releasing build ${commit}...`); @@ -64,7 +65,9 @@ async function main(): Promise { await retry(() => scripts.storedProcedure('releaseBuild').execute('', [commit])); } -main().then(() => { +const [, , force] = process.argv; + +main(force === 'true').then(() => { console.log('Build successfully released'); process.exit(0); }, err => { diff --git a/build/azure-pipelines/common/retry.js b/build/azure-pipelines/common/retry.js index bd78d195abb..9c64a9b3226 100644 --- a/build/azure-pipelines/common/retry.js +++ b/build/azure-pipelines/common/retry.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); exports.retry = void 0; async function retry(fn) { diff --git a/build/azure-pipelines/common/retry.ts b/build/azure-pipelines/common/retry.ts index 0c766771da8..ed232245dec 100644 --- a/build/azure-pipelines/common/retry.ts +++ b/build/azure-pipelines/common/retry.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - export async function retry(fn: () => Promise): Promise { let lastError: Error | undefined; diff --git a/build/azure-pipelines/common/sign.js b/build/azure-pipelines/common/sign.js index 2c2168cacc3..a1ebcc90e40 100644 --- a/build/azure-pipelines/common/sign.js +++ b/build/azure-pipelines/common/sign.js @@ -13,6 +13,8 @@ function getParams(type) { switch (type) { case 'windows': return '[{"keyCode":"CP-230012","operationSetCode":"SigntoolSign","parameters":[{"parameterName":"OpusName","parameterValue":"VS Code"},{"parameterName":"OpusInfo","parameterValue":"https://code.visualstudio.com/"},{"parameterName":"Append","parameterValue":"/as"},{"parameterName":"FileDigest","parameterValue":"/fd \\"SHA256\\""},{"parameterName":"PageHash","parameterValue":"/NPH"},{"parameterName":"TimeStamp","parameterValue":"/tr \\"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\\" /td sha256"}],"toolName":"sign","toolVersion":"1.0"},{"keyCode":"CP-230012","operationSetCode":"SigntoolVerify","parameters":[{"parameterName":"VerifyAll","parameterValue":"/all"}],"toolName":"sign","toolVersion":"1.0"}]'; + case 'windows-appx': + return '[{"keyCode":"CP-229979","operationSetCode":"SigntoolSign","parameters":[{"parameterName":"OpusName","parameterValue":"VS Code"},{"parameterName":"OpusInfo","parameterValue":"https://code.visualstudio.com/"},{"parameterName":"FileDigest","parameterValue":"/fd \\"SHA256\\""},{"parameterName":"PageHash","parameterValue":"/NPH"},{"parameterName":"TimeStamp","parameterValue":"/tr \\"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\\" /td sha256"}],"toolName":"sign","toolVersion":"1.0"},{"keyCode":"CP-229979","operationSetCode":"SigntoolVerify","parameters":[],"toolName":"sign","toolVersion":"1.0"}]'; case 'rpm': return '[{ "keyCode": "CP-450779-Pgp", "operationSetCode": "LinuxSign", "parameters": [], "toolName": "sign", "toolVersion": "1.0" }]'; case 'darwin-sign': diff --git a/build/azure-pipelines/common/sign.ts b/build/azure-pipelines/common/sign.ts index a50ca698dfd..7f1916d26a2 100644 --- a/build/azure-pipelines/common/sign.ts +++ b/build/azure-pipelines/common/sign.ts @@ -12,6 +12,8 @@ function getParams(type: string): string { switch (type) { case 'windows': return '[{"keyCode":"CP-230012","operationSetCode":"SigntoolSign","parameters":[{"parameterName":"OpusName","parameterValue":"VS Code"},{"parameterName":"OpusInfo","parameterValue":"https://code.visualstudio.com/"},{"parameterName":"Append","parameterValue":"/as"},{"parameterName":"FileDigest","parameterValue":"/fd \\"SHA256\\""},{"parameterName":"PageHash","parameterValue":"/NPH"},{"parameterName":"TimeStamp","parameterValue":"/tr \\"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\\" /td sha256"}],"toolName":"sign","toolVersion":"1.0"},{"keyCode":"CP-230012","operationSetCode":"SigntoolVerify","parameters":[{"parameterName":"VerifyAll","parameterValue":"/all"}],"toolName":"sign","toolVersion":"1.0"}]'; + case 'windows-appx': + return '[{"keyCode":"CP-229979","operationSetCode":"SigntoolSign","parameters":[{"parameterName":"OpusName","parameterValue":"VS Code"},{"parameterName":"OpusInfo","parameterValue":"https://code.visualstudio.com/"},{"parameterName":"FileDigest","parameterValue":"/fd \\"SHA256\\""},{"parameterName":"PageHash","parameterValue":"/NPH"},{"parameterName":"TimeStamp","parameterValue":"/tr \\"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\\" /td sha256"}],"toolName":"sign","toolVersion":"1.0"},{"keyCode":"CP-229979","operationSetCode":"SigntoolVerify","parameters":[],"toolName":"sign","toolVersion":"1.0"}]'; case 'rpm': return '[{ "keyCode": "CP-450779-Pgp", "operationSetCode": "LinuxSign", "parameters": [], "toolName": "sign", "toolVersion": "1.0" }]'; case 'darwin-sign': diff --git a/build/azure-pipelines/darwin/cli-build-darwin.yml b/build/azure-pipelines/darwin/cli-build-darwin.yml new file mode 100644 index 00000000000..90e15d1c9e1 --- /dev/null +++ b/build/azure-pipelines/darwin/cli-build-darwin.yml @@ -0,0 +1,69 @@ +parameters: + - name: VSCODE_QUALITY + type: string + - name: VSCODE_BUILD_MACOS + type: boolean + default: false + - name: VSCODE_BUILD_MACOS_ARM64 + type: boolean + default: false + - name: channel + type: string + default: stable + +steps: + - task: Npm@1 + displayName: Download openssl prebuilt + inputs: + command: custom + customCommand: pack @vscode-internal/openssl-prebuilt@0.0.1 + customRegistry: useFeed + customFeed: 'Monaco/openssl-prebuilt' + workingDir: $(Build.ArtifactStagingDirectory) + + - script: | + set -e + mkdir $(Build.ArtifactStagingDirectory)/openssl + tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.1.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl + displayName: Extract openssl prebuilt + + - task: NodeTool@0 + inputs: + versionSpec: "16.x" + + - template: ../mixin-distro-posix.yml + parameters: + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + + - script: | + set -e + node build/azure-pipelines/cli/prepare.js + displayName: Prepare CLI build + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + + - template: ../cli/install-rust-posix.yml + parameters: + targets: + - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}: + - x86_64-apple-darwin + - ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}: + - aarch64-apple-darwin + + - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}: + - template: ../cli/cli-compile-and-publish.yml + parameters: + VSCODE_CLI_TARGET: x86_64-apple-darwin + VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_darwin_x64_cli + VSCODE_CLI_ENV: + OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/lib + OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-osx/include + + - ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}: + - template: ../cli/cli-compile-and-publish.yml + parameters: + VSCODE_CLI_TARGET: aarch64-apple-darwin + VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_darwin_arm64_cli + VSCODE_CLI_ENV: + OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/lib + OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-osx/include diff --git a/build/azure-pipelines/darwin/helper-plugin-entitlements.plist b/build/azure-pipelines/darwin/helper-plugin-entitlements.plist new file mode 100644 index 00000000000..1cc1a152c74 --- /dev/null +++ b/build/azure-pipelines/darwin/helper-plugin-entitlements.plist @@ -0,0 +1,14 @@ + + + + + com.apple.security.cs.allow-jit + + com.apple.security.cs.allow-unsigned-executable-memory + + com.apple.security.cs.allow-dyld-environment-variables + + com.apple.security.cs.disable-library-validation + + + diff --git a/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml b/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml new file mode 100644 index 00000000000..385697b412f --- /dev/null +++ b/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml @@ -0,0 +1,55 @@ +parameters: + - name: VSCODE_BUILD_MACOS + type: boolean + - name: VSCODE_BUILD_MACOS_ARM64 + type: boolean + +steps: + - task: NodeTool@0 + inputs: + versionSpec: "16.x" + + - task: AzureKeyVault@1 + displayName: "Azure Key Vault: Get Secrets" + inputs: + azureSubscription: "vscode-builds-subscription" + KeyVaultName: vscode + SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password" + + - script: | + set -e + npm config set registry "$NPM_REGISTRY" --location=project + npm config set always-auth=true --location=project + yarn config set registry "$NPM_REGISTRY" + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM & Yarn + + - task: npmAuthenticate@0 + inputs: + workingFile: .npmrc + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Authentication + + - script: node build/setup-npm-registry.js $NPM_REGISTRY + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Registry + + - script: | + set -e + for i in {1..3}; do # try 3 times + yarn --cwd build --frozen-lockfile --check-files && break + if [ $i -eq 3 ]; then + echo "Yarn failed too many times" >&2 + exit 1 + fi + echo "Yarn failed $i, trying again..." + done + displayName: Install build dependencies + + - template: ../cli/cli-darwin-sign.yml + parameters: + VSCODE_CLI_ARTIFACTS: + - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}: + - unsigned_vscode_cli_darwin_x64_cli + - ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}: + - unsigned_vscode_cli_darwin_arm64_cli diff --git a/build/azure-pipelines/darwin/product-build-darwin-sign.yml b/build/azure-pipelines/darwin/product-build-darwin-sign.yml index f82e7a8b98d..79826b73541 100644 --- a/build/azure-pipelines/darwin/product-build-darwin-sign.yml +++ b/build/azure-pipelines/darwin/product-build-darwin-sign.yml @@ -35,36 +35,95 @@ steps: git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") displayName: Merge distro + - script: node build/setup-npm-registry.js $NPM_REGISTRY + condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Registry + - script: | - set -e - npx https://aka.ms/enablesecurefeed standAlone - timeoutInMinutes: 5 - retryCountOnTaskFailure: 3 - condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true')) - displayName: Switch to Terrapin packages + mkdir -p .build + node build/azure-pipelines/common/computeNodeModulesCacheKey.js x64 > .build/yarnlockhash + node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash + displayName: Prepare yarn cache flags + + - task: Cache@2 + inputs: + key: "nodeModules | $(Agent.OS) | .build/yarnlockhash" + path: .build/node_modules_cache + cacheHitVar: NODE_MODULES_RESTORED + displayName: Restore node_modules cache + + - task: Cache@2 + inputs: + key: '"builtInDeps" | .build/builtindepshash' + path: .build/builtInExtensions + displayName: Restore built-in extensions - script: | set -e - for i in {1..3}; do # try 3 times, for Terrapin - yarn --cwd build --frozen-lockfile --check-files && break + tar -xzf .build/node_modules_cache/cache.tgz + displayName: Extract node_modules cache + condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true')) + + - script: | + set -e + npm install -g node-gyp@latest + node-gyp --version + displayName: Update node-gyp + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + + - script: | + set -e + npm config set registry "$NPM_REGISTRY" --location=project + npm config set always-auth=true --location=project + yarn config set registry "$NPM_REGISTRY" + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM & Yarn + + - task: npmAuthenticate@0 + inputs: + workingFile: .npmrc + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Authentication + + - script: | + set -e + export npm_config_arch=$(VSCODE_ARCH) + export npm_config_node_gyp=$(which node-gyp) + + for i in {1..3}; do # try 3 times + yarn --frozen-lockfile --check-files && break if [ $i -eq 3 ]; then echo "Yarn failed too many times" >&2 exit 1 fi echo "Yarn failed $i, trying again..." done - displayName: Install build dependencies + env: + ELECTRON_SKIP_BINARY_DOWNLOAD: 1 + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Install dependencies + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + + - script: | + set -e + node build/lib/builtInExtensions.js + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Download missing built-in extensions + + - script: | + set -e + node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt + mkdir -p .build/node_modules_cache + tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + displayName: Create node_modules archive - download: current artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive displayName: Download $(VSCODE_ARCH) artifact - - script: | - set -e - unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip -d $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) - mv $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip - displayName: Unzip & move - - task: UseDotNet@2 inputs: version: 2.x @@ -74,20 +133,38 @@ steps: - script: | set -e - node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-sign $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(agent.builddirectory) VSCode-darwin-$(VSCODE_ARCH).zip + node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-sign $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive VSCode-darwin-$(VSCODE_ARCH).zip displayName: Codesign - script: | set -e - node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-notarize $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(agent.builddirectory) VSCode-darwin-$(VSCODE_ARCH).zip + node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-notarize $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive VSCode-darwin-$(VSCODE_ARCH).zip displayName: Notarize - script: | set -e - APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) + unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip -d $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH) + displayName: Extract signed app + condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) + + - script: | + set -e + APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)" APP_NAME="`ls $APP_ROOT | head -n 1`" - "$APP_ROOT/$APP_NAME/Contents/Resources/app/bin/code" --export-default-configuration=.build - displayName: Verify start after signing (export configuration) + echo "##vso[task.setvariable variable=APP_PATH]$APP_ROOT/$APP_NAME" + displayName: Find application path + condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) + + - script: | + set -e + codesign -dv --deep --verbose=4 "$(APP_PATH)" + displayName: Verify signature + condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) + + - script: | + set -e + "$(APP_PATH)/Contents/Resources/app/bin/code" --export-default-configuration=.build + displayName: Verify signed application starts OK condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) - script: | @@ -100,9 +177,9 @@ steps: echo "##vso[task.setvariable variable=ASSET_ID]$ASSET_ID" displayName: Set asset id variable - - script: mv $(agent.builddirectory)/VSCode-darwin-x64.zip $(agent.builddirectory)/VSCode-darwin.zip - displayName: Rename x64 build to it's legacy name + - script: mv $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-x64.zip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin.zip + displayName: Rename x64 build to its legacy name condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) - - publish: $(Agent.BuildDirectory)/VSCode-$(ASSET_ID).zip + - publish: $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-$(ASSET_ID).zip artifact: vscode_client_darwin_$(VSCODE_ARCH)_archive diff --git a/build/azure-pipelines/darwin/product-build-darwin-test.yml b/build/azure-pipelines/darwin/product-build-darwin-test.yml index dd495426b6d..29c7bf90925 100644 --- a/build/azure-pipelines/darwin/product-build-darwin-test.yml +++ b/build/azure-pipelines/darwin/product-build-darwin-test.yml @@ -3,202 +3,62 @@ parameters: type: string - name: VSCODE_RUN_UNIT_TESTS type: boolean - default: true - name: VSCODE_RUN_INTEGRATION_TESTS type: boolean - default: true - name: VSCODE_RUN_SMOKE_TESTS type: boolean - default: true steps: - - task: NodeTool@0 - inputs: - versionSpec: "16.x" - - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: AzureKeyVault@1 - displayName: "Azure Key Vault: Get Secrets" - inputs: - azureSubscription: "vscode-builds-subscription" - KeyVaultName: vscode - SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key" - - - task: DownloadPipelineArtifact@2 - inputs: - artifact: Compilation - path: $(Build.ArtifactStagingDirectory) - displayName: Download compilation output - - - script: | - set -e - tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz - displayName: Extract compilation output - - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - # Set up the credentials to retrieve distro repo and setup git persona - # to create a merge commit for when we merge distro into oss - - script: | - set -e - cat << EOF > ~/.netrc - machine github.com - login vscode - password $(github-distro-mixin-password) - EOF - - git config user.email "vscode@microsoft.com" - git config user.name "VSCode" - displayName: Prepare tooling - - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF - echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)" - git checkout FETCH_HEAD - condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' ')) - displayName: Checkout override commit - - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") - displayName: Merge distro - - - script: | - mkdir -p .build - node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash - displayName: Prepare yarn cache flags - - - task: Cache@2 - inputs: - key: "nodeModules | $(Agent.OS) | .build/yarnlockhash" - path: .build/node_modules_cache - cacheHitVar: NODE_MODULES_RESTORED - displayName: Restore node_modules cache - - - script: | - set -e - tar -xzf .build/node_modules_cache/cache.tgz - condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true')) - displayName: Extract node_modules cache - - - script: | - set -e - npm install -g node-gyp@latest - node-gyp --version - displayName: Update node-gyp - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) - - - script: | - set -e - npx https://aka.ms/enablesecurefeed standAlone - timeoutInMinutes: 5 - retryCountOnTaskFailure: 3 - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true')) - displayName: Switch to Terrapin packages - - - script: | - set -e - export npm_config_arch=$(VSCODE_ARCH) - export npm_config_node_gyp=$(which node-gyp) - - for i in {1..3}; do # try 3 times, for Terrapin - yarn --frozen-lockfile --check-files && break - if [ $i -eq 3 ]; then - echo "Yarn failed too many times" >&2 - exit 1 - fi - echo "Yarn failed $i, trying again..." - done - env: - ELECTRON_SKIP_BINARY_DOWNLOAD: 1 - PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 - GITHUB_TOKEN: "$(github-distro-mixin-password)" - displayName: Install dependencies - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) - - - script: | - set -e - node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt - mkdir -p .build/node_modules_cache - tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) - displayName: Create node_modules archive - - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - # This script brings in the right resources (images, icons, etc) based on the quality (insiders, stable, exploration) - - script: | - set -e - node build/azure-pipelines/mixin - displayName: Mix in quality - - - script: | - set -e - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci - displayName: Build client - - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - node build/azure-pipelines/mixin --server - displayName: Mix in server quality - - - script: | - set -e - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci - displayName: Build Server - - script: | set -e VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install" displayName: Download Electron and Playwright - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - # Setting hardened entitlements is a requirement for: - # * Running tests on Big Sur (because Big Sur has additional security precautions) - - script: | - set -e - security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain - security default-keychain -s $(agent.tempdirectory)/buildagent.keychain - security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain - echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12 - security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign - security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain - VSCODE_ARCH=$(VSCODE_ARCH) DEBUG=electron-osx-sign* node build/darwin/sign.js - displayName: Set Hardened Entitlements - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: - - script: | - set -e - ./scripts/test.sh --build --tfs "Unit Tests" - displayName: Run unit tests (Electron) - timeoutInMinutes: 15 + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + ./scripts/test.sh --tfs "Unit Tests" + displayName: Run unit tests (Electron) + timeoutInMinutes: 15 - - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: - - script: | - set -e - yarn test-node --build - displayName: Run unit tests (node.js) - timeoutInMinutes: 15 + - script: | + set -e + yarn test-node + displayName: Run unit tests (node.js) + timeoutInMinutes: 15 - - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: - - script: | - set -e - DEBUG=*browser* yarn test-browser-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests" - displayName: Run unit tests (Browser, Chromium & Webkit) - timeoutInMinutes: 30 + - script: | + set -e + DEBUG=*browser* yarn test-browser-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests" + displayName: Run unit tests (Browser, Chromium & Webkit) + timeoutInMinutes: 30 + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + ./scripts/test.sh --build --tfs "Unit Tests" + displayName: Run unit tests (Electron) + timeoutInMinutes: 15 + + - script: | + set -e + yarn test-node --build + displayName: Run unit tests (node.js) + timeoutInMinutes: 15 + + - script: | + set -e + DEBUG=*browser* yarn test-browser-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests" + displayName: Run unit tests (Browser, Chromium & Webkit) + timeoutInMinutes: 30 - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: - script: | set -e yarn gulp \ + compile-extension:configuration-editing \ compile-extension:css-language-features-server \ compile-extension:emmet \ compile-extension:git \ @@ -206,50 +66,52 @@ steps: compile-extension:html-language-features-server \ compile-extension:ipynb \ compile-extension:json-language-features-server \ + compile-extension:markdown-language-features-server \ compile-extension:markdown-language-features \ compile-extension-media \ compile-extension:microsoft-authentication \ compile-extension:typescript-language-features \ compile-extension:vscode-api-tests \ compile-extension:vscode-colorize-tests \ - compile-extension:vscode-custom-editor-tests \ - compile-extension:vscode-notebook-tests \ compile-extension:vscode-test-resolver displayName: Build integration tests - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: - - script: | - # Figure out the full absolute path of the product we just built - # including the remote server and configure the integration tests - # to run with these builds instead of running out of sources. - set -e - APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) - APP_NAME="`ls $APP_ROOT | head -n 1`" - INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \ - VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \ - ./scripts/test-integration.sh --build --tfs "Integration Tests" - displayName: Run integration tests (Electron) - timeoutInMinutes: 20 + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + ./scripts/test-integration.sh --tfs "Integration Tests" + displayName: Run integration tests (Electron) + timeoutInMinutes: 20 - - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: - - script: | - set -e - VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin-$(VSCODE_ARCH)" \ - ./scripts/test-web-integration.sh --browser webkit - displayName: Run integration tests (Browser, Webkit) - timeoutInMinutes: 20 + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + # Figure out the full absolute path of the product we just built + # including the remote server and configure the integration tests + # to run with these builds instead of running out of sources. + set -e + APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) + APP_NAME="`ls $APP_ROOT | head -n 1`" + INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \ + VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \ + ./scripts/test-integration.sh --build --tfs "Integration Tests" + displayName: Run integration tests (Electron) + timeoutInMinutes: 20 - - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: - - script: | - set -e - APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) - APP_NAME="`ls $APP_ROOT | head -n 1`" - INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \ - VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \ - ./scripts/test-remote-integration.sh - displayName: Run integration tests (Remote) - timeoutInMinutes: 20 + - script: | + set -e + VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin-$(VSCODE_ARCH)" \ + ./scripts/test-web-integration.sh --browser webkit + displayName: Run integration tests (Browser, Webkit) + timeoutInMinutes: 20 + + - script: | + set -e + APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) + APP_NAME="`ls $APP_ROOT | head -n 1`" + INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \ + VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \ + ./scripts/test-remote-integration.sh + displayName: Run integration tests (Remote) + timeoutInMinutes: 20 - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - script: | @@ -259,35 +121,49 @@ steps: continueOnError: true condition: succeededOrFailed() - - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - - script: | - set -e - VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin-$(VSCODE_ARCH)" \ - yarn smoketest-no-compile --web --tracing --headless - timeoutInMinutes: 20 - displayName: Run smoke tests (Browser, Chromium) + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + yarn --cwd test/smoke compile + displayName: Compile smoke tests - - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - - script: | - set -e - APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) - APP_NAME="`ls $APP_ROOT | head -n 1`" - yarn smoketest-no-compile --tracing --build "$APP_ROOT/$APP_NAME" - timeoutInMinutes: 20 - displayName: Run smoke tests (Electron) + - script: | + set -e + yarn gulp compile-extension-media + displayName: Build extensions for smoke tests - - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - - script: | - set -e - yarn gulp compile-extension:vscode-test-resolver - APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) - APP_NAME="`ls $APP_ROOT | head -n 1`" - VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \ - yarn smoketest-no-compile --tracing --remote --build "$APP_ROOT/$APP_NAME" - timeoutInMinutes: 20 - displayName: Run smoke tests (Remote) + - script: | + set -e + yarn smoketest-no-compile --tracing + timeoutInMinutes: 20 + displayName: Run smoke tests (Electron) + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) + APP_NAME="`ls $APP_ROOT | head -n 1`" + yarn smoketest-no-compile --tracing --build "$APP_ROOT/$APP_NAME" + timeoutInMinutes: 20 + displayName: Run smoke tests (Electron) + + - script: | + set -e + VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin-$(VSCODE_ARCH)" \ + yarn smoketest-no-compile --web --tracing --headless + timeoutInMinutes: 20 + displayName: Run smoke tests (Browser, Chromium) + + - script: | + set -e + yarn gulp compile-extension:vscode-test-resolver + APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) + APP_NAME="`ls $APP_ROOT | head -n 1`" + VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin-$(VSCODE_ARCH)" \ + yarn smoketest-no-compile --tracing --remote --build "$APP_ROOT/$APP_NAME" + timeoutInMinutes: 20 + displayName: Run smoke tests (Remote) - - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - script: | set -e ps -ef @@ -295,31 +171,47 @@ steps: continueOnError: true condition: succeededOrFailed() - - task: PublishPipelineArtifact@0 - inputs: - artifactName: crash-dump-macos-$(VSCODE_ARCH) - targetPath: .build/crashes - displayName: "Publish Crash Reports" - continueOnError: true - condition: failed() + - ${{ if or(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + - task: PublishPipelineArtifact@0 + inputs: + targetPath: .build/crashes + ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + artifactName: crash-dump-macos-$(VSCODE_ARCH)-integration-$(System.JobAttempt) + ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + artifactName: crash-dump-macos-$(VSCODE_ARCH)-smoke-$(System.JobAttempt) + ${{ else }}: + artifactName: crash-dump-macos-$(VSCODE_ARCH)-$(System.JobAttempt) + displayName: "Publish Crash Reports" + continueOnError: true + condition: failed() - # In order to properly symbolify above crash reports - # (if any), we need the compiled native modules too - - task: PublishPipelineArtifact@0 - inputs: - artifactName: node-modules-macos-$(VSCODE_ARCH) - targetPath: node_modules - displayName: "Publish Node Modules" - continueOnError: true - condition: failed() + # In order to properly symbolify above crash reports + # (if any), we need the compiled native modules too + - task: PublishPipelineArtifact@0 + inputs: + targetPath: node_modules + ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + artifactName: node-modules-macos-$(VSCODE_ARCH)-integration-$(System.JobAttempt) + ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + artifactName: node-modules-macos-$(VSCODE_ARCH)-smoke-$(System.JobAttempt) + ${{ else }}: + artifactName: node-modules-macos-$(VSCODE_ARCH)-$(System.JobAttempt) + displayName: "Publish Node Modules" + continueOnError: true + condition: failed() - - task: PublishPipelineArtifact@0 - inputs: - artifactName: logs-macos-$(VSCODE_ARCH)-$(System.JobAttempt) - targetPath: .build/logs - displayName: "Publish Log Files" - continueOnError: true - condition: failed() + - task: PublishPipelineArtifact@0 + inputs: + targetPath: .build/logs + ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + artifactName: logs-macos-$(VSCODE_ARCH)-integration-$(System.JobAttempt) + ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + artifactName: logs-macos-$(VSCODE_ARCH)-smoke-$(System.JobAttempt) + ${{ else }}: + artifactName: logs-macos-$(VSCODE_ARCH)-$(System.JobAttempt) + displayName: "Publish Log Files" + continueOnError: true + condition: succeededOrFailed() - task: PublishTestResults@2 displayName: Publish Tests Results diff --git a/build/azure-pipelines/darwin/product-build-darwin-universal.yml b/build/azure-pipelines/darwin/product-build-darwin-universal.yml index 1b8cfef6737..5a3c3df5484 100644 --- a/build/azure-pipelines/darwin/product-build-darwin-universal.yml +++ b/build/azure-pipelines/darwin/product-build-darwin-universal.yml @@ -35,9 +35,14 @@ steps: git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") displayName: Merge distro + - script: node build/setup-npm-registry.js $NPM_REGISTRY + condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Registry + - script: | mkdir -p .build - node build/azure-pipelines/common/computeNodeModulesCacheKey.js x64 $ENABLE_TERRAPIN > .build/yarnlockhash + node build/azure-pipelines/common/computeNodeModulesCacheKey.js x64 > .build/yarnlockhash + node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash displayName: Prepare yarn cache flags - task: Cache@2 @@ -47,10 +52,73 @@ steps: cacheHitVar: NODE_MODULES_RESTORED displayName: Restore node_modules cache + - task: Cache@2 + inputs: + key: '"builtInDeps" | .build/builtindepshash' + path: .build/builtInExtensions + displayName: Restore built-in extensions + - script: | set -e tar -xzf .build/node_modules_cache/cache.tgz displayName: Extract node_modules cache + condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true')) + + - script: | + set -e + npm install -g node-gyp@latest + node-gyp --version + displayName: Update node-gyp + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + + - script: | + set -e + npm config set registry "$NPM_REGISTRY" --location=project + npm config set always-auth=true --location=project + yarn config set registry "$NPM_REGISTRY" + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM & Yarn + + - task: npmAuthenticate@0 + inputs: + workingFile: .npmrc + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Authentication + + - script: | + set -e + export npm_config_arch=$(VSCODE_ARCH) + export npm_config_node_gyp=$(which node-gyp) + + for i in {1..3}; do # try 3 times + yarn --frozen-lockfile --check-files && break + if [ $i -eq 3 ]; then + echo "Yarn failed too many times" >&2 + exit 1 + fi + echo "Yarn failed $i, trying again..." + done + env: + ELECTRON_SKIP_BINARY_DOWNLOAD: 1 + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Install dependencies + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + + - script: | + set -e + node build/lib/builtInExtensions.js + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Download missing built-in extensions + + - script: | + set -e + node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt + mkdir -p .build/node_modules_cache + tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + displayName: Create node_modules archive - script: | set -e diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index 5c524dd42fb..4962f8491ff 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -1,54 +1,84 @@ +parameters: + - name: VSCODE_PUBLISH + type: boolean + - name: VSCODE_QUALITY + type: string + - name: VSCODE_RUN_UNIT_TESTS + type: boolean + - name: VSCODE_RUN_INTEGRATION_TESTS + type: boolean + - name: VSCODE_RUN_SMOKE_TESTS + type: boolean + - name: VSCODE_BUILD_TUNNEL_CLI + type: boolean + steps: + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - checkout: self + fetchDepth: 1 + retryCountOnTaskFailure: 3 + - task: NodeTool@0 inputs: versionSpec: "16.x" - - task: AzureKeyVault@1 - displayName: "Azure Key Vault: Get Secrets" - inputs: - azureSubscription: "vscode-builds-subscription" - KeyVaultName: vscode - SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key" + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - task: AzureKeyVault@1 + displayName: "Azure Key Vault: Get Secrets" + inputs: + azureSubscription: "vscode-builds-subscription" + KeyVaultName: vscode + SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key" - - task: DownloadPipelineArtifact@2 - inputs: - artifact: Compilation - path: $(Build.ArtifactStagingDirectory) - displayName: Download compilation output + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - task: DownloadPipelineArtifact@2 + inputs: + artifact: Compilation + path: $(Build.ArtifactStagingDirectory) + displayName: Download compilation output - - script: | - set -e - tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz - displayName: Extract compilation output + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz + displayName: Extract compilation output - - script: | - set -e - cat << EOF > ~/.netrc - machine github.com - login vscode - password $(github-distro-mixin-password) - EOF + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + cat << EOF > ~/.netrc + machine github.com + login vscode + password $(github-distro-mixin-password) + EOF - git config user.email "vscode@microsoft.com" - git config user.name "VSCode" - displayName: Prepare tooling + git config user.email "vscode@microsoft.com" + git config user.name "VSCode" + displayName: Prepare tooling - - script: | - set -e - git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF - echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)" - git checkout FETCH_HEAD - condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' ')) - displayName: Checkout override commit + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF + echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)" + git checkout FETCH_HEAD + condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' ')) + displayName: Checkout override commit - - script: | - set -e - git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") - displayName: Merge distro + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") + displayName: Merge distro + + - script: node build/setup-npm-registry.js $NPM_REGISTRY + condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Registry - script: | mkdir -p .build - node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash + node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH > .build/yarnlockhash + node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash displayName: Prepare yarn cache flags - task: Cache@2 @@ -58,6 +88,12 @@ steps: cacheHitVar: NODE_MODULES_RESTORED displayName: Restore node_modules cache + - task: Cache@2 + inputs: + key: '"builtInDeps" | .build/builtindepshash' + path: .build/builtInExtensions + displayName: Restore built-in extensions + - script: | set -e tar -xzf .build/node_modules_cache/cache.tgz @@ -66,25 +102,24 @@ steps: - script: | set -e - npm install -g node-gyp@latest - node-gyp --version - displayName: Update node-gyp - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + npm config set registry "$NPM_REGISTRY" --location=project + npm config set always-auth=true --location=project + yarn config set registry "$NPM_REGISTRY" + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM & Yarn - - script: | - set -e - npx https://aka.ms/enablesecurefeed standAlone - timeoutInMinutes: 5 - retryCountOnTaskFailure: 3 - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true')) - displayName: Switch to Terrapin packages + - task: npmAuthenticate@0 + inputs: + workingFile: .npmrc + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Authentication - script: | set -e export npm_config_arch=$(VSCODE_ARCH) export npm_config_node_gyp=$(which node-gyp) - for i in {1..3}; do # try 3 times, for Terrapin + for i in {1..3}; do # try 3 times yarn --frozen-lockfile --check-files && break if [ $i -eq 3 ]; then echo "Yarn failed too many times" >&2 @@ -99,6 +134,13 @@ steps: displayName: Install dependencies condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + - script: | + set -e + node build/lib/builtInExtensions.js + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Download missing built-in extensions + - script: | set -e node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt @@ -107,115 +149,175 @@ steps: condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) displayName: Create node_modules archive - # This script brings in the right resources (images, icons, etc) based on the quality (insiders, stable, exploration) - - script: | - set -e - node build/azure-pipelines/mixin - displayName: Mix in quality + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + # This script brings in the right resources (images, icons, etc) based on the quality (insiders, stable, exploration) + - script: | + set -e + node build/azure-pipelines/mixin + displayName: Mix in quality + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci + displayName: Build client + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + node build/azure-pipelines/mixin --server + displayName: Mix in server quality + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci + VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci + displayName: Build Server + + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + yarn gulp "transpile-client-swc" "transpile-extensions" + displayName: Transpile - script: | set -e - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci - displayName: Build client + APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)" + APP_NAME="`ls $APP_ROOT | head -n 1`" + echo "##vso[task.setvariable variable=APP_PATH]$APP_ROOT/$APP_NAME" + displayName: Find application path - - script: | - set -e - node build/azure-pipelines/mixin --server - displayName: Mix in server quality + - ${{ if eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true) }}: + - task: DownloadPipelineArtifact@2 + inputs: + artifact: unsigned_vscode_cli_darwin_arm64_cli + patterns: "**" + path: $(Build.ArtifactStagingDirectory)/cli + displayName: Download VS Code CLI + condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64')) - - script: | - set -e - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci - displayName: Build Server + - task: DownloadPipelineArtifact@2 + inputs: + artifact: unsigned_vscode_cli_darwin_x64_cli + patterns: "**" + path: $(Build.ArtifactStagingDirectory)/cli + displayName: Download VS Code CLI + condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) - # Setting hardened entitlements is a requirement for: - # * Apple notarization - # * Running tests on Big Sur (because Big Sur has additional security precautions) - - script: | - set -e - security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain - security default-keychain -s $(agent.tempdirectory)/buildagent.keychain - security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain - echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12 - security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign - security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain - VSCODE_ARCH=$(VSCODE_ARCH) DEBUG=electron-osx-sign* node build/darwin/sign.js - displayName: Set Hardened Entitlements + - script: | + set -e + ARCHIVE_NAME=$(ls "$(Build.ArtifactStagingDirectory)/cli" | head -n 1) + unzip "$(Build.ArtifactStagingDirectory)/cli/$ARCHIVE_NAME" -d "$(Build.ArtifactStagingDirectory)/cli" + CLI_APP_NAME=$(node -p "require(\"$(APP_PATH)/Contents/Resources/app/product.json\").tunnelApplicationName") + mv "$(Build.ArtifactStagingDirectory)/cli/code" "$(APP_PATH)/Contents/Resources/app/bin/$CLI_APP_NAME" + chmod +x "$(APP_PATH)/Contents/Resources/app/bin/$CLI_APP_NAME" + displayName: Make CLI executable - - script: | - set -e - pushd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip * && popd - displayName: Archive build + - ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + - template: product-build-darwin-test.yml + parameters: + VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }} + VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }} + VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }} + VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }} - - script: | - set -e + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + # Setting hardened entitlements is a requirement for: + # * Apple notarization + # * Running tests on Big Sur (because Big Sur has additional security precautions) + - script: | + set -e + security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain + security default-keychain -s $(agent.tempdirectory)/buildagent.keychain + security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain + echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12 + security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign + security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain + VSCODE_ARCH=$(VSCODE_ARCH) DEBUG=electron-osx-sign* node build/darwin/sign.js + displayName: Set Hardened Entitlements - # package Remote Extension Host - pushd .. && mv vscode-reh-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH) && zip -Xry vscode-server-darwin-$(VSCODE_ARCH).zip vscode-server-darwin-$(VSCODE_ARCH) && popd + - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + - script: | + set -e + pushd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip * && popd + displayName: Archive build - # package Remote Extension Host (Web) - pushd .. && mv vscode-reh-web-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH)-web && zip -Xry vscode-server-darwin-$(VSCODE_ARCH)-web.zip vscode-server-darwin-$(VSCODE_ARCH)-web && popd - displayName: Prepare to publish servers + - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + - script: | + set -e - - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip - artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive - displayName: Publish client archive + # package Remote Extension Host + pushd .. && mv vscode-reh-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH) && zip -Xry vscode-server-darwin-$(VSCODE_ARCH).zip vscode-server-darwin-$(VSCODE_ARCH) && popd - - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH).zip - artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned - displayName: Publish server archive + # package Remote Extension Host (Web) + pushd .. && mv vscode-reh-web-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH)-web && zip -Xry vscode-server-darwin-$(VSCODE_ARCH)-web.zip vscode-server-darwin-$(VSCODE_ARCH)-web && popd + displayName: Prepare to publish servers - - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web.zip - artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned - displayName: Publish web server archive + - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: Generate SBOM (client) + inputs: + BuildDropPath: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) + PackageName: Visual Studio Code - - task: AzureCLI@2 - inputs: - azureSubscription: "vscode-builds-subscription" - scriptType: pscore - scriptLocation: inlineScript - addSpnToEnvironment: true - inlineScript: | - Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId" - Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId" - Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey" + - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + - publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest + displayName: Publish SBOM (client) + artifact: vscode_client_darwin_$(VSCODE_ARCH)_sbom - - script: | - set -e - AZURE_STORAGE_ACCOUNT="ticino" \ - AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \ - AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \ - AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \ - VSCODE_ARCH="$(VSCODE_ARCH)" \ - node build/azure-pipelines/upload-configuration - displayName: Upload configuration (for Bing settings search) - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), ne(variables['VSCODE_PUBLISH'], 'false')) - continueOnError: true + - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: Generate SBOM (server) + inputs: + BuildDropPath: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH) + PackageName: Visual Studio Code Server - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: Generate SBOM (client) - inputs: - BuildDropPath: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) - PackageName: Visual Studio Code - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + - publish: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)/_manifest + displayName: Publish SBOM (server) + artifact: vscode_server_darwin_$(VSCODE_ARCH)_sbom - - publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest - displayName: Publish SBOM (client) - artifact: vscode_client_darwin_$(VSCODE_ARCH)_sbom - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip + artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive + displayName: Publish client archive - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: Generate SBOM (server) - inputs: - BuildDropPath: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH) - PackageName: Visual Studio Code Server - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH).zip + artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned + displayName: Publish server archive - - publish: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)/_manifest - displayName: Publish SBOM (server) - artifact: vscode_server_darwin_$(VSCODE_ARCH)_sbom - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web.zip + artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned + displayName: Publish web server archive + + - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + - task: AzureCLI@2 + inputs: + azureSubscription: "vscode-builds-subscription" + scriptType: pscore + scriptLocation: inlineScript + addSpnToEnvironment: true + inlineScript: | + Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId" + Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId" + Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey" + + - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + - script: | + set -e + AZURE_STORAGE_ACCOUNT="ticino" \ + AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \ + AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \ + AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \ + VSCODE_ARCH="$(VSCODE_ARCH)" \ + node build/azure-pipelines/upload-configuration + displayName: Upload configuration (for Bing settings search) + condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) + continueOnError: true diff --git a/build/azure-pipelines/linux/cli-build-linux.yml b/build/azure-pipelines/linux/cli-build-linux.yml new file mode 100644 index 00000000000..b7b10504b4d --- /dev/null +++ b/build/azure-pipelines/linux/cli-build-linux.yml @@ -0,0 +1,138 @@ +parameters: + - name: VSCODE_BUILD_LINUX_ALPINE + type: boolean + default: false + - name: VSCODE_BUILD_LINUX + type: boolean + default: false + - name: VSCODE_BUILD_LINUX_ALPINE_ARM64 + type: boolean + default: false + - name: VSCODE_BUILD_LINUX_ARM64 + type: boolean + default: false + - name: VSCODE_BUILD_LINUX_ARMHF + type: boolean + default: false + - name: VSCODE_QUALITY + type: string + - name: channel + type: string + default: stable + +steps: + - task: Npm@1 + displayName: Download openssl prebuilt + inputs: + command: custom + customCommand: pack @vscode-internal/openssl-prebuilt@0.0.1 + customRegistry: useFeed + customFeed: 'Monaco/openssl-prebuilt' + workingDir: $(Build.ArtifactStagingDirectory) + + - script: | + set -e + mkdir $(Build.ArtifactStagingDirectory)/openssl + tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.1.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl + displayName: Extract openssl prebuilt + + # inspired by: https://github.com/emk/rust-musl-builder/blob/main/Dockerfile + - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true)) }}: + - bash: | + set -e + sudo apt-get update + sudo apt-get install -yq build-essential musl-dev musl-tools linux-libc-dev pkgconf xutils-dev + sudo ln -s "/usr/bin/g++" "/usr/bin/musl-g++" || echo "link exists" + displayName: Install musl build dependencies + + - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}: + - bash: | + set -e + sudo apt-get install -yq gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf binutils-arm-linux-gnueabihf + displayName: Install arm32 toolchains + + - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}: + - bash: | + set -e + sudo apt-get install -yq gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu + displayName: Install arm64 toolchains + + - task: NodeTool@0 + inputs: + versionSpec: "16.x" + + - template: ../mixin-distro-posix.yml + parameters: + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + + - script: | + set -e + node build/azure-pipelines/cli/prepare.js + displayName: Prepare CLI build + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + + - template: ../cli/install-rust-posix.yml + parameters: + targets: + - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true) }}: + - aarch64-unknown-linux-musl + - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true) }}: + - x86_64-unknown-linux-musl + - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}: + - aarch64-unknown-linux-gnu + - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}: + - x86_64-unknown-linux-gnu + - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}: + - armv7-unknown-linux-gnueabihf + + - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true) }}: + - template: ../cli/cli-compile-and-publish.yml + parameters: + VSCODE_CLI_TARGET: aarch64-unknown-linux-musl + VSCODE_CLI_ARTIFACT: vscode_cli_alpine_arm64_cli + VSCODE_CLI_ENV: + CXX_aarch64-unknown-linux-musl: musl-g++ + CC_aarch64-unknown-linux-musl: musl-gcc + OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/lib + OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/include + + - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true) }}: + - template: ../cli/cli-compile-and-publish.yml + parameters: + VSCODE_CLI_TARGET: x86_64-unknown-linux-musl + VSCODE_CLI_ARTIFACT: vscode_cli_alpine_x64_cli + VSCODE_CLI_ENV: + CXX_aarch64-unknown-linux-musl: musl-g++ + CC_aarch64-unknown-linux-musl: musl-gcc + OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/lib + OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/include + + - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}: + - template: ../cli/cli-compile-and-publish.yml + parameters: + VSCODE_CLI_TARGET: aarch64-unknown-linux-gnu + VSCODE_CLI_ARTIFACT: vscode_cli_linux_arm64_cli + VSCODE_CLI_ENV: + CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc + OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/lib + OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/include + + - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}: + - template: ../cli/cli-compile-and-publish.yml + parameters: + VSCODE_CLI_TARGET: x86_64-unknown-linux-gnu + VSCODE_CLI_ARTIFACT: vscode_cli_linux_x64_cli + VSCODE_CLI_ENV: + OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/lib + OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/include + + - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}: + - template: ../cli/cli-compile-and-publish.yml + parameters: + VSCODE_CLI_TARGET: armv7-unknown-linux-gnueabihf + VSCODE_CLI_ARTIFACT: vscode_cli_linux_armhf_cli + VSCODE_CLI_ENV: + CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc + OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm-linux/lib + OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm-linux/include diff --git a/build/azure-pipelines/linux/product-build-alpine.yml b/build/azure-pipelines/linux/product-build-alpine.yml index 3aef7279243..2175c76556e 100644 --- a/build/azure-pipelines/linux/product-build-alpine.yml +++ b/build/azure-pipelines/linux/product-build-alpine.yml @@ -55,9 +55,14 @@ steps: git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") displayName: Merge distro + - script: node build/setup-npm-registry.js $NPM_REGISTRY + condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Registry + - script: | mkdir -p .build - node build/azure-pipelines/common/computeNodeModulesCacheKey.js "alpine" $ENABLE_TERRAPIN > .build/yarnlockhash + node build/azure-pipelines/common/computeNodeModulesCacheKey.js "alpine" > .build/yarnlockhash + node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash displayName: Prepare yarn cache flags - task: Cache@2 @@ -67,6 +72,12 @@ steps: cacheHitVar: NODE_MODULES_RESTORED displayName: Restore node_modules cache + - task: Cache@2 + inputs: + key: '"builtInDeps" | .build/builtindepshash' + path: .build/builtInExtensions + displayName: Restore built-in extensions + - script: | set -e tar -xzf .build/node_modules_cache/cache.tgz @@ -75,15 +86,21 @@ steps: - script: | set -e - npx https://aka.ms/enablesecurefeed standAlone - timeoutInMinutes: 5 - retryCountOnTaskFailure: 3 - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true')) - displayName: Switch to Terrapin packages + npm config set registry "$NPM_REGISTRY" --location=project + npm config set always-auth=true --location=project + yarn config set registry "$NPM_REGISTRY" + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM & Yarn + + - task: npmAuthenticate@0 + inputs: + workingFile: .npmrc + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Authentication - script: | set -e - for i in {1..3}; do # try 3 times, for Terrapin + for i in {1..3}; do # try 3 times yarn --frozen-lockfile --check-files --check-files && break if [ $i -eq 3 ]; then echo "Yarn failed too many times" >&2 @@ -98,6 +115,13 @@ steps: displayName: Install dependencies condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + - script: | + set -e + node build/lib/builtInExtensions.js + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Download missing built-in extensions + - script: | set -e node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt diff --git a/build/azure-pipelines/linux/product-build-linux-client-test.yml b/build/azure-pipelines/linux/product-build-linux-client-test.yml new file mode 100644 index 00000000000..36495873d96 --- /dev/null +++ b/build/azure-pipelines/linux/product-build-linux-client-test.yml @@ -0,0 +1,278 @@ +parameters: + - name: VSCODE_QUALITY + type: string + - name: VSCODE_RUN_UNIT_TESTS + type: boolean + - name: VSCODE_RUN_INTEGRATION_TESTS + type: boolean + - name: VSCODE_RUN_SMOKE_TESTS + type: boolean + +steps: + - script: | + set -e + VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install" + displayName: Download Electron and Playwright + + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + sudo apt-get update + sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1 + sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb + sudo chmod +x /etc/init.d/xvfb + sudo update-rc.d xvfb defaults + sudo service xvfb start + displayName: Setup build environment + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) + ELECTRON_ROOT=.build/electron + sudo chown root $APP_ROOT/chrome-sandbox + sudo chown root $ELECTRON_ROOT/chrome-sandbox + sudo chmod 4755 $APP_ROOT/chrome-sandbox + sudo chmod 4755 $ELECTRON_ROOT/chrome-sandbox + stat $APP_ROOT/chrome-sandbox + stat $ELECTRON_ROOT/chrome-sandbox + displayName: Change setuid helper binary permission + + - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests" + displayName: Run unit tests (Electron) + timeoutInMinutes: 15 + + - script: | + set -e + yarn test-node + displayName: Run unit tests (node.js) + timeoutInMinutes: 15 + + - script: | + set -e + DEBUG=*browser* yarn test-browser-no-install --browser chromium --tfs "Browser Unit Tests" + displayName: Run unit tests (Browser, Chromium) + timeoutInMinutes: 15 + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + ./scripts/test.sh --build --tfs "Unit Tests" + displayName: Run unit tests (Electron) + timeoutInMinutes: 15 + + - script: | + set -e + yarn test-node --build + displayName: Run unit tests (node.js) + timeoutInMinutes: 15 + + - script: | + set -e + DEBUG=*browser* yarn test-browser-no-install --build --browser chromium --tfs "Browser Unit Tests" + displayName: Run unit tests (Browser, Chromium) + timeoutInMinutes: 15 + + - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: + - script: | + set -e + yarn gulp \ + compile-extension:configuration-editing \ + compile-extension:css-language-features-server \ + compile-extension:emmet \ + compile-extension:git \ + compile-extension:github-authentication \ + compile-extension:html-language-features-server \ + compile-extension:ipynb \ + compile-extension:json-language-features-server \ + compile-extension:markdown-language-features-server \ + compile-extension:markdown-language-features \ + compile-extension-media \ + compile-extension:microsoft-authentication \ + compile-extension:typescript-language-features \ + compile-extension:vscode-api-tests \ + compile-extension:vscode-colorize-tests \ + compile-extension:vscode-test-resolver + displayName: Build integration tests + + - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests" + displayName: Run integration tests (Electron) + timeoutInMinutes: 20 + + - script: | + set -e + ./scripts/test-web-integration.sh --browser chromium + displayName: Run integration tests (Browser, Chromium) + timeoutInMinutes: 20 + + - script: | + set -e + ./scripts/test-remote-integration.sh + displayName: Run integration tests (Remote) + timeoutInMinutes: 20 + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + # Figure out the full absolute path of the product we just built + # including the remote server and configure the integration tests + # to run with these builds instead of running out of sources. + set -e + APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) + APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName") + INTEGRATION_TEST_APP_NAME="$APP_NAME" \ + INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \ + VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \ + ./scripts/test-integration.sh --build --tfs "Integration Tests" + displayName: Run integration tests (Electron) + timeoutInMinutes: 20 + + - script: | + set -e + VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \ + ./scripts/test-web-integration.sh --browser chromium + displayName: Run integration tests (Browser, Chromium) + timeoutInMinutes: 20 + + - script: | + set -e + APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) + APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName") + INTEGRATION_TEST_APP_NAME="$APP_NAME" \ + INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \ + VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \ + ./scripts/test-remote-integration.sh + displayName: Run integration tests (Remote) + timeoutInMinutes: 20 + + - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: + - script: | + set -e + ps -ef + cat /proc/sys/fs/inotify/max_user_watches + lsof | wc -l + displayName: Diagnostics before smoke test run (processes, max_user_watches, number of opened file handles) + continueOnError: true + condition: succeededOrFailed() + + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + yarn --cwd test/smoke compile + displayName: Compile smoke tests + + - script: | + set -e + yarn gulp \ + compile-extension:markdown-language-features \ + compile-extension-media + displayName: Build extensions for smoke tests + + - script: | + set -e + yarn smoketest-no-compile --tracing + timeoutInMinutes: 20 + displayName: Run smoke tests (Electron) + + - script: | + set -e + yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage" + timeoutInMinutes: 20 + displayName: Run smoke tests (Browser, Chromium) + + - script: | + set -e + yarn gulp compile-extension:vscode-test-resolver + yarn smoketest-no-compile --remote --tracing + timeoutInMinutes: 20 + displayName: Run smoke tests (Remote) + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) + yarn smoketest-no-compile --tracing --build "$APP_PATH" + timeoutInMinutes: 20 + displayName: Run smoke tests (Electron) + + - script: | + set -e + VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \ + yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage" + timeoutInMinutes: 20 + displayName: Run smoke tests (Browser, Chromium) + + - script: | + set -e + yarn gulp compile-extension:vscode-test-resolver + APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) + VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \ + yarn smoketest-no-compile --tracing --remote --build "$APP_PATH" + timeoutInMinutes: 20 + displayName: Run smoke tests (Remote) + + - script: | + set -e + ps -ef + cat /proc/sys/fs/inotify/max_user_watches + lsof | wc -l + displayName: Diagnostics after smoke test run (processes, max_user_watches, number of opened file handles) + continueOnError: true + condition: succeededOrFailed() + + - ${{ if or(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + - task: PublishPipelineArtifact@0 + inputs: + targetPath: .build/crashes + ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + artifactName: crash-dump-linux-$(VSCODE_ARCH)-integration-$(System.JobAttempt) + ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + artifactName: crash-dump-linux-$(VSCODE_ARCH)-smoke-$(System.JobAttempt) + ${{ else }}: + artifactName: crash-dump-linux-$(VSCODE_ARCH)-$(System.JobAttempt) + displayName: "Publish Crash Reports" + continueOnError: true + condition: failed() + + # In order to properly symbolify above crash reports + # (if any), we need the compiled native modules too + - task: PublishPipelineArtifact@0 + inputs: + targetPath: node_modules + ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + artifactName: node-modules-linux-$(VSCODE_ARCH)-integration-$(System.JobAttempt) + ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + artifactName: node-modules-linux-$(VSCODE_ARCH)-smoke-$(System.JobAttempt) + ${{ else }}: + artifactName: node-modules-linux-$(VSCODE_ARCH)-$(System.JobAttempt) + displayName: "Publish Node Modules" + continueOnError: true + condition: failed() + + - task: PublishPipelineArtifact@0 + inputs: + targetPath: .build/logs + ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + artifactName: logs-linux-$(VSCODE_ARCH)-integration-$(System.JobAttempt) + ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + artifactName: logs-linux-$(VSCODE_ARCH)-smoke-$(System.JobAttempt) + ${{ else }}: + artifactName: logs-linux-$(VSCODE_ARCH)-$(System.JobAttempt) + displayName: "Publish Log Files" + continueOnError: true + condition: succeededOrFailed() + + - task: PublishTestResults@2 + displayName: Publish Tests Results + inputs: + testResultsFiles: "*-results.xml" + searchFolder: "$(Build.ArtifactStagingDirectory)/test-results" + condition: succeededOrFailed() diff --git a/build/azure-pipelines/linux/product-build-linux-client.yml b/build/azure-pipelines/linux/product-build-linux-client.yml index 8f3b4aad146..099b2eae733 100644 --- a/build/azure-pipelines/linux/product-build-linux-client.yml +++ b/build/azure-pipelines/linux/product-build-linux-client.yml @@ -1,96 +1,126 @@ parameters: + - name: VSCODE_PUBLISH + type: boolean - name: VSCODE_QUALITY type: string - name: VSCODE_RUN_UNIT_TESTS type: boolean - default: true - name: VSCODE_RUN_INTEGRATION_TESTS type: boolean - default: true - name: VSCODE_RUN_SMOKE_TESTS type: boolean - default: true + - name: VSCODE_BUILD_TUNNEL_CLI + type: boolean steps: + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - checkout: self + fetchDepth: 1 + retryCountOnTaskFailure: 3 + - task: NodeTool@0 inputs: versionSpec: "16.x" - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: AzureKeyVault@1 - displayName: "Azure Key Vault: Get Secrets" - inputs: - azureSubscription: "vscode-builds-subscription" - KeyVaultName: vscode - SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password" - - - task: DownloadPipelineArtifact@2 - inputs: - artifact: Compilation - path: $(Build.ArtifactStagingDirectory) - displayName: Download compilation output - - - task: DownloadPipelineArtifact@2 - inputs: - artifact: reh_node_modules-$(VSCODE_ARCH) - path: $(Build.ArtifactStagingDirectory) - displayName: Download server build dependencies - condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'armhf')) - - - script: | - set -e - # Start X server - /etc/init.d/xvfb start - # Start dbus session - DBUS_LAUNCH_RESULT=$(sudo dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address) - echo "##vso[task.setvariable variable=DBUS_SESSION_BUS_ADDRESS]$DBUS_LAUNCH_RESULT" - displayName: Setup system services - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) - - - script: | - set -e - tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz - displayName: Extract compilation output + - task: AzureKeyVault@1 + displayName: "Azure Key Vault: Get Secrets" + inputs: + azureSubscription: "vscode-builds-subscription" + KeyVaultName: vscode + SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password" - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - cat << EOF > ~/.netrc - machine github.com - login vscode - password $(github-distro-mixin-password) - EOF - - git config user.email "vscode@microsoft.com" - git config user.name "VSCode" - displayName: Prepare tooling + - task: DownloadPipelineArtifact@2 + inputs: + artifact: Compilation + path: $(Build.ArtifactStagingDirectory) + displayName: Download compilation output - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF - echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)" - git checkout FETCH_HEAD - condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' ')) - displayName: Checkout override commit + - task: DownloadPipelineArtifact@2 + inputs: + artifact: reh_node_modules-$(VSCODE_ARCH) + path: $(Build.ArtifactStagingDirectory) + displayName: Download server build dependencies + condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'armhf')) - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") - displayName: Merge distro + - script: | + set -e + # Start X server + /etc/init.d/xvfb start + # Start dbus session + DBUS_LAUNCH_RESULT=$(sudo dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address) + echo "##vso[task.setvariable variable=DBUS_SESSION_BUS_ADDRESS]$DBUS_LAUNCH_RESULT" + displayName: Setup system services + condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz + displayName: Extract compilation output + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + cat << EOF > ~/.netrc + machine github.com + login vscode + password $(github-distro-mixin-password) + EOF + + git config user.email "vscode@microsoft.com" + git config user.name "VSCode" + displayName: Prepare tooling + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF + echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)" + git checkout FETCH_HEAD + condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' ')) + displayName: Checkout override commit + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") + displayName: Merge distro + + - script: node build/setup-npm-registry.js $NPM_REGISTRY + condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Registry - script: | mkdir -p .build - node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash + node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH > .build/yarnlockhash + node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash displayName: Prepare yarn cache flags + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - task: Cache@2 + inputs: + key: "genericNodeModules | $(Agent.OS) | .build/yarnlockhash" + path: .build/node_modules_cache + cacheHitVar: NODE_MODULES_RESTORED + displayName: Restore node_modules cache + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - task: Cache@2 + inputs: + key: "nodeModules | $(Agent.OS) | .build/yarnlockhash" + path: .build/node_modules_cache + cacheHitVar: NODE_MODULES_RESTORED + displayName: Restore node_modules cache + - task: Cache@2 inputs: - key: "nodeModules | $(Agent.OS) | .build/yarnlockhash" - path: .build/node_modules_cache - cacheHitVar: NODE_MODULES_RESTORED - displayName: Restore node_modules cache + key: '"builtInDeps" | .build/builtindepshash' + path: .build/builtInExtensions + displayName: Restore built-in extensions - script: | set -e @@ -100,16 +130,22 @@ steps: - script: | set -e - npx https://aka.ms/enablesecurefeed standAlone - timeoutInMinutes: 5 - retryCountOnTaskFailure: 3 - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true')) - displayName: Switch to Terrapin packages + npm config set registry "$NPM_REGISTRY" --location=project + npm config set always-auth=true --location=project + yarn config set registry "$NPM_REGISTRY" + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM & Yarn + + - task: npmAuthenticate@0 + inputs: + workingFile: .npmrc + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Authentication - script: | set -e node build/npm/setupBuildYarnrc - for i in {1..3}; do # try 3 times, for Terrapin + for i in {1..3}; do # try 3 times yarn --cwd build --frozen-lockfile --check-files && break if [ $i -eq 3 ]; then echo "Yarn failed too many times" >&2 @@ -155,7 +191,7 @@ steps: export VSCODE_REMOTE_CXX=$(which g++) fi - for i in {1..3}; do # try 3 times, for Terrapin + for i in {1..3}; do # try 3 times yarn --frozen-lockfile --check-files && break if [ $i -eq 3 ]; then echo "Yarn failed too many times" >&2 @@ -172,10 +208,18 @@ steps: - script: | set -e - rm -rf remote/node_modules - tar -xzf $(Build.ArtifactStagingDirectory)/reh_node_modules-$(VSCODE_ARCH).tar.gz --directory $(Build.SourcesDirectory)/remote - displayName: Extract server node_modules output - condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'armhf')) + node build/lib/builtInExtensions.js + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Download missing built-in extensions + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + rm -rf remote/node_modules + tar -xzf $(Build.ArtifactStagingDirectory)/reh_node_modules-$(VSCODE_ARCH).tar.gz --directory $(Build.SourcesDirectory)/remote + displayName: Extract server node_modules output + condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'armhf')) - script: | set -e @@ -186,319 +230,167 @@ steps: displayName: Create node_modules archive - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - node build/azure-pipelines/mixin - displayName: Mix in quality - - - script: | - set -e - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci - displayName: Build + - script: | + set -e + node build/azure-pipelines/mixin + displayName: Mix in quality - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - node build/azure-pipelines/mixin --server - displayName: Mix in server quality - - - script: | - set -e - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci - displayName: Build Server - - - script: | - set -e - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install" - displayName: Download Electron and Playwright - - - script: | - set -e - APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) - ELECTRON_ROOT=.build/electron - sudo chown root $APP_ROOT/chrome-sandbox - sudo chown root $ELECTRON_ROOT/chrome-sandbox - sudo chmod 4755 $APP_ROOT/chrome-sandbox - sudo chmod 4755 $ELECTRON_ROOT/chrome-sandbox - stat $APP_ROOT/chrome-sandbox - stat $ELECTRON_ROOT/chrome-sandbox - displayName: Change setuid helper binary permission - - - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: - - script: | - set -e - ./scripts/test.sh --build --tfs "Unit Tests" - displayName: Run unit tests (Electron) - timeoutInMinutes: 15 - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: - - script: | - set -e - yarn test-node --build - displayName: Run unit tests (node.js) - timeoutInMinutes: 15 - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: - - script: | - set -e - DEBUG=*browser* yarn test-browser-no-install --build --browser chromium --tfs "Browser Unit Tests" - displayName: Run unit tests (Browser, Chromium) - timeoutInMinutes: 15 - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: - - script: | - set -e - yarn gulp \ - compile-extension:css-language-features-server \ - compile-extension:emmet \ - compile-extension:git \ - compile-extension:github-authentication \ - compile-extension:html-language-features-server \ - compile-extension:ipynb \ - compile-extension:json-language-features-server \ - compile-extension:markdown-language-features \ - compile-extension-media \ - compile-extension:microsoft-authentication \ - compile-extension:typescript-language-features \ - compile-extension:vscode-api-tests \ - compile-extension:vscode-colorize-tests \ - compile-extension:vscode-custom-editor-tests \ - compile-extension:vscode-notebook-tests \ - compile-extension:vscode-test-resolver - displayName: Build integration tests - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: - - script: | - # Figure out the full absolute path of the product we just built - # including the remote server and configure the integration tests - # to run with these builds instead of running out of sources. - set -e - APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) - APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName") - INTEGRATION_TEST_APP_NAME="$APP_NAME" \ - INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \ - VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \ - ./scripts/test-integration.sh --build --tfs "Integration Tests" - displayName: Run integration tests (Electron) - timeoutInMinutes: 20 - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: - - script: | - set -e - VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \ - ./scripts/test-web-integration.sh --browser chromium - displayName: Run integration tests (Browser, Chromium) - timeoutInMinutes: 20 - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: - - script: | - set -e - APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) - APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName") - INTEGRATION_TEST_APP_NAME="$APP_NAME" \ - INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \ - VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \ - ./scripts/test-remote-integration.sh - displayName: Run integration tests (Remote) - timeoutInMinutes: 20 - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - - script: | - set -e - ps -ef - cat /proc/sys/fs/inotify/max_user_watches - lsof | wc -l - displayName: Diagnostics before smoke test run (processes, max_user_watches, number of opened file handles) - continueOnError: true - condition: and(succeededOrFailed(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - - script: | - set -e - VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \ - yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage" - timeoutInMinutes: 20 - displayName: Run smoke tests (Browser, Chromium) - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - - script: | - set -e - APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) - yarn smoketest-no-compile --tracing --build "$APP_PATH" - timeoutInMinutes: 20 - displayName: Run smoke tests (Electron) - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - - script: | - set -e - yarn gulp compile-extension:vscode-test-resolver - APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) - VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \ - yarn smoketest-no-compile --tracing --remote --build "$APP_PATH" - timeoutInMinutes: 20 - displayName: Run smoke tests (Remote) - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - - script: | - set -e - ps -ef - cat /proc/sys/fs/inotify/max_user_watches - lsof | wc -l - displayName: Diagnostics after smoke test run (processes, max_user_watches, number of opened file handles) - continueOnError: true - condition: and(succeededOrFailed(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - task: PublishPipelineArtifact@0 - inputs: - artifactName: crash-dump-linux-$(VSCODE_ARCH) - targetPath: .build/crashes - displayName: "Publish Crash Reports" - continueOnError: true - condition: failed() - - # In order to properly symbolify above crash reports - # (if any), we need the compiled native modules too - - task: PublishPipelineArtifact@0 - inputs: - artifactName: node-modules-linux-$(VSCODE_ARCH) - targetPath: node_modules - displayName: "Publish Node Modules" - continueOnError: true - condition: failed() - - - task: PublishPipelineArtifact@0 - inputs: - artifactName: logs-linux-$(VSCODE_ARCH)-$(System.JobAttempt) - targetPath: .build/logs - displayName: "Publish Log Files" - continueOnError: true - condition: and(failed(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - task: PublishTestResults@2 - displayName: Publish Tests Results - inputs: - testResultsFiles: "*-results.xml" - searchFolder: "$(Build.ArtifactStagingDirectory)/test-results" - condition: and(succeededOrFailed(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) + - script: | + set -e + VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci + displayName: Build - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb" - yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm" - displayName: Build deb, rpm packages - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - script: | + set -e + node build/azure-pipelines/mixin --server + displayName: Mix in server quality - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap" - displayName: Prepare snap package - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - script: | + set -e + VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci + VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci + displayName: Build Server - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: UseDotNet@2 - inputs: - version: 2.x - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + yarn gulp "transpile-client-swc" "transpile-extensions" + displayName: Transpile - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: EsrpClientTool@1 - displayName: Download ESRPClient - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true) }}: + - task: DownloadPipelineArtifact@2 + inputs: + artifact: vscode_cli_linux_arm64_cli + patterns: "**" + path: $(Build.ArtifactStagingDirectory)/cli + displayName: Download VS Code CLI + condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64')) - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" rpm $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) .build/linux/rpm '*.rpm' - displayName: Codesign rpm - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - task: DownloadPipelineArtifact@2 + inputs: + artifact: vscode_cli_linux_x64_cli + patterns: "**" + path: $(Build.ArtifactStagingDirectory)/cli + displayName: Download VS Code CLI + condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - VSCODE_ARCH="$(VSCODE_ARCH)" \ - ./build/azure-pipelines/linux/prepare-publish.sh - displayName: Prepare for Publish - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - task: DownloadPipelineArtifact@2 + inputs: + artifact: vscode_cli_linux_armhf_cli + patterns: "**" + path: $(Build.ArtifactStagingDirectory)/cli + displayName: Download VS Code CLI + condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'armhf')) - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - publish: $(DEB_PATH) - artifact: vscode_client_linux_$(VSCODE_ARCH)_deb-package - displayName: Publish deb package - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - script: | + set -e + tar -xzvf $(Build.ArtifactStagingDirectory)/cli/*.tar.gz -C $(Build.ArtifactStagingDirectory)/cli + CLI_APP_NAME=$(node -p "require(\"$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/resources/app/product.json\").tunnelApplicationName") + mv $(Build.ArtifactStagingDirectory)/cli/code $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/bin/$CLI_APP_NAME + displayName: Make CLI executable - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - publish: $(RPM_PATH) - artifact: vscode_client_linux_$(VSCODE_ARCH)_rpm-package - displayName: Publish rpm package - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + - template: product-build-linux-client-test.yml + parameters: + VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }} + VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }} + VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }} + VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }} - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - publish: $(TARBALL_PATH) - artifact: vscode_client_linux_$(VSCODE_ARCH)_archive-unsigned - displayName: Publish client archive - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - script: | + set -e + yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb" + yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm" + displayName: Build deb, rpm packages - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH).tar.gz - artifact: vscode_server_linux_$(VSCODE_ARCH)_archive-unsigned - displayName: Publish server archive - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - script: | + set -e + yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap" + displayName: Prepare snap package - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH)-web.tar.gz - artifact: vscode_web_linux_$(VSCODE_ARCH)_archive-unsigned - displayName: Publish web server archive - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - task: UseDotNet@2 + inputs: + version: 2.x - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: PublishPipelineArtifact@0 - displayName: "Publish Pipeline Artifact" - inputs: - artifactName: "snap-$(VSCODE_ARCH)" - targetPath: .build/linux/snap-tarball - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - task: EsrpClientTool@1 + displayName: Download ESRPClient - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: Generate SBOM (client) - inputs: - BuildDropPath: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) - PackageName: Visual Studio Code - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - script: | + set -e + node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" rpm $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) .build/linux/rpm '*.rpm' + displayName: Codesign rpm - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - publish: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/_manifest - displayName: Publish SBOM (client) - artifact: vscode_client_linux_$(VSCODE_ARCH)_sbom - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - script: | + set -e + VSCODE_ARCH="$(VSCODE_ARCH)" \ + ./build/azure-pipelines/linux/prepare-publish.sh + displayName: Prepare for Publish - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: Generate SBOM (server) - inputs: - BuildDropPath: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH) - PackageName: Visual Studio Code Server - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: Generate SBOM (client) + inputs: + BuildDropPath: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH) + PackageName: Visual Studio Code - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - publish: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)/_manifest - displayName: Publish SBOM (server) - artifact: vscode_server_linux_$(VSCODE_ARCH)_sbom - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - publish: $(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)/_manifest + displayName: Publish SBOM (client) + artifact: vscode_client_linux_$(VSCODE_ARCH)_sbom + + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: Generate SBOM (server) + inputs: + BuildDropPath: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH) + PackageName: Visual Studio Code Server + + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - publish: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)/_manifest + displayName: Publish SBOM (server) + artifact: vscode_server_linux_$(VSCODE_ARCH)_sbom + + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - publish: $(DEB_PATH) + artifact: vscode_client_linux_$(VSCODE_ARCH)_deb-package + displayName: Publish deb package + + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - publish: $(RPM_PATH) + artifact: vscode_client_linux_$(VSCODE_ARCH)_rpm-package + displayName: Publish rpm package + + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - publish: $(TARBALL_PATH) + artifact: vscode_client_linux_$(VSCODE_ARCH)_archive-unsigned + displayName: Publish client archive + + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH).tar.gz + artifact: vscode_server_linux_$(VSCODE_ARCH)_archive-unsigned + displayName: Publish server archive + + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - publish: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH)-web.tar.gz + artifact: vscode_web_linux_$(VSCODE_ARCH)_archive-unsigned + displayName: Publish web server archive + + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - task: PublishPipelineArtifact@0 + displayName: "Publish Pipeline Artifact" + inputs: + artifactName: "snap-$(VSCODE_ARCH)" + targetPath: .build/linux/snap-tarball diff --git a/build/azure-pipelines/linux/product-build-linux-server.yml b/build/azure-pipelines/linux/product-build-linux-server.yml index 8ab58da435c..ecc193d3fed 100644 --- a/build/azure-pipelines/linux/product-build-linux-server.yml +++ b/build/azure-pipelines/linux/product-build-linux-server.yml @@ -8,59 +8,69 @@ steps: versionSpec: "16.x" - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: AzureKeyVault@1 - displayName: "Azure Key Vault: Get Secrets" - inputs: - azureSubscription: "vscode-builds-subscription" - KeyVaultName: vscode - SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password" + - task: AzureKeyVault@1 + displayName: "Azure Key Vault: Get Secrets" + inputs: + azureSubscription: "vscode-builds-subscription" + KeyVaultName: vscode + SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password" - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: Docker@1 - displayName: "Pull Docker image" - inputs: - azureSubscriptionEndpoint: "vscode-builds-subscription" - azureContainerRegistry: vscodehub.azurecr.io - command: "Run an image" - imageName: "vscode-linux-build-agent:centos7-devtoolset8-arm64" - containerCommand: uname - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64')) + - task: Docker@1 + displayName: "Pull Docker image" + inputs: + azureSubscriptionEndpoint: "vscode-builds-subscription" + azureContainerRegistry: vscodehub.azurecr.io + command: "Run an image" + imageName: "vscode-linux-build-agent:centos7-devtoolset8-arm64" + containerCommand: uname + condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64')) - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - cat << EOF > ~/.netrc - machine github.com - login vscode - password $(github-distro-mixin-password) - EOF + - script: | + set -e + cat << EOF > ~/.netrc + machine github.com + login vscode + password $(github-distro-mixin-password) + EOF - git config user.email "vscode@microsoft.com" - git config user.name "VSCode" - displayName: Prepare tooling + git config user.email "vscode@microsoft.com" + git config user.name "VSCode" + displayName: Prepare tooling - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF - echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)" - git checkout FETCH_HEAD - condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' ')) - displayName: Checkout override commit + - script: | + set -e + git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF + echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)" + git checkout FETCH_HEAD + condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' ')) + displayName: Checkout override commit - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") - displayName: Merge distro + - script: | + set -e + git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") + displayName: Merge distro - script: | set -e - npx https://aka.ms/enablesecurefeed standAlone - timeoutInMinutes: 5 - retryCountOnTaskFailure: 3 - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true')) - displayName: Switch to Terrapin packages + npm config set registry "$NPM_REGISTRY" --location=project + npm config set always-auth=true --location=project + yarn config set registry "$NPM_REGISTRY" + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM & Yarn + + - task: npmAuthenticate@0 + inputs: + workingFile: .npmrc + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Authentication + + - script: node build/setup-npm-registry.js $NPM_REGISTRY + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Registry - script: | set -e @@ -71,18 +81,18 @@ steps: condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - displayName: Register Docker QEMU - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64')) + - script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + displayName: Register Docker QEMU + condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64')) - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - docker run -e VSCODE_QUALITY -e GITHUB_TOKEN -v $(pwd):/root/vscode -v ~/.netrc:/root/.netrc vscodehub.azurecr.io/vscode-linux-build-agent:centos7-devtoolset8-arm64 /root/vscode/build/azure-pipelines/linux/scripts/install-remote-dependencies.sh - displayName: Install dependencies via qemu - env: - GITHUB_TOKEN: "$(github-distro-mixin-password)" - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64')) + - script: | + set -e + docker run -e VSCODE_QUALITY -e GITHUB_TOKEN -v $(pwd):/root/vscode -v ~/.netrc:/root/.netrc vscodehub.azurecr.io/vscode-linux-build-agent:centos7-devtoolset8-arm64 /root/vscode/build/azure-pipelines/linux/scripts/install-remote-dependencies.sh + displayName: Install dependencies via qemu + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64')) - script: | set -e diff --git a/build/azure-pipelines/linux/scripts/install-remote-dependencies.sh b/build/azure-pipelines/linux/scripts/install-remote-dependencies.sh index d2f62087661..c6b4e3115f1 100755 --- a/build/azure-pipelines/linux/scripts/install-remote-dependencies.sh +++ b/build/azure-pipelines/linux/scripts/install-remote-dependencies.sh @@ -4,7 +4,7 @@ set -e echo "Installing remote dependencies" (cd remote && rm -rf node_modules) -for i in {1..3}; do # try 3 times, for Terrapin +for i in {1..3}; do # try 3 times yarn --cwd remote --frozen-lockfile --check-files && break if [ $i -eq 3 ]; then echo "Yarn failed too many times" >&2 diff --git a/build/azure-pipelines/mixin-distro-posix.yml b/build/azure-pipelines/mixin-distro-posix.yml new file mode 100644 index 00000000000..5340bda32d0 --- /dev/null +++ b/build/azure-pipelines/mixin-distro-posix.yml @@ -0,0 +1,40 @@ +parameters: + - name: VSCODE_QUALITY + type: string + +steps: + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - task: AzureKeyVault@1 + displayName: "Azure Key Vault: Get Secrets" + inputs: + azureSubscription: "vscode-builds-subscription" + KeyVaultName: vscode + SecretsFilter: "github-distro-mixin-password" + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + cat << EOF > ~/.netrc + machine github.com + login vscode + password $(github-distro-mixin-password) + EOF + + git config user.email "vscode@microsoft.com" + git config user.name "VSCode" + displayName: Prepare tooling + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF + echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)" + git checkout FETCH_HEAD + condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' ')) + displayName: Checkout override commit + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") + displayName: Merge distro diff --git a/build/azure-pipelines/mixin-distro-win32.yml b/build/azure-pipelines/mixin-distro-win32.yml new file mode 100644 index 00000000000..5ff4eacf41c --- /dev/null +++ b/build/azure-pipelines/mixin-distro-win32.yml @@ -0,0 +1,40 @@ +parameters: + - name: VSCODE_QUALITY + type: string + +steps: + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - task: AzureKeyVault@1 + displayName: "Azure Key Vault: Get Secrets" + inputs: + azureSubscription: "vscode-builds-subscription" + KeyVaultName: vscode + SecretsFilter: "github-distro-mixin-password" + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + "machine github.com`nlogin vscode`npassword $(github-distro-mixin-password)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII + + exec { git config user.email "vscode@microsoft.com" } + exec { git config user.name "VSCode" } + displayName: Prepare tooling + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + + exec { git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $(VSCODE_DISTRO_REF) } + Write-Host "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)" + exec { git checkout FETCH_HEAD } + condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' ')) + displayName: Checkout override commit + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") } + displayName: Merge distro diff --git a/build/azure-pipelines/mixin.js b/build/azure-pipelines/mixin.js index 769ac72a9ee..273aeda9fc2 100644 --- a/build/azure-pipelines/mixin.js +++ b/build/azure-pipelines/mixin.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); const json = require("gulp-json-editor"); const buffer = require('gulp-buffer'); diff --git a/build/azure-pipelines/mixin.ts b/build/azure-pipelines/mixin.ts index ccd98d6e773..aec694a61df 100644 --- a/build/azure-pipelines/mixin.ts +++ b/build/azure-pipelines/mixin.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as json from 'gulp-json-editor'; const buffer = require('gulp-buffer'); import * as filter from 'gulp-filter'; diff --git a/build/azure-pipelines/product-build-pr-cache.yml b/build/azure-pipelines/product-build-pr-cache.yml new file mode 100644 index 00000000000..73f17eea5ac --- /dev/null +++ b/build/azure-pipelines/product-build-pr-cache.yml @@ -0,0 +1,83 @@ +steps: + - checkout: self + fetchDepth: 1 + retryCountOnTaskFailure: 3 + + - task: NodeTool@0 + inputs: + versionSpec: "16.x" + + - script: node build/setup-npm-registry.js $NPM_REGISTRY + condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Registry + + - script: | + mkdir -p .build + node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH > .build/yarnlockhash + node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash + displayName: Prepare yarn cache flags + + - task: Cache@2 + inputs: + key: "genericNodeModules | $(Agent.OS) | .build/yarnlockhash" + path: .build/node_modules_cache + cacheHitVar: NODE_MODULES_RESTORED + displayName: Restore node_modules cache + + - task: Cache@2 + inputs: + key: '"builtInDeps" | .build/builtindepshash' + path: .build/builtInExtensions + displayName: Restore built-in extensions + + - script: | + set -e + tar -xzf .build/node_modules_cache/cache.tgz + condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true')) + displayName: Extract node_modules cache + + - script: | + set -e + npm config set registry "$NPM_REGISTRY" --location=project + npm config set always-auth=true --location=project + yarn config set registry "$NPM_REGISTRY" + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM & Yarn + + - task: npmAuthenticate@0 + inputs: + workingFile: .npmrc + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Authentication + + - script: | + set -e + for i in {1..3}; do # try 3 times + yarn --frozen-lockfile --check-files && break + if [ $i -eq 3 ]; then + echo "Yarn failed too many times" >&2 + exit 1 + fi + echo "Yarn failed $i, trying again..." + done + env: + ELECTRON_SKIP_BINARY_DOWNLOAD: 1 + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Install dependencies + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + + - script: | + set -e + node build/lib/builtInExtensions.js + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Download missing built-in extensions + + - script: | + set -e + node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt + mkdir -p .build/node_modules_cache + tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + displayName: Create node_modules archive diff --git a/build/azure-pipelines/product-build-pr.yml b/build/azure-pipelines/product-build-pr.yml index 3c45858413e..2ef55d4d05f 100644 --- a/build/azure-pipelines/product-build-pr.yml +++ b/build/azure-pipelines/product-build-pr.yml @@ -6,22 +6,15 @@ pr: branches: include: ["main", "release/*"] -resources: - containers: - - container: centos7-devtoolset8-x64 - image: vscodehub.azurecr.io/vscode-linux-build-agent:centos7-devtoolset8-x64 - options: --user 0:0 --cap-add SYS_ADMIN - - container: vscode-bionic-x64 - image: vscodehub.azurecr.io/vscode-linux-build-agent:bionic-x64 - options: --user 0:0 --cap-add SYS_ADMIN - variables: - name: Codeql.SkipTaskAutoInjection value: true - name: skipComponentGovernanceDetection value: true - - name: ENABLE_TERRAPIN - value: false + - name: NPM_REGISTRY + value: 'none' + - name: VSCODE_CIBUILD + value: ${{ in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI') }} - name: VSCODE_PUBLISH value: false - name: VSCODE_QUALITY @@ -29,164 +22,178 @@ variables: - name: VSCODE_STEP_ON_IT value: false -stages: - - stage: Compile - jobs: - - job: Compile - pool: vscode-1es-vscode-linux-18.04 - variables: - VSCODE_ARCH: x64 - steps: - - template: product-compile.yml - parameters: - VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} +jobs: + - ${{ if ne(variables['VSCODE_CIBUILD'], true) }}: + - job: Compile + displayName: Compile & Hygiene + pool: vscode-1es-vscode-linux-20.04 + timeoutInMinutes: 30 + variables: + VSCODE_ARCH: x64 + steps: + - template: product-compile.yml + parameters: + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - - stage: LinuxServerDependencies - dependsOn: [] - pool: vscode-1es-vscode-linux-18.04 - jobs: - - job: x64 - container: centos7-devtoolset8-x64 - variables: - VSCODE_ARCH: x64 - NPM_ARCH: x64 - steps: - - template: linux/product-build-linux-server.yml - parameters: - VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + - job: Linuxx64UnitTest + displayName: Linux (Unit Tests) + pool: vscode-1es-vscode-linux-20.04 + timeoutInMinutes: 30 + variables: + VSCODE_ARCH: x64 + NPM_ARCH: x64 + DISPLAY: ":10" + steps: + - template: linux/product-build-linux-client.yml + parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: false + VSCODE_RUN_UNIT_TESTS: true + VSCODE_RUN_INTEGRATION_TESTS: false + VSCODE_RUN_SMOKE_TESTS: false - - stage: Windows - dependsOn: - - Compile - pool: vscode-1es-vscode-windows-2019 - jobs: - - job: WindowsUnitTests - displayName: Unit Tests - timeoutInMinutes: 120 - variables: - VSCODE_ARCH: x64 - steps: - - template: win32/product-build-win32.yml - parameters: - VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_RUN_UNIT_TESTS: true - VSCODE_RUN_INTEGRATION_TESTS: false - VSCODE_RUN_SMOKE_TESTS: false - - job: WindowsIntegrationTests - displayName: Integration Tests - timeoutInMinutes: 120 - variables: - VSCODE_ARCH: x64 - steps: - - template: win32/product-build-win32.yml - parameters: - VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_RUN_UNIT_TESTS: false - VSCODE_RUN_INTEGRATION_TESTS: true - VSCODE_RUN_SMOKE_TESTS: false - - job: WindowsSmokeTests - displayName: Smoke Tests - timeoutInMinutes: 120 - variables: - VSCODE_ARCH: x64 - steps: - - template: win32/product-build-win32.yml - parameters: - VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_RUN_UNIT_TESTS: false - VSCODE_RUN_INTEGRATION_TESTS: false - VSCODE_RUN_SMOKE_TESTS: true + - job: Linuxx64IntegrationTest + displayName: Linux (Integration Tests) + pool: vscode-1es-vscode-linux-20.04 + timeoutInMinutes: 30 + variables: + VSCODE_ARCH: x64 + NPM_ARCH: x64 + DISPLAY: ":10" + steps: + - template: linux/product-build-linux-client.yml + parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: false + VSCODE_RUN_UNIT_TESTS: false + VSCODE_RUN_INTEGRATION_TESTS: true + VSCODE_RUN_SMOKE_TESTS: false - - stage: Linux - dependsOn: - - Compile - - LinuxServerDependencies - pool: vscode-1es-vscode-linux-18.04 - jobs: - - job: Linuxx64UnitTest - displayName: Unit Tests - container: vscode-bionic-x64 - variables: - VSCODE_ARCH: x64 - NPM_ARCH: x64 - DISPLAY: ":10" - steps: - - template: linux/product-build-linux-client.yml - parameters: - VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_RUN_UNIT_TESTS: true - VSCODE_RUN_INTEGRATION_TESTS: false - VSCODE_RUN_SMOKE_TESTS: false - - job: Linuxx64IntegrationTest - displayName: Integration Tests - container: vscode-bionic-x64 - variables: - VSCODE_ARCH: x64 - NPM_ARCH: x64 - DISPLAY: ":10" - steps: - - template: linux/product-build-linux-client.yml - parameters: - VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_RUN_UNIT_TESTS: false - VSCODE_RUN_INTEGRATION_TESTS: true - VSCODE_RUN_SMOKE_TESTS: false - - job: Linuxx64SmokeTest - displayName: Smoke Tests - container: vscode-bionic-x64 - variables: - VSCODE_ARCH: x64 - NPM_ARCH: x64 - DISPLAY: ":10" - steps: - - template: linux/product-build-linux-client.yml - parameters: - VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_RUN_UNIT_TESTS: false - VSCODE_RUN_INTEGRATION_TESTS: false - VSCODE_RUN_SMOKE_TESTS: true + - job: Linuxx64SmokeTest + displayName: Linux (Smoke Tests) + pool: vscode-1es-vscode-linux-20.04 + timeoutInMinutes: 30 + variables: + VSCODE_ARCH: x64 + NPM_ARCH: x64 + DISPLAY: ":10" + steps: + - template: linux/product-build-linux-client.yml + parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: false + VSCODE_RUN_UNIT_TESTS: false + VSCODE_RUN_INTEGRATION_TESTS: false + VSCODE_RUN_SMOKE_TESTS: true - - stage: macOS - dependsOn: - - Compile - pool: - vmImage: macOS-latest - variables: - BUILDSECMON_OPT_IN: true - jobs: - - job: macOSUnitTest - displayName: Unit Tests - timeoutInMinutes: 90 - variables: - VSCODE_ARCH: x64 - steps: - - template: darwin/product-build-darwin-test.yml - parameters: - VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_RUN_UNIT_TESTS: true - VSCODE_RUN_INTEGRATION_TESTS: false - VSCODE_RUN_SMOKE_TESTS: false - - job: macOSIntegrationTest - displayName: Integration Tests - timeoutInMinutes: 90 - variables: - VSCODE_ARCH: x64 - steps: - - template: darwin/product-build-darwin-test.yml - parameters: - VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_RUN_UNIT_TESTS: false - VSCODE_RUN_INTEGRATION_TESTS: true - VSCODE_RUN_SMOKE_TESTS: false - - job: macOSSmokeTest - displayName: Smoke Tests - timeoutInMinutes: 90 - variables: - VSCODE_ARCH: x64 - steps: - - template: darwin/product-build-darwin-test.yml - parameters: - VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - VSCODE_RUN_UNIT_TESTS: false - VSCODE_RUN_INTEGRATION_TESTS: false - VSCODE_RUN_SMOKE_TESTS: true + - job: LinuxCLI + displayName: Linux (CLI) + pool: vscode-1es-vscode-linux-20.04 + timeoutInMinutes: 30 + steps: + - template: cli/test.yml + + - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}: + - job: Linuxx64MaintainNodeModulesCache + displayName: Linux (Maintain node_modules cache) + pool: vscode-1es-vscode-linux-20.04 + timeoutInMinutes: 30 + variables: + VSCODE_ARCH: x64 + steps: + - template: product-build-pr-cache.yml + + # - job: macOSUnitTest + # displayName: macOS (Unit Tests) + # pool: + # vmImage: macOS-11 + # timeoutInMinutes: 60 + # variables: + # BUILDSECMON_OPT_IN: true + # VSCODE_ARCH: x64 + # steps: + # - template: darwin/product-build-darwin.yml + # parameters: + # VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + # VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + # VSCODE_RUN_UNIT_TESTS: true + # VSCODE_RUN_INTEGRATION_TESTS: false + # VSCODE_RUN_SMOKE_TESTS: false + # - job: macOSIntegrationTest + # displayName: macOS (Integration Tests) + # pool: + # vmImage: macOS-11 + # timeoutInMinutes: 60 + # variables: + # BUILDSECMON_OPT_IN: true + # VSCODE_ARCH: x64 + # steps: + # - template: darwin/product-build-darwin.yml + # parameters: + # VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + # VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + # VSCODE_RUN_UNIT_TESTS: false + # VSCODE_RUN_INTEGRATION_TESTS: true + # VSCODE_RUN_SMOKE_TESTS: false + # - job: macOSSmokeTest + # displayName: macOS (Smoke Tests) + # pool: + # vmImage: macOS-11 + # timeoutInMinutes: 60 + # variables: + # BUILDSECMON_OPT_IN: true + # VSCODE_ARCH: x64 + # steps: + # - template: darwin/product-build-darwin.yml + # parameters: + # VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + # VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + # VSCODE_RUN_UNIT_TESTS: false + # VSCODE_RUN_INTEGRATION_TESTS: false + # VSCODE_RUN_SMOKE_TESTS: true + + # - job: WindowsUnitTests + # displayName: Windows (Unit Tests) + # pool: vscode-1es-vscode-windows-2019 + # timeoutInMinutes: 60 + # variables: + # VSCODE_ARCH: x64 + # steps: + # - template: win32/product-build-win32.yml + # parameters: + # VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + # VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + # VSCODE_RUN_UNIT_TESTS: true + # VSCODE_RUN_INTEGRATION_TESTS: false + # VSCODE_RUN_SMOKE_TESTS: false + # - job: WindowsIntegrationTests + # displayName: Windows (Integration Tests) + # pool: vscode-1es-vscode-windows-2019 + # timeoutInMinutes: 60 + # variables: + # VSCODE_ARCH: x64 + # steps: + # - template: win32/product-build-win32.yml + # parameters: + # VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + # VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + # VSCODE_RUN_UNIT_TESTS: false + # VSCODE_RUN_INTEGRATION_TESTS: true + # VSCODE_RUN_SMOKE_TESTS: false + # - job: WindowsSmokeTests + # displayName: Windows (Smoke Tests) + # pool: vscode-1es-vscode-windows-2019 + # timeoutInMinutes: 60 + # variables: + # VSCODE_ARCH: x64 + # steps: + # - template: win32/product-build-win32.yml + # parameters: + # VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + # VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + # VSCODE_RUN_UNIT_TESTS: false + # VSCODE_RUN_INTEGRATION_TESTS: false + # VSCODE_RUN_SMOKE_TESTS: true diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml index 3cc4fc399d9..ded4d810b69 100644 --- a/build/azure-pipelines/product-build.yml +++ b/build/azure-pipelines/product-build.yml @@ -25,10 +25,10 @@ parameters: - exploration - insider - stable - - name: ENABLE_TERRAPIN - displayName: "Enable Terrapin" - type: boolean - default: true + - name: NPM_REGISTRY + displayName: "Custom NPM Registry" + type: string + default: 'https://pkgs.dev.azure.com/monacotools/Monaco/_packaging/vscode/npm/registry/' - name: VSCODE_BUILD_WIN32 displayName: "đŸŽ¯ Windows x64" type: boolean @@ -77,6 +77,10 @@ parameters: displayName: "đŸŽ¯ Web" type: boolean default: true + - name: VSCODE_BUILD_TUNNEL_CLI + displayName: "Build Tunnel CLI" + type: boolean + default: true - name: VSCODE_PUBLISH displayName: "Publish to builds.code.visualstudio.com" type: boolean @@ -101,16 +105,18 @@ parameters: variables: - name: VSCODE_DISTRO_REF value: ${{ parameters.VSCODE_DISTRO_REF }} - - name: ENABLE_TERRAPIN - value: ${{ eq(parameters.ENABLE_TERRAPIN, true) }} + - name: NPM_REGISTRY + value: ${{ parameters.NPM_REGISTRY }} - name: VSCODE_QUALITY value: ${{ parameters.VSCODE_QUALITY }} - name: VSCODE_BUILD_STAGE_WINDOWS value: ${{ or(eq(parameters.VSCODE_BUILD_WIN32, true), eq(parameters.VSCODE_BUILD_WIN32_32BIT, true), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }} - name: VSCODE_BUILD_STAGE_LINUX - value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true), eq(parameters.VSCODE_BUILD_WEB, true)) }} + value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true)) }} - name: VSCODE_BUILD_STAGE_MACOS value: ${{ or(eq(parameters.VSCODE_BUILD_MACOS, true), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }} + - name: VSCODE_BUILD_STAGE_WEB + value: ${{ eq(parameters.VSCODE_BUILD_WEB, true) }} - name: VSCODE_CIBUILD value: ${{ in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI') }} - name: VSCODE_PUBLISH @@ -169,13 +175,147 @@ stages: parameters: VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + - ${{ if eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true) }}: + - stage: CompileCLI + dependsOn: [] + jobs: + - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true)) }}: + - job: LinuxX64 + pool: vscode-1es-linux + steps: + - template: ./linux/cli-build-linux.yml + parameters: + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_LINUX: ${{ parameters.VSCODE_BUILD_LINUX }} + VSCODE_BUILD_LINUX_ALPINE: ${{ parameters.VSCODE_BUILD_LINUX_ALPINE }} + + - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}: + - job: LinuxGnuARM + pool: vscode-1es-linux + steps: + - template: ./linux/cli-build-linux.yml + parameters: + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_LINUX_ARMHF: ${{ parameters.VSCODE_BUILD_LINUX_ARMHF }} + VSCODE_BUILD_LINUX_ARM64: ${{ parameters.VSCODE_BUILD_LINUX_ARM64 }} + + - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true) }}: + - job: LinuxAlpineARM64 + pool: vscode-1es-linux-20.04-arm64 + steps: + - task: NodeTool@0 + displayName: Install Node.js + inputs: + versionSpec: 16.x + - script: | + set -e + npm install -g yarn + displayName: Install yarn + - template: ./linux/cli-build-linux.yml + parameters: + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_LINUX_ALPINE_ARM64: ${{ parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64 }} + + - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}: + - job: MacOSX64 + pool: + vmImage: macOS-11 + steps: + - template: ./darwin/cli-build-darwin.yml + parameters: + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_MACOS: ${{ parameters.VSCODE_BUILD_MACOS }} + + - ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}: + - job: MacOSARM64 + pool: + vmImage: macOS-11 + steps: + - template: ./darwin/cli-build-darwin.yml + parameters: + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_MACOS_ARM64: ${{ parameters.VSCODE_BUILD_MACOS_ARM64 }} + + - ${{ if eq(parameters.VSCODE_BUILD_WIN32, true) }}: + - job: WindowsX64 + pool: vscode-1es-windows + steps: + - template: ./win32/cli-build-win32.yml + parameters: + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_WIN32: ${{ parameters.VSCODE_BUILD_WIN32 }} + + - ${{ if eq(parameters.VSCODE_BUILD_WIN32_ARM64, true) }}: + - job: WindowsARM64 + pool: vscode-1es-windows + steps: + - template: ./win32/cli-build-win32.yml + parameters: + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_WIN32_ARM64: ${{ parameters.VSCODE_BUILD_WIN32_ARM64 }} + + - ${{ if eq(parameters.VSCODE_BUILD_WIN32_32BIT, true) }}: + - job: WindowsX86 + pool: vscode-1es-windows + steps: + - template: ./win32/cli-build-win32.yml + parameters: + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_WIN32_32BIT: ${{ parameters.VSCODE_BUILD_WIN32_32BIT }} + - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_WINDOWS'], true)) }}: - stage: Windows dependsOn: - Compile + - ${{ if eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true) }}: + - CompileCLI pool: vscode-1es-windows jobs: - - ${{ if eq(parameters.VSCODE_BUILD_WIN32, true) }}: + - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}: + - job: WindowsUnitTests + displayName: Unit Tests + timeoutInMinutes: 60 + variables: + VSCODE_ARCH: x64 + steps: + - template: win32/product-build-win32.yml + parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: false + VSCODE_RUN_UNIT_TESTS: true + VSCODE_RUN_INTEGRATION_TESTS: false + VSCODE_RUN_SMOKE_TESTS: false + - job: WindowsIntegrationTests + displayName: Integration Tests + timeoutInMinutes: 60 + variables: + VSCODE_ARCH: x64 + steps: + - template: win32/product-build-win32.yml + parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: false + VSCODE_RUN_UNIT_TESTS: false + VSCODE_RUN_INTEGRATION_TESTS: true + VSCODE_RUN_SMOKE_TESTS: false + - job: WindowsSmokeTests + displayName: Smoke Tests + timeoutInMinutes: 60 + variables: + VSCODE_ARCH: x64 + steps: + - template: win32/product-build-win32.yml + parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: false + VSCODE_RUN_UNIT_TESTS: false + VSCODE_RUN_INTEGRATION_TESTS: false + VSCODE_RUN_SMOKE_TESTS: true + + - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32, true)) }}: - job: Windows timeoutInMinutes: 120 variables: @@ -183,7 +323,12 @@ stages: steps: - template: win32/product-build-win32.yml parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: ${{ parameters.VSCODE_BUILD_TUNNEL_CLI }} + VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} + VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} + VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32_32BIT, true)) }}: - job: Windows32 @@ -193,7 +338,12 @@ stages: steps: - template: win32/product-build-win32.yml parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: ${{ parameters.VSCODE_BUILD_TUNNEL_CLI }} + VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} + VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} + VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}: - job: WindowsARM64 @@ -203,7 +353,22 @@ stages: steps: - template: win32/product-build-win32.yml parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: ${{ parameters.VSCODE_BUILD_TUNNEL_CLI }} + VSCODE_RUN_UNIT_TESTS: false + VSCODE_RUN_INTEGRATION_TESTS: false + VSCODE_RUN_SMOKE_TESTS: false + + - ${{ if and(eq(variables['VSCODE_PUBLISH'], true), eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true)) }}: + - job: windowsCLISign + timeoutInMinutes: 90 + steps: + - template: win32/product-build-win32-cli-sign.yml + parameters: + VSCODE_BUILD_WIN32: ${{ parameters.VSCODE_BUILD_WIN32 }} + VSCODE_BUILD_WIN32_ARM64: ${{ parameters.VSCODE_BUILD_WIN32_ARM64 }} + VSCODE_BUILD_WIN32_32BIT: ${{ parameters.VSCODE_BUILD_WIN32_32BIT }} - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_LINUX'], true)) }}: - stage: LinuxServerDependencies @@ -235,9 +400,61 @@ stages: dependsOn: - Compile - LinuxServerDependencies + - ${{ if eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true) }}: + - CompileCLI pool: vscode-1es-linux jobs: - - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}: + - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}: + - job: Linuxx64UnitTest + displayName: Unit Tests + container: vscode-bionic-x64 + variables: + VSCODE_ARCH: x64 + NPM_ARCH: x64 + DISPLAY: ":10" + steps: + - template: linux/product-build-linux-client.yml + parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: false + VSCODE_RUN_UNIT_TESTS: true + VSCODE_RUN_INTEGRATION_TESTS: false + VSCODE_RUN_SMOKE_TESTS: false + - job: Linuxx64IntegrationTest + displayName: Integration Tests + container: vscode-bionic-x64 + variables: + VSCODE_ARCH: x64 + NPM_ARCH: x64 + DISPLAY: ":10" + steps: + - template: linux/product-build-linux-client.yml + parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: false + VSCODE_RUN_UNIT_TESTS: false + VSCODE_RUN_INTEGRATION_TESTS: true + VSCODE_RUN_SMOKE_TESTS: false + - job: Linuxx64SmokeTest + displayName: Smoke Tests + container: vscode-bionic-x64 + variables: + VSCODE_ARCH: x64 + NPM_ARCH: x64 + DISPLAY: ":10" + steps: + - template: linux/product-build-linux-client.yml + parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: false + VSCODE_RUN_UNIT_TESTS: false + VSCODE_RUN_INTEGRATION_TESTS: false + VSCODE_RUN_SMOKE_TESTS: true + + - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX, true)) }}: - job: Linuxx64 container: vscode-bionic-x64 variables: @@ -247,7 +464,12 @@ stages: steps: - template: linux/product-build-linux-client.yml parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: ${{ parameters.VSCODE_BUILD_TUNNEL_CLI }} + VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} + VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} + VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX, true), ne(variables['VSCODE_PUBLISH'], 'false')) }}: - job: LinuxSnap @@ -268,7 +490,12 @@ stages: steps: - template: linux/product-build-linux-client.yml parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: ${{ parameters.VSCODE_BUILD_TUNNEL_CLI }} + VSCODE_RUN_UNIT_TESTS: false + VSCODE_RUN_INTEGRATION_TESTS: false + VSCODE_RUN_SMOKE_TESTS: false # TODO@joaomoreno: We don't ship ARM snaps for now - ${{ if and(false, eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true)) }}: @@ -290,7 +517,12 @@ stages: steps: - template: linux/product-build-linux-client.yml parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: ${{ parameters.VSCODE_BUILD_TUNNEL_CLI }} + VSCODE_RUN_UNIT_TESTS: false + VSCODE_RUN_INTEGRATION_TESTS: false + VSCODE_RUN_SMOKE_TESTS: false # TODO@joaomoreno: We don't ship ARM snaps for now - ${{ if and(false, eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}: @@ -318,39 +550,92 @@ stages: steps: - template: linux/product-build-alpine.yml - - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WEB, true)) }}: - - job: LinuxWeb - variables: - VSCODE_ARCH: x64 - steps: - - template: web/product-build-web.yml - - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_MACOS'], true)) }}: - stage: macOS dependsOn: - Compile + - ${{ if eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true) }}: + - CompileCLI pool: - vmImage: macOS-latest + vmImage: macOS-11 variables: BUILDSECMON_OPT_IN: true jobs: - - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}: - - job: macOSTest + - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}: + - job: macOSUnitTest + displayName: Unit Tests timeoutInMinutes: 90 variables: VSCODE_ARCH: x64 steps: - - template: darwin/product-build-darwin-test.yml + - template: darwin/product-build-darwin.yml parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: false + VSCODE_RUN_UNIT_TESTS: true + VSCODE_RUN_INTEGRATION_TESTS: false + VSCODE_RUN_SMOKE_TESTS: false + - job: macOSIntegrationTest + displayName: Integration Tests + timeoutInMinutes: 90 + variables: + VSCODE_ARCH: x64 + steps: + - template: darwin/product-build-darwin.yml + parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: false + VSCODE_RUN_UNIT_TESTS: false + VSCODE_RUN_INTEGRATION_TESTS: true + VSCODE_RUN_SMOKE_TESTS: false + - job: macOSSmokeTest + displayName: Smoke Tests + timeoutInMinutes: 90 + variables: + VSCODE_ARCH: x64 + steps: + - template: darwin/product-build-darwin.yml + parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: false + VSCODE_RUN_UNIT_TESTS: false + VSCODE_RUN_INTEGRATION_TESTS: false + VSCODE_RUN_SMOKE_TESTS: true - - ${{ if eq(variables['VSCODE_CIBUILD'], false) }}: - - job: macOS + - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS, true)) }}: + - job: macOS + timeoutInMinutes: 90 + variables: + VSCODE_ARCH: x64 + steps: + - template: darwin/product-build-darwin.yml + parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: ${{ parameters.VSCODE_BUILD_TUNNEL_CLI }} + VSCODE_RUN_UNIT_TESTS: false + VSCODE_RUN_INTEGRATION_TESTS: false + VSCODE_RUN_SMOKE_TESTS: false + + - ${{ if eq(parameters.VSCODE_STEP_ON_IT, false) }}: + - job: macOSTest timeoutInMinutes: 90 variables: VSCODE_ARCH: x64 steps: - template: darwin/product-build-darwin.yml + parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: false + VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} + VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} + VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }} + + - ${{ if eq(variables['VSCODE_PUBLISH'], true) }}: - job: macOSSign dependsOn: - macOS @@ -360,6 +645,15 @@ stages: steps: - template: darwin/product-build-darwin-sign.yml + - ${{ if and(eq(variables['VSCODE_PUBLISH'], true), eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true)) }}: + - job: macOSCLISign + timeoutInMinutes: 90 + steps: + - template: darwin/product-build-darwin-cli-sign.yml + parameters: + VSCODE_BUILD_MACOS: ${{ parameters.VSCODE_BUILD_MACOS }} + VSCODE_BUILD_MACOS_ARM64: ${{ parameters.VSCODE_BUILD_MACOS_ARM64 }} + - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}: - job: macOSARM64 timeoutInMinutes: 90 @@ -367,7 +661,15 @@ stages: VSCODE_ARCH: arm64 steps: - template: darwin/product-build-darwin.yml - - ${{ if eq(variables['VSCODE_CIBUILD'], false) }}: + parameters: + VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }} + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + VSCODE_BUILD_TUNNEL_CLI: ${{ parameters.VSCODE_BUILD_TUNNEL_CLI }} + VSCODE_RUN_UNIT_TESTS: false + VSCODE_RUN_INTEGRATION_TESTS: false + VSCODE_RUN_SMOKE_TESTS: false + + - ${{ if eq(variables['VSCODE_PUBLISH'], true) }}: - job: macOSARM64Sign dependsOn: - macOSARM64 @@ -387,7 +689,8 @@ stages: VSCODE_ARCH: universal steps: - template: darwin/product-build-darwin-universal.yml - - ${{ if eq(variables['VSCODE_CIBUILD'], false) }}: + + - ${{ if eq(variables['VSCODE_PUBLISH'], true) }}: - job: macOSUniversalSign dependsOn: - macOSUniversal @@ -397,6 +700,19 @@ stages: steps: - template: darwin/product-build-darwin-sign.yml + - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_WEB'], true)) }}: + - stage: Web + dependsOn: + - Compile + pool: vscode-1es-linux + jobs: + - ${{ if eq(parameters.VSCODE_BUILD_WEB, true) }}: + - job: Web + variables: + VSCODE_ARCH: x64 + steps: + - template: web/product-build-web.yml + - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), ne(variables['VSCODE_PUBLISH'], 'false')) }}: - stage: Publish dependsOn: @@ -412,13 +728,33 @@ stages: steps: - template: product-publish.yml + - ${{ if and(parameters.VSCODE_RELEASE, eq(parameters.VSCODE_DISTRO_REF, ' ')) }}: + - stage: ApproveRelease + dependsOn: [] # run in parallel to compile stage + pool: vscode-1es-linux + jobs: + - deployment: ApproveRelease + displayName: "Approve Release" + environment: "vscode" + variables: + skipComponentGovernanceDetection: true + strategy: + runOnce: + deploy: + steps: + - checkout: none + - ${{ if or(and(parameters.VSCODE_RELEASE, eq(parameters.VSCODE_DISTRO_REF, ' ')), and(in(parameters.VSCODE_QUALITY, 'insider', 'exploration'), eq(variables['VSCODE_SCHEDULEDBUILD'], true))) }}: - stage: Release dependsOn: - Publish + - ${{ if and(parameters.VSCODE_RELEASE, eq(parameters.VSCODE_DISTRO_REF, ' ')) }}: + - ApproveRelease pool: vscode-1es-linux jobs: - job: ReleaseBuild displayName: Release Build steps: - template: product-release.yml + parameters: + VSCODE_RELEASE: ${{ parameters.VSCODE_RELEASE }} diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml index 1fd9b0441de..9da22cba292 100644 --- a/build/azure-pipelines/product-compile.yml +++ b/build/azure-pipelines/product-compile.yml @@ -7,45 +7,18 @@ steps: inputs: versionSpec: "16.x" - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: AzureKeyVault@1 - displayName: "Azure Key Vault: Get Secrets" - inputs: - azureSubscription: "vscode-builds-subscription" - KeyVaultName: vscode - SecretsFilter: "github-distro-mixin-password" + - template: ./mixin-distro-posix.yml + parameters: + VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }} - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - cat << EOF > ~/.netrc - machine github.com - login vscode - password $(github-distro-mixin-password) - EOF - - git config user.email "vscode@microsoft.com" - git config user.name "VSCode" - displayName: Prepare tooling - - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF - echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)" - git checkout FETCH_HEAD - condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' ')) - displayName: Checkout override commit - - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") - displayName: Merge distro + - script: node build/setup-npm-registry.js $NPM_REGISTRY + condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Registry - script: | mkdir -p .build - node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash + node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH > .build/yarnlockhash + node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash displayName: Prepare yarn cache flags # using `genericNodeModules` instead of `nodeModules` here to avoid sharing the cache with builds running inside containers @@ -56,6 +29,13 @@ steps: cacheHitVar: NODE_MODULES_RESTORED displayName: Restore node_modules cache + # Cache built-in extensions to avoid GH rate limits. + - task: Cache@2 + inputs: + key: '"builtInDeps" | .build/builtindepshash' + path: .build/builtInExtensions + displayName: Restore built-in extensions + - script: | set -e tar -xzf .build/node_modules_cache/cache.tgz @@ -64,11 +44,17 @@ steps: - script: | set -e - npx https://aka.ms/enablesecurefeed standAlone - timeoutInMinutes: 5 - retryCountOnTaskFailure: 3 - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true')) - displayName: Switch to Terrapin packages + npm config set registry "$NPM_REGISTRY" --location=project + npm config set always-auth=true --location=project + yarn config set registry "$NPM_REGISTRY" + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM & Yarn + + - task: npmAuthenticate@0 + inputs: + workingFile: .npmrc + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Authentication - script: | set -e @@ -79,7 +65,7 @@ steps: - script: | set -e - for i in {1..3}; do # try 3 times, for Terrapin + for i in {1..3}; do # try 3 times yarn --frozen-lockfile --check-files && break if [ $i -eq 3 ]; then echo "Yarn failed too many times" >&2 @@ -94,6 +80,13 @@ steps: displayName: Install dependencies condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + - script: | + set -e + node build/lib/builtInExtensions.js + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Download missing built-in extensions + - script: | set -e node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt @@ -103,75 +96,85 @@ steps: displayName: Create node_modules archive - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - # Mixin must run before optimize, because the CSS loader will inline small SVGs - - script: | - set -e - node build/azure-pipelines/mixin - displayName: Mix in quality + # Mixin must run before optimize, because the CSS loader will inline small SVGs + - script: | + set -e + node build/azure-pipelines/mixin + displayName: Mix in quality - script: | set -e - yarn npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check + yarn npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check env: GITHUB_TOKEN: "$(github-distro-mixin-password)" displayName: Compile & Hygiene - - script: | - set -e - yarn --cwd test/smoke compile - yarn --cwd test/integration/browser compile - displayName: Compile test suites - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + yarn --cwd build compile + ./.github/workflows/check-clean-git-state.sh + displayName: Check /build/ folder - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: AzureCLI@2 - inputs: - azureSubscription: "vscode-builds-subscription" - scriptType: pscore - scriptLocation: inlineScript - addSpnToEnvironment: true - inlineScript: | - Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId" - Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId" - Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey" + - script: | + set -e + yarn --cwd test/smoke compile + yarn --cwd test/integration/browser compile + displayName: Compile test suites + condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - AZURE_STORAGE_ACCOUNT="ticino" \ - AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \ - AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \ - AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \ - node build/azure-pipelines/upload-sourcemaps - displayName: Upload sourcemaps + - task: AzureCLI@2 + inputs: + azureSubscription: "vscode-builds-subscription" + scriptType: pscore + scriptLocation: inlineScript + addSpnToEnvironment: true + inlineScript: | + Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId" + Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId" + Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey" - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set - - ./build/azure-pipelines/common/extract-telemetry.sh - displayName: Extract Telemetry - - - script: | - set -e - tar -cz --ignore-failed-read -f $(Build.ArtifactStagingDirectory)/compilation.tar.gz .build out-* test/integration/browser/out test/smoke/out test/automation/out - displayName: Compress compilation artifact - - - task: PublishPipelineArtifact@1 - inputs: - targetPath: $(Build.ArtifactStagingDirectory)/compilation.tar.gz - artifactName: Compilation - displayName: Publish compilation artifact + - script: | + set -e + AZURE_STORAGE_ACCOUNT="ticino" \ + AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \ + AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \ + AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \ + node build/azure-pipelines/upload-sourcemaps + displayName: Upload sourcemaps - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn download-builtin-extensions-cg - displayName: Built-in extensions component details + - script: | + set - + ./build/azure-pipelines/common/extract-telemetry.sh + displayName: Extract Telemetry - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 - displayName: "Component Detection" - inputs: - sourceScanPath: $(Build.SourcesDirectory) - continueOnError: true + - script: | + set -e + tar -cz --ignore-failed-read -f $(Build.ArtifactStagingDirectory)/compilation.tar.gz .build out-* test/integration/browser/out test/smoke/out test/automation/out + displayName: Compress compilation artifact + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - task: PublishPipelineArtifact@1 + inputs: + targetPath: $(Build.ArtifactStagingDirectory)/compilation.tar.gz + artifactName: Compilation + displayName: Publish compilation artifact + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: | + set -e + VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + yarn download-builtin-extensions-cg + displayName: Built-in extensions component details + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 + displayName: "Component Detection" + inputs: + sourceScanPath: $(Build.SourcesDirectory) + continueOnError: true diff --git a/build/azure-pipelines/product-publish.ps1 b/build/azure-pipelines/product-publish.ps1 index 5abfed48dca..4e47d7d6cb2 100644 --- a/build/azure-pipelines/product-publish.ps1 +++ b/build/azure-pipelines/product-publish.ps1 @@ -46,6 +46,7 @@ $stages = @( if ($env:VSCODE_BUILD_STAGE_WINDOWS -eq 'True') { 'Windows' } if ($env:VSCODE_BUILD_STAGE_LINUX -eq 'True') { 'Linux' } if ($env:VSCODE_BUILD_STAGE_MACOS -eq 'True') { 'macOS' } + if ($env:VSCODE_BUILD_STAGE_WEB -eq 'True') { 'Web' } ) do { @@ -61,12 +62,15 @@ do { if($set.Add($artifactName)) { Write-Host "Processing artifact: '$artifactName. Downloading from: $($_.resource.downloadUrl)" + $extractPath = "$env:AGENT_TEMPDIRECTORY/$artifactName.zip" try { - Invoke-RestMethod $_.resource.downloadUrl -OutFile "$env:AGENT_TEMPDIRECTORY/$artifactName.zip" -Headers @{ + Invoke-RestMethod $_.resource.downloadUrl -OutFile $extractPath -Headers @{ Authorization = "Bearer $env:SYSTEM_ACCESSTOKEN" - } -MaximumRetryCount 5 -RetryIntervalSec 1 | Out-Null + } -MaximumRetryCount 5 -RetryIntervalSec 1 -TimeoutSec 300 | Out-Null - Expand-Archive -Path "$env:AGENT_TEMPDIRECTORY/$artifactName.zip" -DestinationPath $env:AGENT_TEMPDIRECTORY | Out-Null + Write-Host "Extracting artifact: '$extractPath'" + + Expand-Archive -Path $extractPath -DestinationPath $env:AGENT_TEMPDIRECTORY | Out-Null } catch { Write-Warning $_ $set.Remove($artifactName) | Out-Null @@ -75,6 +79,13 @@ do { $null,$product,$os,$arch,$type = $artifactName -split '_' $asset = Get-ChildItem -rec "$env:AGENT_TEMPDIRECTORY/$artifactName" + + if ($asset.Size -ne $_.resource.properties.artifactsize) { + Write-Warning "Artifact size mismatch for '$artifactName'. Expected: $($_.resource.properties.artifactsize). Actual: $($asset.Size)" + $set.Remove($artifactName) | Out-Null + continue + } + Write-Host "Processing artifact with the following values:" # turning in into an object just to log nicely @{ diff --git a/build/azure-pipelines/product-publish.yml b/build/azure-pipelines/product-publish.yml index 4d711aba120..80076fd666d 100644 --- a/build/azure-pipelines/product-publish.yml +++ b/build/azure-pipelines/product-publish.yml @@ -109,6 +109,7 @@ steps: if ($env:VSCODE_BUILD_STAGE_WINDOWS -eq 'True') { 'Windows' } if ($env:VSCODE_BUILD_STAGE_LINUX -eq 'True') { 'Linux' } if ($env:VSCODE_BUILD_STAGE_MACOS -eq 'True') { 'macOS' } + if ($env:VSCODE_BUILD_STAGE_WEB -eq 'True') { 'Web' } ) Write-Host "Stages to check: $stages" diff --git a/build/azure-pipelines/product-release.yml b/build/azure-pipelines/product-release.yml index a1086945595..8be900a9b41 100644 --- a/build/azure-pipelines/product-release.yml +++ b/build/azure-pipelines/product-release.yml @@ -1,3 +1,7 @@ +parameters: + - name: VSCODE_RELEASE + type: boolean + steps: - task: NodeTool@0 inputs: @@ -20,4 +24,4 @@ steps: AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \ AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \ AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \ - node build/azure-pipelines/common/releaseBuild.js + node build/azure-pipelines/common/releaseBuild.js ${{ parameters.VSCODE_RELEASE }} diff --git a/build/azure-pipelines/publish-types/check-version.js b/build/azure-pipelines/publish-types/check-version.js index b45ad3f4cc0..34779085a79 100644 --- a/build/azure-pipelines/publish-types/check-version.js +++ b/build/azure-pipelines/publish-types/check-version.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); const cp = require("child_process"); let tag = ''; diff --git a/build/azure-pipelines/publish-types/check-version.ts b/build/azure-pipelines/publish-types/check-version.ts index 137e535353a..35c5a511593 100644 --- a/build/azure-pipelines/publish-types/check-version.ts +++ b/build/azure-pipelines/publish-types/check-version.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as cp from 'child_process'; let tag = ''; diff --git a/build/azure-pipelines/publish-types/update-types.js b/build/azure-pipelines/publish-types/update-types.js index e22911b8470..facece095c3 100644 --- a/build/azure-pipelines/publish-types/update-types.js +++ b/build/azure-pipelines/publish-types/update-types.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); const fs = require("fs"); const cp = require("child_process"); diff --git a/build/azure-pipelines/publish-types/update-types.ts b/build/azure-pipelines/publish-types/update-types.ts index 7ccd976dba5..a727647e64a 100644 --- a/build/azure-pipelines/publish-types/update-types.ts +++ b/build/azure-pipelines/publish-types/update-types.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as fs from 'fs'; import * as cp from 'child_process'; import * as path from 'path'; diff --git a/build/azure-pipelines/sdl-scan.yml b/build/azure-pipelines/sdl-scan.yml index f6a44d4862b..460283240e8 100644 --- a/build/azure-pipelines/sdl-scan.yml +++ b/build/azure-pipelines/sdl-scan.yml @@ -2,10 +2,10 @@ trigger: none pr: none parameters: - - name: ENABLE_TERRAPIN - displayName: "Enable Terrapin" - type: boolean - default: true + - name: NPM_REGISTRY + displayName: "Custom NPM Registry" + type: string + default: "https://pkgs.dev.azure.com/monacotools/Monaco/_packaging/vscode/npm/registry/" - name: SCAN_WINDOWS displayName: "Scan Windows" type: boolean @@ -16,8 +16,8 @@ parameters: default: false variables: - - name: ENABLE_TERRAPIN - value: ${{ eq(parameters.ENABLE_TERRAPIN, true) }} + - name: NPM_REGISTRY + value: ${{ parameters.NPM_REGISTRY }} - name: SCAN_WINDOWS value: ${{ eq(parameters.SCAN_WINDOWS, true) }} - name: SCAN_LINUX @@ -83,11 +83,24 @@ stages: - powershell: | . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" - exec { npx https://aka.ms/enablesecurefeed standAlone } - timeoutInMinutes: 5 - retryCountOnTaskFailure: 3 - condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true')) - displayName: Switch to Terrapin packages + exec { npm config set registry "$env:NPM_REGISTRY" --location=project } + exec { npm config set always-auth=true --location=project } + exec { yarn config set registry "$env:NPM_REGISTRY" } + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM & Yarn + + - task: npmAuthenticate@0 + inputs: + workingFile: .npmrc + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Authentication + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { node build/setup-npm-registry.js $env:NPM_REGISTRY } + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Registry - task: Semmle@1 inputs: @@ -184,15 +197,25 @@ stages: - script: | set -e - npx https://aka.ms/enablesecurefeed standAlone - timeoutInMinutes: 5 - retryCountOnTaskFailure: 3 - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true')) - displayName: Switch to Terrapin packages + npm config set registry "$NPM_REGISTRY" --location=project + npm config set always-auth=true --location=project + yarn config set registry "$NPM_REGISTRY" + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM & Yarn + + - task: npmAuthenticate@0 + inputs: + workingFile: .npmrc + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Authentication + + - script: node build/setup-npm-registry.js $NPM_REGISTRY + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Registry - script: | set -e - for i in {1..3}; do # try 3 times, for Terrapin + for i in {1..3}; do # try 3 times yarn --cwd build --frozen-lockfile --check-files && break if [ $i -eq 3 ]; then echo "Yarn failed too many times" >&2 @@ -225,7 +248,7 @@ stages: export VSCODE_REMOTE_CXX=$(which g++) fi - for i in {1..3}; do # try 3 times, for Terrapin + for i in {1..3}; do # try 3 times yarn --frozen-lockfile --check-files && break if [ $i -eq 3 ]; then echo "Yarn failed too many times" >&2 diff --git a/build/azure-pipelines/upload-cdn.js b/build/azure-pipelines/upload-cdn.js index 1bd3ed6f5fd..5a410547456 100644 --- a/build/azure-pipelines/upload-cdn.js +++ b/build/azure-pipelines/upload-cdn.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); const es = require("event-stream"); const Vinyl = require("vinyl"); diff --git a/build/azure-pipelines/upload-cdn.ts b/build/azure-pipelines/upload-cdn.ts index 9ac656e7c26..ddb03c1e839 100644 --- a/build/azure-pipelines/upload-cdn.ts +++ b/build/azure-pipelines/upload-cdn.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as es from 'event-stream'; import * as Vinyl from 'vinyl'; import * as vfs from 'vinyl-fs'; diff --git a/build/azure-pipelines/upload-configuration.js b/build/azure-pipelines/upload-configuration.js index 8be7f4492cc..7ee4c8370ce 100644 --- a/build/azure-pipelines/upload-configuration.js +++ b/build/azure-pipelines/upload-configuration.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); exports.getSettingsSearchBuildId = exports.shouldSetupSettingsSearch = void 0; const path = require("path"); @@ -52,7 +52,7 @@ function generateVSCodeConfigurationTask() { const timer = setTimeout(() => { codeProc.kill(); reject(new Error('export-default-configuration process timed out')); - }, 30 * 1000); + }, 60 * 1000); codeProc.on('error', err => { clearTimeout(timer); reject(err); diff --git a/build/azure-pipelines/upload-configuration.ts b/build/azure-pipelines/upload-configuration.ts index 49bc00fc46f..1455cfca78f 100644 --- a/build/azure-pipelines/upload-configuration.ts +++ b/build/azure-pipelines/upload-configuration.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as path from 'path'; import * as os from 'os'; import * as cp from 'child_process'; @@ -63,7 +61,7 @@ function generateVSCodeConfigurationTask(): Promise { const timer = setTimeout(() => { codeProc.kill(); reject(new Error('export-default-configuration process timed out')); - }, 30 * 1000); + }, 60 * 1000); codeProc.on('error', err => { clearTimeout(timer); diff --git a/build/azure-pipelines/upload-nlsmetadata.js b/build/azure-pipelines/upload-nlsmetadata.js index a17b8e71267..c92cd277d85 100644 --- a/build/azure-pipelines/upload-nlsmetadata.js +++ b/build/azure-pipelines/upload-nlsmetadata.js @@ -1,14 +1,16 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); const es = require("event-stream"); const vfs = require("vinyl-fs"); const merge = require("gulp-merge-json"); const gzip = require("gulp-gzip"); const identity_1 = require("@azure/identity"); +const path = require("path"); +const fs_1 = require("fs"); const azure = require('gulp-azure-storage'); const commit = process.env['VSCODE_DISTRO_COMMIT'] || process.env['BUILD_SOURCEVERSION']; const credential = new identity_1.ClientSecretCredential(process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], process.env['AZURE_CLIENT_SECRET']); @@ -18,8 +20,8 @@ function main() { .pipe(merge({ fileName: 'combined.nls.metadata.json', jsonSpace: '', + concatArrays: true, edit: (parsedJson, file) => { - let key; if (file.base === 'out-vscode-web-min') { return { vscode: parsedJson }; } @@ -63,7 +65,11 @@ function main() { break; } } - key = 'vscode.' + file.relative.split('/')[0]; + // Get extension id and use that as the key + const folderPath = path.join(file.base, file.relative.split('/')[0]); + const manifest = (0, fs_1.readFileSync)(path.join(folderPath, 'package.json'), 'utf-8'); + const manifestJson = JSON.parse(manifest); + const key = manifestJson.publisher + '.' + manifestJson.name; return { [key]: parsedJson }; }, })) diff --git a/build/azure-pipelines/upload-nlsmetadata.ts b/build/azure-pipelines/upload-nlsmetadata.ts index f1d5b5f4d8b..4749e1f9605 100644 --- a/build/azure-pipelines/upload-nlsmetadata.ts +++ b/build/azure-pipelines/upload-nlsmetadata.ts @@ -3,14 +3,14 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as es from 'event-stream'; import * as Vinyl from 'vinyl'; import * as vfs from 'vinyl-fs'; import * as merge from 'gulp-merge-json'; import * as gzip from 'gulp-gzip'; import { ClientSecretCredential } from '@azure/identity'; +import path = require('path'); +import { readFileSync } from 'fs'; const azure = require('gulp-azure-storage'); const commit = process.env['VSCODE_DISTRO_COMMIT'] || process.env['BUILD_SOURCEVERSION']; @@ -33,8 +33,8 @@ function main(): Promise { .pipe(merge({ fileName: 'combined.nls.metadata.json', jsonSpace: '', + concatArrays: true, edit: (parsedJson, file) => { - let key; if (file.base === 'out-vscode-web-min') { return { vscode: parsedJson }; } @@ -82,7 +82,12 @@ function main(): Promise { break; } } - key = 'vscode.' + file.relative.split('/')[0]; + + // Get extension id and use that as the key + const folderPath = path.join(file.base, file.relative.split('/')[0]); + const manifest = readFileSync(path.join(folderPath, 'package.json'), 'utf-8'); + const manifestJson = JSON.parse(manifest); + const key = manifestJson.publisher + '.' + manifestJson.name; return { [key]: parsedJson }; }, })) @@ -113,4 +118,3 @@ main().catch(err => { console.error(err); process.exit(1); }); - diff --git a/build/azure-pipelines/upload-sourcemaps.js b/build/azure-pipelines/upload-sourcemaps.js index 22e3e28290d..b852cb958eb 100644 --- a/build/azure-pipelines/upload-sourcemaps.js +++ b/build/azure-pipelines/upload-sourcemaps.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); const path = require("path"); const es = require("event-stream"); diff --git a/build/azure-pipelines/upload-sourcemaps.ts b/build/azure-pipelines/upload-sourcemaps.ts index e78e783c064..1f76c4c73f4 100644 --- a/build/azure-pipelines/upload-sourcemaps.ts +++ b/build/azure-pipelines/upload-sourcemaps.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as path from 'path'; import * as es from 'event-stream'; import * as Vinyl from 'vinyl'; diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml index fa07a82305d..092b3a13aff 100644 --- a/build/azure-pipelines/web/product-build-web.yml +++ b/build/azure-pipelines/web/product-build-web.yml @@ -46,9 +46,14 @@ steps: git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") displayName: Merge distro + - script: node build/setup-npm-registry.js $NPM_REGISTRY + condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Registry + - script: | mkdir -p .build - node build/azure-pipelines/common/computeNodeModulesCacheKey.js "web" $ENABLE_TERRAPIN > .build/yarnlockhash + node build/azure-pipelines/common/computeNodeModulesCacheKey.js "web" > .build/yarnlockhash + node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash displayName: Prepare yarn cache flags - task: Cache@2 @@ -58,6 +63,12 @@ steps: cacheHitVar: NODE_MODULES_RESTORED displayName: Restore node_modules cache + - task: Cache@2 + inputs: + key: '"builtInDeps" | .build/builtindepshash' + path: .build/builtInExtensions + displayName: Restore built-in extensions + - script: | set -e tar -xzf .build/node_modules_cache/cache.tgz @@ -66,15 +77,21 @@ steps: - script: | set -e - npx https://aka.ms/enablesecurefeed standAlone - timeoutInMinutes: 5 - retryCountOnTaskFailure: 3 - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true')) - displayName: Switch to Terrapin packages + npm config set registry "$NPM_REGISTRY" --location=project + npm config set always-auth=true --location=project + yarn config set registry "$NPM_REGISTRY" + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM & Yarn + + - task: npmAuthenticate@0 + inputs: + workingFile: .npmrc + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Authentication - script: | set -e - for i in {1..3}; do # try 3 times, for Terrapin + for i in {1..3}; do # try 3 times yarn --frozen-lockfile --check-files && break if [ $i -eq 3 ]; then echo "Yarn failed too many times" >&2 @@ -89,6 +106,13 @@ steps: displayName: Install dependencies condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + - script: | + set -e + node build/lib/builtInExtensions.js + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Download missing built-in extensions + - script: | set -e node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt @@ -163,6 +187,7 @@ steps: cd $ROOT && tar --owner=0 --group=0 -czf $WEB_TARBALL_PATH $WEB_BUILD_NAME displayName: Prepare for publish + condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) - publish: $(Agent.BuildDirectory)/vscode-web.tar.gz artifact: vscode_web_linux_standalone_archive-unsigned diff --git a/build/azure-pipelines/win32/cli-build-win32.yml b/build/azure-pipelines/win32/cli-build-win32.yml new file mode 100644 index 00000000000..d581591730a --- /dev/null +++ b/build/azure-pipelines/win32/cli-build-win32.yml @@ -0,0 +1,83 @@ +parameters: + - name: VSCODE_BUILD_WIN32 + type: boolean + default: false + - name: VSCODE_BUILD_WIN32_32BIT + type: boolean + default: false + - name: VSCODE_BUILD_WIN32_ARM64 + type: boolean + default: false + - name: VSCODE_QUALITY + type: string + - name: channel + type: string + default: stable + +steps: + - task: Npm@1 + displayName: Download openssl prebuilt + inputs: + command: custom + customCommand: pack @vscode-internal/openssl-prebuilt@0.0.1 + customRegistry: useFeed + customFeed: 'Monaco/openssl-prebuilt' + workingDir: $(Build.ArtifactStagingDirectory) + + - powershell: | + mkdir $(Build.ArtifactStagingDirectory)/openssl + tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.1.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl + displayName: Extract openssl prebuilt + + - task: NodeTool@0 + inputs: + versionSpec: "16.x" + + - template: ../mixin-distro-win32.yml + parameters: + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { node build/azure-pipelines/cli/prepare.js } + displayName: Prepare CLI build + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + + - template: ../cli/install-rust-win32.yml + parameters: + targets: + - ${{ if eq(parameters.VSCODE_BUILD_WIN32, true) }}: + - x86_64-pc-windows-msvc + - ${{ if eq(parameters.VSCODE_BUILD_WIN32_ARM64, true) }}: + - aarch64-pc-windows-msvc + - ${{ if eq(parameters.VSCODE_BUILD_WIN32_32BIT, true) }}: + - i686-pc-windows-msvc + + - ${{ if eq(parameters.VSCODE_BUILD_WIN32, true) }}: + - template: ../cli/cli-compile-and-publish.yml + parameters: + VSCODE_CLI_TARGET: x86_64-pc-windows-msvc + VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_win32_x64_cli + VSCODE_CLI_ENV: + OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-windows-static-md/lib + OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-windows-static-md/include + + - ${{ if eq(parameters.VSCODE_BUILD_WIN32_ARM64, true) }}: + - template: ../cli/cli-compile-and-publish.yml + parameters: + VSCODE_CLI_TARGET: aarch64-pc-windows-msvc + VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_win32_arm64_cli + VSCODE_CLI_ENV: + OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-windows-static-md/lib + OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-windows-static-md/include + + - ${{ if eq(parameters.VSCODE_BUILD_WIN32_32BIT, true) }}: + - template: ../cli/cli-compile-and-publish.yml + parameters: + VSCODE_CLI_TARGET: i686-pc-windows-msvc + VSCODE_CLI_ARTIFACT: unsigned_vscode_cli_win32_ia32_cli + VSCODE_CLI_ENV: + OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x86-windows-static-md/lib + OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x86-windows-static-md/include diff --git a/build/azure-pipelines/win32/product-build-win32-cli-sign.yml b/build/azure-pipelines/win32/product-build-win32-cli-sign.yml new file mode 100644 index 00000000000..b3e7cf3764a --- /dev/null +++ b/build/azure-pipelines/win32/product-build-win32-cli-sign.yml @@ -0,0 +1,29 @@ +parameters: + - name: VSCODE_BUILD_WIN32 + type: boolean + - name: VSCODE_BUILD_WIN32_ARM64 + type: boolean + - name: VSCODE_BUILD_WIN32_32BIT + type: boolean + +steps: + - task: NodeTool@0 + displayName: "Use Node.js" + inputs: + versionSpec: "16.x" + + - pwsh: | + . build/azure-pipelines/win32/exec.ps1 + cd build + exec { yarn } + displayName: Install build dependencies + + - template: ../cli/cli-win32-sign.yml + parameters: + VSCODE_CLI_ARTIFACTS: + - ${{ if eq(parameters.VSCODE_BUILD_WIN32, true) }}: + - unsigned_vscode_cli_win32_x64_cli + - ${{ if eq(parameters.VSCODE_BUILD_WIN32_ARM64, true) }}: + - unsigned_vscode_cli_win32_arm64_cli + - ${{ if eq(parameters.VSCODE_BUILD_WIN32_32BIT, true) }}: + - unsigned_vscode_cli_win32_ia32_cli diff --git a/build/azure-pipelines/win32/product-build-win32-test.yml b/build/azure-pipelines/win32/product-build-win32-test.yml new file mode 100644 index 00000000000..9a17a88bca7 --- /dev/null +++ b/build/azure-pipelines/win32/product-build-win32-test.yml @@ -0,0 +1,251 @@ +parameters: + - name: VSCODE_QUALITY + type: string + - name: VSCODE_RUN_UNIT_TESTS + type: boolean + - name: VSCODE_RUN_INTEGRATION_TESTS + type: boolean + - name: VSCODE_RUN_SMOKE_TESTS + type: boolean + +steps: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" + exec { yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install" } + displayName: Download Electron and Playwright + + - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { yarn electron $(VSCODE_ARCH) } + exec { .\scripts\test.bat --tfs "Unit Tests" } + displayName: Run unit tests (Electron) + timeoutInMinutes: 15 + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { yarn test-node } + displayName: Run unit tests (node.js) + timeoutInMinutes: 15 + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { node test/unit/browser/index.js --sequential --browser chromium --tfs "Browser Unit Tests" } + displayName: Run unit tests (Browser, Chromium) + timeoutInMinutes: 20 + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { yarn electron $(VSCODE_ARCH) } + exec { .\scripts\test.bat --build --tfs "Unit Tests" } + displayName: Run unit tests (Electron) + timeoutInMinutes: 15 + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { yarn test-node --build } + displayName: Run unit tests (node.js) + timeoutInMinutes: 15 + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { yarn test-browser-no-install --sequential --build --browser chromium --tfs "Browser Unit Tests" } + displayName: Run unit tests (Browser, Chromium) + timeoutInMinutes: 20 + + - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { yarn gulp ` + compile-extension:configuration-editing ` + compile-extension:css-language-features-server ` + compile-extension:emmet ` + compile-extension:git ` + compile-extension:github-authentication ` + compile-extension:html-language-features-server ` + compile-extension:ipynb ` + compile-extension:json-language-features-server ` + compile-extension:markdown-language-features-server ` + compile-extension:markdown-language-features ` + compile-extension-media ` + compile-extension:microsoft-authentication ` + compile-extension:typescript-language-features ` + compile-extension:vscode-api-tests ` + compile-extension:vscode-colorize-tests ` + compile-extension:vscode-test-resolver ` + } + displayName: Build integration tests + + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { .\scripts\test-integration.bat --tfs "Integration Tests" } + displayName: Run integration tests (Electron) + timeoutInMinutes: 20 + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { .\scripts\test-web-integration.bat --browser firefox } + displayName: Run integration tests (Browser, Firefox) + timeoutInMinutes: 20 + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { .\scripts\test-remote-integration.bat } + displayName: Run integration tests (Remote) + timeoutInMinutes: 20 + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - powershell: | + # Figure out the full absolute path of the product we just built + # including the remote server and configure the integration tests + # to run with these builds instead of running out of sources. + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)" + $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json + $AppNameShort = $AppProductJson.nameShort + exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\scripts\test-integration.bat --build --tfs "Integration Tests" } + displayName: Run integration tests (Electron) + timeoutInMinutes: 20 + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"; .\scripts\test-web-integration.bat --browser firefox } + displayName: Run integration tests (Browser, Firefox) + timeoutInMinutes: 20 + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)" + $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json + $AppNameShort = $AppProductJson.nameShort + exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\scripts\test-remote-integration.bat } + displayName: Run integration tests (Remote) + timeoutInMinutes: 20 + + - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + exec {.\build\azure-pipelines\win32\listprocesses.bat } + displayName: Diagnostics before smoke test run + continueOnError: true + condition: succeededOrFailed() + + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { yarn --cwd test/smoke compile } + displayName: Compile smoke tests + + - script: | + set -e + yarn gulp compile-extension-media + displayName: Build extensions for smoke tests + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { yarn smoketest-no-compile --tracing } + displayName: Run smoke tests (Electron) + timeoutInMinutes: 20 + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)" + exec { yarn smoketest-no-compile --tracing --build "$AppRoot" } + displayName: Run smoke tests (Electron) + timeoutInMinutes: 20 + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)" + exec { yarn smoketest-no-compile --web --tracing --headless } + displayName: Run smoke tests (Browser, Chromium) + timeoutInMinutes: 20 + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)" + $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)" + exec { yarn gulp compile-extension:vscode-test-resolver } + exec { yarn smoketest-no-compile --tracing --remote --build "$AppRoot" } + displayName: Run smoke tests (Remote) + timeoutInMinutes: 20 + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + exec {.\build\azure-pipelines\win32\listprocesses.bat } + displayName: Diagnostics after smoke test run + continueOnError: true + condition: succeededOrFailed() + + - ${{ if or(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + - task: PublishPipelineArtifact@0 + inputs: + targetPath: .build\crashes + ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + artifactName: crash-dump-windows-$(VSCODE_ARCH)-integration-$(System.JobAttempt) + ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + artifactName: crash-dump-windows-$(VSCODE_ARCH)-smoke-$(System.JobAttempt) + ${{ else }}: + artifactName: crash-dump-windows-$(VSCODE_ARCH)-$(System.JobAttempt) + displayName: "Publish Crash Reports" + continueOnError: true + condition: failed() + + # In order to properly symbolify above crash reports + # (if any), we need the compiled native modules too + - task: PublishPipelineArtifact@0 + inputs: + targetPath: node_modules + ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + artifactName: node-modules-windows-$(VSCODE_ARCH)-integration-$(System.JobAttempt) + ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + artifactName: node-modules-windows-$(VSCODE_ARCH)-smoke-$(System.JobAttempt) + ${{ else }}: + artifactName: node-modules-windows-$(VSCODE_ARCH)-$(System.JobAttempt) + displayName: "Publish Node Modules" + continueOnError: true + condition: failed() + + - task: PublishPipelineArtifact@0 + inputs: + targetPath: .build\logs + ${{ if and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + artifactName: logs-windows-$(VSCODE_ARCH)-integration-$(System.JobAttempt) + ${{ elseif and(eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + artifactName: logs-windows-$(VSCODE_ARCH)-smoke-$(System.JobAttempt) + ${{ else }}: + artifactName: logs-windows-$(VSCODE_ARCH)-$(System.JobAttempt) + displayName: "Publish Log Files" + continueOnError: true + condition: succeededOrFailed() + + - task: PublishTestResults@2 + displayName: Publish Tests Results + inputs: + testResultsFiles: "*-results.xml" + searchFolder: "$(Build.ArtifactStagingDirectory)/test-results" + condition: succeededOrFailed() diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index 7501869b57d..9f62ea0a0c3 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -1,17 +1,23 @@ parameters: + - name: VSCODE_PUBLISH + type: boolean - name: VSCODE_QUALITY type: string - name: VSCODE_RUN_UNIT_TESTS type: boolean - default: true - name: VSCODE_RUN_INTEGRATION_TESTS type: boolean - default: true - name: VSCODE_RUN_SMOKE_TESTS type: boolean - default: true + - name: VSCODE_BUILD_TUNNEL_CLI + type: boolean steps: + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - checkout: self + fetchDepth: 1 + retryCountOnTaskFailure: 3 + - task: NodeTool@0 inputs: versionSpec: "16.x" @@ -22,66 +28,82 @@ steps: addToPath: true - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: AzureKeyVault@1 - displayName: "Azure Key Vault: Get Secrets" - inputs: - azureSubscription: "vscode-builds-subscription" - KeyVaultName: vscode - SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password" - - - task: DownloadPipelineArtifact@2 - inputs: - artifact: Compilation - path: $(Build.ArtifactStagingDirectory) - displayName: Download compilation output - - - task: ExtractFiles@1 - displayName: Extract compilation output - inputs: - archiveFilePatterns: "$(Build.ArtifactStagingDirectory)/compilation.tar.gz" - cleanDestinationFolder: false + - task: AzureKeyVault@1 + displayName: "Azure Key Vault: Get Secrets" + inputs: + azureSubscription: "vscode-builds-subscription" + KeyVaultName: vscode + SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password" - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - "machine github.com`nlogin vscode`npassword $(github-distro-mixin-password)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII - - exec { git config user.email "vscode@microsoft.com" } - exec { git config user.name "VSCode" } - displayName: Prepare tooling + - task: DownloadPipelineArtifact@2 + inputs: + artifact: Compilation + path: $(Build.ArtifactStagingDirectory) + displayName: Download compilation output - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - - exec { git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $(VSCODE_DISTRO_REF) } - Write-Host "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)" - exec { git checkout FETCH_HEAD } - condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' ')) - displayName: Checkout override commit + - task: ExtractFiles@1 + displayName: Extract compilation output + inputs: + archiveFilePatterns: "$(Build.ArtifactStagingDirectory)/compilation.tar.gz" + cleanDestinationFolder: false - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - exec { git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") } - displayName: Merge distro + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + "machine github.com`nlogin vscode`npassword $(github-distro-mixin-password)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII + + exec { git config user.email "vscode@microsoft.com" } + exec { git config user.name "VSCode" } + displayName: Prepare tooling + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + + exec { git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $(VSCODE_DISTRO_REF) } + Write-Host "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)" + exec { git checkout FETCH_HEAD } + condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' ')) + displayName: Checkout override commit + + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") } + displayName: Merge distro - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { node build/setup-npm-registry.js $env:NPM_REGISTRY } + condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Registry + + - powershell: | + if (!(Test-Path ".build")) { New-Item -Path ".build" -ItemType Directory } "$(VSCODE_ARCH)" | Out-File -Encoding ascii -NoNewLine .build\arch - "$env:ENABLE_TERRAPIN" | Out-File -Encoding ascii -NoNewLine .build\terrapin node build/azure-pipelines/common/computeNodeModulesCacheKey.js > .build/yarnlockhash + node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash displayName: Prepare yarn cache flags - task: Cache@2 inputs: - key: "nodeModules | $(Agent.OS) | .build/arch, .build/terrapin, .build/yarnlockhash" + key: "nodeModules | $(Agent.OS) | .build/arch, .build/yarnlockhash" path: .build/node_modules_cache cacheHitVar: NODE_MODULES_RESTORED displayName: Restore node_modules cache + - task: Cache@2 + inputs: + key: '"builtInDeps" | .build/builtindepshash' + path: .build/builtInExtensions + displayName: Restore built-in extensions + - powershell: | . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" @@ -92,11 +114,17 @@ steps: - powershell: | . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" - exec { npx https://aka.ms/enablesecurefeed standAlone } - timeoutInMinutes: 5 - retryCountOnTaskFailure: 3 - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true')) - displayName: Switch to Terrapin packages + exec { npm config set registry "$env:NPM_REGISTRY" --location=project } + exec { npm config set always-auth=true --location=project } + exec { yarn config set registry "$env:NPM_REGISTRY" } + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM & Yarn + + - task: npmAuthenticate@0 + inputs: + workingFile: .npmrc + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Authentication - powershell: | . build/azure-pipelines/win32/exec.ps1 @@ -112,6 +140,14 @@ steps: displayName: Install dependencies condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { node build/lib/builtInExtensions.js } + env: + GITHUB_TOKEN: "$(github-distro-mixin-password)" + displayName: Download missing built-in extensions + - powershell: | . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" @@ -122,346 +158,229 @@ steps: displayName: Create node_modules archive - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - exec { node build/azure-pipelines/mixin } - displayName: Mix in quality + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { node build/azure-pipelines/mixin } + displayName: Mix in quality - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" - exec { yarn npm-run-all -lp "electron $(VSCODE_ARCH)" } - displayName: Download Electron - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { node build\lib\policies } + displayName: Generate Group Policy definitions + retryCountOnTaskFailure: 3 - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" - exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-min-ci" } - echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)" - displayName: Build + - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" + exec { yarn gulp "transpile-client-swc" "transpile-extensions" } + displayName: Transpile + + - ${{ if eq(parameters.VSCODE_QUALITY, 'insider') }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $env:VSCODE_EXPLORER_APPX_DIR=$(Join-Path $pwd.Path ".build/win32/appx") + exec { node build/win32/explorer-appx-fetcher } + env: + VSCODE_ARCH: "$(VSCODE_ARCH)" + displayName: Download Explorer Sparse Package + condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" - exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" } - displayName: Prepare Package - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" + exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-min-ci" } + echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)" + displayName: Build + + - ${{ if eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true) }}: + - task: DownloadPipelineArtifact@2 + inputs: + artifact: unsigned_vscode_cli_win32_arm64_cli + patterns: "**" + path: $(Build.ArtifactStagingDirectory)/cli + displayName: Download VS Code CLI + condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64')) + + - task: DownloadPipelineArtifact@2 + inputs: + artifact: unsigned_vscode_cli_win32_x64_cli + patterns: "**" + path: $(Build.ArtifactStagingDirectory)/cli + displayName: Download VS Code CLI + condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) + + - task: DownloadPipelineArtifact@2 + inputs: + artifact: unsigned_vscode_cli_win32_ia32_cli + patterns: "**" + path: $(Build.ArtifactStagingDirectory)/cli + displayName: Download VS Code CLI + condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'ia32')) + + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $ArtifactName = (gci -Path "$(Build.ArtifactStagingDirectory)/cli" | Select-Object -last 1).FullName + Expand-Archive -Path $ArtifactName -DestinationPath "$(Build.ArtifactStagingDirectory)/cli" + $AppProductJson = Get-Content -Raw -Path "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)\resources\app\product.json" | ConvertFrom-Json + $CliAppName = $AppProductJson.tunnelApplicationName + Move-Item -Path "$(Build.ArtifactStagingDirectory)/cli/code.exe" -Destination "$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)/bin/$CliAppName.exe" + displayName: Move VS Code CLI + + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" + exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" } + displayName: Prepare Package - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - exec { node build/azure-pipelines/mixin --server } - displayName: Mix in quality - - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" - exec { yarn gulp "vscode-reh-win32-$(VSCODE_ARCH)-min-ci" } - exec { yarn gulp "vscode-reh-web-win32-$(VSCODE_ARCH)-min-ci" } - echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(CodeSigningFolderPath),$(agent.builddirectory)/vscode-reh-win32-$(VSCODE_ARCH)" - displayName: Build Server - condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) - - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" - exec { yarn npm-run-all -lp "playwright-install" } - displayName: Download Playwright - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) - - - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - exec { yarn electron $(VSCODE_ARCH) } - exec { .\scripts\test.bat --build --tfs "Unit Tests" } - displayName: Run unit tests (Electron) - timeoutInMinutes: 15 - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) - - - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - exec { yarn test-node --build } - displayName: Run unit tests (node.js) - timeoutInMinutes: 15 - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) - - - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - exec { yarn test-browser-no-install --sequential --build --browser chromium --browser firefox --tfs "Browser Unit Tests" } - displayName: Run unit tests (Browser, Chromium & Firefox) - timeoutInMinutes: 20 - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) - - - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - exec { yarn gulp ` - compile-extension:css-language-features-server ` - compile-extension:emmet ` - compile-extension:git ` - compile-extension:github-authentication ` - compile-extension:html-language-features-server ` - compile-extension:ipynb ` - compile-extension:json-language-features-server ` - compile-extension:markdown-language-features ` - compile-extension-media ` - compile-extension:microsoft-authentication ` - compile-extension:typescript-language-features ` - compile-extension:vscode-api-tests ` - compile-extension:vscode-colorize-tests ` - compile-extension:vscode-custom-editor-tests ` - compile-extension:vscode-notebook-tests ` - compile-extension:vscode-test-resolver ` - } - displayName: Build integration tests - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) - - - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: - - powershell: | - # Figure out the full absolute path of the product we just built - # including the remote server and configure the integration tests - # to run with these builds instead of running out of sources. - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)" - $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json - $AppNameShort = $AppProductJson.nameShort - exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\scripts\test-integration.bat --build --tfs "Integration Tests" } - displayName: Run integration tests (Electron) - timeoutInMinutes: 20 - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) - - - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - exec { $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"; .\scripts\test-web-integration.bat --browser firefox } - displayName: Run integration tests (Browser, Firefox) - timeoutInMinutes: 20 - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) - - - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)" - $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json - $AppNameShort = $AppProductJson.nameShort - exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\scripts\test-remote-integration.bat } - displayName: Run integration tests (Remote) - timeoutInMinutes: 20 - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) - - - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - exec {.\build\azure-pipelines\win32\listprocesses.bat } - displayName: Diagnostics before smoke test run - continueOnError: true - condition: and(succeededOrFailed(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)" - exec { yarn smoketest-no-compile --web --tracing --headless } - displayName: Run smoke tests (Browser, Chromium) - timeoutInMinutes: 20 - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) - - - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)" - exec { yarn smoketest-no-compile --tracing --build "$AppRoot" } - displayName: Run smoke tests (Electron) - timeoutInMinutes: 20 - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) - - - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)" - $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)" - exec { yarn gulp compile-extension:vscode-test-resolver } - exec { yarn smoketest-no-compile --tracing --remote --build "$AppRoot" } - displayName: Run smoke tests (Remote) - timeoutInMinutes: 20 - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) - - - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - exec {.\build\azure-pipelines\win32\listprocesses.bat } - displayName: Diagnostics after smoke test run - continueOnError: true - condition: and(succeededOrFailed(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - - - task: PublishPipelineArtifact@0 - inputs: - artifactName: crash-dump-windows-$(VSCODE_ARCH) - targetPath: .build\crashes - displayName: "Publish Crash Reports" - continueOnError: true - condition: failed() - - # In order to properly symbolify above crash reports - # (if any), we need the compiled native modules too - - task: PublishPipelineArtifact@0 - inputs: - artifactName: node-modules-windows-$(VSCODE_ARCH) - targetPath: node_modules - displayName: "Publish Node Modules" - continueOnError: true - condition: failed() - - - task: PublishPipelineArtifact@0 - inputs: - artifactName: logs-windows-$(VSCODE_ARCH)-$(System.JobAttempt) - targetPath: .build\logs - displayName: "Publish Log Files" - continueOnError: true - condition: and(failed(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) - - - task: PublishTestResults@2 - displayName: Publish Tests Results - inputs: - testResultsFiles: "*-results.xml" - searchFolder: "$(Build.ArtifactStagingDirectory)/test-results" - condition: and(succeededOrFailed(), eq(variables['VSCODE_STEP_ON_IT'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { node build/azure-pipelines/mixin --server } + displayName: Mix in quality + condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: UseDotNet@2 - inputs: - version: 3.x - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" + exec { yarn gulp "vscode-reh-win32-$(VSCODE_ARCH)-min-ci" } + exec { yarn gulp "vscode-reh-web-win32-$(VSCODE_ARCH)-min-ci" } + echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(CodeSigningFolderPath),$(agent.builddirectory)/vscode-reh-win32-$(VSCODE_ARCH)" + displayName: Build Server + condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: EsrpClientTool@1 - displayName: Download ESRPClient - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + - template: product-build-win32-test.yml + parameters: + VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }} + VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }} + VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }} + VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }} - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - $EsrpClientTool = (gci -directory -filter EsrpClientTool_* $(Agent.RootDirectory)\_tasks | Select-Object -last 1).FullName - $EsrpCliZip = (gci -recurse -filter esrpcli.*.zip $EsrpClientTool | Select-Object -last 1).FullName - mkdir -p $(Agent.TempDirectory)\esrpcli - Expand-Archive -Path $EsrpCliZip -DestinationPath $(Agent.TempDirectory)\esrpcli - $EsrpCliDllPath = (gci -recurse -filter esrpcli.dll $(Agent.TempDirectory)\esrpcli | Select-Object -last 1).FullName - echo "##vso[task.setvariable variable=EsrpCliDllPath]$EsrpCliDllPath" - displayName: Find ESRP CLI - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - task: UseDotNet@2 + inputs: + version: 3.x + condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - exec { node build\azure-pipelines\common\sign $env:EsrpCliDllPath windows $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(CodeSigningFolderPath) '*.dll,*.exe,*.node' } - displayName: Codesign - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - task: EsrpClientTool@1 + displayName: Download ESRPClient - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-archive" } - displayName: Package archive - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $EsrpClientTool = (gci -directory -filter EsrpClientTool_* $(Agent.RootDirectory)\_tasks | Select-Object -last 1).FullName + $EsrpCliZip = (gci -recurse -filter esrpcli.*.zip $EsrpClientTool | Select-Object -last 1).FullName + mkdir -p $(Agent.TempDirectory)\esrpcli + Expand-Archive -Path $EsrpCliZip -DestinationPath $(Agent.TempDirectory)\esrpcli + $EsrpCliDllPath = (gci -recurse -filter esrpcli.dll $(Agent.TempDirectory)\esrpcli | Select-Object -last 1).FullName + echo "##vso[task.setvariable variable=EsrpCliDllPath]$EsrpCliDllPath" + displayName: Find ESRP CLI - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - $env:ESRPPKI = "$(ESRP-PKI)" - $env:ESRPAADUsername = "$(esrp-aad-username)" - $env:ESRPAADPassword = "$(esrp-aad-password)" - exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-system-setup" --sign } - exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign } - displayName: Package setups - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { node build\azure-pipelines\common\sign $env:EsrpCliDllPath windows $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(CodeSigningFolderPath) '*.dll,*.exe,*.node' } + displayName: Codesign - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - powershell: | - . build/azure-pipelines/win32/exec.ps1 - $ErrorActionPreference = "Stop" - .\build\azure-pipelines\win32\prepare-publish.ps1 - displayName: Publish - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if and(eq(parameters.VSCODE_QUALITY, 'insider'), eq(parameters.VSCODE_PUBLISH, true)) }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { node build\azure-pipelines\common\sign $env:EsrpCliDllPath windows-appx $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(CodeSigningFolderPath) '*.appx' } + displayName: Codesign context menu appx package - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\archive\$(ARCHIVE_NAME) - artifact: vscode_client_win32_$(VSCODE_ARCH)_archive - displayName: Publish archive - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-archive" } + displayName: Package archive - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\system-setup\$(SYSTEM_SETUP_NAME) - artifact: vscode_client_win32_$(VSCODE_ARCH)_setup - displayName: Publish system setup - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $env:ESRPPKI = "$(ESRP-PKI)" + $env:ESRPAADUsername = "$(esrp-aad-username)" + $env:ESRPAADPassword = "$(esrp-aad-password)" + exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-system-setup" --sign } + exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign } + displayName: Package setups - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\user-setup\$(USER_SETUP_NAME) - artifact: vscode_client_win32_$(VSCODE_ARCH)_user-setup - displayName: Publish user setup - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + .\build\azure-pipelines\win32\prepare-publish.ps1 + displayName: Publish - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH).zip - artifact: vscode_server_win32_$(VSCODE_ARCH)_archive - displayName: Publish server archive - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: Generate SBOM (client) + inputs: + BuildDropPath: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH) + PackageName: Visual Studio Code - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH)-web.zip - artifact: vscode_web_win32_$(VSCODE_ARCH)_archive - displayName: Publish web server archive - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - publish: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)/_manifest + displayName: Publish SBOM (client) + artifact: vscode_client_win32_$(VSCODE_ARCH)_sbom - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: Generate SBOM (client) - inputs: - BuildDropPath: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH) - PackageName: Visual Studio Code - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: Generate SBOM (server) + inputs: + BuildDropPath: $(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH) + PackageName: Visual Studio Code Server + condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - publish: $(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)/_manifest - displayName: Publish SBOM (client) - artifact: vscode_client_win32_$(VSCODE_ARCH)_sbom - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - publish: $(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)/_manifest + displayName: Publish SBOM (server) + artifact: vscode_server_win32_$(VSCODE_ARCH)_sbom + condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: Generate SBOM (server) - inputs: - BuildDropPath: $(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH) - PackageName: Visual Studio Code Server - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\archive\$(ARCHIVE_NAME) + artifact: vscode_client_win32_$(VSCODE_ARCH)_archive + displayName: Publish archive - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - publish: $(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)/_manifest - displayName: Publish SBOM (server) - artifact: vscode_server_win32_$(VSCODE_ARCH)_sbom - condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'), ne(variables['VSCODE_ARCH'], 'arm64')) + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\system-setup\$(SYSTEM_SETUP_NAME) + artifact: vscode_client_win32_$(VSCODE_ARCH)_setup + displayName: Publish system setup + + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - publish: $(System.DefaultWorkingDirectory)\.build\win32-$(VSCODE_ARCH)\user-setup\$(USER_SETUP_NAME) + artifact: vscode_client_win32_$(VSCODE_ARCH)_user-setup + displayName: Publish user setup + condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false')) + + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH).zip + artifact: vscode_server_win32_$(VSCODE_ARCH)_archive + displayName: Publish server archive + condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) + + - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: + - publish: $(System.DefaultWorkingDirectory)\.build\vscode-server-win32-$(VSCODE_ARCH)-web.zip + artifact: vscode_web_win32_$(VSCODE_ARCH)_archive + displayName: Publish web server archive + condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64')) diff --git a/build/builtin/main.js b/build/builtin/main.js index b1842e9a595..f4dbc6e8325 100644 --- a/build/builtin/main.js +++ b/build/builtin/main.js @@ -30,8 +30,7 @@ app.once('ready', () => { webPreferences: { nodeIntegration: true, contextIsolation: false, - enableWebSQL: false, - nativeWindowOpen: true + enableWebSQL: false } }); window.setMenuBarVisibility(false); diff --git a/build/darwin/create-universal-app.js b/build/darwin/create-universal-app.js index 197bf5b2f1b..750366e752d 100644 --- a/build/darwin/create-universal-app.js +++ b/build/darwin/create-universal-app.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); const vscode_universal_bundler_1 = require("vscode-universal-bundler"); const cross_spawn_promise_1 = require("@malept/cross-spawn-promise"); @@ -39,7 +39,7 @@ async function main() { outAppPath, force: true }); - let productJson = await fs.readJson(productJsonPath); + const productJson = await fs.readJson(productJsonPath); Object.assign(productJson, { darwinUniversalAssetId: 'darwin-universal' }); diff --git a/build/darwin/create-universal-app.ts b/build/darwin/create-universal-app.ts index 7d145eaec71..5f4b3170532 100644 --- a/build/darwin/create-universal-app.ts +++ b/build/darwin/create-universal-app.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import { makeUniversalApp } from 'vscode-universal-bundler'; import { spawn } from '@malept/cross-spawn-promise'; import * as fs from 'fs-extra'; @@ -45,7 +43,7 @@ async function main() { force: true }); - let productJson = await fs.readJson(productJsonPath); + const productJson = await fs.readJson(productJsonPath); Object.assign(productJson, { darwinUniversalAssetId: 'darwin-universal' }); diff --git a/build/darwin/sign.js b/build/darwin/sign.js index 02b0e1f052e..ef6bef395e4 100644 --- a/build/darwin/sign.js +++ b/build/darwin/sign.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); const codesign = require("electron-osx-sign"); const path = require("path"); @@ -26,6 +26,7 @@ async function main() { const helperAppBaseName = product.nameShort; const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app'; const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app'; + const pluginHelperAppName = helperAppBaseName + ' Helper (Plugin).app'; const infoPlistPath = path.resolve(appRoot, appName, 'Contents', 'Info.plist'); const defaultOpts = { app: path.join(appRoot, appName), @@ -45,7 +46,8 @@ async function main() { // TODO(deepak1556): Incorrectly declared type in electron-osx-sign ignore: (filePath) => { return filePath.includes(gpuHelperAppName) || - filePath.includes(rendererHelperAppName); + filePath.includes(rendererHelperAppName) || + filePath.includes(pluginHelperAppName); } }; const gpuHelperOpts = { @@ -60,6 +62,12 @@ async function main() { entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist'), 'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist'), }; + const pluginHelperOpts = { + ...defaultOpts, + app: path.join(appFrameworkPath, pluginHelperAppName), + entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'), + 'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'), + }; // Only overwrite plist entries for x64 and arm64 builds, // universal will get its copy from the x64 build. if (arch !== 'universal') { @@ -87,6 +95,7 @@ async function main() { } await codesign.signAsync(gpuHelperOpts); await codesign.signAsync(rendererHelperOpts); + await codesign.signAsync(pluginHelperOpts); await codesign.signAsync(appOpts); } if (require.main === module) { diff --git a/build/darwin/sign.ts b/build/darwin/sign.ts index 9b0a9f75afc..7490d45eaed 100644 --- a/build/darwin/sign.ts +++ b/build/darwin/sign.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as codesign from 'electron-osx-sign'; import * as path from 'path'; import * as util from '../lib/util'; @@ -31,6 +29,7 @@ async function main(): Promise { const helperAppBaseName = product.nameShort; const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app'; const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app'; + const pluginHelperAppName = helperAppBaseName + ' Helper (Plugin).app'; const infoPlistPath = path.resolve(appRoot, appName, 'Contents', 'Info.plist'); const defaultOpts: codesign.SignOptions = { @@ -52,7 +51,8 @@ async function main(): Promise { // TODO(deepak1556): Incorrectly declared type in electron-osx-sign ignore: (filePath: string) => { return filePath.includes(gpuHelperAppName) || - filePath.includes(rendererHelperAppName); + filePath.includes(rendererHelperAppName) || + filePath.includes(pluginHelperAppName); } }; @@ -70,6 +70,13 @@ async function main(): Promise { 'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist'), }; + const pluginHelperOpts: codesign.SignOptions = { + ...defaultOpts, + app: path.join(appFrameworkPath, pluginHelperAppName), + entitlements: path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'), + 'entitlements-inherit': path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist'), + }; + // Only overwrite plist entries for x64 and arm64 builds, // universal will get its copy from the x64 build. if (arch !== 'universal') { @@ -98,6 +105,7 @@ async function main(): Promise { await codesign.signAsync(gpuHelperOpts); await codesign.signAsync(rendererHelperOpts); + await codesign.signAsync(pluginHelperOpts); await codesign.signAsync(appOpts as any); } diff --git a/build/eslint.js b/build/eslint.js index c04f4ef7756..288917b35bf 100644 --- a/build/eslint.js +++ b/build/eslint.js @@ -13,8 +13,7 @@ function eslint() { .src(eslintFilter, { base: '.', follow: true, allowEmpty: true }) .pipe( gulpeslint({ - configFile: '.eslintrc.json', - rulePaths: ['./build/lib/eslint'], + configFile: '.eslintrc.json' }) ) .pipe(gulpeslint.formatEach('compact')) diff --git a/build/filters.js b/build/filters.js index c2a0a52bdb9..ff8e4ef81b3 100644 --- a/build/filters.js +++ b/build/filters.js @@ -22,6 +22,7 @@ module.exports.all = [ 'scripts/**/*', 'src/**/*', 'test/**/*', + '!cli/**/*', '!out*/**', '!test/**/out/**', '!**/node_modules/**', @@ -39,6 +40,7 @@ module.exports.unicodeFilter = [ '!**/test/**', '!**/*.test.ts', '!**/*.{d.ts,json,md}', + '!**/*.mp3', '!build/win32/**', '!extensions/markdown-language-features/notebook-out/*.js', @@ -48,7 +50,6 @@ module.exports.unicodeFilter = [ '!extensions/typescript-language-features/test-workspace/**', '!extensions/vscode-api-tests/testWorkspace/**', '!extensions/vscode-api-tests/testWorkspace2/**', - '!extensions/vscode-custom-editor-tests/test-workspace/**', '!extensions/**/dist/**', '!extensions/**/out/**', '!extensions/**/snippets/**', @@ -66,10 +67,7 @@ module.exports.indentationFilter = [ '!**/LICENSE.{txt,rtf}', '!LICENSES.chromium.html', '!**/LICENSE', - '!src/vs/nls.js', - '!src/vs/nls.build.js', - '!src/vs/css.js', - '!src/vs/css.build.js', + '!**/*.mp3', '!src/vs/loader.js', '!src/vs/base/browser/dompurify/*', '!src/vs/base/common/marked/marked.js', @@ -85,10 +83,10 @@ module.exports.indentationFilter = [ '!test/monaco/out/**', '!test/smoke/out/**', '!extensions/typescript-language-features/test-workspace/**', + '!extensions/typescript-language-features/resources/walkthroughs/**', '!extensions/markdown-math/notebook-out/**', '!extensions/vscode-api-tests/testWorkspace/**', '!extensions/vscode-api-tests/testWorkspace2/**', - '!extensions/vscode-custom-editor-tests/test-workspace/**', '!build/monaco/**', '!build/win32/**', @@ -141,10 +139,12 @@ module.exports.copyrightFilter = [ '!**/*.cmd', '!**/*.ico', '!**/*.opus', + '!**/*.mp3', '!**/*.icns', '!**/*.xml', '!**/*.sh', '!**/*.zsh', + '!**/*.fish', '!**/*.txt', '!**/*.xpm', '!**/*.opts', diff --git a/build/gulpfile.compile.js b/build/gulpfile.compile.js index c3049784fe4..1424c90e3d0 100644 --- a/build/gulpfile.compile.js +++ b/build/gulpfile.compile.js @@ -9,13 +9,16 @@ const gulp = require('gulp'); const util = require('./lib/util'); const task = require('./lib/task'); const compilation = require('./lib/compilation'); +const optimize = require('./lib/optimize'); // Full compile, including nls and inline sources in sourcemaps, for build const compileBuildTask = task.define('compile-build', task.series( util.rimraf('out-build'), util.buildWebNodePaths('out-build'), - compilation.compileTask('src', 'out-build', true) + compilation.compileApiProposalNamesTask, + compilation.compileTask('src', 'out-build', true), + optimize.optimizeLoaderTask('out-build', 'out-build', true) ) ); gulp.task(compileBuildTask); diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js index 41dbfe647ae..fb3a148f9a8 100644 --- a/build/gulpfile.editor.js +++ b/build/gulpfile.editor.js @@ -6,8 +6,9 @@ const gulp = require('gulp'); const path = require('path'); const util = require('./lib/util'); +const { getVersion } = require('./lib/getVersion'); const task = require('./lib/task'); -const common = require('./lib/optimize'); +const optimize = require('./lib/optimize'); const es = require('event-stream'); const File = require('vinyl'); const i18n = require('./lib/i18n'); @@ -17,34 +18,41 @@ const compilation = require('./lib/compilation'); const monacoapi = require('./lib/monaco-api'); const fs = require('fs'); -let root = path.dirname(__dirname); -let sha1 = util.getVersion(root); -let semver = require('./monaco/package.json').version; -let headerVersion = semver + '(' + sha1 + ')'; +const root = path.dirname(__dirname); +const sha1 = getVersion(root); +const semver = require('./monaco/package.json').version; +const headerVersion = semver + '(' + sha1 + ')'; // Build -let editorEntryPoints = [ +const editorEntryPoints = [ { name: 'vs/editor/editor.main', include: [], exclude: ['vs/css', 'vs/nls'], - prepend: ['out-editor-build/vs/css.js', 'out-editor-build/vs/nls.js'], + prepend: [ + { path: 'out-editor-build/vs/css.js', amdModuleId: 'vs/css' }, + { path: 'out-editor-build/vs/nls.js', amdModuleId: 'vs/nls' } + ], }, { name: 'vs/base/common/worker/simpleWorker', include: ['vs/editor/common/services/editorSimpleWorker'], - prepend: ['vs/loader.js'], - append: ['vs/base/worker/workerMain'], + exclude: ['vs/nls'], + prepend: [ + { path: 'vs/loader.js' }, + { path: 'vs/nls.js', amdModuleId: 'vs/nls' }, + { path: 'vs/base/worker/workerMain.js' } + ], dest: 'vs/base/worker/workerMain.js' } ]; -let editorResources = [ +const editorResources = [ 'out-editor-build/vs/base/browser/ui/codicons/**/*.ttf' ]; -let BUNDLED_FILE_HEADER = [ +const BUNDLED_FILE_HEADER = [ '/*!-----------------------------------------------------------', ' * Copyright (c) Microsoft Corporation. All rights reserved.', ' * Version: ' + headerVersion, @@ -79,26 +87,29 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => { const compileEditorAMDTask = task.define('compile-editor-amd', compilation.compileTask('out-editor-src', 'out-editor-build', true)); -const optimizeEditorAMDTask = task.define('optimize-editor-amd', common.optimizeTask({ - src: 'out-editor-build', - entryPoints: editorEntryPoints, - resources: editorResources, - loaderConfig: { - paths: { - 'vs': 'out-editor-build/vs', - 'vs/css': 'out-editor-build/vs/css.build', - 'vs/nls': 'out-editor-build/vs/nls.build', - 'vscode': 'empty:' +const optimizeEditorAMDTask = task.define('optimize-editor-amd', optimize.optimizeTask( + { + out: 'out-editor', + amd: { + src: 'out-editor-build', + entryPoints: editorEntryPoints, + resources: editorResources, + loaderConfig: { + paths: { + 'vs': 'out-editor-build/vs', + 'vs/css': 'out-editor-build/vs/css.build', + 'vs/nls': 'out-editor-build/vs/nls.build', + 'vscode': 'empty:' + } + }, + header: BUNDLED_FILE_HEADER, + bundleInfo: true, + languages } - }, - bundleLoader: false, - header: BUNDLED_FILE_HEADER, - bundleInfo: true, - out: 'out-editor', - languages: languages -})); + } +)); -const minifyEditorAMDTask = task.define('minify-editor-amd', common.minifyTask('out-editor')); +const minifyEditorAMDTask = task.define('minify-editor-amd', optimize.minifyTask('out-editor')); const createESMSourcesAndResourcesTask = task.define('extract-editor-esm', () => { standalone.createESMSourcesAndResources2({ @@ -109,12 +120,6 @@ const createESMSourcesAndResourcesTask = task.define('extract-editor-esm', () => 'inlineEntryPoint:0.ts', 'inlineEntryPoint:1.ts', 'vs/loader.js', - 'vs/nls.ts', - 'vs/nls.build.js', - 'vs/nls.d.ts', - 'vs/css.js', - 'vs/css.build.js', - 'vs/css.d.ts', 'vs/base/worker/workerMain.ts', ], renames: { @@ -224,7 +229,7 @@ const appendJSToESMImportsTask = task.define('append-js-to-esm-imports', () => { result.push(line); continue; } - let modifiedLine = ( + const modifiedLine = ( line .replace(/^import(.*)\'([^']+)\'/, `import$1'$2.js'`) .replace(/^export \* from \'([^']+)\'/, `export * from '$1.js'`) @@ -239,10 +244,10 @@ const appendJSToESMImportsTask = task.define('append-js-to-esm-imports', () => { * @param {string} contents */ function toExternalDTS(contents) { - let lines = contents.split(/\r\n|\r|\n/); + const lines = contents.split(/\r\n|\r|\n/); let killNextCloseCurlyBrace = false; for (let i = 0; i < lines.length; i++) { - let line = lines[i]; + const line = lines[i]; if (killNextCloseCurlyBrace) { if ('}' === line) { @@ -316,7 +321,7 @@ const finalEditorResourcesTask = task.define('final-editor-resources', () => { // package.json gulp.src('build/monaco/package.json') .pipe(es.through(function (data) { - let json = JSON.parse(data.contents.toString()); + const json = JSON.parse(data.contents.toString()); json.private = false; data.contents = Buffer.from(JSON.stringify(json, null, ' ')); this.emit('data', data); @@ -360,10 +365,10 @@ const finalEditorResourcesTask = task.define('final-editor-resources', () => { return; } - let relativePathToMap = path.relative(path.join(data.relative), path.join('min-maps', data.relative + '.map')); + const relativePathToMap = path.relative(path.join(data.relative), path.join('min-maps', data.relative + '.map')); let strContents = data.contents.toString(); - let newStr = '//# sourceMappingURL=' + relativePathToMap.replace(/\\/g, '/'); + const newStr = '//# sourceMappingURL=' + relativePathToMap.replace(/\\/g, '/'); strContents = strContents.replace(/\/\/# sourceMappingURL=[^ ]+$/, newStr); data.contents = Buffer.from(strContents); @@ -483,13 +488,13 @@ function createTscCompileTask(watch) { cwd: path.join(__dirname, '..'), // stdio: [null, 'pipe', 'inherit'] }); - let errors = []; - let reporter = createReporter('monaco'); + const errors = []; + const reporter = createReporter('monaco'); /** @type {NodeJS.ReadWriteStream | undefined} */ let report; // eslint-disable-next-line no-control-regex - let magic = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g; // https://stackoverflow.com/questions/25245716/remove-all-ansi-colors-styles-from-strings + const magic = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g; // https://stackoverflow.com/questions/25245716/remove-all-ansi-colors-styles-from-strings child.stdout.on('data', data => { let str = String(data); @@ -502,12 +507,12 @@ function createTscCompileTask(watch) { report.end(); } else if (str) { - let match = /(.*\(\d+,\d+\): )(.*: )(.*)/.exec(str); + const match = /(.*\(\d+,\d+\): )(.*: )(.*)/.exec(str); if (match) { // trying to massage the message so that it matches the gulp-tsb error messages // e.g. src/vs/base/common/strings.ts(663,5): error TS2322: Type '1234' is not assignable to type 'string'. - let fullpath = path.join(root, match[1]); - let message = match[3]; + const fullpath = path.join(root, match[1]); + const message = match[3]; reporter(fullpath + message); } else { reporter(str); diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js index ba2606861fd..c0b79bc0f9d 100644 --- a/build/gulpfile.extensions.js +++ b/build/gulpfile.extensions.js @@ -12,15 +12,15 @@ const nodeUtil = require('util'); const es = require('event-stream'); const filter = require('gulp-filter'); const util = require('./lib/util'); +const { getVersion } = require('./lib/getVersion'); const task = require('./lib/task'); const watcher = require('./lib/watch'); const createReporter = require('./lib/reporter').createReporter; const glob = require('glob'); const root = path.dirname(__dirname); -const commit = util.getVersion(root); +const commit = getVersion(root); const plumber = require('gulp-plumber'); const ext = require('./lib/extensions'); -const product = require('../product.json'); const extensionsPath = path.join(path.dirname(__dirname), 'extensions'); @@ -47,14 +47,15 @@ const compilations = [ 'gulp/tsconfig.json', 'html-language-features/client/tsconfig.json', 'html-language-features/server/tsconfig.json', - 'image-preview/tsconfig.json', 'ipynb/tsconfig.json', 'jake/tsconfig.json', 'json-language-features/client/tsconfig.json', 'json-language-features/server/tsconfig.json', 'markdown-language-features/preview-src/tsconfig.json', + 'markdown-language-features/server/tsconfig.json', 'markdown-language-features/tsconfig.json', 'markdown-math/tsconfig.json', + 'media-preview/tsconfig.json', 'merge-conflict/tsconfig.json', 'microsoft-authentication/tsconfig.json', 'npm/tsconfig.json', @@ -66,8 +67,6 @@ const compilations = [ 'typescript-language-features/tsconfig.json', 'vscode-api-tests/tsconfig.json', 'vscode-colorize-tests/tsconfig.json', - 'vscode-custom-editor-tests/tsconfig.json', - 'vscode-notebook-tests/tsconfig.json', 'vscode-test-resolver/tsconfig.json' ]; @@ -91,7 +90,7 @@ const tasks = compilations.map(function (tsconfigFile) { const baseUrl = getBaseUrl(out); let headerId, headerOut; - let index = relativeDirname.indexOf('/'); + const index = relativeDirname.indexOf('/'); if (index < 0) { headerId = 'vscode.' + relativeDirname; headerOut = 'out'; @@ -100,7 +99,7 @@ const tasks = compilations.map(function (tsconfigFile) { headerOut = relativeDirname.substr(index + 1) + '/out'; } - function createPipeline(build, emitError) { + function createPipeline(build, emitError, transpileOnly) { const nlsDev = require('vscode-nls-dev'); const tsb = require('./lib/tsb'); const sourcemaps = require('gulp-sourcemaps'); @@ -110,7 +109,7 @@ const tasks = compilations.map(function (tsconfigFile) { overrideOptions.inlineSources = Boolean(build); overrideOptions.base = path.dirname(absolutePath); - const compilation = tsb.create(absolutePath, overrideOptions, false, err => reporter(err.toString())); + const compilation = tsb.create(absolutePath, overrideOptions, { verbose: false, transpileOnly, transpileOnlyIncludesDts: transpileOnly, transpileWithSwc: true }, err => reporter(err.toString())); const pipeline = function () { const input = es.through(); @@ -152,6 +151,16 @@ const tasks = compilations.map(function (tsconfigFile) { const cleanTask = task.define(`clean-extension-${name}`, util.rimraf(out)); + const transpileTask = task.define(`transpile-extension:${name}`, task.series(cleanTask, () => { + const pipeline = createPipeline(false, true, true); + const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts'])); + const input = es.merge(nonts, pipeline.tsProjectSrc()); + + return input + .pipe(pipeline()) + .pipe(gulp.dest(out)); + })); + const compileTask = task.define(`compile-extension:${name}`, task.series(cleanTask, () => { const pipeline = createPipeline(false, true); const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts'])); @@ -184,12 +193,16 @@ const tasks = compilations.map(function (tsconfigFile) { })); // Tasks + gulp.task(transpileTask); gulp.task(compileTask); gulp.task(watchTask); - return { compileTask, watchTask, compileBuildTask }; + return { transpileTask, compileTask, watchTask, compileBuildTask }; }); +const transpileExtensionsTask = task.define('transpile-extensions', task.parallel(...tasks.map(t => t.transpileTask))); +gulp.task(transpileExtensionsTask); + const compileExtensionsTask = task.define('compile-extensions', task.parallel(...tasks.map(t => t.compileTask))); gulp.task(compileExtensionsTask); exports.compileExtensionsTask = compileExtensionsTask; @@ -222,8 +235,8 @@ exports.compileExtensionMediaBuildTask = compileExtensionMediaBuildTask; const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimraf('.build/extensions')); const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series( cleanExtensionsBuildTask, + task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))), task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream(false).pipe(gulp.dest('.build'))), - task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false, product.extensionsGallery?.serviceUrl).pipe(gulp.dest('.build'))), )); gulp.task(compileExtensionsBuildTask); diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js index a9691fcb0d8..c76fab7abc6 100644 --- a/build/gulpfile.hygiene.js +++ b/build/gulpfile.hygiene.js @@ -16,7 +16,7 @@ function checkPackageJSON(actualPath) { const actual = require(path.join(__dirname, '..', actualPath)); const rootPackageJSON = require('../package.json'); const checkIncluded = (set1, set2) => { - for (let depName in set1) { + for (const depName in set1) { const depVersion = set1[depName]; const rootDepVersion = set2[depName]; if (!rootDepVersion) { diff --git a/build/gulpfile.js b/build/gulpfile.js index 65dda505fa7..e945c06eed4 100644 --- a/build/gulpfile.js +++ b/build/gulpfile.js @@ -11,7 +11,7 @@ require('events').EventEmitter.defaultMaxListeners = 100; const gulp = require('gulp'); const util = require('./lib/util'); const task = require('./lib/task'); -const { compileTask, watchTask, compileApiProposalNamesTask, watchApiProposalNamesTask } = require('./lib/compilation'); +const { transpileClientSWC, transpileTask, compileTask, watchTask, compileApiProposalNamesTask, watchApiProposalNamesTask } = require('./lib/compilation'); const { monacoTypecheckTask/* , monacoTypecheckWatchTask */ } = require('./gulpfile.editor'); const { compileExtensionsTask, watchExtensionsTask, compileExtensionMediaTask } = require('./gulpfile.extensions'); @@ -19,6 +19,14 @@ const { compileExtensionsTask, watchExtensionsTask, compileExtensionMediaTask } gulp.task(compileApiProposalNamesTask); gulp.task(watchApiProposalNamesTask); +// SWC Client Transpile +const transpileClientSWCTask = task.define('transpile-client-swc', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), transpileTask('src', 'out', true))); +gulp.task(transpileClientSWCTask); + +// Transpile only +const transpileClientTask = task.define('transpile-client', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), transpileTask('src', 'out'))); +gulp.task(transpileClientTask); + // Fast compile for development time const compileClientTask = task.define('compile-client', task.series(util.rimraf('out'), util.buildWebNodePaths('out'), compileApiProposalNamesTask, compileTask('src', 'out', false))); gulp.task(compileClientTask); diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js index 54135e9f50d..7475e04d6e5 100644 --- a/build/gulpfile.reh.js +++ b/build/gulpfile.reh.js @@ -9,8 +9,9 @@ const gulp = require('gulp'); const path = require('path'); const es = require('event-stream'); const util = require('./lib/util'); +const { getVersion } = require('./lib/getVersion'); const task = require('./lib/task'); -const common = require('./lib/optimize'); +const optimize = require('./lib/optimize'); const product = require('../product.json'); const rename = require('gulp-rename'); const replace = require('gulp-replace'); @@ -30,7 +31,7 @@ const { vscodeWebEntryPoints, vscodeWebResourceIncludes, createVSCodeWebFileCont const cp = require('child_process'); const REPO_ROOT = path.dirname(__dirname); -const commit = util.getVersion(REPO_ROOT); +const commit = getVersion(REPO_ROOT); const BUILD_ROOT = path.dirname(REPO_ROOT); const REMOTE_FOLDER = path.join(REPO_ROOT, 'remote'); @@ -58,15 +59,10 @@ const serverResources = [ 'out-build/bootstrap-fork.js', 'out-build/bootstrap-amd.js', 'out-build/bootstrap-node.js', - 'out-build/paths.js', // Performance 'out-build/vs/base/common/performance.js', - // main entry points - 'out-build/server-cli.js', - 'out-build/server-main.js', - // Watcher 'out-build/vs/platform/files/**/*.exe', 'out-build/vs/platform/files/**/*.md', @@ -76,12 +72,14 @@ const serverResources = [ 'out-build/vs/base/node/ps.sh', // Terminal shell integration + 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration.fish', 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1', 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh', 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-env.zsh', 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh', 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh', 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration-login.zsh', + 'out-build/vs/workbench/contrib/terminal/browser/media/shellIntegration.fish', '!**/test/**' ]; @@ -252,7 +250,7 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa const date = new Date().toISOString(); const productJsonStream = gulp.src(['product.json'], { base: '.' }) - .pipe(json({ commit, date })); + .pipe(json({ commit, date, version })); const license = gulp.src(['remote/LICENSE'], { base: 'remote', allowEmpty: true }); @@ -281,7 +279,7 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa ].map(resource => gulp.src(resource, { base: '.' }).pipe(rename(resource))); } - let all = es.merge( + const all = es.merge( packageJsonStream, productJsonStream, license, @@ -355,23 +353,42 @@ function tweakProductForServerWeb(product) { ['reh', 'reh-web'].forEach(type => { const optimizeTask = task.define(`optimize-vscode-${type}`, task.series( util.rimraf(`out-vscode-${type}`), - common.optimizeTask({ - src: 'out-build', - entryPoints: _.flatten(type === 'reh' ? serverEntryPoints : serverWithWebEntryPoints), - otherSources: [], - resources: type === 'reh' ? serverResources : serverWithWebResources, - loaderConfig: common.loaderConfig(), - out: `out-vscode-${type}`, - inlineAmdImages: true, - bundleInfo: undefined, - fileContentMapper: createVSCodeWebFileContentMapper('.build/extensions', type === 'reh-web' ? tweakProductForServerWeb(product) : product) - }) + optimize.optimizeTask( + { + out: `out-vscode-${type}`, + amd: { + src: 'out-build', + entryPoints: _.flatten(type === 'reh' ? serverEntryPoints : serverWithWebEntryPoints), + otherSources: [], + resources: type === 'reh' ? serverResources : serverWithWebResources, + loaderConfig: optimize.loaderConfig(), + inlineAmdImages: true, + bundleInfo: undefined, + fileContentMapper: createVSCodeWebFileContentMapper('.build/extensions', type === 'reh-web' ? tweakProductForServerWeb(product) : product) + }, + commonJS: { + src: 'out-build', + entryPoints: [ + 'out-build/server-main.js', + 'out-build/server-cli.js' + ], + platform: 'node', + external: [ + 'minimist', + // TODO: we cannot inline `product.json` because + // it is being changed during build time at a later + // point in time (such as `checksums`) + '../product.json' + ] + } + } + ) )); const minifyTask = task.define(`minify-vscode-${type}`, task.series( optimizeTask, util.rimraf(`out-vscode-${type}-min`), - common.minifyTask(`out-vscode-${type}`, `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`) + optimize.minifyTask(`out-vscode-${type}`, `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`) )); gulp.task(minifyTask); diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index 268650959cd..d5b4db00073 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -6,6 +6,7 @@ 'use strict'; const gulp = require('gulp'); +const merge = require('gulp-merge-json'); const fs = require('fs'); const os = require('os'); const cp = require('child_process'); @@ -17,11 +18,12 @@ const replace = require('gulp-replace'); const filter = require('gulp-filter'); const _ = require('underscore'); const util = require('./lib/util'); +const { getVersion } = require('./lib/getVersion'); const task = require('./lib/task'); const buildfile = require('../src/buildfile'); -const common = require('./lib/optimize'); +const optimize = require('./lib/optimize'); const root = path.dirname(__dirname); -const commit = util.getVersion(root); +const commit = getVersion(root); const packageJson = require('../package.json'); const product = require('../product.json'); const crypto = require('crypto'); @@ -33,6 +35,9 @@ const minimist = require('minimist'); const { compileBuildTask } = require('./gulpfile.compile'); const { compileExtensionsBuildTask, compileExtensionMediaBuildTask } = require('./gulpfile.extensions'); const { getSettingsSearchBuildId, shouldSetupSettingsSearch } = require('./azure-pipelines/upload-configuration'); +const { promisify } = require('util'); +const glob = promisify(require('glob')); +const rcedit = promisify(require('rcedit')); // Build const vscodeEntryPoints = _.flatten([ @@ -43,31 +48,28 @@ const vscodeEntryPoints = _.flatten([ buildfile.workerLanguageDetection, buildfile.workerSharedProcess, buildfile.workerLocalFileSearch, + buildfile.workerProfileAnalysis, buildfile.workbenchDesktop, buildfile.code ]); const vscodeResources = [ - 'out-build/main.js', - 'out-build/cli.js', 'out-build/bootstrap.js', 'out-build/bootstrap-fork.js', 'out-build/bootstrap-amd.js', 'out-build/bootstrap-node.js', 'out-build/bootstrap-window.js', - 'out-build/vs/**/*.{svg,png,html,jpg,opus}', + 'out-build/vs/**/*.{svg,png,html,jpg,mp3}', '!out-build/vs/code/browser/**/*.html', '!out-build/vs/editor/standalone/**/*.svg', 'out-build/vs/base/common/performance.js', - 'out-build/vs/base/common/stripComments.js', - 'out-build/vs/base/node/languagePacks.js', 'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}', 'out-build/vs/base/browser/ui/codicons/codicon/**', 'out-build/vs/base/parts/sandbox/electron-browser/preload.js', - 'out-build/vs/platform/environment/node/userDataPath.js', 'out-build/vs/workbench/browser/media/*-theme.css', 'out-build/vs/workbench/contrib/debug/**/*.json', 'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt', + 'out-build/vs/workbench/contrib/terminal/browser/media/*.fish', 'out-build/vs/workbench/contrib/terminal/browser/media/*.ps1', 'out-build/vs/workbench/contrib/terminal/browser/media/*.sh', 'out-build/vs/workbench/contrib/terminal/browser/media/*.zsh', @@ -76,23 +78,58 @@ const vscodeResources = [ 'out-build/vs/workbench/contrib/tasks/**/*.json', 'out-build/vs/platform/files/**/*.exe', 'out-build/vs/platform/files/**/*.md', - 'out-build/vs/code/electron-browser/workbench/**', - 'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js', - 'out-build/vs/code/electron-sandbox/issue/issueReporter.js', - 'out-build/vs/code/electron-sandbox/processExplorer/processExplorer.js', '!**/test/**' ]; +// Do not change the order of these files! They will +// be inlined into the target window file in this order +// and they depend on each other in this way. +const windowBootstrapFiles = [ + 'out-build/bootstrap.js', + 'out-build/vs/loader.js', + 'out-build/bootstrap-window.js' +]; + const optimizeVSCodeTask = task.define('optimize-vscode', task.series( util.rimraf('out-vscode'), - common.optimizeTask({ - src: 'out-build', - entryPoints: vscodeEntryPoints, - resources: vscodeResources, - loaderConfig: common.loaderConfig(), - out: 'out-vscode', - bundleInfo: undefined - }) + // Optimize: bundles source files automatically based on + // AMD and CommonJS import statements based on the passed + // in entry points. In addition, concat window related + // bootstrap files into a single file. + optimize.optimizeTask( + { + out: 'out-vscode', + amd: { + src: 'out-build', + entryPoints: vscodeEntryPoints, + resources: vscodeResources, + loaderConfig: optimize.loaderConfig(), + bundleInfo: undefined + }, + commonJS: { + src: 'out-build', + entryPoints: [ + 'out-build/main.js', + 'out-build/cli.js' + ], + platform: 'node', + external: [ + 'electron', + 'minimist', + // TODO: we cannot inline `product.json` because + // it is being changed during build time at a later + // point in time (such as `checksums`) + '../product.json' + ] + }, + manual: [ + { src: [...windowBootstrapFiles, 'out-build/vs/code/electron-sandbox/workbench/workbench.js'], out: 'vs/code/electron-sandbox/workbench/workbench.js' }, + { src: [...windowBootstrapFiles, 'out-build/vs/code/electron-sandbox/issue/issueReporter.js'], out: 'vs/code/electron-sandbox/issue/issueReporter.js' }, + { src: [...windowBootstrapFiles, 'out-build/vs/code/electron-sandbox/processExplorer/processExplorer.js'], out: 'vs/code/electron-sandbox/processExplorer/processExplorer.js' }, + { src: [...windowBootstrapFiles, 'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js'], out: 'vs/code/electron-browser/sharedProcess/sharedProcess.js' } + ] + } + ) )); gulp.task(optimizeVSCodeTask); @@ -100,7 +137,7 @@ const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${ const minifyVSCodeTask = task.define('minify-vscode', task.series( optimizeVSCodeTask, util.rimraf('out-vscode-min'), - common.minifyTask('out-vscode', `${sourceMappingURLBase}/core`) + optimize.minifyTask('out-vscode', `${sourceMappingURLBase}/core`) )); gulp.task(minifyVSCodeTask); @@ -122,9 +159,9 @@ gulp.task(core); * @return {Object} A map of paths to checksums. */ function computeChecksums(out, filenames) { - let result = {}; + const result = {}; filenames.forEach(function (filename) { - let fullPath = path.join(process.cwd(), out, filename); + const fullPath = path.join(process.cwd(), out, filename); result[filename] = computeChecksum(fullPath); }); return result; @@ -137,9 +174,9 @@ function computeChecksums(out, filenames) { * @return {string} The checksum for `filename`. */ function computeChecksum(filename) { - let contents = fs.readFileSync(filename); + const contents = fs.readFileSync(filename); - let hash = crypto + const hash = crypto .createHash('md5') .update(contents) .digest('base64') @@ -165,8 +202,8 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op 'vs/workbench/workbench.desktop.main.js', 'vs/workbench/workbench.desktop.main.css', 'vs/workbench/api/node/extensionHostProcess.js', - 'vs/code/electron-browser/workbench/workbench.html', - 'vs/code/electron-browser/workbench/workbench.js' + 'vs/code/electron-sandbox/workbench/workbench.html', + 'vs/code/electron-sandbox/workbench/workbench.js' ]); const src = gulp.src(out + '/**', { base: '.' }) @@ -206,7 +243,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op .pipe(json(packageJsonUpdates)); const date = new Date().toISOString(); - const productJsonUpdate = { commit, date, checksums }; + const productJsonUpdate = { commit, date, checksums, version }; if (shouldSetupSettingsSearch()) { productJsonUpdate.settingsSearchBuildId = getSettingsSearchBuildId(packageJson); @@ -240,6 +277,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op '**/node-pty/lib/worker/conoutSocketWorker.js', '**/node-pty/lib/shared/conout.js', '**/*.wasm', + '**/node-vsce-sign/bin/*', ], 'node_modules.asar')); let all = es.merge( @@ -331,6 +369,12 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op result = es.merge(result, gulp.src('resources/win32/VisualElementsManifest.xml', { base: 'resources/win32' }) .pipe(rename(product.nameShort + '.VisualElementsManifest.xml'))); + result = es.merge(result, gulp.src('.build/policies/win32/**', { base: '.build/policies/win32' }) + .pipe(rename(f => f.dirname = `policies/${f.dirname}`))); + + if (quality === 'insider') { + result = es.merge(result, gulp.src('.build/win32/appx/**', { base: '.build/win32' })); + } } else if (platform === 'linux') { result = es.merge(result, gulp.src('resources/linux/bin/code.sh', { base: '.' }) .pipe(replace('@@PRODNAME@@', product.nameLong)) @@ -342,6 +386,35 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op }; } +function patchWin32DependenciesTask(destinationFolderName) { + const cwd = path.join(path.dirname(root), destinationFolderName); + + return async () => { + const deps = await glob('**/*.node', { cwd }); + const packageJson = JSON.parse(await fs.promises.readFile(path.join(cwd, 'resources', 'app', 'package.json'), 'utf8')); + const product = JSON.parse(await fs.promises.readFile(path.join(cwd, 'resources', 'app', 'product.json'), 'utf8')); + const baseVersion = packageJson.version.replace(/-.*$/, ''); + + await Promise.all(deps.map(async dep => { + const basename = path.basename(dep); + + await rcedit(path.join(cwd, dep), { + 'file-version': baseVersion, + 'version-string': { + 'CompanyName': 'Microsoft Corporation', + 'FileDescription': product.nameLong, + 'FileVersion': packageJson.version, + 'InternalName': basename, + 'LegalCopyright': 'Copyright (C) 2022 Microsoft. All rights reserved', + 'OriginalFilename': basename, + 'ProductName': product.nameLong, + 'ProductVersion': packageJson.version, + } + }); + })); + }; +} + const buildRoot = path.dirname(root); const BUILD_TARGETS = [ @@ -365,10 +438,16 @@ BUILD_TARGETS.forEach(buildTarget => { const sourceFolderName = `out-vscode${dashed(minified)}`; const destinationFolderName = `VSCode${dashed(platform)}${dashed(arch)}`; - const vscodeTaskCI = task.define(`vscode${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series( + const tasks = [ util.rimraf(path.join(buildRoot, destinationFolderName)), packageTask(platform, arch, sourceFolderName, destinationFolderName, opts) - )); + ]; + + if (platform === 'win32') { + tasks.push(patchWin32DependenciesTask(destinationFolderName)); + } + + const vscodeTaskCI = task.define(`vscode${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(...tasks)); gulp.task(vscodeTaskCI); const vscodeTask = task.define(`vscode${dashed(platform)}${dashed(arch)}${dashed(minified)}`, task.series( @@ -389,6 +468,8 @@ BUILD_TARGETS.forEach(buildTarget => { } }); +// #region nls + const innoSetupConfig = { 'zh-cn': { codePage: 'CP936', defaultInfo: { name: 'Simplified Chinese', id: '$0804', } }, 'zh-tw': { codePage: 'CP950', defaultInfo: { name: 'Traditional Chinese', id: '$0404' } }, @@ -404,46 +485,23 @@ const innoSetupConfig = { 'tr': { codePage: 'CP1254' } }; -// Transifex Localizations - -const apiHostname = process.env.TRANSIFEX_API_URL; -const apiName = process.env.TRANSIFEX_API_NAME; -const apiToken = process.env.TRANSIFEX_API_TOKEN; - -gulp.task(task.define( - 'vscode-translations-push', - task.series( - compileBuildTask, - compileExtensionsBuildTask, - optimizeVSCodeTask, - function () { - const pathToMetadata = './out-vscode/nls.metadata.json'; - const pathToExtensions = '.build/extensions/*'; - const pathToSetup = 'build/win32/**/{Default.isl,messages.en.isl}'; - - return es.merge( - gulp.src(pathToMetadata).pipe(i18n.createXlfFilesForCoreBundle()), - gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()), - gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions()) - ).pipe(i18n.findObsoleteResources(apiHostname, apiName, apiToken) - ).pipe(i18n.pushXlfFiles(apiHostname, apiName, apiToken)); - } - ) -)); - gulp.task(task.define( 'vscode-translations-export', task.series( - compileBuildTask, + core, compileExtensionsBuildTask, - optimizeVSCodeTask, function () { const pathToMetadata = './out-vscode/nls.metadata.json'; + const pathToRehWebMetadata = './out-vscode-reh-web/nls.metadata.json'; const pathToExtensions = '.build/extensions/*'; const pathToSetup = 'build/win32/i18n/messages.en.isl'; return es.merge( - gulp.src(pathToMetadata).pipe(i18n.createXlfFilesForCoreBundle()), + gulp.src([pathToMetadata, pathToRehWebMetadata]).pipe(merge({ + fileName: 'nls.metadata.json', + jsonSpace: '', + concatArrays: true + })).pipe(i18n.createXlfFilesForCoreBundle()), gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()), gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions()) ).pipe(vfs.dest('../vscode-translations-export')); @@ -451,24 +509,19 @@ gulp.task(task.define( ) )); -gulp.task('vscode-translations-pull', function () { - return es.merge([...i18n.defaultLanguages, ...i18n.extraLanguages].map(language => { - let includeDefault = !!innoSetupConfig[language.id].defaultInfo; - return i18n.pullSetupXlfFiles(apiHostname, apiName, apiToken, language, includeDefault).pipe(vfs.dest(`../vscode-translations-import/${language.id}/setup`)); - })); -}); - gulp.task('vscode-translations-import', function () { - let options = minimist(process.argv.slice(2), { + const options = minimist(process.argv.slice(2), { string: 'location', default: { location: '../vscode-translations-import' } }); return es.merge([...i18n.defaultLanguages, ...i18n.extraLanguages].map(language => { - let id = language.id; + const id = language.id; return gulp.src(`${options.location}/${id}/vscode-setup/messages.xlf`) .pipe(i18n.prepareIslFiles(language, innoSetupConfig[language.id])) .pipe(vfs.dest(`./build/win32/i18n`)); })); }); + +// #endregion diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js index 7d0f70f9bef..cdc887013d8 100644 --- a/build/gulpfile.vscode.linux.js +++ b/build/gulpfile.vscode.linux.js @@ -12,16 +12,22 @@ const shell = require('gulp-shell'); const es = require('event-stream'); const vfs = require('vinyl-fs'); const util = require('./lib/util'); +const { getVersion } = require('./lib/getVersion'); const task = require('./lib/task'); const packageJson = require('../package.json'); const product = require('../product.json'); -const rpmDependenciesGenerator = require('./linux/rpm/dependencies-generator'); +const dependenciesGenerator = require('./linux/dependencies-generator'); +const sysrootInstaller = require('./linux/debian/install-sysroot'); +const debianRecommendedDependencies = require('./linux/debian/dep-lists').recommendedDeps; const path = require('path'); const root = path.dirname(__dirname); -const commit = util.getVersion(root); +const commit = getVersion(root); const linuxPackageRevision = Math.floor(new Date().getTime() / 1000); +/** + * @param {string} arch + */ function getDebPackageArch(arch) { return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64' }[arch]; } @@ -74,12 +80,16 @@ function prepareDebPackage(arch) { let size = 0; const control = code.pipe(es.through( function (f) { size += f.isDirectory() ? 4096 : f.contents.length; }, - function () { + async function () { const that = this; + const sysroot = await sysrootInstaller.getSysroot(debArch); + const dependencies = dependenciesGenerator.getDependencies('deb', binaryDir, product.applicationName, debArch, sysroot); gulp.src('resources/linux/debian/control.template', { base: '.' }) .pipe(replace('@@NAME@@', product.applicationName)) .pipe(replace('@@VERSION@@', packageJson.version + '-' + linuxPackageRevision)) .pipe(replace('@@ARCHITECTURE@@', debArch)) + .pipe(replace('@@DEPENDS@@', dependencies.join(', '))) + .pipe(replace('@@RECOMMENDS@@', debianRecommendedDependencies.join(', '))) .pipe(replace('@@INSTALLEDSIZE@@', Math.ceil(size / 1024))) .pipe(rename('DEBIAN/control')) .pipe(es.through(function (f) { that.emit('data', f); }, function () { that.emit('end'); })); @@ -176,7 +186,7 @@ function prepareRpmPackage(arch) { const code = gulp.src(binaryDir + '/**/*', { base: binaryDir }) .pipe(rename(function (p) { p.dirname = 'BUILD/usr/share/' + product.applicationName + '/' + p.dirname; })); - const dependencies = rpmDependenciesGenerator.getDependencies(binaryDir, product.applicationName, rpmArch); + const dependencies = dependenciesGenerator.getDependencies('rpm', binaryDir, product.applicationName, rpmArch); const spec = gulp.src('resources/linux/rpm/code.spec.template', { base: '.' }) .pipe(replace('@@NAME@@', product.applicationName)) .pipe(replace('@@NAME_LONG@@', product.nameLong)) @@ -210,7 +220,7 @@ function buildRpmPackage(arch) { return shell.task([ 'mkdir -p ' + destination, - 'HOME="$(pwd)/' + destination + '" fakeroot rpmbuild -bb ' + rpmBuildPath + '/SPECS/' + product.applicationName + '.spec --target=' + rpmArch, + 'HOME="$(pwd)/' + destination + '" rpmbuild -bb ' + rpmBuildPath + '/SPECS/' + product.applicationName + '.spec --target=' + rpmArch, 'cp "' + rpmOut + '/$(ls ' + rpmOut + ')" ' + destination + '/' ]); } diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js index f0ad617f405..6de4d03d414 100644 --- a/build/gulpfile.vscode.web.js +++ b/build/gulpfile.vscode.web.js @@ -9,8 +9,9 @@ const gulp = require('gulp'); const path = require('path'); const es = require('event-stream'); const util = require('./lib/util'); +const { getVersion } = require('./lib/getVersion'); const task = require('./lib/task'); -const common = require('./lib/optimize'); +const optimize = require('./lib/optimize'); const product = require('../product.json'); const rename = require('gulp-rename'); const filter = require('gulp-filter'); @@ -26,13 +27,13 @@ const REPO_ROOT = path.dirname(__dirname); const BUILD_ROOT = path.dirname(REPO_ROOT); const WEB_FOLDER = path.join(REPO_ROOT, 'remote', 'web'); -const commit = util.getVersion(REPO_ROOT); +const commit = getVersion(REPO_ROOT); const quality = product.quality; const version = (quality && quality !== 'stable') ? `${packageJson.version}-${quality}` : packageJson.version; const vscodeWebResourceIncludes = [ // Workbench - 'out-build/vs/{base,platform,editor,workbench}/**/*.{svg,png,jpg,opus}', + 'out-build/vs/{base,platform,editor,workbench}/**/*.{svg,png,jpg,mp3}', 'out-build/vs/code/browser/workbench/*.html', 'out-build/vs/base/browser/ui/codicons/codicon/**/*.ttf', 'out-build/vs/**/markdown.css', @@ -70,6 +71,7 @@ const vscodeWebEntryPoints = _.flatten([ buildfile.workerNotebook, buildfile.workerLanguageDetection, buildfile.workerLocalFileSearch, + buildfile.workerProfileAnalysis, buildfile.keyboardMaps, buildfile.workbenchWeb ]); @@ -153,24 +155,28 @@ exports.createVSCodeWebFileContentMapper = createVSCodeWebFileContentMapper; const optimizeVSCodeWebTask = task.define('optimize-vscode-web', task.series( util.rimraf('out-vscode-web'), - common.optimizeTask({ - src: 'out-build', - entryPoints: _.flatten(vscodeWebEntryPoints), - otherSources: [], - resources: vscodeWebResources, - loaderConfig: common.loaderConfig(), - externalLoaderInfo: util.createExternalLoaderConfig(product.webEndpointUrl, commit, quality), - out: 'out-vscode-web', - inlineAmdImages: true, - bundleInfo: undefined, - fileContentMapper: createVSCodeWebFileContentMapper('.build/web/extensions', product) - }) + optimize.optimizeTask( + { + out: 'out-vscode-web', + amd: { + src: 'out-build', + entryPoints: _.flatten(vscodeWebEntryPoints), + otherSources: [], + resources: vscodeWebResources, + loaderConfig: optimize.loaderConfig(), + externalLoaderInfo: util.createExternalLoaderConfig(product.webEndpointUrl, commit, quality), + inlineAmdImages: true, + bundleInfo: undefined, + fileContentMapper: createVSCodeWebFileContentMapper('.build/web/extensions', product) + } + } + ) )); const minifyVSCodeWebTask = task.define('minify-vscode-web', task.series( optimizeVSCodeWebTask, util.rimraf('out-vscode-web-min'), - common.minifyTask('out-vscode-web', `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`) + optimize.minifyTask('out-vscode-web', `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`) )); gulp.task(minifyVSCodeWebTask); @@ -208,7 +214,7 @@ function packageTask(sourceFolderName, destinationFolderName) { gulp.src('resources/server/code-512.png', { base: 'resources/server' }) ); - let all = es.merge( + const all = es.merge( packageJsonStream, license, sources, @@ -218,7 +224,7 @@ function packageTask(sourceFolderName, destinationFolderName) { pwaicons ); - let result = all + const result = all .pipe(util.skipDirectories()) .pipe(util.fixWin32DirectoryPermissions()); @@ -229,7 +235,7 @@ function packageTask(sourceFolderName, destinationFolderName) { const compileWebExtensionsBuildTask = task.define('compile-web-extensions-build', task.series( task.define('clean-web-extensions-build', util.rimraf('.build/web/extensions')), task.define('bundle-web-extensions-build', () => extensions.packageLocalExtensionsStream(true).pipe(gulp.dest('.build/web'))), - task.define('bundle-marketplace-web-extensions-build', () => extensions.packageMarketplaceExtensionsStream(true, product.extensionsGallery?.serviceUrl).pipe(gulp.dest('.build/web'))), + task.define('bundle-marketplace-web-extensions-build', () => extensions.packageMarketplaceExtensionsStream(true).pipe(gulp.dest('.build/web'))), task.define('bundle-web-extension-media-build', () => extensions.buildExtensionMedia(false, '.build/web/extensions')), )); gulp.task(compileWebExtensionsBuildTask); diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js index 81ba5095816..9117a021b5a 100644 --- a/build/gulpfile.vscode.win32.js +++ b/build/gulpfile.vscode.win32.js @@ -87,6 +87,7 @@ function buildWin32Setup(arch, target) { productJson['target'] = target; fs.writeFileSync(productJsonPath, JSON.stringify(productJson, undefined, '\t')); + const quality = product.quality; const definitions = { NameLong: product.nameLong, NameShort: product.nameShort, @@ -109,9 +110,19 @@ function buildWin32Setup(arch, target) { RepoDir: repoPath, OutputDir: outputPath, InstallTarget: target, - ProductJsonPath: productJsonPath + ProductJsonPath: productJsonPath, + Quality: quality }; + if (quality === 'insider') { + const appxPackagePrefix = 'code_insiders'; + definitions['AppxPackage'] = `${appxPackagePrefix}_explorer_${arch}.appx`; + if (arch === 'ia32') { + definitions['AppxPackage'] = `${appxPackagePrefix}_explorer_x86.appx`; + } + definitions['AppxPackageFullname'] = `Microsoft.${product.win32RegValueName}_1.0.0.0_neutral__8wekyb3d8bbwe`; + } + packageInnoSetup(issPath, { definitions }, cb); }; } diff --git a/build/hygiene.js b/build/hygiene.js index 1668e508ec9..67f074c4ac0 100644 --- a/build/hygiene.js +++ b/build/hygiene.js @@ -10,6 +10,7 @@ const vfs = require('vinyl-fs'); const path = require('path'); const fs = require('fs'); const pall = require('p-all'); + const { all, copyrightFilter, unicodeFilter, indentationFilter, tsFormattingFilter, eslintFilter } = require('./filters'); const copyrightHeaderLines = [ @@ -116,8 +117,8 @@ function hygiene(some, linting = true) { }) .then( (result) => { - let original = result.src.replace(/\r\n/gm, '\n'); - let formatted = result.dest.replace(/\r\n/gm, '\n'); + const original = result.src.replace(/\r\n/gm, '\n'); + const formatted = result.dest.replace(/\r\n/gm, '\n'); if (original !== formatted) { console.error( @@ -173,8 +174,7 @@ function hygiene(some, linting = true) { .pipe(filter(eslintFilter)) .pipe( gulpeslint({ - configFile: '.eslintrc.json', - rulePaths: ['./build/lib/eslint'], + configFile: '.eslintrc.json' }) ) .pipe(gulpeslint.formatEach('compact')) @@ -292,7 +292,7 @@ if (require.main === module) { .then( (vinyls) => new Promise((c, e) => - hygiene(es.readArray(vinyls)) + hygiene(es.readArray(vinyls).pipe(filter(all))) .on('end', () => c()) .on('error', e) ) diff --git a/build/lib/asar.js b/build/lib/asar.js index 708005791f6..9ee1616fdfa 100644 --- a/build/lib/asar.js +++ b/build/lib/asar.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); exports.createAsar = void 0; const path = require("path"); @@ -81,7 +81,7 @@ function createAsar(folderPath, unpackGlobs, destFilename) { out.push(file.contents); } }, function () { - let finish = () => { + const finish = () => { { const headerPickle = pickle.createEmpty(); headerPickle.writeString(JSON.stringify(filesystem.header)); diff --git a/build/lib/asar.ts b/build/lib/asar.ts index 18ab7b01946..44a6416bdfb 100644 --- a/build/lib/asar.ts +++ b/build/lib/asar.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as path from 'path'; import * as es from 'event-stream'; const pickle = require('chromium-pickle-js'); @@ -98,7 +96,7 @@ export function createAsar(folderPath: string, unpackGlobs: string[], destFilena } }, function () { - let finish = () => { + const finish = () => { { const headerPickle = pickle.createEmpty(); headerPickle.writeString(JSON.stringify(filesystem.header)); diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js index 2671a5a3a6c..38c30234b7e 100644 --- a/build/lib/builtInExtensions.js +++ b/build/lib/builtInExtensions.js @@ -4,7 +4,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ Object.defineProperty(exports, "__esModule", { value: true }); -exports.getBuiltInExtensions = void 0; +exports.getBuiltInExtensions = exports.getExtensionStream = void 0; const fs = require("fs"); const path = require("path"); const os = require("os"); @@ -44,6 +44,21 @@ function isUpToDate(extension) { return false; } } +function getExtensionDownloadStream(extension) { + const galleryServiceUrl = productjson.extensionsGallery?.serviceUrl; + return (galleryServiceUrl ? ext.fromMarketplace(galleryServiceUrl, extension) : ext.fromGithub(extension)) + .pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`)); +} +function getExtensionStream(extension) { + // if the extension exists on disk, use those files instead of downloading anew + if (isUpToDate(extension)) { + log('[extensions]', `${extension.name}@${extension.version} up to date`, ansiColors.green('✔ī¸Ž')); + return vfs.src(['**'], { cwd: getExtensionPath(extension), dot: true }) + .pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`)); + } + return getExtensionDownloadStream(extension); +} +exports.getExtensionStream = getExtensionStream; function syncMarketplaceExtension(extension) { const galleryServiceUrl = productjson.extensionsGallery?.serviceUrl; const source = ansiColors.blue(galleryServiceUrl ? '[marketplace]' : '[github]'); @@ -52,8 +67,7 @@ function syncMarketplaceExtension(extension) { return es.readArray([]); } rimraf.sync(getExtensionPath(extension)); - return (galleryServiceUrl ? ext.fromMarketplace(galleryServiceUrl, extension) : ext.fromGithub(extension)) - .pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`)) + return getExtensionDownloadStream(extension) .pipe(vfs.dest('.build/builtInExtensions')) .on('end', () => log(source, extension.name, ansiColors.green('✔ī¸Ž'))); } @@ -102,7 +116,7 @@ function getBuiltInExtensions() { const control = readControlFile(); const streams = []; for (const extension of [...builtInExtensions, ...webBuiltInExtensions]) { - let controlState = control[extension.name] || 'marketplace'; + const controlState = control[extension.name] || 'marketplace'; control[extension.name] = controlState; streams.push(syncExtension(extension, controlState)); } diff --git a/build/lib/builtInExtensions.ts b/build/lib/builtInExtensions.ts index 1abc85b3b09..912e05653ac 100644 --- a/build/lib/builtInExtensions.ts +++ b/build/lib/builtInExtensions.ts @@ -68,10 +68,26 @@ function isUpToDate(extension: IExtensionDefinition): boolean { } } +function getExtensionDownloadStream(extension: IExtensionDefinition) { + const galleryServiceUrl = productjson.extensionsGallery?.serviceUrl; + return (galleryServiceUrl ? ext.fromMarketplace(galleryServiceUrl, extension) : ext.fromGithub(extension)) + .pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`)); +} + +export function getExtensionStream(extension: IExtensionDefinition) { + // if the extension exists on disk, use those files instead of downloading anew + if (isUpToDate(extension)) { + log('[extensions]', `${extension.name}@${extension.version} up to date`, ansiColors.green('✔ī¸Ž')); + return vfs.src(['**'], { cwd: getExtensionPath(extension), dot: true }) + .pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`)); + } + + return getExtensionDownloadStream(extension); +} + function syncMarketplaceExtension(extension: IExtensionDefinition): Stream { const galleryServiceUrl = productjson.extensionsGallery?.serviceUrl; const source = ansiColors.blue(galleryServiceUrl ? '[marketplace]' : '[github]'); - if (isUpToDate(extension)) { log(source, `${extension.name}@${extension.version}`, ansiColors.green('✔ī¸Ž')); return es.readArray([]); @@ -79,8 +95,7 @@ function syncMarketplaceExtension(extension: IExtensionDefinition): Stream { rimraf.sync(getExtensionPath(extension)); - return (galleryServiceUrl ? ext.fromMarketplace(galleryServiceUrl, extension) : ext.fromGithub(extension)) - .pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`)) + return getExtensionDownloadStream(extension) .pipe(vfs.dest('.build/builtInExtensions')) .on('end', () => log(source, extension.name, ansiColors.green('✔ī¸Ž'))); } @@ -143,7 +158,7 @@ export function getBuiltInExtensions(): Promise { const streams: Stream[] = []; for (const extension of [...builtInExtensions, ...webBuiltInExtensions]) { - let controlState = control[extension.name] || 'marketplace'; + const controlState = control[extension.name] || 'marketplace'; control[extension.name] = controlState; streams.push(syncExtension(extension, controlState)); diff --git a/build/lib/bundle.js b/build/lib/bundle.js index 8c1967d4c68..497ac4fb67e 100644 --- a/build/lib/bundle.js +++ b/build/lib/bundle.js @@ -42,14 +42,20 @@ function bundle(entryPoints, config, callback) { if (!config.paths['vs/css']) { config.paths['vs/css'] = 'out-build/vs/css.build'; } + config.buildForceInvokeFactory = config.buildForceInvokeFactory || {}; + config.buildForceInvokeFactory['vs/nls'] = true; + config.buildForceInvokeFactory['vs/css'] = true; loader.config(config); loader(['require'], (localRequire) => { - const resolvePath = (path) => { - const r = localRequire.toUrl(path); - if (!/\.js/.test(r)) { - return r + '.js'; + const resolvePath = (entry) => { + let r = localRequire.toUrl(entry.path); + if (!r.endsWith('.js')) { + r += '.js'; } - return r; + // avoid packaging the build version of plugins: + r = r.replace('vs/nls.build.js', 'vs/nls.js'); + r = r.replace('vs/css.build.js', 'vs/css.js'); + return { path: r, amdModuleId: entry.amdModuleId }; }; for (const moduleId in entryPointsMap) { const entryPoint = entryPointsMap[moduleId]; @@ -298,9 +304,18 @@ function emitEntryPoint(modulesMap, deps, entryPoint, includedModules, prepend, if (module.shim) { mainResult.sources.push(emitShimmedModule(c, deps[c], module.shim, module.path, contents)); } - else { + else if (module.defineLocation) { mainResult.sources.push(emitNamedModule(c, module.defineLocation, module.path, contents)); } + else { + const moduleCopy = { + id: module.id, + path: module.path, + defineLocation: module.defineLocation, + dependencies: module.dependencies + }; + throw new Error(`Cannot bundle module '${module.id}' for entry point '${entryPoint}' because it has no shim and it lacks a defineLocation: ${JSON.stringify(moduleCopy)}`); + } }); Object.keys(usedPlugins).forEach((pluginName) => { const plugin = usedPlugins[pluginName]; @@ -321,10 +336,13 @@ function emitEntryPoint(modulesMap, deps, entryPoint, includedModules, prepend, plugin.writeFile(pluginName, entryPoint, req, write, {}); } }); - const toIFile = (path) => { - const contents = readFileAndRemoveBOM(path); + const toIFile = (entry) => { + let contents = readFileAndRemoveBOM(entry.path); + if (entry.amdModuleId) { + contents = contents.replace(/^define\(/m, `define("${entry.amdModuleId}",`); + } return { - path: path, + path: entry.path, contents: contents }; }; diff --git a/build/lib/bundle.ts b/build/lib/bundle.ts index a1130d4bbbd..c5fdc2da18c 100644 --- a/build/lib/bundle.ts +++ b/build/lib/bundle.ts @@ -15,7 +15,7 @@ interface IPosition { interface IBuildModuleInfo { id: string; path: string; - defineLocation: IPosition; + defineLocation: IPosition | null; dependencies: string[]; shim: string; exports: any; @@ -42,12 +42,17 @@ interface ILoaderPluginReqFunc { toUrl(something: string): string; } +export interface IExtraFile { + path: string; + amdModuleId?: string; +} + export interface IEntryPoint { name: string; include?: string[]; exclude?: string[]; - prepend?: string[]; - append?: string[]; + prepend?: IExtraFile[]; + append?: IExtraFile[]; dest?: string; } @@ -92,6 +97,13 @@ interface IPartialBundleResult { export interface ILoaderConfig { isBuild?: boolean; paths?: { [path: string]: any }; + /* + * Normally, during a build, no module factories are invoked. This can be used + * to forcefully execute a module's factory. + */ + buildForceInvokeFactory: { + [moduleId: string]: boolean; + }; } /** @@ -132,15 +144,21 @@ export function bundle(entryPoints: IEntryPoint[], config: ILoaderConfig, callba if (!config.paths['vs/css']) { config.paths['vs/css'] = 'out-build/vs/css.build'; } + config.buildForceInvokeFactory = config.buildForceInvokeFactory || {}; + config.buildForceInvokeFactory['vs/nls'] = true; + config.buildForceInvokeFactory['vs/css'] = true; loader.config(config); loader(['require'], (localRequire: any) => { - const resolvePath = (path: string) => { - const r = localRequire.toUrl(path); - if (!/\.js/.test(r)) { - return r + '.js'; + const resolvePath = (entry: IExtraFile) => { + let r = localRequire.toUrl(entry.path); + if (!r.endsWith('.js')) { + r += '.js'; } - return r; + // avoid packaging the build version of plugins: + r = r.replace('vs/nls.build.js', 'vs/nls.js'); + r = r.replace('vs/css.build.js', 'vs/css.js'); + return { path: r, amdModuleId: entry.amdModuleId }; }; for (const moduleId in entryPointsMap) { const entryPoint = entryPointsMap[moduleId]; @@ -403,8 +421,8 @@ function emitEntryPoint( deps: IGraph, entryPoint: string, includedModules: string[], - prepend: string[], - append: string[], + prepend: IExtraFile[], + append: IExtraFile[], dest: string | undefined ): IEmitEntryPointResult { if (!dest) { @@ -444,8 +462,16 @@ function emitEntryPoint( if (module.shim) { mainResult.sources.push(emitShimmedModule(c, deps[c], module.shim, module.path, contents)); - } else { + } else if (module.defineLocation) { mainResult.sources.push(emitNamedModule(c, module.defineLocation, module.path, contents)); + } else { + const moduleCopy = { + id: module.id, + path: module.path, + defineLocation: module.defineLocation, + dependencies: module.dependencies + }; + throw new Error(`Cannot bundle module '${module.id}' for entry point '${entryPoint}' because it has no shim and it lacks a defineLocation: ${JSON.stringify(moduleCopy)}`); } }); @@ -470,10 +496,13 @@ function emitEntryPoint( } }); - const toIFile = (path: string): IFile => { - const contents = readFileAndRemoveBOM(path); + const toIFile = (entry: IExtraFile): IFile => { + let contents = readFileAndRemoveBOM(entry.path); + if (entry.amdModuleId) { + contents = contents.replace(/^define\(/m, `define("${entry.amdModuleId}",`); + } return { - path: path, + path: entry.path, contents: contents }; }; diff --git a/build/lib/compilation.js b/build/lib/compilation.js index db489e01f9d..f5d46d7b20c 100644 --- a/build/lib/compilation.js +++ b/build/lib/compilation.js @@ -1,10 +1,10 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); -exports.watchApiProposalNamesTask = exports.compileApiProposalNamesTask = exports.watchTask = exports.compileTask = void 0; +exports.watchApiProposalNamesTask = exports.compileApiProposalNamesTask = exports.watchTask = exports.compileTask = exports.transpileTask = void 0; const es = require("event-stream"); const fs = require("fs"); const gulp = require("gulp"); @@ -19,10 +19,11 @@ const os = require("os"); const File = require("vinyl"); const task = require("./task"); const watch = require('./watch'); +// --- gulp-tsb: compile and transpile -------------------------------- const reporter = (0, reporter_1.createReporter)(); function getTypeScriptCompilerOptions(src) { const rootDir = path.join(__dirname, `../../${src}`); - let options = {}; + const options = {}; options.verbose = false; options.sourceMap = true; if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry @@ -34,7 +35,7 @@ function getTypeScriptCompilerOptions(src) { options.newLine = /\r\n/.test(fs.readFileSync(__filename, 'utf8')) ? 0 : 1; return options; } -function createCompile(src, build, emitError) { +function createCompile(src, build, emitError, transpileOnly) { const tsb = require('./tsb'); const sourcemaps = require('gulp-sourcemaps'); const projectPath = path.join(__dirname, '../../', src, 'tsconfig.json'); @@ -42,7 +43,11 @@ function createCompile(src, build, emitError) { if (!build) { overrideOptions.inlineSourceMap = true; } - const compilation = tsb.create(projectPath, overrideOptions, false, err => reporter(err)); + const compilation = tsb.create(projectPath, overrideOptions, { + verbose: false, + transpileOnly: Boolean(transpileOnly), + transpileWithSwc: typeof transpileOnly !== 'boolean' && transpileOnly.swc + }, err => reporter(err)); function pipeline(token) { const bom = require('gulp-bom'); const utf8Filter = util.filter(data => /(\/|\\)test(\/|\\).*utf8/.test(data.path)); @@ -59,7 +64,7 @@ function createCompile(src, build, emitError) { .pipe(noDeclarationsFilter) .pipe(build ? nls.nls() : es.through()) .pipe(noDeclarationsFilter.restore) - .pipe(sourcemaps.write('.', { + .pipe(transpileOnly ? es.through() : sourcemaps.write('.', { addComment: false, includeContent: !!build, sourceRoot: overrideOptions.sourceRoot @@ -73,14 +78,24 @@ function createCompile(src, build, emitError) { }; return pipeline; } +function transpileTask(src, out, swc) { + return function () { + const transpile = createCompile(src, false, true, { swc }); + const srcPipe = gulp.src(`${src}/**`, { base: `${src}` }); + return srcPipe + .pipe(transpile()) + .pipe(gulp.dest(out)); + }; +} +exports.transpileTask = transpileTask; function compileTask(src, out, build) { return function () { if (os.totalmem() < 4000000000) { throw new Error('compilation requires 4GB of RAM'); } - const compile = createCompile(src, build, true); + const compile = createCompile(src, build, true, false); const srcPipe = gulp.src(`${src}/**`, { base: `${src}` }); - let generator = new MonacoGenerator(false); + const generator = new MonacoGenerator(false); if (src === 'src') { generator.execute(); } @@ -93,10 +108,10 @@ function compileTask(src, out, build) { exports.compileTask = compileTask; function watchTask(out, build) { return function () { - const compile = createCompile('src', build); + const compile = createCompile('src', build, false, false); const src = gulp.src('src/**', { base: 'src' }); const watchSrc = watch('src/**', { base: 'src', readDelay: 200 }); - let generator = new MonacoGenerator(true); + const generator = new MonacoGenerator(true); generator.execute(); return watchSrc .pipe(generator.stream) @@ -112,7 +127,7 @@ class MonacoGenerator { this._isWatch = isWatch; this.stream = es.through(); this._watchedFiles = {}; - let onWillReadFile = (moduleId, filePath) => { + const onWillReadFile = (moduleId, filePath) => { if (!this._isWatch) { return; } @@ -149,7 +164,7 @@ class MonacoGenerator { }, 20); } _run() { - let r = monacodts.run3(this._declarationResolver); + const r = monacodts.run3(this._declarationResolver); if (!r && !this._isWatch) { // The build must always be able to generate the monaco.d.ts throw new Error(`monaco.d.ts generation error - Cannot continue`); @@ -178,6 +193,15 @@ class MonacoGenerator { } } function generateApiProposalNames() { + let eol; + try { + const src = fs.readFileSync('src/vs/workbench/services/extensions/common/extensionsApiProposals.ts', 'utf-8'); + const match = /\r?\n/m.exec(src); + eol = match ? match[0] : os.EOL; + } + catch { + eol = os.EOL; + } const pattern = /vscode\.proposed\.([a-zA-Z]+)\.d\.ts$/; const proposalNames = new Set(); const input = es.through(); @@ -200,11 +224,11 @@ function generateApiProposalNames() { '// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.', '', 'export const allApiProposals = Object.freeze({', - `${names.map(name => `\t${name}: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.${name}.d.ts'`).join(`,${os.EOL}`)}`, + `${names.map(name => `\t${name}: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.${name}.d.ts'`).join(`,${eol}`)}`, '});', 'export type ApiProposalName = keyof typeof allApiProposals;', '', - ].join(os.EOL); + ].join(eol); this.emit('data', new File({ path: 'vs/workbench/services/extensions/common/extensionsApiProposals.ts', contents: Buffer.from(contents) diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts index d40b6139cc0..b9769822d73 100644 --- a/build/lib/compilation.ts +++ b/build/lib/compilation.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as es from 'event-stream'; import * as fs from 'fs'; import * as gulp from 'gulp'; @@ -19,14 +17,16 @@ import * as os from 'os'; import ts = require('typescript'); import * as File from 'vinyl'; import * as task from './task'; - const watch = require('./watch'); + +// --- gulp-tsb: compile and transpile -------------------------------- + const reporter = createReporter(); function getTypeScriptCompilerOptions(src: string): ts.CompilerOptions { const rootDir = path.join(__dirname, `../../${src}`); - let options: ts.CompilerOptions = {}; + const options: ts.CompilerOptions = {}; options.verbose = false; options.sourceMap = true; if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry @@ -39,7 +39,7 @@ function getTypeScriptCompilerOptions(src: string): ts.CompilerOptions { return options; } -function createCompile(src: string, build: boolean, emitError?: boolean) { +function createCompile(src: string, build: boolean, emitError: boolean, transpileOnly: boolean | { swc: boolean }) { const tsb = require('./tsb') as typeof import('./tsb'); const sourcemaps = require('gulp-sourcemaps') as typeof import('gulp-sourcemaps'); @@ -50,7 +50,11 @@ function createCompile(src: string, build: boolean, emitError?: boolean) { overrideOptions.inlineSourceMap = true; } - const compilation = tsb.create(projectPath, overrideOptions, false, err => reporter(err)); + const compilation = tsb.create(projectPath, overrideOptions, { + verbose: false, + transpileOnly: Boolean(transpileOnly), + transpileWithSwc: typeof transpileOnly !== 'boolean' && transpileOnly.swc + }, err => reporter(err)); function pipeline(token?: util.ICancellationToken) { const bom = require('gulp-bom') as typeof import('gulp-bom'); @@ -70,7 +74,7 @@ function createCompile(src: string, build: boolean, emitError?: boolean) { .pipe(noDeclarationsFilter) .pipe(build ? nls.nls() : es.through()) .pipe(noDeclarationsFilter.restore) - .pipe(sourcemaps.write('.', { + .pipe(transpileOnly ? es.through() : sourcemaps.write('.', { addComment: false, includeContent: !!build, sourceRoot: overrideOptions.sourceRoot @@ -86,6 +90,19 @@ function createCompile(src: string, build: boolean, emitError?: boolean) { return pipeline; } +export function transpileTask(src: string, out: string, swc: boolean): () => NodeJS.ReadWriteStream { + + return function () { + + const transpile = createCompile(src, false, true, { swc }); + const srcPipe = gulp.src(`${src}/**`, { base: `${src}` }); + + return srcPipe + .pipe(transpile()) + .pipe(gulp.dest(out)); + }; +} + export function compileTask(src: string, out: string, build: boolean): () => NodeJS.ReadWriteStream { return function () { @@ -94,9 +111,9 @@ export function compileTask(src: string, out: string, build: boolean): () => Nod throw new Error('compilation requires 4GB of RAM'); } - const compile = createCompile(src, build, true); + const compile = createCompile(src, build, true, false); const srcPipe = gulp.src(`${src}/**`, { base: `${src}` }); - let generator = new MonacoGenerator(false); + const generator = new MonacoGenerator(false); if (src === 'src') { generator.execute(); } @@ -111,12 +128,12 @@ export function compileTask(src: string, out: string, build: boolean): () => Nod export function watchTask(out: string, build: boolean): () => NodeJS.ReadWriteStream { return function () { - const compile = createCompile('src', build); + const compile = createCompile('src', build, false, false); const src = gulp.src('src/**', { base: 'src' }); const watchSrc = watch('src/**', { base: 'src', readDelay: 200 }); - let generator = new MonacoGenerator(true); + const generator = new MonacoGenerator(true); generator.execute(); return watchSrc @@ -140,7 +157,7 @@ class MonacoGenerator { this._isWatch = isWatch; this.stream = es.through(); this._watchedFiles = {}; - let onWillReadFile = (moduleId: string, filePath: string) => { + const onWillReadFile = (moduleId: string, filePath: string) => { if (!this._isWatch) { return; } @@ -182,7 +199,7 @@ class MonacoGenerator { } private _run(): monacodts.IMonacoDeclarationResult | null { - let r = monacodts.run3(this._declarationResolver); + const r = monacodts.run3(this._declarationResolver); if (!r && !this._isWatch) { // The build must always be able to generate the monaco.d.ts throw new Error(`monaco.d.ts generation error - Cannot continue`); @@ -215,6 +232,16 @@ class MonacoGenerator { } function generateApiProposalNames() { + let eol: string; + + try { + const src = fs.readFileSync('src/vs/workbench/services/extensions/common/extensionsApiProposals.ts', 'utf-8'); + const match = /\r?\n/m.exec(src); + eol = match ? match[0] : os.EOL; + } catch { + eol = os.EOL; + } + const pattern = /vscode\.proposed\.([a-zA-Z]+)\.d\.ts$/; const proposalNames = new Set(); @@ -239,11 +266,11 @@ function generateApiProposalNames() { '// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.', '', 'export const allApiProposals = Object.freeze({', - `${names.map(name => `\t${name}: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.${name}.d.ts'`).join(`,${os.EOL}`)}`, + `${names.map(name => `\t${name}: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.${name}.d.ts'`).join(`,${eol}`)}`, '});', 'export type ApiProposalName = keyof typeof allApiProposals;', '', - ].join(os.EOL); + ].join(eol); this.emit('data', new File({ path: 'vs/workbench/services/extensions/common/extensionsApiProposals.ts', diff --git a/build/lib/dependencies.js b/build/lib/dependencies.js index cbc6cec9d81..3b5a9e3e098 100644 --- a/build/lib/dependencies.js +++ b/build/lib/dependencies.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); exports.getProductionDependencies = void 0; const path = require("path"); diff --git a/build/lib/dependencies.ts b/build/lib/dependencies.ts index 516da11be67..eb195154924 100644 --- a/build/lib/dependencies.ts +++ b/build/lib/dependencies.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as path from 'path'; import * as cp from 'child_process'; import * as _ from 'underscore'; diff --git a/build/lib/electron.js b/build/lib/electron.js index 362f6c38e69..38f13d0ff08 100644 --- a/build/lib/electron.js +++ b/build/lib/electron.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); exports.config = void 0; const fs = require("fs"); @@ -11,12 +11,13 @@ const vfs = require("vinyl-fs"); const filter = require("gulp-filter"); const _ = require("underscore"); const util = require("./util"); +const getVersion_1 = require("./getVersion"); function isDocumentSuffix(str) { return str === 'document' || str === 'script' || str === 'file' || str === 'source code'; } const root = path.dirname(path.dirname(__dirname)); const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8')); -const commit = util.getVersion(root); +const commit = (0, getVersion_1.getVersion)(root); const darwinCreditsTemplate = product.darwinCredits && _.template(fs.readFileSync(path.join(root, product.darwinCredits), 'utf8')); /** * Generate a `DarwinDocumentType` given a list of file extensions, an icon name, and an optional suffix or file type name. @@ -152,6 +153,7 @@ exports.config = { 'F# script': ['fsx', 'fsscript'], 'SVG document': ['svg', 'svgz'], 'TOML document': 'toml', + 'Swift source code': 'swift', }, 'default'), // Default icon with default name darwinBundleDocumentType([ diff --git a/build/lib/electron.ts b/build/lib/electron.ts index ed91f8c2f71..247de01c563 100644 --- a/build/lib/electron.ts +++ b/build/lib/electron.ts @@ -3,14 +3,13 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as fs from 'fs'; import * as path from 'path'; import * as vfs from 'vinyl-fs'; import * as filter from 'gulp-filter'; import * as _ from 'underscore'; import * as util from './util'; +import { getVersion } from './getVersion'; type DarwinDocumentSuffix = 'document' | 'script' | 'file' | 'source code'; type DarwinDocumentType = { @@ -28,7 +27,7 @@ function isDocumentSuffix(str?: string): str is DarwinDocumentSuffix { const root = path.dirname(path.dirname(__dirname)); const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8')); -const commit = util.getVersion(root); +const commit = getVersion(root); const darwinCreditsTemplate = product.darwinCredits && _.template(fs.readFileSync(path.join(root, product.darwinCredits), 'utf8')); @@ -169,6 +168,7 @@ export const config = { 'F# script': ['fsx', 'fsscript'], 'SVG document': ['svg', 'svgz'], 'TOML document': 'toml', + 'Swift source code': 'swift', }, 'default'), // Default icon with default name darwinBundleDocumentType([ diff --git a/build/lib/eslint/code-import-patterns.js b/build/lib/eslint/code-import-patterns.js deleted file mode 100644 index 47cc3063d1c..00000000000 --- a/build/lib/eslint/code-import-patterns.js +++ /dev/null @@ -1,199 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -const path = require("path"); -const minimatch = require("minimatch"); -const utils_1 = require("./utils"); -const REPO_ROOT = path.normalize(path.join(__dirname, '../../../')); -function isLayerAllowRule(option) { - return !!(option.when && option.allow); -} -/** - * Returns the filename relative to the project root and using `/` as separators - */ -function getRelativeFilename(context) { - const filename = path.normalize(context.getFilename()); - return filename.substring(REPO_ROOT.length).replace(/\\/g, '/'); -} -module.exports = new class { - constructor() { - this.meta = { - messages: { - badImport: 'Imports violates \'{{restrictions}}\' restrictions. See https://github.com/microsoft/vscode/wiki/Source-Code-Organization', - badFilename: 'Missing definition in `code-import-patterns` for this file. Define rules at https://github.com/microsoft/vscode/blob/main/.eslintrc.json' - }, - docs: { - url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization' - } - }; - this._optionsCache = new WeakMap(); - } - create(context) { - const options = context.options; - const configs = this._processOptions(options); - const relativeFilename = getRelativeFilename(context); - for (const config of configs) { - if (minimatch(relativeFilename, config.target)) { - return (0, utils_1.createImportRuleListener)((node, value) => this._checkImport(context, config, node, value)); - } - } - context.report({ - loc: { line: 1, column: 0 }, - messageId: 'badFilename' - }); - return {}; - } - _processOptions(options) { - if (this._optionsCache.has(options)) { - return this._optionsCache.get(options); - } - function orSegment(variants) { - return (variants.length === 1 ? variants[0] : `{${variants.join(',')}}`); - } - const layerRules = [ - { layer: 'common', deps: orSegment(['common']) }, - { layer: 'worker', deps: orSegment(['common', 'worker']) }, - { layer: 'browser', deps: orSegment(['common', 'browser']), isBrowser: true }, - { layer: 'electron-sandbox', deps: orSegment(['common', 'browser', 'electron-sandbox']), isBrowser: true }, - { layer: 'node', deps: orSegment(['common', 'node']), isNode: true }, - { layer: 'electron-browser', deps: orSegment(['common', 'browser', 'node', 'electron-sandbox', 'electron-browser']), isBrowser: true, isNode: true }, - { layer: 'electron-main', deps: orSegment(['common', 'node', 'electron-main']), isNode: true }, - ]; - let browserAllow = []; - let nodeAllow = []; - let testAllow = []; - for (const option of options) { - if (isLayerAllowRule(option)) { - if (option.when === 'hasBrowser') { - browserAllow = option.allow.slice(0); - } - else if (option.when === 'hasNode') { - nodeAllow = option.allow.slice(0); - } - else if (option.when === 'test') { - testAllow = option.allow.slice(0); - } - } - } - function findLayer(layer) { - for (const layerRule of layerRules) { - if (layerRule.layer === layer) { - return layerRule; - } - } - return null; - } - function generateConfig(layerRule, target, rawRestrictions) { - const restrictions = []; - const testRestrictions = [...testAllow]; - if (layerRule.isBrowser) { - restrictions.push(...browserAllow); - } - if (layerRule.isNode) { - restrictions.push(...nodeAllow); - } - for (const rawRestriction of rawRestrictions) { - let importPattern; - let when = undefined; - if (typeof rawRestriction === 'string') { - importPattern = rawRestriction; - } - else { - importPattern = rawRestriction.pattern; - when = rawRestriction.when; - } - if (typeof when === 'undefined' - || (when === 'hasBrowser' && layerRule.isBrowser) - || (when === 'hasNode' && layerRule.isNode)) { - restrictions.push(importPattern.replace(/\/\~$/, `/${layerRule.deps}/**`)); - testRestrictions.push(importPattern.replace(/\/\~$/, `/test/${layerRule.deps}/**`)); - } - else if (when === 'test') { - testRestrictions.push(importPattern.replace(/\/\~$/, `/${layerRule.deps}/**`)); - testRestrictions.push(importPattern.replace(/\/\~$/, `/test/${layerRule.deps}/**`)); - } - } - testRestrictions.push(...restrictions); - return [ - { - target: target.replace(/\/\~$/, `/${layerRule.layer}/**`), - restrictions: restrictions - }, - { - target: target.replace(/\/\~$/, `/test/${layerRule.layer}/**`), - restrictions: testRestrictions - } - ]; - } - const configs = []; - for (const option of options) { - if (isLayerAllowRule(option)) { - continue; - } - const target = option.target; - const targetIsVS = /^src\/vs\//.test(target); - const restrictions = (typeof option.restrictions === 'string' ? [option.restrictions] : option.restrictions).slice(0); - if (targetIsVS) { - // Always add "vs/nls" - restrictions.push('vs/nls'); - } - if (targetIsVS && option.layer) { - // single layer => simple substitution for /~ - const layerRule = findLayer(option.layer); - if (layerRule) { - const [config, testConfig] = generateConfig(layerRule, target, restrictions); - if (option.test) { - configs.push(testConfig); - } - else { - configs.push(config); - } - } - } - else if (targetIsVS && /\/\~$/.test(target)) { - // generate all layers - for (const layerRule of layerRules) { - const [config, testConfig] = generateConfig(layerRule, target, restrictions); - configs.push(config); - configs.push(testConfig); - } - } - else { - configs.push({ target, restrictions: restrictions.filter(r => typeof r === 'string') }); - } - } - this._optionsCache.set(options, configs); - return configs; - } - _checkImport(context, config, node, importPath) { - // resolve relative paths - if (importPath[0] === '.') { - const relativeFilename = getRelativeFilename(context); - importPath = path.posix.join(path.posix.dirname(relativeFilename), importPath); - if (/^src\/vs\//.test(importPath)) { - // resolve using AMD base url - importPath = importPath.substring('src/'.length); - } - } - const restrictions = config.restrictions; - let matched = false; - for (const pattern of restrictions) { - if (minimatch(importPath, pattern)) { - matched = true; - break; - } - } - if (!matched) { - // None of the restrictions matched - context.report({ - loc: node.loc, - messageId: 'badImport', - data: { - restrictions: restrictions.join(' or ') - } - }); - } - } -}; diff --git a/build/lib/eslint/code-layering.js b/build/lib/eslint/code-layering.js deleted file mode 100644 index bcb413d9db3..00000000000 --- a/build/lib/eslint/code-layering.js +++ /dev/null @@ -1,68 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -const path_1 = require("path"); -const utils_1 = require("./utils"); -module.exports = new class { - constructor() { - this.meta = { - messages: { - layerbreaker: 'Bad layering. You are not allowed to access {{from}} from here, allowed layers are: [{{allowed}}]' - }, - docs: { - url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization' - } - }; - } - create(context) { - const fileDirname = (0, path_1.dirname)(context.getFilename()); - const parts = fileDirname.split(/\\|\//); - const ruleArgs = context.options[0]; - let config; - for (let i = parts.length - 1; i >= 0; i--) { - if (ruleArgs[parts[i]]) { - config = { - allowed: new Set(ruleArgs[parts[i]]).add(parts[i]), - disallowed: new Set() - }; - Object.keys(ruleArgs).forEach(key => { - if (!config.allowed.has(key)) { - config.disallowed.add(key); - } - }); - break; - } - } - if (!config) { - // nothing - return {}; - } - return (0, utils_1.createImportRuleListener)((node, path) => { - if (path[0] === '.') { - path = (0, path_1.join)((0, path_1.dirname)(context.getFilename()), path); - } - const parts = (0, path_1.dirname)(path).split(/\\|\//); - for (let i = parts.length - 1; i >= 0; i--) { - const part = parts[i]; - if (config.allowed.has(part)) { - // GOOD - same layer - break; - } - if (config.disallowed.has(part)) { - // BAD - wrong layer - context.report({ - loc: node.loc, - messageId: 'layerbreaker', - data: { - from: part, - allowed: [...config.allowed.keys()].join(', ') - } - }); - break; - } - } - }); - } -}; diff --git a/build/lib/eslint/code-no-look-behind-regex.js b/build/lib/eslint/code-no-look-behind-regex.js deleted file mode 100644 index 7c9c624a407..00000000000 --- a/build/lib/eslint/code-no-look-behind-regex.js +++ /dev/null @@ -1,42 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -'use strict'; -Object.defineProperty(exports, "__esModule", { value: true }); -//------------------------------------------------------------------------------ -// Rule Definition -//------------------------------------------------------------------------------ -const _positiveLookBehind = /\(\?<=.+/; -const _negativeLookBehind = /\(\? { - const pattern = node.regex?.pattern; - if (_containsLookBehind(pattern)) { - context.report({ - node, - message: 'Look behind assertions are not yet supported in all browsers' - }); - } - }, - // new Regex("...") - ['NewExpression[callee.name="RegExp"] Literal']: (node) => { - if (_containsLookBehind(node.value)) { - context.report({ - node, - message: 'Look behind assertions are not yet supported in all browsers' - }); - } - } - }; - } -}; diff --git a/build/lib/eslint/code-no-nls-in-standalone-editor.js b/build/lib/eslint/code-no-nls-in-standalone-editor.js deleted file mode 100644 index 36782a4b5bc..00000000000 --- a/build/lib/eslint/code-no-nls-in-standalone-editor.js +++ /dev/null @@ -1,38 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -const path_1 = require("path"); -const utils_1 = require("./utils"); -module.exports = new class NoNlsInStandaloneEditorRule { - constructor() { - this.meta = { - messages: { - noNls: 'Not allowed to import vs/nls in standalone editor modules. Use standaloneStrings.ts' - } - }; - } - create(context) { - const fileName = context.getFilename(); - if (/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(fileName) - || /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(fileName) - || /vs(\/|\\)editor(\/|\\)editor.api/.test(fileName) - || /vs(\/|\\)editor(\/|\\)editor.main/.test(fileName) - || /vs(\/|\\)editor(\/|\\)editor.worker/.test(fileName)) { - return (0, utils_1.createImportRuleListener)((node, path) => { - // resolve relative paths - if (path[0] === '.') { - path = (0, path_1.join)(context.getFilename(), path); - } - if (/vs(\/|\\)nls/.test(path)) { - context.report({ - loc: node.loc, - messageId: 'noNls' - }); - } - }); - } - return {}; - } -}; diff --git a/build/lib/eslint/code-no-standalone-editor.js b/build/lib/eslint/code-no-standalone-editor.js deleted file mode 100644 index c57bd560bcf..00000000000 --- a/build/lib/eslint/code-no-standalone-editor.js +++ /dev/null @@ -1,41 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -const path_1 = require("path"); -const utils_1 = require("./utils"); -module.exports = new class NoNlsInStandaloneEditorRule { - constructor() { - this.meta = { - messages: { - badImport: 'Not allowed to import standalone editor modules.' - }, - docs: { - url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization' - } - }; - } - create(context) { - if (/vs(\/|\\)editor/.test(context.getFilename())) { - // the vs/editor folder is allowed to use the standalone editor - return {}; - } - return (0, utils_1.createImportRuleListener)((node, path) => { - // resolve relative paths - if (path[0] === '.') { - path = (0, path_1.join)(context.getFilename(), path); - } - if (/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(path) - || /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(path) - || /vs(\/|\\)editor(\/|\\)editor.api/.test(path) - || /vs(\/|\\)editor(\/|\\)editor.main/.test(path) - || /vs(\/|\\)editor(\/|\\)editor.worker/.test(path)) { - context.report({ - loc: node.loc, - messageId: 'badImport' - }); - } - }); - } -}; diff --git a/build/lib/eslint/code-no-test-only.js b/build/lib/eslint/code-no-test-only.js deleted file mode 100644 index 46d144bfcaf..00000000000 --- a/build/lib/eslint/code-no-test-only.js +++ /dev/null @@ -1,17 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -module.exports = new class NoTestOnly { - create(context) { - return { - ['MemberExpression[object.name="test"][property.name="only"]']: (node) => { - return context.report({ - node, - message: 'test.only is a dev-time tool and CANNOT be pushed' - }); - } - }; - } -}; diff --git a/build/lib/eslint/code-no-unexternalized-strings.js b/build/lib/eslint/code-no-unexternalized-strings.js deleted file mode 100644 index b603f4d8e09..00000000000 --- a/build/lib/eslint/code-no-unexternalized-strings.js +++ /dev/null @@ -1,111 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -var _a; -const experimental_utils_1 = require("@typescript-eslint/experimental-utils"); -function isStringLiteral(node) { - return !!node && node.type === experimental_utils_1.AST_NODE_TYPES.Literal && typeof node.value === 'string'; -} -function isDoubleQuoted(node) { - return node.raw[0] === '"' && node.raw[node.raw.length - 1] === '"'; -} -module.exports = new (_a = class NoUnexternalizedStrings { - constructor() { - this.meta = { - messages: { - doubleQuoted: 'Only use double-quoted strings for externalized strings.', - badKey: 'The key \'{{key}}\' doesn\'t conform to a valid localize identifier.', - duplicateKey: 'Duplicate key \'{{key}}\' with different message value.', - badMessage: 'Message argument to \'{{message}}\' must be a string literal.' - } - }; - } - create(context) { - const externalizedStringLiterals = new Map(); - const doubleQuotedStringLiterals = new Set(); - function collectDoubleQuotedStrings(node) { - if (isStringLiteral(node) && isDoubleQuoted(node)) { - doubleQuotedStringLiterals.add(node); - } - } - function visitLocalizeCall(node) { - // localize(key, message) - const [keyNode, messageNode] = node.arguments; - // (1) - // extract key so that it can be checked later - let key; - if (isStringLiteral(keyNode)) { - doubleQuotedStringLiterals.delete(keyNode); - key = keyNode.value; - } - else if (keyNode.type === experimental_utils_1.AST_NODE_TYPES.ObjectExpression) { - for (let property of keyNode.properties) { - if (property.type === experimental_utils_1.AST_NODE_TYPES.Property && !property.computed) { - if (property.key.type === experimental_utils_1.AST_NODE_TYPES.Identifier && property.key.name === 'key') { - if (isStringLiteral(property.value)) { - doubleQuotedStringLiterals.delete(property.value); - key = property.value.value; - break; - } - } - } - } - } - if (typeof key === 'string') { - let array = externalizedStringLiterals.get(key); - if (!array) { - array = []; - externalizedStringLiterals.set(key, array); - } - array.push({ call: node, message: messageNode }); - } - // (2) - // remove message-argument from doubleQuoted list and make - // sure it is a string-literal - doubleQuotedStringLiterals.delete(messageNode); - if (!isStringLiteral(messageNode)) { - context.report({ - loc: messageNode.loc, - messageId: 'badMessage', - data: { message: context.getSourceCode().getText(node) } - }); - } - } - function reportBadStringsAndBadKeys() { - // (1) - // report all strings that are in double quotes - for (const node of doubleQuotedStringLiterals) { - context.report({ loc: node.loc, messageId: 'doubleQuoted' }); - } - for (const [key, values] of externalizedStringLiterals) { - // (2) - // report all invalid NLS keys - if (!key.match(NoUnexternalizedStrings._rNlsKeys)) { - for (let value of values) { - context.report({ loc: value.call.loc, messageId: 'badKey', data: { key } }); - } - } - // (2) - // report all invalid duplicates (same key, different message) - if (values.length > 1) { - for (let i = 1; i < values.length; i++) { - if (context.getSourceCode().getText(values[i - 1].message) !== context.getSourceCode().getText(values[i].message)) { - context.report({ loc: values[i].call.loc, messageId: 'duplicateKey', data: { key } }); - } - } - } - } - } - return { - ['Literal']: (node) => collectDoubleQuotedStrings(node), - ['ExpressionStatement[directive] Literal:exit']: (node) => doubleQuotedStringLiterals.delete(node), - ['CallExpression[callee.type="MemberExpression"][callee.object.name="nls"][callee.property.name="localize"]:exit']: (node) => visitLocalizeCall(node), - ['CallExpression[callee.name="localize"][arguments.length>=2]:exit']: (node) => visitLocalizeCall(node), - ['Program:exit']: reportBadStringsAndBadKeys, - }; - } - }, - _a._rNlsKeys = /^[_a-zA-Z0-9][ .\-_a-zA-Z0-9]*$/, - _a); diff --git a/build/lib/eslint/code-no-unused-expressions.js b/build/lib/eslint/code-no-unused-expressions.js deleted file mode 100644 index 530464f37b5..00000000000 --- a/build/lib/eslint/code-no-unused-expressions.js +++ /dev/null @@ -1,125 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -// FORKED FROM https://github.com/eslint/eslint/blob/b23ad0d789a909baf8d7c41a35bc53df932eaf30/lib/rules/no-unused-expressions.js -// and added support for `OptionalCallExpression`, see https://github.com/facebook/create-react-app/issues/8107 and https://github.com/eslint/eslint/issues/12642 -/** - * @fileoverview Flag expressions in statement position that do not side effect - * @author Michael Ficarra - */ -'use strict'; -Object.defineProperty(exports, "__esModule", { value: true }); -//------------------------------------------------------------------------------ -// Rule Definition -//------------------------------------------------------------------------------ -module.exports = { - meta: { - type: 'suggestion', - docs: { - description: 'disallow unused expressions', - category: 'Best Practices', - recommended: false, - url: 'https://eslint.org/docs/rules/no-unused-expressions' - }, - schema: [ - { - type: 'object', - properties: { - allowShortCircuit: { - type: 'boolean', - default: false - }, - allowTernary: { - type: 'boolean', - default: false - }, - allowTaggedTemplates: { - type: 'boolean', - default: false - } - }, - additionalProperties: false - } - ] - }, - create(context) { - const config = context.options[0] || {}, allowShortCircuit = config.allowShortCircuit || false, allowTernary = config.allowTernary || false, allowTaggedTemplates = config.allowTaggedTemplates || false; - // eslint-disable-next-line jsdoc/require-description - /** - * @param node any node - * @returns whether the given node structurally represents a directive - */ - function looksLikeDirective(node) { - return node.type === 'ExpressionStatement' && - node.expression.type === 'Literal' && typeof node.expression.value === 'string'; - } - // eslint-disable-next-line jsdoc/require-description - /** - * @param predicate ([a] -> Boolean) the function used to make the determination - * @param list the input list - * @returns the leading sequence of members in the given list that pass the given predicate - */ - function takeWhile(predicate, list) { - for (let i = 0; i < list.length; ++i) { - if (!predicate(list[i])) { - return list.slice(0, i); - } - } - return list.slice(); - } - // eslint-disable-next-line jsdoc/require-description - /** - * @param node a Program or BlockStatement node - * @returns the leading sequence of directive nodes in the given node's body - */ - function directives(node) { - return takeWhile(looksLikeDirective, node.body); - } - // eslint-disable-next-line jsdoc/require-description - /** - * @param node any node - * @param ancestors the given node's ancestors - * @returns whether the given node is considered a directive in its current position - */ - function isDirective(node, ancestors) { - const parent = ancestors[ancestors.length - 1], grandparent = ancestors[ancestors.length - 2]; - return (parent.type === 'Program' || parent.type === 'BlockStatement' && - (/Function/u.test(grandparent.type))) && - directives(parent).indexOf(node) >= 0; - } - /** - * Determines whether or not a given node is a valid expression. Recurses on short circuit eval and ternary nodes if enabled by flags. - * @param node any node - * @returns whether the given node is a valid expression - */ - function isValidExpression(node) { - if (allowTernary) { - // Recursive check for ternary and logical expressions - if (node.type === 'ConditionalExpression') { - return isValidExpression(node.consequent) && isValidExpression(node.alternate); - } - } - if (allowShortCircuit) { - if (node.type === 'LogicalExpression') { - return isValidExpression(node.right); - } - } - if (allowTaggedTemplates && node.type === 'TaggedTemplateExpression') { - return true; - } - if (node.type === 'ExpressionStatement') { - return isValidExpression(node.expression); - } - return /^(?:Assignment|OptionalCall|Call|New|Update|Yield|Await|Chain)Expression$/u.test(node.type) || - (node.type === 'UnaryExpression' && ['delete', 'void'].indexOf(node.operator) >= 0); - } - return { - ExpressionStatement(node) { - if (!isValidExpression(node.expression) && !isDirective(node, context.getAncestors())) { - context.report({ node: node, message: `Expected an assignment or function call and instead saw an expression. ${node.expression}` }); - } - } - }; - } -}; diff --git a/build/lib/eslint/code-translation-remind.js b/build/lib/eslint/code-translation-remind.js deleted file mode 100644 index 30b63429521..00000000000 --- a/build/lib/eslint/code-translation-remind.js +++ /dev/null @@ -1,57 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -var _a; -const fs_1 = require("fs"); -const utils_1 = require("./utils"); -module.exports = new (_a = class TranslationRemind { - constructor() { - this.meta = { - messages: { - missing: 'Please add \'{{resource}}\' to ./build/lib/i18n.resources.json file to use translations here.' - } - }; - } - create(context) { - return (0, utils_1.createImportRuleListener)((node, path) => this._checkImport(context, node, path)); - } - _checkImport(context, node, path) { - if (path !== TranslationRemind.NLS_MODULE) { - return; - } - const currentFile = context.getFilename(); - const matchService = currentFile.match(/vs\/workbench\/services\/\w+/); - const matchPart = currentFile.match(/vs\/workbench\/contrib\/\w+/); - if (!matchService && !matchPart) { - return; - } - const resource = matchService ? matchService[0] : matchPart[0]; - let resourceDefined = false; - let json; - try { - json = (0, fs_1.readFileSync)('./build/lib/i18n.resources.json', 'utf8'); - } - catch (e) { - console.error('[translation-remind rule]: File with resources to pull from Transifex was not found. Aborting translation resource check for newly defined workbench part/service.'); - return; - } - const workbenchResources = JSON.parse(json).workbench; - workbenchResources.forEach((existingResource) => { - if (existingResource.name === resource) { - resourceDefined = true; - return; - } - }); - if (!resourceDefined) { - context.report({ - loc: node.loc, - messageId: 'missing', - data: { resource } - }); - } - } - }, - _a.NLS_MODULE = 'vs/nls', - _a); diff --git a/build/lib/eslint/utils.js b/build/lib/eslint/utils.js deleted file mode 100644 index c58e4e24be1..00000000000 --- a/build/lib/eslint/utils.js +++ /dev/null @@ -1,37 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.createImportRuleListener = void 0; -function createImportRuleListener(validateImport) { - function _checkImport(node) { - if (node && node.type === 'Literal' && typeof node.value === 'string') { - validateImport(node, node.value); - } - } - return { - // import ??? from 'module' - ImportDeclaration: (node) => { - _checkImport(node.source); - }, - // import('module').then(...) OR await import('module') - ['CallExpression[callee.type="Import"][arguments.length=1] > Literal']: (node) => { - _checkImport(node); - }, - // import foo = ... - ['TSImportEqualsDeclaration > TSExternalModuleReference > Literal']: (node) => { - _checkImport(node); - }, - // export ?? from 'module' - ExportAllDeclaration: (node) => { - _checkImport(node.source); - }, - // export {foo} from 'module' - ExportNamedDeclaration: (node) => { - _checkImport(node.source); - }, - }; -} -exports.createImportRuleListener = createImportRuleListener; diff --git a/build/lib/eslint/vscode-dts-cancellation.js b/build/lib/eslint/vscode-dts-cancellation.js deleted file mode 100644 index d016f0d2ebc..00000000000 --- a/build/lib/eslint/vscode-dts-cancellation.js +++ /dev/null @@ -1,33 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -const experimental_utils_1 = require("@typescript-eslint/experimental-utils"); -module.exports = new class ApiProviderNaming { - constructor() { - this.meta = { - messages: { - noToken: 'Function lacks a cancellation token, preferable as last argument', - } - }; - } - create(context) { - return { - ['TSInterfaceDeclaration[id.name=/.+Provider/] TSMethodSignature[key.name=/^(provide|resolve).+/]']: (node) => { - let found = false; - for (let param of node.params) { - if (param.type === experimental_utils_1.AST_NODE_TYPES.Identifier) { - found = found || param.name === 'token'; - } - } - if (!found) { - context.report({ - node, - messageId: 'noToken' - }); - } - } - }; - } -}; diff --git a/build/lib/eslint/vscode-dts-create-func.js b/build/lib/eslint/vscode-dts-create-func.js deleted file mode 100644 index e9ec659cef1..00000000000 --- a/build/lib/eslint/vscode-dts-create-func.js +++ /dev/null @@ -1,34 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -const experimental_utils_1 = require("@typescript-eslint/experimental-utils"); -module.exports = new class ApiLiteralOrTypes { - constructor() { - this.meta = { - docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#creating-objects' }, - messages: { sync: '`createXYZ`-functions are constructor-replacements and therefore must return sync', } - }; - } - create(context) { - return { - ['TSDeclareFunction Identifier[name=/create.*/]']: (node) => { - const decl = node.parent; - if (decl.returnType?.typeAnnotation.type !== experimental_utils_1.AST_NODE_TYPES.TSTypeReference) { - return; - } - if (decl.returnType.typeAnnotation.typeName.type !== experimental_utils_1.AST_NODE_TYPES.Identifier) { - return; - } - const ident = decl.returnType.typeAnnotation.typeName.name; - if (ident === 'Promise' || ident === 'Thenable') { - context.report({ - node, - messageId: 'sync' - }); - } - } - }; - } -}; diff --git a/build/lib/eslint/vscode-dts-event-naming.js b/build/lib/eslint/vscode-dts-event-naming.js deleted file mode 100644 index 1e376cca734..00000000000 --- a/build/lib/eslint/vscode-dts-event-naming.js +++ /dev/null @@ -1,86 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -var _a; -const experimental_utils_1 = require("@typescript-eslint/experimental-utils"); -module.exports = new (_a = class ApiEventNaming { - constructor() { - this.meta = { - docs: { - url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#event-naming' - }, - messages: { - naming: 'Event names must follow this patten: `on[Did|Will]`', - verb: 'Unknown verb \'{{verb}}\' - is this really a verb? Iff so, then add this verb to the configuration', - subject: 'Unknown subject \'{{subject}}\' - This subject has not been used before but it should refer to something in the API', - unknown: 'UNKNOWN event declaration, lint-rule needs tweaking' - } - }; - } - create(context) { - const config = context.options[0]; - const allowed = new Set(config.allowed); - const verbs = new Set(config.verbs); - return { - ['TSTypeAnnotation TSTypeReference Identifier[name="Event"]']: (node) => { - const def = node.parent?.parent?.parent; - const ident = this.getIdent(def); - if (!ident) { - // event on unknown structure... - return context.report({ - node, - message: 'unknown' - }); - } - if (allowed.has(ident.name)) { - // configured exception - return; - } - const match = ApiEventNaming._nameRegExp.exec(ident.name); - if (!match) { - context.report({ - node: ident, - messageId: 'naming' - }); - return; - } - // check that is spelled out (configured) as verb - if (!verbs.has(match[2].toLowerCase())) { - context.report({ - node: ident, - messageId: 'verb', - data: { verb: match[2] } - }); - } - // check that a subject (if present) has occurred - if (match[3]) { - const regex = new RegExp(match[3], 'ig'); - const parts = context.getSourceCode().getText().split(regex); - if (parts.length < 3) { - context.report({ - node: ident, - messageId: 'subject', - data: { subject: match[3] } - }); - } - } - } - }; - } - getIdent(def) { - if (!def) { - return; - } - if (def.type === experimental_utils_1.AST_NODE_TYPES.Identifier) { - return def; - } - else if ((def.type === experimental_utils_1.AST_NODE_TYPES.TSPropertySignature || def.type === experimental_utils_1.AST_NODE_TYPES.Property) && def.key.type === experimental_utils_1.AST_NODE_TYPES.Identifier) { - return def.key; - } - return this.getIdent(def.parent); - } - }, - _a._nameRegExp = /on(Did|Will)([A-Z][a-z]+)([A-Z][a-z]+)?/, - _a); diff --git a/build/lib/eslint/vscode-dts-interface-naming.js b/build/lib/eslint/vscode-dts-interface-naming.js deleted file mode 100644 index 70ca810825b..00000000000 --- a/build/lib/eslint/vscode-dts-interface-naming.js +++ /dev/null @@ -1,30 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -var _a; -module.exports = new (_a = class ApiInterfaceNaming { - constructor() { - this.meta = { - messages: { - naming: 'Interfaces must not be prefixed with uppercase `I`', - } - }; - } - create(context) { - return { - ['TSInterfaceDeclaration Identifier']: (node) => { - const name = node.name; - if (ApiInterfaceNaming._nameRegExp.test(name)) { - context.report({ - node, - messageId: 'naming' - }); - } - } - }; - } - }, - _a._nameRegExp = /I[A-Z]/, - _a); diff --git a/build/lib/eslint/vscode-dts-literal-or-types.js b/build/lib/eslint/vscode-dts-literal-or-types.js deleted file mode 100644 index e4c075db91c..00000000000 --- a/build/lib/eslint/vscode-dts-literal-or-types.js +++ /dev/null @@ -1,25 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -module.exports = new class ApiLiteralOrTypes { - constructor() { - this.meta = { - docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#enums' }, - messages: { useEnum: 'Use enums, not literal-or-types', } - }; - } - create(context) { - return { - ['TSTypeAnnotation TSUnionType']: (node) => { - if (node.types.every(value => value.type === 'TSLiteralType')) { - context.report({ - node: node, - messageId: 'useEnum' - }); - } - } - }; - } -}; diff --git a/build/lib/eslint/vscode-dts-provider-naming.js b/build/lib/eslint/vscode-dts-provider-naming.js deleted file mode 100644 index 0d94a8a9223..00000000000 --- a/build/lib/eslint/vscode-dts-provider-naming.js +++ /dev/null @@ -1,37 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -var _a; -module.exports = new (_a = class ApiProviderNaming { - constructor() { - this.meta = { - messages: { - naming: 'A provider should only have functions like provideXYZ or resolveXYZ', - } - }; - } - create(context) { - const config = context.options[0]; - const allowed = new Set(config.allowed); - return { - ['TSInterfaceDeclaration[id.name=/.+Provider/] TSMethodSignature']: (node) => { - const interfaceName = node.parent?.parent.id.name; - if (allowed.has(interfaceName)) { - // allowed - return; - } - const methodName = node.key.name; - if (!ApiProviderNaming._providerFunctionNames.test(methodName)) { - context.report({ - node, - messageId: 'naming' - }); - } - } - }; - } - }, - _a._providerFunctionNames = /^(provide|resolve|prepare).+/, - _a); diff --git a/build/lib/eslint/vscode-dts-region-comments.js b/build/lib/eslint/vscode-dts-region-comments.js deleted file mode 100644 index 2dc9487314e..00000000000 --- a/build/lib/eslint/vscode-dts-region-comments.js +++ /dev/null @@ -1,35 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -module.exports = new class ApiEventNaming { - constructor() { - this.meta = { - messages: { - comment: 'region comments should start with a camel case identifier, `:`, then either a GH issue link or owner, e.g #region myProposalName: https://github.com/microsoft/vscode/issues/', - } - }; - } - create(context) { - const sourceCode = context.getSourceCode(); - return { - ['Program']: (_node) => { - for (const comment of sourceCode.getAllComments()) { - if (comment.type !== 'Line') { - continue; - } - if (!/^\s*#region /.test(comment.value)) { - continue; - } - if (!/^\s*#region ([a-z]+): (@[a-z]+|https:\/\/github.com\/microsoft\/vscode\/issues\/\d+)/i.test(comment.value)) { - context.report({ - node: comment, - messageId: 'comment', - }); - } - } - } - }; - } -}; diff --git a/build/lib/eslint/vscode-dts-use-thenable.js b/build/lib/eslint/vscode-dts-use-thenable.js deleted file mode 100644 index 7e23953cb69..00000000000 --- a/build/lib/eslint/vscode-dts-use-thenable.js +++ /dev/null @@ -1,24 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -module.exports = new class ApiEventNaming { - constructor() { - this.meta = { - messages: { - usage: 'Use the Thenable-type instead of the Promise type', - } - }; - } - create(context) { - return { - ['TSTypeAnnotation TSTypeReference Identifier[name="Promise"]']: (node) => { - context.report({ - node, - messageId: 'usage', - }); - } - }; - } -}; diff --git a/build/lib/eslint/vscode-dts-vscode-in-comments.js b/build/lib/eslint/vscode-dts-vscode-in-comments.js deleted file mode 100644 index 8f9a13fb01f..00000000000 --- a/build/lib/eslint/vscode-dts-vscode-in-comments.js +++ /dev/null @@ -1,45 +0,0 @@ -"use strict"; -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -module.exports = new class ApiVsCodeInComments { - constructor() { - this.meta = { - messages: { - comment: `Don't use the term 'vs code' in comments` - } - }; - } - create(context) { - const sourceCode = context.getSourceCode(); - return { - ['Program']: (_node) => { - for (const comment of sourceCode.getAllComments()) { - if (comment.type !== 'Block') { - continue; - } - if (!comment.range) { - continue; - } - const startIndex = comment.range[0] + '/*'.length; - const re = /vs code/ig; - let match; - while ((match = re.exec(comment.value))) { - // Allow using 'VS Code' in quotes - if (comment.value[match.index - 1] === `'` && comment.value[match.index + match[0].length] === `'`) { - continue; - } - // Types for eslint seem incorrect - const start = sourceCode.getLocFromIndex(startIndex + match.index); - const end = sourceCode.getLocFromIndex(startIndex + match.index + match[0].length); - context.report({ - messageId: 'comment', - loc: { start, end } - }); - } - } - } - }; - } -}; diff --git a/build/lib/extensions.js b/build/lib/extensions.js index 50fc4dd945b..f69b3322018 100644 --- a/build/lib/extensions.js +++ b/build/lib/extensions.js @@ -25,9 +25,10 @@ const buffer = require('gulp-buffer'); const jsoncParser = require("jsonc-parser"); const dependencies_1 = require("./dependencies"); const _ = require("underscore"); -const util = require('./util'); +const builtInExtensions_1 = require("./builtInExtensions"); +const getVersion_1 = require("./getVersion"); const root = path.dirname(path.dirname(__dirname)); -const commit = util.getVersion(root); +const commit = (0, getVersion_1.getVersion)(root); const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`; function minifyExtensionResources(input) { const jsonFilter = filter(['**/*.json', '**/*.code-snippets'], { restore: true }); @@ -245,8 +246,6 @@ const excludedExtensions = [ 'vscode-test-resolver', 'ms-vscode.node-debug', 'ms-vscode.node-debug2', - 'vscode-notebook-tests', - 'vscode-custom-editor-tests', ]; const marketplaceWebExtensionsExclude = new Set([ 'ms-vscode.node-debug', @@ -313,16 +312,15 @@ function packageLocalExtensionsStream(forWeb) { .pipe(util2.setExecutableBit(['**/*.sh']))); } exports.packageLocalExtensionsStream = packageLocalExtensionsStream; -function packageMarketplaceExtensionsStream(forWeb, galleryServiceUrl) { +function packageMarketplaceExtensionsStream(forWeb) { const marketplaceExtensionsDescriptions = [ ...builtInExtensions.filter(({ name }) => (forWeb ? !marketplaceWebExtensionsExclude.has(name) : true)), ...(forWeb ? webBuiltInExtensions : []) ]; const marketplaceExtensionsStream = minifyExtensionResources(es.merge(...marketplaceExtensionsDescriptions .map(extension => { - const input = (galleryServiceUrl ? fromMarketplace(galleryServiceUrl, extension) : fromGithub(extension)) - .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`)); - return updateExtensionPackageJSON(input, (data) => { + const src = (0, builtInExtensions_1.getExtensionStream)(extension).pipe(rename(p => p.dirname = `extensions/${p.dirname}`)); + return updateExtensionPackageJSON(src, (data) => { delete data.scripts; delete data.dependencies; delete data.devDependencies; @@ -345,19 +343,27 @@ function scanBuiltinExtensions(extensionsRoot, exclude = []) { if (!fs.existsSync(packageJSONPath)) { continue; } - let packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString('utf8')); + const packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString('utf8')); if (!isWebExtension(packageJSON)) { continue; } const children = fs.readdirSync(path.join(extensionsRoot, extensionFolder)); const packageNLSPath = children.filter(child => child === 'package.nls.json')[0]; const packageNLS = packageNLSPath ? JSON.parse(fs.readFileSync(path.join(extensionsRoot, extensionFolder, packageNLSPath)).toString()) : undefined; + let browserNlsMetadataPath; + if (packageJSON.browser) { + const browserEntrypointFolderPath = path.join(extensionFolder, path.dirname(packageJSON.browser)); + if (fs.existsSync(path.join(extensionsRoot, browserEntrypointFolderPath, 'nls.metadata.json'))) { + browserNlsMetadataPath = path.join(browserEntrypointFolderPath, 'nls.metadata.json'); + } + } const readme = children.filter(child => /^readme(\.txt|\.md|)$/i.test(child))[0]; const changelog = children.filter(child => /^changelog(\.txt|\.md|)$/i.test(child))[0]; scannedExtensions.push({ extensionPath: extensionFolder, packageJSON, packageNLS, + browserNlsMetadataPath, readmePath: readme ? path.join(extensionFolder, readme) : undefined, changelogPath: changelog ? path.join(extensionFolder, changelog) : undefined, }); @@ -373,7 +379,7 @@ function translatePackageJSON(packageJSON, packageNLSPath) { const CharCode_PC = '%'.charCodeAt(0); const packageNls = JSON.parse(fs.readFileSync(packageNLSPath).toString()); const translate = (obj) => { - for (let key in obj) { + for (const key in obj) { const val = obj[key]; if (Array.isArray(val)) { val.forEach(translate); @@ -400,6 +406,7 @@ const esbuildMediaScripts = [ 'markdown-language-features/esbuild-preview.js', 'markdown-math/esbuild.js', 'notebook-renderers/esbuild.js', + 'ipynb/esbuild.js', 'simple-browser/esbuild-preview.js', ]; async function webpackExtensions(taskName, isWatch, webpackConfigLocations) { diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts index 312b830b903..36f29fcf3a1 100644 --- a/build/lib/extensions.ts +++ b/build/lib/extensions.ts @@ -25,9 +25,11 @@ import * as jsoncParser from 'jsonc-parser'; import webpack = require('webpack'); import { getProductionDependencies } from './dependencies'; import _ = require('underscore'); -const util = require('./util'); +import { getExtensionStream } from './builtInExtensions'; +import { getVersion } from './getVersion'; + const root = path.dirname(path.dirname(__dirname)); -const commit = util.getVersion(root); +const commit = getVersion(root); const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`; function minifyExtensionResources(input: Stream): Stream { @@ -285,8 +287,6 @@ const excludedExtensions = [ 'vscode-test-resolver', 'ms-vscode.node-debug', 'ms-vscode.node-debug2', - 'vscode-notebook-tests', - 'vscode-custom-editor-tests', ]; const marketplaceWebExtensionsExclude = new Set([ @@ -382,7 +382,7 @@ export function packageLocalExtensionsStream(forWeb: boolean): Stream { ); } -export function packageMarketplaceExtensionsStream(forWeb: boolean, galleryServiceUrl?: string): Stream { +export function packageMarketplaceExtensionsStream(forWeb: boolean): Stream { const marketplaceExtensionsDescriptions = [ ...builtInExtensions.filter(({ name }) => (forWeb ? !marketplaceWebExtensionsExclude.has(name) : true)), ...(forWeb ? webBuiltInExtensions : []) @@ -391,9 +391,8 @@ export function packageMarketplaceExtensionsStream(forWeb: boolean, galleryServi es.merge( ...marketplaceExtensionsDescriptions .map(extension => { - const input = (galleryServiceUrl ? fromMarketplace(galleryServiceUrl, extension) : fromGithub(extension)) - .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`)); - return updateExtensionPackageJSON(input, (data: any) => { + const src = getExtensionStream(extension).pipe(rename(p => p.dirname = `extensions/${p.dirname}`)); + return updateExtensionPackageJSON(src, (data: any) => { delete data.scripts; delete data.dependencies; delete data.devDependencies; @@ -413,6 +412,7 @@ export interface IScannedBuiltinExtension { extensionPath: string; packageJSON: any; packageNLS?: any; + browserNlsMetadataPath?: string; readmePath?: string; changelogPath?: string; } @@ -430,13 +430,20 @@ export function scanBuiltinExtensions(extensionsRoot: string, exclude: string[] if (!fs.existsSync(packageJSONPath)) { continue; } - let packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString('utf8')); + const packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString('utf8')); if (!isWebExtension(packageJSON)) { continue; } const children = fs.readdirSync(path.join(extensionsRoot, extensionFolder)); const packageNLSPath = children.filter(child => child === 'package.nls.json')[0]; const packageNLS = packageNLSPath ? JSON.parse(fs.readFileSync(path.join(extensionsRoot, extensionFolder, packageNLSPath)).toString()) : undefined; + let browserNlsMetadataPath: string | undefined; + if (packageJSON.browser) { + const browserEntrypointFolderPath = path.join(extensionFolder, path.dirname(packageJSON.browser)); + if (fs.existsSync(path.join(extensionsRoot, browserEntrypointFolderPath, 'nls.metadata.json'))) { + browserNlsMetadataPath = path.join(browserEntrypointFolderPath, 'nls.metadata.json'); + } + } const readme = children.filter(child => /^readme(\.txt|\.md|)$/i.test(child))[0]; const changelog = children.filter(child => /^changelog(\.txt|\.md|)$/i.test(child))[0]; @@ -444,6 +451,7 @@ export function scanBuiltinExtensions(extensionsRoot: string, exclude: string[] extensionPath: extensionFolder, packageJSON, packageNLS, + browserNlsMetadataPath, readmePath: readme ? path.join(extensionFolder, readme) : undefined, changelogPath: changelog ? path.join(extensionFolder, changelog) : undefined, }); @@ -461,7 +469,7 @@ export function translatePackageJSON(packageJSON: string, packageNLSPath: string const CharCode_PC = '%'.charCodeAt(0); const packageNls: NLSFormat = JSON.parse(fs.readFileSync(packageNLSPath).toString()); const translate = (obj: any) => { - for (let key in obj) { + for (const key in obj) { const val = obj[key]; if (Array.isArray(val)) { val.forEach(translate); @@ -487,6 +495,7 @@ const esbuildMediaScripts = [ 'markdown-language-features/esbuild-preview.js', 'markdown-math/esbuild.js', 'notebook-renderers/esbuild.js', + 'ipynb/esbuild.js', 'simple-browser/esbuild-preview.js', ]; @@ -500,7 +509,7 @@ export async function webpackExtensions(taskName: string, isWatch: boolean, webp function addConfig(configOrFn: webpack.Configuration | Function) { let config; if (typeof configOrFn === 'function') { - config = configOrFn({}, {}); + config = (configOrFn as Function)({}, {}); webpackConfigs.push(config); } else { config = configOrFn; diff --git a/build/lib/getVersion.js b/build/lib/getVersion.js new file mode 100644 index 00000000000..3f51e62f80d --- /dev/null +++ b/build/lib/getVersion.js @@ -0,0 +1,16 @@ +"use strict"; +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +Object.defineProperty(exports, "__esModule", { value: true }); +exports.getVersion = void 0; +const git = require("./git"); +function getVersion(root) { + let version = process.env['VSCODE_DISTRO_COMMIT'] || process.env['BUILD_SOURCEVERSION']; + if (!version || !/^[0-9a-f]{40}$/i.test(version.trim())) { + version = git.getVersion(root); + } + return version; +} +exports.getVersion = getVersion; diff --git a/build/lib/getVersion.ts b/build/lib/getVersion.ts new file mode 100644 index 00000000000..461302962d2 --- /dev/null +++ b/build/lib/getVersion.ts @@ -0,0 +1,16 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as git from './git'; + +export function getVersion(root: string): string | undefined { + let version = process.env['VSCODE_DISTRO_COMMIT'] || process.env['BUILD_SOURCEVERSION']; + + if (!version || !/^[0-9a-f]{40}$/i.test(version.trim())) { + version = git.getVersion(root); + } + + return version; +} diff --git a/build/lib/git.js b/build/lib/git.js index 1726f76fcc7..0aa340347ac 100644 --- a/build/lib/git.js +++ b/build/lib/git.js @@ -1,10 +1,10 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.getVersion = void 0; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.getVersion = void 0; const path = require("path"); const fs = require("fs"); /** @@ -45,7 +45,7 @@ function getVersion(repo) { } const refsRegex = /^([0-9a-f]{40})\s+(.+)$/gm; let refsMatch; - let refs = {}; + const refs = {}; while (refsMatch = refsRegex.exec(refsRaw)) { refs[refsMatch[2]] = refsMatch[1]; } diff --git a/build/lib/git.ts b/build/lib/git.ts index dc9c667c21b..dbb424f21df 100644 --- a/build/lib/git.ts +++ b/build/lib/git.ts @@ -2,8 +2,6 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as path from 'path'; import * as fs from 'fs'; @@ -51,7 +49,7 @@ export function getVersion(repo: string): string | undefined { const refsRegex = /^([0-9a-f]{40})\s+(.+)$/gm; let refsMatch: RegExpExecArray | null; - let refs: { [ref: string]: string } = {}; + const refs: { [ref: string]: string } = {}; while (refsMatch = refsRegex.exec(refsRaw)) { refs[refsMatch[2]] = refsMatch[1]; diff --git a/build/lib/i18n.js b/build/lib/i18n.js index e89cdf1504e..24e622bc7a8 100644 --- a/build/lib/i18n.js +++ b/build/lib/i18n.js @@ -4,19 +4,18 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ Object.defineProperty(exports, "__esModule", { value: true }); -exports.prepareIslFiles = exports.prepareI18nPackFiles = exports.prepareI18nFiles = exports.pullSetupXlfFiles = exports.findObsoleteResources = exports.pushXlfFiles = exports.createXlfFilesForIsl = exports.createXlfFilesForExtensions = exports.createXlfFilesForCoreBundle = exports.getResource = exports.processNlsFiles = exports.Limiter = exports.XLF = exports.Line = exports.externalExtensionsWithTranslations = exports.extraLanguages = exports.defaultLanguages = void 0; +exports.prepareIslFiles = exports.prepareI18nPackFiles = exports.createXlfFilesForIsl = exports.createXlfFilesForExtensions = exports.createXlfFilesForCoreBundle = exports.getResource = exports.processNlsFiles = exports.XLF = exports.Line = exports.extraLanguages = exports.defaultLanguages = void 0; const path = require("path"); const fs = require("fs"); const event_stream_1 = require("event-stream"); const File = require("vinyl"); const Is = require("is"); const xml2js = require("xml2js"); -const https = require("https"); const gulp = require("gulp"); const fancyLog = require("fancy-log"); const ansiColors = require("ansi-colors"); const iconv = require("@vscode/iconv-lite-umd"); -const NUMBER_OF_CONCURRENT_DOWNLOADS = 4; +const l10n_dev_1 = require("@vscode/l10n-dev"); function log(message, ...rest) { fancyLog(ansiColors.green('[i18n]'), message, ...rest); } @@ -38,7 +37,7 @@ exports.extraLanguages = [ { id: 'tr', folderName: 'trk' } ]; // non built-in extensions also that are transifex and need to be part of the language packs -exports.externalExtensionsWithTranslations = { +const externalExtensionsWithTranslations = { 'vscode-chrome-debug': 'msjsdiag.debugger-for-chrome', 'vscode-node-debug': 'ms-vscode.node-debug', 'vscode-node-debug2': 'ms-vscode.node-debug2' @@ -46,7 +45,7 @@ exports.externalExtensionsWithTranslations = { var LocalizeInfo; (function (LocalizeInfo) { function is(value) { - let candidate = value; + const candidate = value; return Is.defined(candidate) && Is.string(candidate.key) && (Is.undef(candidate.comment) || (Is.array(candidate.comment) && candidate.comment.every(element => Is.string(element)))); } LocalizeInfo.is = is; @@ -57,25 +56,12 @@ var BundledFormat; if (Is.undef(value)) { return false; } - let candidate = value; - let length = Object.keys(value).length; + const candidate = value; + const length = Object.keys(value).length; return length === 3 && Is.defined(candidate.keys) && Is.defined(candidate.messages) && Is.defined(candidate.bundles); } BundledFormat.is = is; })(BundledFormat || (BundledFormat = {})); -var PackageJsonFormat; -(function (PackageJsonFormat) { - function is(value) { - if (Is.undef(value) || !Is.object(value)) { - return false; - } - return Object.keys(value).every(key => { - let element = value[key]; - return Is.string(element) || (Is.object(element) && Is.defined(element.message) && Is.defined(element.comment)); - }); - } - PackageJsonFormat.is = is; -})(PackageJsonFormat || (PackageJsonFormat = {})); class Line { constructor(indent = 0) { this.buffer = []; @@ -133,9 +119,9 @@ class XLF { } this.numberOfMessages += keys.length; this.files[original] = []; - let existingKeys = new Set(); + const existingKeys = new Set(); for (let i = 0; i < keys.length; i++) { - let key = keys[i]; + const key = keys[i]; let realKey; let comment; if (Is.string(key)) { @@ -152,7 +138,7 @@ class XLF { continue; } existingKeys.add(realKey); - let message = encodeEntities(messages[i]); + const message = encodeEntities(messages[i]); this.files[original].push({ id: realKey, message: message, comment: comment }); } } @@ -178,41 +164,16 @@ class XLF { this.appendNewLine('', 0); } appendNewLine(content, indent) { - let line = new Line(indent); + const line = new Line(indent); line.append(content); this.buffer.push(line.toString()); } } exports.XLF = XLF; -XLF.parsePseudo = function (xlfString) { - return new Promise((resolve) => { - let parser = new xml2js.Parser(); - let files = []; - parser.parseString(xlfString, function (_err, result) { - const fileNodes = result['xliff']['file']; - fileNodes.forEach(file => { - const originalFilePath = file.$.original; - const messages = {}; - const transUnits = file.body[0]['trans-unit']; - if (transUnits) { - transUnits.forEach((unit) => { - const key = unit.$.id; - const val = pseudify(unit.source[0]['_'].toString()); - if (key && val) { - messages[key] = decodeEntities(val); - } - }); - files.push({ messages: messages, originalFilePath: originalFilePath, language: 'ps' }); - } - }); - resolve(files); - }); - }); -}; XLF.parse = function (xlfString) { return new Promise((resolve, reject) => { - let parser = new xml2js.Parser(); - let files = []; + const parser = new xml2js.Parser(); + const files = []; parser.parseString(xlfString, function (err, result) { if (err) { reject(new Error(`XLF parsing error: Failed to parse XLIFF string. ${err}`)); @@ -222,11 +183,11 @@ XLF.parse = function (xlfString) { reject(new Error(`XLF parsing error: XLIFF file does not contain "xliff" or "file" node(s) required for parsing.`)); } fileNodes.forEach((file) => { - const originalFilePath = file.$.original; - if (!originalFilePath) { + const name = file.$.original; + if (!name) { reject(new Error(`XLF parsing error: XLIFF file node does not contain original attribute to determine the original location of the resource file.`)); } - let language = file.$['target-language']; + const language = file.$['target-language']; if (!language) { reject(new Error(`XLF parsing error: XLIFF file node does not contain target-language attribute to determine translated language.`)); } @@ -244,45 +205,18 @@ XLF.parse = function (xlfString) { val = val._ ? val._ : ''; } if (!key) { - reject(new Error(`XLF parsing error: trans-unit ${JSON.stringify(unit, undefined, 0)} defined in file ${originalFilePath} is missing the ID attribute.`)); + reject(new Error(`XLF parsing error: trans-unit ${JSON.stringify(unit, undefined, 0)} defined in file ${name} is missing the ID attribute.`)); return; } messages[key] = decodeEntities(val); }); - files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() }); + files.push({ messages, name, language: language.toLowerCase() }); } }); resolve(files); }); }); }; -class Limiter { - constructor(maxDegreeOfParalellism) { - this.maxDegreeOfParalellism = maxDegreeOfParalellism; - this.outstandingPromises = []; - this.runningPromises = 0; - } - queue(factory) { - return new Promise((c, e) => { - this.outstandingPromises.push({ factory, c, e }); - this.consume(); - }); - } - consume() { - while (this.outstandingPromises.length && this.runningPromises < this.maxDegreeOfParalellism) { - const iLimitedTask = this.outstandingPromises.shift(); - this.runningPromises++; - const promise = iLimitedTask.factory(); - promise.then(iLimitedTask.c).catch(iLimitedTask.e); - promise.then(() => this.consumed()).catch(() => this.consumed()); - } - } - consumed() { - this.runningPromises--; - this.consume(); - } -} -exports.Limiter = Limiter; function sortLanguages(languages) { return languages.sort((a, b) => { return a.id < b.id ? -1 : (a.id > b.id ? 1 : 0); @@ -295,9 +229,10 @@ function stripComments(content) { // Second group matches a single quoted string // Third group matches a multi line comment // Forth group matches a single line comment - const regexp = /("[^"\\]*(?:\\.[^"\\]*)*")|('[^'\\]*(?:\\.[^'\\]*)*')|(\/\*[^\/\*]*(?:(?:\*|\/)[^\/\*]*)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))/g; - let result = content.replace(regexp, (match, _m1, _m2, m3, m4) => { - // Only one of m1, m2, m3, m4 matches + // Fifth group matches a trailing comma + const regexp = /("[^"\\]*(?:\\.[^"\\]*)*")|('[^'\\]*(?:\\.[^'\\]*)*')|(\/\*[^\/\*]*(?:(?:\*|\/)[^\/\*]*)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))|(,\s*[}\]])/g; + const result = content.replace(regexp, (match, _m1, _m2, m3, m4, m5) => { + // Only one of m1, m2, m3, m4, m5 matches if (m3) { // A block comment. Replace with nothing return ''; @@ -313,6 +248,10 @@ function stripComments(content) { return ''; } } + else if (m5) { + // Remove the trailing comma + return match.substring(1); + } else { // We match a string return match; @@ -356,20 +295,20 @@ function escapeCharacters(value) { return result.join(''); } function processCoreBundleFormat(fileHeader, languages, json, emitter) { - let keysSection = json.keys; - let messageSection = json.messages; - let bundleSection = json.bundles; - let statistics = Object.create(null); - let defaultMessages = Object.create(null); - let modules = Object.keys(keysSection); + const keysSection = json.keys; + const messageSection = json.messages; + const bundleSection = json.bundles; + const statistics = Object.create(null); + const defaultMessages = Object.create(null); + const modules = Object.keys(keysSection); modules.forEach((module) => { - let keys = keysSection[module]; - let messages = messageSection[module]; + const keys = keysSection[module]; + const messages = messageSection[module]; if (!messages || keys.length !== messages.length) { emitter.emit('error', `Message for module ${module} corrupted. Mismatch in number of keys and messages.`); return; } - let messageMap = Object.create(null); + const messageMap = Object.create(null); defaultMessages[module] = messageMap; keys.map((key, i) => { if (typeof key === 'string') { @@ -380,27 +319,27 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) { } }); }); - let languageDirectory = path.join(__dirname, '..', '..', '..', 'vscode-loc', 'i18n'); + const languageDirectory = path.join(__dirname, '..', '..', '..', 'vscode-loc', 'i18n'); if (!fs.existsSync(languageDirectory)) { log(`No VS Code localization repository found. Looking at ${languageDirectory}`); log(`To bundle translations please check out the vscode-loc repository as a sibling of the vscode repository.`); } - let sortedLanguages = sortLanguages(languages); + const sortedLanguages = sortLanguages(languages); sortedLanguages.forEach((language) => { if (process.env['VSCODE_BUILD_VERBOSE']) { log(`Generating nls bundles for: ${language.id}`); } statistics[language.id] = 0; - let localizedModules = Object.create(null); - let languageFolderName = language.translationId || language.id; - let i18nFile = path.join(languageDirectory, `vscode-language-pack-${languageFolderName}`, 'translations', 'main.i18n.json'); + const localizedModules = Object.create(null); + const languageFolderName = language.translationId || language.id; + const i18nFile = path.join(languageDirectory, `vscode-language-pack-${languageFolderName}`, 'translations', 'main.i18n.json'); let allMessages; if (fs.existsSync(i18nFile)) { - let content = stripComments(fs.readFileSync(i18nFile, 'utf8')); + const content = stripComments(fs.readFileSync(i18nFile, 'utf8')); allMessages = JSON.parse(content); } modules.forEach((module) => { - let order = keysSection[module]; + const order = keysSection[module]; let moduleMessage; if (allMessages) { moduleMessage = allMessages.contents[module]; @@ -412,7 +351,7 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) { moduleMessage = defaultMessages[module]; statistics[language.id] = statistics[language.id] + Object.keys(moduleMessage).length; } - let localizedMessages = []; + const localizedMessages = []; order.forEach((keyInfo) => { let key = null; if (typeof keyInfo === 'string') { @@ -434,14 +373,14 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) { localizedModules[module] = localizedMessages; }); Object.keys(bundleSection).forEach((bundle) => { - let modules = bundleSection[bundle]; - let contents = [ + const modules = bundleSection[bundle]; + const contents = [ fileHeader, `define("${bundle}.nls.${language.id}", {` ]; modules.forEach((module, index) => { contents.push(`\t"${module}": [`); - let messages = localizedModules[module]; + const messages = localizedModules[module]; if (!messages) { emitter.emit('error', `Didn't find messages for module ${module}.`); return; @@ -456,11 +395,11 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) { }); }); Object.keys(statistics).forEach(key => { - let value = statistics[key]; + const value = statistics[key]; log(`${key} has ${value} untranslated strings.`); }); sortedLanguages.forEach(language => { - let stats = statistics[language.id]; + const stats = statistics[language.id]; if (Is.undef(stats)) { log(`\tNo translations found for language ${language.id}. Using default language instead.`); } @@ -468,7 +407,7 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) { } function processNlsFiles(opts) { return (0, event_stream_1.through)(function (file) { - let fileName = path.basename(file.path); + const fileName = path.basename(file.path); if (fileName === 'nls.metadata.json') { let json = null; if (file.isBuffer()) { @@ -486,7 +425,7 @@ function processNlsFiles(opts) { }); } exports.processNlsFiles = processNlsFiles; -const editorProject = 'vscode-editor', workbenchProject = 'vscode-workbench', extensionsProject = 'vscode-extensions', setupProject = 'vscode-setup'; +const editorProject = 'vscode-editor', workbenchProject = 'vscode-workbench', extensionsProject = 'vscode-extensions', setupProject = 'vscode-setup', serverProject = 'vscode-server'; function getResource(sourceFile) { let resource; if (/^vs\/platform/.test(sourceFile)) { @@ -504,6 +443,9 @@ function getResource(sourceFile) { else if (/^vs\/code/.test(sourceFile)) { return { name: 'vs/code', project: workbenchProject }; } + else if (/^vs\/server/.test(sourceFile)) { + return { name: 'vs/server', project: serverProject }; + } else if (/^vs\/workbench\/contrib/.test(sourceFile)) { resource = sourceFile.split('/', 4).join('/'); return { name: resource, project: workbenchProject }; @@ -525,7 +467,7 @@ function createXlfFilesForCoreBundle() { if (file.isBuffer()) { const xlfs = Object.create(null); const json = JSON.parse(file.contents.toString('utf8')); - for (let coreModule in json.keys) { + for (const coreModule in json.keys) { const projectResource = getResource(coreModule); const resource = projectResource.name; const project = projectResource.project; @@ -544,7 +486,7 @@ function createXlfFilesForCoreBundle() { xlf.addFile(`src/${coreModule}`, keys, messages); } } - for (let resource in xlfs) { + for (const resource in xlfs) { const xlf = xlfs[resource]; const filePath = `${xlf.project}/${resource.replace(/\//g, '_')}.xlf`; const xlfFile = new File({ @@ -566,6 +508,28 @@ function createXlfFilesForCoreBundle() { }); } exports.createXlfFilesForCoreBundle = createXlfFilesForCoreBundle; +function createL10nBundleForExtension(extensionName) { + const result = (0, event_stream_1.through)(); + gulp.src([ + `extensions/${extensionName}/src/**/*.ts`, + ]).pipe((0, event_stream_1.writeArray)((err, files) => { + if (err) { + result.emit('error', err); + return; + } + const json = (0, l10n_dev_1.getL10nJson)(files.map(file => { + return file.contents.toString('utf8'); + })); + if (Object.keys(json).length > 0) { + result.emit('data', new File({ + path: `${extensionName}/bundle.l10n.json`, + contents: Buffer.from(JSON.stringify(json), 'utf8') + })); + } + result.emit('end'); + })); + return result; +} function createXlfFilesForExtensions() { let counter = 0; let folderStreamEnded = false; @@ -576,57 +540,56 @@ function createXlfFilesForExtensions() { if (!stat.isDirectory()) { return; } - let extensionName = path.basename(extensionFolder.path); + const extensionName = path.basename(extensionFolder.path); if (extensionName === 'node_modules') { return; } counter++; - let _xlf; - function getXlf() { - if (!_xlf) { - _xlf = new XLF(extensionsProject); + let _l10nMap; + function getL10nMap() { + if (!_l10nMap) { + _l10nMap = new Map(); } - return _xlf; + return _l10nMap; } - gulp.src([`.build/extensions/${extensionName}/package.nls.json`, `.build/extensions/${extensionName}/**/nls.metadata.json`], { allowEmpty: true }).pipe((0, event_stream_1.through)(function (file) { + (0, event_stream_1.merge)(gulp.src([`.build/extensions/${extensionName}/package.nls.json`, `.build/extensions/${extensionName}/**/nls.metadata.json`], { allowEmpty: true }), createL10nBundleForExtension(extensionName)).pipe((0, event_stream_1.through)(function (file) { if (file.isBuffer()) { const buffer = file.contents; const basename = path.basename(file.path); if (basename === 'package.nls.json') { const json = JSON.parse(buffer.toString('utf8')); - const keys = Object.keys(json); - const messages = keys.map((key) => { - const value = json[key]; - if (Is.string(value)) { - return value; - } - else if (value) { - return value.message; - } - else { - return `Unknown message for key: ${key}`; - } - }); - getXlf().addFile(`extensions/${extensionName}/package`, keys, messages); + getL10nMap().set(`extensions/${extensionName}/package`, json); } else if (basename === 'nls.metadata.json') { const json = JSON.parse(buffer.toString('utf8')); const relPath = path.relative(`.build/extensions/${extensionName}`, path.dirname(file.path)); - for (let file in json) { + for (const file in json) { const fileContent = json[file]; - getXlf().addFile(`extensions/${extensionName}/${relPath}/${file}`, fileContent.keys, fileContent.messages); + const info = Object.create(null); + for (let i = 0; i < fileContent.messages.length; i++) { + const message = fileContent.messages[i]; + const { key, comment } = LocalizeInfo.is(fileContent.keys[i]) + ? fileContent.keys[i] + : { key: fileContent.keys[i], comment: undefined }; + info[key] = comment ? { message, comment } : message; + } + getL10nMap().set(`extensions/${extensionName}/${relPath}/${file}`, info); } } + else if (basename === 'bundle.l10n.json') { + const json = JSON.parse(buffer.toString('utf8')); + getL10nMap().set(`extensions/${extensionName}/bundle`, json); + } else { this.emit('error', new Error(`${file.path} is not a valid extension nls file`)); return; } } }, function () { - if (_xlf) { - let xlfFile = new File({ + if (_l10nMap?.size > 0) { + const xlfFile = new File({ path: path.join(extensionsProject, extensionName + '.xlf'), - contents: Buffer.from(_xlf.toString(), 'utf8') + contents: Buffer.from((0, l10n_dev_1.getL10nXlf)(_l10nMap), 'utf8') }); folderStream.queue(xlfFile); } @@ -656,14 +619,14 @@ function createXlfFilesForIsl() { else { throw new Error(`Unknown input file ${file.path}`); } - let xlf = new XLF(projectName), keys = [], messages = []; - let model = new TextModel(file.contents.toString()); + const xlf = new XLF(projectName), keys = [], messages = []; + const model = new TextModel(file.contents.toString()); let inMessageSection = false; model.lines.forEach(line => { if (line.length === 0) { return; } - let firstChar = line.charAt(0); + const firstChar = line.charAt(0); switch (firstChar) { case ';': // Comment line; @@ -675,13 +638,13 @@ function createXlfFilesForIsl() { if (!inMessageSection) { return; } - let sections = line.split('='); + const sections = line.split('='); if (sections.length !== 2) { throw new Error(`Badly formatted message found: ${line}`); } else { - let key = sections[0]; - let value = sections[1]; + const key = sections[0]; + const value = sections[1]; if (key.length > 0 && value.length > 0) { keys.push(key); messages.push(value); @@ -697,300 +660,8 @@ function createXlfFilesForIsl() { }); } exports.createXlfFilesForIsl = createXlfFilesForIsl; -function pushXlfFiles(apiHostname, username, password) { - let tryGetPromises = []; - let updateCreatePromises = []; - return (0, event_stream_1.through)(function (file) { - const project = path.dirname(file.relative); - const fileName = path.basename(file.path); - const slug = fileName.substr(0, fileName.length - '.xlf'.length); - const credentials = `${username}:${password}`; - // Check if resource already exists, if not, then create it. - let promise = tryGetResource(project, slug, apiHostname, credentials); - tryGetPromises.push(promise); - promise.then(exists => { - if (exists) { - promise = updateResource(project, slug, file, apiHostname, credentials); - } - else { - promise = createResource(project, slug, file, apiHostname, credentials); - } - updateCreatePromises.push(promise); - }); - }, function () { - // End the pipe only after all the communication with Transifex API happened - Promise.all(tryGetPromises).then(() => { - Promise.all(updateCreatePromises).then(() => { - this.queue(null); - }).catch((reason) => { throw new Error(reason); }); - }).catch((reason) => { throw new Error(reason); }); - }); -} -exports.pushXlfFiles = pushXlfFiles; -function getAllResources(project, apiHostname, username, password) { - return new Promise((resolve, reject) => { - const credentials = `${username}:${password}`; - const options = { - hostname: apiHostname, - path: `/api/2/project/${project}/resources`, - auth: credentials, - method: 'GET' - }; - const request = https.request(options, (res) => { - let buffer = []; - res.on('data', (chunk) => buffer.push(chunk)); - res.on('end', () => { - if (res.statusCode === 200) { - let json = JSON.parse(Buffer.concat(buffer).toString()); - if (Array.isArray(json)) { - resolve(json.map(o => o.slug)); - return; - } - reject(`Unexpected data format. Response code: ${res.statusCode}.`); - } - else { - reject(`No resources in ${project} returned no data. Response code: ${res.statusCode}.`); - } - }); - }); - request.on('error', (err) => { - reject(`Failed to query resources in ${project} with the following error: ${err}. ${options.path}`); - }); - request.end(); - }); -} -function findObsoleteResources(apiHostname, username, password) { - let resourcesByProject = Object.create(null); - resourcesByProject[extensionsProject] = [].concat(exports.externalExtensionsWithTranslations); // clone - return (0, event_stream_1.through)(function (file) { - const project = path.dirname(file.relative); - const fileName = path.basename(file.path); - const slug = fileName.substr(0, fileName.length - '.xlf'.length); - let slugs = resourcesByProject[project]; - if (!slugs) { - resourcesByProject[project] = slugs = []; - } - slugs.push(slug); - this.push(file); - }, function () { - const json = JSON.parse(fs.readFileSync('./build/lib/i18n.resources.json', 'utf8')); - let i18Resources = [...json.editor, ...json.workbench].map((r) => r.project + '/' + r.name.replace(/\//g, '_')); - let extractedResources = []; - for (let project of [workbenchProject, editorProject]) { - for (let resource of resourcesByProject[project]) { - if (resource !== 'setup_messages') { - extractedResources.push(project + '/' + resource); - } - } - } - if (i18Resources.length !== extractedResources.length) { - console.log(`[i18n] Obsolete resources in file 'build/lib/i18n.resources.json': JSON.stringify(${i18Resources.filter(p => extractedResources.indexOf(p) === -1)})`); - console.log(`[i18n] Missing resources in file 'build/lib/i18n.resources.json': JSON.stringify(${extractedResources.filter(p => i18Resources.indexOf(p) === -1)})`); - } - let promises = []; - for (let project in resourcesByProject) { - promises.push(getAllResources(project, apiHostname, username, password).then(resources => { - let expectedResources = resourcesByProject[project]; - let unusedResources = resources.filter(resource => resource && expectedResources.indexOf(resource) === -1); - if (unusedResources.length) { - console.log(`[transifex] Obsolete resources in project '${project}': ${unusedResources.join(', ')}`); - } - })); - } - return Promise.all(promises).then(_ => { - this.push(null); - }).catch((reason) => { throw new Error(reason); }); - }); -} -exports.findObsoleteResources = findObsoleteResources; -function tryGetResource(project, slug, apiHostname, credentials) { - return new Promise((resolve, reject) => { - const options = { - hostname: apiHostname, - path: `/api/2/project/${project}/resource/${slug}/?details`, - auth: credentials, - method: 'GET' - }; - const request = https.request(options, (response) => { - if (response.statusCode === 404) { - resolve(false); - } - else if (response.statusCode === 200) { - resolve(true); - } - else { - reject(`Failed to query resource ${project}/${slug}. Response: ${response.statusCode} ${response.statusMessage}`); - } - }); - request.on('error', (err) => { - reject(`Failed to get ${project}/${slug} on Transifex: ${err}`); - }); - request.end(); - }); -} -function createResource(project, slug, xlfFile, apiHostname, credentials) { - return new Promise((_resolve, reject) => { - const data = JSON.stringify({ - 'content': xlfFile.contents.toString(), - 'name': slug, - 'slug': slug, - 'i18n_type': 'XLIFF' - }); - const options = { - hostname: apiHostname, - path: `/api/2/project/${project}/resources`, - headers: { - 'Content-Type': 'application/json', - 'Content-Length': Buffer.byteLength(data) - }, - auth: credentials, - method: 'POST' - }; - let request = https.request(options, (res) => { - if (res.statusCode === 201) { - log(`Resource ${project}/${slug} successfully created on Transifex.`); - } - else { - reject(`Something went wrong in the request creating ${slug} in ${project}. ${res.statusCode}`); - } - }); - request.on('error', (err) => { - reject(`Failed to create ${project}/${slug} on Transifex: ${err}`); - }); - request.write(data); - request.end(); - }); -} -/** - * The following link provides information about how Transifex handles updates of a resource file: - * https://dev.befoolish.co/tx-docs/public/projects/updating-content#what-happens-when-you-update-files - */ -function updateResource(project, slug, xlfFile, apiHostname, credentials) { - return new Promise((resolve, reject) => { - const data = JSON.stringify({ content: xlfFile.contents.toString() }); - const options = { - hostname: apiHostname, - path: `/api/2/project/${project}/resource/${slug}/content`, - headers: { - 'Content-Type': 'application/json', - 'Content-Length': Buffer.byteLength(data) - }, - auth: credentials, - method: 'PUT' - }; - let request = https.request(options, (res) => { - if (res.statusCode === 200) { - res.setEncoding('utf8'); - let responseBuffer = ''; - res.on('data', function (chunk) { - responseBuffer += chunk; - }); - res.on('end', () => { - const response = JSON.parse(responseBuffer); - log(`Resource ${project}/${slug} successfully updated on Transifex. Strings added: ${response.strings_added}, updated: ${response.strings_added}, deleted: ${response.strings_added}`); - resolve(); - }); - } - else { - reject(`Something went wrong in the request updating ${slug} in ${project}. ${res.statusCode}`); - } - }); - request.on('error', (err) => { - reject(`Failed to update ${project}/${slug} on Transifex: ${err}`); - }); - request.write(data); - request.end(); - }); -} -function pullSetupXlfFiles(apiHostname, username, password, language, includeDefault) { - let setupResources = [{ name: 'setup_messages', project: workbenchProject }]; - if (includeDefault) { - setupResources.push({ name: 'setup_default', project: setupProject }); - } - return pullXlfFiles(apiHostname, username, password, language, setupResources); -} -exports.pullSetupXlfFiles = pullSetupXlfFiles; -function pullXlfFiles(apiHostname, username, password, language, resources) { - const credentials = `${username}:${password}`; - let expectedTranslationsCount = resources.length; - let translationsRetrieved = 0, called = false; - return (0, event_stream_1.readable)(function (_count, callback) { - // Mark end of stream when all resources were retrieved - if (translationsRetrieved === expectedTranslationsCount) { - return this.emit('end'); - } - if (!called) { - called = true; - const stream = this; - resources.map(function (resource) { - retrieveResource(language, resource, apiHostname, credentials).then((file) => { - if (file) { - stream.emit('data', file); - } - translationsRetrieved++; - }).catch(error => { throw new Error(error); }); - }); - } - callback(); - }); -} -const limiter = new Limiter(NUMBER_OF_CONCURRENT_DOWNLOADS); -function retrieveResource(language, resource, apiHostname, credentials) { - return limiter.queue(() => new Promise((resolve, reject) => { - const slug = resource.name.replace(/\//g, '_'); - const project = resource.project; - let transifexLanguageId = language.id === 'ps' ? 'en' : language.translationId || language.id; - const options = { - hostname: apiHostname, - path: `/api/2/project/${project}/resource/${slug}/translation/${transifexLanguageId}?file&mode=onlyreviewed`, - auth: credentials, - port: 443, - method: 'GET' - }; - console.log('[transifex] Fetching ' + options.path); - let request = https.request(options, (res) => { - let xlfBuffer = []; - res.on('data', (chunk) => xlfBuffer.push(chunk)); - res.on('end', () => { - if (res.statusCode === 200) { - resolve(new File({ contents: Buffer.concat(xlfBuffer), path: `${project}/${slug}.xlf` })); - } - else if (res.statusCode === 404) { - console.log(`[transifex] ${slug} in ${project} returned no data.`); - resolve(null); - } - else { - reject(`${slug} in ${project} returned no data. Response code: ${res.statusCode}.`); - } - }); - }); - request.on('error', (err) => { - reject(`Failed to query resource ${slug} with the following error: ${err}. ${options.path}`); - }); - request.end(); - })); -} -function prepareI18nFiles() { - let parsePromises = []; - return (0, event_stream_1.through)(function (xlf) { - let stream = this; - let parsePromise = XLF.parse(xlf.contents.toString()); - parsePromises.push(parsePromise); - parsePromise.then(resolvedFiles => { - resolvedFiles.forEach(file => { - let translatedFile = createI18nFile(file.originalFilePath, file.messages); - stream.queue(translatedFile); - }); - }); - }, function () { - Promise.all(parsePromises) - .then(() => { this.queue(null); }) - .catch(reason => { throw new Error(reason); }); - }); -} -exports.prepareI18nFiles = prepareI18nFiles; -function createI18nFile(originalFilePath, messages) { - let result = Object.create(null); +function createI18nFile(name, messages) { + const result = Object.create(null); result[''] = [ '--------------------------------------------------------------------------------------------', 'Copyright (c) Microsoft Corporation. All rights reserved.', @@ -998,7 +669,7 @@ function createI18nFile(originalFilePath, messages) { '--------------------------------------------------------------------------------------------', 'Do not edit this file. It is machine generated.' ]; - for (let key of Object.keys(messages)) { + for (const key of Object.keys(messages)) { result[key] = messages[key]; } let content = JSON.stringify(result, null, '\t'); @@ -1006,43 +677,51 @@ function createI18nFile(originalFilePath, messages) { content = content.replace(/\n/g, '\r\n'); } return new File({ - path: path.join(originalFilePath + '.i18n.json'), + path: path.join(name + '.i18n.json'), contents: Buffer.from(content, 'utf8') }); } const i18nPackVersion = '1.0.0'; -function prepareI18nPackFiles(externalExtensions, resultingTranslationPaths, pseudo = false) { - let parsePromises = []; - let mainPack = { version: i18nPackVersion, contents: {} }; - let extensionsPacks = {}; - let errors = []; +function getRecordFromL10nJsonFormat(l10nJsonFormat) { + const record = {}; + for (const key of Object.keys(l10nJsonFormat)) { + const value = l10nJsonFormat[key]; + record[key] = typeof value === 'string' ? value : value.message; + } + return record; +} +function prepareI18nPackFiles(resultingTranslationPaths) { + const parsePromises = []; + const mainPack = { version: i18nPackVersion, contents: {} }; + const extensionsPacks = {}; + const errors = []; return (0, event_stream_1.through)(function (xlf) { - let project = path.basename(path.dirname(path.dirname(xlf.relative))); - let resource = path.basename(xlf.relative, '.xlf'); - let contents = xlf.contents.toString(); + const project = path.basename(path.dirname(path.dirname(xlf.relative))); + const resource = path.basename(xlf.relative, '.xlf'); + const contents = xlf.contents.toString(); log(`Found ${project}: ${resource}`); - let parsePromise = pseudo ? XLF.parsePseudo(contents) : XLF.parse(contents); + const parsePromise = (0, l10n_dev_1.getL10nFilesFromXlf)(contents); parsePromises.push(parsePromise); parsePromise.then(resolvedFiles => { resolvedFiles.forEach(file => { - const path = file.originalFilePath; + const path = file.name; const firstSlash = path.indexOf('/'); if (project === extensionsProject) { let extPack = extensionsPacks[resource]; if (!extPack) { extPack = extensionsPacks[resource] = { version: i18nPackVersion, contents: {} }; } - const externalId = externalExtensions[resource]; + const externalId = externalExtensionsWithTranslations[resource]; if (!externalId) { // internal extension: remove 'extensions/extensionId/' segnent const secondSlash = path.indexOf('/', firstSlash + 1); - extPack.contents[path.substr(secondSlash + 1)] = file.messages; + extPack.contents[path.substring(secondSlash + 1)] = getRecordFromL10nJsonFormat(file.messages); } else { - extPack.contents[path] = file.messages; + extPack.contents[path] = getRecordFromL10nJsonFormat(file.messages); } } else { - mainPack.contents[path.substr(firstSlash + 1)] = file.messages; + mainPack.contents[path.substring(firstSlash + 1)] = getRecordFromL10nJsonFormat(file.messages); } }); }).catch(reason => { @@ -1057,10 +736,10 @@ function prepareI18nPackFiles(externalExtensions, resultingTranslationPaths, pse const translatedMainFile = createI18nFile('./main', mainPack); resultingTranslationPaths.push({ id: 'vscode', resourceName: 'main.i18n.json' }); this.queue(translatedMainFile); - for (let extension in extensionsPacks) { + for (const extension in extensionsPacks) { const translatedExtFile = createI18nFile(`extensions/${extension}`, extensionsPacks[extension]); this.queue(translatedExtFile); - const externalExtensionId = externalExtensions[extension]; + const externalExtensionId = externalExtensionsWithTranslations[extension]; if (externalExtensionId) { resultingTranslationPaths.push({ id: externalExtensionId, resourceName: `extensions/${extension}.i18n.json` }); } @@ -1077,14 +756,14 @@ function prepareI18nPackFiles(externalExtensions, resultingTranslationPaths, pse } exports.prepareI18nPackFiles = prepareI18nPackFiles; function prepareIslFiles(language, innoSetupConfig) { - let parsePromises = []; + const parsePromises = []; return (0, event_stream_1.through)(function (xlf) { - let stream = this; - let parsePromise = XLF.parse(xlf.contents.toString()); + const stream = this; + const parsePromise = XLF.parse(xlf.contents.toString()); parsePromises.push(parsePromise); parsePromise.then(resolvedFiles => { resolvedFiles.forEach(file => { - let translatedFile = createIslFile(file.originalFilePath, file.messages, language, innoSetupConfig); + const translatedFile = createIslFile(file.name, file.messages, language, innoSetupConfig); stream.queue(translatedFile); }); }).catch(reason => { @@ -1099,27 +778,27 @@ function prepareIslFiles(language, innoSetupConfig) { }); } exports.prepareIslFiles = prepareIslFiles; -function createIslFile(originalFilePath, messages, language, innoSetup) { - let content = []; +function createIslFile(name, messages, language, innoSetup) { + const content = []; let originalContent; - if (path.basename(originalFilePath) === 'Default') { - originalContent = new TextModel(fs.readFileSync(originalFilePath + '.isl', 'utf8')); + if (path.basename(name) === 'Default') { + originalContent = new TextModel(fs.readFileSync(name + '.isl', 'utf8')); } else { - originalContent = new TextModel(fs.readFileSync(originalFilePath + '.en.isl', 'utf8')); + originalContent = new TextModel(fs.readFileSync(name + '.en.isl', 'utf8')); } originalContent.lines.forEach(line => { if (line.length > 0) { - let firstChar = line.charAt(0); + const firstChar = line.charAt(0); if (firstChar === '[' || firstChar === ';') { content.push(line); } else { - let sections = line.split('='); - let key = sections[0]; + const sections = line.split('='); + const key = sections[0]; let translated = line; if (key) { - let translatedMessage = messages[key]; + const translatedMessage = messages[key]; if (translatedMessage) { translated = `${key}=${translatedMessage}`; } @@ -1128,7 +807,7 @@ function createIslFile(originalFilePath, messages, language, innoSetup) { } } }); - const basename = path.basename(originalFilePath); + const basename = path.basename(name); const filePath = `${basename}.${language.id}.isl`; const encoded = iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage); return new File({ @@ -1137,9 +816,9 @@ function createIslFile(originalFilePath, messages, language, innoSetup) { }); } function encodeEntities(value) { - let result = []; + const result = []; for (let i = 0; i < value.length; i++) { - let ch = value[i]; + const ch = value[i]; switch (ch) { case '<': result.push('<'); @@ -1159,6 +838,3 @@ function encodeEntities(value) { function decodeEntities(value) { return value.replace(/</g, '<').replace(/>/g, '>').replace(/&/g, '&'); } -function pseudify(message) { - return '\uFF3B' + message.replace(/[aouei]/g, '$&$&') + '\uFF3D'; -} diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json index b7b2cd1833e..fa8f6fc1feb 100644 --- a/build/lib/i18n.resources.json +++ b/build/lib/i18n.resources.json @@ -90,6 +90,10 @@ "name": "vs/workbench/contrib/files", "project": "vscode-workbench" }, + { + "name": "vs/workbench/contrib/folding", + "project": "vscode-workbench" + }, { "name": "vs/workbench/contrib/html", "project": "vscode-workbench" @@ -278,6 +282,10 @@ "name": "vs/workbench/contrib/userDataSync", "project": "vscode-workbench" }, + { + "name": "vs/workbench/contrib/editSessions", + "project": "vscode-workbench" + }, { "name": "vs/workbench/contrib/views", "project": "vscode-workbench" @@ -290,10 +298,22 @@ "name": "vs/workbench/contrib/audioCues", "project": "vscode-workbench" }, + { + "name": "vs/workbench/contrib/deprecatedExtensionMigrator", + "project": "vscode-workbench" + }, + { + "name": "vs/workbench/contrib/bracketPairColorizer2Telemetry", + "project": "vscode-workbench" + }, { "name": "vs/workbench/contrib/offline", "project": "vscode-workbench" }, + { + "name": "vs/workbench/contrib/remoteTunnel", + "project": "vscode-workbench" + }, { "name": "vs/workbench/services/actions", "project": "vscode-workbench" @@ -426,6 +446,10 @@ "name": "vs/workbench/services/userDataSync", "project": "vscode-workbench" }, + { + "name": "vs/workbench/services/editSessions", + "project": "vscode-workbench" + }, { "name": "vs/workbench/services/views", "project": "vscode-workbench" @@ -455,11 +479,11 @@ "project": "vscode-workbench" }, { - "name": "vs/workbench/contrib/profiles", + "name": "vs/workbench/contrib/userDataProfile", "project": "vscode-profiles" }, { - "name": "vs/workbench/services/profiles", + "name": "vs/workbench/services/userDataProfile", "project": "vscode-profiles" } ] diff --git a/build/lib/i18n.ts b/build/lib/i18n.ts index 3ea4f7efb4e..1962ba98926 100644 --- a/build/lib/i18n.ts +++ b/build/lib/i18n.ts @@ -6,17 +6,15 @@ import * as path from 'path'; import * as fs from 'fs'; -import { through, readable, ThroughStream } from 'event-stream'; +import { merge, through, ThroughStream, writeArray } from 'event-stream'; import * as File from 'vinyl'; import * as Is from 'is'; import * as xml2js from 'xml2js'; -import * as https from 'https'; import * as gulp from 'gulp'; import * as fancyLog from 'fancy-log'; import * as ansiColors from 'ansi-colors'; import * as iconv from '@vscode/iconv-lite-umd'; - -const NUMBER_OF_CONCURRENT_DOWNLOADS = 4; +import { l10nJsonFormat, getL10nXlf, l10nJsonDetails, getL10nFilesFromXlf, getL10nJson } from '@vscode/l10n-dev'; function log(message: any, ...rest: any[]): void { fancyLog(ansiColors.green('[i18n]'), message, ...rest); @@ -52,17 +50,12 @@ export const extraLanguages: Language[] = [ ]; // non built-in extensions also that are transifex and need to be part of the language packs -export const externalExtensionsWithTranslations = { +const externalExtensionsWithTranslations: Record = { 'vscode-chrome-debug': 'msjsdiag.debugger-for-chrome', 'vscode-node-debug': 'ms-vscode.node-debug', 'vscode-node-debug2': 'ms-vscode.node-debug2' }; - -interface Map { - [key: string]: V; -} - interface Item { id: string; message: string; @@ -74,12 +67,6 @@ export interface Resource { project: string; } -interface ParsedXLF { - messages: Map; - originalFilePath: string; - language: string; -} - interface LocalizeInfo { key: string; comment: string[]; @@ -87,15 +74,15 @@ interface LocalizeInfo { module LocalizeInfo { export function is(value: any): value is LocalizeInfo { - let candidate = value as LocalizeInfo; + const candidate = value as LocalizeInfo; return Is.defined(candidate) && Is.string(candidate.key) && (Is.undef(candidate.comment) || (Is.array(candidate.comment) && candidate.comment.every(element => Is.string(element)))); } } interface BundledFormat { - keys: Map<(string | LocalizeInfo)[]>; - messages: Map; - bundles: Map; + keys: Record; + messages: Record; + bundles: Record; } module BundledFormat { @@ -104,34 +91,13 @@ module BundledFormat { return false; } - let candidate = value as BundledFormat; - let length = Object.keys(value).length; + const candidate = value as BundledFormat; + const length = Object.keys(value).length; return length === 3 && Is.defined(candidate.keys) && Is.defined(candidate.messages) && Is.defined(candidate.bundles); } } -interface ValueFormat { - message: string; - comment: string[]; -} - -interface PackageJsonFormat { - [key: string]: string | ValueFormat; -} - -module PackageJsonFormat { - export function is(value: any): value is PackageJsonFormat { - if (Is.undef(value) || !Is.object(value)) { - return false; - } - return Object.keys(value).every(key => { - let element = value[key]; - return Is.string(element) || (Is.object(element) && Is.defined(element.message) && Is.defined(element.comment)); - }); - } -} - interface BundledExtensionFormat { [key: string]: { messages: string[]; @@ -181,7 +147,7 @@ class TextModel { export class XLF { private buffer: string[]; - private files: Map; + private files: Record; public numberOfMessages: number; constructor(public project: string) { @@ -218,9 +184,9 @@ export class XLF { } this.numberOfMessages += keys.length; this.files[original] = []; - let existingKeys = new Set(); + const existingKeys = new Set(); for (let i = 0; i < keys.length; i++) { - let key = keys[i]; + const key = keys[i]; let realKey: string | undefined; let comment: string | undefined; if (Is.string(key)) { @@ -236,7 +202,7 @@ export class XLF { continue; } existingKeys.add(realKey); - let message: string = encodeEntities(messages[i]); + const message: string = encodeEntities(messages[i]); this.files[original].push({ id: realKey, message: message, comment: comment }); } } @@ -269,42 +235,16 @@ export class XLF { } private appendNewLine(content: string, indent?: number): void { - let line = new Line(indent); + const line = new Line(indent); line.append(content); this.buffer.push(line.toString()); } - static parsePseudo = function (xlfString: string): Promise { - return new Promise((resolve) => { - let parser = new xml2js.Parser(); - let files: { messages: Map; originalFilePath: string; language: string }[] = []; - parser.parseString(xlfString, function (_err: any, result: any) { - const fileNodes: any[] = result['xliff']['file']; - fileNodes.forEach(file => { - const originalFilePath = file.$.original; - const messages: Map = {}; - const transUnits = file.body[0]['trans-unit']; - if (transUnits) { - transUnits.forEach((unit: any) => { - const key = unit.$.id; - const val = pseudify(unit.source[0]['_'].toString()); - if (key && val) { - messages[key] = decodeEntities(val); - } - }); - files.push({ messages: messages, originalFilePath: originalFilePath, language: 'ps' }); - } - }); - resolve(files); - }); - }); - }; - - static parse = function (xlfString: string): Promise { + static parse = function (xlfString: string): Promise { return new Promise((resolve, reject) => { - let parser = new xml2js.Parser(); + const parser = new xml2js.Parser(); - let files: { messages: Map; originalFilePath: string; language: string }[] = []; + const files: { messages: Record; name: string; language: string }[] = []; parser.parseString(xlfString, function (err: any, result: any) { if (err) { @@ -317,15 +257,15 @@ export class XLF { } fileNodes.forEach((file) => { - const originalFilePath = file.$.original; - if (!originalFilePath) { + const name = file.$.original; + if (!name) { reject(new Error(`XLF parsing error: XLIFF file node does not contain original attribute to determine the original location of the resource file.`)); } - let language = file.$['target-language']; + const language = file.$['target-language']; if (!language) { reject(new Error(`XLF parsing error: XLIFF file node does not contain target-language attribute to determine translated language.`)); } - const messages: Map = {}; + const messages: Record = {}; const transUnits = file.body[0]['trans-unit']; if (transUnits) { @@ -341,12 +281,12 @@ export class XLF { val = val._ ? val._ : ''; } if (!key) { - reject(new Error(`XLF parsing error: trans-unit ${JSON.stringify(unit, undefined, 0)} defined in file ${originalFilePath} is missing the ID attribute.`)); + reject(new Error(`XLF parsing error: trans-unit ${JSON.stringify(unit, undefined, 0)} defined in file ${name} is missing the ID attribute.`)); return; } messages[key] = decodeEntities(val); }); - files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() }); + files.push({ messages, name, language: language.toLowerCase() }); } }); @@ -356,49 +296,6 @@ export class XLF { }; } -export interface ITask { - (): T; -} - -interface ILimitedTaskFactory { - factory: ITask>; - c: (value?: T | Promise) => void; - e: (error?: any) => void; -} - -export class Limiter { - private runningPromises: number; - private outstandingPromises: ILimitedTaskFactory[]; - - constructor(private maxDegreeOfParalellism: number) { - this.outstandingPromises = []; - this.runningPromises = 0; - } - - queue(factory: ITask>): Promise { - return new Promise((c, e) => { - this.outstandingPromises.push({ factory, c, e }); - this.consume(); - }); - } - - private consume(): void { - while (this.outstandingPromises.length && this.runningPromises < this.maxDegreeOfParalellism) { - const iLimitedTask = this.outstandingPromises.shift()!; - this.runningPromises++; - - const promise = iLimitedTask.factory(); - promise.then(iLimitedTask.c).catch(iLimitedTask.e); - promise.then(() => this.consumed()).catch(() => this.consumed()); - } - } - - private consumed(): void { - this.runningPromises--; - this.consume(); - } -} - function sortLanguages(languages: Language[]): Language[] { return languages.sort((a: Language, b: Language): number => { return a.id < b.id ? -1 : (a.id > b.id ? 1 : 0); @@ -412,9 +309,10 @@ function stripComments(content: string): string { // Second group matches a single quoted string // Third group matches a multi line comment // Forth group matches a single line comment - const regexp = /("[^"\\]*(?:\\.[^"\\]*)*")|('[^'\\]*(?:\\.[^'\\]*)*')|(\/\*[^\/\*]*(?:(?:\*|\/)[^\/\*]*)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))/g; - let result = content.replace(regexp, (match, _m1: string, _m2: string, m3: string, m4: string) => { - // Only one of m1, m2, m3, m4 matches + // Fifth group matches a trailing comma + const regexp = /("[^"\\]*(?:\\.[^"\\]*)*")|('[^'\\]*(?:\\.[^'\\]*)*')|(\/\*[^\/\*]*(?:(?:\*|\/)[^\/\*]*)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))|(,\s*[}\]])/g; + const result = content.replace(regexp, (match, _m1: string, _m2: string, m3: string, m4: string, m5: string) => { + // Only one of m1, m2, m3, m4, m5 matches if (m3) { // A block comment. Replace with nothing return ''; @@ -427,6 +325,9 @@ function stripComments(content: string): string { } else { return ''; } + } else if (m5) { + // Remove the trailing comma + return match.substring(1); } else { // We match a string return match; @@ -472,22 +373,22 @@ function escapeCharacters(value: string): string { } function processCoreBundleFormat(fileHeader: string, languages: Language[], json: BundledFormat, emitter: ThroughStream) { - let keysSection = json.keys; - let messageSection = json.messages; - let bundleSection = json.bundles; + const keysSection = json.keys; + const messageSection = json.messages; + const bundleSection = json.bundles; - let statistics: Map = Object.create(null); + const statistics: Record = Object.create(null); - let defaultMessages: Map> = Object.create(null); - let modules = Object.keys(keysSection); + const defaultMessages: Record> = Object.create(null); + const modules = Object.keys(keysSection); modules.forEach((module) => { - let keys = keysSection[module]; - let messages = messageSection[module]; + const keys = keysSection[module]; + const messages = messageSection[module]; if (!messages || keys.length !== messages.length) { emitter.emit('error', `Message for module ${module} corrupted. Mismatch in number of keys and messages.`); return; } - let messageMap: Map = Object.create(null); + const messageMap: Record = Object.create(null); defaultMessages[module] = messageMap; keys.map((key, i) => { if (typeof key === 'string') { @@ -498,28 +399,28 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json }); }); - let languageDirectory = path.join(__dirname, '..', '..', '..', 'vscode-loc', 'i18n'); + const languageDirectory = path.join(__dirname, '..', '..', '..', 'vscode-loc', 'i18n'); if (!fs.existsSync(languageDirectory)) { log(`No VS Code localization repository found. Looking at ${languageDirectory}`); log(`To bundle translations please check out the vscode-loc repository as a sibling of the vscode repository.`); } - let sortedLanguages = sortLanguages(languages); + const sortedLanguages = sortLanguages(languages); sortedLanguages.forEach((language) => { if (process.env['VSCODE_BUILD_VERBOSE']) { log(`Generating nls bundles for: ${language.id}`); } statistics[language.id] = 0; - let localizedModules: Map = Object.create(null); - let languageFolderName = language.translationId || language.id; - let i18nFile = path.join(languageDirectory, `vscode-language-pack-${languageFolderName}`, 'translations', 'main.i18n.json'); + const localizedModules: Record = Object.create(null); + const languageFolderName = language.translationId || language.id; + const i18nFile = path.join(languageDirectory, `vscode-language-pack-${languageFolderName}`, 'translations', 'main.i18n.json'); let allMessages: I18nFormat | undefined; if (fs.existsSync(i18nFile)) { - let content = stripComments(fs.readFileSync(i18nFile, 'utf8')); + const content = stripComments(fs.readFileSync(i18nFile, 'utf8')); allMessages = JSON.parse(content); } modules.forEach((module) => { - let order = keysSection[module]; + const order = keysSection[module]; let moduleMessage: { [messageKey: string]: string } | undefined; if (allMessages) { moduleMessage = allMessages.contents[module]; @@ -531,7 +432,7 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json moduleMessage = defaultMessages[module]; statistics[language.id] = statistics[language.id] + Object.keys(moduleMessage).length; } - let localizedMessages: string[] = []; + const localizedMessages: string[] = []; order.forEach((keyInfo) => { let key: string | null = null; if (typeof keyInfo === 'string') { @@ -552,14 +453,14 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json localizedModules[module] = localizedMessages; }); Object.keys(bundleSection).forEach((bundle) => { - let modules = bundleSection[bundle]; - let contents: string[] = [ + const modules = bundleSection[bundle]; + const contents: string[] = [ fileHeader, `define("${bundle}.nls.${language.id}", {` ]; modules.forEach((module, index) => { contents.push(`\t"${module}": [`); - let messages = localizedModules[module]; + const messages = localizedModules[module]; if (!messages) { emitter.emit('error', `Didn't find messages for module ${module}.`); return; @@ -574,11 +475,11 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json }); }); Object.keys(statistics).forEach(key => { - let value = statistics[key]; + const value = statistics[key]; log(`${key} has ${value} untranslated strings.`); }); sortedLanguages.forEach(language => { - let stats = statistics[language.id]; + const stats = statistics[language.id]; if (Is.undef(stats)) { log(`\tNo translations found for language ${language.id}. Using default language instead.`); } @@ -587,7 +488,7 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json export function processNlsFiles(opts: { fileHeader: string; languages: Language[] }): ThroughStream { return through(function (this: ThroughStream, file: File) { - let fileName = path.basename(file.path); + const fileName = path.basename(file.path); if (fileName === 'nls.metadata.json') { let json = null; if (file.isBuffer()) { @@ -607,7 +508,8 @@ export function processNlsFiles(opts: { fileHeader: string; languages: Language[ const editorProject: string = 'vscode-editor', workbenchProject: string = 'vscode-workbench', extensionsProject: string = 'vscode-extensions', - setupProject: string = 'vscode-setup'; + setupProject: string = 'vscode-setup', + serverProject: string = 'vscode-server'; export function getResource(sourceFile: string): Resource { let resource: string; @@ -622,6 +524,8 @@ export function getResource(sourceFile: string): Resource { return { name: 'vs/base', project: editorProject }; } else if (/^vs\/code/.test(sourceFile)) { return { name: 'vs/code', project: workbenchProject }; + } else if (/^vs\/server/.test(sourceFile)) { + return { name: 'vs/server', project: serverProject }; } else if (/^vs\/workbench\/contrib/.test(sourceFile)) { resource = sourceFile.split('/', 4).join('/'); return { name: resource, project: workbenchProject }; @@ -641,9 +545,9 @@ export function createXlfFilesForCoreBundle(): ThroughStream { const basename = path.basename(file.path); if (basename === 'nls.metadata.json') { if (file.isBuffer()) { - const xlfs: Map = Object.create(null); + const xlfs: Record = Object.create(null); const json: BundledFormat = JSON.parse((file.contents as Buffer).toString('utf8')); - for (let coreModule in json.keys) { + for (const coreModule in json.keys) { const projectResource = getResource(coreModule); const resource = projectResource.name; const project = projectResource.project; @@ -662,7 +566,7 @@ export function createXlfFilesForCoreBundle(): ThroughStream { xlf.addFile(`src/${coreModule}`, keys, messages); } } - for (let resource in xlfs) { + for (const resource in xlfs) { const xlf = xlfs[resource]; const filePath = `${xlf.project}/${resource.replace(/\//g, '_')}.xlf`; const xlfFile = new File({ @@ -682,6 +586,32 @@ export function createXlfFilesForCoreBundle(): ThroughStream { }); } +function createL10nBundleForExtension(extensionName: string): ThroughStream { + const result = through(); + gulp.src([ + `extensions/${extensionName}/src/**/*.ts`, + ]).pipe(writeArray((err, files: File[]) => { + if (err) { + result.emit('error', err); + return; + } + + const json = getL10nJson(files.map(file => { + return file.contents.toString('utf8'); + })); + + if (Object.keys(json).length > 0) { + result.emit('data', new File({ + path: `${extensionName}/bundle.l10n.json`, + contents: Buffer.from(JSON.stringify(json), 'utf8') + })); + } + result.emit('end'); + })); + + return result; +} + export function createXlfFilesForExtensions(): ThroughStream { let counter: number = 0; let folderStreamEnded: boolean = false; @@ -692,53 +622,57 @@ export function createXlfFilesForExtensions(): ThroughStream { if (!stat.isDirectory()) { return; } - let extensionName = path.basename(extensionFolder.path); + const extensionName = path.basename(extensionFolder.path); if (extensionName === 'node_modules') { return; } counter++; - let _xlf: XLF; - function getXlf() { - if (!_xlf) { - _xlf = new XLF(extensionsProject); + let _l10nMap: Map; + function getL10nMap() { + if (!_l10nMap) { + _l10nMap = new Map(); } - return _xlf; + return _l10nMap; } - gulp.src([`.build/extensions/${extensionName}/package.nls.json`, `.build/extensions/${extensionName}/**/nls.metadata.json`], { allowEmpty: true }).pipe(through(function (file: File) { + merge( + gulp.src([`.build/extensions/${extensionName}/package.nls.json`, `.build/extensions/${extensionName}/**/nls.metadata.json`], { allowEmpty: true }), + createL10nBundleForExtension(extensionName) + ).pipe(through(function (file: File) { if (file.isBuffer()) { const buffer: Buffer = file.contents as Buffer; const basename = path.basename(file.path); if (basename === 'package.nls.json') { - const json: PackageJsonFormat = JSON.parse(buffer.toString('utf8')); - const keys = Object.keys(json); - const messages = keys.map((key) => { - const value = json[key]; - if (Is.string(value)) { - return value; - } else if (value) { - return value.message; - } else { - return `Unknown message for key: ${key}`; - } - }); - getXlf().addFile(`extensions/${extensionName}/package`, keys, messages); + const json: l10nJsonFormat = JSON.parse(buffer.toString('utf8')); + getL10nMap().set(`extensions/${extensionName}/package`, json); } else if (basename === 'nls.metadata.json') { const json: BundledExtensionFormat = JSON.parse(buffer.toString('utf8')); const relPath = path.relative(`.build/extensions/${extensionName}`, path.dirname(file.path)); - for (let file in json) { + for (const file in json) { const fileContent = json[file]; - getXlf().addFile(`extensions/${extensionName}/${relPath}/${file}`, fileContent.keys, fileContent.messages); + const info: l10nJsonFormat = Object.create(null); + for (let i = 0; i < fileContent.messages.length; i++) { + const message = fileContent.messages[i]; + const { key, comment } = LocalizeInfo.is(fileContent.keys[i]) + ? fileContent.keys[i] as LocalizeInfo + : { key: fileContent.keys[i] as string, comment: undefined }; + + info[key] = comment ? { message, comment } : message; + } + getL10nMap().set(`extensions/${extensionName}/${relPath}/${file}`, info); } + } else if (basename === 'bundle.l10n.json') { + const json: l10nJsonFormat = JSON.parse(buffer.toString('utf8')); + getL10nMap().set(`extensions/${extensionName}/bundle`, json); } else { this.emit('error', new Error(`${file.path} is not a valid extension nls file`)); return; } } }, function () { - if (_xlf) { - let xlfFile = new File({ + if (_l10nMap?.size > 0) { + const xlfFile = new File({ path: path.join(extensionsProject, extensionName + '.xlf'), - contents: Buffer.from(_xlf.toString(), 'utf8') + contents: Buffer.from(getL10nXlf(_l10nMap), 'utf8') }); folderStream.queue(xlfFile); } @@ -769,17 +703,17 @@ export function createXlfFilesForIsl(): ThroughStream { throw new Error(`Unknown input file ${file.path}`); } - let xlf = new XLF(projectName), + const xlf = new XLF(projectName), keys: string[] = [], messages: string[] = []; - let model = new TextModel(file.contents.toString()); + const model = new TextModel(file.contents.toString()); let inMessageSection = false; model.lines.forEach(line => { if (line.length === 0) { return; } - let firstChar = line.charAt(0); + const firstChar = line.charAt(0); switch (firstChar) { case ';': // Comment line; @@ -791,12 +725,12 @@ export function createXlfFilesForIsl(): ThroughStream { if (!inMessageSection) { return; } - let sections: string[] = line.split('='); + const sections: string[] = line.split('='); if (sections.length !== 2) { throw new Error(`Badly formatted message found: ${line}`); } else { - let key = sections[0]; - let value = sections[1]; + const key = sections[0]; + const value = sections[1]; if (key.length > 0 && value.length > 0) { keys.push(key); messages.push(value); @@ -814,322 +748,8 @@ export function createXlfFilesForIsl(): ThroughStream { }); } -export function pushXlfFiles(apiHostname: string, username: string, password: string): ThroughStream { - let tryGetPromises: Array> = []; - let updateCreatePromises: Array> = []; - - return through(function (this: ThroughStream, file: File) { - const project = path.dirname(file.relative); - const fileName = path.basename(file.path); - const slug = fileName.substr(0, fileName.length - '.xlf'.length); - const credentials = `${username}:${password}`; - - // Check if resource already exists, if not, then create it. - let promise = tryGetResource(project, slug, apiHostname, credentials); - tryGetPromises.push(promise); - promise.then(exists => { - if (exists) { - promise = updateResource(project, slug, file, apiHostname, credentials); - } else { - promise = createResource(project, slug, file, apiHostname, credentials); - } - updateCreatePromises.push(promise); - }); - - }, function () { - // End the pipe only after all the communication with Transifex API happened - Promise.all(tryGetPromises).then(() => { - Promise.all(updateCreatePromises).then(() => { - this.queue(null); - }).catch((reason) => { throw new Error(reason); }); - }).catch((reason) => { throw new Error(reason); }); - }); -} - -function getAllResources(project: string, apiHostname: string, username: string, password: string): Promise { - return new Promise((resolve, reject) => { - const credentials = `${username}:${password}`; - const options = { - hostname: apiHostname, - path: `/api/2/project/${project}/resources`, - auth: credentials, - method: 'GET' - }; - - const request = https.request(options, (res) => { - let buffer: Buffer[] = []; - res.on('data', (chunk: Buffer) => buffer.push(chunk)); - res.on('end', () => { - if (res.statusCode === 200) { - let json = JSON.parse(Buffer.concat(buffer).toString()); - if (Array.isArray(json)) { - resolve(json.map(o => o.slug)); - return; - } - reject(`Unexpected data format. Response code: ${res.statusCode}.`); - } else { - reject(`No resources in ${project} returned no data. Response code: ${res.statusCode}.`); - } - }); - }); - request.on('error', (err) => { - reject(`Failed to query resources in ${project} with the following error: ${err}. ${options.path}`); - }); - request.end(); - }); -} - -export function findObsoleteResources(apiHostname: string, username: string, password: string): ThroughStream { - let resourcesByProject: Map = Object.create(null); - resourcesByProject[extensionsProject] = ([] as any[]).concat(externalExtensionsWithTranslations); // clone - - return through(function (this: ThroughStream, file: File) { - const project = path.dirname(file.relative); - const fileName = path.basename(file.path); - const slug = fileName.substr(0, fileName.length - '.xlf'.length); - - let slugs = resourcesByProject[project]; - if (!slugs) { - resourcesByProject[project] = slugs = []; - } - slugs.push(slug); - this.push(file); - }, function () { - - const json = JSON.parse(fs.readFileSync('./build/lib/i18n.resources.json', 'utf8')); - let i18Resources = [...json.editor, ...json.workbench].map((r: Resource) => r.project + '/' + r.name.replace(/\//g, '_')); - let extractedResources: string[] = []; - for (let project of [workbenchProject, editorProject]) { - for (let resource of resourcesByProject[project]) { - if (resource !== 'setup_messages') { - extractedResources.push(project + '/' + resource); - } - } - } - if (i18Resources.length !== extractedResources.length) { - console.log(`[i18n] Obsolete resources in file 'build/lib/i18n.resources.json': JSON.stringify(${i18Resources.filter(p => extractedResources.indexOf(p) === -1)})`); - console.log(`[i18n] Missing resources in file 'build/lib/i18n.resources.json': JSON.stringify(${extractedResources.filter(p => i18Resources.indexOf(p) === -1)})`); - } - - let promises: Array> = []; - for (let project in resourcesByProject) { - promises.push( - getAllResources(project, apiHostname, username, password).then(resources => { - let expectedResources = resourcesByProject[project]; - let unusedResources = resources.filter(resource => resource && expectedResources.indexOf(resource) === -1); - if (unusedResources.length) { - console.log(`[transifex] Obsolete resources in project '${project}': ${unusedResources.join(', ')}`); - } - }) - ); - } - return Promise.all(promises).then(_ => { - this.push(null); - }).catch((reason) => { throw new Error(reason); }); - }); -} - -function tryGetResource(project: string, slug: string, apiHostname: string, credentials: string): Promise { - return new Promise((resolve, reject) => { - const options = { - hostname: apiHostname, - path: `/api/2/project/${project}/resource/${slug}/?details`, - auth: credentials, - method: 'GET' - }; - - const request = https.request(options, (response) => { - if (response.statusCode === 404) { - resolve(false); - } else if (response.statusCode === 200) { - resolve(true); - } else { - reject(`Failed to query resource ${project}/${slug}. Response: ${response.statusCode} ${response.statusMessage}`); - } - }); - request.on('error', (err) => { - reject(`Failed to get ${project}/${slug} on Transifex: ${err}`); - }); - - request.end(); - }); -} - -function createResource(project: string, slug: string, xlfFile: File, apiHostname: string, credentials: any): Promise { - return new Promise((_resolve, reject) => { - const data = JSON.stringify({ - 'content': xlfFile.contents.toString(), - 'name': slug, - 'slug': slug, - 'i18n_type': 'XLIFF' - }); - const options = { - hostname: apiHostname, - path: `/api/2/project/${project}/resources`, - headers: { - 'Content-Type': 'application/json', - 'Content-Length': Buffer.byteLength(data) - }, - auth: credentials, - method: 'POST' - }; - - let request = https.request(options, (res) => { - if (res.statusCode === 201) { - log(`Resource ${project}/${slug} successfully created on Transifex.`); - } else { - reject(`Something went wrong in the request creating ${slug} in ${project}. ${res.statusCode}`); - } - }); - request.on('error', (err) => { - reject(`Failed to create ${project}/${slug} on Transifex: ${err}`); - }); - - request.write(data); - request.end(); - }); -} - -/** - * The following link provides information about how Transifex handles updates of a resource file: - * https://dev.befoolish.co/tx-docs/public/projects/updating-content#what-happens-when-you-update-files - */ -function updateResource(project: string, slug: string, xlfFile: File, apiHostname: string, credentials: string): Promise { - return new Promise((resolve, reject) => { - const data = JSON.stringify({ content: xlfFile.contents.toString() }); - const options = { - hostname: apiHostname, - path: `/api/2/project/${project}/resource/${slug}/content`, - headers: { - 'Content-Type': 'application/json', - 'Content-Length': Buffer.byteLength(data) - }, - auth: credentials, - method: 'PUT' - }; - - let request = https.request(options, (res) => { - if (res.statusCode === 200) { - res.setEncoding('utf8'); - - let responseBuffer: string = ''; - res.on('data', function (chunk) { - responseBuffer += chunk; - }); - res.on('end', () => { - const response = JSON.parse(responseBuffer); - log(`Resource ${project}/${slug} successfully updated on Transifex. Strings added: ${response.strings_added}, updated: ${response.strings_added}, deleted: ${response.strings_added}`); - resolve(); - }); - } else { - reject(`Something went wrong in the request updating ${slug} in ${project}. ${res.statusCode}`); - } - }); - request.on('error', (err) => { - reject(`Failed to update ${project}/${slug} on Transifex: ${err}`); - }); - - request.write(data); - request.end(); - }); -} - -export function pullSetupXlfFiles(apiHostname: string, username: string, password: string, language: Language, includeDefault: boolean): NodeJS.ReadableStream { - let setupResources = [{ name: 'setup_messages', project: workbenchProject }]; - if (includeDefault) { - setupResources.push({ name: 'setup_default', project: setupProject }); - } - return pullXlfFiles(apiHostname, username, password, language, setupResources); -} - -function pullXlfFiles(apiHostname: string, username: string, password: string, language: Language, resources: Resource[]): NodeJS.ReadableStream { - const credentials = `${username}:${password}`; - let expectedTranslationsCount = resources.length; - let translationsRetrieved = 0, called = false; - - return readable(function (_count: any, callback: any) { - // Mark end of stream when all resources were retrieved - if (translationsRetrieved === expectedTranslationsCount) { - return this.emit('end'); - } - - if (!called) { - called = true; - const stream = this; - resources.map(function (resource) { - retrieveResource(language, resource, apiHostname, credentials).then((file: File | null) => { - if (file) { - stream.emit('data', file); - } - translationsRetrieved++; - }).catch(error => { throw new Error(error); }); - }); - } - - callback(); - }); -} -const limiter = new Limiter(NUMBER_OF_CONCURRENT_DOWNLOADS); - -function retrieveResource(language: Language, resource: Resource, apiHostname: string, credentials: string): Promise { - return limiter.queue(() => new Promise((resolve, reject) => { - const slug = resource.name.replace(/\//g, '_'); - const project = resource.project; - let transifexLanguageId = language.id === 'ps' ? 'en' : language.translationId || language.id; - const options = { - hostname: apiHostname, - path: `/api/2/project/${project}/resource/${slug}/translation/${transifexLanguageId}?file&mode=onlyreviewed`, - auth: credentials, - port: 443, - method: 'GET' - }; - console.log('[transifex] Fetching ' + options.path); - - let request = https.request(options, (res) => { - let xlfBuffer: Buffer[] = []; - res.on('data', (chunk: Buffer) => xlfBuffer.push(chunk)); - res.on('end', () => { - if (res.statusCode === 200) { - resolve(new File({ contents: Buffer.concat(xlfBuffer), path: `${project}/${slug}.xlf` })); - } else if (res.statusCode === 404) { - console.log(`[transifex] ${slug} in ${project} returned no data.`); - resolve(null); - } else { - reject(`${slug} in ${project} returned no data. Response code: ${res.statusCode}.`); - } - }); - }); - request.on('error', (err) => { - reject(`Failed to query resource ${slug} with the following error: ${err}. ${options.path}`); - }); - request.end(); - })); -} - -export function prepareI18nFiles(): ThroughStream { - let parsePromises: Promise[] = []; - - return through(function (this: ThroughStream, xlf: File) { - let stream = this; - let parsePromise = XLF.parse(xlf.contents.toString()); - parsePromises.push(parsePromise); - parsePromise.then( - resolvedFiles => { - resolvedFiles.forEach(file => { - let translatedFile = createI18nFile(file.originalFilePath, file.messages); - stream.queue(translatedFile); - }); - } - ); - }, function () { - Promise.all(parsePromises) - .then(() => { this.queue(null); }) - .catch(reason => { throw new Error(reason); }); - }); -} - -function createI18nFile(originalFilePath: string, messages: any): File { - let result = Object.create(null); +function createI18nFile(name: string, messages: any): File { + const result = Object.create(null); result[''] = [ '--------------------------------------------------------------------------------------------', 'Copyright (c) Microsoft Corporation. All rights reserved.', @@ -1137,7 +757,7 @@ function createI18nFile(originalFilePath: string, messages: any): File { '--------------------------------------------------------------------------------------------', 'Do not edit this file. It is machine generated.' ]; - for (let key of Object.keys(messages)) { + for (const key of Object.keys(messages)) { result[key] = messages[key]; } @@ -1146,7 +766,7 @@ function createI18nFile(originalFilePath: string, messages: any): File { content = content.replace(/\n/g, '\r\n'); } return new File({ - path: path.join(originalFilePath + '.i18n.json'), + path: path.join(name + '.i18n.json'), contents: Buffer.from(content, 'utf8') }); } @@ -1154,7 +774,7 @@ function createI18nFile(originalFilePath: string, messages: any): File { interface I18nPack { version: string; contents: { - [path: string]: Map; + [path: string]: Record; }; } @@ -1165,22 +785,31 @@ export interface TranslationPath { resourceName: string; } -export function prepareI18nPackFiles(externalExtensions: Map, resultingTranslationPaths: TranslationPath[], pseudo = false): NodeJS.ReadWriteStream { - let parsePromises: Promise[] = []; - let mainPack: I18nPack = { version: i18nPackVersion, contents: {} }; - let extensionsPacks: Map = {}; - let errors: any[] = []; +function getRecordFromL10nJsonFormat(l10nJsonFormat: l10nJsonFormat): Record { + const record: Record = {}; + for (const key of Object.keys(l10nJsonFormat)) { + const value = l10nJsonFormat[key]; + record[key] = typeof value === 'string' ? value : value.message; + } + return record; +} + +export function prepareI18nPackFiles(resultingTranslationPaths: TranslationPath[]): NodeJS.ReadWriteStream { + const parsePromises: Promise[] = []; + const mainPack: I18nPack = { version: i18nPackVersion, contents: {} }; + const extensionsPacks: Record = {}; + const errors: any[] = []; return through(function (this: ThroughStream, xlf: File) { - let project = path.basename(path.dirname(path.dirname(xlf.relative))); - let resource = path.basename(xlf.relative, '.xlf'); - let contents = xlf.contents.toString(); + const project = path.basename(path.dirname(path.dirname(xlf.relative))); + const resource = path.basename(xlf.relative, '.xlf'); + const contents = xlf.contents.toString(); log(`Found ${project}: ${resource}`); - let parsePromise = pseudo ? XLF.parsePseudo(contents) : XLF.parse(contents); + const parsePromise = getL10nFilesFromXlf(contents); parsePromises.push(parsePromise); parsePromise.then( resolvedFiles => { resolvedFiles.forEach(file => { - const path = file.originalFilePath; + const path = file.name; const firstSlash = path.indexOf('/'); if (project === extensionsProject) { @@ -1188,15 +817,15 @@ export function prepareI18nPackFiles(externalExtensions: Map, resultingT if (!extPack) { extPack = extensionsPacks[resource] = { version: i18nPackVersion, contents: {} }; } - const externalId = externalExtensions[resource]; + const externalId = externalExtensionsWithTranslations[resource]; if (!externalId) { // internal extension: remove 'extensions/extensionId/' segnent const secondSlash = path.indexOf('/', firstSlash + 1); - extPack.contents[path.substr(secondSlash + 1)] = file.messages; + extPack.contents[path.substring(secondSlash + 1)] = getRecordFromL10nJsonFormat(file.messages); } else { - extPack.contents[path] = file.messages; + extPack.contents[path] = getRecordFromL10nJsonFormat(file.messages); } } else { - mainPack.contents[path.substr(firstSlash + 1)] = file.messages; + mainPack.contents[path.substring(firstSlash + 1)] = getRecordFromL10nJsonFormat(file.messages); } }); } @@ -1213,11 +842,11 @@ export function prepareI18nPackFiles(externalExtensions: Map, resultingT resultingTranslationPaths.push({ id: 'vscode', resourceName: 'main.i18n.json' }); this.queue(translatedMainFile); - for (let extension in extensionsPacks) { + for (const extension in extensionsPacks) { const translatedExtFile = createI18nFile(`extensions/${extension}`, extensionsPacks[extension]); this.queue(translatedExtFile); - const externalExtensionId = externalExtensions[extension]; + const externalExtensionId = externalExtensionsWithTranslations[extension]; if (externalExtensionId) { resultingTranslationPaths.push({ id: externalExtensionId, resourceName: `extensions/${extension}.i18n.json` }); } else { @@ -1234,16 +863,16 @@ export function prepareI18nPackFiles(externalExtensions: Map, resultingT } export function prepareIslFiles(language: Language, innoSetupConfig: InnoSetup): ThroughStream { - let parsePromises: Promise[] = []; + const parsePromises: Promise[] = []; return through(function (this: ThroughStream, xlf: File) { - let stream = this; - let parsePromise = XLF.parse(xlf.contents.toString()); + const stream = this; + const parsePromise = XLF.parse(xlf.contents.toString()); parsePromises.push(parsePromise); parsePromise.then( resolvedFiles => { resolvedFiles.forEach(file => { - let translatedFile = createIslFile(file.originalFilePath, file.messages, language, innoSetupConfig); + const translatedFile = createIslFile(file.name, file.messages, language, innoSetupConfig); stream.queue(translatedFile); }); } @@ -1259,25 +888,25 @@ export function prepareIslFiles(language: Language, innoSetupConfig: InnoSetup): }); } -function createIslFile(originalFilePath: string, messages: Map, language: Language, innoSetup: InnoSetup): File { - let content: string[] = []; +function createIslFile(name: string, messages: l10nJsonFormat, language: Language, innoSetup: InnoSetup): File { + const content: string[] = []; let originalContent: TextModel; - if (path.basename(originalFilePath) === 'Default') { - originalContent = new TextModel(fs.readFileSync(originalFilePath + '.isl', 'utf8')); + if (path.basename(name) === 'Default') { + originalContent = new TextModel(fs.readFileSync(name + '.isl', 'utf8')); } else { - originalContent = new TextModel(fs.readFileSync(originalFilePath + '.en.isl', 'utf8')); + originalContent = new TextModel(fs.readFileSync(name + '.en.isl', 'utf8')); } originalContent.lines.forEach(line => { if (line.length > 0) { - let firstChar = line.charAt(0); + const firstChar = line.charAt(0); if (firstChar === '[' || firstChar === ';') { content.push(line); } else { - let sections: string[] = line.split('='); - let key = sections[0]; + const sections: string[] = line.split('='); + const key = sections[0]; let translated = line; if (key) { - let translatedMessage = messages[key]; + const translatedMessage = messages[key]; if (translatedMessage) { translated = `${key}=${translatedMessage}`; } @@ -1288,7 +917,7 @@ function createIslFile(originalFilePath: string, messages: Map, language } }); - const basename = path.basename(originalFilePath); + const basename = path.basename(name); const filePath = `${basename}.${language.id}.isl`; const encoded = iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage); @@ -1299,9 +928,9 @@ function createIslFile(originalFilePath: string, messages: Map, language } function encodeEntities(value: string): string { - let result: string[] = []; + const result: string[] = []; for (let i = 0; i < value.length; i++) { - let ch = value[i]; + const ch = value[i]; switch (ch) { case '<': result.push('<'); @@ -1322,7 +951,3 @@ function encodeEntities(value: string): string { function decodeEntities(value: string): string { return value.replace(/</g, '<').replace(/>/g, '>').replace(/&/g, '&'); } - -function pseudify(message: string) { - return '\uFF3B' + message.replace(/[aouei]/g, '$&$&') + '\uFF3D'; -} diff --git a/build/lib/layersChecker.js b/build/lib/layersChecker.js index c83d6fcf984..e766756d9f3 100644 --- a/build/lib/layersChecker.js +++ b/build/lib/layersChecker.js @@ -51,11 +51,13 @@ const CORE_TYPES = [ 'BigInt64Array', 'btoa', 'atob', + 'AbortController', 'AbortSignal', 'MessageChannel', 'MessagePort', 'URL', - 'URLSearchParams' + 'URLSearchParams', + 'ReadonlyArray', ]; // Types that are defined in a common layer but are known to be only // available in native environments should not be allowed in browser @@ -72,6 +74,11 @@ const RULES = [ target: '**/vs/**/test/**', skip: true // -> skip all test files }, + // TODO@bpasero remove me once electron utility process has landed + { + target: '**/vs/workbench/services/extensions/electron-sandbox/nativeLocalProcessExtensionHost.ts', + skip: true + }, // Common: vs/base/common/platform.ts { target: '**/vs/base/common/platform.ts', @@ -223,7 +230,7 @@ function checkFile(program, sourceFile, rule) { } if (rule.disallowedTypes?.some(disallowed => disallowed === text)) { const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart()); - console.log(`[build/lib/layersChecker.ts]: Reference to type '${text}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`); + console.log(`[build/lib/layersChecker.ts]: Reference to type '${text}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1}). Learn more about our source code organization at https://github.com/microsoft/vscode/wiki/Source-Code-Organization.`); hasErrors = true; return; } @@ -247,7 +254,7 @@ function checkFile(program, sourceFile, rule) { for (const disallowedDefinition of rule.disallowedDefinitions) { if (definitionFileName.indexOf(disallowedDefinition) >= 0) { const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart()); - console.log(`[build/lib/layersChecker.ts]: Reference to symbol '${text}' from '${disallowedDefinition}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`); + console.log(`[build/lib/layersChecker.ts]: Reference to symbol '${text}' from '${disallowedDefinition}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1}) Learn more about our source code organization at https://github.com/microsoft/vscode/wiki/Source-Code-Organization.`); hasErrors = true; return; } diff --git a/build/lib/layersChecker.ts b/build/lib/layersChecker.ts index 95810c3b5f4..44490b6f1f9 100644 --- a/build/lib/layersChecker.ts +++ b/build/lib/layersChecker.ts @@ -52,11 +52,13 @@ const CORE_TYPES = [ 'BigInt64Array', 'btoa', 'atob', + 'AbortController', 'AbortSignal', 'MessageChannel', 'MessagePort', 'URL', - 'URLSearchParams' + 'URLSearchParams', + 'ReadonlyArray', ]; // Types that are defined in a common layer but are known to be only @@ -77,6 +79,12 @@ const RULES: IRule[] = [ skip: true // -> skip all test files }, + // TODO@bpasero remove me once electron utility process has landed + { + target: '**/vs/workbench/services/extensions/electron-sandbox/nativeLocalProcessExtensionHost.ts', + skip: true + }, + // Common: vs/base/common/platform.ts { target: '**/vs/base/common/platform.ts', @@ -262,7 +270,7 @@ function checkFile(program: ts.Program, sourceFile: ts.SourceFile, rule: IRule) if (rule.disallowedTypes?.some(disallowed => disallowed === text)) { const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart()); - console.log(`[build/lib/layersChecker.ts]: Reference to type '${text}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`); + console.log(`[build/lib/layersChecker.ts]: Reference to type '${text}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1}). Learn more about our source code organization at https://github.com/microsoft/vscode/wiki/Source-Code-Organization.`); hasErrors = true; return; @@ -289,7 +297,7 @@ function checkFile(program: ts.Program, sourceFile: ts.SourceFile, rule: IRule) if (definitionFileName.indexOf(disallowedDefinition) >= 0) { const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart()); - console.log(`[build/lib/layersChecker.ts]: Reference to symbol '${text}' from '${disallowedDefinition}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`); + console.log(`[build/lib/layersChecker.ts]: Reference to symbol '${text}' from '${disallowedDefinition}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1}) Learn more about our source code organization at https://github.com/microsoft/vscode/wiki/Source-Code-Organization.`); hasErrors = true; return; diff --git a/build/lib/monaco-api.js b/build/lib/monaco-api.js index d708d6346b3..a7542b711df 100644 --- a/build/lib/monaco-api.js +++ b/build/lib/monaco-api.js @@ -27,7 +27,7 @@ function isDeclaration(ts, a) { } function visitTopLevelDeclarations(ts, sourceFile, visitor) { let stop = false; - let visit = (node) => { + const visit = (node) => { if (stop) { return; } @@ -49,19 +49,19 @@ function visitTopLevelDeclarations(ts, sourceFile, visitor) { visit(sourceFile); } function getAllTopLevelDeclarations(ts, sourceFile) { - let all = []; + const all = []; visitTopLevelDeclarations(ts, sourceFile, (node) => { if (node.kind === ts.SyntaxKind.InterfaceDeclaration || node.kind === ts.SyntaxKind.ClassDeclaration || node.kind === ts.SyntaxKind.ModuleDeclaration) { - let interfaceDeclaration = node; - let triviaStart = interfaceDeclaration.pos; - let triviaEnd = interfaceDeclaration.name.pos; - let triviaText = getNodeText(sourceFile, { pos: triviaStart, end: triviaEnd }); + const interfaceDeclaration = node; + const triviaStart = interfaceDeclaration.pos; + const triviaEnd = interfaceDeclaration.name.pos; + const triviaText = getNodeText(sourceFile, { pos: triviaStart, end: triviaEnd }); if (triviaText.indexOf('@internal') === -1) { all.push(node); } } else { - let nodeText = getNodeText(sourceFile, node); + const nodeText = getNodeText(sourceFile, node); if (nodeText.indexOf('@internal') === -1) { all.push(node); } @@ -95,7 +95,7 @@ function getNodeText(sourceFile, node) { function hasModifier(modifiers, kind) { if (modifiers) { for (let i = 0; i < modifiers.length; i++) { - let mod = modifiers[i]; + const mod = modifiers[i]; if (mod.kind === kind) { return true; } @@ -113,14 +113,14 @@ function isDefaultExport(ts, declaration) { function getMassagedTopLevelDeclarationText(ts, sourceFile, declaration, importName, usage, enums) { let result = getNodeText(sourceFile, declaration); if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration || declaration.kind === ts.SyntaxKind.ClassDeclaration) { - let interfaceDeclaration = declaration; + const interfaceDeclaration = declaration; const staticTypeName = (isDefaultExport(ts, interfaceDeclaration) ? `${importName}.default` : `${importName}.${declaration.name.text}`); let instanceTypeName = staticTypeName; const typeParametersCnt = (interfaceDeclaration.typeParameters ? interfaceDeclaration.typeParameters.length : 0); if (typeParametersCnt > 0) { - let arr = []; + const arr = []; for (let i = 0; i < typeParametersCnt; i++) { arr.push('any'); } @@ -129,7 +129,7 @@ function getMassagedTopLevelDeclarationText(ts, sourceFile, declaration, importN const members = interfaceDeclaration.members; members.forEach((member) => { try { - let memberText = getNodeText(sourceFile, member); + const memberText = getNodeText(sourceFile, member); if (memberText.indexOf('@internal') >= 0 || memberText.indexOf('private') >= 0) { result = result.replace(memberText, ''); } @@ -152,7 +152,7 @@ function getMassagedTopLevelDeclarationText(ts, sourceFile, declaration, importN result = result.replace(/export default /g, 'export '); result = result.replace(/export declare /g, 'export '); result = result.replace(/declare /g, ''); - let lines = result.split(/\r\n|\r|\n/); + const lines = result.split(/\r\n|\r|\n/); for (let i = 0; i < lines.length; i++) { if (/\s*\*/.test(lines[i])) { // very likely a comment @@ -177,9 +177,9 @@ function format(ts, text, endl) { return text; } // Parse the source text - let sourceFile = ts.createSourceFile('file.ts', text, ts.ScriptTarget.Latest, /*setParentPointers*/ true); + const sourceFile = ts.createSourceFile('file.ts', text, ts.ScriptTarget.Latest, /*setParentPointers*/ true); // Get the formatting edits on the input sources - let edits = ts.formatting.formatDocument(sourceFile, getRuleProvider(tsfmt), tsfmt); + const edits = ts.formatting.formatDocument(sourceFile, getRuleProvider(tsfmt), tsfmt); // Apply the edits on the input code return applyEdits(text, edits); function countParensCurly(text) { @@ -202,7 +202,7 @@ function format(ts, text, endl) { return r; } function preformat(text, endl) { - let lines = text.split(endl); + const lines = text.split(endl); let inComment = false; let inCommentDeltaIndent = 0; let indent = 0; @@ -282,9 +282,9 @@ function format(ts, text, endl) { // Apply edits in reverse on the existing text let result = text; for (let i = edits.length - 1; i >= 0; i--) { - let change = edits[i]; - let head = result.slice(0, change.span.start); - let tail = result.slice(change.span.start + change.span.length); + const change = edits[i]; + const head = result.slice(0, change.span.start); + const tail = result.slice(change.span.start + change.span.length); result = head + change.newText + tail; } return result; @@ -300,15 +300,15 @@ function createReplacerFromDirectives(directives) { } function createReplacer(data) { data = data || ''; - let rawDirectives = data.split(';'); - let directives = []; + const rawDirectives = data.split(';'); + const directives = []; rawDirectives.forEach((rawDirective) => { if (rawDirective.length === 0) { return; } - let pieces = rawDirective.split('=>'); + const pieces = rawDirective.split('=>'); let findStr = pieces[0]; - let replaceStr = pieces[1]; + const replaceStr = pieces[1]; findStr = findStr.replace(/[\-\\\{\}\*\+\?\|\^\$\.\,\[\]\(\)\#\s]/g, '\\$&'); findStr = '\\b' + findStr + '\\b'; directives.push([new RegExp(findStr, 'g'), replaceStr]); @@ -317,32 +317,32 @@ function createReplacer(data) { } function generateDeclarationFile(ts, recipe, sourceFileGetter) { const endl = /\r\n/.test(recipe) ? '\r\n' : '\n'; - let lines = recipe.split(endl); - let result = []; + const lines = recipe.split(endl); + const result = []; let usageCounter = 0; - let usageImports = []; - let usage = []; + const usageImports = []; + const usage = []; let failed = false; usage.push(`var a: any;`); usage.push(`var b: any;`); const generateUsageImport = (moduleId) => { - let importName = 'm' + (++usageCounter); + const importName = 'm' + (++usageCounter); usageImports.push(`import * as ${importName} from './${moduleId.replace(/\.d\.ts$/, '')}';`); return importName; }; - let enums = []; + const enums = []; let version = null; lines.forEach(line => { if (failed) { return; } - let m0 = line.match(/^\/\/dtsv=(\d+)$/); + const m0 = line.match(/^\/\/dtsv=(\d+)$/); if (m0) { version = m0[1]; } - let m1 = line.match(/^\s*#include\(([^;)]*)(;[^)]*)?\)\:(.*)$/); + const m1 = line.match(/^\s*#include\(([^;)]*)(;[^)]*)?\)\:(.*)$/); if (m1) { - let moduleId = m1[1]; + const moduleId = m1[1]; const sourceFile = sourceFileGetter(moduleId); if (!sourceFile) { logErr(`While handling ${line}`); @@ -351,14 +351,14 @@ function generateDeclarationFile(ts, recipe, sourceFileGetter) { return; } const importName = generateUsageImport(moduleId); - let replacer = createReplacer(m1[2]); - let typeNames = m1[3].split(/,/); + const replacer = createReplacer(m1[2]); + const typeNames = m1[3].split(/,/); typeNames.forEach((typeName) => { typeName = typeName.trim(); if (typeName.length === 0) { return; } - let declaration = getTopLevelDeclaration(ts, sourceFile, typeName); + const declaration = getTopLevelDeclaration(ts, sourceFile, typeName); if (!declaration) { logErr(`While handling ${line}`); logErr(`Cannot find ${typeName}`); @@ -369,9 +369,9 @@ function generateDeclarationFile(ts, recipe, sourceFileGetter) { }); return; } - let m2 = line.match(/^\s*#includeAll\(([^;)]*)(;[^)]*)?\)\:(.*)$/); + const m2 = line.match(/^\s*#includeAll\(([^;)]*)(;[^)]*)?\)\:(.*)$/); if (m2) { - let moduleId = m2[1]; + const moduleId = m2[1]; const sourceFile = sourceFileGetter(moduleId); if (!sourceFile) { logErr(`While handling ${line}`); @@ -380,10 +380,10 @@ function generateDeclarationFile(ts, recipe, sourceFileGetter) { return; } const importName = generateUsageImport(moduleId); - let replacer = createReplacer(m2[2]); - let typeNames = m2[3].split(/,/); - let typesToExcludeMap = {}; - let typesToExcludeArr = []; + const replacer = createReplacer(m2[2]); + const typeNames = m2[3].split(/,/); + const typesToExcludeMap = {}; + const typesToExcludeArr = []; typeNames.forEach((typeName) => { typeName = typeName.trim(); if (typeName.length === 0) { @@ -400,7 +400,7 @@ function generateDeclarationFile(ts, recipe, sourceFileGetter) { } else { // node is ts.VariableStatement - let nodeText = getNodeText(sourceFile, declaration); + const nodeText = getNodeText(sourceFile, declaration); for (let i = 0; i < typesToExcludeArr.length; i++) { if (nodeText.indexOf(typesToExcludeArr[i]) >= 0) { return; @@ -605,7 +605,7 @@ class TypeScriptLanguageServiceHost { } } function execute() { - let r = run3(new DeclarationResolver(new FSProvider())); + const r = run3(new DeclarationResolver(new FSProvider())); if (!r) { throw new Error(`monaco.d.ts generation error - Cannot continue`); } diff --git a/build/lib/monaco-api.ts b/build/lib/monaco-api.ts index e6a06d21ea2..3da550fb277 100644 --- a/build/lib/monaco-api.ts +++ b/build/lib/monaco-api.ts @@ -40,7 +40,7 @@ function isDeclaration(ts: typeof import('typescript'), a: TSTopLevelDeclare): a function visitTopLevelDeclarations(ts: typeof import('typescript'), sourceFile: ts.SourceFile, visitor: (node: TSTopLevelDeclare) => boolean): void { let stop = false; - let visit = (node: ts.Node): void => { + const visit = (node: ts.Node): void => { if (stop) { return; } @@ -67,19 +67,19 @@ function visitTopLevelDeclarations(ts: typeof import('typescript'), sourceFile: function getAllTopLevelDeclarations(ts: typeof import('typescript'), sourceFile: ts.SourceFile): TSTopLevelDeclare[] { - let all: TSTopLevelDeclare[] = []; + const all: TSTopLevelDeclare[] = []; visitTopLevelDeclarations(ts, sourceFile, (node) => { if (node.kind === ts.SyntaxKind.InterfaceDeclaration || node.kind === ts.SyntaxKind.ClassDeclaration || node.kind === ts.SyntaxKind.ModuleDeclaration) { - let interfaceDeclaration = node; - let triviaStart = interfaceDeclaration.pos; - let triviaEnd = interfaceDeclaration.name.pos; - let triviaText = getNodeText(sourceFile, { pos: triviaStart, end: triviaEnd }); + const interfaceDeclaration = node; + const triviaStart = interfaceDeclaration.pos; + const triviaEnd = interfaceDeclaration.name.pos; + const triviaText = getNodeText(sourceFile, { pos: triviaStart, end: triviaEnd }); if (triviaText.indexOf('@internal') === -1) { all.push(node); } } else { - let nodeText = getNodeText(sourceFile, node); + const nodeText = getNodeText(sourceFile, node); if (nodeText.indexOf('@internal') === -1) { all.push(node); } @@ -115,10 +115,10 @@ function getNodeText(sourceFile: ts.SourceFile, node: { pos: number; end: number return sourceFile.getFullText().substring(node.pos, node.end); } -function hasModifier(modifiers: ts.NodeArray | undefined, kind: ts.SyntaxKind): boolean { +function hasModifier(modifiers: ts.NodeArray | undefined, kind: ts.SyntaxKind): boolean { if (modifiers) { for (let i = 0; i < modifiers.length; i++) { - let mod = modifiers[i]; + const mod = modifiers[i]; if (mod.kind === kind) { return true; } @@ -141,7 +141,7 @@ function isDefaultExport(ts: typeof import('typescript'), declaration: ts.Interf function getMassagedTopLevelDeclarationText(ts: typeof import('typescript'), sourceFile: ts.SourceFile, declaration: TSTopLevelDeclare, importName: string, usage: string[], enums: IEnumEntry[]): string { let result = getNodeText(sourceFile, declaration); if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration || declaration.kind === ts.SyntaxKind.ClassDeclaration) { - let interfaceDeclaration = declaration; + const interfaceDeclaration = declaration; const staticTypeName = ( isDefaultExport(ts, interfaceDeclaration) @@ -152,7 +152,7 @@ function getMassagedTopLevelDeclarationText(ts: typeof import('typescript'), sou let instanceTypeName = staticTypeName; const typeParametersCnt = (interfaceDeclaration.typeParameters ? interfaceDeclaration.typeParameters.length : 0); if (typeParametersCnt > 0) { - let arr: string[] = []; + const arr: string[] = []; for (let i = 0; i < typeParametersCnt; i++) { arr.push('any'); } @@ -162,7 +162,7 @@ function getMassagedTopLevelDeclarationText(ts: typeof import('typescript'), sou const members: ts.NodeArray = interfaceDeclaration.members; members.forEach((member) => { try { - let memberText = getNodeText(sourceFile, member); + const memberText = getNodeText(sourceFile, member); if (memberText.indexOf('@internal') >= 0 || memberText.indexOf('private') >= 0) { result = result.replace(memberText, ''); } else { @@ -182,7 +182,7 @@ function getMassagedTopLevelDeclarationText(ts: typeof import('typescript'), sou result = result.replace(/export default /g, 'export '); result = result.replace(/export declare /g, 'export '); result = result.replace(/declare /g, ''); - let lines = result.split(/\r\n|\r|\n/); + const lines = result.split(/\r\n|\r|\n/); for (let i = 0; i < lines.length; i++) { if (/\s*\*/.test(lines[i])) { // very likely a comment @@ -212,10 +212,10 @@ function format(ts: typeof import('typescript'), text: string, endl: string): st } // Parse the source text - let sourceFile = ts.createSourceFile('file.ts', text, ts.ScriptTarget.Latest, /*setParentPointers*/ true); + const sourceFile = ts.createSourceFile('file.ts', text, ts.ScriptTarget.Latest, /*setParentPointers*/ true); // Get the formatting edits on the input sources - let edits = (ts).formatting.formatDocument(sourceFile, getRuleProvider(tsfmt), tsfmt); + const edits = (ts).formatting.formatDocument(sourceFile, getRuleProvider(tsfmt), tsfmt); // Apply the edits on the input code return applyEdits(text, edits); @@ -242,7 +242,7 @@ function format(ts: typeof import('typescript'), text: string, endl: string): st } function preformat(text: string, endl: string): string { - let lines = text.split(endl); + const lines = text.split(endl); let inComment = false; let inCommentDeltaIndent = 0; let indent = 0; @@ -328,9 +328,9 @@ function format(ts: typeof import('typescript'), text: string, endl: string): st // Apply edits in reverse on the existing text let result = text; for (let i = edits.length - 1; i >= 0; i--) { - let change = edits[i]; - let head = result.slice(0, change.span.start); - let tail = result.slice(change.span.start + change.span.length); + const change = edits[i]; + const head = result.slice(0, change.span.start); + const tail = result.slice(change.span.start + change.span.length); result = head + change.newText + tail; } return result; @@ -348,15 +348,15 @@ function createReplacerFromDirectives(directives: [RegExp, string][]): (str: str function createReplacer(data: string): (str: string) => string { data = data || ''; - let rawDirectives = data.split(';'); - let directives: [RegExp, string][] = []; + const rawDirectives = data.split(';'); + const directives: [RegExp, string][] = []; rawDirectives.forEach((rawDirective) => { if (rawDirective.length === 0) { return; } - let pieces = rawDirective.split('=>'); + const pieces = rawDirective.split('=>'); let findStr = pieces[0]; - let replaceStr = pieces[1]; + const replaceStr = pieces[1]; findStr = findStr.replace(/[\-\\\{\}\*\+\?\|\^\$\.\,\[\]\(\)\#\s]/g, '\\$&'); findStr = '\\b' + findStr + '\\b'; @@ -380,12 +380,12 @@ interface IEnumEntry { function generateDeclarationFile(ts: typeof import('typescript'), recipe: string, sourceFileGetter: SourceFileGetter): ITempResult | null { const endl = /\r\n/.test(recipe) ? '\r\n' : '\n'; - let lines = recipe.split(endl); - let result: string[] = []; + const lines = recipe.split(endl); + const result: string[] = []; let usageCounter = 0; - let usageImports: string[] = []; - let usage: string[] = []; + const usageImports: string[] = []; + const usage: string[] = []; let failed = false; @@ -393,12 +393,12 @@ function generateDeclarationFile(ts: typeof import('typescript'), recipe: string usage.push(`var b: any;`); const generateUsageImport = (moduleId: string) => { - let importName = 'm' + (++usageCounter); + const importName = 'm' + (++usageCounter); usageImports.push(`import * as ${importName} from './${moduleId.replace(/\.d\.ts$/, '')}';`); return importName; }; - let enums: IEnumEntry[] = []; + const enums: IEnumEntry[] = []; let version: string | null = null; lines.forEach(line => { @@ -407,14 +407,14 @@ function generateDeclarationFile(ts: typeof import('typescript'), recipe: string return; } - let m0 = line.match(/^\/\/dtsv=(\d+)$/); + const m0 = line.match(/^\/\/dtsv=(\d+)$/); if (m0) { version = m0[1]; } - let m1 = line.match(/^\s*#include\(([^;)]*)(;[^)]*)?\)\:(.*)$/); + const m1 = line.match(/^\s*#include\(([^;)]*)(;[^)]*)?\)\:(.*)$/); if (m1) { - let moduleId = m1[1]; + const moduleId = m1[1]; const sourceFile = sourceFileGetter(moduleId); if (!sourceFile) { logErr(`While handling ${line}`); @@ -425,15 +425,15 @@ function generateDeclarationFile(ts: typeof import('typescript'), recipe: string const importName = generateUsageImport(moduleId); - let replacer = createReplacer(m1[2]); + const replacer = createReplacer(m1[2]); - let typeNames = m1[3].split(/,/); + const typeNames = m1[3].split(/,/); typeNames.forEach((typeName) => { typeName = typeName.trim(); if (typeName.length === 0) { return; } - let declaration = getTopLevelDeclaration(ts, sourceFile, typeName); + const declaration = getTopLevelDeclaration(ts, sourceFile, typeName); if (!declaration) { logErr(`While handling ${line}`); logErr(`Cannot find ${typeName}`); @@ -445,9 +445,9 @@ function generateDeclarationFile(ts: typeof import('typescript'), recipe: string return; } - let m2 = line.match(/^\s*#includeAll\(([^;)]*)(;[^)]*)?\)\:(.*)$/); + const m2 = line.match(/^\s*#includeAll\(([^;)]*)(;[^)]*)?\)\:(.*)$/); if (m2) { - let moduleId = m2[1]; + const moduleId = m2[1]; const sourceFile = sourceFileGetter(moduleId); if (!sourceFile) { logErr(`While handling ${line}`); @@ -458,11 +458,11 @@ function generateDeclarationFile(ts: typeof import('typescript'), recipe: string const importName = generateUsageImport(moduleId); - let replacer = createReplacer(m2[2]); + const replacer = createReplacer(m2[2]); - let typeNames = m2[3].split(/,/); - let typesToExcludeMap: { [typeName: string]: boolean } = {}; - let typesToExcludeArr: string[] = []; + const typeNames = m2[3].split(/,/); + const typesToExcludeMap: { [typeName: string]: boolean } = {}; + const typesToExcludeArr: string[] = []; typeNames.forEach((typeName) => { typeName = typeName.trim(); if (typeName.length === 0) { @@ -479,7 +479,7 @@ function generateDeclarationFile(ts: typeof import('typescript'), recipe: string } } else { // node is ts.VariableStatement - let nodeText = getNodeText(sourceFile, declaration); + const nodeText = getNodeText(sourceFile, declaration); for (let i = 0; i < typesToExcludeArr.length; i++) { if (nodeText.indexOf(typesToExcludeArr[i]) >= 0) { return; @@ -732,7 +732,7 @@ class TypeScriptLanguageServiceHost implements ts.LanguageServiceHost { } export function execute(): IMonacoDeclarationResult { - let r = run3(new DeclarationResolver(new FSProvider())); + const r = run3(new DeclarationResolver(new FSProvider())); if (!r) { throw new Error(`monaco.d.ts generation error - Cannot continue`); } diff --git a/build/lib/optimize.js b/build/lib/optimize.js index d5b957d1195..92e449a0cea 100644 --- a/build/lib/optimize.js +++ b/build/lib/optimize.js @@ -1,10 +1,10 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); -exports.minifyTask = exports.optimizeTask = exports.loaderConfig = void 0; +exports.minifyTask = exports.optimizeTask = exports.optimizeLoaderTask = exports.loaderConfig = void 0; const es = require("event-stream"); const gulp = require("gulp"); const concat = require("gulp-concat"); @@ -35,40 +35,58 @@ function loaderConfig() { } exports.loaderConfig = loaderConfig; const IS_OUR_COPYRIGHT_REGEXP = /Copyright \(C\) Microsoft Corporation/i; -function loader(src, bundledFileHeader, bundleLoader, externalLoaderInfo) { - let sources = [ - `${src}/vs/loader.js` - ]; - if (bundleLoader) { - sources = sources.concat([ - `${src}/vs/css.js`, - `${src}/vs/nls.js` - ]); - } - let isFirst = true; +function loaderPlugin(src, base, amdModuleId) { return (gulp - .src(sources, { base: `${src}` }) + .src(src, { base }) .pipe(es.through(function (data) { - if (isFirst) { - isFirst = false; - this.emit('data', new VinylFile({ - path: 'fake', - base: '.', - contents: Buffer.from(bundledFileHeader) - })); - this.emit('data', data); + if (amdModuleId) { + let contents = data.contents.toString('utf8'); + contents = contents.replace(/^define\(/m, `define("${amdModuleId}",`); + data.contents = Buffer.from(contents); } - else { - this.emit('data', data); + this.emit('data', data); + }))); +} +function loader(src, bundledFileHeader, bundleLoader, externalLoaderInfo) { + let loaderStream = gulp.src(`${src}/vs/loader.js`, { base: `${src}` }); + if (bundleLoader) { + loaderStream = es.merge(loaderStream, loaderPlugin(`${src}/vs/css.js`, `${src}`, 'vs/css'), loaderPlugin(`${src}/vs/nls.js`, `${src}`, 'vs/nls')); + } + const files = []; + const order = (f) => { + if (f.path.endsWith('loader.js')) { + return 0; } + if (f.path.endsWith('css.js')) { + return 1; + } + if (f.path.endsWith('nls.js')) { + return 2; + } + return 3; + }; + return (loaderStream + .pipe(es.through(function (data) { + files.push(data); }, function () { + files.sort((a, b) => { + return order(a) - order(b); + }); + files.unshift(new VinylFile({ + path: 'fake', + base: '.', + contents: Buffer.from(bundledFileHeader) + })); if (externalLoaderInfo !== undefined) { - this.emit('data', new VinylFile({ + files.push(new VinylFile({ path: 'fake2', base: '.', contents: Buffer.from(`require.config(${JSON.stringify(externalLoaderInfo, undefined, 2)});`) })); } + for (const file of files) { + this.emit('data', file); + } this.emit('end'); })) .pipe(concat('vs/loader.js'))); @@ -117,56 +135,94 @@ const DEFAULT_FILE_HEADER = [ ' * Copyright (C) Microsoft Corporation. All rights reserved.', ' *--------------------------------------------------------*/' ].join('\n'); -function optimizeTask(opts) { +function optimizeAMDTask(opts) { const src = opts.src; const entryPoints = opts.entryPoints; const resources = opts.resources; const loaderConfig = opts.loaderConfig; const bundledFileHeader = opts.header || DEFAULT_FILE_HEADER; - const bundleLoader = (typeof opts.bundleLoader === 'undefined' ? true : opts.bundleLoader); - const out = opts.out; const fileContentMapper = opts.fileContentMapper || ((contents, _path) => contents); - return function () { - const sourcemaps = require('gulp-sourcemaps'); - const bundlesStream = es.through(); // this stream will contain the bundled files - const resourcesStream = es.through(); // this stream will contain the resources - const bundleInfoStream = es.through(); // this stream will contain bundleInfo.json - bundle.bundle(entryPoints, loaderConfig, function (err, result) { - if (err || !result) { - return bundlesStream.emit('error', JSON.stringify(err)); + const sourcemaps = require('gulp-sourcemaps'); + const bundlesStream = es.through(); // this stream will contain the bundled files + const resourcesStream = es.through(); // this stream will contain the resources + const bundleInfoStream = es.through(); // this stream will contain bundleInfo.json + bundle.bundle(entryPoints, loaderConfig, function (err, result) { + if (err || !result) { + return bundlesStream.emit('error', JSON.stringify(err)); + } + toBundleStream(src, bundledFileHeader, result.files, fileContentMapper).pipe(bundlesStream); + // Remove css inlined resources + const filteredResources = resources.slice(); + result.cssInlinedResources.forEach(function (resource) { + if (process.env['VSCODE_BUILD_VERBOSE']) { + log('optimizer', 'excluding inlined: ' + resource); } - toBundleStream(src, bundledFileHeader, result.files, fileContentMapper).pipe(bundlesStream); - // Remove css inlined resources - const filteredResources = resources.slice(); - result.cssInlinedResources.forEach(function (resource) { - if (process.env['VSCODE_BUILD_VERBOSE']) { - log('optimizer', 'excluding inlined: ' + resource); - } - filteredResources.push('!' + resource); - }); - gulp.src(filteredResources, { base: `${src}`, allowEmpty: true }).pipe(resourcesStream); - const bundleInfoArray = []; - if (opts.bundleInfo) { - bundleInfoArray.push(new VinylFile({ - path: 'bundleInfo.json', - base: '.', - contents: Buffer.from(JSON.stringify(result.bundleData, null, '\t')) - })); - } - es.readArray(bundleInfoArray).pipe(bundleInfoStream); + filteredResources.push('!' + resource); }); - const result = es.merge(loader(src, bundledFileHeader, bundleLoader, opts.externalLoaderInfo), bundlesStream, resourcesStream, bundleInfoStream); - return result - .pipe(sourcemaps.write('./', { - sourceRoot: undefined, - addComment: true, - includeContent: true - })) - .pipe(opts.languages && opts.languages.length ? (0, i18n_1.processNlsFiles)({ - fileHeader: bundledFileHeader, - languages: opts.languages - }) : es.through()) - .pipe(gulp.dest(out)); + gulp.src(filteredResources, { base: `${src}`, allowEmpty: true }).pipe(resourcesStream); + const bundleInfoArray = []; + if (opts.bundleInfo) { + bundleInfoArray.push(new VinylFile({ + path: 'bundleInfo.json', + base: '.', + contents: Buffer.from(JSON.stringify(result.bundleData, null, '\t')) + })); + } + es.readArray(bundleInfoArray).pipe(bundleInfoStream); + }); + const result = es.merge(loader(src, bundledFileHeader, false, opts.externalLoaderInfo), bundlesStream, resourcesStream, bundleInfoStream); + return result + .pipe(sourcemaps.write('./', { + sourceRoot: undefined, + addComment: true, + includeContent: true + })) + .pipe(opts.languages && opts.languages.length ? (0, i18n_1.processNlsFiles)({ + fileHeader: bundledFileHeader, + languages: opts.languages + }) : es.through()); +} +function optimizeCommonJSTask(opts) { + const esbuild = require('esbuild'); + const src = opts.src; + const entryPoints = opts.entryPoints; + return gulp.src(entryPoints, { base: `${src}`, allowEmpty: true }) + .pipe(es.map((f, cb) => { + esbuild.build({ + entryPoints: [f.path], + bundle: true, + platform: opts.platform, + write: false, + external: opts.external + }).then(res => { + const jsFile = res.outputFiles[0]; + f.contents = Buffer.from(jsFile.contents); + cb(undefined, f); + }); + })); +} +function optimizeManualTask(options) { + const concatenations = options.map(opt => { + return gulp + .src(opt.src) + .pipe(concat(opt.out)); + }); + return es.merge(...concatenations); +} +function optimizeLoaderTask(src, out, bundleLoader, bundledFileHeader = '', externalLoaderInfo) { + return () => loader(src, bundledFileHeader, bundleLoader, externalLoaderInfo).pipe(gulp.dest(out)); +} +exports.optimizeLoaderTask = optimizeLoaderTask; +function optimizeTask(opts) { + return function () { + const optimizers = [optimizeAMDTask(opts.amd)]; + if (opts.commonJS) { + optimizers.push(optimizeCommonJSTask(opts.commonJS)); + } + if (opts.manual) { + optimizers.push(optimizeManualTask(opts.manual)); + } + return es.merge(...optimizers).pipe(gulp.dest(opts.out)); }; } exports.optimizeTask = optimizeTask; diff --git a/build/lib/optimize.ts b/build/lib/optimize.ts index fc2a2f42661..2e3943d79f9 100644 --- a/build/lib/optimize.ts +++ b/build/lib/optimize.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as es from 'event-stream'; import * as gulp from 'gulp'; import * as concat from 'gulp-concat'; @@ -41,41 +39,68 @@ export function loaderConfig() { const IS_OUR_COPYRIGHT_REGEXP = /Copyright \(C\) Microsoft Corporation/i; -function loader(src: string, bundledFileHeader: string, bundleLoader: boolean, externalLoaderInfo?: any): NodeJS.ReadWriteStream { - let sources = [ - `${src}/vs/loader.js` - ]; - if (bundleLoader) { - sources = sources.concat([ - `${src}/vs/css.js`, - `${src}/vs/nls.js` - ]); - } - - let isFirst = true; +function loaderPlugin(src: string, base: string, amdModuleId: string | undefined): NodeJS.ReadWriteStream { return ( gulp - .src(sources, { base: `${src}` }) - .pipe(es.through(function (data) { - if (isFirst) { - isFirst = false; - this.emit('data', new VinylFile({ - path: 'fake', - base: '.', - contents: Buffer.from(bundledFileHeader) - })); - this.emit('data', data); - } else { - this.emit('data', data); + .src(src, { base }) + .pipe(es.through(function (data: VinylFile) { + if (amdModuleId) { + let contents = data.contents.toString('utf8'); + contents = contents.replace(/^define\(/m, `define("${amdModuleId}",`); + data.contents = Buffer.from(contents); } + this.emit('data', data); + })) + ); +} + +function loader(src: string, bundledFileHeader: string, bundleLoader: boolean, externalLoaderInfo?: any): NodeJS.ReadWriteStream { + let loaderStream = gulp.src(`${src}/vs/loader.js`, { base: `${src}` }); + if (bundleLoader) { + loaderStream = es.merge( + loaderStream, + loaderPlugin(`${src}/vs/css.js`, `${src}`, 'vs/css'), + loaderPlugin(`${src}/vs/nls.js`, `${src}`, 'vs/nls'), + ); + } + + const files: VinylFile[] = []; + const order = (f: VinylFile) => { + if (f.path.endsWith('loader.js')) { + return 0; + } + if (f.path.endsWith('css.js')) { + return 1; + } + if (f.path.endsWith('nls.js')) { + return 2; + } + return 3; + }; + + return ( + loaderStream + .pipe(es.through(function (data) { + files.push(data); }, function () { + files.sort((a, b) => { + return order(a) - order(b); + }); + files.unshift(new VinylFile({ + path: 'fake', + base: '.', + contents: Buffer.from(bundledFileHeader) + })); if (externalLoaderInfo !== undefined) { - this.emit('data', new VinylFile({ + files.push(new VinylFile({ path: 'fake2', base: '.', contents: Buffer.from(`require.config(${JSON.stringify(externalLoaderInfo, undefined, 2)});`) })); } + for (const file of files) { + this.emit('data', file); + } this.emit('end'); })) .pipe(concat('vs/loader.js')) @@ -128,7 +153,7 @@ function toBundleStream(src: string, bundledFileHeader: string, bundles: bundle. })); } -export interface IOptimizeTaskOpts { +export interface IOptimizeAMDTaskOpts { /** * The folder to read files from. */ @@ -159,11 +184,7 @@ export interface IOptimizeTaskOpts { */ bundleInfo: boolean; /** - * (out folder name) - */ - out: string; - /** - * (out folder name) + * Language configuration. */ languages?: Language[]; /** @@ -180,67 +201,164 @@ const DEFAULT_FILE_HEADER = [ ' *--------------------------------------------------------*/' ].join('\n'); -export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStream { +function optimizeAMDTask(opts: IOptimizeAMDTaskOpts): NodeJS.ReadWriteStream { const src = opts.src; const entryPoints = opts.entryPoints; const resources = opts.resources; const loaderConfig = opts.loaderConfig; const bundledFileHeader = opts.header || DEFAULT_FILE_HEADER; - const bundleLoader = (typeof opts.bundleLoader === 'undefined' ? true : opts.bundleLoader); - const out = opts.out; const fileContentMapper = opts.fileContentMapper || ((contents: string, _path: string) => contents); - return function () { - const sourcemaps = require('gulp-sourcemaps') as typeof import('gulp-sourcemaps'); + const sourcemaps = require('gulp-sourcemaps') as typeof import('gulp-sourcemaps'); - const bundlesStream = es.through(); // this stream will contain the bundled files - const resourcesStream = es.through(); // this stream will contain the resources - const bundleInfoStream = es.through(); // this stream will contain bundleInfo.json + const bundlesStream = es.through(); // this stream will contain the bundled files + const resourcesStream = es.through(); // this stream will contain the resources + const bundleInfoStream = es.through(); // this stream will contain bundleInfo.json - bundle.bundle(entryPoints, loaderConfig, function (err, result) { - if (err || !result) { return bundlesStream.emit('error', JSON.stringify(err)); } + bundle.bundle(entryPoints, loaderConfig, function (err, result) { + if (err || !result) { return bundlesStream.emit('error', JSON.stringify(err)); } - toBundleStream(src, bundledFileHeader, result.files, fileContentMapper).pipe(bundlesStream); + toBundleStream(src, bundledFileHeader, result.files, fileContentMapper).pipe(bundlesStream); - // Remove css inlined resources - const filteredResources = resources.slice(); - result.cssInlinedResources.forEach(function (resource) { - if (process.env['VSCODE_BUILD_VERBOSE']) { - log('optimizer', 'excluding inlined: ' + resource); - } - filteredResources.push('!' + resource); - }); - gulp.src(filteredResources, { base: `${src}`, allowEmpty: true }).pipe(resourcesStream); - - const bundleInfoArray: VinylFile[] = []; - if (opts.bundleInfo) { - bundleInfoArray.push(new VinylFile({ - path: 'bundleInfo.json', - base: '.', - contents: Buffer.from(JSON.stringify(result.bundleData, null, '\t')) - })); + // Remove css inlined resources + const filteredResources = resources.slice(); + result.cssInlinedResources.forEach(function (resource) { + if (process.env['VSCODE_BUILD_VERBOSE']) { + log('optimizer', 'excluding inlined: ' + resource); } - es.readArray(bundleInfoArray).pipe(bundleInfoStream); + filteredResources.push('!' + resource); }); + gulp.src(filteredResources, { base: `${src}`, allowEmpty: true }).pipe(resourcesStream); - const result = es.merge( - loader(src, bundledFileHeader, bundleLoader, opts.externalLoaderInfo), - bundlesStream, - resourcesStream, - bundleInfoStream - ); + const bundleInfoArray: VinylFile[] = []; + if (opts.bundleInfo) { + bundleInfoArray.push(new VinylFile({ + path: 'bundleInfo.json', + base: '.', + contents: Buffer.from(JSON.stringify(result.bundleData, null, '\t')) + })); + } + es.readArray(bundleInfoArray).pipe(bundleInfoStream); + }); - return result - .pipe(sourcemaps.write('./', { - sourceRoot: undefined, - addComment: true, - includeContent: true - })) - .pipe(opts.languages && opts.languages.length ? processNlsFiles({ - fileHeader: bundledFileHeader, - languages: opts.languages - }) : es.through()) - .pipe(gulp.dest(out)); + const result = es.merge( + loader(src, bundledFileHeader, false, opts.externalLoaderInfo), + bundlesStream, + resourcesStream, + bundleInfoStream + ); + + return result + .pipe(sourcemaps.write('./', { + sourceRoot: undefined, + addComment: true, + includeContent: true + })) + .pipe(opts.languages && opts.languages.length ? processNlsFiles({ + fileHeader: bundledFileHeader, + languages: opts.languages + }) : es.through()); +} + +export interface IOptimizeCommonJSTaskOpts { + /** + * The paths to consider for optimizing. + */ + entryPoints: string[]; + /** + * The folder to read files from. + */ + src: string; + /** + * ESBuild `platform` option: https://esbuild.github.io/api/#platform + */ + platform: 'browser' | 'node' | 'neutral'; + /** + * ESBuild `external` option: https://esbuild.github.io/api/#external + */ + external: string[]; +} + +function optimizeCommonJSTask(opts: IOptimizeCommonJSTaskOpts): NodeJS.ReadWriteStream { + const esbuild = require('esbuild') as typeof import('esbuild'); + + const src = opts.src; + const entryPoints = opts.entryPoints; + + return gulp.src(entryPoints, { base: `${src}`, allowEmpty: true }) + .pipe(es.map((f: any, cb) => { + esbuild.build({ + entryPoints: [f.path], + bundle: true, + platform: opts.platform, + write: false, + external: opts.external + }).then(res => { + const jsFile = res.outputFiles[0]; + f.contents = Buffer.from(jsFile.contents); + + cb(undefined, f); + }); + })); +} + +export interface IOptimizeManualTaskOpts { + /** + * The paths to consider for concatenation. The entries + * will be concatenated in the order they are provided. + */ + src: string[]; + /** + * Destination target to concatenate the entryPoints into. + */ + out: string; +} + +function optimizeManualTask(options: IOptimizeManualTaskOpts[]): NodeJS.ReadWriteStream { + const concatenations = options.map(opt => { + return gulp + .src(opt.src) + .pipe(concat(opt.out)); + }); + + return es.merge(...concatenations); +} + +export function optimizeLoaderTask(src: string, out: string, bundleLoader: boolean, bundledFileHeader = '', externalLoaderInfo?: any): () => NodeJS.ReadWriteStream { + return () => loader(src, bundledFileHeader, bundleLoader, externalLoaderInfo).pipe(gulp.dest(out)); +} + +export interface IOptimizeTaskOpts { + /** + * Destination folder for the optimized files. + */ + out: string; + /** + * Optimize AMD modules (using our AMD loader). + */ + amd: IOptimizeAMDTaskOpts; + /** + * Optimize CommonJS modules (using esbuild). + */ + commonJS?: IOptimizeCommonJSTaskOpts; + /** + * Optimize manually by concatenating files. + */ + manual?: IOptimizeManualTaskOpts[]; +} + +export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStream { + return function () { + const optimizers = [optimizeAMDTask(opts.amd)]; + if (opts.commonJS) { + optimizers.push(optimizeCommonJSTask(opts.commonJS)); + } + + if (opts.manual) { + optimizers.push(optimizeManualTask(opts.manual)); + } + + return es.merge(...optimizers).pipe(gulp.dest(opts.out)); }; } diff --git a/build/lib/policies.js b/build/lib/policies.js index 3e2a10df350..37bb8e36d0c 100644 --- a/build/lib/policies.js +++ b/build/lib/policies.js @@ -13,6 +13,7 @@ const Parser = require("tree-sitter"); const node_fetch_1 = require("node-fetch"); const { typescript } = require('tree-sitter-typescript'); const product = require('../../product.json'); +const packageJson = require('../../package.json'); function isNlsString(value) { return value ? typeof value !== 'string' : false; } @@ -95,10 +96,6 @@ class BooleanPolicy extends BasePolicy { } } class IntPolicy extends BasePolicy { - constructor(name, category, minimumVersion, description, moduleName, defaultValue) { - super(PolicyType.StringEnum, name, category, minimumVersion, description, moduleName); - this.defaultValue = defaultValue; - } static from(name, category, minimumVersion, description, moduleName, settingNode) { const type = getStringProperty(settingNode, 'type'); if (type !== 'number') { @@ -110,6 +107,10 @@ class IntPolicy extends BasePolicy { } return new IntPolicy(name, category, minimumVersion, description, moduleName, defaultValue); } + constructor(name, category, minimumVersion, description, moduleName, defaultValue) { + super(PolicyType.StringEnum, name, category, minimumVersion, description, moduleName); + this.defaultValue = defaultValue; + } renderADMXElements() { return [ `` @@ -139,11 +140,6 @@ class StringPolicy extends BasePolicy { } } class StringEnumPolicy extends BasePolicy { - constructor(name, category, minimumVersion, description, moduleName, enum_, enumDescriptions) { - super(PolicyType.StringEnum, name, category, minimumVersion, description, moduleName); - this.enum_ = enum_; - this.enumDescriptions = enumDescriptions; - } static from(name, category, minimumVersion, description, moduleName, settingNode) { const type = getStringProperty(settingNode, 'type'); if (type !== 'string') { @@ -165,6 +161,11 @@ class StringEnumPolicy extends BasePolicy { } return new StringEnumPolicy(name, category, minimumVersion, description, moduleName, enum_, enumDescriptions); } + constructor(name, category, minimumVersion, description, moduleName, enum_, enumDescriptions) { + super(PolicyType.StringEnum, name, category, minimumVersion, description, moduleName); + this.enum_ = enum_; + this.enumDescriptions = enumDescriptions; + } renderADMXElements() { return [ ``, @@ -408,23 +409,63 @@ const Languages = { 'tr': 'tr-tr', 'pl': 'pl-pl', }; -async function getLatestStableVersion(updateUrl) { - const res = await (0, node_fetch_1.default)(`${updateUrl}/api/update/darwin/stable/latest`); - const { name: version } = await res.json(); - return version; -} -async function getNLS(resourceUrlTemplate, languageId, version) { +async function getSpecificNLS(resourceUrlTemplate, languageId, version) { const resource = { publisher: 'ms-ceintl', name: `vscode-language-pack-${languageId}`, - version, + version: `${version[0]}.${version[1]}.${version[2]}`, path: 'extension/translations/main.i18n.json' }; const url = resourceUrlTemplate.replace(/\{([^}]+)\}/g, (_, key) => resource[key]); const res = await (0, node_fetch_1.default)(url); + if (res.status !== 200) { + throw new Error(`[${res.status}] Error downloading language pack ${languageId}@${version}`); + } const { contents: result } = await res.json(); return result; } +function parseVersion(version) { + const [, major, minor, patch] = /^(\d+)\.(\d+)\.(\d+)/.exec(version); + return [parseInt(major), parseInt(minor), parseInt(patch)]; +} +function compareVersions(a, b) { + if (a[0] !== b[0]) { + return a[0] - b[0]; + } + if (a[1] !== b[1]) { + return a[1] - b[1]; + } + return a[2] - b[2]; +} +async function queryVersions(serviceUrl, languageId) { + const res = await (0, node_fetch_1.default)(`${serviceUrl}/extensionquery`, { + method: 'POST', + headers: { + 'Accept': 'application/json;api-version=3.0-preview.1', + 'Content-Type': 'application/json', + 'User-Agent': 'VS Code Build', + }, + body: JSON.stringify({ + filters: [{ criteria: [{ filterType: 7, value: `ms-ceintl.vscode-language-pack-${languageId}` }] }], + flags: 0x1 + }) + }); + if (res.status !== 200) { + throw new Error(`[${res.status}] Error querying for extension: ${languageId}`); + } + const result = await res.json(); + return result.results[0].extensions[0].versions.map(v => parseVersion(v.version)).sort(compareVersions); +} +async function getNLS(extensionGalleryServiceUrl, resourceUrlTemplate, languageId, version) { + const versions = await queryVersions(extensionGalleryServiceUrl, languageId); + const nextMinor = [version[0], version[1] + 1, 0]; + const compatibleVersions = versions.filter(v => compareVersions(v, nextMinor) < 0); + const latestCompatibleVersion = compatibleVersions.at(-1); // order is newest to oldest + if (!latestCompatibleVersion) { + throw new Error(`No compatible language pack found for ${languageId} for version ${version}`); + } + return await getSpecificNLS(resourceUrlTemplate, languageId, latestCompatibleVersion); +} async function parsePolicies() { const parser = new Parser(); parser.setLanguage(typescript); @@ -440,9 +481,9 @@ async function parsePolicies() { return policies; } async function getTranslations() { - const updateUrl = product.updateUrl; - if (!updateUrl) { - console.warn(`Skipping policy localization: No 'updateUrl' found in 'product.json'.`); + const extensionGalleryServiceUrl = product.extensionsGallery?.serviceUrl; + if (!extensionGalleryServiceUrl) { + console.warn(`Skipping policy localization: No 'extensionGallery.serviceUrl' found in 'product.json'.`); return []; } const resourceUrlTemplate = product.extensionsGallery?.resourceUrlTemplate; @@ -450,9 +491,9 @@ async function getTranslations() { console.warn(`Skipping policy localization: No 'resourceUrlTemplate' found in 'product.json'.`); return []; } - const version = await getLatestStableVersion(updateUrl); + const version = parseVersion(packageJson.version); const languageIds = Object.keys(Languages); - return await Promise.all(languageIds.map(languageId => getNLS(resourceUrlTemplate, languageId, version) + return await Promise.all(languageIds.map(languageId => getNLS(extensionGalleryServiceUrl, resourceUrlTemplate, languageId, version) .then(languageTranslations => ({ languageId, languageTranslations })))); } async function main() { diff --git a/build/lib/policies.ts b/build/lib/policies.ts index 62ea4d561e5..0e89508fe8e 100644 --- a/build/lib/policies.ts +++ b/build/lib/policies.ts @@ -12,6 +12,7 @@ import * as Parser from 'tree-sitter'; import fetch from 'node-fetch'; const { typescript } = require('tree-sitter-typescript'); const product = require('../../product.json'); +const packageJson = require('../../package.json'); type NlsString = { value: string; nlsKey: string }; @@ -587,26 +588,73 @@ const Languages = { type LanguageTranslations = { [moduleName: string]: { [nlsKey: string]: string } }; type Translations = { languageId: string; languageTranslations: LanguageTranslations }[]; -async function getLatestStableVersion(updateUrl: string) { - const res = await fetch(`${updateUrl}/api/update/darwin/stable/latest`); - const { name: version } = await res.json() as { name: string }; - return version; -} +type Version = [number, number, number]; -async function getNLS(resourceUrlTemplate: string, languageId: string, version: string) { +async function getSpecificNLS(resourceUrlTemplate: string, languageId: string, version: Version) { const resource = { publisher: 'ms-ceintl', name: `vscode-language-pack-${languageId}`, - version, + version: `${version[0]}.${version[1]}.${version[2]}`, path: 'extension/translations/main.i18n.json' }; const url = resourceUrlTemplate.replace(/\{([^}]+)\}/g, (_, key) => resource[key as keyof typeof resource]); const res = await fetch(url); + + if (res.status !== 200) { + throw new Error(`[${res.status}] Error downloading language pack ${languageId}@${version}`); + } + const { contents: result } = await res.json() as { contents: LanguageTranslations }; return result; } +function parseVersion(version: string): Version { + const [, major, minor, patch] = /^(\d+)\.(\d+)\.(\d+)/.exec(version)!; + return [parseInt(major), parseInt(minor), parseInt(patch)]; +} + +function compareVersions(a: Version, b: Version): number { + if (a[0] !== b[0]) { return a[0] - b[0]; } + if (a[1] !== b[1]) { return a[1] - b[1]; } + return a[2] - b[2]; +} + +async function queryVersions(serviceUrl: string, languageId: string): Promise { + const res = await fetch(`${serviceUrl}/extensionquery`, { + method: 'POST', + headers: { + 'Accept': 'application/json;api-version=3.0-preview.1', + 'Content-Type': 'application/json', + 'User-Agent': 'VS Code Build', + }, + body: JSON.stringify({ + filters: [{ criteria: [{ filterType: 7, value: `ms-ceintl.vscode-language-pack-${languageId}` }] }], + flags: 0x1 + }) + }); + + if (res.status !== 200) { + throw new Error(`[${res.status}] Error querying for extension: ${languageId}`); + } + + const result = await res.json() as { results: [{ extensions: { versions: { version: string }[] }[] }] }; + return result.results[0].extensions[0].versions.map(v => parseVersion(v.version)).sort(compareVersions); +} + +async function getNLS(extensionGalleryServiceUrl: string, resourceUrlTemplate: string, languageId: string, version: Version) { + const versions = await queryVersions(extensionGalleryServiceUrl, languageId); + const nextMinor: Version = [version[0], version[1] + 1, 0]; + const compatibleVersions = versions.filter(v => compareVersions(v, nextMinor) < 0); + const latestCompatibleVersion = compatibleVersions.at(-1)!; // order is newest to oldest + + if (!latestCompatibleVersion) { + throw new Error(`No compatible language pack found for ${languageId} for version ${version}`); + } + + return await getSpecificNLS(resourceUrlTemplate, languageId, latestCompatibleVersion); +} + async function parsePolicies(): Promise { const parser = new Parser(); parser.setLanguage(typescript); @@ -626,10 +674,10 @@ async function parsePolicies(): Promise { } async function getTranslations(): Promise { - const updateUrl = product.updateUrl; + const extensionGalleryServiceUrl = product.extensionsGallery?.serviceUrl; - if (!updateUrl) { - console.warn(`Skipping policy localization: No 'updateUrl' found in 'product.json'.`); + if (!extensionGalleryServiceUrl) { + console.warn(`Skipping policy localization: No 'extensionGallery.serviceUrl' found in 'product.json'.`); return []; } @@ -640,11 +688,11 @@ async function getTranslations(): Promise { return []; } - const version = await getLatestStableVersion(updateUrl); + const version = parseVersion(packageJson.version); const languageIds = Object.keys(Languages); return await Promise.all(languageIds.map( - languageId => getNLS(resourceUrlTemplate, languageId, version) + languageId => getNLS(extensionGalleryServiceUrl, resourceUrlTemplate, languageId, version) .then(languageTranslations => ({ languageId, languageTranslations })) )); } diff --git a/build/lib/preLaunch.js b/build/lib/preLaunch.js index ba8ba1c0382..7d316f594df 100644 --- a/build/lib/preLaunch.js +++ b/build/lib/preLaunch.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); // @ts-check const path = require("path"); diff --git a/build/lib/preLaunch.ts b/build/lib/preLaunch.ts index 57441870cc4..3d3f513b591 100644 --- a/build/lib/preLaunch.ts +++ b/build/lib/preLaunch.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - // @ts-check import * as path from 'path'; diff --git a/build/lib/reporter.js b/build/lib/reporter.js index def8f24a065..0c735614324 100644 --- a/build/lib/reporter.js +++ b/build/lib/reporter.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); exports.createReporter = void 0; const es = require("event-stream"); diff --git a/build/lib/reporter.ts b/build/lib/reporter.ts index f875fce908a..a9c8b53671a 100644 --- a/build/lib/reporter.ts +++ b/build/lib/reporter.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as es from 'event-stream'; import * as _ from 'underscore'; import * as fancyLog from 'fancy-log'; diff --git a/build/lib/snapshotLoader.js b/build/lib/snapshotLoader.js index ee626a0f7f1..ef1ecadbb43 100644 --- a/build/lib/snapshotLoader.js +++ b/build/lib/snapshotLoader.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; var snaps; (function (snaps) { const fs = require('fs'); diff --git a/build/lib/snapshotLoader.ts b/build/lib/snapshotLoader.ts index 40b06d67d05..c3d66dba7e1 100644 --- a/build/lib/snapshotLoader.ts +++ b/build/lib/snapshotLoader.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - namespace snaps { const fs = require('fs'); diff --git a/build/lib/standalone.js b/build/lib/standalone.js index f2116eb159e..80accea5f4e 100644 --- a/build/lib/standalone.js +++ b/build/lib/standalone.js @@ -10,7 +10,7 @@ const path = require("path"); const tss = require("./treeshaking"); const REPO_ROOT = path.join(__dirname, '../../'); const SRC_DIR = path.join(REPO_ROOT, 'src'); -let dirCache = {}; +const dirCache = {}; function writeFile(filePath, contents) { function ensureDirs(dirPath) { if (dirCache[dirPath]) { @@ -53,13 +53,13 @@ function extractEditor(options) { options.typings.push(`../node_modules/@types/${type}/index.d.ts`); }); } - let result = tss.shake(options); - for (let fileName in result) { + const result = tss.shake(options); + for (const fileName in result) { if (result.hasOwnProperty(fileName)) { writeFile(path.join(options.destRoot, fileName), result[fileName]); } } - let copied = {}; + const copied = {}; const copyFile = (fileName) => { if (copied[fileName]) { return; @@ -72,7 +72,7 @@ function extractEditor(options) { const writeOutputFile = (fileName, contents) => { writeFile(path.join(options.destRoot, fileName), contents); }; - for (let fileName in result) { + for (const fileName in result) { if (result.hasOwnProperty(fileName)) { const fileContents = result[fileName]; const info = ts.preProcessFile(fileContents); @@ -102,13 +102,12 @@ function extractEditor(options) { delete tsConfig.compilerOptions.moduleResolution; writeOutputFile('tsconfig.json', JSON.stringify(tsConfig, null, '\t')); [ - 'vs/css.build.js', - 'vs/css.d.ts', - 'vs/css.js', + 'vs/css.build.ts', + 'vs/css.ts', 'vs/loader.js', - 'vs/nls.build.js', - 'vs/nls.d.ts', - 'vs/nls.js', + 'vs/loader.d.ts', + 'vs/nls.build.ts', + 'vs/nls.ts', 'vs/nls.mock.ts', ].forEach(copyFile); } @@ -119,7 +118,7 @@ function createESMSourcesAndResources2(options) { const OUT_FOLDER = path.join(REPO_ROOT, options.outFolder); const OUT_RESOURCES_FOLDER = path.join(REPO_ROOT, options.outResourcesFolder); const getDestAbsoluteFilePath = (file) => { - let dest = options.renames[file.replace(/\\/g, '/')] || file; + const dest = options.renames[file.replace(/\\/g, '/')] || file; if (dest === 'tsconfig.json') { return path.join(OUT_FOLDER, `tsconfig.json`); } @@ -181,7 +180,7 @@ function createESMSourcesAndResources2(options) { + relativePath + fileContents.substring(end + 1)); } - fileContents = fileContents.replace(/import ([a-zA-z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) { + fileContents = fileContents.replace(/import ([a-zA-Z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) { return `import * as ${m1} from ${m2};`; }); write(getDestAbsoluteFilePath(file), fileContents); @@ -193,7 +192,7 @@ function createESMSourcesAndResources2(options) { if (dir.charAt(dir.length - 1) !== '/' || dir.charAt(dir.length - 1) !== '\\') { dir += '/'; } - let result = []; + const result = []; _walkDirRecursive(dir, result, dir.length); return result; } @@ -215,7 +214,7 @@ function createESMSourcesAndResources2(options) { } writeFile(absoluteFilePath, contents); function toggleComments(fileContents) { - let lines = fileContents.split(/\r\n|\r|\n/); + const lines = fileContents.split(/\r\n|\r|\n/); let mode = 0; for (let i = 0; i < lines.length; i++) { const line = lines[i]; @@ -278,14 +277,14 @@ function transportCSS(module, enqueue, write) { let DATA = ';base64,' + fileContents.toString('base64'); if (!forceBase64 && /\.svg$/.test(url)) { // .svg => url encode as explained at https://codepen.io/tigt/post/optimizing-svgs-in-data-uris - let newText = fileContents.toString() + const newText = fileContents.toString() .replace(/"/g, '\'') .replace(//g, '%3E') .replace(/&/g, '%26') .replace(/#/g, '%23') .replace(/\s+/g, ' '); - let encodedData = ',' + newText; + const encodedData = ',' + newText; if (encodedData.length < DATA.length) { DATA = encodedData; } diff --git a/build/lib/standalone.ts b/build/lib/standalone.ts index 3483de02a39..775a1be5996 100644 --- a/build/lib/standalone.ts +++ b/build/lib/standalone.ts @@ -10,7 +10,7 @@ import * as tss from './treeshaking'; const REPO_ROOT = path.join(__dirname, '../../'); const SRC_DIR = path.join(REPO_ROOT, 'src'); -let dirCache: { [dir: string]: boolean } = {}; +const dirCache: { [dir: string]: boolean } = {}; function writeFile(filePath: string, contents: Buffer | string): void { function ensureDirs(dirPath: string): void { @@ -63,13 +63,13 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str }); } - let result = tss.shake(options); - for (let fileName in result) { + const result = tss.shake(options); + for (const fileName in result) { if (result.hasOwnProperty(fileName)) { writeFile(path.join(options.destRoot, fileName), result[fileName]); } } - let copied: { [fileName: string]: boolean } = {}; + const copied: { [fileName: string]: boolean } = {}; const copyFile = (fileName: string) => { if (copied[fileName]) { return; @@ -82,7 +82,7 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str const writeOutputFile = (fileName: string, contents: string | Buffer) => { writeFile(path.join(options.destRoot, fileName), contents); }; - for (let fileName in result) { + for (const fileName in result) { if (result.hasOwnProperty(fileName)) { const fileContents = result[fileName]; const info = ts.preProcessFile(fileContents); @@ -115,13 +115,12 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str writeOutputFile('tsconfig.json', JSON.stringify(tsConfig, null, '\t')); [ - 'vs/css.build.js', - 'vs/css.d.ts', - 'vs/css.js', + 'vs/css.build.ts', + 'vs/css.ts', 'vs/loader.js', - 'vs/nls.build.js', - 'vs/nls.d.ts', - 'vs/nls.js', + 'vs/loader.d.ts', + 'vs/nls.build.ts', + 'vs/nls.ts', 'vs/nls.mock.ts', ].forEach(copyFile); } @@ -142,7 +141,7 @@ export function createESMSourcesAndResources2(options: IOptions2): void { const OUT_RESOURCES_FOLDER = path.join(REPO_ROOT, options.outResourcesFolder); const getDestAbsoluteFilePath = (file: string): string => { - let dest = options.renames[file.replace(/\\/g, '/')] || file; + const dest = options.renames[file.replace(/\\/g, '/')] || file; if (dest === 'tsconfig.json') { return path.join(OUT_FOLDER, `tsconfig.json`); } @@ -213,7 +212,7 @@ export function createESMSourcesAndResources2(options: IOptions2): void { ); } - fileContents = fileContents.replace(/import ([a-zA-z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) { + fileContents = fileContents.replace(/import ([a-zA-Z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) { return `import * as ${m1} from ${m2};`; }); @@ -229,7 +228,7 @@ export function createESMSourcesAndResources2(options: IOptions2): void { if (dir.charAt(dir.length - 1) !== '/' || dir.charAt(dir.length - 1) !== '\\') { dir += '/'; } - let result: string[] = []; + const result: string[] = []; _walkDirRecursive(dir, result, dir.length); return result; } @@ -253,7 +252,7 @@ export function createESMSourcesAndResources2(options: IOptions2): void { writeFile(absoluteFilePath, contents); function toggleComments(fileContents: string): string { - let lines = fileContents.split(/\r\n|\r|\n/); + const lines = fileContents.split(/\r\n|\r|\n/); let mode = 0; for (let i = 0; i < lines.length; i++) { const line = lines[i]; @@ -325,14 +324,14 @@ function transportCSS(module: string, enqueue: (module: string) => void, write: if (!forceBase64 && /\.svg$/.test(url)) { // .svg => url encode as explained at https://codepen.io/tigt/post/optimizing-svgs-in-data-uris - let newText = fileContents.toString() + const newText = fileContents.toString() .replace(/"/g, '\'') .replace(//g, '%3E') .replace(/&/g, '%26') .replace(/#/g, '%23') .replace(/\s+/g, ' '); - let encodedData = ',' + newText; + const encodedData = ',' + newText; if (encodedData.length < DATA.length) { DATA = encodedData; } diff --git a/build/lib/stats.js b/build/lib/stats.js index 6d705a9a16b..869ac2043b3 100644 --- a/build/lib/stats.js +++ b/build/lib/stats.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); exports.createStatsStream = void 0; const es = require("event-stream"); diff --git a/build/lib/stats.ts b/build/lib/stats.ts index 6e85cf68e29..fe4b22453b5 100644 --- a/build/lib/stats.ts +++ b/build/lib/stats.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as es from 'event-stream'; import * as fancyLog from 'fancy-log'; import * as ansiColors from 'ansi-colors'; diff --git a/build/lib/task.js b/build/lib/task.js index d08ab8acde8..ba4babafc18 100644 --- a/build/lib/task.js +++ b/build/lib/task.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); exports.define = exports.parallel = exports.series = void 0; const fancyLog = require("fancy-log"); diff --git a/build/lib/task.ts b/build/lib/task.ts index 4e571ec9294..7d2a4dee016 100644 --- a/build/lib/task.ts +++ b/build/lib/task.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as fancyLog from 'fancy-log'; import * as ansiColors from 'ansi-colors'; diff --git a/build/lib/test/i18n.test.js b/build/lib/test/i18n.test.js index 4d339c120a9..3f8015e8c90 100644 --- a/build/lib/test/i18n.test.js +++ b/build/lib/test/i18n.test.js @@ -9,20 +9,20 @@ const i18n = require("../i18n"); suite('XLF Parser Tests', () => { const sampleXlf = 'Key #1Key #2 &'; const sampleTranslatedXlf = 'Key #1КĐŊĐžĐŋĐēĐ° #1Key #2 &КĐŊĐžĐŋĐēĐ° #2 &'; - const originalFilePath = 'vs/base/common/keybinding'; + const name = 'vs/base/common/keybinding'; const keys = ['key1', 'key2']; const messages = ['Key #1', 'Key #2 &']; const translatedMessages = { key1: 'КĐŊĐžĐŋĐēĐ° #1', key2: 'КĐŊĐžĐŋĐēĐ° #2 &' }; test('Keys & messages to XLF conversion', () => { const xlf = new i18n.XLF('vscode-workbench'); - xlf.addFile(originalFilePath, keys, messages); + xlf.addFile(name, keys, messages); const xlfString = xlf.toString(); assert.strictEqual(xlfString.replace(/\s{2,}/g, ''), sampleXlf); }); test('XLF to keys & messages conversion', () => { i18n.XLF.parse(sampleTranslatedXlf).then(function (resolvedFiles) { assert.deepStrictEqual(resolvedFiles[0].messages, translatedMessages); - assert.strictEqual(resolvedFiles[0].originalFilePath, originalFilePath); + assert.strictEqual(resolvedFiles[0].name, name); }); }); test('JSON file source path to Transifex resource match', () => { diff --git a/build/lib/test/i18n.test.ts b/build/lib/test/i18n.test.ts index ab0924c4350..b8a68323dd7 100644 --- a/build/lib/test/i18n.test.ts +++ b/build/lib/test/i18n.test.ts @@ -9,14 +9,14 @@ import i18n = require('../i18n'); suite('XLF Parser Tests', () => { const sampleXlf = 'Key #1Key #2 &'; const sampleTranslatedXlf = 'Key #1КĐŊĐžĐŋĐēĐ° #1Key #2 &КĐŊĐžĐŋĐēĐ° #2 &'; - const originalFilePath = 'vs/base/common/keybinding'; + const name = 'vs/base/common/keybinding'; const keys = ['key1', 'key2']; const messages = ['Key #1', 'Key #2 &']; const translatedMessages = { key1: 'КĐŊĐžĐŋĐēĐ° #1', key2: 'КĐŊĐžĐŋĐēĐ° #2 &' }; test('Keys & messages to XLF conversion', () => { const xlf = new i18n.XLF('vscode-workbench'); - xlf.addFile(originalFilePath, keys, messages); + xlf.addFile(name, keys, messages); const xlfString = xlf.toString(); assert.strictEqual(xlfString.replace(/\s{2,}/g, ''), sampleXlf); @@ -25,7 +25,7 @@ suite('XLF Parser Tests', () => { test('XLF to keys & messages conversion', () => { i18n.XLF.parse(sampleTranslatedXlf).then(function (resolvedFiles) { assert.deepStrictEqual(resolvedFiles[0].messages, translatedMessages); - assert.strictEqual(resolvedFiles[0].originalFilePath, originalFilePath); + assert.strictEqual(resolvedFiles[0].name, name); }); }); diff --git a/build/lib/treeshaking.js b/build/lib/treeshaking.js index 008eb27aca2..029235f7709 100644 --- a/build/lib/treeshaking.js +++ b/build/lib/treeshaking.js @@ -1,8 +1,8 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); exports.shake = exports.toStringShakeLevel = exports.ShakeLevel = void 0; const fs = require("fs"); @@ -32,7 +32,7 @@ function printDiagnostics(options, diagnostics) { result += `${path.join(options.sourcesRoot, diag.file.fileName)}`; } if (diag.file && diag.start) { - let location = diag.file.getLineAndCharacterOfPosition(diag.start); + const location = diag.file.getLineAndCharacterOfPosition(diag.start); result += `:${location.line + 1}:${location.character}`; } result += ` - ` + JSON.stringify(diag.messageText); @@ -89,6 +89,8 @@ function discoverAndReadFiles(ts, options) { const in_queue = Object.create(null); const queue = []; const enqueue = (moduleId) => { + // To make the treeshaker work on windows... + moduleId = moduleId.replace(/\\/g, '/'); if (in_queue[moduleId]) { return; } @@ -150,7 +152,7 @@ function processLibFiles(ts, options) { result[key] = sourceText; // precess dependencies and "recurse" const info = ts.preProcessFile(sourceText); - for (let ref of info.libReferenceDirectives) { + for (const ref of info.libReferenceDirectives) { stack.push(ref.fileName); } } @@ -226,6 +228,12 @@ function getColor(node) { function setColor(node, color) { node.$$$color = color; } +function markNeededSourceFile(node) { + node.$$$neededSourceFile = true; +} +function isNeededSourceFile(node) { + return Boolean(node.$$$neededSourceFile); +} function nodeOrParentIsBlack(node) { while (node) { const color = getColor(node); @@ -351,6 +359,19 @@ function markNodes(ts, languageService, options) { } }); } + /** + * Return the parent of `node` which is an ImportDeclaration + */ + function findParentImportDeclaration(node) { + let _node = node; + do { + if (ts.isImportDeclaration(_node)) { + return _node; + } + _node = _node.parent; + } while (_node); + return null; + } function enqueue_gray(node) { if (nodeOrParentIsBlack(node) || getColor(node) === 1 /* NodeColor.Gray */) { return; @@ -418,6 +439,8 @@ function markNodes(ts, languageService, options) { console.warn(`Cannot find source file ${filename}`); return; } + // This source file should survive even if it is empty + markNeededSourceFile(sourceFile); enqueue_black(sourceFile); } function enqueueImport(node, importText) { @@ -467,50 +490,56 @@ function markNodes(ts, languageService, options) { } const nodeSourceFile = node.getSourceFile(); const loop = (node) => { - const [symbol, symbolImportNode] = getRealNodeSymbol(ts, checker, node); - if (symbolImportNode) { - setColor(symbolImportNode, 2 /* NodeColor.Black */); - } - if (isSymbolWithDeclarations(symbol) && !nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol)) { - for (let i = 0, len = symbol.declarations.length; i < len; i++) { - const declaration = symbol.declarations[i]; - if (ts.isSourceFile(declaration)) { - // Do not enqueue full source files - // (they can be the declaration of a module import) - continue; + const symbols = getRealNodeSymbol(ts, checker, node); + for (const { symbol, symbolImportNode } of symbols) { + if (symbolImportNode) { + setColor(symbolImportNode, 2 /* NodeColor.Black */); + const importDeclarationNode = findParentImportDeclaration(symbolImportNode); + if (importDeclarationNode && ts.isStringLiteral(importDeclarationNode.moduleSpecifier)) { + enqueueImport(importDeclarationNode, importDeclarationNode.moduleSpecifier.text); } - if (options.shakeLevel === 2 /* ShakeLevel.ClassMembers */ && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration)) && !isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(ts, program, checker, declaration)) { - enqueue_black(declaration.name); - for (let j = 0; j < declaration.members.length; j++) { - const member = declaration.members[j]; - const memberName = member.name ? member.name.getText() : null; - if (ts.isConstructorDeclaration(member) - || ts.isConstructSignatureDeclaration(member) - || ts.isIndexSignatureDeclaration(member) - || ts.isCallSignatureDeclaration(member) - || memberName === '[Symbol.iterator]' - || memberName === '[Symbol.toStringTag]' - || memberName === 'toJSON' - || memberName === 'toString' - || memberName === 'dispose' // TODO: keeping all `dispose` methods - || /^_(.*)Brand$/.test(memberName || '') // TODO: keeping all members ending with `Brand`... - ) { - enqueue_black(member); + } + if (isSymbolWithDeclarations(symbol) && !nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol)) { + for (let i = 0, len = symbol.declarations.length; i < len; i++) { + const declaration = symbol.declarations[i]; + if (ts.isSourceFile(declaration)) { + // Do not enqueue full source files + // (they can be the declaration of a module import) + continue; + } + if (options.shakeLevel === 2 /* ShakeLevel.ClassMembers */ && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration)) && !isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(ts, program, checker, declaration)) { + enqueue_black(declaration.name); + for (let j = 0; j < declaration.members.length; j++) { + const member = declaration.members[j]; + const memberName = member.name ? member.name.getText() : null; + if (ts.isConstructorDeclaration(member) + || ts.isConstructSignatureDeclaration(member) + || ts.isIndexSignatureDeclaration(member) + || ts.isCallSignatureDeclaration(member) + || memberName === '[Symbol.iterator]' + || memberName === '[Symbol.toStringTag]' + || memberName === 'toJSON' + || memberName === 'toString' + || memberName === 'dispose' // TODO: keeping all `dispose` methods + || /^_(.*)Brand$/.test(memberName || '') // TODO: keeping all members ending with `Brand`... + ) { + enqueue_black(member); + } + if (isStaticMemberWithSideEffects(ts, member)) { + enqueue_black(member); + } } - if (isStaticMemberWithSideEffects(ts, member)) { - enqueue_black(member); + // queue the heritage clauses + if (declaration.heritageClauses) { + for (const heritageClause of declaration.heritageClauses) { + enqueue_black(heritageClause); + } } } - // queue the heritage clauses - if (declaration.heritageClauses) { - for (let heritageClause of declaration.heritageClauses) { - enqueue_black(heritageClause); - } + else { + enqueue_black(declaration); } } - else { - enqueue_black(declaration); - } } } node.forEachChild(loop); @@ -551,7 +580,7 @@ function generateResult(ts, languageService, shakeLevel) { if (!program) { throw new Error('Could not get program from language service'); } - let result = {}; + const result = {}; const writeFile = (filePath, contents) => { result[filePath] = contents; }; @@ -567,7 +596,7 @@ function generateResult(ts, languageService, shakeLevel) { } return; } - let text = sourceFile.text; + const text = sourceFile.text; let result = ''; function keep(node) { result += text.substring(node.pos, node.end); @@ -597,7 +626,7 @@ function generateResult(ts, languageService, shakeLevel) { } } else { - let survivingImports = []; + const survivingImports = []; for (const importNode of node.importClause.namedBindings.elements) { if (getColor(importNode) === 2 /* NodeColor.Black */) { survivingImports.push(importNode.getFullText(sourceFile)); @@ -626,7 +655,7 @@ function generateResult(ts, languageService, shakeLevel) { } if (ts.isExportDeclaration(node)) { if (node.exportClause && node.moduleSpecifier && ts.isNamedExports(node.exportClause)) { - let survivingExports = []; + const survivingExports = []; for (const exportSpecifier of node.exportClause.elements) { if (getColor(exportSpecifier) === 2 /* NodeColor.Black */) { survivingExports.push(exportSpecifier.getFullText(sourceFile)); @@ -647,8 +676,8 @@ function generateResult(ts, languageService, shakeLevel) { // keep method continue; } - let pos = member.pos - node.pos; - let end = member.end - node.pos; + const pos = member.pos - node.pos; + const end = member.end - node.pos; toWrite = toWrite.substring(0, pos) + toWrite.substring(end); } return write(toWrite); @@ -661,11 +690,23 @@ function generateResult(ts, languageService, shakeLevel) { } if (getColor(sourceFile) !== 2 /* NodeColor.Black */) { if (!nodeOrChildIsBlack(sourceFile)) { - // none of the elements are reachable => don't write this file at all! - return; + // none of the elements are reachable + if (isNeededSourceFile(sourceFile)) { + // this source file must be written, even if nothing is used from it + // because there is an import somewhere for it. + // However, TS complains with empty files with the error "x" is not a module, + // so we will export a dummy variable + result = 'export const __dummy = 0;'; + } + else { + // don't write this file at all! + return; + } + } + else { + sourceFile.forEachChild(writeMarkedNodes); + result += sourceFile.endOfFileToken.getFullText(sourceFile); } - sourceFile.forEachChild(writeMarkedNodes); - result += sourceFile.endOfFileToken.getFullText(sourceFile); } else { result = text; @@ -697,13 +738,20 @@ function findSymbolFromHeritageType(ts, checker, type) { return findSymbolFromHeritageType(ts, checker, type.expression); } if (ts.isIdentifier(type)) { - return getRealNodeSymbol(ts, checker, type)[0]; + const tmp = getRealNodeSymbol(ts, checker, type); + return (tmp.length > 0 ? tmp[0].symbol : null); } if (ts.isPropertyAccessExpression(type)) { return findSymbolFromHeritageType(ts, checker, type.name); } return null; } +class SymbolImportTuple { + constructor(symbol, symbolImportNode) { + this.symbol = symbol; + this.symbolImportNode = symbolImportNode; + } +} /** * Returns the node's symbol and the `import` node (if the symbol resolved from a different module) */ @@ -735,7 +783,7 @@ function getRealNodeSymbol(ts, checker, node) { } if (!ts.isShorthandPropertyAssignment(node)) { if (node.getChildCount() !== 0) { - return [null, null]; + return []; } } const { parent } = node; @@ -781,10 +829,7 @@ function getRealNodeSymbol(ts, checker, node) { const type = checker.getTypeAtLocation(parent.parent); if (name && type) { if (type.isUnion()) { - const prop = type.types[0].getProperty(name); - if (prop) { - symbol = prop; - } + return generateMultipleSymbols(type, name, importNode); } else { const prop = type.getProperty(name); @@ -815,9 +860,19 @@ function getRealNodeSymbol(ts, checker, node) { } } if (symbol && symbol.declarations) { - return [symbol, importNode]; + return [new SymbolImportTuple(symbol, importNode)]; + } + return []; + function generateMultipleSymbols(type, name, importNode) { + const result = []; + for (const t of type.types) { + const prop = t.getProperty(name); + if (prop && prop.declarations) { + result.push(new SymbolImportTuple(prop, importNode)); + } + } + return result; } - return [null, null]; } /** Get the token whose text contains the position */ function getTokenAtPosition(ts, sourceFile, position, allowPositionInLeadingTrivia, includeEndPosition) { @@ -839,3 +894,4 @@ function getTokenAtPosition(ts, sourceFile, position, allowPositionInLeadingTriv return current; } } +//#endregion diff --git a/build/lib/treeshaking.ts b/build/lib/treeshaking.ts index 113340285a8..020e567eb72 100644 --- a/build/lib/treeshaking.ts +++ b/build/lib/treeshaking.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as fs from 'fs'; import * as path from 'path'; import type * as ts from 'typescript'; @@ -73,7 +71,7 @@ function printDiagnostics(options: ITreeShakingOptions, diagnostics: ReadonlyArr result += `${path.join(options.sourcesRoot, diag.file.fileName)}`; } if (diag.file && diag.start) { - let location = diag.file.getLineAndCharacterOfPosition(diag.start); + const location = diag.file.getLineAndCharacterOfPosition(diag.start); result += `:${location.line + 1}:${location.character}`; } result += ` - ` + JSON.stringify(diag.messageText); @@ -144,6 +142,8 @@ function discoverAndReadFiles(ts: typeof import('typescript'), options: ITreeSha const queue: string[] = []; const enqueue = (moduleId: string) => { + // To make the treeshaker work on windows... + moduleId = moduleId.replace(/\\/g, '/'); if (in_queue[moduleId]) { return; } @@ -216,7 +216,7 @@ function processLibFiles(ts: typeof import('typescript'), options: ITreeShakingO // precess dependencies and "recurse" const info = ts.preProcessFile(sourceText); - for (let ref of info.libReferenceDirectives) { + for (const ref of info.libReferenceDirectives) { stack.push(ref.fileName); } } @@ -307,6 +307,12 @@ function getColor(node: ts.Node): NodeColor { function setColor(node: ts.Node, color: NodeColor): void { (node).$$$color = color; } +function markNeededSourceFile(node: ts.SourceFile): void { + (node).$$$neededSourceFile = true; +} +function isNeededSourceFile(node: ts.SourceFile): boolean { + return Boolean((node).$$$neededSourceFile); +} function nodeOrParentIsBlack(node: ts.Node): boolean { while (node) { const color = getColor(node); @@ -449,6 +455,20 @@ function markNodes(ts: typeof import('typescript'), languageService: ts.Language }); } + /** + * Return the parent of `node` which is an ImportDeclaration + */ + function findParentImportDeclaration(node: ts.Declaration): ts.ImportDeclaration | null { + let _node: ts.Node = node; + do { + if (ts.isImportDeclaration(_node)) { + return _node; + } + _node = _node.parent; + } while (_node); + return null; + } + function enqueue_gray(node: ts.Node): void { if (nodeOrParentIsBlack(node) || getColor(node) === NodeColor.Gray) { return; @@ -531,6 +551,8 @@ function markNodes(ts: typeof import('typescript'), languageService: ts.Language console.warn(`Cannot find source file ${filename}`); return; } + // This source file should survive even if it is empty + markNeededSourceFile(sourceFile); enqueue_black(sourceFile); } @@ -587,54 +609,60 @@ function markNodes(ts: typeof import('typescript'), languageService: ts.Language const nodeSourceFile = node.getSourceFile(); const loop = (node: ts.Node) => { - const [symbol, symbolImportNode] = getRealNodeSymbol(ts, checker, node); - if (symbolImportNode) { - setColor(symbolImportNode, NodeColor.Black); - } - - if (isSymbolWithDeclarations(symbol) && !nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol)) { - for (let i = 0, len = symbol.declarations.length; i < len; i++) { - const declaration = symbol.declarations[i]; - if (ts.isSourceFile(declaration)) { - // Do not enqueue full source files - // (they can be the declaration of a module import) - continue; + const symbols = getRealNodeSymbol(ts, checker, node); + for (const { symbol, symbolImportNode } of symbols) { + if (symbolImportNode) { + setColor(symbolImportNode, NodeColor.Black); + const importDeclarationNode = findParentImportDeclaration(symbolImportNode); + if (importDeclarationNode && ts.isStringLiteral(importDeclarationNode.moduleSpecifier)) { + enqueueImport(importDeclarationNode, importDeclarationNode.moduleSpecifier.text); } + } - if (options.shakeLevel === ShakeLevel.ClassMembers && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration)) && !isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(ts, program, checker, declaration)) { - enqueue_black(declaration.name!); - - for (let j = 0; j < declaration.members.length; j++) { - const member = declaration.members[j]; - const memberName = member.name ? member.name.getText() : null; - if ( - ts.isConstructorDeclaration(member) - || ts.isConstructSignatureDeclaration(member) - || ts.isIndexSignatureDeclaration(member) - || ts.isCallSignatureDeclaration(member) - || memberName === '[Symbol.iterator]' - || memberName === '[Symbol.toStringTag]' - || memberName === 'toJSON' - || memberName === 'toString' - || memberName === 'dispose'// TODO: keeping all `dispose` methods - || /^_(.*)Brand$/.test(memberName || '') // TODO: keeping all members ending with `Brand`... - ) { - enqueue_black(member); - } - - if (isStaticMemberWithSideEffects(ts, member)) { - enqueue_black(member); - } + if (isSymbolWithDeclarations(symbol) && !nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol)) { + for (let i = 0, len = symbol.declarations.length; i < len; i++) { + const declaration = symbol.declarations[i]; + if (ts.isSourceFile(declaration)) { + // Do not enqueue full source files + // (they can be the declaration of a module import) + continue; } - // queue the heritage clauses - if (declaration.heritageClauses) { - for (let heritageClause of declaration.heritageClauses) { - enqueue_black(heritageClause); + if (options.shakeLevel === ShakeLevel.ClassMembers && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration)) && !isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(ts, program, checker, declaration)) { + enqueue_black(declaration.name!); + + for (let j = 0; j < declaration.members.length; j++) { + const member = declaration.members[j]; + const memberName = member.name ? member.name.getText() : null; + if ( + ts.isConstructorDeclaration(member) + || ts.isConstructSignatureDeclaration(member) + || ts.isIndexSignatureDeclaration(member) + || ts.isCallSignatureDeclaration(member) + || memberName === '[Symbol.iterator]' + || memberName === '[Symbol.toStringTag]' + || memberName === 'toJSON' + || memberName === 'toString' + || memberName === 'dispose'// TODO: keeping all `dispose` methods + || /^_(.*)Brand$/.test(memberName || '') // TODO: keeping all members ending with `Brand`... + ) { + enqueue_black(member); + } + + if (isStaticMemberWithSideEffects(ts, member)) { + enqueue_black(member); + } } + + // queue the heritage clauses + if (declaration.heritageClauses) { + for (const heritageClause of declaration.heritageClauses) { + enqueue_black(heritageClause); + } + } + } else { + enqueue_black(declaration); } - } else { - enqueue_black(declaration); } } } @@ -682,7 +710,7 @@ function generateResult(ts: typeof import('typescript'), languageService: ts.Lan throw new Error('Could not get program from language service'); } - let result: ITreeShakingResult = {}; + const result: ITreeShakingResult = {}; const writeFile = (filePath: string, contents: string): void => { result[filePath] = contents; }; @@ -700,7 +728,7 @@ function generateResult(ts: typeof import('typescript'), languageService: ts.Lan return; } - let text = sourceFile.text; + const text = sourceFile.text; let result = ''; function keep(node: ts.Node): void { @@ -734,7 +762,7 @@ function generateResult(ts: typeof import('typescript'), languageService: ts.Lan return keep(node); } } else { - let survivingImports: string[] = []; + const survivingImports: string[] = []; for (const importNode of node.importClause.namedBindings.elements) { if (getColor(importNode) === NodeColor.Black) { survivingImports.push(importNode.getFullText(sourceFile)); @@ -762,7 +790,7 @@ function generateResult(ts: typeof import('typescript'), languageService: ts.Lan if (ts.isExportDeclaration(node)) { if (node.exportClause && node.moduleSpecifier && ts.isNamedExports(node.exportClause)) { - let survivingExports: string[] = []; + const survivingExports: string[] = []; for (const exportSpecifier of node.exportClause.elements) { if (getColor(exportSpecifier) === NodeColor.Black) { survivingExports.push(exportSpecifier.getFullText(sourceFile)); @@ -785,8 +813,8 @@ function generateResult(ts: typeof import('typescript'), languageService: ts.Lan continue; } - let pos = member.pos - node.pos; - let end = member.end - node.pos; + const pos = member.pos - node.pos; + const end = member.end - node.pos; toWrite = toWrite.substring(0, pos) + toWrite.substring(end); } return write(toWrite); @@ -802,11 +830,21 @@ function generateResult(ts: typeof import('typescript'), languageService: ts.Lan if (getColor(sourceFile) !== NodeColor.Black) { if (!nodeOrChildIsBlack(sourceFile)) { - // none of the elements are reachable => don't write this file at all! - return; + // none of the elements are reachable + if (isNeededSourceFile(sourceFile)) { + // this source file must be written, even if nothing is used from it + // because there is an import somewhere for it. + // However, TS complains with empty files with the error "x" is not a module, + // so we will export a dummy variable + result = 'export const __dummy = 0;'; + } else { + // don't write this file at all! + return; + } + } else { + sourceFile.forEachChild(writeMarkedNodes); + result += sourceFile.endOfFileToken.getFullText(sourceFile); } - sourceFile.forEachChild(writeMarkedNodes); - result += sourceFile.endOfFileToken.getFullText(sourceFile); } else { result = text; } @@ -843,7 +881,8 @@ function findSymbolFromHeritageType(ts: typeof import('typescript'), checker: ts return findSymbolFromHeritageType(ts, checker, type.expression); } if (ts.isIdentifier(type)) { - return getRealNodeSymbol(ts, checker, type)[0]; + const tmp = getRealNodeSymbol(ts, checker, type); + return (tmp.length > 0 ? tmp[0].symbol : null); } if (ts.isPropertyAccessExpression(type)) { return findSymbolFromHeritageType(ts, checker, type.name); @@ -851,10 +890,17 @@ function findSymbolFromHeritageType(ts: typeof import('typescript'), checker: ts return null; } +class SymbolImportTuple { + constructor( + public readonly symbol: ts.Symbol | null, + public readonly symbolImportNode: ts.Declaration | null + ) { } +} + /** * Returns the node's symbol and the `import` node (if the symbol resolved from a different module) */ -function getRealNodeSymbol(ts: typeof import('typescript'), checker: ts.TypeChecker, node: ts.Node): [ts.Symbol | null, ts.Declaration | null] { +function getRealNodeSymbol(ts: typeof import('typescript'), checker: ts.TypeChecker, node: ts.Node): SymbolImportTuple[] { // Use some TypeScript internals to avoid code duplication type ObjectLiteralElementWithName = ts.ObjectLiteralElement & { name: ts.PropertyName; parent: ts.ObjectLiteralExpression | ts.JsxAttributes }; @@ -887,7 +933,7 @@ function getRealNodeSymbol(ts: typeof import('typescript'), checker: ts.TypeChec if (!ts.isShorthandPropertyAssignment(node)) { if (node.getChildCount() !== 0) { - return [null, null]; + return []; } } @@ -940,10 +986,7 @@ function getRealNodeSymbol(ts: typeof import('typescript'), checker: ts.TypeChec const type = checker.getTypeAtLocation(parent.parent); if (name && type) { if (type.isUnion()) { - const prop = type.types[0].getProperty(name); - if (prop) { - symbol = prop; - } + return generateMultipleSymbols(type, name, importNode); } else { const prop = type.getProperty(name); if (prop) { @@ -975,10 +1018,21 @@ function getRealNodeSymbol(ts: typeof import('typescript'), checker: ts.TypeChec } if (symbol && symbol.declarations) { - return [symbol, importNode]; + return [new SymbolImportTuple(symbol, importNode)]; } - return [null, null]; + return []; + + function generateMultipleSymbols(type: ts.UnionType, name: string, importNode: ts.Declaration | null): SymbolImportTuple[] { + const result: SymbolImportTuple[] = []; + for (const t of type.types) { + const prop = t.getProperty(name); + if (prop && prop.declarations) { + result.push(new SymbolImportTuple(prop, importNode)); + } + } + return result; + } } /** Get the token whose text contains the position */ diff --git a/build/lib/tsb/builder.js b/build/lib/tsb/builder.js index cb700a54077..be74a30a17a 100644 --- a/build/lib/tsb/builder.js +++ b/build/lib/tsb/builder.js @@ -9,7 +9,6 @@ const fs_1 = require("fs"); const path = require("path"); const crypto = require("crypto"); const utils = require("./utils"); -const log = require("fancy-log"); const colors = require("ansi-colors"); const ts = require("typescript"); const Vinyl = require("vinyl"); @@ -23,12 +22,15 @@ function normalize(path) { return path.replace(/\\/g, '/'); } function createTypeScriptBuilder(config, projectFile, cmd) { - function _log(topic, message) { - if (config.verbose) { - log(colors.cyan(topic), message); - } - } - let host = new LanguageServiceHost(cmd, projectFile, _log), service = ts.createLanguageService(host, ts.createDocumentRegistry()), lastBuildVersion = Object.create(null), lastDtsHash = Object.create(null), userWantsDeclarations = cmd.options.declaration, oldErrors = Object.create(null), headUsed = process.memoryUsage().heapUsed, emitSourceMapsInStream = true; + const _log = config.logFn; + const host = new LanguageServiceHost(cmd, projectFile, _log); + const service = ts.createLanguageService(host, ts.createDocumentRegistry()); + const lastBuildVersion = Object.create(null); + const lastDtsHash = Object.create(null); + const userWantsDeclarations = cmd.options.declaration; + let oldErrors = Object.create(null); + let headUsed = process.memoryUsage().heapUsed; + let emitSourceMapsInStream = true; // always emit declaraction files host.getCompilationSettings().declaration = true; function file(file) { @@ -85,8 +87,8 @@ function createTypeScriptBuilder(config, projectFile, cmd) { process.nextTick(function () { if (/\.d\.ts$/.test(fileName)) { // if it's already a d.ts file just emit it signature - let snapshot = host.getScriptSnapshot(fileName); - let signature = crypto.createHash('md5') + const snapshot = host.getScriptSnapshot(fileName); + const signature = crypto.createHash('md5') .update(snapshot.getText(0, snapshot.getLength())) .digest('base64'); return resolve({ @@ -95,10 +97,10 @@ function createTypeScriptBuilder(config, projectFile, cmd) { files: [] }); } - let output = service.getEmitOutput(fileName); - let files = []; + const output = service.getEmitOutput(fileName); + const files = []; let signature; - for (let file of output.outputFiles) { + for (const file of output.outputFiles) { if (!emitSourceMapsInStream && /\.js\.map$/.test(file.name)) { continue; } @@ -111,19 +113,19 @@ function createTypeScriptBuilder(config, projectFile, cmd) { continue; } } - let vinyl = new Vinyl({ + const vinyl = new Vinyl({ path: file.name, contents: Buffer.from(file.text), base: !config._emitWithoutBasePath && baseFor(host.getScriptSnapshot(fileName)) || undefined }); if (!emitSourceMapsInStream && /\.js$/.test(file.name)) { - let sourcemapFile = output.outputFiles.filter(f => /\.js\.map$/.test(f.name))[0]; + const sourcemapFile = output.outputFiles.filter(f => /\.js\.map$/.test(f.name))[0]; if (sourcemapFile) { - let extname = path.extname(vinyl.relative); - let basename = path.basename(vinyl.relative, extname); - let dirname = path.dirname(vinyl.relative); - let tsname = (dirname === '.' ? '' : dirname + '/') + basename + '.ts'; - let sourceMap = JSON.parse(sourcemapFile.text); + const extname = path.extname(vinyl.relative); + const basename = path.basename(vinyl.relative, extname); + const dirname = path.dirname(vinyl.relative); + const tsname = (dirname === '.' ? '' : dirname + '/') + basename + '.ts'; + const sourceMap = JSON.parse(sourcemapFile.text); sourceMap.sources[0] = tsname.replace(/\\/g, '/'); vinyl.sourceMap = sourceMap; } @@ -138,15 +140,15 @@ function createTypeScriptBuilder(config, projectFile, cmd) { }); }); } - let newErrors = Object.create(null); - let t1 = Date.now(); - let toBeEmitted = []; - let toBeCheckedSyntactically = []; - let toBeCheckedSemantically = []; - let filesWithChangedSignature = []; - let dependentFiles = []; - let newLastBuildVersion = new Map(); - for (let fileName of host.getScriptFileNames()) { + const newErrors = Object.create(null); + const t1 = Date.now(); + const toBeEmitted = []; + const toBeCheckedSyntactically = []; + const toBeCheckedSemantically = []; + const filesWithChangedSignature = []; + const dependentFiles = []; + const newLastBuildVersion = new Map(); + for (const fileName of host.getScriptFileNames()) { if (lastBuildVersion[fileName] !== host.getScriptVersion(fileName)) { toBeEmitted.push(fileName); toBeCheckedSyntactically.push(fileName); @@ -154,8 +156,8 @@ function createTypeScriptBuilder(config, projectFile, cmd) { } } return new Promise(resolve => { - let semanticCheckInfo = new Map(); - let seenAsDependentFile = new Set(); + const semanticCheckInfo = new Map(); + const seenAsDependentFile = new Set(); function workOnNext() { let promise; // let fileName: string; @@ -168,9 +170,9 @@ function createTypeScriptBuilder(config, projectFile, cmd) { } // (1st) emit code else if (toBeEmitted.length) { - let fileName = toBeEmitted.pop(); + const fileName = toBeEmitted.pop(); promise = emitSoon(fileName).then(value => { - for (let file of value.files) { + for (const file of value.files) { _log('[emit code]', file.path); out(file); } @@ -189,7 +191,7 @@ function createTypeScriptBuilder(config, projectFile, cmd) { } // (2nd) check syntax else if (toBeCheckedSyntactically.length) { - let fileName = toBeCheckedSyntactically.pop(); + const fileName = toBeCheckedSyntactically.pop(); _log('[check syntax]', fileName); promise = checkSyntaxSoon(fileName).then(diagnostics => { delete oldErrors[fileName]; @@ -224,7 +226,7 @@ function createTypeScriptBuilder(config, projectFile, cmd) { // (4th) check dependents else if (filesWithChangedSignature.length) { while (filesWithChangedSignature.length) { - let fileName = filesWithChangedSignature.pop(); + const fileName = filesWithChangedSignature.pop(); if (!isExternalModule(service.getProgram().getSourceFile(fileName))) { _log('[check semantics*]', fileName + ' is an internal module and it has changed shape -> check whatever hasn\'t been checked yet'); toBeCheckedSemantically.push(...host.getScriptFileNames()); @@ -243,7 +245,7 @@ function createTypeScriptBuilder(config, projectFile, cmd) { } if (fileName) { seenAsDependentFile.add(fileName); - let value = semanticCheckInfo.get(fileName); + const value = semanticCheckInfo.get(fileName); if (value === 0) { // already validated successfully -> look at dependents next host.collectDependents(fileName, dependentFiles); @@ -283,12 +285,10 @@ function createTypeScriptBuilder(config, projectFile, cmd) { }); oldErrors = newErrors; // print stats - if (config.verbose) { - const headNow = process.memoryUsage().heapUsed; - const MB = 1024 * 1024; - log('[tsb]', 'time:', colors.yellow((Date.now() - t1) + 'ms'), 'mem:', colors.cyan(Math.ceil(headNow / MB) + 'MB'), colors.bgCyan('delta: ' + Math.ceil((headNow - headUsed) / MB))); - headUsed = headNow; - } + const headNow = process.memoryUsage().heapUsed; + const MB = 1024 * 1024; + _log('[tsb]', `time: ${colors.yellow((Date.now() - t1) + 'ms')} + \nmem: ${colors.cyan(Math.ceil(headNow / MB) + 'MB')} ${colors.bgCyan('delta: ' + Math.ceil((headNow - headUsed) / MB))}`); + headUsed = headNow; }); } return { @@ -400,7 +400,7 @@ class LanguageServiceHost { } if (!old || old.getVersion() !== snapshot.getVersion()) { this._dependenciesRecomputeList.push(filename); - let node = this._dependencies.lookup(filename); + const node = this._dependencies.lookup(filename); if (node) { node.outgoing = Object.create(null); } @@ -479,7 +479,7 @@ class LanguageServiceHost { } } if (!found) { - for (let key in this._fileNameToDeclaredModule) { + for (const key in this._fileNameToDeclaredModule) { if (this._fileNameToDeclaredModule[key] && ~this._fileNameToDeclaredModule[key].indexOf(ref.fileName)) { this._dependencies.inertEdge(filename, key); } diff --git a/build/lib/tsb/builder.ts b/build/lib/tsb/builder.ts index d5bec6ee97b..b6d3b153f6a 100644 --- a/build/lib/tsb/builder.ts +++ b/build/lib/tsb/builder.ts @@ -7,13 +7,12 @@ import { statSync, readFileSync } from 'fs'; import * as path from 'path'; import * as crypto from 'crypto'; import * as utils from './utils'; -import * as log from 'fancy-log'; import * as colors from 'ansi-colors'; import * as ts from 'typescript'; import * as Vinyl from 'vinyl'; export interface IConfiguration { - verbose: boolean; + logFn: (topic: string, message: string) => void; _emitWithoutBasePath?: boolean; } @@ -39,25 +38,20 @@ function normalize(path: string): string { export function createTypeScriptBuilder(config: IConfiguration, projectFile: string, cmd: ts.ParsedCommandLine): ITypeScriptBuilder { - function _log(topic: string, message: string): void { - if (config.verbose) { - log(colors.cyan(topic), message); - } - } + const _log = config.logFn; - let host = new LanguageServiceHost(cmd, projectFile, _log), - service = ts.createLanguageService(host, ts.createDocumentRegistry()), - lastBuildVersion: { [path: string]: string } = Object.create(null), - lastDtsHash: { [path: string]: string } = Object.create(null), - userWantsDeclarations = cmd.options.declaration, - oldErrors: { [path: string]: ts.Diagnostic[] } = Object.create(null), - headUsed = process.memoryUsage().heapUsed, - emitSourceMapsInStream = true; + const host = new LanguageServiceHost(cmd, projectFile, _log); + const service = ts.createLanguageService(host, ts.createDocumentRegistry()); + const lastBuildVersion: { [path: string]: string } = Object.create(null); + const lastDtsHash: { [path: string]: string } = Object.create(null); + const userWantsDeclarations = cmd.options.declaration; + let oldErrors: { [path: string]: ts.Diagnostic[] } = Object.create(null); + let headUsed = process.memoryUsage().heapUsed; + let emitSourceMapsInStream = true; // always emit declaraction files host.getCompilationSettings().declaration = true; - function file(file: Vinyl): void { // support gulp-sourcemaps if ((file).sourceMap) { @@ -117,8 +111,8 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str if (/\.d\.ts$/.test(fileName)) { // if it's already a d.ts file just emit it signature - let snapshot = host.getScriptSnapshot(fileName); - let signature = crypto.createHash('md5') + const snapshot = host.getScriptSnapshot(fileName); + const signature = crypto.createHash('md5') .update(snapshot.getText(0, snapshot.getLength())) .digest('base64'); @@ -129,11 +123,11 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str }); } - let output = service.getEmitOutput(fileName); - let files: Vinyl[] = []; + const output = service.getEmitOutput(fileName); + const files: Vinyl[] = []; let signature: string | undefined; - for (let file of output.outputFiles) { + for (const file of output.outputFiles) { if (!emitSourceMapsInStream && /\.js\.map$/.test(file.name)) { continue; } @@ -149,22 +143,22 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str } } - let vinyl = new Vinyl({ + const vinyl = new Vinyl({ path: file.name, contents: Buffer.from(file.text), base: !config._emitWithoutBasePath && baseFor(host.getScriptSnapshot(fileName)) || undefined }); if (!emitSourceMapsInStream && /\.js$/.test(file.name)) { - let sourcemapFile = output.outputFiles.filter(f => /\.js\.map$/.test(f.name))[0]; + const sourcemapFile = output.outputFiles.filter(f => /\.js\.map$/.test(f.name))[0]; if (sourcemapFile) { - let extname = path.extname(vinyl.relative); - let basename = path.basename(vinyl.relative, extname); - let dirname = path.dirname(vinyl.relative); - let tsname = (dirname === '.' ? '' : dirname + '/') + basename + '.ts'; + const extname = path.extname(vinyl.relative); + const basename = path.basename(vinyl.relative, extname); + const dirname = path.dirname(vinyl.relative); + const tsname = (dirname === '.' ? '' : dirname + '/') + basename + '.ts'; - let sourceMap = JSON.parse(sourcemapFile.text); + const sourceMap = JSON.parse(sourcemapFile.text); sourceMap.sources[0] = tsname.replace(/\\/g, '/'); (vinyl).sourceMap = sourceMap; } @@ -182,17 +176,17 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str }); } - let newErrors: { [path: string]: ts.Diagnostic[] } = Object.create(null); - let t1 = Date.now(); + const newErrors: { [path: string]: ts.Diagnostic[] } = Object.create(null); + const t1 = Date.now(); - let toBeEmitted: string[] = []; - let toBeCheckedSyntactically: string[] = []; - let toBeCheckedSemantically: string[] = []; - let filesWithChangedSignature: string[] = []; - let dependentFiles: string[] = []; - let newLastBuildVersion = new Map(); + const toBeEmitted: string[] = []; + const toBeCheckedSyntactically: string[] = []; + const toBeCheckedSemantically: string[] = []; + const filesWithChangedSignature: string[] = []; + const dependentFiles: string[] = []; + const newLastBuildVersion = new Map(); - for (let fileName of host.getScriptFileNames()) { + for (const fileName of host.getScriptFileNames()) { if (lastBuildVersion[fileName] !== host.getScriptVersion(fileName)) { toBeEmitted.push(fileName); @@ -203,8 +197,8 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str return new Promise(resolve => { - let semanticCheckInfo = new Map(); - let seenAsDependentFile = new Set(); + const semanticCheckInfo = new Map(); + const seenAsDependentFile = new Set(); function workOnNext() { @@ -221,10 +215,10 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str // (1st) emit code else if (toBeEmitted.length) { - let fileName = toBeEmitted.pop()!; + const fileName = toBeEmitted.pop()!; promise = emitSoon(fileName).then(value => { - for (let file of value.files) { + for (const file of value.files) { _log('[emit code]', file.path); out(file); } @@ -246,7 +240,7 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str // (2nd) check syntax else if (toBeCheckedSyntactically.length) { - let fileName = toBeCheckedSyntactically.pop()!; + const fileName = toBeCheckedSyntactically.pop()!; _log('[check syntax]', fileName); promise = checkSyntaxSoon(fileName).then(diagnostics => { delete oldErrors[fileName]; @@ -286,7 +280,7 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str // (4th) check dependents else if (filesWithChangedSignature.length) { while (filesWithChangedSignature.length) { - let fileName = filesWithChangedSignature.pop()!; + const fileName = filesWithChangedSignature.pop()!; if (!isExternalModule(service.getProgram()!.getSourceFile(fileName)!)) { _log('[check semantics*]', fileName + ' is an internal module and it has changed shape -> check whatever hasn\'t been checked yet'); @@ -308,7 +302,7 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str } if (fileName) { seenAsDependentFile.add(fileName); - let value = semanticCheckInfo.get(fileName); + const value = semanticCheckInfo.get(fileName); if (value === 0) { // already validated successfully -> look at dependents next host.collectDependents(fileName, dependentFiles); @@ -355,15 +349,13 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str oldErrors = newErrors; // print stats - if (config.verbose) { - const headNow = process.memoryUsage().heapUsed; - const MB = 1024 * 1024; - log('[tsb]', - 'time:', colors.yellow((Date.now() - t1) + 'ms'), - 'mem:', colors.cyan(Math.ceil(headNow / MB) + 'MB'), colors.bgCyan('delta: ' + Math.ceil((headNow - headUsed) / MB)) - ); - headUsed = headNow; - } + const headNow = process.memoryUsage().heapUsed; + const MB = 1024 * 1024; + _log( + '[tsb]', + `time: ${colors.yellow((Date.now() - t1) + 'ms')} + \nmem: ${colors.cyan(Math.ceil(headNow / MB) + 'MB')} ${colors.bgCyan('delta: ' + Math.ceil((headNow - headUsed) / MB))}` + ); + headUsed = headNow; }); } @@ -507,7 +499,7 @@ class LanguageServiceHost implements ts.LanguageServiceHost { } if (!old || old.getVersion() !== snapshot.getVersion()) { this._dependenciesRecomputeList.push(filename); - let node = this._dependencies.lookup(filename); + const node = this._dependencies.lookup(filename); if (node) { node.outgoing = Object.create(null); } @@ -605,7 +597,7 @@ class LanguageServiceHost implements ts.LanguageServiceHost { } if (!found) { - for (let key in this._fileNameToDeclaredModule) { + for (const key in this._fileNameToDeclaredModule) { if (this._fileNameToDeclaredModule[key] && ~this._fileNameToDeclaredModule[key].indexOf(ref.fileName)) { this._dependencies.inertEdge(filename, key); } diff --git a/build/lib/tsb/index.js b/build/lib/tsb/index.js index bd30013092c..51806a479ea 100644 --- a/build/lib/tsb/index.js +++ b/build/lib/tsb/index.js @@ -13,6 +13,9 @@ const stream_1 = require("stream"); const path_1 = require("path"); const utils_1 = require("./utils"); const fs_1 = require("fs"); +const log = require("fancy-log"); +const colors = require("ansi-colors"); +const transpiler_1 = require("./transpiler"); class EmptyDuplex extends stream_1.Duplex { _write(_chunk, _encoding, callback) { callback(); } _read() { this.push(null); } @@ -23,7 +26,7 @@ function createNullCompiler() { return result; } const _defaultOnError = (err) => console.log(JSON.stringify(err, null, 4)); -function create(projectPath, existingOptions, verbose = false, onError = _defaultOnError) { +function create(projectPath, existingOptions, config, onError = _defaultOnError) { function printDiagnostic(diag) { if (!diag.file || !diag.start) { onError(ts.flattenDiagnosticMessageText(diag.messageText, '\n')); @@ -43,24 +46,64 @@ function create(projectPath, existingOptions, verbose = false, onError = _defaul cmdLine.errors.forEach(printDiagnostic); return createNullCompiler(); } - const _builder = builder.createTypeScriptBuilder({ verbose }, projectPath, cmdLine); - function createStream(token) { + function logFn(topic, message) { + if (config.verbose) { + log(colors.cyan(topic), message); + } + } + // FULL COMPILE stream doing transpile, syntax and semantic diagnostics + function createCompileStream(builder, token) { return through(function (file) { // give the file to the compiler if (file.isStream()) { this.emit('error', 'no support for streams'); return; } - _builder.file(file); + builder.file(file); }, function () { // start the compilation process - _builder.build(file => this.queue(file), printDiagnostic, token).catch(e => console.error(e)).then(() => this.queue(null)); + builder.build(file => this.queue(file), printDiagnostic, token).catch(e => console.error(e)).then(() => this.queue(null)); }); } - const result = (token) => createStream(token); + // TRANSPILE ONLY stream doing just TS to JS conversion + function createTranspileStream(transpiler) { + return through(function (file) { + // give the file to the compiler + if (file.isStream()) { + this.emit('error', 'no support for streams'); + return; + } + if (!file.contents) { + return; + } + if (!config.transpileOnlyIncludesDts && file.path.endsWith('.d.ts')) { + return; + } + if (!transpiler.onOutfile) { + transpiler.onOutfile = file => this.queue(file); + } + transpiler.transpile(file); + }, function () { + transpiler.join().then(() => { + this.queue(null); + transpiler.onOutfile = undefined; + }); + }); + } + let result; + if (config.transpileOnly) { + const transpiler = !config.transpileWithSwc + ? new transpiler_1.TscTranspiler(logFn, printDiagnostic, projectPath, cmdLine) + : new transpiler_1.SwcTranspiler(logFn, printDiagnostic, projectPath, cmdLine); + result = (() => createTranspileStream(transpiler)); + } + else { + const _builder = builder.createTypeScriptBuilder({ logFn }, projectPath, cmdLine); + result = ((token) => createCompileStream(_builder, token)); + } result.src = (opts) => { let _pos = 0; - let _fileNames = cmdLine.fileNames.slice(0); + const _fileNames = cmdLine.fileNames.slice(0); return new class extends stream_1.Readable { constructor() { super({ objectMode: true }); diff --git a/build/lib/tsb/index.ts b/build/lib/tsb/index.ts index 6e8e3d6fb77..0c5952cec34 100644 --- a/build/lib/tsb/index.ts +++ b/build/lib/tsb/index.ts @@ -11,6 +11,9 @@ import { Readable, Writable, Duplex } from 'stream'; import { dirname } from 'path'; import { strings } from './utils'; import { readFileSync, statSync } from 'fs'; +import * as log from 'fancy-log'; +import colors = require('ansi-colors'); +import { ITranspiler, SwcTranspiler, TscTranspiler } from './transpiler'; export interface IncrementalCompiler { (token?: any): Readable & Writable; @@ -33,7 +36,7 @@ const _defaultOnError = (err: string) => console.log(JSON.stringify(err, null, 4 export function create( projectPath: string, existingOptions: Partial, - verbose: boolean = false, + config: { verbose?: boolean; transpileOnly?: boolean; transpileOnlyIncludesDts?: boolean; transpileWithSwc?: boolean }, onError: (message: string) => void = _defaultOnError ): IncrementalCompiler { @@ -64,9 +67,14 @@ export function create( return createNullCompiler(); } - const _builder = builder.createTypeScriptBuilder({ verbose }, projectPath, cmdLine); + function logFn(topic: string, message: string): void { + if (config.verbose) { + log(colors.cyan(topic), message); + } + } - function createStream(token?: builder.CancellationToken): Readable & Writable { + // FULL COMPILE stream doing transpile, syntax and semantic diagnostics + function createCompileStream(builder: builder.ITypeScriptBuilder, token?: builder.CancellationToken): Readable & Writable { return through(function (this: through.ThroughStream, file: Vinyl) { // give the file to the compiler @@ -74,11 +82,11 @@ export function create( this.emit('error', 'no support for streams'); return; } - _builder.file(file); + builder.file(file); }, function (this: { queue(a: any): void }) { // start the compilation process - _builder.build( + builder.build( file => this.queue(file), printDiagnostic, token @@ -86,10 +94,50 @@ export function create( }); } - const result = (token: builder.CancellationToken) => createStream(token); + // TRANSPILE ONLY stream doing just TS to JS conversion + function createTranspileStream(transpiler: ITranspiler): Readable & Writable { + return through(function (this: through.ThroughStream & { queue(a: any): void }, file: Vinyl) { + // give the file to the compiler + if (file.isStream()) { + this.emit('error', 'no support for streams'); + return; + } + if (!file.contents) { + return; + } + if (!config.transpileOnlyIncludesDts && file.path.endsWith('.d.ts')) { + return; + } + + if (!transpiler.onOutfile) { + transpiler.onOutfile = file => this.queue(file); + } + + transpiler.transpile(file); + + }, function (this: { queue(a: any): void }) { + transpiler.join().then(() => { + this.queue(null); + transpiler.onOutfile = undefined; + }); + }); + } + + + let result: IncrementalCompiler; + if (config.transpileOnly) { + const transpiler = !config.transpileWithSwc + ? new TscTranspiler(logFn, printDiagnostic, projectPath, cmdLine) + : new SwcTranspiler(logFn, printDiagnostic, projectPath, cmdLine); + result = (() => createTranspileStream(transpiler)); + } else { + const _builder = builder.createTypeScriptBuilder({ logFn }, projectPath, cmdLine); + result = ((token: builder.CancellationToken) => createCompileStream(_builder, token)); + } + result.src = (opts?: { cwd?: string; base?: string }) => { let _pos = 0; - let _fileNames = cmdLine.fileNames.slice(0); + const _fileNames = cmdLine.fileNames.slice(0); return new class extends Readable { constructor() { super({ objectMode: true }); diff --git a/build/lib/tsb/transpiler.js b/build/lib/tsb/transpiler.js new file mode 100644 index 00000000000..e5e90128d09 --- /dev/null +++ b/build/lib/tsb/transpiler.js @@ -0,0 +1,314 @@ +"use strict"; +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +var _a; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.SwcTranspiler = exports.TscTranspiler = void 0; +const swc = require("@swc/core"); +const ts = require("typescript"); +const threads = require("node:worker_threads"); +const Vinyl = require("vinyl"); +const node_os_1 = require("node:os"); +function transpile(tsSrc, options) { + const isAmd = /\n(import|export)/m.test(tsSrc); + if (!isAmd && options.compilerOptions?.module === ts.ModuleKind.AMD) { + // enforce NONE module-system for not-amd cases + options = { ...options, ...{ compilerOptions: { ...options.compilerOptions, module: ts.ModuleKind.None } } }; + } + const out = ts.transpileModule(tsSrc, options); + return { + jsSrc: out.outputText, + diag: out.diagnostics ?? [] + }; +} +if (!threads.isMainThread) { + // WORKER + threads.parentPort?.addListener('message', (req) => { + const res = { + jsSrcs: [], + diagnostics: [] + }; + for (const tsSrc of req.tsSrcs) { + const out = transpile(tsSrc, req.options); + res.jsSrcs.push(out.jsSrc); + res.diagnostics.push(out.diag); + } + threads.parentPort.postMessage(res); + }); +} +class OutputFileNameOracle { + constructor(cmdLine, configFilePath) { + this.getOutputFileName = (file) => { + try { + // windows: path-sep normalizing + file = ts.normalizePath(file); + if (!cmdLine.options.configFilePath) { + // this is needed for the INTERNAL getOutputFileNames-call below... + cmdLine.options.configFilePath = configFilePath; + } + const isDts = file.endsWith('.d.ts'); + if (isDts) { + file = file.slice(0, -5) + '.ts'; + cmdLine.fileNames.push(file); + } + const outfile = ts.getOutputFileNames(cmdLine, file, true)[0]; + if (isDts) { + cmdLine.fileNames.pop(); + } + return outfile; + } + catch (err) { + console.error(file, cmdLine.fileNames); + console.error(err); + throw new err; + } + }; + } +} +class TranspileWorker { + constructor(outFileFn) { + this.id = TranspileWorker.pool++; + this._worker = new threads.Worker(__filename); + this._durations = []; + this._worker.addListener('message', (res) => { + if (!this._pending) { + console.error('RECEIVING data WITHOUT request'); + return; + } + const [resolve, reject, files, options, t1] = this._pending; + const outFiles = []; + const diag = []; + for (let i = 0; i < res.jsSrcs.length; i++) { + // inputs and outputs are aligned across the arrays + const file = files[i]; + const jsSrc = res.jsSrcs[i]; + const diag = res.diagnostics[i]; + if (diag.length > 0) { + diag.push(...diag); + continue; + } + let SuffixTypes; + (function (SuffixTypes) { + SuffixTypes[SuffixTypes["Dts"] = 5] = "Dts"; + SuffixTypes[SuffixTypes["Ts"] = 3] = "Ts"; + SuffixTypes[SuffixTypes["Unknown"] = 0] = "Unknown"; + })(SuffixTypes || (SuffixTypes = {})); + const suffixLen = file.path.endsWith('.d.ts') ? 5 /* SuffixTypes.Dts */ + : file.path.endsWith('.ts') ? 3 /* SuffixTypes.Ts */ + : 0 /* SuffixTypes.Unknown */; + // check if output of a DTS-files isn't just "empty" and iff so + // skip this file + if (suffixLen === 5 /* SuffixTypes.Dts */ && _isDefaultEmpty(jsSrc)) { + continue; + } + const outBase = options.compilerOptions?.outDir ?? file.base; + const outPath = outFileFn(file.path); + outFiles.push(new Vinyl({ + path: outPath, + base: outBase, + contents: Buffer.from(jsSrc), + })); + } + this._pending = undefined; + this._durations.push(Date.now() - t1); + if (diag.length > 0) { + reject(diag); + } + else { + resolve(outFiles); + } + }); + } + terminate() { + // console.log(`Worker#${this.id} ENDS after ${this._durations.length} jobs (total: ${this._durations.reduce((p, c) => p + c, 0)}, avg: ${this._durations.reduce((p, c) => p + c, 0) / this._durations.length})`); + this._worker.terminate(); + } + get isBusy() { + return this._pending !== undefined; + } + next(files, options) { + if (this._pending !== undefined) { + throw new Error('BUSY'); + } + return new Promise((resolve, reject) => { + this._pending = [resolve, reject, files, options, Date.now()]; + const req = { + options, + tsSrcs: files.map(file => String(file.contents)) + }; + this._worker.postMessage(req); + }); + } +} +TranspileWorker.pool = 1; +class TscTranspiler { + constructor(logFn, _onError, configFilePath, _cmdLine) { + this._onError = _onError; + this._cmdLine = _cmdLine; + this._workerPool = []; + this._queue = []; + this._allJobs = []; + logFn('Transpile', `will use ${TscTranspiler.P} transpile worker`); + this._outputFileNames = new OutputFileNameOracle(_cmdLine, configFilePath); + } + async join() { + // wait for all penindg jobs + this._consumeQueue(); + await Promise.allSettled(this._allJobs); + this._allJobs.length = 0; + // terminate all worker + this._workerPool.forEach(w => w.terminate()); + this._workerPool.length = 0; + } + transpile(file) { + if (this._cmdLine.options.noEmit) { + // not doing ANYTHING here + return; + } + const newLen = this._queue.push(file); + if (newLen > TscTranspiler.P ** 2) { + this._consumeQueue(); + } + } + _consumeQueue() { + if (this._queue.length === 0) { + // no work... + return; + } + // kinda LAZYily create workers + if (this._workerPool.length === 0) { + for (let i = 0; i < TscTranspiler.P; i++) { + this._workerPool.push(new TranspileWorker(file => this._outputFileNames.getOutputFileName(file))); + } + } + const freeWorker = this._workerPool.filter(w => !w.isBusy); + if (freeWorker.length === 0) { + // OK, they will pick up work themselves + return; + } + for (const worker of freeWorker) { + if (this._queue.length === 0) { + break; + } + const job = new Promise(resolve => { + const consume = () => { + const files = this._queue.splice(0, TscTranspiler.P); + if (files.length === 0) { + // DONE + resolve(undefined); + return; + } + // work on the NEXT file + // const [inFile, outFn] = req; + worker.next(files, { compilerOptions: this._cmdLine.options }).then(outFiles => { + if (this.onOutfile) { + outFiles.map(this.onOutfile, this); + } + consume(); + }).catch(err => { + this._onError(err); + }); + }; + consume(); + }); + this._allJobs.push(job); + } + } +} +exports.TscTranspiler = TscTranspiler; +TscTranspiler.P = Math.floor((0, node_os_1.cpus)().length * .5); +function _isDefaultEmpty(src) { + return src + .replace('"use strict";', '') + .replace(/\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm, '$1') + .trim().length === 0; +} +class SwcTranspiler { + constructor(_logFn, _onError, configFilePath, _cmdLine) { + this._logFn = _logFn; + this._onError = _onError; + this._cmdLine = _cmdLine; + this._jobs = []; + _logFn('Transpile', `will use SWC to transpile source files`); + this._outputFileNames = new OutputFileNameOracle(_cmdLine, configFilePath); + } + async join() { + const jobs = this._jobs.slice(); + this._jobs.length = 0; + await Promise.allSettled(jobs); + } + transpile(file) { + if (this._cmdLine.options.noEmit) { + // not doing ANYTHING here + return; + } + const tsSrc = String(file.contents); + const t1 = Date.now(); + let options = SwcTranspiler._swcrcEsm; + if (this._cmdLine.options.module === ts.ModuleKind.AMD) { + const isAmd = /\n(import|export)/m.test(tsSrc); + if (isAmd) { + options = SwcTranspiler._swcrcAmd; + } + } + else if (this._cmdLine.options.module === ts.ModuleKind.CommonJS) { + options = SwcTranspiler._swcrcCommonJS; + } + this._jobs.push(swc.transform(tsSrc, options).then(output => { + // check if output of a DTS-files isn't just "empty" and iff so + // skip this file + if (file.path.endsWith('.d.ts') && _isDefaultEmpty(output.code)) { + return; + } + const outBase = this._cmdLine.options.outDir ?? file.base; + const outPath = this._outputFileNames.getOutputFileName(file.path); + this.onOutfile(new Vinyl({ + path: outPath, + base: outBase, + contents: Buffer.from(output.code), + })); + this._logFn('Transpile', `swc took ${Date.now() - t1}ms for ${file.path}`); + }).catch(err => { + this._onError(err); + })); + } +} +exports.SwcTranspiler = SwcTranspiler; +_a = SwcTranspiler; +// --- .swcrc +SwcTranspiler._swcrcAmd = { + exclude: '\.js$', + jsc: { + parser: { + syntax: 'typescript', + tsx: false, + decorators: true + }, + target: 'es2020', + loose: false, + minify: { + compress: false, + mangle: false + } + }, + module: { + type: 'amd', + noInterop: true + }, + minify: false, +}; +SwcTranspiler._swcrcCommonJS = { + ..._a._swcrcAmd, + module: { + type: 'commonjs', + importInterop: 'none' + } +}; +SwcTranspiler._swcrcEsm = { + ..._a._swcrcAmd, + module: { + type: 'es6' + } +}; diff --git a/build/lib/tsb/transpiler.ts b/build/lib/tsb/transpiler.ts new file mode 100644 index 00000000000..a82cbaef890 --- /dev/null +++ b/build/lib/tsb/transpiler.ts @@ -0,0 +1,407 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as swc from '@swc/core'; +import * as ts from 'typescript'; +import * as threads from 'node:worker_threads'; +import * as Vinyl from 'vinyl'; +import { cpus } from 'node:os'; + +interface TranspileReq { + readonly tsSrcs: string[]; + readonly options: ts.TranspileOptions; +} + +interface TranspileRes { + readonly jsSrcs: string[]; + readonly diagnostics: ts.Diagnostic[][]; +} + +function transpile(tsSrc: string, options: ts.TranspileOptions): { jsSrc: string; diag: ts.Diagnostic[] } { + + const isAmd = /\n(import|export)/m.test(tsSrc); + if (!isAmd && options.compilerOptions?.module === ts.ModuleKind.AMD) { + // enforce NONE module-system for not-amd cases + options = { ...options, ...{ compilerOptions: { ...options.compilerOptions, module: ts.ModuleKind.None } } }; + } + const out = ts.transpileModule(tsSrc, options); + return { + jsSrc: out.outputText, + diag: out.diagnostics ?? [] + }; +} + +if (!threads.isMainThread) { + // WORKER + threads.parentPort?.addListener('message', (req: TranspileReq) => { + const res: TranspileRes = { + jsSrcs: [], + diagnostics: [] + }; + for (const tsSrc of req.tsSrcs) { + const out = transpile(tsSrc, req.options); + res.jsSrcs.push(out.jsSrc); + res.diagnostics.push(out.diag); + } + threads.parentPort!.postMessage(res); + }); +} + +class OutputFileNameOracle { + + readonly getOutputFileName: (name: string) => string; + + constructor(cmdLine: ts.ParsedCommandLine, configFilePath: string) { + // very complicated logic to re-use TS internal functions to know the output path + // given a TS input path and its config + type InternalTsApi = typeof ts & { + normalizePath(path: string): string; + getOutputFileNames(commandLine: ts.ParsedCommandLine, inputFileName: string, ignoreCase: boolean): readonly string[]; + }; + this.getOutputFileName = (file) => { + try { + + // windows: path-sep normalizing + file = (ts).normalizePath(file); + + if (!cmdLine.options.configFilePath) { + // this is needed for the INTERNAL getOutputFileNames-call below... + cmdLine.options.configFilePath = configFilePath; + } + const isDts = file.endsWith('.d.ts'); + if (isDts) { + file = file.slice(0, -5) + '.ts'; + cmdLine.fileNames.push(file); + } + const outfile = (ts).getOutputFileNames(cmdLine, file, true)[0]; + if (isDts) { + cmdLine.fileNames.pop(); + } + return outfile; + + } catch (err) { + console.error(file, cmdLine.fileNames); + console.error(err); + throw new err; + } + }; + } +} + +class TranspileWorker { + + private static pool = 1; + + readonly id = TranspileWorker.pool++; + + private _worker = new threads.Worker(__filename); + private _pending?: [resolve: Function, reject: Function, file: Vinyl[], options: ts.TranspileOptions, t1: number]; + private _durations: number[] = []; + + constructor(outFileFn: (fileName: string) => string) { + + this._worker.addListener('message', (res: TranspileRes) => { + if (!this._pending) { + console.error('RECEIVING data WITHOUT request'); + return; + } + + const [resolve, reject, files, options, t1] = this._pending; + + const outFiles: Vinyl[] = []; + const diag: ts.Diagnostic[] = []; + + for (let i = 0; i < res.jsSrcs.length; i++) { + // inputs and outputs are aligned across the arrays + const file = files[i]; + const jsSrc = res.jsSrcs[i]; + const diag = res.diagnostics[i]; + + if (diag.length > 0) { + diag.push(...diag); + continue; + } + const enum SuffixTypes { + Dts = 5, + Ts = 3, + Unknown = 0 + } + const suffixLen = file.path.endsWith('.d.ts') ? SuffixTypes.Dts + : file.path.endsWith('.ts') ? SuffixTypes.Ts + : SuffixTypes.Unknown; + + // check if output of a DTS-files isn't just "empty" and iff so + // skip this file + if (suffixLen === SuffixTypes.Dts && _isDefaultEmpty(jsSrc)) { + continue; + } + + const outBase = options.compilerOptions?.outDir ?? file.base; + const outPath = outFileFn(file.path); + + outFiles.push(new Vinyl({ + path: outPath, + base: outBase, + contents: Buffer.from(jsSrc), + })); + } + + this._pending = undefined; + this._durations.push(Date.now() - t1); + + if (diag.length > 0) { + reject(diag); + } else { + resolve(outFiles); + } + }); + } + + terminate() { + // console.log(`Worker#${this.id} ENDS after ${this._durations.length} jobs (total: ${this._durations.reduce((p, c) => p + c, 0)}, avg: ${this._durations.reduce((p, c) => p + c, 0) / this._durations.length})`); + this._worker.terminate(); + } + + get isBusy() { + return this._pending !== undefined; + } + + next(files: Vinyl[], options: ts.TranspileOptions) { + if (this._pending !== undefined) { + throw new Error('BUSY'); + } + return new Promise((resolve, reject) => { + this._pending = [resolve, reject, files, options, Date.now()]; + const req: TranspileReq = { + options, + tsSrcs: files.map(file => String(file.contents)) + }; + this._worker.postMessage(req); + }); + } +} + +export interface ITranspiler { + onOutfile?: (file: Vinyl) => void; + join(): Promise; + transpile(file: Vinyl): void; +} + +export class TscTranspiler implements ITranspiler { + + static P = Math.floor(cpus().length * .5); + + private readonly _outputFileNames: OutputFileNameOracle; + + + public onOutfile?: (file: Vinyl) => void; + + private _workerPool: TranspileWorker[] = []; + private _queue: Vinyl[] = []; + private _allJobs: Promise[] = []; + + constructor( + logFn: (topic: string, message: string) => void, + private readonly _onError: (err: any) => void, + configFilePath: string, + private readonly _cmdLine: ts.ParsedCommandLine + ) { + logFn('Transpile', `will use ${TscTranspiler.P} transpile worker`); + this._outputFileNames = new OutputFileNameOracle(_cmdLine, configFilePath); + } + + async join() { + // wait for all penindg jobs + this._consumeQueue(); + await Promise.allSettled(this._allJobs); + this._allJobs.length = 0; + + // terminate all worker + this._workerPool.forEach(w => w.terminate()); + this._workerPool.length = 0; + } + + + transpile(file: Vinyl) { + + if (this._cmdLine.options.noEmit) { + // not doing ANYTHING here + return; + } + + const newLen = this._queue.push(file); + if (newLen > TscTranspiler.P ** 2) { + this._consumeQueue(); + } + } + + private _consumeQueue(): void { + + if (this._queue.length === 0) { + // no work... + return; + } + + // kinda LAZYily create workers + if (this._workerPool.length === 0) { + for (let i = 0; i < TscTranspiler.P; i++) { + this._workerPool.push(new TranspileWorker(file => this._outputFileNames.getOutputFileName(file))); + } + } + + const freeWorker = this._workerPool.filter(w => !w.isBusy); + if (freeWorker.length === 0) { + // OK, they will pick up work themselves + return; + } + + for (const worker of freeWorker) { + if (this._queue.length === 0) { + break; + } + + const job = new Promise(resolve => { + + const consume = () => { + const files = this._queue.splice(0, TscTranspiler.P); + if (files.length === 0) { + // DONE + resolve(undefined); + return; + } + // work on the NEXT file + // const [inFile, outFn] = req; + worker.next(files, { compilerOptions: this._cmdLine.options }).then(outFiles => { + if (this.onOutfile) { + outFiles.map(this.onOutfile, this); + } + consume(); + }).catch(err => { + this._onError(err); + }); + }; + + consume(); + }); + + this._allJobs.push(job); + } + } +} + +function _isDefaultEmpty(src: string): boolean { + return src + .replace('"use strict";', '') + .replace(/\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm, '$1') + .trim().length === 0; +} + + +export class SwcTranspiler implements ITranspiler { + + onOutfile?: ((file: Vinyl) => void) | undefined; + + private readonly _outputFileNames: OutputFileNameOracle; + private _jobs: Promise[] = []; + + constructor( + private readonly _logFn: (topic: string, message: string) => void, + private readonly _onError: (err: any) => void, + configFilePath: string, + private readonly _cmdLine: ts.ParsedCommandLine + ) { + _logFn('Transpile', `will use SWC to transpile source files`); + this._outputFileNames = new OutputFileNameOracle(_cmdLine, configFilePath); + } + + async join(): Promise { + const jobs = this._jobs.slice(); + this._jobs.length = 0; + await Promise.allSettled(jobs); + } + + transpile(file: Vinyl): void { + if (this._cmdLine.options.noEmit) { + // not doing ANYTHING here + return; + } + + const tsSrc = String(file.contents); + const t1 = Date.now(); + + let options: swc.Options = SwcTranspiler._swcrcEsm; + if (this._cmdLine.options.module === ts.ModuleKind.AMD) { + const isAmd = /\n(import|export)/m.test(tsSrc); + if (isAmd) { + options = SwcTranspiler._swcrcAmd; + } + } else if (this._cmdLine.options.module === ts.ModuleKind.CommonJS) { + options = SwcTranspiler._swcrcCommonJS; + } + + this._jobs.push(swc.transform(tsSrc, options).then(output => { + + // check if output of a DTS-files isn't just "empty" and iff so + // skip this file + if (file.path.endsWith('.d.ts') && _isDefaultEmpty(output.code)) { + return; + } + + const outBase = this._cmdLine.options.outDir ?? file.base; + const outPath = this._outputFileNames.getOutputFileName(file.path); + + this.onOutfile!(new Vinyl({ + path: outPath, + base: outBase, + contents: Buffer.from(output.code), + })); + + this._logFn('Transpile', `swc took ${Date.now() - t1}ms for ${file.path}`); + + }).catch(err => { + this._onError(err); + })); + } + + // --- .swcrc + + + private static readonly _swcrcAmd: swc.Options = { + exclude: '\.js$', + jsc: { + parser: { + syntax: 'typescript', + tsx: false, + decorators: true + }, + target: 'es2020', + loose: false, + minify: { + compress: false, + mangle: false + } + }, + module: { + type: 'amd', + noInterop: true + }, + minify: false, + }; + + private static readonly _swcrcCommonJS: swc.Options = { + ...this._swcrcAmd, + module: { + type: 'commonjs', + importInterop: 'none' + } + }; + + private static readonly _swcrcEsm: swc.Options = { + ...this._swcrcAmd, + module: { + type: 'es6' + } + }; +} diff --git a/build/lib/tsb/utils.js b/build/lib/tsb/utils.js index 810297dc246..cc8605758ce 100644 --- a/build/lib/tsb/utils.js +++ b/build/lib/tsb/utils.js @@ -30,7 +30,7 @@ var collections; } collections.lookupOrInsert = lookupOrInsert; function forEach(collection, callback) { - for (let key in collection) { + for (const key in collection) { if (hasOwnProperty.call(collection, key)) { callback({ key: key, diff --git a/build/lib/tsb/utils.ts b/build/lib/tsb/utils.ts index 295d873b63a..3b003e3a6e1 100644 --- a/build/lib/tsb/utils.ts +++ b/build/lib/tsb/utils.ts @@ -28,7 +28,7 @@ export module collections { } export function forEach(collection: { [keys: string]: T }, callback: (entry: { key: string; value: T }) => void): void { - for (let key in collection) { + for (const key in collection) { if (hasOwnProperty.call(collection, key)) { callback({ key: key, diff --git a/build/lib/util.js b/build/lib/util.js index 4efe2b3a046..3eae325612a 100644 --- a/build/lib/util.js +++ b/build/lib/util.js @@ -1,10 +1,10 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); -exports.buildWebNodePaths = exports.createExternalLoaderConfig = exports.acquireWebNodePaths = exports.getElectronVersion = exports.streamToPromise = exports.versionStringToNumber = exports.filter = exports.rebase = exports.getVersion = exports.ensureDir = exports.rreddir = exports.rimraf = exports.rewriteSourceMappingURL = exports.stripSourceMappingURL = exports.loadSourcemaps = exports.cleanNodeModules = exports.skipDirectories = exports.toFileUri = exports.setExecutableBit = exports.fixWin32DirectoryPermissions = exports.debounce = exports.incremental = void 0; +exports.buildWebNodePaths = exports.createExternalLoaderConfig = exports.acquireWebNodePaths = exports.getElectronVersion = exports.streamToPromise = exports.versionStringToNumber = exports.filter = exports.rebase = exports.ensureDir = exports.rreddir = exports.rimraf = exports.rewriteSourceMappingURL = exports.stripSourceMappingURL = exports.loadSourcemaps = exports.cleanNodeModules = exports.skipDirectories = exports.toFileUri = exports.setExecutableBit = exports.fixWin32DirectoryPermissions = exports.debounce = exports.incremental = void 0; const es = require("event-stream"); const _debounce = require("debounce"); const _filter = require("gulp-filter"); @@ -13,7 +13,6 @@ const path = require("path"); const fs = require("fs"); const _rimraf = require("rimraf"); const VinylFile = require("vinyl"); -const git = require("./git"); const root = path.dirname(path.dirname(__dirname)); const NoCancellationToken = { isCancellationRequested: () => false }; function incremental(streamProvider, initial, supportsCancellation) { @@ -240,7 +239,7 @@ function _rreaddir(dirPath, prepend, result) { } } function rreddir(dirPath) { - let result = []; + const result = []; _rreaddir(dirPath, '', result); return result; } @@ -253,14 +252,6 @@ function ensureDir(dirPath) { fs.mkdirSync(dirPath); } exports.ensureDir = ensureDir; -function getVersion(root) { - let version = process.env['VSCODE_DISTRO_COMMIT'] || process.env['BUILD_SOURCEVERSION']; - if (!version || !/^[0-9a-f]{40}$/i.test(version.trim())) { - version = git.getVersion(root); - } - return version; -} -exports.getVersion = getVersion; function rebase(count) { return rename(f => { const parts = f.dirname ? f.dirname.split(/[\/\\]/) : []; @@ -336,6 +327,13 @@ function acquireWebNodePaths() { } nodePaths[key] = entryPoint; } + // @TODO lramos15 can we make this dynamic like the rest of the node paths + // Add these paths as well for 1DS SDK dependencies. + // Not sure why given the 1DS entrypoint then requires these modules + // they are not fetched from the right location and instead are fetched from out/ + nodePaths['@microsoft/dynamicproto-js'] = 'lib/dist/umd/dynamicproto-js.min.js'; + nodePaths['@microsoft/applicationinsights-shims'] = 'dist/umd/applicationinsights-shims.min.js'; + nodePaths['@microsoft/applicationinsights-core-js'] = 'browser/applicationinsights-core-js.min.js'; return nodePaths; } exports.acquireWebNodePaths = acquireWebNodePaths; @@ -344,7 +342,7 @@ function createExternalLoaderConfig(webEndpoint, commit, quality) { return undefined; } webEndpoint = webEndpoint + `/${quality}/${commit}`; - let nodePaths = acquireWebNodePaths(); + const nodePaths = acquireWebNodePaths(); Object.keys(nodePaths).map(function (key, _) { nodePaths[key] = `${webEndpoint}/node_modules/${key}/${nodePaths[key]}`; }); diff --git a/build/lib/util.ts b/build/lib/util.ts index e1cb4e70be0..bbe6c52ef41 100644 --- a/build/lib/util.ts +++ b/build/lib/util.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as es from 'event-stream'; import _debounce = require('debounce'); import * as _filter from 'gulp-filter'; @@ -16,7 +14,6 @@ import * as _rimraf from 'rimraf'; import * as VinylFile from 'vinyl'; import { ThroughStream } from 'through'; import * as sm from 'source-map'; -import * as git from './git'; const root = path.dirname(path.dirname(__dirname)); @@ -209,8 +206,8 @@ export function loadSourcemaps(): NodeJS.ReadWriteStream { const contents = (f.contents).toString('utf8'); const reg = /\/\/# sourceMappingURL=(.*)$/g; - let lastMatch: RegExpMatchArray | null = null; - let match: RegExpMatchArray | null = null; + let lastMatch: RegExpExecArray | null = null; + let match: RegExpExecArray | null = null; while (match = reg.exec(contents)) { lastMatch = match; @@ -306,7 +303,7 @@ function _rreaddir(dirPath: string, prepend: string, result: string[]): void { } export function rreddir(dirPath: string): string[] { - let result: string[] = []; + const result: string[] = []; _rreaddir(dirPath, '', result); return result; } @@ -319,16 +316,6 @@ export function ensureDir(dirPath: string): void { fs.mkdirSync(dirPath); } -export function getVersion(root: string): string | undefined { - let version = process.env['VSCODE_DISTRO_COMMIT'] || process.env['BUILD_SOURCEVERSION']; - - if (!version || !/^[0-9a-f]{40}$/i.test(version.trim())) { - version = git.getVersion(root); - } - - return version; -} - export function rebase(count: number): NodeJS.ReadWriteStream { return rename(f => { const parts = f.dirname ? f.dirname.split(/[\/\\]/) : []; @@ -415,6 +402,13 @@ export function acquireWebNodePaths() { nodePaths[key] = entryPoint; } + // @TODO lramos15 can we make this dynamic like the rest of the node paths + // Add these paths as well for 1DS SDK dependencies. + // Not sure why given the 1DS entrypoint then requires these modules + // they are not fetched from the right location and instead are fetched from out/ + nodePaths['@microsoft/dynamicproto-js'] = 'lib/dist/umd/dynamicproto-js.min.js'; + nodePaths['@microsoft/applicationinsights-shims'] = 'dist/umd/applicationinsights-shims.min.js'; + nodePaths['@microsoft/applicationinsights-core-js'] = 'browser/applicationinsights-core-js.min.js'; return nodePaths; } @@ -423,7 +417,7 @@ export function createExternalLoaderConfig(webEndpoint?: string, commit?: string return undefined; } webEndpoint = webEndpoint + `/${quality}/${commit}`; - let nodePaths = acquireWebNodePaths(); + const nodePaths = acquireWebNodePaths(); Object.keys(nodePaths).map(function (key, _) { nodePaths[key] = `${webEndpoint}/node_modules/${key}/${nodePaths[key]}`; }); @@ -455,4 +449,3 @@ export function buildWebNodePaths(outDir: string) { result.taskName = 'build-web-node-paths'; return result; } - diff --git a/build/linux/debian/calculate-deps.js b/build/linux/debian/calculate-deps.js new file mode 100644 index 00000000000..ecdb01f541c --- /dev/null +++ b/build/linux/debian/calculate-deps.js @@ -0,0 +1,79 @@ +"use strict"; +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +Object.defineProperty(exports, "__esModule", { value: true }); +exports.generatePackageDeps = void 0; +const child_process_1 = require("child_process"); +const fs_1 = require("fs"); +const os_1 = require("os"); +const path = require("path"); +const manifests = require("../../../cgmanifest.json"); +const dep_lists_1 = require("./dep-lists"); +function generatePackageDeps(files, arch, sysroot) { + const dependencies = files.map(file => calculatePackageDeps(file, arch, sysroot)); + const additionalDepsSet = new Set(dep_lists_1.additionalDeps); + dependencies.push(additionalDepsSet); + return dependencies; +} +exports.generatePackageDeps = generatePackageDeps; +// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/debian/calculate_package_deps.py. +function calculatePackageDeps(binaryPath, arch, sysroot) { + try { + if (!((0, fs_1.statSync)(binaryPath).mode & fs_1.constants.S_IXUSR)) { + throw new Error(`Binary ${binaryPath} needs to have an executable bit set.`); + } + } + catch (e) { + // The package might not exist. Don't re-throw the error here. + console.error('Tried to stat ' + binaryPath + ' but failed.'); + } + // Get the Chromium dpkg-shlibdeps file. + const chromiumManifest = manifests.registrations.filter(registration => { + return registration.component.type === 'git' && registration.component.git.name === 'chromium'; + }); + const dpkgShlibdepsUrl = `https://raw.githubusercontent.com/chromium/chromium/${chromiumManifest[0].version}/third_party/dpkg-shlibdeps/dpkg-shlibdeps.pl`; + const dpkgShlibdepsScriptLocation = `${(0, os_1.tmpdir)()}/dpkg-shlibdeps.pl`; + const result = (0, child_process_1.spawnSync)('curl', [dpkgShlibdepsUrl, '-o', dpkgShlibdepsScriptLocation]); + if (result.status !== 0) { + throw new Error('Cannot retrieve dpkg-shlibdeps. Stderr:\n' + result.stderr); + } + const cmd = [dpkgShlibdepsScriptLocation, '--ignore-weak-undefined']; + switch (arch) { + case 'amd64': + cmd.push(`-l${sysroot}/usr/lib/x86_64-linux-gnu`, `-l${sysroot}/lib/x86_64-linux-gnu`); + break; + case 'armhf': + cmd.push(`-l${sysroot}/usr/lib/arm-linux-gnueabihf`, `-l${sysroot}/lib/arm-linux-gnueabihf`); + break; + case 'arm64': + cmd.push(`-l${sysroot}/usr/lib/aarch64-linux-gnu`, `-l${sysroot}/lib/aarch64-linux-gnu`); + break; + } + cmd.push(`-l${sysroot}/usr/lib`); + cmd.push('-O', '-e', path.resolve(binaryPath)); + const dpkgShlibdepsResult = (0, child_process_1.spawnSync)('perl', cmd, { cwd: sysroot }); + if (dpkgShlibdepsResult.status !== 0) { + throw new Error(`dpkg-shlibdeps failed with exit code ${dpkgShlibdepsResult.status}. stderr:\n${dpkgShlibdepsResult.stderr} `); + } + const shlibsDependsPrefix = 'shlibs:Depends='; + const requiresList = dpkgShlibdepsResult.stdout.toString('utf-8').trimEnd().split('\n'); + let depsStr = ''; + for (const line of requiresList) { + if (line.startsWith(shlibsDependsPrefix)) { + depsStr = line.substring(shlibsDependsPrefix.length); + } + } + // Refs https://chromium-review.googlesource.com/c/chromium/src/+/3572926 + // Chromium depends on libgcc_s, is from the package libgcc1. However, in + // Bullseye, the package was renamed to libgcc-s1. To avoid adding a dep + // on the newer package, this hack skips the dep. This is safe because + // libgcc-s1 is a dependency of libc6. This hack can be removed once + // support for Debian Buster and Ubuntu Bionic are dropped. + const filteredDeps = depsStr.split(', ').filter(dependency => { + return !dependency.startsWith('libgcc-s1'); + }).sort(); + const requires = new Set(filteredDeps); + return requires; +} diff --git a/build/linux/debian/calculate-deps.ts b/build/linux/debian/calculate-deps.ts new file mode 100644 index 00000000000..b13d3cdfaaf --- /dev/null +++ b/build/linux/debian/calculate-deps.ts @@ -0,0 +1,84 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { spawnSync } from 'child_process'; +import { constants, statSync } from 'fs'; +import { tmpdir } from 'os'; +import path = require('path'); +import * as manifests from '../../../cgmanifest.json'; +import { additionalDeps } from './dep-lists'; +import { DebianArchString } from './types'; + +export function generatePackageDeps(files: string[], arch: DebianArchString, sysroot: string): Set[] { + const dependencies: Set[] = files.map(file => calculatePackageDeps(file, arch, sysroot)); + const additionalDepsSet = new Set(additionalDeps); + dependencies.push(additionalDepsSet); + return dependencies; +} + +// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/debian/calculate_package_deps.py. +function calculatePackageDeps(binaryPath: string, arch: DebianArchString, sysroot: string): Set { + try { + if (!(statSync(binaryPath).mode & constants.S_IXUSR)) { + throw new Error(`Binary ${binaryPath} needs to have an executable bit set.`); + } + } catch (e) { + // The package might not exist. Don't re-throw the error here. + console.error('Tried to stat ' + binaryPath + ' but failed.'); + } + + // Get the Chromium dpkg-shlibdeps file. + const chromiumManifest = manifests.registrations.filter(registration => { + return registration.component.type === 'git' && registration.component.git!.name === 'chromium'; + }); + const dpkgShlibdepsUrl = `https://raw.githubusercontent.com/chromium/chromium/${chromiumManifest[0].version}/third_party/dpkg-shlibdeps/dpkg-shlibdeps.pl`; + const dpkgShlibdepsScriptLocation = `${tmpdir()}/dpkg-shlibdeps.pl`; + const result = spawnSync('curl', [dpkgShlibdepsUrl, '-o', dpkgShlibdepsScriptLocation]); + if (result.status !== 0) { + throw new Error('Cannot retrieve dpkg-shlibdeps. Stderr:\n' + result.stderr); + } + const cmd = [dpkgShlibdepsScriptLocation, '--ignore-weak-undefined']; + switch (arch) { + case 'amd64': + cmd.push(`-l${sysroot}/usr/lib/x86_64-linux-gnu`, + `-l${sysroot}/lib/x86_64-linux-gnu`); + break; + case 'armhf': + cmd.push(`-l${sysroot}/usr/lib/arm-linux-gnueabihf`, + `-l${sysroot}/lib/arm-linux-gnueabihf`); + break; + case 'arm64': + cmd.push(`-l${sysroot}/usr/lib/aarch64-linux-gnu`, + `-l${sysroot}/lib/aarch64-linux-gnu`); + break; + } + cmd.push(`-l${sysroot}/usr/lib`); + cmd.push('-O', '-e', path.resolve(binaryPath)); + + const dpkgShlibdepsResult = spawnSync('perl', cmd, { cwd: sysroot }); + if (dpkgShlibdepsResult.status !== 0) { + throw new Error(`dpkg-shlibdeps failed with exit code ${dpkgShlibdepsResult.status}. stderr:\n${dpkgShlibdepsResult.stderr} `); + } + + const shlibsDependsPrefix = 'shlibs:Depends='; + const requiresList = dpkgShlibdepsResult.stdout.toString('utf-8').trimEnd().split('\n'); + let depsStr = ''; + for (const line of requiresList) { + if (line.startsWith(shlibsDependsPrefix)) { + depsStr = line.substring(shlibsDependsPrefix.length); + } + } + // Refs https://chromium-review.googlesource.com/c/chromium/src/+/3572926 + // Chromium depends on libgcc_s, is from the package libgcc1. However, in + // Bullseye, the package was renamed to libgcc-s1. To avoid adding a dep + // on the newer package, this hack skips the dep. This is safe because + // libgcc-s1 is a dependency of libc6. This hack can be removed once + // support for Debian Buster and Ubuntu Bionic are dropped. + const filteredDeps = depsStr.split(', ').filter(dependency => { + return !dependency.startsWith('libgcc-s1'); + }).sort(); + const requires = new Set(filteredDeps); + return requires; +} diff --git a/build/linux/debian/dep-lists.js b/build/linux/debian/dep-lists.js new file mode 100644 index 00000000000..a6e2cdf1f5e --- /dev/null +++ b/build/linux/debian/dep-lists.js @@ -0,0 +1,144 @@ +"use strict"; +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +Object.defineProperty(exports, "__esModule", { value: true }); +exports.referenceGeneratedDepsByArch = exports.recommendedDeps = exports.additionalDeps = void 0; +// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/debian/additional_deps +// Additional dependencies not in the dpkg-shlibdeps output. +exports.additionalDeps = [ + 'ca-certificates', + 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', + 'libnss3 (>= 3.26)', + 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', + 'xdg-utils (>= 1.0.2)' // OS integration +]; +// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/debian/manual_recommends +// Dependencies that we can only recommend +// for now since some of the older distros don't support them. +exports.recommendedDeps = [ + 'libvulkan1' // Move to additionalDeps once support for Trusty and Jessie are dropped. +]; +exports.referenceGeneratedDepsByArch = { + 'amd64': [ + 'ca-certificates', + 'libasound2 (>= 1.0.16)', + 'libatk-bridge2.0-0 (>= 2.5.3)', + 'libatk1.0-0 (>= 2.2.0)', + 'libatspi2.0-0 (>= 2.9.90)', + 'libc6 (>= 2.14)', + 'libc6 (>= 2.17)', + 'libc6 (>= 2.2.5)', + 'libcairo2 (>= 1.6.0)', + 'libcups2 (>= 1.6.0)', + 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', + 'libdbus-1-3 (>= 1.5.12)', + 'libdrm2 (>= 2.4.38)', + 'libexpat1 (>= 2.0.1)', + 'libgbm1 (>= 8.1~0)', + 'libglib2.0-0 (>= 2.16.0)', + 'libglib2.0-0 (>= 2.39.4)', + 'libgtk-3-0 (>= 3.9.10)', + 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', + 'libnspr4 (>= 2:4.9-2~)', + 'libnss3 (>= 2:3.22)', + 'libnss3 (>= 3.26)', + 'libpango-1.0-0 (>= 1.14.0)', + 'libsecret-1-0 (>= 0.18)', + 'libx11-6', + 'libx11-6 (>= 2:1.4.99.1)', + 'libxcb1 (>= 1.9.2)', + 'libxcomposite1 (>= 1:0.4.4-1)', + 'libxdamage1 (>= 1:1.1)', + 'libxext6', + 'libxfixes3', + 'libxkbcommon0 (>= 0.4.1)', + 'libxkbfile1', + 'libxrandr2', + 'xdg-utils (>= 1.0.2)' + ], + 'armhf': [ + 'ca-certificates', + 'libasound2 (>= 1.0.16)', + 'libatk-bridge2.0-0 (>= 2.5.3)', + 'libatk1.0-0 (>= 2.2.0)', + 'libatspi2.0-0 (>= 2.9.90)', + 'libc6 (>= 2.17)', + 'libc6 (>= 2.4)', + 'libc6 (>= 2.9)', + 'libcairo2 (>= 1.6.0)', + 'libcups2 (>= 1.6.0)', + 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', + 'libdbus-1-3 (>= 1.5.12)', + 'libdrm2 (>= 2.4.38)', + 'libexpat1 (>= 2.0.1)', + 'libgbm1 (>= 8.1~0)', + 'libglib2.0-0 (>= 2.16.0)', + 'libglib2.0-0 (>= 2.39.4)', + 'libgtk-3-0 (>= 3.9.10)', + 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', + 'libnspr4 (>= 2:4.9-2~)', + 'libnss3 (>= 2:3.22)', + 'libnss3 (>= 3.26)', + 'libpango-1.0-0 (>= 1.14.0)', + 'libsecret-1-0 (>= 0.18)', + 'libstdc++6 (>= 4.1.1)', + 'libstdc++6 (>= 5)', + 'libstdc++6 (>= 5.2)', + 'libstdc++6 (>= 6)', + 'libx11-6', + 'libx11-6 (>= 2:1.4.99.1)', + 'libxcb1 (>= 1.9.2)', + 'libxcomposite1 (>= 1:0.4.4-1)', + 'libxdamage1 (>= 1:1.1)', + 'libxext6', + 'libxfixes3', + 'libxkbcommon0 (>= 0.4.1)', + 'libxkbfile1', + 'libxrandr2', + 'xdg-utils (>= 1.0.2)' + ], + 'arm64': [ + 'ca-certificates', + 'libasound2 (>= 1.0.16)', + 'libatk-bridge2.0-0 (>= 2.5.3)', + 'libatk1.0-0 (>= 2.2.0)', + 'libatspi2.0-0 (>= 2.9.90)', + 'libc6 (>= 2.17)', + 'libcairo2 (>= 1.6.0)', + 'libcups2 (>= 1.6.0)', + 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', + 'libdbus-1-3 (>= 1.0.2)', + 'libdrm2 (>= 2.4.38)', + 'libexpat1 (>= 2.0.1)', + 'libgbm1 (>= 8.1~0)', + 'libgcc1 (>= 1:3.0)', + 'libgcc1 (>= 1:4.2)', + 'libgcc1 (>= 1:4.5)', + 'libglib2.0-0 (>= 2.16.0)', + 'libglib2.0-0 (>= 2.39.4)', + 'libgtk-3-0 (>= 3.9.10)', + 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', + 'libnspr4 (>= 2:4.9-2~)', + 'libnss3 (>= 2:3.22)', + 'libnss3 (>= 3.26)', + 'libpango-1.0-0 (>= 1.14.0)', + 'libsecret-1-0 (>= 0.18)', + 'libstdc++6 (>= 4.1.1)', + 'libstdc++6 (>= 5)', + 'libstdc++6 (>= 5.2)', + 'libstdc++6 (>= 6)', + 'libx11-6', + 'libx11-6 (>= 2:1.4.99.1)', + 'libxcb1 (>= 1.9.2)', + 'libxcomposite1 (>= 1:0.4.4-1)', + 'libxdamage1 (>= 1:1.1)', + 'libxext6', + 'libxfixes3', + 'libxkbcommon0 (>= 0.4.1)', + 'libxkbfile1', + 'libxrandr2', + 'xdg-utils (>= 1.0.2)' + ] +}; diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts new file mode 100644 index 00000000000..528448a1961 --- /dev/null +++ b/build/linux/debian/dep-lists.ts @@ -0,0 +1,144 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/debian/additional_deps +// Additional dependencies not in the dpkg-shlibdeps output. +export const additionalDeps = [ + 'ca-certificates', // Make sure users have SSL certificates. + 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', + 'libnss3 (>= 3.26)', + 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', // For Breakpad crash reports. + 'xdg-utils (>= 1.0.2)' // OS integration +]; + +// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/debian/manual_recommends +// Dependencies that we can only recommend +// for now since some of the older distros don't support them. +export const recommendedDeps = [ + 'libvulkan1' // Move to additionalDeps once support for Trusty and Jessie are dropped. +]; + +export const referenceGeneratedDepsByArch = { + 'amd64': [ + 'ca-certificates', + 'libasound2 (>= 1.0.16)', + 'libatk-bridge2.0-0 (>= 2.5.3)', + 'libatk1.0-0 (>= 2.2.0)', + 'libatspi2.0-0 (>= 2.9.90)', + 'libc6 (>= 2.14)', + 'libc6 (>= 2.17)', + 'libc6 (>= 2.2.5)', + 'libcairo2 (>= 1.6.0)', + 'libcups2 (>= 1.6.0)', + 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', + 'libdbus-1-3 (>= 1.5.12)', + 'libdrm2 (>= 2.4.38)', + 'libexpat1 (>= 2.0.1)', + 'libgbm1 (>= 8.1~0)', + 'libglib2.0-0 (>= 2.16.0)', + 'libglib2.0-0 (>= 2.39.4)', + 'libgtk-3-0 (>= 3.9.10)', + 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', + 'libnspr4 (>= 2:4.9-2~)', + 'libnss3 (>= 2:3.22)', + 'libnss3 (>= 3.26)', + 'libpango-1.0-0 (>= 1.14.0)', + 'libsecret-1-0 (>= 0.18)', + 'libx11-6', + 'libx11-6 (>= 2:1.4.99.1)', + 'libxcb1 (>= 1.9.2)', + 'libxcomposite1 (>= 1:0.4.4-1)', + 'libxdamage1 (>= 1:1.1)', + 'libxext6', + 'libxfixes3', + 'libxkbcommon0 (>= 0.4.1)', + 'libxkbfile1', + 'libxrandr2', + 'xdg-utils (>= 1.0.2)' + ], + 'armhf': [ + 'ca-certificates', + 'libasound2 (>= 1.0.16)', + 'libatk-bridge2.0-0 (>= 2.5.3)', + 'libatk1.0-0 (>= 2.2.0)', + 'libatspi2.0-0 (>= 2.9.90)', + 'libc6 (>= 2.17)', + 'libc6 (>= 2.4)', + 'libc6 (>= 2.9)', + 'libcairo2 (>= 1.6.0)', + 'libcups2 (>= 1.6.0)', + 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', + 'libdbus-1-3 (>= 1.5.12)', + 'libdrm2 (>= 2.4.38)', + 'libexpat1 (>= 2.0.1)', + 'libgbm1 (>= 8.1~0)', + 'libglib2.0-0 (>= 2.16.0)', + 'libglib2.0-0 (>= 2.39.4)', + 'libgtk-3-0 (>= 3.9.10)', + 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', + 'libnspr4 (>= 2:4.9-2~)', + 'libnss3 (>= 2:3.22)', + 'libnss3 (>= 3.26)', + 'libpango-1.0-0 (>= 1.14.0)', + 'libsecret-1-0 (>= 0.18)', + 'libstdc++6 (>= 4.1.1)', + 'libstdc++6 (>= 5)', + 'libstdc++6 (>= 5.2)', + 'libstdc++6 (>= 6)', + 'libx11-6', + 'libx11-6 (>= 2:1.4.99.1)', + 'libxcb1 (>= 1.9.2)', + 'libxcomposite1 (>= 1:0.4.4-1)', + 'libxdamage1 (>= 1:1.1)', + 'libxext6', + 'libxfixes3', + 'libxkbcommon0 (>= 0.4.1)', + 'libxkbfile1', + 'libxrandr2', + 'xdg-utils (>= 1.0.2)' + ], + 'arm64': [ + 'ca-certificates', + 'libasound2 (>= 1.0.16)', + 'libatk-bridge2.0-0 (>= 2.5.3)', + 'libatk1.0-0 (>= 2.2.0)', + 'libatspi2.0-0 (>= 2.9.90)', + 'libc6 (>= 2.17)', + 'libcairo2 (>= 1.6.0)', + 'libcups2 (>= 1.6.0)', + 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', + 'libdbus-1-3 (>= 1.0.2)', + 'libdrm2 (>= 2.4.38)', + 'libexpat1 (>= 2.0.1)', + 'libgbm1 (>= 8.1~0)', + 'libgcc1 (>= 1:3.0)', + 'libgcc1 (>= 1:4.2)', + 'libgcc1 (>= 1:4.5)', + 'libglib2.0-0 (>= 2.16.0)', + 'libglib2.0-0 (>= 2.39.4)', + 'libgtk-3-0 (>= 3.9.10)', + 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', + 'libnspr4 (>= 2:4.9-2~)', + 'libnss3 (>= 2:3.22)', + 'libnss3 (>= 3.26)', + 'libpango-1.0-0 (>= 1.14.0)', + 'libsecret-1-0 (>= 0.18)', + 'libstdc++6 (>= 4.1.1)', + 'libstdc++6 (>= 5)', + 'libstdc++6 (>= 5.2)', + 'libstdc++6 (>= 6)', + 'libx11-6', + 'libx11-6 (>= 2:1.4.99.1)', + 'libxcb1 (>= 1.9.2)', + 'libxcomposite1 (>= 1:0.4.4-1)', + 'libxdamage1 (>= 1:1.1)', + 'libxext6', + 'libxfixes3', + 'libxkbcommon0 (>= 0.4.1)', + 'libxkbfile1', + 'libxrandr2', + 'xdg-utils (>= 1.0.2)' + ] +}; diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js new file mode 100644 index 00000000000..2eaec091873 --- /dev/null +++ b/build/linux/debian/install-sysroot.js @@ -0,0 +1,89 @@ +"use strict"; +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +Object.defineProperty(exports, "__esModule", { value: true }); +exports.getSysroot = void 0; +const child_process_1 = require("child_process"); +const crypto_1 = require("crypto"); +const os_1 = require("os"); +const fs = require("fs"); +const https = require("https"); +const path = require("path"); +const util = require("../../lib/util"); +// Based on https://source.chromium.org/chromium/chromium/src/+/main:build/linux/sysroot_scripts/install-sysroot.py. +const URL_PREFIX = 'https://msftelectron.blob.core.windows.net'; +const URL_PATH = 'sysroots/toolchain'; +function getSha(filename) { + const hash = (0, crypto_1.createHash)('sha1'); + // Read file 1 MB at a time + const fd = fs.openSync(filename, 'r'); + const buffer = Buffer.alloc(1024 * 1024); + let position = 0; + let bytesRead = 0; + while ((bytesRead = fs.readSync(fd, buffer, 0, buffer.length, position)) === buffer.length) { + hash.update(buffer); + position += bytesRead; + } + hash.update(buffer.slice(0, bytesRead)); + return hash.digest('hex'); +} +async function getSysroot(arch) { + const sysrootJSONUrl = `https://raw.githubusercontent.com/electron/electron/v${util.getElectronVersion()}/script/sysroots.json`; + const sysrootDictLocation = `${(0, os_1.tmpdir)()}/sysroots.json`; + const result = (0, child_process_1.spawnSync)('curl', [sysrootJSONUrl, '-o', sysrootDictLocation]); + if (result.status !== 0) { + throw new Error('Cannot retrieve sysroots.json. Stderr:\n' + result.stderr); + } + const sysrootInfo = require(sysrootDictLocation); + const sysrootArch = arch === 'armhf' ? 'bullseye_arm' : `bullseye_${arch}`; + const sysrootDict = sysrootInfo[sysrootArch]; + const tarballFilename = sysrootDict['Tarball']; + const tarballSha = sysrootDict['Sha1Sum']; + const sysroot = path.join((0, os_1.tmpdir)(), sysrootDict['SysrootDir']); + const url = [URL_PREFIX, URL_PATH, tarballSha, tarballFilename].join('/'); + const stamp = path.join(sysroot, '.stamp'); + if (fs.existsSync(stamp) && fs.readFileSync(stamp).toString() === url) { + return sysroot; + } + console.log(`Installing Debian ${arch} root image: ${sysroot}`); + fs.rmSync(sysroot, { recursive: true, force: true }); + fs.mkdirSync(sysroot); + const tarball = path.join(sysroot, tarballFilename); + console.log(`Downloading ${url}`); + let downloadSuccess = false; + for (let i = 0; i < 3 && !downloadSuccess; i++) { + fs.writeFileSync(tarball, ''); + await new Promise((c) => { + https.get(url, (res) => { + res.on('data', (chunk) => { + fs.appendFileSync(tarball, chunk); + }); + res.on('end', () => { + downloadSuccess = true; + c(); + }); + }).on('error', (err) => { + console.error('Encountered an error during the download attempt: ' + err.message); + c(); + }); + }); + } + if (!downloadSuccess) { + fs.rmSync(tarball); + throw new Error('Failed to download ' + url); + } + const sha = getSha(tarball); + if (sha !== tarballSha) { + throw new Error(`Tarball sha1sum is wrong. Expected ${tarballSha}, actual ${sha}`); + } + const proc = (0, child_process_1.spawnSync)('tar', ['xf', tarball, '-C', sysroot]); + if (proc.status) { + throw new Error('Tarball extraction failed with code ' + proc.status); + } + fs.rmSync(tarball); + fs.writeFileSync(stamp, url); + return sysroot; +} +exports.getSysroot = getSysroot; diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts new file mode 100644 index 00000000000..ac9de5b8578 --- /dev/null +++ b/build/linux/debian/install-sysroot.ts @@ -0,0 +1,98 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { spawnSync } from 'child_process'; +import { createHash } from 'crypto'; +import { tmpdir } from 'os'; +import * as fs from 'fs'; +import * as https from 'https'; +import * as path from 'path'; +import { DebianArchString } from './types'; +import * as util from '../../lib/util'; + +// Based on https://source.chromium.org/chromium/chromium/src/+/main:build/linux/sysroot_scripts/install-sysroot.py. +const URL_PREFIX = 'https://msftelectron.blob.core.windows.net'; +const URL_PATH = 'sysroots/toolchain'; + +function getSha(filename: fs.PathLike): string { + const hash = createHash('sha1'); + // Read file 1 MB at a time + const fd = fs.openSync(filename, 'r'); + const buffer = Buffer.alloc(1024 * 1024); + let position = 0; + let bytesRead = 0; + while ((bytesRead = fs.readSync(fd, buffer, 0, buffer.length, position)) === buffer.length) { + hash.update(buffer); + position += bytesRead; + } + hash.update(buffer.slice(0, bytesRead)); + return hash.digest('hex'); +} + +type SysrootDictEntry = { + Sha1Sum: string; + SysrootDir: string; + Tarball: string; +}; + +export async function getSysroot(arch: DebianArchString): Promise { + const sysrootJSONUrl = `https://raw.githubusercontent.com/electron/electron/v${util.getElectronVersion()}/script/sysroots.json`; + const sysrootDictLocation = `${tmpdir()}/sysroots.json`; + const result = spawnSync('curl', [sysrootJSONUrl, '-o', sysrootDictLocation]); + if (result.status !== 0) { + throw new Error('Cannot retrieve sysroots.json. Stderr:\n' + result.stderr); + } + const sysrootInfo = require(sysrootDictLocation); + const sysrootArch = arch === 'armhf' ? 'bullseye_arm' : `bullseye_${arch}`; + const sysrootDict: SysrootDictEntry = sysrootInfo[sysrootArch]; + const tarballFilename = sysrootDict['Tarball']; + const tarballSha = sysrootDict['Sha1Sum']; + const sysroot = path.join(tmpdir(), sysrootDict['SysrootDir']); + const url = [URL_PREFIX, URL_PATH, tarballSha, tarballFilename].join('/'); + const stamp = path.join(sysroot, '.stamp'); + if (fs.existsSync(stamp) && fs.readFileSync(stamp).toString() === url) { + return sysroot; + } + + console.log(`Installing Debian ${arch} root image: ${sysroot}`); + fs.rmSync(sysroot, { recursive: true, force: true }); + fs.mkdirSync(sysroot); + const tarball = path.join(sysroot, tarballFilename); + console.log(`Downloading ${url}`); + let downloadSuccess = false; + for (let i = 0; i < 3 && !downloadSuccess; i++) { + fs.writeFileSync(tarball, ''); + await new Promise((c) => { + https.get(url, (res) => { + res.on('data', (chunk) => { + fs.appendFileSync(tarball, chunk); + }); + res.on('end', () => { + downloadSuccess = true; + c(); + }); + }).on('error', (err) => { + console.error('Encountered an error during the download attempt: ' + err.message); + c(); + }); + }); + } + if (!downloadSuccess) { + fs.rmSync(tarball); + throw new Error('Failed to download ' + url); + } + const sha = getSha(tarball); + if (sha !== tarballSha) { + throw new Error(`Tarball sha1sum is wrong. Expected ${tarballSha}, actual ${sha}`); + } + + const proc = spawnSync('tar', ['xf', tarball, '-C', sysroot]); + if (proc.status) { + throw new Error('Tarball extraction failed with code ' + proc.status); + } + fs.rmSync(tarball); + fs.writeFileSync(stamp, url); + return sysroot; +} diff --git a/extensions/vscode-notebook-tests/test/customRenderer.vsctestnb b/build/linux/debian/types.js similarity index 58% rename from extensions/vscode-notebook-tests/test/customRenderer.vsctestnb rename to build/linux/debian/types.js index a4a092d8349..93c92aac9c6 100644 --- a/extensions/vscode-notebook-tests/test/customRenderer.vsctestnb +++ b/build/linux/debian/types.js @@ -1,4 +1,11 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +Object.defineProperty(exports, "__esModule", { value: true }); +exports.isDebianArchString = void 0; +function isDebianArchString(s) { + return ['amd64', 'armhf', 'arm64'].includes(s); +} +exports.isDebianArchString = isDebianArchString; diff --git a/build/linux/debian/types.ts b/build/linux/debian/types.ts new file mode 100644 index 00000000000..e97485ef128 --- /dev/null +++ b/build/linux/debian/types.ts @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +export type DebianArchString = 'amd64' | 'armhf' | 'arm64'; + +export function isDebianArchString(s: string): s is DebianArchString { + return ['amd64', 'armhf', 'arm64'].includes(s); +} diff --git a/build/linux/rpm/dependencies-generator.js b/build/linux/dependencies-generator.js similarity index 57% rename from build/linux/rpm/dependencies-generator.js rename to build/linux/dependencies-generator.js index 1d91eb8de78..af20828097e 100644 --- a/build/linux/rpm/dependencies-generator.js +++ b/build/linux/dependencies-generator.js @@ -6,18 +6,45 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.getDependencies = void 0; const child_process_1 = require("child_process"); -const fs_1 = require("fs"); const path = require("path"); -const dep_lists_1 = require("./dep-lists"); +const calculate_deps_1 = require("./debian/calculate-deps"); +const calculate_deps_2 = require("./rpm/calculate-deps"); +const dep_lists_1 = require("./debian/dep-lists"); +const dep_lists_2 = require("./rpm/dep-lists"); +const types_1 = require("./debian/types"); +const types_2 = require("./rpm/types"); // A flag that can easily be toggled. // Make sure to compile the build directory after toggling the value. // If false, we warn about new dependencies if they show up -// while running the rpm prepare package task for a release. +// while running the prepare package tasks for a release. // If true, we fail the build if there are new dependencies found during that task. // The reference dependencies, which one has to update when the new dependencies // are valid, are in dep-lists.ts const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true; -function getDependencies(buildDir, applicationName, arch) { +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/98.0.4758.109:chrome/installer/linux/BUILD.gn;l=64-80 +// and the Linux Archive build +// Shared library dependencies that we already bundle. +const bundledDeps = [ + 'libEGL.so', + 'libGLESv2.so', + 'libvulkan.so.1', + 'swiftshader_libEGL.so', + 'swiftshader_libGLESv2.so', + 'libvk_swiftshader.so', + 'libffmpeg.so' +]; +function getDependencies(packageType, buildDir, applicationName, arch, sysroot) { + if (packageType === 'deb') { + if (!(0, types_1.isDebianArchString)(arch)) { + throw new Error('Invalid Debian arch string ' + arch); + } + if (!sysroot) { + throw new Error('Missing sysroot parameter'); + } + } + if (packageType === 'rpm' && !(0, types_2.isRpmArchString)(arch)) { + throw new Error('Invalid RPM arch string ' + arch); + } // Get the files for which we want to find dependencies. const nativeModulesPath = path.join(buildDir, 'resources', 'app', 'node_modules.asar.unpacked'); const findResult = (0, child_process_1.spawnSync)('find', [nativeModulesPath, '-name', '*.node']); @@ -33,26 +60,22 @@ function getDependencies(buildDir, applicationName, arch) { files.push(path.join(buildDir, 'chrome-sandbox')); files.push(path.join(buildDir, 'chrome_crashpad_handler')); // Generate the dependencies. - const dependencies = files.map((file) => calculatePackageDeps(file)); - // Add additional dependencies. - const additionalDepsSet = new Set(dep_lists_1.additionalDeps); - dependencies.push(additionalDepsSet); + const dependencies = packageType === 'deb' ? + (0, calculate_deps_1.generatePackageDeps)(files, arch, sysroot) : + (0, calculate_deps_2.generatePackageDeps)(files); // Merge all the dependencies. const mergedDependencies = mergePackageDeps(dependencies); - let sortedDependencies = []; - for (const dependency of mergedDependencies) { - sortedDependencies.push(dependency); - } - sortedDependencies.sort(); - // Exclude bundled dependencies - sortedDependencies = sortedDependencies.filter(dependency => { - return !dep_lists_1.bundledDeps.some(bundledDep => dependency.startsWith(bundledDep)); - }); - const referenceGeneratedDeps = dep_lists_1.referenceGeneratedDepsByArch[arch]; + // Exclude bundled dependencies and sort + const sortedDependencies = Array.from(mergedDependencies).filter(dependency => { + return !bundledDeps.some(bundledDep => dependency.startsWith(bundledDep)); + }).sort(); + const referenceGeneratedDeps = packageType === 'deb' ? + dep_lists_1.referenceGeneratedDepsByArch[arch] : + dep_lists_2.referenceGeneratedDepsByArch[arch]; if (JSON.stringify(sortedDependencies) !== JSON.stringify(referenceGeneratedDeps)) { - const failMessage = 'The dependencies list has changed. ' - + 'Printing newer dependencies list that one can use to compare against referenceGeneratedDeps:\n' - + sortedDependencies.join('\n'); + const failMessage = 'The dependencies list has changed.' + + '\nOld:\n' + referenceGeneratedDeps.join('\n') + + '\nNew:\n' + sortedDependencies.join('\n'); if (FAIL_BUILD_FOR_NEW_DEPENDENCIES) { throw new Error(failMessage); } @@ -63,25 +86,7 @@ function getDependencies(buildDir, applicationName, arch) { return sortedDependencies; } exports.getDependencies = getDependencies; -// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/calculate_package_deps.py. -function calculatePackageDeps(binaryPath) { - try { - if (!((0, fs_1.statSync)(binaryPath).mode & fs_1.constants.S_IXUSR)) { - throw new Error(`Binary ${binaryPath} needs to have an executable bit set.`); - } - } - catch (e) { - // The package might not exist. Don't re-throw the error here. - console.error('Tried to stat ' + binaryPath + ' but failed.'); - } - const findRequiresResult = (0, child_process_1.spawnSync)('/usr/lib/rpm/find-requires', { input: binaryPath + '\n' }); - if (findRequiresResult.status !== 0) { - throw new Error(`find-requires failed with exit code ${findRequiresResult.status}.\nstderr: ${findRequiresResult.stderr}`); - } - const requires = new Set(findRequiresResult.stdout.toString('utf-8').trimEnd().split('\n')); - return requires; -} -// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/merge_package_deps.py +// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/merge_package_deps.py. function mergePackageDeps(inputDeps) { const requires = new Set(); for (const depSet of inputDeps) { diff --git a/build/linux/rpm/dependencies-generator.ts b/build/linux/dependencies-generator.ts similarity index 55% rename from build/linux/rpm/dependencies-generator.ts rename to build/linux/dependencies-generator.ts index 95953ecaa24..34573c4ac12 100644 --- a/build/linux/rpm/dependencies-generator.ts +++ b/build/linux/dependencies-generator.ts @@ -6,21 +6,49 @@ 'use strict'; import { spawnSync } from 'child_process'; -import { constants, statSync } from 'fs'; import path = require('path'); -import { additionalDeps, bundledDeps, referenceGeneratedDepsByArch } from './dep-lists'; -import { ArchString } from './types'; +import { generatePackageDeps as generatePackageDepsDebian } from './debian/calculate-deps'; +import { generatePackageDeps as generatePackageDepsRpm } from './rpm/calculate-deps'; +import { referenceGeneratedDepsByArch as debianGeneratedDeps } from './debian/dep-lists'; +import { referenceGeneratedDepsByArch as rpmGeneratedDeps } from './rpm/dep-lists'; +import { DebianArchString, isDebianArchString } from './debian/types'; +import { isRpmArchString, RpmArchString } from './rpm/types'; // A flag that can easily be toggled. // Make sure to compile the build directory after toggling the value. // If false, we warn about new dependencies if they show up -// while running the rpm prepare package task for a release. +// while running the prepare package tasks for a release. // If true, we fail the build if there are new dependencies found during that task. // The reference dependencies, which one has to update when the new dependencies // are valid, are in dep-lists.ts const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true; -export function getDependencies(buildDir: string, applicationName: string, arch: ArchString): string[] { +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/98.0.4758.109:chrome/installer/linux/BUILD.gn;l=64-80 +// and the Linux Archive build +// Shared library dependencies that we already bundle. +const bundledDeps = [ + 'libEGL.so', + 'libGLESv2.so', + 'libvulkan.so.1', + 'swiftshader_libEGL.so', + 'swiftshader_libGLESv2.so', + 'libvk_swiftshader.so', + 'libffmpeg.so' +]; + +export function getDependencies(packageType: 'deb' | 'rpm', buildDir: string, applicationName: string, arch: string, sysroot?: string): string[] { + if (packageType === 'deb') { + if (!isDebianArchString(arch)) { + throw new Error('Invalid Debian arch string ' + arch); + } + if (!sysroot) { + throw new Error('Missing sysroot parameter'); + } + } + if (packageType === 'rpm' && !isRpmArchString(arch)) { + throw new Error('Invalid RPM arch string ' + arch); + } + // Get the files for which we want to find dependencies. const nativeModulesPath = path.join(buildDir, 'resources', 'app', 'node_modules.asar.unpacked'); const findResult = spawnSync('find', [nativeModulesPath, '-name', '*.node']); @@ -40,30 +68,25 @@ export function getDependencies(buildDir: string, applicationName: string, arch: files.push(path.join(buildDir, 'chrome_crashpad_handler')); // Generate the dependencies. - const dependencies: Set[] = files.map((file) => calculatePackageDeps(file)); - - // Add additional dependencies. - const additionalDepsSet = new Set(additionalDeps); - dependencies.push(additionalDepsSet); + const dependencies = packageType === 'deb' ? + generatePackageDepsDebian(files, arch as DebianArchString, sysroot!) : + generatePackageDepsRpm(files); // Merge all the dependencies. const mergedDependencies = mergePackageDeps(dependencies); - let sortedDependencies: string[] = []; - for (const dependency of mergedDependencies) { - sortedDependencies.push(dependency); - } - sortedDependencies.sort(); - // Exclude bundled dependencies - sortedDependencies = sortedDependencies.filter(dependency => { + // Exclude bundled dependencies and sort + const sortedDependencies: string[] = Array.from(mergedDependencies).filter(dependency => { return !bundledDeps.some(bundledDep => dependency.startsWith(bundledDep)); - }); + }).sort(); - const referenceGeneratedDeps = referenceGeneratedDepsByArch[arch]; + const referenceGeneratedDeps = packageType === 'deb' ? + debianGeneratedDeps[arch as DebianArchString] : + rpmGeneratedDeps[arch as RpmArchString]; if (JSON.stringify(sortedDependencies) !== JSON.stringify(referenceGeneratedDeps)) { - const failMessage = 'The dependencies list has changed. ' - + 'Printing newer dependencies list that one can use to compare against referenceGeneratedDeps:\n' - + sortedDependencies.join('\n'); + const failMessage = 'The dependencies list has changed.' + + '\nOld:\n' + referenceGeneratedDeps.join('\n') + + '\nNew:\n' + sortedDependencies.join('\n'); if (FAIL_BUILD_FOR_NEW_DEPENDENCIES) { throw new Error(failMessage); } else { @@ -74,27 +97,8 @@ export function getDependencies(buildDir: string, applicationName: string, arch: return sortedDependencies; } -// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/calculate_package_deps.py. -function calculatePackageDeps(binaryPath: string): Set { - try { - if (!(statSync(binaryPath).mode & constants.S_IXUSR)) { - throw new Error(`Binary ${binaryPath} needs to have an executable bit set.`); - } - } catch (e) { - // The package might not exist. Don't re-throw the error here. - console.error('Tried to stat ' + binaryPath + ' but failed.'); - } - const findRequiresResult = spawnSync('/usr/lib/rpm/find-requires', { input: binaryPath + '\n' }); - if (findRequiresResult.status !== 0) { - throw new Error(`find-requires failed with exit code ${findRequiresResult.status}.\nstderr: ${findRequiresResult.stderr}`); - } - - const requires = new Set(findRequiresResult.stdout.toString('utf-8').trimEnd().split('\n')); - return requires; -} - -// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/merge_package_deps.py +// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/merge_package_deps.py. function mergePackageDeps(inputDeps: Set[]): Set { const requires = new Set(); for (const depSet of inputDeps) { diff --git a/build/linux/libcxx-fetcher.js b/build/linux/libcxx-fetcher.js index 52606aba169..64c7706ff62 100644 --- a/build/linux/libcxx-fetcher.js +++ b/build/linux/libcxx-fetcher.js @@ -1,11 +1,11 @@ +"use strict"; /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -// Can be removed once https://github.com/electron/electron-rebuild/pull/703 is available. -'use strict'; Object.defineProperty(exports, "__esModule", { value: true }); exports.downloadLibcxxObjects = exports.downloadLibcxxHeaders = void 0; +// Can be removed once https://github.com/electron/electron-rebuild/pull/703 is available. const debug = require("debug"); const extract = require("extract-zip"); const fs = require("fs-extra"); diff --git a/build/linux/libcxx-fetcher.ts b/build/linux/libcxx-fetcher.ts index 0e8f5ade255..a9b97a0d9a6 100644 --- a/build/linux/libcxx-fetcher.ts +++ b/build/linux/libcxx-fetcher.ts @@ -5,8 +5,6 @@ // Can be removed once https://github.com/electron/electron-rebuild/pull/703 is available. -'use strict'; - import * as debug from 'debug'; import * as extract from 'extract-zip'; import * as fs from 'fs-extra'; diff --git a/build/linux/rpm/calculate-deps.js b/build/linux/rpm/calculate-deps.js new file mode 100644 index 00000000000..325fc9694c3 --- /dev/null +++ b/build/linux/rpm/calculate-deps.js @@ -0,0 +1,35 @@ +"use strict"; +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +Object.defineProperty(exports, "__esModule", { value: true }); +exports.generatePackageDeps = void 0; +const child_process_1 = require("child_process"); +const fs_1 = require("fs"); +const dep_lists_1 = require("./dep-lists"); +function generatePackageDeps(files) { + const dependencies = files.map(file => calculatePackageDeps(file)); + const additionalDepsSet = new Set(dep_lists_1.additionalDeps); + dependencies.push(additionalDepsSet); + return dependencies; +} +exports.generatePackageDeps = generatePackageDeps; +// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/calculate_package_deps.py. +function calculatePackageDeps(binaryPath) { + try { + if (!((0, fs_1.statSync)(binaryPath).mode & fs_1.constants.S_IXUSR)) { + throw new Error(`Binary ${binaryPath} needs to have an executable bit set.`); + } + } + catch (e) { + // The package might not exist. Don't re-throw the error here. + console.error('Tried to stat ' + binaryPath + ' but failed.'); + } + const findRequiresResult = (0, child_process_1.spawnSync)('/usr/lib/rpm/find-requires', { input: binaryPath + '\n' }); + if (findRequiresResult.status !== 0) { + throw new Error(`find-requires failed with exit code ${findRequiresResult.status}.\nstderr: ${findRequiresResult.stderr}`); + } + const requires = new Set(findRequiresResult.stdout.toString('utf-8').trimEnd().split('\n')); + return requires; +} diff --git a/build/linux/rpm/calculate-deps.ts b/build/linux/rpm/calculate-deps.ts new file mode 100644 index 00000000000..4be2200c018 --- /dev/null +++ b/build/linux/rpm/calculate-deps.ts @@ -0,0 +1,35 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { spawnSync } from 'child_process'; +import { constants, statSync } from 'fs'; +import { additionalDeps } from './dep-lists'; + +export function generatePackageDeps(files: string[]): Set[] { + const dependencies: Set[] = files.map(file => calculatePackageDeps(file)); + const additionalDepsSet = new Set(additionalDeps); + dependencies.push(additionalDepsSet); + return dependencies; +} + +// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/calculate_package_deps.py. +function calculatePackageDeps(binaryPath: string): Set { + try { + if (!(statSync(binaryPath).mode & constants.S_IXUSR)) { + throw new Error(`Binary ${binaryPath} needs to have an executable bit set.`); + } + } catch (e) { + // The package might not exist. Don't re-throw the error here. + console.error('Tried to stat ' + binaryPath + ' but failed.'); + } + + const findRequiresResult = spawnSync('/usr/lib/rpm/find-requires', { input: binaryPath + '\n' }); + if (findRequiresResult.status !== 0) { + throw new Error(`find-requires failed with exit code ${findRequiresResult.status}.\nstderr: ${findRequiresResult.stderr}`); + } + + const requires = new Set(findRequiresResult.stdout.toString('utf-8').trimEnd().split('\n')); + return requires; +} diff --git a/build/linux/rpm/dep-lists.js b/build/linux/rpm/dep-lists.js index 99064a1f7e6..2339e3703b6 100644 --- a/build/linux/rpm/dep-lists.js +++ b/build/linux/rpm/dep-lists.js @@ -4,7 +4,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ Object.defineProperty(exports, "__esModule", { value: true }); -exports.referenceGeneratedDepsByArch = exports.bundledDeps = exports.additionalDeps = void 0; +exports.referenceGeneratedDepsByArch = exports.additionalDeps = void 0; // Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/additional_deps // Additional dependencies not in the rpm find-requires output. exports.additionalDeps = [ @@ -17,18 +17,6 @@ exports.additionalDeps = [ 'libcurl.so.4()(64bit)', 'xdg-utils' // OS integration ]; -// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/98.0.4758.109:chrome/installer/linux/BUILD.gn;l=64-80 -// and the Linux Archive build -// Shared library dependencies that we already bundle. -exports.bundledDeps = [ - 'libEGL.so', - 'libGLESv2.so', - 'libvulkan.so.1', - 'swiftshader_libEGL.so', - 'swiftshader_libGLESv2.so', - 'libvk_swiftshader.so', - 'libffmpeg.so' -]; exports.referenceGeneratedDepsByArch = { 'x86_64': [ 'ca-certificates', @@ -65,6 +53,7 @@ exports.referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.8)(64bit)', 'libc.so.6(GLIBC_2.9)(64bit)', 'libcairo.so.2()(64bit)', + 'libcups.so.2()(64bit)', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3()(64bit)', 'libdl.so.2()(64bit)', @@ -74,10 +63,8 @@ exports.referenceGeneratedDepsByArch = { 'libgbm.so.1()(64bit)', 'libgcc_s.so.1()(64bit)', 'libgcc_s.so.1(GCC_3.0)(64bit)', - 'libgdk_pixbuf-2.0.so.0()(64bit)', 'libgio-2.0.so.0()(64bit)', 'libglib-2.0.so.0()(64bit)', - 'libgmodule-2.0.so.0()(64bit)', 'libgobject-2.0.so.0()(64bit)', 'libgtk-3.so.0()(64bit)', 'libm.so.6()(64bit)', @@ -147,6 +134,7 @@ exports.referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.8)', 'libc.so.6(GLIBC_2.9)', 'libcairo.so.2', + 'libcups.so.2', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3', 'libdl.so.2', @@ -158,10 +146,8 @@ exports.referenceGeneratedDepsByArch = { 'libgcc_s.so.1(GCC_3.0)', 'libgcc_s.so.1(GCC_3.4)', 'libgcc_s.so.1(GCC_3.5)', - 'libgdk_pixbuf-2.0.so.0', 'libgio-2.0.so.0', 'libglib-2.0.so.0', - 'libgmodule-2.0.so.0', 'libgobject-2.0.so.0', 'libgtk-3.so.0', 'libgtk-3.so.0()(64bit)', @@ -237,6 +223,7 @@ exports.referenceGeneratedDepsByArch = { 'libc.so.6()(64bit)', 'libc.so.6(GLIBC_2.17)(64bit)', 'libcairo.so.2()(64bit)', + 'libcups.so.2()(64bit)', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3()(64bit)', 'libdbus-1.so.3(LIBDBUS_1_3)(64bit)', @@ -249,10 +236,8 @@ exports.referenceGeneratedDepsByArch = { 'libgcc_s.so.1(GCC_3.0)(64bit)', 'libgcc_s.so.1(GCC_4.2.0)(64bit)', 'libgcc_s.so.1(GCC_4.5.0)(64bit)', - 'libgdk_pixbuf-2.0.so.0()(64bit)', 'libgio-2.0.so.0()(64bit)', 'libglib-2.0.so.0()(64bit)', - 'libgmodule-2.0.so.0()(64bit)', 'libgobject-2.0.so.0()(64bit)', 'libgtk-3.so.0()(64bit)', 'libm.so.6()(64bit)', diff --git a/build/linux/rpm/dep-lists.ts b/build/linux/rpm/dep-lists.ts index 524cc0d7edd..7df703fa060 100644 --- a/build/linux/rpm/dep-lists.ts +++ b/build/linux/rpm/dep-lists.ts @@ -16,19 +16,6 @@ export const additionalDeps = [ 'xdg-utils' // OS integration ]; -// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/98.0.4758.109:chrome/installer/linux/BUILD.gn;l=64-80 -// and the Linux Archive build -// Shared library dependencies that we already bundle. -export const bundledDeps = [ - 'libEGL.so', - 'libGLESv2.so', - 'libvulkan.so.1', - 'swiftshader_libEGL.so', - 'swiftshader_libGLESv2.so', - 'libvk_swiftshader.so', - 'libffmpeg.so' -]; - export const referenceGeneratedDepsByArch = { 'x86_64': [ 'ca-certificates', @@ -65,6 +52,7 @@ export const referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.8)(64bit)', 'libc.so.6(GLIBC_2.9)(64bit)', 'libcairo.so.2()(64bit)', + 'libcups.so.2()(64bit)', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3()(64bit)', 'libdl.so.2()(64bit)', @@ -74,10 +62,8 @@ export const referenceGeneratedDepsByArch = { 'libgbm.so.1()(64bit)', 'libgcc_s.so.1()(64bit)', 'libgcc_s.so.1(GCC_3.0)(64bit)', - 'libgdk_pixbuf-2.0.so.0()(64bit)', 'libgio-2.0.so.0()(64bit)', 'libglib-2.0.so.0()(64bit)', - 'libgmodule-2.0.so.0()(64bit)', 'libgobject-2.0.so.0()(64bit)', 'libgtk-3.so.0()(64bit)', 'libm.so.6()(64bit)', @@ -147,6 +133,7 @@ export const referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.8)', 'libc.so.6(GLIBC_2.9)', 'libcairo.so.2', + 'libcups.so.2', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3', 'libdl.so.2', @@ -158,10 +145,8 @@ export const referenceGeneratedDepsByArch = { 'libgcc_s.so.1(GCC_3.0)', 'libgcc_s.so.1(GCC_3.4)', 'libgcc_s.so.1(GCC_3.5)', - 'libgdk_pixbuf-2.0.so.0', 'libgio-2.0.so.0', 'libglib-2.0.so.0', - 'libgmodule-2.0.so.0', 'libgobject-2.0.so.0', 'libgtk-3.so.0', 'libgtk-3.so.0()(64bit)', @@ -237,6 +222,7 @@ export const referenceGeneratedDepsByArch = { 'libc.so.6()(64bit)', 'libc.so.6(GLIBC_2.17)(64bit)', 'libcairo.so.2()(64bit)', + 'libcups.so.2()(64bit)', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3()(64bit)', 'libdbus-1.so.3(LIBDBUS_1_3)(64bit)', @@ -249,10 +235,8 @@ export const referenceGeneratedDepsByArch = { 'libgcc_s.so.1(GCC_3.0)(64bit)', 'libgcc_s.so.1(GCC_4.2.0)(64bit)', 'libgcc_s.so.1(GCC_4.5.0)(64bit)', - 'libgdk_pixbuf-2.0.so.0()(64bit)', 'libgio-2.0.so.0()(64bit)', 'libglib-2.0.so.0()(64bit)', - 'libgmodule-2.0.so.0()(64bit)', 'libgobject-2.0.so.0()(64bit)', 'libgtk-3.so.0()(64bit)', 'libm.so.6()(64bit)', diff --git a/build/linux/rpm/types.js b/build/linux/rpm/types.js index 56d4e6c56ce..9e140325075 100644 --- a/build/linux/rpm/types.js +++ b/build/linux/rpm/types.js @@ -4,3 +4,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ Object.defineProperty(exports, "__esModule", { value: true }); +exports.isRpmArchString = void 0; +function isRpmArchString(s) { + return ['x86_64', 'armv7hl', 'aarch64'].includes(s); +} +exports.isRpmArchString = isRpmArchString; diff --git a/build/linux/rpm/types.ts b/build/linux/rpm/types.ts index 84330949d1d..c6a01da1cf5 100644 --- a/build/linux/rpm/types.ts +++ b/build/linux/rpm/types.ts @@ -3,4 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -export type ArchString = 'x86_64' | 'armv7hl' | 'aarch64'; +export type RpmArchString = 'x86_64' | 'armv7hl' | 'aarch64'; + +export function isRpmArchString(s: string): s is RpmArchString { + return ['x86_64', 'armv7hl', 'aarch64'].includes(s); +} diff --git a/build/monaco/monaco.d.ts.recipe b/build/monaco/monaco.d.ts.recipe index 5ca6a6005a4..f48942bf3e5 100644 --- a/build/monaco/monaco.d.ts.recipe +++ b/build/monaco/monaco.d.ts.recipe @@ -43,7 +43,7 @@ declare namespace monaco { #include(vs/base/common/uri): URI, UriComponents #include(vs/base/common/keyCodes): KeyCode #include(vs/editor/common/services/editorBaseApi): KeyMod -#include(vs/base/common/htmlContent): IMarkdownString +#include(vs/base/common/htmlContent): IMarkdownString, MarkdownStringTrustedOptions #include(vs/base/browser/keyboardEvent): IKeyboardEvent #include(vs/base/browser/mouseEvent): IMouseEvent #include(vs/editor/common/editorCommon): IScrollEvent @@ -72,7 +72,7 @@ export interface ICommandHandler { #include(vs/editor/common/core/editOperation): ISingleEditOperation #include(vs/editor/common/core/wordHelper): IWordAtPosition #includeAll(vs/editor/common/model): IScrollEvent -#include(vs/editor/common/diff/diffComputer): IChange, ICharChange, ILineChange +#include(vs/editor/common/diff/smartLinesDiffComputer): IChange, ICharChange, ILineChange #include(vs/editor/common/core/dimension): IDimension #includeAll(vs/editor/common/editorCommon): IScrollEvent #includeAll(vs/editor/common/textModelEvents): diff --git a/build/npm/dirs.js b/build/npm/dirs.js index 23f57323e45..f820f39e222 100644 --- a/build/npm/dirs.js +++ b/build/npm/dirs.js @@ -23,13 +23,14 @@ exports.dirs = [ 'extensions/gulp', 'extensions/html-language-features', 'extensions/html-language-features/server', - 'extensions/image-preview', 'extensions/ipynb', 'extensions/jake', 'extensions/json-language-features', 'extensions/json-language-features/server', + 'extensions/markdown-language-features/server', 'extensions/markdown-language-features', 'extensions/markdown-math', + 'extensions/media-preview', 'extensions/merge-conflict', 'extensions/microsoft-authentication', 'extensions/notebook-renderers', @@ -41,8 +42,6 @@ exports.dirs = [ 'extensions/typescript-language-features', 'extensions/vscode-api-tests', 'extensions/vscode-colorize-tests', - 'extensions/vscode-custom-editor-tests', - 'extensions/vscode-notebook-tests', 'extensions/vscode-test-resolver', 'remote', 'remote/web', diff --git a/build/npm/jsconfig.json b/build/npm/jsconfig.json index 41d18dab432..2b8f9ad1953 100644 --- a/build/npm/jsconfig.json +++ b/build/npm/jsconfig.json @@ -4,7 +4,7 @@ "lib": [ "ES2020" ], - "module": "node12", + "module": "node16", "checkJs": true, "noEmit": true } diff --git a/build/npm/preinstall.js b/build/npm/preinstall.js index a839653f75c..afefc404267 100644 --- a/build/npm/preinstall.js +++ b/build/npm/preinstall.js @@ -21,12 +21,19 @@ const path = require('path'); const fs = require('fs'); const cp = require('child_process'); const yarnVersion = cp.execSync('yarn -v', { encoding: 'utf8' }).trim(); -const parsedYarnVersion = /^(\d+)\.(\d+)\./.exec(yarnVersion); +const parsedYarnVersion = /^(\d+)\.(\d+)\.(\d+)/.exec(yarnVersion); const majorYarnVersion = parseInt(parsedYarnVersion[1]); const minorYarnVersion = parseInt(parsedYarnVersion[2]); +const patchYarnVersion = parseInt(parsedYarnVersion[3]); -if (majorYarnVersion < 1 || minorYarnVersion < 10) { - console.error('\033[1;31m*** Please use yarn >=1.10.1.\033[0;0m'); +if ( + majorYarnVersion < 1 || + majorYarnVersion === 1 && ( + minorYarnVersion < 10 || (minorYarnVersion === 10 && patchYarnVersion < 1) + ) || + majorYarnVersion >= 2 +) { + console.error('\033[1;31m*** Please use yarn >=1.10.1 and <2.\033[0;0m'); err = true; } diff --git a/build/npm/update-all-grammars.mjs b/build/npm/update-all-grammars.mjs index 2da48570661..e0d34e42beb 100644 --- a/build/npm/update-all-grammars.mjs +++ b/build/npm/update-all-grammars.mjs @@ -6,7 +6,7 @@ import { spawn as _spawn } from 'child_process'; import { readdirSync, readFileSync } from 'fs'; import { join } from 'path'; -import url from 'url' +import url from 'url'; async function spawn(cmd, args, opts) { return new Promise((c, e) => { @@ -20,7 +20,7 @@ async function main() { for (const extension of readdirSync('extensions')) { try { - let packageJSON = JSON.parse(readFileSync(join('extensions', extension, 'package.json')).toString()); + const packageJSON = JSON.parse(readFileSync(join('extensions', extension, 'package.json')).toString()); if (!(packageJSON && packageJSON.scripts && packageJSON.scripts['update-grammar'])) { continue; } diff --git a/build/npm/update-localization-extension.js b/build/npm/update-localization-extension.js index 1a689a189ea..b78674a7099 100644 --- a/build/npm/update-localization-extension.js +++ b/build/npm/update-localization-extension.js @@ -68,7 +68,7 @@ function update(options) { console.log(`Importing translations for ${languageId} form '${location}' to '${translationDataFolder}' ...`); let translationPaths = []; gulp.src(path.join(location, '**', languageId, '*.xlf'), { silent: false }) - .pipe(i18n.prepareI18nPackFiles(i18n.externalExtensionsWithTranslations, translationPaths, languageId === 'ps')) + .pipe(i18n.prepareI18nPackFiles(translationPaths)) .on('error', (error) => { console.log(`Error occurred while importing translations:`); translationPaths = undefined; diff --git a/build/package.json b/build/package.json index c259ad65063..6d4464865f3 100644 --- a/build/package.json +++ b/build/package.json @@ -40,19 +40,16 @@ "@types/underscore": "^1.8.9", "@types/webpack": "^4.41.25", "@types/xml2js": "0.0.33", - "@typescript-eslint/experimental-utils": "^5.10.0", - "@typescript-eslint/parser": "^5.10.0", "@vscode/iconv-lite-umd": "0.7.0", - "applicationinsights": "1.4.2", "byline": "^5.0.0", "colors": "^1.4.0", "commander": "^7.0.0", "debug": "^4.3.2", "electron-osx-sign": "^0.4.16", - "esbuild": "^0.14.2", + "esbuild": "0.15.5", "extract-zip": "^2.0.1", "fs-extra": "^9.1.0", - "got": "11.8.1", + "got": "11.8.5", "gulp-merge-json": "^2.1.1", "gulp-shell": "^0.8.0", "jsonc-parser": "^2.3.0", diff --git a/build/setup-npm-registry.js b/build/setup-npm-registry.js new file mode 100644 index 00000000000..75a5fdc8131 --- /dev/null +++ b/build/setup-npm-registry.js @@ -0,0 +1,41 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +const fs = require('fs').promises; +const path = require('path'); + +async function* getYarnLockFiles(dir) { + const files = await fs.readdir(dir); + + for (const file of files) { + const fullPath = path.join(dir, file); + const stat = await fs.stat(fullPath); + + if (stat.isDirectory()) { + yield* getYarnLockFiles(fullPath); + } else if (file === 'yarn.lock') { + yield fullPath; + } + } +} + +async function setup(url, file) { + let contents = await fs.readFile(file, 'utf8'); + contents = contents.replace(/https:\/\/registry\.[^.]+\.com\//g, url); + await fs.writeFile(file, contents); +} + +async function main(url) { + const root = process.cwd(); + + for await (const file of getYarnLockFiles(root)) { + console.log(`Enabling custom NPM registry: ${path.relative(root, file)}`); + await setup(url, file); + } +} + +main(process.argv[2]); diff --git a/build/tsconfig.build.json b/build/tsconfig.build.json index 0a00f2d0f48..801c7735b06 100644 --- a/build/tsconfig.build.json +++ b/build/tsconfig.build.json @@ -7,5 +7,8 @@ }, "include": [ "**/*.ts" + ], + "exclude": [ + "lib/eslint-plugin-vscode/**/*" ] } diff --git a/build/tsconfig.json b/build/tsconfig.json index de65bb698d3..ac3ce923add 100644 --- a/build/tsconfig.json +++ b/build/tsconfig.json @@ -3,6 +3,7 @@ "target": "es2020", "lib": ["ES2020"], "module": "commonjs", + "alwaysStrict": true, "removeComments": false, "preserveConstEnums": true, "sourceMap": false, diff --git a/build/win32/Cargo.lock b/build/win32/Cargo.lock index e27f58bf455..0601c70fb9e 100644 --- a/build/win32/Cargo.lock +++ b/build/win32/Cargo.lock @@ -1,258 +1,331 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -[[package]] -name = "build_const" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +version = 3 [[package]] -name = "byteorder" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "chrono" -version = "0.4.0" +name = "atty" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "num 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", + "hermit-abi", + "libc", + "winapi", ] [[package]] -name = "crc" -version = "1.7.0" +name = "bitflags" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "build_const" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "crc" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" dependencies = [ - "build_const 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "build_const", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "getrandom" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", ] [[package]] name = "inno_updater" -version = "0.8.2" +version = "0.9.0" dependencies = [ - "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "crc 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "slog 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "slog-async 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "slog-term 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder", + "crc", + "slog", + "slog-async", + "slog-term", + "winapi", ] [[package]] -name = "isatty" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "lazy_static" -version = "1.0.0" +name = "itoa" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "libc" -version = "0.2.36" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] -name = "num" -version = "0.1.41" +name = "num_threads" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" dependencies = [ - "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", ] [[package]] -name = "num-integer" -version = "0.1.35" +name = "once_cell" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" + +[[package]] +name = "proc-macro2" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ - "num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-ident", ] [[package]] -name = "num-iter" -version = "0.1.34" +name = "quote" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ - "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", ] -[[package]] -name = "num-traits" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "redox_syscall" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "redox_termios" -version = "0.1.1" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ - "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", ] [[package]] -name = "slog" -version = "2.1.1" +name = "redox_users" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "rustversion" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0a5f7c728f5d284929a1cccb5bc19884422bfe6ef4d6c409da2c41838983fcf" + +[[package]] +name = "slog" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06" [[package]] name = "slog-async" -version = "2.2.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "766c59b252e62a34651412870ff55d8c4e6d04df19b43eecb2703e417b097ffe" dependencies = [ - "slog 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "take_mut 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-channel", + "slog", + "take_mut", + "thread_local", ] [[package]] name = "slog-term" -version = "2.3.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87d29185c55b7b258b4f120eab00f48557d4d9bc814f41713f449d35b0f8977c" dependencies = [ - "chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "isatty 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "slog 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "atty", + "slog", + "term", + "thread_local", + "time", +] + +[[package]] +name = "syn" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] name = "take_mut" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" [[package]] name = "term" -version = "0.4.6" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" dependencies = [ - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs-next", + "rustversion", + "winapi", ] [[package]] -name = "termion" -version = "1.5.1" +name = "thiserror" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" dependencies = [ - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] name = "thread_local" -version = "0.3.5" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ - "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "once_cell", ] [[package]] name = "time" -version = "0.1.39" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217" dependencies = [ - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa", + "libc", + "num_threads", + "time-macros", ] [[package]] -name = "unreachable" -version = "1.0.0" +name = "time-macros" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -] +checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" [[package]] -name = "void" -version = "1.0.2" +name = "unicode-ident" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "winapi" -version = "0.3.4" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ - "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" - -[metadata] -"checksum build_const 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e90dc84f5e62d2ebe7676b83c22d33b6db8bd27340fb6ffbff0a364efa0cb9c9" -"checksum byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "652805b7e73fada9d85e9a6682a4abd490cb52d96aeecc12e33a0de34dfd0d23" -"checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9" -"checksum crc 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd5d02c0aac6bd68393ed69e00bbc2457f3e89075c6349db7189618dc4ddc1d7" -"checksum isatty 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f2a233726c7bb76995cec749d59582e5664823b7245d4970354408f1d79a7a2" -"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -"checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d" -"checksum libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "1e5d97d6708edaa407429faa671b942dc0f2727222fb6b6539bf1db936e4b121" -"checksum num 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "cc4083e14b542ea3eb9b5f33ff48bd373a92d78687e74f4cc0a30caeb754f0ca" -"checksum num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "d1452e8b06e448a07f0e6ebb0bb1d92b8890eea63288c0b627331d53514d0fba" -"checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01" -"checksum num-traits 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "9936036cc70fe4a8b2d338ab665900323290efb03983c86cbe235ae800ad8017" -"checksum redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd" -"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -"checksum slog 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0a6b13b17f4225771f7f15cece704a4e68d3a5f31278ed26367f497133398a18" -"checksum slog-async 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e319a30c08b004618d5f7ca2f2b1dad7b4623ba7fcb1a12846fc3b01e9eaa10" -"checksum slog-term 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5bb5d9360b2b279b326824b3b4ca2402ead8a8138f0e5ec1900605c861bb6671" -"checksum take_mut 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50b910a1174df4aeb5738e8a0e7253883cf7801de40d094175a5a557e487f4c5" -"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1" -"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" -"checksum thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963" -"checksum time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "a15375f1df02096fb3317256ce2cee6a1f42fc84ea5ad5fc8c421cfe40c73098" -"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -"checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3" -"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" -"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/build/win32/Cargo.toml b/build/win32/Cargo.toml new file mode 100644 index 00000000000..decae65f9e6 --- /dev/null +++ b/build/win32/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "inno_updater" +version = "0.9.0" +authors = ["Microsoft "] +build = "build.rs" + +[dependencies] +byteorder = "1" +crc = "^1.0.0" +slog = "2.1.1" +slog-async = "2.2.0" +slog-term = "2.3.0" + +[target.'cfg(windows)'.dependencies] +winapi = { version = "^0.3.9", features = ["winuser", "libloaderapi", "commctrl", "processthreadsapi", "tlhelp32", "handleapi", "psapi", "errhandlingapi", "winbase", "shellapi"] } + +[profile.release] +lto = true +panic = 'abort' diff --git a/build/win32/code.iss b/build/win32/code.iss index e96ca4bde77..9376add416f 100644 --- a/build/win32/code.iss +++ b/build/win32/code.iss @@ -26,7 +26,7 @@ SetupIconFile={#RepoDir}\resources\win32\code.ico UninstallDisplayIcon={app}\{#ExeBasename}.exe ChangesEnvironment=true ChangesAssociations=true -MinVersion=6.1.7600 +MinVersion=6.2 SourceDir={#SourceDir} AppVersion={#Version} VersionInfoVersion={#RawVersion} @@ -77,7 +77,7 @@ Type: filesandordirs; Name: "{app}\_" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1 Name: "addcontextmenufiles"; Description: "{cm:AddContextMenuFiles,{#NameShort}}"; GroupDescription: "{cm:Other}"; Flags: unchecked -Name: "addcontextmenufolders"; Description: "{cm:AddContextMenuFolders,{#NameShort}}"; GroupDescription: "{cm:Other}"; Flags: unchecked +Name: "addcontextmenufolders"; Description: "{cm:AddContextMenuFolders,{#NameShort}}"; GroupDescription: "{cm:Other}"; Flags: unchecked; Check: not (IsWindows11OrLater and QualityIsInsiders) Name: "associatewithfiles"; Description: "{cm:AssociateWithFiles,{#NameShort}}"; GroupDescription: "{cm:Other}" Name: "addtopath"; Description: "{cm:AddToPath}"; GroupDescription: "{cm:Other}" Name: "runcode"; Description: "{cm:RunAfter,{#NameShort}}"; GroupDescription: "{cm:Other}"; Check: WizardSilent @@ -86,8 +86,9 @@ Name: "runcode"; Description: "{cm:RunAfter,{#NameShort}}"; GroupDescription: "{ Name: "{app}"; AfterInstall: DisableAppDirInheritance [Files] -Source: "*"; Excludes: "\CodeSignSummary*.md,\tools,\tools\*,\resources\app\product.json"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "*"; Excludes: "\CodeSignSummary*.md,\tools,\tools\*,\appx,\appx\*,\resources\app\product.json"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "tools\*"; DestDir: "{app}\tools"; Flags: ignoreversion +Source: "appx\*"; DestDir: "{app}\appx"; BeforeInstall: RemoveAppxPackage; AfterInstall: AddAppxPackage; Flags: ignoreversion; Check: IsWindows11OrLater and QualityIsInsiders Source: "{#ProductJsonPath}"; DestDir: "{code:GetDestDir}\resources\app"; Flags: ignoreversion [Icons] @@ -99,6 +100,9 @@ Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#NameLong}"; File Filename: "{app}\{#ExeBasename}.exe"; Description: "{cm:LaunchProgram,{#NameLong}}"; Tasks: runcode; Flags: nowait postinstall; Check: ShouldRunAfterUpdate Filename: "{app}\{#ExeBasename}.exe"; Description: "{cm:LaunchProgram,{#NameLong}}"; Flags: nowait postinstall; Check: WizardNotSilent +[UninstallRun] +Filename: "powershell.exe"; Parameters: "Invoke-Command -ScriptBlock {{Remove-AppxPackage -Package ""{#AppxPackageFullname}""}"; Check: IsWindows11OrLater and QualityIsInsiders; Flags: shellexec waituntilterminated runhidden + [Registry] #if "user" == InstallTarget #define SoftwareClassesRootKey "HKCU" @@ -1261,18 +1265,19 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Applications\{#ExeBas Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Applications\{#ExeBasename}.exe\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe""" Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Applications\{#ExeBasename}.exe\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1""" -Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufiles; Flags: uninsdeletekey -Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufiles -Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: addcontextmenufiles -Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey -Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders -Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders -Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey -Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders -Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders -Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey -Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders -Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders +Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}ContextMenu"; ValueType: expandsz; ValueName: "Title"; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufiles; Flags: uninsdeletekey; Check: IsWindows11OrLater and QualityIsInsiders +Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufiles; Flags: uninsdeletekey; Check: not (IsWindows11OrLater and QualityIsInsiders) +Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufiles; Check: not (IsWindows11OrLater and QualityIsInsiders) +Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: addcontextmenufiles; Check: not (IsWindows11OrLater and QualityIsInsiders) +Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey; Check: not (IsWindows11OrLater and QualityIsInsiders) +Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders; Check: not (IsWindows11OrLater and QualityIsInsiders) +Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders; Check: not (IsWindows11OrLater and QualityIsInsiders) +Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey; Check: not (IsWindows11OrLater and QualityIsInsiders) +Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders; Check: not (IsWindows11OrLater and QualityIsInsiders) +Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders; Check: not (IsWindows11OrLater and QualityIsInsiders) +Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey; Check: not (IsWindows11OrLater and QualityIsInsiders) +Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders; Check: not (IsWindows11OrLater and QualityIsInsiders) +Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders; Check: not (IsWindows11OrLater and QualityIsInsiders) ; Environment #if "user" == InstallTarget @@ -1376,6 +1381,11 @@ begin Result := True; end; +function IsWindows11OrLater(): Boolean; +begin + Result := (GetWindowsVersion >= $0A0055F0); +end; + function GetAppMutex(Value: string): string; begin if IsBackgroundUpdate() then @@ -1400,6 +1410,37 @@ begin Result := 'false'; end; +function QualityIsInsiders(): boolean; +begin + if '{#Quality}' = 'insider' then + Result := True + else + Result := False; +end; + +procedure AddAppxPackage(); +var + AddAppxPackageResultCode: Integer; +begin + if WizardIsTaskSelected('addcontextmenufiles') then begin + ShellExec('', 'powershell.exe', '-Command ' + AddQuotes('Add-AppxPackage -Path ''' + ExpandConstant('{app}\appx\{#AppxPackage}') + ''' -ExternalLocation ''' + ExpandConstant('{app}\appx') + ''''), '', SW_HIDE, ewWaitUntilTerminated, AddAppxPackageResultCode); + RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\*\shell\{#RegValueName}'); + RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\directory\shell\{#RegValueName}'); + RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\directory\background\shell\{#RegValueName}'); + RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\Drive\shell\{#RegValueName}'); + end; +end; + +procedure RemoveAppxPackage(); +var + RemoveAppxPackageResultCode: Integer; +begin + ShellExec('', 'powershell.exe', '-Command ' + AddQuotes('Remove-AppxPackage -Package ''{#AppxPackageFullname}'''), '', SW_HIDE, ewWaitUntilTerminated, RemoveAppxPackageResultCode); + if not WizardIsTaskSelected('addcontextmenufiles') then begin + RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\{#RegValueName}ContextMenu'); + end; +end; + procedure CurStepChanged(CurStep: TSetupStep); var UpdateResultCode: Integer; @@ -1494,8 +1535,8 @@ begin Permissions := '/grant:r "*S-1-5-18:(OI)(CI)F" /grant:r "*S-1-5-32-544:(OI)(CI)F" /grant:r "*S-1-5-11:(OI)(CI)RX" /grant:r "*S-1-5-32-545:(OI)(CI)RX"'; #if "user" == InstallTarget - Permissions := Permissions + ' /grant:r "*S-1-3-0:(OI)(CI)F"'; + Permissions := Permissions + Format(' /grant:r "*S-1-3-0:(OI)(CI)F" /grant:r "%s:(OI)(CI)F"', [GetUserNameString()]); #endif Exec(ExpandConstant('{sys}\icacls.exe'), ExpandConstant('"{app}" /inheritancelevel:r ') + Permissions, '', SW_HIDE, ewWaitUntilTerminated, ResultCode); -end; \ No newline at end of file +end; diff --git a/build/win32/explorer-appx-fetcher.js b/build/win32/explorer-appx-fetcher.js new file mode 100644 index 00000000000..64b5ce9c117 --- /dev/null +++ b/build/win32/explorer-appx-fetcher.js @@ -0,0 +1,56 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +'use strict'; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.downloadExplorerAppx = void 0; +const debug = require("debug"); +const extract = require("extract-zip"); +const fs = require("fs-extra"); +const path = require("path"); +const product = require("../../product.json"); +const get_1 = require("@electron/get"); +const d = debug('explorer-appx-fetcher'); +async function downloadExplorerAppx(outDir, quality = 'stable', targetArch = 'x64') { + const fileNamePrefix = quality === 'insider' ? 'code_insiders' : 'code'; + const fileName = `${fileNamePrefix}_explorer_${targetArch}.zip`; + if (await fs.pathExists(path.resolve(outDir, 'resources.pri'))) { + return; + } + if (!await fs.pathExists(outDir)) { + await fs.mkdirp(outDir); + } + d(`downloading ${fileName}`); + const artifact = await (0, get_1.downloadArtifact)({ + isGeneric: true, + version: '3.0.4', + artifactName: fileName, + unsafelyDisableChecksums: true, + mirrorOptions: { + mirror: 'https://github.com/microsoft/vscode-explorer-command/releases/download/', + customDir: '3.0.4', + customFilename: fileName + } + }); + d(`unpacking from ${fileName}`); + await extract(artifact, { dir: outDir }); +} +exports.downloadExplorerAppx = downloadExplorerAppx; +async function main() { + const outputDir = process.env['VSCODE_EXPLORER_APPX_DIR']; + let arch = process.env['VSCODE_ARCH']; + if (!outputDir) { + throw new Error('Required build env not set'); + } + if (arch === 'ia32') { + arch = 'x86'; + } + await downloadExplorerAppx(outputDir, product.quality, arch); +} +if (require.main === module) { + main().catch(err => { + console.error(err); + process.exit(1); + }); +} diff --git a/build/win32/explorer-appx-fetcher.ts b/build/win32/explorer-appx-fetcher.ts new file mode 100644 index 00000000000..9f49d954474 --- /dev/null +++ b/build/win32/explorer-appx-fetcher.ts @@ -0,0 +1,66 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import * as debug from 'debug'; +import * as extract from 'extract-zip'; +import * as fs from 'fs-extra'; +import * as path from 'path'; +import * as product from '../../product.json'; +import { downloadArtifact } from '@electron/get'; + +const d = debug('explorer-appx-fetcher'); + +export async function downloadExplorerAppx(outDir: string, quality: string = 'stable', targetArch: string = 'x64'): Promise { + const fileNamePrefix = quality === 'insider' ? 'code_insiders' : 'code'; + const fileName = `${fileNamePrefix}_explorer_${targetArch}.zip`; + + if (await fs.pathExists(path.resolve(outDir, 'resources.pri'))) { + return; + } + + if (!await fs.pathExists(outDir)) { + await fs.mkdirp(outDir); + } + + d(`downloading ${fileName}`); + const artifact = await downloadArtifact({ + isGeneric: true, + version: '3.0.4', + artifactName: fileName, + unsafelyDisableChecksums: true, + mirrorOptions: { + mirror: 'https://github.com/microsoft/vscode-explorer-command/releases/download/', + customDir: '3.0.4', + customFilename: fileName + } + }); + + d(`unpacking from ${fileName}`); + await extract(artifact, { dir: outDir }); +} + +async function main(): Promise { + const outputDir = process.env['VSCODE_EXPLORER_APPX_DIR']; + let arch = process.env['VSCODE_ARCH']; + + if (!outputDir) { + throw new Error('Required build env not set'); + } + + if (arch === 'ia32') { + arch = 'x86'; + } + + await downloadExplorerAppx(outputDir, (product as any).quality, arch); +} + +if (require.main === module) { + main().catch(err => { + console.error(err); + process.exit(1); + }); +} diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe index 8c532b9eb5e..fea47a59c9d 100644 Binary files a/build/win32/inno_updater.exe and b/build/win32/inno_updater.exe differ diff --git a/build/yarn.lock b/build/yarn.lock index d65a62ebce3..27bc4dd9a10 100644 --- a/build/yarn.lock +++ b/build/yarn.lock @@ -225,6 +225,11 @@ global-agent "^2.0.2" global-tunnel-ng "^2.7.1" +"@esbuild/linux-loong64@0.15.5": + version "0.15.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.5.tgz#91aef76d332cdc7c8942b600fa2307f3387e6f82" + integrity sha512-UHkDFCfSGTuXq08oQltXxSZmH1TXyWsL+4QhZDWvvLl6mEJQqk3u7/wq1LjhrrAXYIllaTtRSzUXl4Olkf2J8A== + "@malept/cross-spawn-promise@^1.1.0": version "1.1.1" resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" @@ -232,27 +237,6 @@ dependencies: cross-spawn "^7.0.1" -"@nodelib/fs.scandir@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" - integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== - dependencies: - "@nodelib/fs.stat" "2.0.5" - run-parallel "^1.1.9" - -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" - integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== - -"@nodelib/fs.walk@^1.2.3": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" - integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== - dependencies: - "@nodelib/fs.scandir" "2.1.5" - fastq "^1.6.0" - "@opentelemetry/api@^1.0.1": version "1.0.3" resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.0.3.tgz#13a12ae9e05c2a782f7b5e84c3cbfda4225eaf80" @@ -470,11 +454,6 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339" integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA== -"@types/json-schema@^7.0.9": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" - integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== - "@types/keyv@*": version "3.1.1" resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.1.tgz#e45a45324fca9dab716ab1230ee249c9fb52cfa7" @@ -523,9 +502,9 @@ integrity sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ== "@types/node@16.x": - version "16.11.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" - integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== + version "16.11.64" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.64.tgz#9171f327298b619e2c52238b120c19056415d820" + integrity sha512-z5hPTlVFzNwtJ2LNozTpJcD1Cu44c4LNuzaq1mwxmiHWQh2ULdR6Vjwo1UGldzRpzL0yUEdZddnfqGW2G70z6Q== "@types/p-limit@^2.2.0": version "2.2.0" @@ -682,103 +661,6 @@ dependencies: "@types/node" "*" -"@typescript-eslint/experimental-utils@^5.10.0": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.10.1.tgz#49fa5a7800ed08ea70aef14fccb14fbae85116ab" - integrity sha512-Ryeb8nkJa/1zKl8iujNtJC8tgj6PgaY0sDUnrTqbmC70nrKKkZaHfiRDTcqICmCSCEQyLQcJAoh0AukLaIaGTw== - dependencies: - "@typescript-eslint/utils" "5.10.1" - -"@typescript-eslint/parser@^5.10.0": - version "5.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.10.0.tgz#8f59e036f5f1cffc178cacbd5ccdd02aeb96c91c" - integrity sha512-pJB2CCeHWtwOAeIxv8CHVGJhI5FNyJAIpx5Pt72YkK3QfEzt6qAlXZuyaBmyfOdM62qU0rbxJzNToPTVeJGrQw== - dependencies: - "@typescript-eslint/scope-manager" "5.10.0" - "@typescript-eslint/types" "5.10.0" - "@typescript-eslint/typescript-estree" "5.10.0" - debug "^4.3.2" - -"@typescript-eslint/scope-manager@5.10.0": - version "5.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.10.0.tgz#bb5d872e8b9e36203908595507fbc4d3105329cb" - integrity sha512-tgNgUgb4MhqK6DoKn3RBhyZ9aJga7EQrw+2/OiDk5hKf3pTVZWyqBi7ukP+Z0iEEDMF5FDa64LqODzlfE4O/Dg== - dependencies: - "@typescript-eslint/types" "5.10.0" - "@typescript-eslint/visitor-keys" "5.10.0" - -"@typescript-eslint/scope-manager@5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.10.1.tgz#f0539c73804d2423506db2475352a4dec36cd809" - integrity sha512-Lyvi559Gvpn94k7+ElXNMEnXu/iundV5uFmCUNnftbFrUbAJ1WBoaGgkbOBm07jVZa682oaBU37ao/NGGX4ZDg== - dependencies: - "@typescript-eslint/types" "5.10.1" - "@typescript-eslint/visitor-keys" "5.10.1" - -"@typescript-eslint/types@5.10.0": - version "5.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.10.0.tgz#beb3cb345076f5b088afe996d57bcd1dfddaa75c" - integrity sha512-wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ== - -"@typescript-eslint/types@5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.10.1.tgz#dca9bd4cb8c067fc85304a31f38ec4766ba2d1ea" - integrity sha512-ZvxQ2QMy49bIIBpTqFiOenucqUyjTQ0WNLhBM6X1fh1NNlYAC6Kxsx8bRTY3jdYsYg44a0Z/uEgQkohbR0H87Q== - -"@typescript-eslint/typescript-estree@5.10.0": - version "5.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz#4be24a3dea0f930bb1397c46187d0efdd955a224" - integrity sha512-x+7e5IqfwLwsxTdliHRtlIYkgdtYXzE0CkFeV6ytAqq431ZyxCFzNMNR5sr3WOlIG/ihVZr9K/y71VHTF/DUQA== - dependencies: - "@typescript-eslint/types" "5.10.0" - "@typescript-eslint/visitor-keys" "5.10.0" - debug "^4.3.2" - globby "^11.0.4" - is-glob "^4.0.3" - semver "^7.3.5" - tsutils "^3.21.0" - -"@typescript-eslint/typescript-estree@5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.1.tgz#b268e67be0553f8790ba3fe87113282977adda15" - integrity sha512-PwIGnH7jIueXv4opcwEbVGDATjGPO1dx9RkUl5LlHDSe+FXxPwFL5W/qYd5/NHr7f6lo/vvTrAzd0KlQtRusJQ== - dependencies: - "@typescript-eslint/types" "5.10.1" - "@typescript-eslint/visitor-keys" "5.10.1" - debug "^4.3.2" - globby "^11.0.4" - is-glob "^4.0.3" - semver "^7.3.5" - tsutils "^3.21.0" - -"@typescript-eslint/utils@5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.10.1.tgz#fa682a33af47080ba2c4368ee0ad2128213a1196" - integrity sha512-RRmlITiUbLuTRtn/gcPRi4202niF+q7ylFLCKu4c+O/PcpRvZ/nAUwQ2G00bZgpWkhrNLNnvhZLbDn8Ml0qsQw== - dependencies: - "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.10.1" - "@typescript-eslint/types" "5.10.1" - "@typescript-eslint/typescript-estree" "5.10.1" - eslint-scope "^5.1.1" - eslint-utils "^3.0.0" - -"@typescript-eslint/visitor-keys@5.10.0": - version "5.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.0.tgz#770215497ad67cd15a572b52089991d5dfe06281" - integrity sha512-GMxj0K1uyrFLPKASLmZzCuSddmjZVbVj3Ouy5QVuIGKZopxvOr24JsS7gruz6C3GExE01mublZ3mIBOaon9zuQ== - dependencies: - "@typescript-eslint/types" "5.10.0" - eslint-visitor-keys "^3.0.0" - -"@typescript-eslint/visitor-keys@5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.1.tgz#29102de692f59d7d34ecc457ed59ab5fc558010b" - integrity sha512-NjQ0Xinhy9IL979tpoTRuLKxMc0zJC7QVSdeerXs2/QvOy2yRkzX5dRb10X5woNUdJgU8G3nYRDlI33sq1K4YQ== - dependencies: - "@typescript-eslint/types" "5.10.1" - eslint-visitor-keys "^3.0.0" - "@vscode/iconv-lite-umd@0.7.0": version "0.7.0" resolved "https://registry.yarnpkg.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz#d2f1e0664ee6036408f9743fee264ea0699b0e48" @@ -847,16 +729,6 @@ anymatch@^3.0.0, anymatch@^3.1.1, anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" -applicationinsights@1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.4.2.tgz#2f25f7a3f3e5bf0ab4486b63e42a48a9ec321d52" - integrity sha512-1wE37G9zEMZTsPJVQ8BDrQtsGgG3DGMActLHwPAF8TYHAXkfqqpeZYCH0XV4lUZ7H4MffRMwN2Ln2nEtUmT8HQ== - dependencies: - cls-hooked "^4.2.2" - continuation-local-storage "^3.2.1" - diagnostic-channel "0.2.0" - diagnostic-channel-publishers "^0.3.3" - aproba@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -887,11 +759,6 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== - asar@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz#1fef03c2d6d2de0cbad138788e4f7ae03b129c7b" @@ -909,21 +776,6 @@ assign-symbols@^1.0.0: resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= -async-hook-jl@^1.7.6: - version "1.7.6" - resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68" - integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg== - dependencies: - stack-chain "^1.3.7" - -async-listener@^0.6.0: - version "0.6.10" - resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc" - integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw== - dependencies: - semver "^5.3.0" - shimmer "^1.1.0" - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -996,7 +848,7 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^3.0.1, braces@~3.0.2: +braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -1067,17 +919,17 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" -cacheable-request@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.1.tgz#062031c2856232782ed694a257fa35da93942a58" - integrity sha512-lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw== +cacheable-request@^7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27" + integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew== dependencies: clone-response "^1.0.2" get-stream "^5.1.0" http-cache-semantics "^4.0.0" keyv "^4.0.0" lowercase-keys "^2.0.0" - normalize-url "^4.1.0" + normalize-url "^6.0.1" responselike "^2.0.0" call-bind@^1.0.0: @@ -1185,15 +1037,6 @@ cloneable-readable@^1.0.0: process-nextick-args "^2.0.0" readable-stream "^2.3.5" -cls-hooked@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908" - integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw== - dependencies: - async-hook-jl "^1.7.6" - emitter-listener "^1.0.1" - semver "^5.4.1" - code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" @@ -1290,14 +1133,6 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= -continuation-local-storage@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb" - integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA== - dependencies: - async-listener "^0.6.0" - emitter-listener "^1.1.1" - core-js@^3.6.5: version "3.15.2" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61" @@ -1427,18 +1262,6 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -diagnostic-channel-publishers@^0.3.3: - version "0.3.5" - resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.3.5.tgz#a84a05fd6cc1d7619fdd17791c17e540119a7536" - integrity sha512-AOIjw4T7Nxl0G2BoBPhkQ6i7T4bUd9+xvdYizwvG7vVAM1dvr+SDrcUudlmzwH0kbEwdR2V1EcnKT0wAeYLQNQ== - -diagnostic-channel@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/diagnostic-channel/-/diagnostic-channel-0.2.0.tgz#cc99af9612c23fb1fff13612c72f2cbfaa8d5a17" - integrity sha1-zJmvlhLCP7H/8TYSxy8sv6qNWhc= - dependencies: - semver "^5.3.0" - dir-compare@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" @@ -1449,13 +1272,6 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== - dependencies: - path-type "^4.0.0" - dom-serializer@^1.0.1, dom-serializer@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" @@ -1510,13 +1326,6 @@ electron-osx-sign@^0.4.16: minimist "^1.2.0" plist "^3.0.1" -emitter-listener@^1.0.1, emitter-listener@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8" - integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ== - dependencies: - shimmer "^1.2.0" - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -1554,113 +1363,132 @@ es6-error@^4.1.1: resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== -esbuild-android-arm64@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.2.tgz#256b7cf2f9d382a2a92a4ff4e13187587c9b7c6a" - integrity sha512-hEixaKMN3XXCkoe+0WcexO4CcBVU5DCSUT+7P8JZiWZCbAjSkc9b6Yz2X5DSfQmRCtI/cQRU6TfMYrMQ5NBfdw== +esbuild-android-64@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.5.tgz#3c7b2f2a59017dab3f2c0356188a8dd9cbdc91c8" + integrity sha512-dYPPkiGNskvZqmIK29OPxolyY3tp+c47+Fsc2WYSOVjEPWNCHNyqhtFqQadcXMJDQt8eN0NMDukbyQgFcHquXg== -esbuild-darwin-64@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.2.tgz#891a59ce6bc3aded0265f982469b3eb9571b92f8" - integrity sha512-Uq8t0cbJQkxkQdbUfOl2wZqZ/AtLZjvJulR1HHnc96UgyzG9YlCLSDMiqjM+NANEy7/zzvwKJsy3iNC9wwqLJA== +esbuild-android-arm64@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.5.tgz#e301db818c5a67b786bf3bb7320e414ac0fcf193" + integrity sha512-YyEkaQl08ze3cBzI/4Cm1S+rVh8HMOpCdq8B78JLbNFHhzi4NixVN93xDrHZLztlocEYqi45rHHCgA8kZFidFg== -esbuild-darwin-arm64@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.2.tgz#ab834fffa9c612b2901ca1e77e4695d4d8aa63a2" - integrity sha512-619MSa17sr7YCIrUj88KzQu2ESA4jKYtIYfLU/smX6qNgxQt3Y/gzM4s6sgJ4fPQzirvmXgcHv1ZNQAs/Xh48A== +esbuild-darwin-64@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.5.tgz#11726de5d0bf5960b92421ef433e35871c091f8d" + integrity sha512-Cr0iIqnWKx3ZTvDUAzG0H/u9dWjLE4c2gTtRLz4pqOBGjfjqdcZSfAObFzKTInLLSmD0ZV1I/mshhPoYSBMMCQ== -esbuild-freebsd-64@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.2.tgz#f7fc87a83f02de27d5a48472571efa1a432ae86d" - integrity sha512-aP6FE/ZsChZpUV6F3HE3x1Pz0paoYXycJ7oLt06g0G9dhJKknPawXCqQg/WMyD+ldCEZfo7F1kavenPdIT/SGQ== +esbuild-darwin-arm64@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.5.tgz#ad89dafebb3613fd374f5a245bb0ce4132413997" + integrity sha512-WIfQkocGtFrz7vCu44ypY5YmiFXpsxvz2xqwe688jFfSVCnUsCn2qkEVDo7gT8EpsLOz1J/OmqjExePL1dr1Kg== -esbuild-freebsd-arm64@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.2.tgz#bc8758420431106751f3180293cac0b5bc4ce2ee" - integrity sha512-LSm98WTb1QIhyS83+Po0KTpZNdd2XpVpI9ua5rLWqKWbKeNRFwOsjeiuwBaRNc+O32s9oC2ZMefETxHBV6VNkQ== +esbuild-freebsd-64@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.5.tgz#6bfb52b4a0d29c965aa833e04126e95173289c8a" + integrity sha512-M5/EfzV2RsMd/wqwR18CELcenZ8+fFxQAAEO7TJKDmP3knhWSbD72ILzrXFMMwshlPAS1ShCZ90jsxkm+8FlaA== -esbuild-linux-32@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.2.tgz#0cc2dcd816d6d66e255bc7aeac139b1d04246812" - integrity sha512-8VxnNEyeUbiGflTKcuVc5JEPTqXfsx2O6ABwUbfS1Hp26lYPRPC7pKQK5Dxa0MBejGc50jy7YZae3EGQUQ8EkQ== +esbuild-freebsd-arm64@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.5.tgz#38a3fed8c6398072f9914856c7c3e3444f9ef4dd" + integrity sha512-2JQQ5Qs9J0440F/n/aUBNvY6lTo4XP/4lt1TwDfHuo0DY3w5++anw+jTjfouLzbJmFFiwmX7SmUhMnysocx96w== -esbuild-linux-64@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.2.tgz#c790f739aa75b15c153609ea3457153fbe4db93d" - integrity sha512-4bzMS2dNxOJoFIiHId4w+tqQzdnsch71JJV1qZnbnErSFWcR9lRgpSqWnTTFtv6XM+MvltRzSXC5wQ7AEBY6Hg== +esbuild-linux-32@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.5.tgz#942dc70127f0c0a7ea91111baf2806e61fc81b32" + integrity sha512-gO9vNnIN0FTUGjvTFucIXtBSr1Woymmx/aHQtuU+2OllGU6YFLs99960UD4Dib1kFovVgs59MTXwpFdVoSMZoQ== -esbuild-linux-arm64@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.2.tgz#96858a1f89ad30274dec780d0e3dd8b5691c6b0c" - integrity sha512-RlIVp0RwJrdtasDF1vTFueLYZ8WuFzxoQ1OoRFZOTyJHCGCNgh7xJIC34gd7B7+RT0CzLBB4LcM5n0LS+hIoww== +esbuild-linux-64@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.5.tgz#6d748564492d5daaa7e62420862c31ac3a44aed9" + integrity sha512-ne0GFdNLsm4veXbTnYAWjbx3shpNKZJUd6XpNbKNUZaNllDZfYQt0/zRqOg0sc7O8GQ+PjSMv9IpIEULXVTVmg== -esbuild-linux-arm@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.2.tgz#03e193225afa9b1215d2ec6efe8edf0c03eeed6f" - integrity sha512-PaylahvMHhH8YMfJPMKEqi64qA0Su+d4FNfHKvlKes/2dUe4QxgbwXT9oLVgy8iJdcFMrO7By4R8fS8S0p8aVQ== +esbuild-linux-arm64@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.5.tgz#28cd899beb2d2b0a3870fd44f4526835089a318d" + integrity sha512-7EgFyP2zjO065XTfdCxiXVEk+f83RQ1JsryN1X/VSX2li9rnHAt2swRbpoz5Vlrl6qjHrCmq5b6yxD13z6RheA== -esbuild-linux-mips64le@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.2.tgz#972f218d2cb5125237376d40ad60a6e5356a782c" - integrity sha512-Fdwrq2roFnO5oetIiUQQueZ3+5soCxBSJswg3MvYaXDomj47BN6oAWMZgLrFh1oVrtWrxSDLCJBenYdbm2s+qQ== +esbuild-linux-arm@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.5.tgz#6441c256225564d8794fdef5b0a69bc1a43051b5" + integrity sha512-wvAoHEN+gJ/22gnvhZnS/+2H14HyAxM07m59RSLn3iXrQsdS518jnEWRBnJz3fR6BJa+VUTo0NxYjGaNt7RA7Q== -esbuild-linux-ppc64le@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.2.tgz#20b71622ac09142b0e523f633af0829def7fed6b" - integrity sha512-vxptskw8JfCDD9QqpRO0XnsM1osuWeRjPaXX1TwdveLogYsbdFtcuiuK/4FxGiNMUr1ojtnCS2rMPbY8puc5NA== +esbuild-linux-mips64le@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.5.tgz#d4927f817290eaffc062446896b2a553f0e11981" + integrity sha512-KdnSkHxWrJ6Y40ABu+ipTZeRhFtc8dowGyFsZY5prsmMSr1ZTG9zQawguN4/tunJ0wy3+kD54GaGwdcpwWAvZQ== -esbuild-netbsd-64@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.2.tgz#dbd6a25117902ef67aa11d8779dd9c6bca7fbe82" - integrity sha512-I8+LzYK5iSNpspS9eCV9sW67Rj8FgMHimGri4mKiGAmN0pNfx+hFX146rYtzGtewuxKtTsPywWteHx+hPRLDsw== +esbuild-linux-ppc64le@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.5.tgz#b6d660dc6d5295f89ac51c675f1a2f639e2fb474" + integrity sha512-QdRHGeZ2ykl5P0KRmfGBZIHmqcwIsUKWmmpZTOq573jRWwmpfRmS7xOhmDHBj9pxv+6qRMH8tLr2fe+ZKQvCYw== -esbuild-openbsd-64@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.2.tgz#3c5f199eed459b2f88865548394c0b77383d9ca4" - integrity sha512-120HgMe9elidWUvM2E6mMf0csrGwx8sYDqUIJugyMy1oHm+/nT08bTAVXuwYG/rkMIqsEO9AlMxuYnwR6En/3Q== +esbuild-linux-riscv64@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.5.tgz#2801bf18414dc3d3ad58d1ea83084f00d9d84896" + integrity sha512-p+WE6RX+jNILsf+exR29DwgV6B73khEQV0qWUbzxaycxawZ8NE0wA6HnnTxbiw5f4Gx9sJDUBemh9v49lKOORA== -esbuild-sunos-64@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.2.tgz#900a681db6b76c6a7f60fc28d2bfe5b11698641c" - integrity sha512-Q3xcf9Uyfra9UuCFxoLixVvdigo0daZaKJ97TL2KNA4bxRUPK18wwGUk3AxvgDQZpRmg82w9PnkaNYo7a+24ow== +esbuild-linux-s390x@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.5.tgz#12a634ae6d3384cacc2b8f4201047deafe596eae" + integrity sha512-J2ngOB4cNzmqLHh6TYMM/ips8aoZIuzxJnDdWutBw5482jGXiOzsPoEF4j2WJ2mGnm7FBCO4StGcwzOgic70JQ== -esbuild-windows-32@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.2.tgz#61e0ba5bd95b277a55d2b997ac4c04dfe2559220" - integrity sha512-TW7O49tPsrq+N1sW8mb3m24j/iDGa4xzAZH4wHWwoIzgtZAYPKC0hpIhufRRG/LA30bdMChO9pjJZ5mtcybtBQ== +esbuild-netbsd-64@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.5.tgz#951bbf87600512dfcfbe3b8d9d117d684d26c1b8" + integrity sha512-MmKUYGDizYjFia0Rwt8oOgmiFH7zaYlsoQ3tIOfPxOqLssAsEgG0MUdRDm5lliqjiuoog8LyDu9srQk5YwWF3w== -esbuild-windows-64@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.2.tgz#6ab59ef721ff75c682a1c8ae0570dabb637abddb" - integrity sha512-Rym6ViMNmi1E2QuQMWy0AFAfdY0wGwZD73BnzlsQBX5hZBuy/L+Speh7ucUZ16gwsrMM9v86icZUDrSN/lNBKg== +esbuild-openbsd-64@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.5.tgz#26705b61961d525d79a772232e8b8f211fdbb035" + integrity sha512-2mMFfkLk3oPWfopA9Plj4hyhqHNuGyp5KQyTT9Rc8hFd8wAn5ZrbJg+gNcLMo2yzf8Uiu0RT6G9B15YN9WQyMA== -esbuild-windows-arm64@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.2.tgz#aca2a4f83d2f0d1592ad4be832ed0045fc888cda" - integrity sha512-ZrLbhr0vX5Em/P1faMnHucjVVWPS+m3tktAtz93WkMZLmbRJevhiW1y4CbulBd2z0MEdXZ6emDa1zFHq5O5bSA== +esbuild-sunos-64@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.5.tgz#d794da1ae60e6e2f6194c44d7b3c66bf66c7a141" + integrity sha512-2sIzhMUfLNoD+rdmV6AacilCHSxZIoGAU2oT7XmJ0lXcZWnCvCtObvO6D4puxX9YRE97GodciRGDLBaiC6x1SA== -esbuild@^0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.2.tgz#9c1e1a652549cc33e44885eea42ea2cc6267edc2" - integrity sha512-l076A6o/PIgcyM24s0dWmDI/b8RQf41uWoJu9I0M71CtW/YSw5T5NUeXxs5lo2tFQD+O4CW4nBHJXx3OY5NpXg== +esbuild-windows-32@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.5.tgz#0670326903f421424be86bc03b7f7b3ff86a9db7" + integrity sha512-e+duNED9UBop7Vnlap6XKedA/53lIi12xv2ebeNS4gFmu7aKyTrok7DPIZyU5w/ftHD4MUDs5PJUkQPP9xJRzg== + +esbuild-windows-64@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.5.tgz#64f32acb7341f3f0a4d10e8ff1998c2d1ebfc0a9" + integrity sha512-v+PjvNtSASHOjPDMIai9Yi+aP+Vwox+3WVdg2JB8N9aivJ7lyhp4NVU+J0MV2OkWFPnVO8AE/7xH+72ibUUEnw== + +esbuild-windows-arm64@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.5.tgz#4fe7f333ce22a922906b10233c62171673a3854b" + integrity sha512-Yz8w/D8CUPYstvVQujByu6mlf48lKmXkq6bkeSZZxTA626efQOJb26aDGLzmFWx6eg/FwrXgt6SZs9V8Pwy/aA== + +esbuild@0.15.5: + version "0.15.5" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.5.tgz#5effd05666f621d4ff2fe2c76a67c198292193ff" + integrity sha512-VSf6S1QVqvxfIsSKb3UKr3VhUCis7wgDbtF4Vd9z84UJr05/Sp2fRKmzC+CSPG/dNAPPJZ0BTBLTT1Fhd6N9Gg== optionalDependencies: - esbuild-android-arm64 "0.14.2" - esbuild-darwin-64 "0.14.2" - esbuild-darwin-arm64 "0.14.2" - esbuild-freebsd-64 "0.14.2" - esbuild-freebsd-arm64 "0.14.2" - esbuild-linux-32 "0.14.2" - esbuild-linux-64 "0.14.2" - esbuild-linux-arm "0.14.2" - esbuild-linux-arm64 "0.14.2" - esbuild-linux-mips64le "0.14.2" - esbuild-linux-ppc64le "0.14.2" - esbuild-netbsd-64 "0.14.2" - esbuild-openbsd-64 "0.14.2" - esbuild-sunos-64 "0.14.2" - esbuild-windows-32 "0.14.2" - esbuild-windows-64 "0.14.2" - esbuild-windows-arm64 "0.14.2" + "@esbuild/linux-loong64" "0.15.5" + esbuild-android-64 "0.15.5" + esbuild-android-arm64 "0.15.5" + esbuild-darwin-64 "0.15.5" + esbuild-darwin-arm64 "0.15.5" + esbuild-freebsd-64 "0.15.5" + esbuild-freebsd-arm64 "0.15.5" + esbuild-linux-32 "0.15.5" + esbuild-linux-64 "0.15.5" + esbuild-linux-arm "0.15.5" + esbuild-linux-arm64 "0.15.5" + esbuild-linux-mips64le "0.15.5" + esbuild-linux-ppc64le "0.15.5" + esbuild-linux-riscv64 "0.15.5" + esbuild-linux-s390x "0.15.5" + esbuild-netbsd-64 "0.15.5" + esbuild-openbsd-64 "0.15.5" + esbuild-sunos-64 "0.15.5" + esbuild-windows-32 "0.15.5" + esbuild-windows-64 "0.15.5" + esbuild-windows-arm64 "0.15.5" escape-string-regexp@^1.0.5: version "1.0.5" @@ -1672,48 +1500,6 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -eslint-scope@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - -eslint-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" - integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== - dependencies: - eslint-visitor-keys "^2.0.0" - -eslint-visitor-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" - integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== - -eslint-visitor-keys@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz#6fbb166a6798ee5991358bc2daa1ba76cc1254a1" - integrity sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ== - -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - -estraverse@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== - events@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" @@ -1753,29 +1539,11 @@ fancy-log@^1.3.3: parse-node-version "^1.0.0" time-stamp "^1.0.0" -fast-glob@^3.2.9: - version "3.2.11" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" - integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" - fast-json-stable-stringify@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== - dependencies: - reusify "^1.0.4" - fd-slicer@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" @@ -1901,7 +1669,7 @@ github-from-package@0.0.0: resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= -glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.0: +glob-parent@^5.1.1, glob-parent@~5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -1962,29 +1730,17 @@ globalthis@^1.0.1: dependencies: define-properties "^1.1.3" -globby@^11.0.4: - version "11.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" - integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== - dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.2.9" - ignore "^5.2.0" - merge2 "^1.4.1" - slash "^3.0.0" - -got@11.8.1: - version "11.8.1" - resolved "https://registry.yarnpkg.com/got/-/got-11.8.1.tgz#df04adfaf2e782babb3daabc79139feec2f7e85d" - integrity sha512-9aYdZL+6nHmvJwHALLwKSUZ0hMwGaJGYv3hoPLPgnT8BoBXm1SjnZeky+91tfwJaDzun2s4RsBRy48IEYv2q2Q== +got@11.8.5: + version "11.8.5" + resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046" + integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ== dependencies: "@sindresorhus/is" "^4.0.0" "@szmarczak/http-timer" "^4.0.5" "@types/cacheable-request" "^6.0.1" "@types/responselike" "^1.0.0" cacheable-lookup "^5.0.3" - cacheable-request "^7.0.1" + cacheable-request "^7.0.2" decompress-response "^6.0.0" http2-wrapper "^1.0.0-beta.5.2" lowercase-keys "^2.0.0" @@ -2125,11 +1881,6 @@ ieee754@^1.1.13: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -ignore@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" - integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== - inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -2191,7 +1942,7 @@ is-glob@^4.0.1: dependencies: is-extglob "^2.1.1" -is-glob@^4.0.3, is-glob@~4.0.1: +is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== @@ -2473,19 +2224,6 @@ mdurl@^1.0.1: resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= -merge2@^1.3.0, merge2@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== - -micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== - dependencies: - braces "^3.0.1" - picomatch "^2.2.3" - mime-db@1.45.0: version "1.45.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" @@ -2604,6 +2342,11 @@ normalize-url@^4.1.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== +normalize-url@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== + npm-conf@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" @@ -2734,11 +2477,6 @@ path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" @@ -2749,7 +2487,7 @@ picomatch@^2.0.4: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== -picomatch@^2.2.1, picomatch@^2.2.3: +picomatch@^2.2.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -2865,11 +2603,6 @@ qs@^6.9.1: dependencies: side-channel "^1.0.4" -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== - quick-lru@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" @@ -2950,11 +2683,6 @@ responselike@^2.0.0: dependencies: lowercase-keys "^2.0.0" -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== - rimraf@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" @@ -2974,13 +2702,6 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" -run-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" - safe-buffer@^5.0.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" @@ -3006,7 +2727,7 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= -semver@^5.1.0, semver@^5.3.0: +semver@^5.1.0: version "5.6.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== @@ -3028,13 +2749,6 @@ semver@^7.3.2: dependencies: lru-cache "^6.0.0" -semver@^7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== - dependencies: - lru-cache "^6.0.0" - serialize-error@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" @@ -3059,11 +2773,6 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shimmer@^1.1.0, shimmer@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" - integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== - side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -3092,11 +2801,6 @@ simple-get@^3.0.3: once "^1.3.1" simple-concat "^1.0.0" -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" @@ -3117,11 +2821,6 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= -stack-chain@^1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285" - integrity sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU= - stoppable@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/stoppable/-/stoppable-1.1.0.tgz#32da568e83ea488b08e4d7ea2c3bcc9d75015d5b" @@ -3326,11 +3025,6 @@ tslib@^1.10.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^1.8.1: - version "1.9.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" - integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== - tslib@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" @@ -3341,13 +3035,6 @@ tslib@^2.2.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== -tsutils@^3.21.0: - version "3.21.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" - integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== - dependencies: - tslib "^1.8.1" - tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" diff --git a/cglicenses.json b/cglicenses.json index e969eb826e9..b2ab858f969 100644 --- a/cglicenses.json +++ b/cglicenses.json @@ -32,20 +32,6 @@ "Copyright (c) tunnel-agent authors" ] }, - { - // Reason: Waiting for https://github.com/segmentio/noop-logger/issues/2 - "name": "noop-logger", - "fullLicenseText": [ - "This project is licensed under the MIT license.", - "Copyrights are respective of each contributor listed at the beginning of each definition file.", - "", - "Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:", - "", - "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.", - "", - "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." - ] - }, { // Reason: The license at https://github.com/rbuckton/reflect-metadata/blob/master/LICENSE // does not include a clear Copyright statement (it's in https://github.com/rbuckton/reflect-metadata/blob/master/CopyrightNotice.txt). @@ -102,36 +88,6 @@ "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." ] }, - { - // Reason: Repository lacks license text. - // https://github.com/othiym23/emitter-listener/blob/master/package.json declares BSD-2-Clause. - // https://github.com/othiym23/emitter-listener/issues/3 - "name": "emitter-listener", - "fullLicenseText": [ - "BSD 2-Clause \"Simplified\" License", - "Copyright (c) 2018, Forrest L Norvell ", - "", - "Redistribution and use in source and binary forms, with or without", - "modification, are permitted provided that the following conditions are met:", - "", - "1. Redistributions of source code must retain the above copyright notice, this", - " list of conditions and the following disclaimer.", - "2. Redistributions in binary form must reproduce the above copyright notice,", - " this list of conditions and the following disclaimer in the documentation", - " and/or other materials provided with the distribution.", - "", - "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND", - "ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED", - "WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE", - "DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR", - "ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES", - "(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;", - "LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND", - "ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT", - "(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS", - "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ] - }, { // Reason: Repository lacks license text. // https://github.com/tjwebb/fnv-plus/blob/master/package.json declares MIT. @@ -147,5 +103,209 @@ "", "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." ] + }, + { + "name": "@vscode/win32-app-container-tokens", + "fullLicenseText": [ + "MIT License", + "", + "Copyright (c) Microsoft Corporation.", + "", + "Permission is hereby granted, free of charge, to any person obtaining a copy", + "of this software and associated documentation files (the \"Software\"), to deal", + "in the Software without restriction, including without limitation the rights", + "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell", + "copies of the Software, and to permit persons to whom the Software is", + "furnished to do so, subject to the following conditions:", + "", + "The above copyright notice and this permission notice shall be included in all", + "copies or substantial portions of the Software.", + "", + "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR", + "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,", + "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", + "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER", + "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,", + "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE", + "SOFTWARE" + ] + }, + { + // Reason: Missing license file + "name": "@tokenizer/token", + "fullLicenseText": [ + "(The MIT License)", + "", + "Copyright (c) 2020 Borewit", + "", + "Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:", + "", + "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.", + "", + "THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." + ] + }, + { + // Reason: Missing license file + "name": "readable-web-to-node-stream", + "fullLicenseText": [ + "(The MIT License)", + "", + "Copyright (c) 2019 Borewit", + "", + "Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:", + "", + "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.", + "", + "THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." + ] + }, + { + // Reason: The substack org has been deleted on GH + "name": "concat-map", + "fullLicenseText": [ + "This software is released under the MIT license:", + "", + "Permission is hereby granted, free of charge, to any person obtaining a copy of", + "this software and associated documentation files (the \"Software\"), to deal in", + "the Software without restriction, including without limitation the rights to", + "use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of", + "the Software, and to permit persons to whom the Software is furnished to do so,", + "subject to the following conditions:", + "", + "The above copyright notice and this permission notice shall be included in all", + "copies or substantial portions of the Software.", + "", + "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR", + "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS", + "FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR", + "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER", + "IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", + "CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." + ] + }, + { + // Reason: The substack org has been deleted on GH + "name": "github-from-package", + "fullLicenseText": [ + "This software is released under the MIT license:", + "", + "Permission is hereby granted, free of charge, to any person obtaining a copy of", + "this software and associated documentation files (the \"Software\"), to deal in", + "the Software without restriction, including without limitation the rights to", + "use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of", + "the Software, and to permit persons to whom the Software is furnished to do so,", + "subject to the following conditions:", + "", + "The above copyright notice and this permission notice shall be included in all", + "copies or substantial portions of the Software.", + "", + "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR", + "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS", + "FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR", + "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER", + "IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", + "CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." + ] + }, + { + // Reason: The substack org has been deleted on GH + "name": "minimist", + "fullLicenseText": [ + "This software is released under the MIT license:", + "", + "Permission is hereby granted, free of charge, to any person obtaining a copy of", + "this software and associated documentation files (the \"Software\"), to deal in", + "the Software without restriction, including without limitation the rights to", + "use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of", + "the Software, and to permit persons to whom the Software is furnished to do so,", + "subject to the following conditions:", + "", + "The above copyright notice and this permission notice shall be included in all", + "copies or substantial portions of the Software.", + "", + "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR", + "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS", + "FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR", + "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER", + "IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", + "CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." + ] + }, + { + // Reason: The substack org has been deleted on GH + "name": "mkdirp", + "fullLicenseText": [ + "Copyright 2010 James Halliday (mail@substack.net)", + "", + "This project is free software released under the MIT/X11 license:", + "", + "Permission is hereby granted, free of charge, to any person obtaining a copy", + "of this software and associated documentation files (the \"Software\"), to deal", + "in the Software without restriction, including without limitation the rights", + "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell", + "copies of the Software, and to permit persons to whom the Software is", + "furnished to do so, subject to the following conditions:", + "", + "The above copyright notice and this permission notice shall be included in", + "all copies or substantial portions of the Software.", + "", + "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR", + "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,", + "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", + "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER", + "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,", + "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN", + "THE SOFTWARE." + ] + }, + { + // Reason: repo URI is wrong on crate, pending https://github.com/warp-tech/russh/pull/53 + "name": "russh-cryptovec", + "fullLicenseTextUri": "https://raw.githubusercontent.com/warp-tech/russh/1da80d0d599b6ee2d257c544c0d6af4f649c9029/LICENSE-2.0.txt" + }, + { + // Reason: repo URI is wrong on crate, pending https://github.com/warp-tech/russh/pull/53 + "name": "russh-keys", + "fullLicenseTextUri": "https://raw.githubusercontent.com/warp-tech/russh/1da80d0d599b6ee2d257c544c0d6af4f649c9029/LICENSE-2.0.txt" + }, + { + // Reason: license is in a subdirectory in repo + "name": "dirs-next", + "fullLicenseTextUri": "https://raw.githubusercontent.com/xdg-rs/dirs/af4aa39daba0ac68e222962a5aca17360158b7cc/dirs/LICENSE-MIT" + }, + { + // Reason: license is in a subdirectory in repo + "name": "openssl", + "fullLicenseTextUri": "https://raw.githubusercontent.com/sfackler/rust-openssl/e43eb58540b27a17f8029c397e3edc12bbc9011f/openssl/LICENSE" + }, + { + // Reason: license is in a subdirectory in repo + "name": "openssl-sys", + "fullLicenseTextUri": "https://raw.githubusercontent.com/sfackler/rust-openssl/e43eb58540b27a17f8029c397e3edc12bbc9011f/openssl-sys/LICENSE-MIT" + }, + { + // Reason: Missing license file + "name": "openssl-macros", + "fullLicenseText": [ + "This software is released under the MIT license:", + "", + "Permission is hereby granted, free of charge, to any person obtaining a copy of", + "this software and associated documentation files (the \"Software\"), to deal in", + "the Software without restriction, including without limitation the rights to", + "use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of", + "the Software, and to permit persons to whom the Software is furnished to do so,", + "subject to the following conditions:", + "", + "The above copyright notice and this permission notice shall be included in all", + "copies or substantial portions of the Software.", + "", + "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR", + "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS", + "FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR", + "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER", + "IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN", + "CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." + ] } ] diff --git a/cgmanifest.json b/cgmanifest.json index f87b67727c9..521f2082aa5 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "chromium", "repositoryUrl": "https://chromium.googlesource.com/chromium/src", - "commitHash": "e2aa76f05f3a6ccadbf43e37f5dfc195cc090b6a" + "commitHash": "16e28102fdf876ce6d136674ba66343ede07441f" } }, "licenseDetail": [ @@ -40,7 +40,475 @@ "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ], "isOnlyProductionDependency": true, - "version": "98.0.4758.141" + "version": "102.0.5005.167" + }, + { + "component": { + "type": "git", + "git": { + "name": "ffmpeg", + "repositoryUrl": "https://chromium.googlesource.com/chromium/third_party/ffmpeg", + "commitHash": "5cd95cdf972ad92c38a4ea2d059ac9d6167302ca" + } + }, + "isOnlyProductionDependency": true, + "license": "LGPL-2.1+", + "version": "4.4.git", + "licenseDetail": [ + " GNU LESSER GENERAL PUBLIC LICENSE", + " Version 2.1, February 1999", + " Copyright (C) 1991, 1999 Free Software Foundation, Inc.", + " 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA", + " Everyone is permitted to copy and distribute verbatim copies", + " of this license document, but changing it is not allowed.", + "[This is the first released version of the Lesser GPL. It also counts", + " as the successor of the GNU Library Public License, version 2, hence", + " the version number 2.1.]", + " Preamble", + " The licenses for most software are designed to take away your", + "freedom to share and change it. By contrast, the GNU General Public", + "Licenses are intended to guarantee your freedom to share and change", + "free software--to make sure the software is free for all its users.", + " This license, the Lesser General Public License, applies to some", + "specially designated software packages--typically libraries--of the", + "Free Software Foundation and other authors who decide to use it. You", + "can use it too, but we suggest you first think carefully about whether", + "this license or the ordinary General Public License is the better", + "strategy to use in any particular case, based on the explanations below.", + " When we speak of free software, we are referring to freedom of use,", + "not price. Our General Public Licenses are designed to make sure that", + "you have the freedom to distribute copies of free software (and charge", + "for this service if you wish); that you receive source code or can get", + "it if you want it; that you can change the software and use pieces of", + "it in new free programs; and that you are informed that you can do", + "these things.", + " To protect your rights, we need to make restrictions that forbid", + "distributors to deny you these rights or to ask you to surrender these", + "rights. These restrictions translate to certain responsibilities for", + "you if you distribute copies of the library or if you modify it.", + " For example, if you distribute copies of the library, whether gratis", + "or for a fee, you must give the recipients all the rights that we gave", + "you. You must make sure that they, too, receive or can get the source", + "code. If you link other code with the library, you must provide", + "complete object files to the recipients, so that they can relink them", + "with the library after making changes to the library and recompiling", + "it. And you must show them these terms so they know their rights.", + " We protect your rights with a two-step method: (1) we copyright the", + "library, and (2) we offer you this license, which gives you legal", + "permission to copy, distribute and/or modify the library.", + " To protect each distributor, we want to make it very clear that", + "there is no warranty for the free library. Also, if the library is", + "modified by someone else and passed on, the recipients should know", + "that what they have is not the original version, so that the original", + "author's reputation will not be affected by problems that might be", + "introduced by others.", + "", + " Finally, software patents pose a constant threat to the existence of", + "any free program. We wish to make sure that a company cannot", + "effectively restrict the users of a free program by obtaining a", + "restrictive license from a patent holder. Therefore, we insist that", + "any patent license obtained for a version of the library must be", + "consistent with the full freedom of use specified in this license.", + " Most GNU software, including some libraries, is covered by the", + "ordinary GNU General Public License. This license, the GNU Lesser", + "General Public License, applies to certain designated libraries, and", + "is quite different from the ordinary General Public License. We use", + "this license for certain libraries in order to permit linking those", + "libraries into non-free programs.", + " When a program is linked with a library, whether statically or using", + "a shared library, the combination of the two is legally speaking a", + "combined work, a derivative of the original library. The ordinary", + "General Public License therefore permits such linking only if the", + "entire combination fits its criteria of freedom. The Lesser General", + "Public License permits more lax criteria for linking other code with", + "the library.", + " We call this license the \"Lesser\" General Public License because it", + "does Less to protect the user's freedom than the ordinary General", + "Public License. It also provides other free software developers Less", + "of an advantage over competing non-free programs. These disadvantages", + "are the reason we use the ordinary General Public License for many", + "libraries. However, the Lesser license provides advantages in certain", + "special circumstances.", + " For example, on rare occasions, there may be a special need to", + "encourage the widest possible use of a certain library, so that it becomes", + "a de-facto standard. To achieve this, non-free programs must be", + "allowed to use the library. A more frequent case is that a free", + "library does the same job as widely used non-free libraries. In this", + "case, there is little to gain by limiting the free library to free", + "software only, so we use the Lesser General Public License.", + " In other cases, permission to use a particular library in non-free", + "programs enables a greater number of people to use a large body of", + "free software. For example, permission to use the GNU C Library in", + "non-free programs enables many more people to use the whole GNU", + "operating system, as well as its variant, the GNU/Linux operating", + "system.", + " Although the Lesser General Public License is Less protective of the", + "users' freedom, it does ensure that the user of a program that is", + "linked with the Library has the freedom and the wherewithal to run", + "that program using a modified version of the Library.", + " The precise terms and conditions for copying, distribution and", + "modification follow. Pay close attention to the difference between a", + "\"work based on the library\" and a \"work that uses the library\". The", + "former contains code derived from the library, whereas the latter must", + "be combined with the library in order to run.", + "", + " GNU LESSER GENERAL PUBLIC LICENSE", + " TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION", + " 0. This License Agreement applies to any software library or other", + "program which contains a notice placed by the copyright holder or", + "other authorized party saying it may be distributed under the terms of", + "this Lesser General Public License (also called \"this License\").", + "Each licensee is addressed as \"you\".", + " A \"library\" means a collection of software functions and/or data", + "prepared so as to be conveniently linked with application programs", + "(which use some of those functions and data) to form executables.", + " The \"Library\", below, refers to any such software library or work", + "which has been distributed under these terms. A \"work based on the", + "Library\" means either the Library or any derivative work under", + "copyright law: that is to say, a work containing the Library or a", + "portion of it, either verbatim or with modifications and/or translated", + "straightforwardly into another language. (Hereinafter, translation is", + "included without limitation in the term \"modification\".)", + " \"Source code\" for a work means the preferred form of the work for", + "making modifications to it. For a library, complete source code means", + "all the source code for all modules it contains, plus any associated", + "interface definition files, plus the scripts used to control compilation", + "and installation of the library.", + " Activities other than copying, distribution and modification are not", + "covered by this License; they are outside its scope. The act of", + "running a program using the Library is not restricted, and output from", + "such a program is covered only if its contents constitute a work based", + "on the Library (independent of the use of the Library in a tool for", + "writing it). Whether that is true depends on what the Library does", + "and what the program that uses the Library does.", + " 1. You may copy and distribute verbatim copies of the Library's", + "complete source code as you receive it, in any medium, provided that", + "you conspicuously and appropriately publish on each copy an", + "appropriate copyright notice and disclaimer of warranty; keep intact", + "all the notices that refer to this License and to the absence of any", + "warranty; and distribute a copy of this License along with the", + "Library.", + " You may charge a fee for the physical act of transferring a copy,", + "and you may at your option offer warranty protection in exchange for a", + "fee.", + "", + " 2. You may modify your copy or copies of the Library or any portion", + "of it, thus forming a work based on the Library, and copy and", + "distribute such modifications or work under the terms of Section 1", + "above, provided that you also meet all of these conditions:", + " a) The modified work must itself be a software library.", + " b) You must cause the files modified to carry prominent notices", + " stating that you changed the files and the date of any change.", + " c) You must cause the whole of the work to be licensed at no", + " charge to all third parties under the terms of this License.", + " d) If a facility in the modified Library refers to a function or a", + " table of data to be supplied by an application program that uses", + " the facility, other than as an argument passed when the facility", + " is invoked, then you must make a good faith effort to ensure that,", + " in the event an application does not supply such function or", + " table, the facility still operates, and performs whatever part of", + " its purpose remains meaningful.", + " (For example, a function in a library to compute square roots has", + " a purpose that is entirely well-defined independent of the", + " application. Therefore, Subsection 2d requires that any", + " application-supplied function or table used by this function must", + " be optional: if the application does not supply it, the square", + " root function must still compute square roots.)", + "These requirements apply to the modified work as a whole. If", + "identifiable sections of that work are not derived from the Library,", + "and can be reasonably considered independent and separate works in", + "themselves, then this License, and its terms, do not apply to those", + "sections when you distribute them as separate works. But when you", + "distribute the same sections as part of a whole which is a work based", + "on the Library, the distribution of the whole must be on the terms of", + "this License, whose permissions for other licensees extend to the", + "entire whole, and thus to each and every part regardless of who wrote", + "it.", + "Thus, it is not the intent of this section to claim rights or contest", + "your rights to work written entirely by you; rather, the intent is to", + "exercise the right to control the distribution of derivative or", + "collective works based on the Library.", + "In addition, mere aggregation of another work not based on the Library", + "with the Library (or with a work based on the Library) on a volume of", + "a storage or distribution medium does not bring the other work under", + "the scope of this License.", + " 3. You may opt to apply the terms of the ordinary GNU General Public", + "License instead of this License to a given copy of the Library. To do", + "this, you must alter all the notices that refer to this License, so", + "that they refer to the ordinary GNU General Public License, version 2,", + "instead of to this License. (If a newer version than version 2 of the", + "ordinary GNU General Public License has appeared, then you can specify", + "that version instead if you wish.) Do not make any other change in", + "these notices.", + "", + " Once this change is made in a given copy, it is irreversible for", + "that copy, so the ordinary GNU General Public License applies to all", + "subsequent copies and derivative works made from that copy.", + " This option is useful when you wish to copy part of the code of", + "the Library into a program that is not a library.", + " 4. You may copy and distribute the Library (or a portion or", + "derivative of it, under Section 2) in object code or executable form", + "under the terms of Sections 1 and 2 above provided that you accompany", + "it with the complete corresponding machine-readable source code, which", + "must be distributed under the terms of Sections 1 and 2 above on a", + "medium customarily used for software interchange.", + " If distribution of object code is made by offering access to copy", + "from a designated place, then offering equivalent access to copy the", + "source code from the same place satisfies the requirement to", + "distribute the source code, even though third parties are not", + "compelled to copy the source along with the object code.", + " 5. A program that contains no derivative of any portion of the", + "Library, but is designed to work with the Library by being compiled or", + "linked with it, is called a \"work that uses the Library\". Such a", + "work, in isolation, is not a derivative work of the Library, and", + "therefore falls outside the scope of this License.", + " However, linking a \"work that uses the Library\" with the Library", + "creates an executable that is a derivative of the Library (because it", + "contains portions of the Library), rather than a \"work that uses the", + "library\". The executable is therefore covered by this License.", + "Section 6 states terms for distribution of such executables.", + " When a \"work that uses the Library\" uses material from a header file", + "that is part of the Library, the object code for the work may be a", + "derivative work of the Library even though the source code is not.", + "Whether this is true is especially significant if the work can be", + "linked without the Library, or if the work is itself a library. The", + "threshold for this to be true is not precisely defined by law.", + " If such an object file uses only numerical parameters, data", + "structure layouts and accessors, and small macros and small inline", + "functions (ten lines or less in length), then the use of the object", + "file is unrestricted, regardless of whether it is legally a derivative", + "work. (Executables containing this object code plus portions of the", + "Library will still fall under Section 6.)", + " Otherwise, if the work is a derivative of the Library, you may", + "distribute the object code for the work under the terms of Section 6.", + "Any executables containing that work also fall under Section 6,", + "whether or not they are linked directly with the Library itself.", + "", + " 6. As an exception to the Sections above, you may also combine or", + "link a \"work that uses the Library\" with the Library to produce a", + "work containing portions of the Library, and distribute that work", + "under terms of your choice, provided that the terms permit", + "modification of the work for the customer's own use and reverse", + "engineering for debugging such modifications.", + " You must give prominent notice with each copy of the work that the", + "Library is used in it and that the Library and its use are covered by", + "this License. You must supply a copy of this License. If the work", + "during execution displays copyright notices, you must include the", + "copyright notice for the Library among them, as well as a reference", + "directing the user to the copy of this License. Also, you must do one", + "of these things:", + " a) Accompany the work with the complete corresponding", + " machine-readable source code for the Library including whatever", + " changes were used in the work (which must be distributed under", + " Sections 1 and 2 above); and, if the work is an executable linked", + " with the Library, with the complete machine-readable \"work that", + " uses the Library\", as object code and/or source code, so that the", + " user can modify the Library and then relink to produce a modified", + " executable containing the modified Library. (It is understood", + " that the user who changes the contents of definitions files in the", + " Library will not necessarily be able to recompile the application", + " to use the modified definitions.)", + " b) Use a suitable shared library mechanism for linking with the", + " Library. A suitable mechanism is one that (1) uses at run time a", + " copy of the library already present on the user's computer system,", + " rather than copying library functions into the executable, and (2)", + " will operate properly with a modified version of the library, if", + " the user installs one, as long as the modified version is", + " interface-compatible with the version that the work was made with.", + " c) Accompany the work with a written offer, valid for at", + " least three years, to give the same user the materials", + " specified in Subsection 6a, above, for a charge no more", + " than the cost of performing this distribution.", + " d) If distribution of the work is made by offering access to copy", + " from a designated place, offer equivalent access to copy the above", + " specified materials from the same place.", + " e) Verify that the user has already received a copy of these", + " materials or that you have already sent this user a copy.", + " For an executable, the required form of the \"work that uses the", + "Library\" must include any data and utility programs needed for", + "reproducing the executable from it. However, as a special exception,", + "the materials to be distributed need not include anything that is", + "normally distributed (in either source or binary form) with the major", + "components (compiler, kernel, and so on) of the operating system on", + "which the executable runs, unless that component itself accompanies", + "the executable.", + " It may happen that this requirement contradicts the license", + "restrictions of other proprietary libraries that do not normally", + "accompany the operating system. Such a contradiction means you cannot", + "use both them and the Library together in an executable that you", + "distribute.", + "", + " 7. You may place library facilities that are a work based on the", + "Library side-by-side in a single library together with other library", + "facilities not covered by this License, and distribute such a combined", + "library, provided that the separate distribution of the work based on", + "the Library and of the other library facilities is otherwise", + "permitted, and provided that you do these two things:", + " a) Accompany the combined library with a copy of the same work", + " based on the Library, uncombined with any other library", + " facilities. This must be distributed under the terms of the", + " Sections above.", + " b) Give prominent notice with the combined library of the fact", + " that part of it is a work based on the Library, and explaining", + " where to find the accompanying uncombined form of the same work.", + " 8. You may not copy, modify, sublicense, link with, or distribute", + "the Library except as expressly provided under this License. Any", + "attempt otherwise to copy, modify, sublicense, link with, or", + "distribute the Library is void, and will automatically terminate your", + "rights under this License. However, parties who have received copies,", + "or rights, from you under this License will not have their licenses", + "terminated so long as such parties remain in full compliance.", + " 9. You are not required to accept this License, since you have not", + "signed it. However, nothing else grants you permission to modify or", + "distribute the Library or its derivative works. These actions are", + "prohibited by law if you do not accept this License. Therefore, by", + "modifying or distributing the Library (or any work based on the", + "Library), you indicate your acceptance of this License to do so, and", + "all its terms and conditions for copying, distributing or modifying", + "the Library or works based on it.", + " 10. Each time you redistribute the Library (or any work based on the", + "Library), the recipient automatically receives a license from the", + "original licensor to copy, distribute, link with or modify the Library", + "subject to these terms and conditions. You may not impose any further", + "restrictions on the recipients' exercise of the rights granted herein.", + "You are not responsible for enforcing compliance by third parties with", + "this License.", + "", + " 11. If, as a consequence of a court judgment or allegation of patent", + "infringement or for any other reason (not limited to patent issues),", + "conditions are imposed on you (whether by court order, agreement or", + "otherwise) that contradict the conditions of this License, they do not", + "excuse you from the conditions of this License. If you cannot", + "distribute so as to satisfy simultaneously your obligations under this", + "License and any other pertinent obligations, then as a consequence you", + "may not distribute the Library at all. For example, if a patent", + "license would not permit royalty-free redistribution of the Library by", + "all those who receive copies directly or indirectly through you, then", + "the only way you could satisfy both it and this License would be to", + "refrain entirely from distribution of the Library.", + "If any portion of this section is held invalid or unenforceable under any", + "particular circumstance, the balance of the section is intended to apply,", + "and the section as a whole is intended to apply in other circumstances.", + "It is not the purpose of this section to induce you to infringe any", + "patents or other property right claims or to contest validity of any", + "such claims; this section has the sole purpose of protecting the", + "integrity of the free software distribution system which is", + "implemented by public license practices. Many people have made", + "generous contributions to the wide range of software distributed", + "through that system in reliance on consistent application of that", + "system; it is up to the author/donor to decide if he or she is willing", + "to distribute software through any other system and a licensee cannot", + "impose that choice.", + "This section is intended to make thoroughly clear what is believed to", + "be a consequence of the rest of this License.", + " 12. If the distribution and/or use of the Library is restricted in", + "certain countries either by patents or by copyrighted interfaces, the", + "original copyright holder who places the Library under this License may add", + "an explicit geographical distribution limitation excluding those countries,", + "so that distribution is permitted only in or among countries not thus", + "excluded. In such case, this License incorporates the limitation as if", + "written in the body of this License.", + " 13. The Free Software Foundation may publish revised and/or new", + "versions of the Lesser General Public License from time to time.", + "Such new versions will be similar in spirit to the present version,", + "but may differ in detail to address new problems or concerns.", + "Each version is given a distinguishing version number. If the Library", + "specifies a version number of this License which applies to it and", + "\"any later version\", you have the option of following the terms and", + "conditions either of that version or of any later version published by", + "the Free Software Foundation. If the Library does not specify a", + "license version number, you may choose any version ever published by", + "the Free Software Foundation.", + "", + " 14. If you wish to incorporate parts of the Library into other free", + "programs whose distribution conditions are incompatible with these,", + "write to the author to ask for permission. For software which is", + "copyrighted by the Free Software Foundation, write to the Free", + "Software Foundation; we sometimes make exceptions for this. Our", + "decision will be guided by the two goals of preserving the free status", + "of all derivatives of our free software and of promoting the sharing", + "and reuse of software generally.", + " NO WARRANTY", + " 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO", + "WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.", + "EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR", + "OTHER PARTIES PROVIDE THE LIBRARY \"AS IS\" WITHOUT WARRANTY OF ANY", + "KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE", + "IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR", + "PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE", + "LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME", + "THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.", + " 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN", + "WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY", + "AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU", + "FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR", + "CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE", + "LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING", + "RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A", + "FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF", + "SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH", + "DAMAGES.", + " END OF TERMS AND CONDITIONS", + "", + " How to Apply These Terms to Your New Libraries", + " If you develop a new library, and you want it to be of the greatest", + "possible use to the public, we recommend making it free software that", + "everyone can redistribute and change. You can do so by permitting", + "redistribution under these terms (or, alternatively, under the terms of the", + "ordinary General Public License).", + " To apply these terms, attach the following notices to the library. It is", + "safest to attach them to the start of each source file to most effectively", + "convey the exclusion of warranty; and each file should have at least the", + "\"copyright\" line and a pointer to where the full notice is found.", + " ", + " Copyright (C) ", + " This library is free software; you can redistribute it and/or", + " modify it under the terms of the GNU Lesser General Public", + " License as published by the Free Software Foundation; either", + " version 2.1 of the License, or (at your option) any later version.", + " This library is distributed in the hope that it will be useful,", + " but WITHOUT ANY WARRANTY; without even the implied warranty of", + " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU", + " Lesser General Public License for more details.", + " You should have received a copy of the GNU Lesser General Public", + " License along with this library; if not, write to the Free Software", + " Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA", + "Also add information on how to contact you by electronic and paper mail.", + "You should also get your employer (if you work as a programmer) or your", + "school, if any, to sign a \"copyright disclaimer\" for the library, if", + "necessary. Here is a sample; alter the names:", + " Yoyodyne, Inc., hereby disclaims all copyright interest in the", + " library `Frob' (a library for tweaking knobs) written by James Random Hacker.", + " , 1 April 1990", + " Ty Coon, President of Vice", + "That's all there is to it!" + ] + }, + { + "component": { + "type": "other", + "other": { + "name": "H.264/AVC Video Standard", + "downloadUrl": "https://chromium.googlesource.com/chromium/third_party/ffmpeg", + "version": "4.4.git" + } + }, + "licenseDetail": [ + "This product is licensed under the AVC patent portfolio license for the personal", + "and non-commercial use of a consumer to (i) encode video in compliance with the AVC standard (\"AVC VIDEO\")", + "and/or (ii) decode AVC video that was encoded by a consumer", + "engaged in a personal and non-commercial activity and/or was obtained from a video provider", + "licensed to provide AVC video. No license is granted or shall be implied for any other use.", + "Additional information may be obtained from MPEG LA LLC. See http://www.MPEGLA.COM.", + "", + "For clarification purposes, this notice does not limit or inhibit the use of the product", + "for normal business uses that are personal to that business which do not include", + "(i) redistribution of the product to third parties, or", + "(ii) creation of content with AVC Standard compliant technologies for distribution to third parties." + ], + "version": "H.264 (08/21)", + "isOnlyProductionDependency": true, + "license": "OTHER" }, { "component": { @@ -48,11 +516,11 @@ "git": { "name": "nodejs", "repositoryUrl": "https://github.com/nodejs/node", - "commitHash": "40ecd5601193c316e62e9216e8a4259130686208" + "commitHash": "442e84a358d75152556b5d087e4dd6a51615330d" } }, "isOnlyProductionDependency": true, - "version": "16.13.0" + "version": "16.14.2" }, { "component": { @@ -60,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "3a1945bd6c62459a457bd8d0b922259234816e22" + "commitHash": "0e6da36264d52656d5cd36a4c15937a6a6ca778e" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "17.4.6" + "version": "19.0.17" }, { "component": { @@ -539,6 +1007,98 @@ "isOnlyProductionDependency": true, "license": "MIT", "version": "0.10.0" + }, + { + "name": "@vscode/win32-app-container-tokens", + "component": { + "type": "git", + "git": { + "name": "vscode-win32-app-container-tokens", + "repositoryUrl": "https://github.com/microsoft/vscode-win32-app-container-tokens", + "commitHash": "5b871f95fd9cb8efa8ee9a80600510d5e5339137" + } + }, + "licenseDetail": [ + "MIT License", + "", + "Copyright (c) Microsoft Corporation.", + "", + "Permission is hereby granted, free of charge, to any person obtaining a copy", + "of this software and associated documentation files (the \"Software\"), to deal", + "in the Software without restriction, including without limitation the rights", + "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell", + "copies of the Software, and to permit persons to whom the Software is", + "furnished to do so, subject to the following conditions:", + "", + "The above copyright notice and this permission notice shall be included in all", + "copies or substantial portions of the Software.", + "", + "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR", + "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,", + "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", + "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER", + "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,", + "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE", + "SOFTWARE" + ] + }, + { + "component": { + "type": "npm", + "npm": { + "name": "@iktakahiro/markdown-it-katex", + "version": "4.0.2" + } + }, + "repositoryUrl": "https://github.com/mjbvz/markdown-it-katex", + "licenseDetail": [ + "The MIT License (MIT)", + "", + "Copyright (c) 2016 Waylon Flinn", + "", + "Permission is hereby granted, free of charge, to any person obtaining a copy", + "of this software and associated documentation files (the \"Software\"), to deal", + "in the Software without restriction, including without limitation the rights", + "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell", + "copies of the Software, and to permit persons to whom the Software is", + "furnished to do so, subject to the following conditions:", + "", + "The above copyright notice and this permission notice shall be included in all", + "copies or substantial portions of the Software.", + "", + "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR", + "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,", + "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", + "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER", + "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,", + "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE", + "SOFTWARE.", + "", + "---", + "", + "The MIT License (MIT)", + "", + "Copyright (c) 2018 Takahiro Ethan Ikeuchi @iktakahiro", + "", + "Permission is hereby granted, free of charge, to any person obtaining a copy", + "of this software and associated documentation files (the \"Software\"), to deal", + "in the Software without restriction, including without limitation the rights", + "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell", + "copies of the Software, and to permit persons to whom the Software is", + "furnished to do so, subject to the following conditions:", + "", + "The above copyright notice and this permission notice shall be included in all", + "copies or substantial portions of the Software.", + "", + "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR", + "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,", + "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", + "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER", + "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,", + "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE", + "SOFTWARE." + ], + "license": "MIT" } ], "version": 1 diff --git a/cli/.cargo/config.toml b/cli/.cargo/config.toml new file mode 100644 index 00000000000..35c67ad3d28 --- /dev/null +++ b/cli/.cargo/config.toml @@ -0,0 +1,2 @@ +[target.'cfg(all(windows, target_env = "msvc"))'] +rustflags = ["-C", "target-feature=+crt-static"] diff --git a/cli/CONTRIBUTING.md b/cli/CONTRIBUTING.md new file mode 100644 index 00000000000..d119f1ac98a --- /dev/null +++ b/cli/CONTRIBUTING.md @@ -0,0 +1,20 @@ +# Setup + +0. Clone, and then run `git submodule update --init --recursive` +1. Get the extensions: [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer) and [CodeLLDB](https://marketplace.visualstudio.com/items?itemName=vadimcn.vscode-lldb) +2. Ensure your workspace is set to the `launcher` folder being the root. + +## Building the CLI on Windows + +For the moment, we require OpenSSL on Windows, where it is not usually installed by default. To install it: + +1. Install (clone) vcpkg [using their instructions](https://github.com/Microsoft/vcpkg#quick-start-windows) +1. Add the location of the `vcpkg` directory to your system or user PATH. +1. Run`vcpkg install openssl:x64-windows-static-md` (after restarting your terminal for PATH changes to apply) +1. You should be able to then `cargo build` successfully + +OpenSSL is needed for the key exchange we do when forwarding Basis tunnels. When all interested Basis clients support ED25519, we would be able to solely use libsodium. At the time of writing however, there is [no active development](https://chromestatus.com/feature/4913922408710144) on this in Chromium. + +# Debug + +1. You can use the Debug tasks already configured to run the launcher. diff --git a/cli/Cargo.lock b/cli/Cargo.lock new file mode 100644 index 00000000000..4ee1f5aae98 --- /dev/null +++ b/cli/Cargo.lock @@ -0,0 +1,2704 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +dependencies = [ + "memchr", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "async-io" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7" +dependencies = [ + "autocfg", + "concurrent-queue", + "futures-lite", + "libc", + "log", + "once_cell", + "parking", + "polling", + "slab", + "socket2", + "waker-fn", + "winapi", +] + +[[package]] +name = "async-trait" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a90ec2df9600c28a01c56c4784c9207a96d2451833aeceb8cc97e4c9548bb78" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" + +[[package]] +name = "cache-padded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" + +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "serde", + "time", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "clap" +version = "3.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" +dependencies = [ + "atty", + "bitflags", + "clap_derive", + "clap_lex", + "indexmap", + "once_cell", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_derive" +version = "3.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "code-cli" +version = "0.1.0" +dependencies = [ + "async-trait", + "atty", + "chrono", + "clap", + "clap_lex", + "dialoguer", + "dirs 4.0.0", + "flate2", + "futures", + "gethostname", + "hyper", + "indicatif", + "keyring", + "lazy_static", + "libc", + "log", + "open", + "opentelemetry", + "opentelemetry-application-insights", + "rand 0.8.5", + "regex", + "reqwest", + "rmp-serde", + "serde", + "serde_bytes", + "serde_json", + "sysinfo", + "tar", + "tempfile", + "tokio", + "tokio-util", + "tunnels", + "url", + "uuid", + "windows-service", + "winreg", + "zip", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "concurrent-queue" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" +dependencies = [ + "cache-padded", +] + +[[package]] +name = "console" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "terminal_size", + "unicode-width", + "winapi", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cxx" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19f39818dcfc97d45b03953c1292efc4e80954e1583c4aa770bac1383e2310a4" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e580d70777c116df50c390d1211993f62d40302881e54d4b79727acb83d0199" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56a46460b88d1cec95112c8c363f0e2c39afdb237f60583b0b36343bf627ea9c" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "747b608fecf06b0d72d440f27acc99288207324b793be2c17991839f3d4995ea" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "data-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "dialoguer" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92e7e37ecef6857fdc0c0c5d42fd5b0938e46590c2183cc92dd310a6d078eb1" +dependencies = [ + "console", + "tempfile", + "zeroize", +] + +[[package]] +name = "digest" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enumflags2" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "err-derive" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "rustversion", + "syn", + "synstructure", +] + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "filetime" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys", +] + +[[package]] +name = "flate2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" + +[[package]] +name = "futures-executor" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" + +[[package]] +name = "futures-lite" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-macro" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" + +[[package]] +name = "futures-task" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" + +[[package]] +name = "futures-util" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "h2" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hex-literal" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "http" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "hyper" +version = "0.14.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde6edd6cef363e9359ed3c98ba64590ba9eecba2293eb5a723ab32aee8926aa" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "indicatif" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" +dependencies = [ + "console", + "lazy_static", + "number_prefix", + "regex", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" + +[[package]] +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "keyring" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38fb8399ddcabfccb274577a8d90f0653e0b5b5977797c1c8834ad09839a10e5" +dependencies = [ + "byteorder", + "secret-service", + "security-framework", + "winapi", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.135" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" + +[[package]] +name = "link-cplusplus" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +dependencies = [ + "cc", +] + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "miniz_oxide" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", +] + +[[package]] +name = "native-tls" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nb-connect" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1bb540dc6ef51cfe1916ec038ce7a620daf3a111e2502d745197cd53d6bca15" +dependencies = [ + "libc", + "socket2", +] + +[[package]] +name = "nix" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" +dependencies = [ + "bitflags", + "cc", + "cfg-if", + "libc", + "memoffset", +] + +[[package]] +name = "ntapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +dependencies = [ + "winapi", +] + +[[package]] +name = "num" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "num-complex" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "once_cell" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" + +[[package]] +name = "open" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2423ffbf445b82e58c3b1543655968923dd06f85432f10be2bb4f1b7122f98c" +dependencies = [ + "pathdiff", + "windows-sys", +] + +[[package]] +name = "openssl" +version = "0.10.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-src" +version = "111.22.0+1.1.1q" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce" +dependencies = [ + "autocfg", + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "opentelemetry" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" +dependencies = [ + "opentelemetry_api", + "opentelemetry_sdk", +] + +[[package]] +name = "opentelemetry-application-insights" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e592c598da4cbf1b4c4c8c07df4d3fb3a0202326cccf90621dbf23286cb79ea6" +dependencies = [ + "bytes", + "chrono", + "flate2", + "http", + "once_cell", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-semantic-conventions", + "reqwest", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "opentelemetry-http" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d" +dependencies = [ + "async-trait", + "bytes", + "http", + "opentelemetry_api", + "reqwest", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b02e0230abb0ab6636d18e2ba8fa02903ea63772281340ccac18e0af3ec9eeb" +dependencies = [ + "opentelemetry", +] + +[[package]] +name = "opentelemetry_api" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +dependencies = [ + "futures-channel", + "futures-util", + "indexmap", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api", + "percent-encoding", + "rand 0.8.5", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "os_str_bytes" +version = "6.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" + +[[package]] +name = "parking" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + +[[package]] +name = "paste" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" + +[[package]] +name = "polling" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011" +dependencies = [ + "autocfg", + "cfg-if", + "libc", + "log", + "wepoll-ffi", + "winapi", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" + +[[package]] +name = "proc-macro-crate" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +dependencies = [ + "toml", +] + +[[package]] +name = "proc-macro-crate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +dependencies = [ + "once_cell", + "thiserror", + "toml", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.7", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rayon" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +dependencies = [ + "autocfg", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom 0.2.7", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "reqwest" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rmp" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + +[[package]] +name = "russh" +version = "0.34.0-beta.16" +source = "git+https://github.com/microsoft/vscode-russh?branch=main#d22cf71d9ea36751322eeb9aa1e8c438a3aa1aef" +dependencies = [ + "bitflags", + "byteorder", + "digest", + "flate2", + "futures", + "generic-array", + "hex-literal", + "hmac", + "log", + "num-bigint", + "once_cell", + "openssl", + "rand 0.8.5", + "russh-cryptovec", + "russh-keys", + "sha1", + "sha2", + "subtle", + "thiserror", + "tokio", +] + +[[package]] +name = "russh-cryptovec" +version = "0.7.0-beta.1" +source = "git+https://github.com/microsoft/vscode-russh?branch=main#d22cf71d9ea36751322eeb9aa1e8c438a3aa1aef" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "russh-keys" +version = "0.22.0-beta.7" +source = "git+https://github.com/microsoft/vscode-russh?branch=main#d22cf71d9ea36751322eeb9aa1e8c438a3aa1aef" +dependencies = [ + "bit-vec", + "byteorder", + "data-encoding", + "dirs 3.0.2", + "futures", + "inout", + "log", + "md5", + "num-bigint", + "num-integer", + "openssl", + "rand 0.7.3", + "rand_core 0.5.1", + "russh-cryptovec", + "serde", + "serde_derive", + "sha2", + "thiserror", + "tokio", + "tokio-stream", + "yasna", +] + +[[package]] +name = "rustversion" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" + +[[package]] +name = "ryu" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + +[[package]] +name = "schannel" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +dependencies = [ + "lazy_static", + "windows-sys", +] + +[[package]] +name = "scoped-tls" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "scratch" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" + +[[package]] +name = "secret-service" +version = "2.0.2" +source = "git+https://github.com/microsoft/vscode-secret-service-rs?rev=30f0414108a122d6f2bfc28a5425d0dac9738518#30f0414108a122d6f2bfc28a5425d0dac9738518" +dependencies = [ + "lazy_static", + "num", + "openssl", + "rand 0.8.5", + "serde", + "zbus", + "zbus_macros", + "zvariant", + "zvariant_derive", +] + +[[package]] +name = "security-framework" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.145" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_bytes" +version = "0.11.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.145" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha-1" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + +[[package]] +name = "sysinfo" +version = "0.23.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3977ec2e0520829be45c8a2df70db2bf364714d8a748316a10c3c35d4d2b01c9" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi", +] + +[[package]] +name = "tar" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "terminal_size" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "textwrap" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" + +[[package]] +name = "thiserror" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "winapi", +] + +[[package]] +name = "tokio-macros" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" +dependencies = [ + "futures-util", + "log", + "native-tls", + "tokio", + "tokio-native-tls", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +dependencies = [ + "bytes", + "futures-core", + "futures-io", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + +[[package]] +name = "tungstenite" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" +dependencies = [ + "base64", + "byteorder", + "bytes", + "http", + "httparse", + "log", + "native-tls", + "rand 0.8.5", + "sha-1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "tunnels" +version = "0.1.0" +source = "git+https://github.com/microsoft/dev-tunnels?rev=3870e9133dfb9557774521bb447827f19b26e55d#3870e9133dfb9557774521bb447827f19b26e55d" +dependencies = [ + "async-trait", + "chrono", + "futures", + "log", + "reqwest", + "russh", + "russh-keys", + "serde", + "serde_json", + "thiserror", + "tokio", + "tokio-tungstenite", + "tokio-util", + "tungstenite", + "url", + "uuid", +] + +[[package]] +name = "typenum" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + +[[package]] +name = "unicode-bidi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom 0.2.7", + "serde", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "wepoll-ffi" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" +dependencies = [ + "cc", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-service" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "917fdb865e7ff03af9dd86609f8767bc88fefba89e8efd569de8e208af8724b3" +dependencies = [ + "bitflags", + "err-derive", + "widestring", + "windows-sys", +] + +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + +[[package]] +name = "yasna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e262a29d0e61ccf2b6190d7050d4b237535fc76ce4c1210d9caa316f71dffa75" +dependencies = [ + "bit-vec", + "num-bigint", +] + +[[package]] +name = "zbus" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cbeb2291cd7267a94489b71376eda33496c1b9881adf6b36f26cc2779f3fc49" +dependencies = [ + "async-io", + "byteorder", + "derivative", + "enumflags2", + "fastrand", + "futures", + "nb-connect", + "nix", + "once_cell", + "polling", + "scoped-tls", + "serde", + "serde_repr", + "zbus_macros", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa3959a7847cf95e3d51e312856617c5b1b77191176c65a79a5f14d778bbe0a6" +dependencies = [ + "proc-macro-crate 0.1.5", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zeroize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" + +[[package]] +name = "zip" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" +dependencies = [ + "byteorder", + "crc32fast", + "flate2", + "thiserror", + "time", +] + +[[package]] +name = "zvariant" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a68c7b55f2074489b7e8e07d2d0a6ee6b4f233867a653c664d8020ba53692525" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9" +dependencies = [ + "proc-macro-crate 1.2.1", + "proc-macro2", + "quote", + "syn", +] diff --git a/cli/Cargo.toml b/cli/Cargo.toml new file mode 100644 index 00000000000..dccd4a32c42 --- /dev/null +++ b/cli/Cargo.toml @@ -0,0 +1,70 @@ +[package] +name = "code-cli" +version = "0.1.0" +edition = "2021" +default-run = "code" + +[lib] +name = "cli" +path = "src/lib.rs" + +[[bin]] +name = "code" + +[dependencies] +futures = "0.3" +clap = { version = "3.0", features = ["derive", "env"] } +open = { version = "2.1.0" } +reqwest = { version = "0.11.9", default-features = false, features = ["json", "stream", "native-tls-vendored"] } +tokio = { version = "1.20", features = ["full"] } +tokio-util = { version = "0.7", features = ["compat"] } +flate2 = { version = "1.0.22" } +zip = { version = "0.5.13", default-features = false, features = ["time", "deflate"] } +regex = { version = "1.5.5" } +lazy_static = { version = "1.4.0" } +sysinfo = { version = "0.23.5" } +serde = { version = "1.0", features = ["derive"] } +serde_json = { version = "1.0" } +rmp-serde = "1.0" +uuid = { version = "0.8.2", features = ["serde", "v4"] } +dirs = "4.0.0" +rand = "0.8.5" +atty = "0.2.14" +opentelemetry = { version = "0.18.0", features = ["rt-tokio"] } +opentelemetry-application-insights = { version = "0.22.0", features = ["reqwest-client-vendored-tls"] } +serde_bytes = "0.11.5" +chrono = { version = "0.4", features = ["serde"] } +gethostname = "0.2.3" +libc = "0.2" +tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "3870e9133dfb9557774521bb447827f19b26e55d", default-features = false, features = ["connections", "vendored-openssl"] } +keyring = "1.1" +dialoguer = "0.10" +hyper = "0.14" +indicatif = "0.16" +tempfile = "3.3" +clap_lex = "0.2" +url = "2.3" +async-trait = "0.1" +log = "0.4" + +[target.'cfg(windows)'.dependencies] +windows-service = "0.5" +winreg = "0.10" + +[target.'cfg(target_os = "linux")'.dependencies] +tar = { version = "0.4" } + +[patch.crates-io] +russh = { git = "https://github.com/microsoft/vscode-russh", branch = "main" } +russh-cryptovec = { git = "https://github.com/microsoft/vscode-russh", branch = "main" } +russh-keys = { git = "https://github.com/microsoft/vscode-russh", branch = "main" } +secret-service = { git = "https://github.com/microsoft/vscode-secret-service-rs", rev = "30f0414108a122d6f2bfc28a5425d0dac9738518" } + +[profile.release] +strip = true +lto = true +codegen-units = 1 + +[features] +default = [] +vscode-encrypt = [] diff --git a/cli/build.rs b/cli/build.rs new file mode 100644 index 00000000000..797e612ec4b --- /dev/null +++ b/cli/build.rs @@ -0,0 +1,58 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +const FILE_HEADER: &str = "/*---------------------------------------------------------------------------------------------\n * Copyright (c) Microsoft Corporation. All rights reserved.\n * Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/"; + +use std::{env, fs, io, path::PathBuf, process}; + +fn main() { + let files = enumerate_source_files().expect("expected to enumerate files"); + ensure_file_headers(&files).expect("expected to ensure file headers"); +} + +fn ensure_file_headers(files: &[PathBuf]) -> Result<(), io::Error> { + let mut ok = true; + + let crlf_header_str = str::replace(FILE_HEADER, "\n", "\r\n"); + let crlf_header = crlf_header_str.as_bytes(); + let lf_header = FILE_HEADER.as_bytes(); + for file in files { + let contents = fs::read(file)?; + + if !(contents.starts_with(lf_header) || contents.starts_with(crlf_header)) { + eprintln!("File missing copyright header: {}", file.display()); + ok = false; + } + } + + if !ok { + process::exit(1); + } + + Ok(()) +} + +/// Gets all "rs" files in the source directory +fn enumerate_source_files() -> Result, io::Error> { + let mut files = vec![]; + let mut queue = vec![]; + + let current_dir = env::current_dir()?.join("src"); + queue.push(current_dir); + + while !queue.is_empty() { + for entry in fs::read_dir(queue.pop().unwrap())? { + let entry = entry?; + let ftype = entry.file_type()?; + if ftype.is_dir() { + queue.push(entry.path()); + } else if ftype.is_file() && entry.file_name().to_string_lossy().ends_with(".rs") { + files.push(entry.path()); + } + } + } + + Ok(files) +} diff --git a/cli/rustfmt.toml b/cli/rustfmt.toml new file mode 100644 index 00000000000..218e203215e --- /dev/null +++ b/cli/rustfmt.toml @@ -0,0 +1 @@ +hard_tabs = true diff --git a/cli/src/auth.rs b/cli/src/auth.rs new file mode 100644 index 00000000000..55bc56c4817 --- /dev/null +++ b/cli/src/auth.rs @@ -0,0 +1,594 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use crate::{ + constants::get_default_user_agent, + info, log, + state::{LauncherPaths, PersistedState}, + trace, + util::{ + errors::{wrap, AnyError, RefreshTokenNotAvailableError, StatusError, WrappedError}, + input::prompt_options, + }, + warning, +}; +use async_trait::async_trait; +use chrono::{DateTime, Duration, Utc}; +use gethostname::gethostname; +use serde::{de::DeserializeOwned, Deserialize, Serialize}; +use std::{cell::Cell, fmt::Display, path::PathBuf, sync::Arc}; +use tokio::time::sleep; +use tunnels::{ + contracts::PROD_FIRST_PARTY_APP_ID, + management::{Authorization, AuthorizationProvider, HttpError}, +}; + +#[derive(Deserialize)] +struct DeviceCodeResponse { + device_code: String, + user_code: String, + message: Option, + verification_uri: String, + expires_in: i64, +} + +#[derive(Deserialize)] +struct AuthenticationResponse { + access_token: String, + refresh_token: Option, + expires_in: Option, +} + +#[derive(clap::ArgEnum, Serialize, Deserialize, Debug, Clone, Copy)] +pub enum AuthProvider { + Microsoft, + Github, +} + +impl Display for AuthProvider { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + AuthProvider::Microsoft => write!(f, "Microsoft Account"), + AuthProvider::Github => write!(f, "Github Account"), + } + } +} + +impl AuthProvider { + pub fn client_id(&self) -> &'static str { + match self { + AuthProvider::Microsoft => "aebc6443-996d-45c2-90f0-388ff96faa56", + AuthProvider::Github => "01ab8ac9400c4e429b23", + } + } + + pub fn code_uri(&self) -> &'static str { + match self { + AuthProvider::Microsoft => { + "https://login.microsoftonline.com/common/oauth2/v2.0/devicecode" + } + AuthProvider::Github => "https://github.com/login/device/code", + } + } + + pub fn grant_uri(&self) -> &'static str { + match self { + AuthProvider::Microsoft => "https://login.microsoftonline.com/common/oauth2/v2.0/token", + AuthProvider::Github => "https://github.com/login/oauth/access_token", + } + } + + pub fn get_default_scopes(&self) -> String { + match self { + AuthProvider::Microsoft => format!( + "{}/.default+offline_access+profile+openid", + PROD_FIRST_PARTY_APP_ID + ), + AuthProvider::Github => "read:user+read:org".to_string(), + } + } +} + +#[derive(Serialize, Deserialize, Debug, Clone)] +pub struct StoredCredential { + #[serde(rename = "p")] + provider: AuthProvider, + #[serde(rename = "a")] + access_token: String, + #[serde(rename = "r")] + refresh_token: Option, + #[serde(rename = "e")] + expires_at: Option>, +} + +impl StoredCredential { + pub async fn is_expired(&self, client: &reqwest::Client) -> bool { + match self.provider { + AuthProvider::Microsoft => self + .expires_at + .map(|e| Utc::now() + chrono::Duration::minutes(5) > e) + .unwrap_or(false), + + // Make an auth request to Github. Mark the credential as expired + // only on a verifiable 4xx code. We don't error on any failed + // request since then a drop in connection could "require" a refresh + AuthProvider::Github => client + .get("https://api.github.com/user") + .header("Authorization", format!("token {}", self.access_token)) + .header("User-Agent", get_default_user_agent()) + .send() + .await + .map(|r| r.status().is_client_error()) + .unwrap_or(false), + } + } + + fn from_response(auth: AuthenticationResponse, provider: AuthProvider) -> Self { + StoredCredential { + provider, + access_token: auth.access_token, + refresh_token: auth.refresh_token, + expires_at: auth.expires_in.map(|e| Utc::now() + Duration::seconds(e)), + } + } +} + +struct StorageWithLastRead { + storage: Box, + last_read: Cell, WrappedError>>, +} + +#[derive(Clone)] +pub struct Auth { + client: reqwest::Client, + log: log::Logger, + file_storage_path: PathBuf, + storage: Arc>>, +} + +trait StorageImplementation: Send + Sync { + fn read(&mut self) -> Result, WrappedError>; + fn store(&mut self, value: StoredCredential) -> Result<(), WrappedError>; + fn clear(&mut self) -> Result<(), WrappedError>; +} + +// unseal decrypts and deserializes the value +fn seal(value: &T) -> String +where + T: Serialize + ?Sized, +{ + let dec = serde_json::to_string(value).expect("expected to serialize"); + encrypt(&dec) +} + +// unseal decrypts and deserializes the value +fn unseal(value: &str) -> Option +where + T: DeserializeOwned, +{ + // small back-compat for old unencrypted values + if let Ok(v) = serde_json::from_str::(value) { + return Some(v); + } + + let dec = decrypt(value)?; + serde_json::from_str::(&dec).ok() +} + +#[cfg(target_os = "windows")] +const KEYCHAIN_ENTRY_LIMIT: usize = 1024; +#[cfg(not(target_os = "windows"))] +const KEYCHAIN_ENTRY_LIMIT: usize = 128 * 1024; + +const CONTINUE_MARKER: &str = ""; + +#[derive(Default)] +struct KeyringStorage { + // keywring storage can be split into multiple entries due to entry length limits + // on Windows https://github.com/microsoft/vscode-cli/issues/358 + entries: Vec, +} + +macro_rules! get_next_entry { + ($self: expr, $i: expr) => { + match $self.entries.get($i) { + Some(e) => e, + None => { + let e = keyring::Entry::new("vscode-cli", &format!("vscode-cli-{}", $i)); + $self.entries.push(e); + $self.entries.last().unwrap() + } + } + }; +} + +impl StorageImplementation for KeyringStorage { + fn read(&mut self) -> Result, WrappedError> { + let mut str = String::new(); + + for i in 0.. { + let entry = get_next_entry!(self, i); + let next_chunk = match entry.get_password() { + Ok(value) => value, + Err(keyring::Error::NoEntry) => return Ok(None), // missing entries? + Err(e) => return Err(wrap(e, "error reading keyring")), + }; + + if next_chunk.ends_with(CONTINUE_MARKER) { + str.push_str(&next_chunk[..next_chunk.len() - CONTINUE_MARKER.len()]); + } else { + str.push_str(&next_chunk); + break; + } + } + + Ok(unseal(&str)) + } + + fn store(&mut self, value: StoredCredential) -> Result<(), WrappedError> { + let sealed = seal(&value); + let step_size = KEYCHAIN_ENTRY_LIMIT - CONTINUE_MARKER.len(); + + for i in (0..sealed.len()).step_by(step_size) { + let entry = get_next_entry!(self, i / step_size); + + let cutoff = i + step_size; + let stored = if cutoff <= sealed.len() { + let mut part = sealed[i..cutoff].to_string(); + part.push_str(CONTINUE_MARKER); + entry.set_password(&part) + } else { + entry.set_password(&sealed[i..]) + }; + + if let Err(e) = stored { + return Err(wrap(e, "error updating keyring")); + } + } + + Ok(()) + } + + fn clear(&mut self) -> Result<(), WrappedError> { + self.read().ok(); // make sure component parts are available + for entry in self.entries.iter() { + entry + .delete_password() + .map_err(|e| wrap(e, "error updating keyring"))?; + } + self.entries.clear(); + + Ok(()) + } +} + +struct FileStorage(PersistedState>); + +impl StorageImplementation for FileStorage { + fn read(&mut self) -> Result, WrappedError> { + Ok(self.0.load().and_then(|s| unseal(&s))) + } + + fn store(&mut self, value: StoredCredential) -> Result<(), WrappedError> { + self.0.save(Some(seal(&value))) + } + + fn clear(&mut self) -> Result<(), WrappedError> { + self.0.save(None) + } +} + +impl Auth { + pub fn new(paths: &LauncherPaths, log: log::Logger) -> Auth { + Auth { + log, + client: reqwest::Client::new(), + file_storage_path: paths.root().join("token.json"), + storage: Arc::new(std::sync::Mutex::new(None)), + } + } + + fn with_storage(&self, op: F) -> T + where + F: FnOnce(&mut StorageWithLastRead) -> T, + { + let mut opt = self.storage.lock().unwrap(); + if let Some(s) = opt.as_mut() { + return op(s); + } + + let mut keyring_storage = KeyringStorage::default(); + let mut file_storage = FileStorage(PersistedState::new(self.file_storage_path.clone())); + + let keyring_storage_result = match std::env::var("VSCODE_CLI_USE_FILE_KEYCHAIN") { + Ok(_) => Err(wrap("", "user prefers file storage")), + _ => keyring_storage.read(), + }; + + let mut storage = match keyring_storage_result { + Ok(v) => StorageWithLastRead { + last_read: Cell::new(Ok(v)), + storage: Box::new(keyring_storage), + }, + Err(_) => StorageWithLastRead { + last_read: Cell::new(file_storage.read()), + storage: Box::new(file_storage), + }, + }; + + let out = op(&mut storage); + *opt = Some(storage); + out + } + + /// Gets a tunnel Authentication for use in the tunnel management API. + pub async fn get_tunnel_authentication(&self) -> Result { + let cred = self.get_credential().await?; + let auth = match cred.provider { + AuthProvider::Microsoft => Authorization::Bearer(cred.access_token), + AuthProvider::Github => Authorization::Github(format!( + "client_id={} {}", + cred.provider.client_id(), + cred.access_token + )), + }; + + Ok(auth) + } + + /// Reads the current details from the keyring. + pub fn get_current_credential(&self) -> Result, WrappedError> { + self.with_storage(|storage| { + let value = storage.last_read.replace(Ok(None)); + storage.last_read.set(value.clone()); + value + }) + } + + /// Clears login info from the keyring. + pub fn clear_credentials(&self) -> Result<(), WrappedError> { + self.with_storage(|storage| { + storage.storage.clear()?; + storage.last_read.set(Ok(None)); + Ok(()) + }) + } + + /// Runs the login flow, optionally pre-filling a provider and/or access token. + pub async fn login( + &self, + provider: Option, + access_token: Option, + ) -> Result { + let provider = match provider { + Some(p) => p, + None => self.prompt_for_provider().await?, + }; + + let credentials = match access_token { + Some(t) => StoredCredential { + provider, + access_token: t, + refresh_token: None, + expires_at: None, + }, + None => self.do_device_code_flow_with_provider(provider).await?, + }; + + self.store_credentials(credentials.clone()); + Ok(credentials) + } + + /// Gets the currently stored credentials, or asks the user to log in. + pub async fn get_credential(&self) -> Result { + let entry = match self.get_current_credential() { + Ok(Some(old_creds)) => { + trace!(self.log, "Found token in keyring"); + match self.get_refreshed_token(&old_creds).await { + Ok(Some(new_creds)) => { + self.store_credentials(new_creds.clone()); + new_creds + } + Ok(None) => old_creds, + Err(e) => { + info!(self.log, "error refreshing token: {}", e); + let new_creds = self + .do_device_code_flow_with_provider(old_creds.provider) + .await?; + self.store_credentials(new_creds.clone()); + new_creds + } + } + } + + Ok(None) => { + trace!(self.log, "No token in keyring, getting a new one"); + let creds = self.do_device_code_flow().await?; + self.store_credentials(creds.clone()); + creds + } + + Err(e) => { + warning!( + self.log, + "Error reading token from keyring, getting a new one: {}", + e + ); + let creds = self.do_device_code_flow().await?; + self.store_credentials(creds.clone()); + creds + } + }; + + Ok(entry) + } + + /// Stores credentials, logging a warning if it fails. + fn store_credentials(&self, creds: StoredCredential) { + self.with_storage(|storage| { + if let Err(e) = storage.storage.store(creds.clone()) { + warning!( + self.log, + "Failed to update keyring with new credentials: {}", + e + ); + } + storage.last_read.set(Ok(Some(creds))); + }) + } + + /// Refreshes the token in the credentials if necessary. Returns None if + /// the token is up to date, or Some new token otherwise. + async fn get_refreshed_token( + &self, + creds: &StoredCredential, + ) -> Result, AnyError> { + if !creds.is_expired(&self.client).await { + return Ok(None); + } + + let refresh_token = match &creds.refresh_token { + Some(t) => t, + None => return Err(AnyError::from(RefreshTokenNotAvailableError())), + }; + + self.do_grant( + creds.provider, + format!( + "client_id={}&grant_type=refresh_token&refresh_token={}", + creds.provider.client_id(), + refresh_token + ), + ) + .await + .map(Some) + } + + /// Does a "grant token" request. + async fn do_grant( + &self, + provider: AuthProvider, + body: String, + ) -> Result { + let response = self + .client + .post(provider.grant_uri()) + .body(body) + .header("Accept", "application/json") + .send() + .await?; + + if !response.status().is_success() { + return Err(StatusError::from_res(response).await?.into()); + } + + let body = response.json::().await?; + Ok(StoredCredential::from_response(body, provider)) + } + + /// Implements the device code flow, returning the credentials upon success. + async fn do_device_code_flow(&self) -> Result { + let provider = self.prompt_for_provider().await?; + self.do_device_code_flow_with_provider(provider).await + } + + async fn prompt_for_provider(&self) -> Result { + if std::env::var("VSCODE_CLI_ALLOW_MS_AUTH").is_err() { + return Ok(AuthProvider::Github); + } + + let provider = prompt_options( + "How would you like to log in to VS Code?", + &[AuthProvider::Microsoft, AuthProvider::Github], + )?; + + Ok(provider) + } + + async fn do_device_code_flow_with_provider( + &self, + provider: AuthProvider, + ) -> Result { + loop { + let init_code = self + .client + .post(provider.code_uri()) + .header("Accept", "application/json") + .body(format!( + "client_id={}&scope={}", + provider.client_id(), + provider.get_default_scopes(), + )) + .send() + .await?; + + if !init_code.status().is_success() { + return Err(StatusError::from_res(init_code).await?.into()); + } + + let init_code_json = init_code.json::().await?; + let expires_at = Utc::now() + chrono::Duration::seconds(init_code_json.expires_in); + + match &init_code_json.message { + Some(m) => self.log.result(m), + None => self.log.result(&format!( + "To grant access to the server, please log into {} and use code {}", + init_code_json.verification_uri, init_code_json.user_code + )), + }; + + let body = format!( + "client_id={}&grant_type=urn:ietf:params:oauth:grant-type:device_code&device_code={}", + provider.client_id(), + init_code_json.device_code + ); + + while Utc::now() < expires_at { + sleep(std::time::Duration::from_secs(5)).await; + + match self.do_grant(provider, body.clone()).await { + Ok(creds) => return Ok(creds), + Err(e) => { + trace!(self.log, "refresh poll failed, retrying: {}", e); + } + } + } + } + } +} + +#[async_trait] +impl AuthorizationProvider for Auth { + async fn get_authorization(&self) -> Result { + self.get_tunnel_authentication() + .await + .map_err(|e| HttpError::AuthorizationError(e.to_string())) + } +} + +lazy_static::lazy_static! { + static ref HOSTNAME: Vec = gethostname().to_string_lossy().bytes().collect(); +} + +#[cfg(feature = "vscode-encrypt")] +fn encrypt(value: &str) -> String { + vscode_encrypt::encrypt(&HOSTNAME, value.as_bytes()).expect("expected to encrypt") +} + +#[cfg(feature = "vscode-encrypt")] +fn decrypt(value: &str) -> Option { + let b = vscode_encrypt::decrypt(&HOSTNAME, value).ok()?; + String::from_utf8(b).ok() +} + +#[cfg(not(feature = "vscode-encrypt"))] +fn encrypt(value: &str) -> String { + value.to_owned() +} + +#[cfg(not(feature = "vscode-encrypt"))] +fn decrypt(value: &str) -> Option { + Some(value.to_owned()) +} diff --git a/cli/src/bin/code/legacy_args.rs b/cli/src/bin/code/legacy_args.rs new file mode 100644 index 00000000000..361348d8373 --- /dev/null +++ b/cli/src/bin/code/legacy_args.rs @@ -0,0 +1,234 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::collections::HashMap; + +use cli::commands::args::{ + CliCore, Commands, DesktopCodeOptions, ExtensionArgs, ExtensionSubcommand, + InstallExtensionArgs, ListExtensionArgs, UninstallExtensionArgs, +}; + +/// Tries to parse the argv using the legacy CLI interface, looking for its +/// flags and generating a CLI with subcommands if those don't exist. +pub fn try_parse_legacy( + iter: impl IntoIterator>, +) -> Option { + let raw = clap_lex::RawArgs::new(iter); + let mut cursor = raw.cursor(); + raw.next(&mut cursor); // Skip the bin + + // First make a hashmap of all flags and capture positional arguments. + let mut args: HashMap> = HashMap::new(); + let mut last_arg = None; + while let Some(arg) = raw.next(&mut cursor) { + if let Some((long, value)) = arg.to_long() { + if let Ok(long) = long { + last_arg = Some(long.to_string()); + match args.get_mut(long) { + Some(prev) => { + if let Some(v) = value { + prev.push(v.to_str_lossy().to_string()); + } + } + None => { + if let Some(v) = value { + args.insert(long.to_string(), vec![v.to_str_lossy().to_string()]); + } else { + args.insert(long.to_string(), vec![]); + } + } + } + } + } else if let Ok(value) = arg.to_value() { + if let Some(last_arg) = &last_arg { + args.get_mut(last_arg) + .expect("expected to have last arg") + .push(value.to_string()); + } + } + } + + let get_first_arg_value = + |key: &str| args.get(key).and_then(|v| v.first()).map(|s| s.to_string()); + let desktop_code_options = DesktopCodeOptions { + extensions_dir: get_first_arg_value("extensions-dir"), + user_data_dir: get_first_arg_value("user-data-dir"), + use_version: None, + }; + + // Now translate them to subcommands. + // --list-extensions -> ext list + // --install-extension=id -> ext install + // --uninstall-extension=id -> ext uninstall + // --status -> status + + if args.contains_key("list-extensions") { + Some(CliCore { + subcommand: Some(Commands::Extension(ExtensionArgs { + subcommand: ExtensionSubcommand::List(ListExtensionArgs { + category: get_first_arg_value("category"), + show_versions: args.contains_key("show-versions"), + }), + desktop_code_options, + })), + ..Default::default() + }) + } else if let Some(exts) = args.remove("install-extension") { + Some(CliCore { + subcommand: Some(Commands::Extension(ExtensionArgs { + subcommand: ExtensionSubcommand::Install(InstallExtensionArgs { + id_or_path: exts, + pre_release: args.contains_key("pre-release"), + force: args.contains_key("force"), + }), + desktop_code_options, + })), + ..Default::default() + }) + } else if let Some(exts) = args.remove("uninstall-extension") { + Some(CliCore { + subcommand: Some(Commands::Extension(ExtensionArgs { + subcommand: ExtensionSubcommand::Uninstall(UninstallExtensionArgs { id: exts }), + desktop_code_options, + })), + ..Default::default() + }) + } else if args.contains_key("status") { + Some(CliCore { + subcommand: Some(Commands::Status), + ..Default::default() + }) + } else { + None + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_parses_list_extensions() { + let args = vec![ + "code", + "--list-extensions", + "--category", + "themes", + "--show-versions", + ]; + let cli = try_parse_legacy(args.into_iter()).unwrap(); + + if let Some(Commands::Extension(extension_args)) = cli.subcommand { + if let ExtensionSubcommand::List(list_args) = extension_args.subcommand { + assert_eq!(list_args.category, Some("themes".to_string())); + assert!(list_args.show_versions); + } else { + panic!( + "Expected list subcommand, got {:?}", + extension_args.subcommand + ); + } + } else { + panic!("Expected extension subcommand, got {:?}", cli.subcommand); + } + } + + #[test] + fn test_parses_install_extension() { + let args = vec![ + "code", + "--install-extension", + "connor4312.codesong", + "connor4312.hello-world", + "--pre-release", + "--force", + ]; + let cli = try_parse_legacy(args.into_iter()).unwrap(); + + if let Some(Commands::Extension(extension_args)) = cli.subcommand { + if let ExtensionSubcommand::Install(install_args) = extension_args.subcommand { + assert_eq!( + install_args.id_or_path, + vec!["connor4312.codesong", "connor4312.hello-world"] + ); + assert!(install_args.pre_release); + assert!(install_args.force); + } else { + panic!( + "Expected install subcommand, got {:?}", + extension_args.subcommand + ); + } + } else { + panic!("Expected extension subcommand, got {:?}", cli.subcommand); + } + } + + #[test] + fn test_parses_uninstall_extension() { + let args = vec!["code", "--uninstall-extension", "connor4312.codesong"]; + let cli = try_parse_legacy(args.into_iter()).unwrap(); + + if let Some(Commands::Extension(extension_args)) = cli.subcommand { + if let ExtensionSubcommand::Uninstall(uninstall_args) = extension_args.subcommand { + assert_eq!(uninstall_args.id, vec!["connor4312.codesong"]); + } else { + panic!( + "Expected uninstall subcommand, got {:?}", + extension_args.subcommand + ); + } + } else { + panic!("Expected extension subcommand, got {:?}", cli.subcommand); + } + } + + #[test] + fn test_parses_user_data_dir_and_extensions_dir() { + let args = vec![ + "code", + "--uninstall-extension", + "connor4312.codesong", + "--user-data-dir", + "foo", + "--extensions-dir", + "bar", + ]; + let cli = try_parse_legacy(args.into_iter()).unwrap(); + + if let Some(Commands::Extension(extension_args)) = cli.subcommand { + assert_eq!( + extension_args.desktop_code_options.user_data_dir, + Some("foo".to_string()) + ); + assert_eq!( + extension_args.desktop_code_options.extensions_dir, + Some("bar".to_string()) + ); + if let ExtensionSubcommand::Uninstall(uninstall_args) = extension_args.subcommand { + assert_eq!(uninstall_args.id, vec!["connor4312.codesong"]); + } else { + panic!( + "Expected uninstall subcommand, got {:?}", + extension_args.subcommand + ); + } + } else { + panic!("Expected extension subcommand, got {:?}", cli.subcommand); + } + } + + #[test] + fn test_status() { + let args = vec!["code", "--status"]; + let cli = try_parse_legacy(args.into_iter()).unwrap(); + + if let Some(Commands::Status) = cli.subcommand { + // no-op + } else { + panic!("Expected extension subcommand, got {:?}", cli.subcommand); + } + } +} diff --git a/cli/src/bin/code/main.rs b/cli/src/bin/code/main.rs new file mode 100644 index 00000000000..ce98c0faaf4 --- /dev/null +++ b/cli/src/bin/code/main.rs @@ -0,0 +1,186 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +mod legacy_args; + +use std::process::Command; + +use clap::Parser; +use cli::{ + commands::{args, tunnels, update, version, CommandContext}, + desktop, log as own_log, + state::LauncherPaths, + util::{ + errors::{wrap, AnyError}, + is_integrated_cli, + prereqs::PreReqChecker, + }, +}; +use legacy_args::try_parse_legacy; +use opentelemetry::sdk::trace::TracerProvider as SdkTracerProvider; +use opentelemetry::trace::TracerProvider; + +use log::{Level, Metadata, Record}; + +#[tokio::main] +async fn main() -> Result<(), std::convert::Infallible> { + let raw_args = std::env::args_os().collect::>(); + let parsed = try_parse_legacy(&raw_args) + .map(|core| args::AnyCli::Integrated(args::IntegratedCli { core })) + .unwrap_or_else(|| { + if let Ok(true) = is_integrated_cli() { + args::AnyCli::Integrated(args::IntegratedCli::parse_from(&raw_args)) + } else { + args::AnyCli::Standalone(args::StandaloneCli::parse_from(&raw_args)) + } + }); + + let core = parsed.core(); + let context = CommandContext { + http: reqwest::Client::new(), + paths: LauncherPaths::new(&core.global_options.cli_data_dir).unwrap(), + log: own_log::Logger::new( + SdkTracerProvider::builder().build().tracer("codecli"), + if core.global_options.verbose { + own_log::Level::Trace + } else { + core.global_options.log.unwrap_or(own_log::Level::Info) + }, + ), + args: core.clone(), + }; + + log::set_logger(Box::leak(Box::new(RustyLogger(context.log.clone())))) + .map(|()| log::set_max_level(log::LevelFilter::Debug)) + .expect("expected to make logger"); + + let result = match parsed { + args::AnyCli::Standalone(args::StandaloneCli { + subcommand: Some(cmd), + .. + }) => match cmd { + args::StandaloneCommands::Update(args) => update::update(context, args).await, + }, + args::AnyCli::Standalone(args::StandaloneCli { core: c, .. }) + | args::AnyCli::Integrated(args::IntegratedCli { core: c, .. }) => match c.subcommand { + None => { + let ca = context.args.get_base_code_args(); + start_code(context, ca).await + } + + Some(args::Commands::Extension(extension_args)) => { + let mut ca = context.args.get_base_code_args(); + extension_args.add_code_args(&mut ca); + start_code(context, ca).await + } + + Some(args::Commands::Status) => { + let mut ca = context.args.get_base_code_args(); + ca.push("--status".to_string()); + start_code(context, ca).await + } + + Some(args::Commands::Version(version_args)) => match version_args.subcommand { + args::VersionSubcommand::Use(use_version_args) => { + version::switch_to(context, use_version_args).await + } + args::VersionSubcommand::Show => version::show(context).await, + }, + + Some(args::Commands::Tunnel(tunnel_args)) => match tunnel_args.subcommand { + Some(args::TunnelSubcommand::Prune) => tunnels::prune(context).await, + Some(args::TunnelSubcommand::Unregister) => tunnels::unregister(context).await, + Some(args::TunnelSubcommand::Rename(rename_args)) => { + tunnels::rename(context, rename_args).await + } + Some(args::TunnelSubcommand::User(user_command)) => { + tunnels::user(context, user_command).await + } + Some(args::TunnelSubcommand::Service(service_args)) => { + tunnels::service(context, service_args).await + } + None => tunnels::serve(context, tunnel_args.serve_args).await, + }, + }, + }; + + match result { + Err(e) => print_and_exit(e), + Ok(code) => std::process::exit(code), + } +} + +fn print_and_exit(err: E) -> ! +where + E: std::fmt::Display, +{ + own_log::emit(own_log::Level::Error, "", &format!("{}", err)); + std::process::exit(1); +} + +async fn start_code(context: CommandContext, args: Vec) -> Result { + // todo: once the integrated CLI takes the place of the Node.js CLI, this should + // redirect to the current installation without using the CodeVersionManager. + + let platform = PreReqChecker::new().verify().await?; + let version_manager = + desktop::CodeVersionManager::new(context.log.clone(), &context.paths, platform); + let version = match &context.args.editor_options.code_options.use_version { + Some(v) => desktop::RequestedVersion::try_from(v.as_str())?, + None => version_manager.get_preferred_version(), + }; + + let binary = match version_manager.try_get_entrypoint(&version).await { + Some(ep) => ep, + None => { + desktop::prompt_to_install(&version); + return Ok(1); + } + }; + + let code = Command::new(&binary) + .args(args) + .status() + .map(|s| s.code().unwrap_or(1)) + .map_err(|e| wrap(e, format!("error running VS Code from {}", binary.display())))?; + + Ok(code) +} + +/// Logger that uses the common rust "log" crate and directs back to one of +/// our managed loggers. +struct RustyLogger(own_log::Logger); + +impl log::Log for RustyLogger { + fn enabled(&self, metadata: &Metadata) -> bool { + metadata.level() <= Level::Debug + } + + fn log(&self, record: &Record) { + if !self.enabled(record.metadata()) { + return; + } + + // exclude noisy log modules: + let src = match record.module_path() { + Some("russh::cipher") => return, + Some("russh::negotiation") => return, + Some(s) => s, + None => "", + }; + + self.0.emit( + match record.level() { + log::Level::Debug => own_log::Level::Debug, + log::Level::Error => own_log::Level::Error, + log::Level::Info => own_log::Level::Info, + log::Level::Trace => own_log::Level::Trace, + log::Level::Warn => own_log::Level::Warn, + }, + &format!("[{}] {}", src, record.args()), + ); + } + + fn flush(&self) {} +} diff --git a/cli/src/commands.rs b/cli/src/commands.rs new file mode 100644 index 00000000000..754729f2c04 --- /dev/null +++ b/cli/src/commands.rs @@ -0,0 +1,12 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +mod context; + +pub mod args; +pub mod tunnels; +pub mod update; +pub mod version; +pub use context::CommandContext; diff --git a/cli/src/commands/args.rs b/cli/src/commands/args.rs new file mode 100644 index 00000000000..d2fdeaae822 --- /dev/null +++ b/cli/src/commands/args.rs @@ -0,0 +1,638 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::fmt; + +use crate::{constants, log, options, tunnels::code_server::CodeServerArgs}; +use clap::{ArgEnum, Args, Parser, Subcommand}; + +const TEMPLATE: &str = " + Visual Studio Code CLI - {version} + + Usage: code-insiders.exe [options][paths...] + + To read output from another program, append '-' (e.g. 'echo Hello World | code-insiders.exe -') + + {all-args}"; + +#[derive(Parser, Debug, Default)] +#[clap( + help_template = TEMPLATE, + long_about = None, + name = "Visual Studio Code CLI", + version = match constants::VSCODE_CLI_VERSION { Some(v) => v, None => "dev" }, + )] +pub struct IntegratedCli { + #[clap(flatten)] + pub core: CliCore, +} + +/// Common CLI shared between intergated and standalone interfaces. +#[derive(Args, Debug, Default, Clone)] +pub struct CliCore { + /// One or more files, folders, or URIs to open. + #[clap(name = "paths")] + pub open_paths: Vec, + + #[clap(flatten, next_help_heading = Some("EDITOR OPTIONS"))] + pub editor_options: EditorOptions, + + #[clap(flatten, next_help_heading = Some("EDITOR TROUBLESHOOTING"))] + pub troubleshooting: EditorTroubleshooting, + + #[clap(flatten, next_help_heading = Some("GLOBAL OPTIONS"))] + pub global_options: GlobalOptions, + + #[clap(subcommand)] + pub subcommand: Option, +} + +#[derive(Parser, Debug, Default)] +#[clap( + help_template = TEMPLATE, + long_about = None, + name = "Visual Studio Code CLI", + version = match constants::VSCODE_CLI_VERSION { Some(v) => v, None => "dev" }, + )] +pub struct StandaloneCli { + #[clap(flatten)] + pub core: CliCore, + + #[clap(subcommand)] + pub subcommand: Option, +} + +pub enum AnyCli { + Integrated(IntegratedCli), + Standalone(StandaloneCli), +} + +impl AnyCli { + pub fn core(&self) -> &CliCore { + match self { + AnyCli::Integrated(cli) => &cli.core, + AnyCli::Standalone(cli) => &cli.core, + } + } +} + +impl CliCore { + pub fn get_base_code_args(&self) -> Vec { + let mut args = self.open_paths.clone(); + self.editor_options.add_code_args(&mut args); + self.troubleshooting.add_code_args(&mut args); + self.global_options.add_code_args(&mut args); + args + } +} + +impl<'a> From<&'a CliCore> for CodeServerArgs { + fn from(cli: &'a CliCore) -> Self { + let mut args = CodeServerArgs { + log: cli.global_options.log, + accept_server_license_terms: true, + ..Default::default() + }; + + args.log = cli.global_options.log; + args.accept_server_license_terms = true; + + if cli.global_options.verbose { + args.verbose = true; + } + + if cli.global_options.disable_telemetry { + args.telemetry_level = Some(options::TelemetryLevel::Off); + } else if cli.global_options.telemetry_level.is_some() { + args.telemetry_level = cli.global_options.telemetry_level; + } + + args + } +} + +#[derive(Subcommand, Debug, Clone)] +pub enum StandaloneCommands { + /// Updates the VS Code CLI. + Update(StandaloneUpdateArgs), +} + +#[derive(Args, Debug, Clone)] +pub struct StandaloneUpdateArgs { + /// Only check for updates, without actually updating the CLI. + #[clap(long)] + pub check: bool, +} + +#[derive(Subcommand, Debug, Clone)] + +pub enum Commands { + /// Create a tunnel that's accessible on vscode.dev from anywhere. + /// Run `code tunnel --help` for more usage info. + Tunnel(TunnelArgs), + + /// Manage VS Code extensions. + #[clap(name = "ext")] + Extension(ExtensionArgs), + + /// Print process usage and diagnostics information. + Status, + + /// Changes the version of VS Code you're using. + Version(VersionArgs), +} + +#[derive(Args, Debug, Clone)] +pub struct ExtensionArgs { + #[clap(subcommand)] + pub subcommand: ExtensionSubcommand, + + #[clap(flatten)] + pub desktop_code_options: DesktopCodeOptions, +} + +impl ExtensionArgs { + pub fn add_code_args(&self, target: &mut Vec) { + if let Some(ed) = &self.desktop_code_options.extensions_dir { + target.push(ed.to_string()); + } + + self.subcommand.add_code_args(target); + } +} + +#[derive(Subcommand, Debug, Clone)] +pub enum ExtensionSubcommand { + /// List installed extensions. + List(ListExtensionArgs), + /// Install an extension. + Install(InstallExtensionArgs), + /// Uninstall an extension. + Uninstall(UninstallExtensionArgs), +} + +impl ExtensionSubcommand { + pub fn add_code_args(&self, target: &mut Vec) { + match self { + ExtensionSubcommand::List(args) => { + target.push("--list-extensions".to_string()); + if args.show_versions { + target.push("--show-versions".to_string()); + } + if let Some(category) = &args.category { + target.push(format!("--category={}", category)); + } + } + ExtensionSubcommand::Install(args) => { + for id in args.id_or_path.iter() { + target.push(format!("--install-extension={}", id)); + } + if args.pre_release { + target.push("--pre-release".to_string()); + } + if args.force { + target.push("--force".to_string()); + } + } + ExtensionSubcommand::Uninstall(args) => { + for id in args.id.iter() { + target.push(format!("--uninstall-extension={}", id)); + } + } + } + } +} + +#[derive(Args, Debug, Clone)] +pub struct ListExtensionArgs { + /// Filters installed extensions by provided category, when using --list-extensions. + #[clap(long, value_name = "category")] + pub category: Option, + + /// Show versions of installed extensions, when using --list-extensions. + #[clap(long)] + pub show_versions: bool, +} + +#[derive(Args, Debug, Clone)] +pub struct InstallExtensionArgs { + /// Either an extension id or a path to a VSIX. The identifier of an + /// extension is '${publisher}.${name}'. Use '--force' argument to update + /// to latest version. To install a specific version provide '@${version}'. + /// For example: 'vscode.csharp@1.2.3'. + #[clap(name = "ext-id | id")] + pub id_or_path: Vec, + + /// Installs the pre-release version of the extension + #[clap(long)] + pub pre_release: bool, + + /// Update to the latest version of the extension if it's already installed. + #[clap(long)] + pub force: bool, +} + +#[derive(Args, Debug, Clone)] +pub struct UninstallExtensionArgs { + /// One or more extension identifiers to uninstall. The identifier of an + /// extension is '${publisher}.${name}'. Use '--force' argument to update + /// to latest version. + #[clap(name = "ext-id")] + pub id: Vec, +} + +#[derive(Args, Debug, Clone)] +pub struct VersionArgs { + #[clap(subcommand)] + pub subcommand: VersionSubcommand, +} + +#[derive(Subcommand, Debug, Clone)] +pub enum VersionSubcommand { + /// Switches the instance of VS Code in use. + Use(UseVersionArgs), + + /// Shows the currently configured VS Code version. + Show, +} + +#[derive(Args, Debug, Clone)] +pub struct UseVersionArgs { + /// The version of VS Code you want to use. Can be "stable", "insiders", + /// a version number, or an absolute path to an existing install. + #[clap(value_name = "stable | insiders | x.y.z | path")] + pub name: String, + + /// The directory where the version can be found. + #[clap(long, value_name = "path")] + pub install_dir: Option, +} + +#[derive(Args, Debug, Default, Clone)] +pub struct EditorOptions { + /// Compare two files with each other. + #[clap(short, long, value_names = &["file", "file"])] + pub diff: Vec, + + /// Add folder(s) to the last active window. + #[clap(short, long, value_name = "folder")] + pub add: Option, + + /// Open a file at the path on the specified line and character position. + #[clap(short, long, value_name = "file:line[:character]")] + pub goto: Option, + + /// Force to open a new window. + #[clap(short, long)] + pub new_window: bool, + + /// Force to open a file or folder in an + #[clap(short, long)] + pub reuse_window: bool, + + /// Wait for the files to be closed before returning. + #[clap(short, long)] + pub wait: bool, + + /// The locale to use (e.g. en-US or zh-TW). + #[clap(long, value_name = "locale")] + pub locale: Option, + + /// Enables proposed API features for extensions. Can receive one or + /// more extension IDs to enable individually. + #[clap(long, value_name = "ext-id")] + pub enable_proposed_api: Vec, + + #[clap(flatten)] + pub code_options: DesktopCodeOptions, +} + +impl EditorOptions { + pub fn add_code_args(&self, target: &mut Vec) { + if !self.diff.is_empty() { + target.push("--diff".to_string()); + for file in self.diff.iter() { + target.push(file.clone()); + } + } + if let Some(add) = &self.add { + target.push("--add".to_string()); + target.push(add.clone()); + } + if let Some(goto) = &self.goto { + target.push("--goto".to_string()); + target.push(goto.clone()); + } + if self.new_window { + target.push("--new-window".to_string()); + } + if self.reuse_window { + target.push("--reuse-window".to_string()); + } + if self.wait { + target.push("--wait".to_string()); + } + if let Some(locale) = &self.locale { + target.push(format!("--locale={}", locale)); + } + if !self.enable_proposed_api.is_empty() { + for id in self.enable_proposed_api.iter() { + target.push(format!("--enable-proposed-api={}", id)); + } + } + self.code_options.add_code_args(target); + } +} + +/// Arguments applicable whenever VS Code desktop is launched +#[derive(Args, Debug, Default, Clone)] +pub struct DesktopCodeOptions { + /// Set the root path for extensions. + #[clap(long, value_name = "dir")] + pub extensions_dir: Option, + + /// Specifies the directory that user data is kept in. Can be used to + /// open multiple distinct instances of Code. + #[clap(long, value_name = "dir")] + pub user_data_dir: Option, + + /// Sets the VS Code version to use for this command. The preferred version + /// can be persisted with `code version use `. Can be "stable", + /// "insiders", a version number, or an absolute path to an existing install. + #[clap(long, value_name = "stable | insiders | x.y.z | path")] + pub use_version: Option, +} + +/// Argument specifying the output format. +#[derive(Args, Debug, Clone)] +pub struct OutputFormatOptions { + /// Set the data output formats. + #[clap(arg_enum, long, value_name = "format", default_value_t = OutputFormat::Text)] + pub format: OutputFormat, +} + +impl DesktopCodeOptions { + pub fn add_code_args(&self, target: &mut Vec) { + if let Some(extensions_dir) = &self.extensions_dir { + target.push(format!("--extensions-dir={}", extensions_dir)); + } + if let Some(user_data_dir) = &self.user_data_dir { + target.push(format!("--user-data-dir={}", user_data_dir)); + } + } +} + +#[derive(Args, Debug, Default, Clone)] +pub struct GlobalOptions { + /// Directory where CLI metadata, such as VS Code installations, should be stored. + #[clap(long, env = "VSCODE_CLI_DATA_DIR", global = true)] + pub cli_data_dir: Option, + + /// Print verbose output (implies --wait). + #[clap(long, global = true)] + pub verbose: bool, + + /// Log level to use. + #[clap(long, arg_enum, value_name = "level", global = true)] + pub log: Option, + + /// Disable telemetry for the current command, even if it was previously + /// accepted as part of the license prompt or specified in '--telemetry-level' + #[clap(long, global = true, hide = true)] + pub disable_telemetry: bool, + + /// Sets the initial telemetry level + #[clap(arg_enum, long, global = true, hide = true)] + pub telemetry_level: Option, +} + +impl GlobalOptions { + pub fn add_code_args(&self, target: &mut Vec) { + if self.verbose { + target.push("--verbose".to_string()); + } + if let Some(log) = self.log { + target.push(format!("--log={}", log)); + } + if self.disable_telemetry { + target.push("--disable-telemetry".to_string()); + } + if let Some(telemetry_level) = &self.telemetry_level { + target.push(format!("--telemetry-level={}", telemetry_level)); + } + } +} + +#[derive(Args, Debug, Default, Clone)] +pub struct EditorTroubleshooting { + /// Run CPU profiler during startup. + #[clap(long)] + pub prof_startup: bool, + + /// Disable all installed extensions. + #[clap(long)] + pub disable_extensions: bool, + + /// Disable an extension. + #[clap(long, value_name = "ext-id")] + pub disable_extension: Vec, + + /// Turn sync on or off. + #[clap(arg_enum, long, value_name = "on | off")] + pub sync: Option, + + /// Allow debugging and profiling of extensions. Check the developer tools for the connection URI. + #[clap(long, value_name = "port")] + pub inspect_extensions: Option, + + /// Allow debugging and profiling of extensions with the extension host + /// being paused after start. Check the developer tools for the connection URI. + #[clap(long, value_name = "port")] + pub inspect_brk_extensions: Option, + + /// Disable GPU hardware acceleration. + #[clap(long)] + pub disable_gpu: bool, + + /// Max memory size for a window (in Mbytes). + #[clap(long, value_name = "memory")] + pub max_memory: Option, + + /// Shows all telemetry events which VS code collects. + #[clap(long)] + pub telemetry: bool, +} + +impl EditorTroubleshooting { + pub fn add_code_args(&self, target: &mut Vec) { + if self.prof_startup { + target.push("--prof-startup".to_string()); + } + if self.disable_extensions { + target.push("--disable-extensions".to_string()); + } + for id in self.disable_extension.iter() { + target.push(format!("--disable-extension={}", id)); + } + if let Some(sync) = &self.sync { + target.push(format!("--sync={}", sync)); + } + if let Some(port) = &self.inspect_extensions { + target.push(format!("--inspect-extensions={}", port)); + } + if let Some(port) = &self.inspect_brk_extensions { + target.push(format!("--inspect-brk-extensions={}", port)); + } + if self.disable_gpu { + target.push("--disable-gpu".to_string()); + } + if let Some(memory) = &self.max_memory { + target.push(format!("--max-memory={}", memory)); + } + if self.telemetry { + target.push("--telemetry".to_string()); + } + } +} + +#[derive(ArgEnum, Clone, Copy, Debug)] +pub enum SyncState { + On, + Off, +} + +impl fmt::Display for SyncState { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match self { + SyncState::Off => write!(f, "off"), + SyncState::On => write!(f, "on"), + } + } +} + +#[derive(ArgEnum, Clone, Copy, Debug)] +pub enum OutputFormat { + Json, + Text, +} + +#[derive(Args, Clone, Debug, Default)] +pub struct ExistingTunnelArgs { + /// Name you'd like to assign preexisting tunnel to use to connect the tunnel + #[clap(long, hide = true)] + pub tunnel_name: Option, + + /// Token to authenticate and use preexisting tunnel + #[clap(long, hide = true)] + pub host_token: Option, + + /// ID of preexisting tunnel to use to connect the tunnel + #[clap(long, hide = true)] + pub tunnel_id: Option, + + /// Cluster of preexisting tunnel to use to connect the tunnel + #[clap(long, hide = true)] + pub cluster: Option, +} + +#[derive(Args, Debug, Clone, Default)] +pub struct TunnelServeArgs { + /// Optional details to connect to an existing tunnel + #[clap(flatten, next_help_heading = Some("ADVANCED OPTIONS"))] + pub tunnel: ExistingTunnelArgs, + + /// Randomly name machine for port forwarding service + #[clap(long)] + pub random_name: bool, + + /// Sets the machine name for port forwarding service + #[clap(long)] + pub name: Option, + + /// Optional parent process id. If provided, the server will be stopped when the process of the given pid no longer exists + #[clap(long, hide = true)] + pub parent_process_id: Option, + + /// If set, the user accepts the server license terms and the server will be started without a user prompt. + #[clap(long)] + pub accept_server_license_terms: bool, +} + +#[derive(Args, Debug, Clone)] +pub struct TunnelArgs { + #[clap(subcommand)] + pub subcommand: Option, + + #[clap(flatten)] + pub serve_args: TunnelServeArgs, +} + +#[derive(Subcommand, Debug, Clone)] +pub enum TunnelSubcommand { + /// Delete all servers which are currently not running. + Prune, + + /// Rename the name of this machine associated with port forwarding service. + Rename(TunnelRenameArgs), + + /// Remove this machine's association with the port forwarding service. + Unregister, + + #[clap(subcommand)] + User(TunnelUserSubCommands), + + /// Manages the tunnel when installed as a system service, + #[clap(subcommand)] + Service(TunnelServiceSubCommands), +} + +#[derive(Subcommand, Debug, Clone)] +pub enum TunnelServiceSubCommands { + /// Installs or re-installs the tunnel service on the machine. + Install, + + /// Uninstalls and stops the tunnel service. + Uninstall, + + /// Internal command for running the service + #[clap(hide = true)] + InternalRun, +} + +#[derive(Args, Debug, Clone)] +pub struct TunnelRenameArgs { + /// The name you'd like to rename your machine to. + pub name: String, +} + +#[derive(Subcommand, Debug, Clone)] +pub enum TunnelUserSubCommands { + /// Log in to port forwarding service + Login(LoginArgs), + + /// Log out of port forwarding service + Logout, + + /// Show the account that's logged into port forwarding service + Show, +} + +#[derive(Args, Debug, Clone)] +pub struct LoginArgs { + /// An access token to store for authentication. Note: this will not be + /// refreshed if it expires! + #[clap(long, requires = "provider")] + pub access_token: Option, + + /// The auth provider to use. If not provided, a prompt will be shown. + #[clap(arg_enum, long)] + pub provider: Option, +} + +#[derive(clap::ArgEnum, Debug, Clone, Copy)] +pub enum AuthProvider { + Microsoft, + Github, +} diff --git a/cli/src/commands/context.rs b/cli/src/commands/context.rs new file mode 100644 index 00000000000..630d0bb028b --- /dev/null +++ b/cli/src/commands/context.rs @@ -0,0 +1,15 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use crate::{log, state::LauncherPaths}; + +use super::args::CliCore; + +pub struct CommandContext { + pub log: log::Logger, + pub paths: LauncherPaths, + pub args: CliCore, + pub http: reqwest::Client, +} diff --git a/cli/src/commands/output.rs b/cli/src/commands/output.rs new file mode 100644 index 00000000000..8747457889b --- /dev/null +++ b/cli/src/commands/output.rs @@ -0,0 +1,135 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::fmt::Display; + +use std::io::{BufWriter, Write}; + +use super::args::OutputFormat; + +pub struct Column { + max_width: usize, + heading: &'static str, + data: Vec, +} + +impl Column { + pub fn new(heading: &'static str) -> Self { + Column { + max_width: heading.len(), + heading, + data: vec![], + } + } + + pub fn add_row(&mut self, row: String) { + self.max_width = std::cmp::max(self.max_width, row.len()); + self.data.push(row); + } +} + +impl OutputFormat { + pub fn print_table(&self, table: OutputTable) -> Result<(), std::io::Error> { + match *self { + OutputFormat::Json => JsonTablePrinter().print(table, &mut std::io::stdout()), + OutputFormat::Text => TextTablePrinter().print(table, &mut std::io::stdout()), + } + } +} + +pub struct OutputTable { + cols: Vec, +} + +impl OutputTable { + pub fn new(cols: Vec) -> Self { + OutputTable { cols } + } +} + +trait TablePrinter { + fn print(&self, table: OutputTable, out: &mut dyn std::io::Write) + -> Result<(), std::io::Error>; +} + +pub struct JsonTablePrinter(); + +impl TablePrinter for JsonTablePrinter { + fn print( + &self, + table: OutputTable, + out: &mut dyn std::io::Write, + ) -> Result<(), std::io::Error> { + let mut bw = BufWriter::new(out); + bw.write_all(b"[")?; + + if !table.cols.is_empty() { + let data_len = table.cols[0].data.len(); + for i in 0..data_len { + if i > 0 { + bw.write_all(b",{")?; + } else { + bw.write_all(b"{")?; + } + for col in &table.cols { + serde_json::to_writer(&mut bw, col.heading)?; + bw.write_all(b":")?; + serde_json::to_writer(&mut bw, &col.data[i])?; + } + } + } + + bw.write_all(b"]")?; + bw.flush() + } +} + +/// Type that prints the output as an ASCII, markdown-style table. +pub struct TextTablePrinter(); + +impl TablePrinter for TextTablePrinter { + fn print( + &self, + table: OutputTable, + out: &mut dyn std::io::Write, + ) -> Result<(), std::io::Error> { + let mut bw = BufWriter::new(out); + + let sizes = table.cols.iter().map(|c| c.max_width).collect::>(); + + // print headers + write_columns(&mut bw, table.cols.iter().map(|c| c.heading), &sizes)?; + // print --- separators + write_columns( + &mut bw, + table.cols.iter().map(|c| "-".repeat(c.max_width)), + &sizes, + )?; + // print each column + if !table.cols.is_empty() { + let data_len = table.cols[0].data.len(); + for i in 0..data_len { + write_columns(&mut bw, table.cols.iter().map(|c| &c.data[i]), &sizes)?; + } + } + + bw.flush() + } +} + +fn write_columns( + mut w: impl Write, + cols: impl Iterator, + sizes: &[usize], +) -> Result<(), std::io::Error> +where + T: Display, +{ + w.write_all(b"|")?; + for (i, col) in cols.enumerate() { + write!(w, " {:width$} |", col, width = sizes[i])?; + } + w.write_all(b"\r\n") +} diff --git a/cli/src/commands/tunnels.rs b/cli/src/commands/tunnels.rs new file mode 100644 index 00000000000..0dea7761d93 --- /dev/null +++ b/cli/src/commands/tunnels.rs @@ -0,0 +1,299 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use async_trait::async_trait; +use std::str::FromStr; +use std::fmt; +use sysinfo::{Pid, SystemExt}; +use tokio::sync::mpsc; +use tokio::time::{sleep, Duration}; + +use super::{ + args::{ + AuthProvider, CliCore, ExistingTunnelArgs, TunnelRenameArgs, TunnelServeArgs, + TunnelServiceSubCommands, TunnelUserSubCommands, + }, + CommandContext, +}; + +use crate::{ + auth::Auth, + log::{self, Logger}, + state::LauncherPaths, + tunnels::{ + code_server::CodeServerArgs, create_service_manager, dev_tunnels, legal, + paths::get_all_servers, ServiceContainer, ServiceManager, + }, + util::{ + errors::{wrap, AnyError}, + prereqs::PreReqChecker, + }, +}; + +impl From for crate::auth::AuthProvider { + fn from(auth_provider: AuthProvider) -> Self { + match auth_provider { + AuthProvider::Github => crate::auth::AuthProvider::Github, + AuthProvider::Microsoft => crate::auth::AuthProvider::Microsoft, + } + } +} + +impl From for Option { + fn from(d: ExistingTunnelArgs) -> Option { + if let (Some(tunnel_id), Some(tunnel_name), Some(cluster), Some(host_token)) = + (d.tunnel_id, d.tunnel_name, d.cluster, d.host_token) + { + Some(dev_tunnels::ExistingTunnel { + tunnel_id, + tunnel_name, + host_token, + cluster, + }) + } else { + None + } + } +} + +struct TunnelServiceContainer { + args: CliCore, +} + +impl TunnelServiceContainer { + fn new(args: CliCore) -> Self { + Self { args } + } +} + +#[async_trait] +impl ServiceContainer for TunnelServiceContainer { + async fn run_service( + &mut self, + log: log::Logger, + launcher_paths: LauncherPaths, + shutdown_rx: mpsc::Receiver, + ) -> Result<(), AnyError> { + let csa = (&self.args).into(); + serve_with_csa( + launcher_paths, + log, + TunnelServeArgs { + random_name: true, // avoid prompting + ..Default::default() + }, + csa, + Some(shutdown_rx), + ) + .await?; + Ok(()) + } +} +/// Describes the signal to manully stop the server +pub enum ShutdownSignal { + CtrlC, + ParentProcessKilled, + ServiceStopped, +} + +impl fmt::Display for ShutdownSignal { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match self { + ShutdownSignal::CtrlC => write!(f, "Ctrl-C received"), + ShutdownSignal::ParentProcessKilled => write!(f, "Parent process no longer exists"), + ShutdownSignal::ServiceStopped => write!(f, "Service stopped"), + } + } +} + +pub async fn service( + ctx: CommandContext, + service_args: TunnelServiceSubCommands, +) -> Result { + let manager = create_service_manager(ctx.log.clone()); + match service_args { + TunnelServiceSubCommands::Install => { + // ensure logged in, otherwise subsequent serving will fail + Auth::new(&ctx.paths, ctx.log.clone()) + .get_credential() + .await?; + + // likewise for license consent + legal::require_consent(&ctx.paths, false)?; + + let current_exe = + std::env::current_exe().map_err(|e| wrap(e, "could not get current exe"))?; + + manager.register( + current_exe, + &[ + "--cli-data-dir", + ctx.paths.root().as_os_str().to_string_lossy().as_ref(), + "tunnel", + "service", + "internal-run", + ], + )?; + ctx.log.result("Service successfully installed! You can use `code tunnel service log` to monitor it, and `code tunnel service uninstall` to remove it."); + } + TunnelServiceSubCommands::Uninstall => { + manager.unregister()?; + } + TunnelServiceSubCommands::InternalRun => { + manager.run(ctx.paths.clone(), TunnelServiceContainer::new(ctx.args))?; + } + } + + Ok(0) +} + +pub async fn user(ctx: CommandContext, user_args: TunnelUserSubCommands) -> Result { + let auth = Auth::new(&ctx.paths, ctx.log.clone()); + match user_args { + TunnelUserSubCommands::Login(login_args) => { + auth.login( + login_args.provider.map(|p| p.into()), + login_args.access_token.to_owned(), + ) + .await?; + } + TunnelUserSubCommands::Logout => { + auth.clear_credentials()?; + } + TunnelUserSubCommands::Show => { + if let Ok(Some(_)) = auth.get_current_credential() { + ctx.log.result("logged in"); + } else { + ctx.log.result("not logged in"); + return Ok(1); + } + } + } + + Ok(0) +} + +/// Remove the tunnel used by this gateway, if any. +pub async fn rename(ctx: CommandContext, rename_args: TunnelRenameArgs) -> Result { + let auth = Auth::new(&ctx.paths, ctx.log.clone()); + let mut dt = dev_tunnels::DevTunnels::new(&ctx.log, auth, &ctx.paths); + dt.rename_tunnel(&rename_args.name).await?; + ctx.log.result(&format!( + "Successfully renamed this gateway to {}", + &rename_args.name + )); + + Ok(0) +} + +/// Remove the tunnel used by this gateway, if any. +pub async fn unregister(ctx: CommandContext) -> Result { + let auth = Auth::new(&ctx.paths, ctx.log.clone()); + let mut dt = dev_tunnels::DevTunnels::new(&ctx.log, auth, &ctx.paths); + dt.remove_tunnel().await?; + Ok(0) +} + +/// Removes unused servers. +pub async fn prune(ctx: CommandContext) -> Result { + get_all_servers(&ctx.paths) + .into_iter() + .map(|s| s.server_paths(&ctx.paths)) + .filter(|s| s.get_running_pid().is_none()) + .try_for_each(|s| { + ctx.log + .result(&format!("Deleted {}", s.server_dir.display())); + s.delete() + }) + .map_err(AnyError::from)?; + + ctx.log.result("Successfully removed all unused servers"); + + Ok(0) +} + +/// Starts the gateway server. +pub async fn serve(ctx: CommandContext, gateway_args: TunnelServeArgs) -> Result { + let CommandContext { + log, paths, args, .. + } = ctx; + + legal::require_consent(&paths, gateway_args.accept_server_license_terms)?; + + let csa = (&args).into(); + serve_with_csa(paths, log, gateway_args, csa, None).await +} + +async fn serve_with_csa( + paths: LauncherPaths, + log: Logger, + gateway_args: TunnelServeArgs, + csa: CodeServerArgs, + shutdown_rx: Option>, +) -> Result { + // Intentionally read before starting the server. If the server updated and + // respawn is requested, the old binary will get renamed, and then + // current_exe will point to the wrong path. + let current_exe = std::env::current_exe().unwrap(); + let platform = spanf!(log, log.span("prereq"), PreReqChecker::new().verify())?; + + let auth = Auth::new(&paths, log.clone()); + let mut dt = dev_tunnels::DevTunnels::new(&log, auth, &paths); + let tunnel = if let Some(d) = gateway_args.tunnel.clone().into() { + dt.start_existing_tunnel(d).await + } else { + dt.start_new_launcher_tunnel(gateway_args.name, gateway_args.random_name) + .await + }?; + + let shutdown_tx = if let Some(tx) = shutdown_rx { + tx + } else { + let (tx, rx) = mpsc::channel::(2); + if let Some(process_id) = gateway_args.parent_process_id { + match Pid::from_str(&process_id) { + Ok(pid) => { + let tx = tx.clone(); + info!(log, "checking for parent process {}", process_id); + tokio::spawn(async move { + let mut s = sysinfo::System::new(); + while s.refresh_process(pid) { + sleep(Duration::from_millis(2000)).await; + } + tx.send(ShutdownSignal::ParentProcessKilled).await.ok(); + }); + } + Err(_) => { + info!(log, "invalid parent process id: {}", process_id); + } + } + } + tokio::spawn(async move { + tokio::signal::ctrl_c().await.ok(); + tx.send(ShutdownSignal::CtrlC).await.ok(); + }); + rx + }; + + let mut r = crate::tunnels::serve(&log, tunnel, &paths, &csa, platform, shutdown_tx).await?; + r.tunnel.close().await.ok(); + + if r.respawn { + warning!(log, "respawn requested, starting new server"); + // reuse current args, but specify no-forward since tunnels will + // already be running in this process, and we cannot do a login + let args = std::env::args().skip(1).collect::>(); + let exit = std::process::Command::new(current_exe) + .args(args) + .spawn() + .map_err(|e| wrap(e, "error respawning after update"))? + .wait() + .map_err(|e| wrap(e, "error waiting for child"))?; + + return Ok(exit.code().unwrap_or(1)); + } + + Ok(0) +} diff --git a/cli/src/commands/update.rs b/cli/src/commands/update.rs new file mode 100644 index 00000000000..7e1db89964c --- /dev/null +++ b/cli/src/commands/update.rs @@ -0,0 +1,44 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use indicatif::ProgressBar; + +use crate::{ + self_update::SelfUpdate, + update_service::UpdateService, + util::{errors::AnyError, input::ProgressBarReporter}, +}; + +use super::{args::StandaloneUpdateArgs, CommandContext}; + +pub async fn update(ctx: CommandContext, args: StandaloneUpdateArgs) -> Result { + let update_service = UpdateService::new(ctx.log.clone(), ctx.http.clone()); + let update_service = SelfUpdate::new(&update_service)?; + + let current_version = update_service.get_current_release().await?; + if update_service.is_up_to_date_with(¤t_version) { + ctx.log.result(format!( + "VS Code is already to to date ({})", + current_version.commit + )); + return Ok(1); + } + + if args.check { + ctx.log + .result(format!("Update to {} is available", current_version)); + return Ok(0); + } + + let pb = ProgressBar::new(1); + pb.set_message("Downloading..."); + update_service + .do_update(¤t_version, ProgressBarReporter::from(pb)) + .await?; + ctx.log + .result(format!("Successfully updated to {}", current_version)); + + Ok(0) +} diff --git a/cli/src/commands/version.rs b/cli/src/commands/version.rs new file mode 100644 index 00000000000..816c53ddf9f --- /dev/null +++ b/cli/src/commands/version.rs @@ -0,0 +1,66 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::path::{Path, PathBuf}; + +use crate::{ + desktop::{prompt_to_install, CodeVersionManager, RequestedVersion}, + log, + util::{ + errors::{AnyError, NoInstallInUserProvidedPath}, + prereqs::PreReqChecker, + }, +}; + +use super::{args::UseVersionArgs, CommandContext}; + +pub async fn switch_to(ctx: CommandContext, args: UseVersionArgs) -> Result { + let platform = PreReqChecker::new().verify().await?; + let vm = CodeVersionManager::new(ctx.log.clone(), &ctx.paths, platform); + let version = RequestedVersion::try_from(args.name.as_str())?; + + let maybe_path = match args.install_dir { + Some(d) => Some( + CodeVersionManager::get_entrypoint_for_install_dir(&PathBuf::from(&d)) + .await + .ok_or(NoInstallInUserProvidedPath(d))?, + ), + None => vm.try_get_entrypoint(&version).await, + }; + + match maybe_path { + Some(p) => { + vm.set_preferred_version(version.clone(), p.clone()).await?; + print_now_using(&ctx.log, &version, &p); + Ok(0) + } + None => { + prompt_to_install(&version); + Ok(1) + } + } +} + +pub async fn show(ctx: CommandContext) -> Result { + let platform = PreReqChecker::new().verify().await?; + let vm = CodeVersionManager::new(ctx.log.clone(), &ctx.paths, platform); + + let version = vm.get_preferred_version(); + println!("Current quality: {}", version); + match vm.try_get_entrypoint(&version).await { + Some(p) => println!("Installation path: {}", p.display()), + None => println!("No existing installation found"), + } + + Ok(0) +} + +fn print_now_using(log: &log::Logger, version: &RequestedVersion, path: &Path) { + log.result(&format!( + "Now using VS Code {} from {}", + version, + path.display() + )); +} diff --git a/cli/src/constants.rs b/cli/src/constants.rs new file mode 100644 index 00000000000..1541a6a43a4 --- /dev/null +++ b/cli/src/constants.rs @@ -0,0 +1,48 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::collections::HashMap; + +use lazy_static::lazy_static; + +use crate::options::Quality; + +pub const CONTROL_PORT: u16 = 31545; +pub const PROTOCOL_VERSION: u32 = 1; + +pub const VSCODE_CLI_VERSION: Option<&'static str> = option_env!("VSCODE_CLI_VERSION"); +pub const VSCODE_CLI_AI_KEY: Option<&'static str> = option_env!("VSCODE_CLI_AI_KEY"); +pub const VSCODE_CLI_AI_ENDPOINT: Option<&'static str> = option_env!("VSCODE_CLI_AI_ENDPOINT"); +pub const VSCODE_CLI_QUALITY: Option<&'static str> = option_env!("VSCODE_CLI_QUALITY"); +pub const VSCODE_CLI_COMMIT: Option<&'static str> = option_env!("VSCODE_CLI_COMMIT"); +pub const VSCODE_CLI_UPDATE_ENDPOINT: Option<&'static str> = + option_env!("VSCODE_CLI_UPDATE_ENDPOINT"); + +pub const TUNNEL_SERVICE_USER_AGENT_ENV_VAR: &str = "TUNNEL_SERVICE_USER_AGENT"; + +// JSON map of quality names to arrays of app IDs used for them, for example, `{"stable":["ABC123"]}` +const VSCODE_CLI_WIN32_APP_IDS: Option<&'static str> = option_env!("VSCODE_CLI_WIN32_APP_IDS"); +// JSON map of quality names to download URIs +const VSCODE_CLI_QUALITY_DOWNLOAD_URIS: Option<&'static str> = + option_env!("VSCODE_CLI_QUALITY_DOWNLOAD_URIS"); + +pub fn get_default_user_agent() -> String { + format!( + "vscode-server-launcher/{}", + VSCODE_CLI_VERSION.unwrap_or("dev") + ) +} + +lazy_static! { + pub static ref TUNNEL_SERVICE_USER_AGENT: String = + match std::env::var(TUNNEL_SERVICE_USER_AGENT_ENV_VAR) { + Ok(ua) if !ua.is_empty() => format!("{} {}", ua, get_default_user_agent()), + _ => get_default_user_agent(), + }; + pub static ref WIN32_APP_IDS: Option>> = + VSCODE_CLI_WIN32_APP_IDS.and_then(|s| serde_json::from_str(s).unwrap()); + pub static ref QUALITY_DOWNLOAD_URIS: Option> = + VSCODE_CLI_QUALITY_DOWNLOAD_URIS.and_then(|s| serde_json::from_str(s).unwrap()); +} diff --git a/extensions/vscode-notebook-tests/test/second.vsctestnb b/cli/src/desktop.rs similarity index 76% rename from extensions/vscode-notebook-tests/test/second.vsctestnb rename to cli/src/desktop.rs index a4a092d8349..9f4409d0f0d 100644 --- a/extensions/vscode-notebook-tests/test/second.vsctestnb +++ b/cli/src/desktop.rs @@ -2,3 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + +mod version_manager; + +pub use version_manager::{prompt_to_install, CodeVersionManager, RequestedVersion}; diff --git a/cli/src/desktop/version_manager.rs b/cli/src/desktop/version_manager.rs new file mode 100644 index 00000000000..3fd1b7c35f3 --- /dev/null +++ b/cli/src/desktop/version_manager.rs @@ -0,0 +1,579 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::{ + ffi::OsString, + fmt, io, + path::{Path, PathBuf}, +}; + +use lazy_static::lazy_static; +use regex::Regex; +use serde::{Deserialize, Serialize}; + +use crate::{ + constants::QUALITY_DOWNLOAD_URIS, + log, + options::{self, Quality}, + state::{LauncherPaths, PersistedState}, + update_service::Platform, + util::errors::{AnyError, InvalidRequestedVersion}, +}; + +/// Parsed instance that a user can request. +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)] +#[serde(tag = "t", content = "c")] +pub enum RequestedVersion { + Quality(options::Quality), + Version { + version: String, + quality: options::Quality, + }, + Commit { + commit: String, + quality: options::Quality, + }, + Path(String), +} + +lazy_static! { + static ref SEMVER_RE: Regex = Regex::new(r"^\d+\.\d+\.\d+(-insider)?$").unwrap(); + static ref COMMIT_RE: Regex = Regex::new(r"^[a-z]+/[a-e0-f]{40}$").unwrap(); +} + +impl RequestedVersion { + pub fn get_command(&self) -> String { + match self { + RequestedVersion::Quality(quality) => { + format!("code version use {}", quality.get_machine_name()) + } + RequestedVersion::Version { version, .. } => { + format!("code version use {}", version) + } + RequestedVersion::Commit { commit, quality } => { + format!("code version use {}/{}", quality.get_machine_name(), commit) + } + RequestedVersion::Path(path) => { + format!("code version use {}", path) + } + } + } +} + +impl std::fmt::Display for RequestedVersion { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match self { + RequestedVersion::Quality(quality) => write!(f, "{}", quality.get_capitalized_name()), + RequestedVersion::Version { version, .. } => { + write!(f, "{}", version) + } + RequestedVersion::Commit { commit, quality } => { + write!(f, "{}/{}", quality, commit) + } + RequestedVersion::Path(path) => write!(f, "{}", path), + } + } +} + +impl TryFrom<&str> for RequestedVersion { + type Error = InvalidRequestedVersion; + + fn try_from(s: &str) -> Result { + if let Ok(quality) = options::Quality::try_from(s) { + return Ok(RequestedVersion::Quality(quality)); + } + + if SEMVER_RE.is_match(s) { + return Ok(RequestedVersion::Version { + quality: if s.ends_with("-insider") { + options::Quality::Insiders + } else { + options::Quality::Stable + }, + version: s.to_string(), + }); + } + + if Path::is_absolute(&PathBuf::from(s)) { + return Ok(RequestedVersion::Path(s.to_string())); + } + + if COMMIT_RE.is_match(s) { + let idx = s.find('/').expect("expected a /"); + if let Ok(quality) = options::Quality::try_from(&s[0..idx]) { + return Ok(RequestedVersion::Commit { + commit: s[idx + 1..].to_string(), + quality, + }); + } + } + + Err(InvalidRequestedVersion()) + } +} + +#[derive(Serialize, Deserialize, Clone, Default)] +struct Stored { + /// Map of requested versions to locations where those versions are installed. + versions: Vec<(RequestedVersion, OsString)>, + current: usize, +} + +pub struct CodeVersionManager { + state: PersistedState, + log: log::Logger, +} + +impl CodeVersionManager { + pub fn new(log: log::Logger, lp: &LauncherPaths, _platform: Platform) -> Self { + CodeVersionManager { + log, + state: PersistedState::new(lp.root().join("versions.json")), + } + } + + /// Tries to find the binary entrypoint for VS Code installed in the path. + pub async fn get_entrypoint_for_install_dir(path: &Path) -> Option { + use tokio::sync::mpsc; + + let (tx, mut rx) = mpsc::channel(1); + + // Look for all the possible paths in parallel + for entry in DESKTOP_CLI_RELATIVE_PATH.split(',') { + let my_path = path.join(entry); + let my_tx = tx.clone(); + tokio::spawn(async move { + if tokio::fs::metadata(&my_path).await.is_ok() { + my_tx.send(my_path).await.ok(); + } + }); + } + + drop(tx); // drop so rx gets None if no sender emits + + rx.recv().await + } + + /// Sets the "version" as the persisted one for the user. + pub async fn set_preferred_version( + &self, + version: RequestedVersion, + path: PathBuf, + ) -> Result<(), AnyError> { + let mut stored = self.state.load(); + stored.current = self.store_version_path(&mut stored, version, path); + self.state.save(stored)?; + Ok(()) + } + + /// Stores or updates the path used for the given version. Returns the index + /// that the path exists at. + fn store_version_path( + &self, + state: &mut Stored, + version: RequestedVersion, + path: PathBuf, + ) -> usize { + if let Some(i) = state.versions.iter().position(|(v, _)| v == &version) { + state.versions[i].1 = path.into_os_string(); + i + } else { + state + .versions + .push((version.clone(), path.into_os_string())); + state.versions.len() - 1 + } + } + + /// Gets the currently preferred version based on set_preferred_version. + pub fn get_preferred_version(&self) -> RequestedVersion { + let stored = self.state.load(); + stored + .versions + .get(stored.current) + .map(|(v, _)| v.clone()) + .unwrap_or(RequestedVersion::Quality(options::Quality::Stable)) + } + + /// Tries to get the entrypoint for the version, if one can be found. + pub async fn try_get_entrypoint(&self, version: &RequestedVersion) -> Option { + let mut state = self.state.load(); + if let Some((_, install_path)) = state.versions.iter().find(|(v, _)| v == version) { + let p = PathBuf::from(install_path); + if p.exists() { + return Some(p); + } + } + + // For simple quality requests, see if that's installed already on the system + let candidates = match &version { + RequestedVersion::Quality(q) => match detect_installed_program(&self.log, *q) { + Ok(p) => p, + Err(e) => { + warning!(self.log, "error looking up installed applications: {}", e); + return None; + } + }, + _ => return None, + }; + + let found = match candidates.into_iter().next() { + Some(p) => p, + None => return None, + }; + + // stash the found path for faster lookup + self.store_version_path(&mut state, version.clone(), found.clone()); + if let Err(e) = self.state.save(state) { + debug!(self.log, "error caching version path: {}", e); + } + + Some(found) + } +} + +/// Shows a nice UI prompt to users asking them if they want to install the +/// requested version. +pub fn prompt_to_install(version: &RequestedVersion) { + println!("No installation of VS Code {} was found.", version); + + if let RequestedVersion::Quality(quality) = version { + if let Some(uri) = QUALITY_DOWNLOAD_URIS.as_ref().and_then(|m| m.get(quality)) { + // todo: on some platforms, we may be able to help automate installation. For example, + // we can unzip the app ourselves on macOS and on windows we can download and spawn the GUI installer + #[cfg(target_os = "linux")] + println!("Install it from your system's package manager or {}, restart your shell, and try again.", uri); + #[cfg(target_os = "macos")] + println!("Download and unzip it from {} and try again.", uri); + #[cfg(target_os = "windows")] + println!("Install it from {} and try again.", uri); + } + } + + println!(); + println!("If you already installed VS Code and we didn't detect it, run `{} --install-dir /path/to/installation`", version.get_command()); +} + +#[cfg(target_os = "macos")] +fn detect_installed_program(log: &log::Logger, quality: Quality) -> io::Result> { + // easy, fast detection for where apps are usually installed + let mut probable = PathBuf::from("/Applications"); + let app_name = quality.get_macos_app_name(); + probable.push(format!("{}.app", app_name)); + if probable.exists() { + probable.extend(["Contents/Resources", "app", "bin", "code"]); + return Ok(vec![probable]); + } + + // _Much_ slower detection using the system_profiler (~10s for me). While the + // profiler can output nicely structure plist xml, pulling in an xml parser + // just for this is overkill. The default output looks something like... + // + // Visual Studio Code - Exploration 2: + // + // Version: 1.73.0-exploration + // Obtained from: Identified Developer + // Last Modified: 9/23/22, 10:16 AM + // Kind: Intel + // Signed by: Developer ID Application: Microsoft Corporation (UBF8T346G9), Developer ID Certification Authority, Apple Root CA + // Location: /Users/connor/Downloads/Visual Studio Code - Exploration 2.app + // + // So, use a simple state machine that looks for the first line, and then for + // the `Location:` line for the path. + info!(log, "Searching for installations on your machine, this is done once and will take about 10 seconds..."); + + let stdout = std::process::Command::new("system_profiler") + .args(["SPApplicationsDataType", "-detailLevel", "mini"]) + .output()? + .stdout; + + enum State { + LookingForName, + LookingForLocation, + } + + let mut state = State::LookingForName; + let mut output: Vec = vec![]; + const LOCATION_PREFIX: &str = "Location:"; + for mut line in String::from_utf8_lossy(&stdout).lines() { + line = line.trim(); + match state { + State::LookingForName => { + if line.starts_with(app_name) && line.ends_with(':') { + state = State::LookingForLocation; + } + } + State::LookingForLocation => { + if line.starts_with(LOCATION_PREFIX) { + output.push( + [ + &line[LOCATION_PREFIX.len()..].trim(), + "Contents/Resources", + "app", + "bin", + "code", + ] + .iter() + .collect(), + ); + state = State::LookingForName; + } + } + } + } + + // Sort shorter paths to the front, preferring "more global" installs, and + // incidentally preferring local installs over Parallels 'installs'. + output.sort_by(|a, b| a.as_os_str().len().cmp(&b.as_os_str().len())); + + Ok(output) +} + +#[cfg(windows)] +fn detect_installed_program(_log: &log::Logger, quality: Quality) -> io::Result> { + use crate::constants::WIN32_APP_IDS; + use winreg::enums::{HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE}; + use winreg::RegKey; + + let mut output: Vec = vec![]; + let app_ids = match WIN32_APP_IDS.as_ref().and_then(|m| m.get(&quality)) { + Some(ids) => ids, + None => return Ok(output), + }; + + let scopes = [ + ( + HKEY_LOCAL_MACHINE, + "SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall", + ), + ( + HKEY_LOCAL_MACHINE, + "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall", + ), + ( + HKEY_CURRENT_USER, + "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall", + ), + ]; + + for (scope, key) in scopes { + let cur_ver = match RegKey::predef(scope).open_subkey(key) { + Ok(k) => k, + Err(_) => continue, + }; + + for key in cur_ver.enum_keys().flatten() { + if app_ids.iter().any(|id| key.contains(id)) { + let sk = cur_ver.open_subkey(&key)?; + if let Ok(location) = sk.get_value::("InstallLocation") { + output.push( + [ + location.as_str(), + "bin", + match quality { + Quality::Exploration => "code-exploration.cmd", + Quality::Insiders => "code-insiders.cmd", + Quality::Stable => "code.cmd", + }, + ] + .iter() + .collect(), + ) + } + } + } + } + + Ok(output) +} + +// Looks for the given binary name in the PATH, returning all candidate matches. +// Based on https://github.dev/microsoft/vscode-js-debug/blob/7594d05518df6700df51771895fcad0ddc7f92f9/src/common/pathUtils.ts#L15 +#[cfg(target_os = "linux")] +fn detect_installed_program(log: &log::Logger, quality: Quality) -> io::Result> { + let path = match std::env::var("PATH") { + Ok(p) => p, + Err(e) => { + info!(log, "PATH is empty ({}), skipping detection", e); + return Ok(vec![]); + } + }; + + let name = quality.get_commandline_name(); + let current_exe = std::env::current_exe().expect("expected to read current exe"); + let mut output = vec![]; + for dir in path.split(':') { + let target: PathBuf = [dir, name].iter().collect(); + match std::fs::canonicalize(&target) { + Ok(m) if m == current_exe => continue, + Ok(_) => {} + Err(_) => continue, + }; + + // note: intentionally store the non-canonicalized version, since if it's a + // symlink, (1) it's probably desired to use it and (2) resolving the link + // breaks snap installations. + output.push(target); + } + + Ok(output) +} + +const DESKTOP_CLI_RELATIVE_PATH: &str = if cfg!(target_os = "macos") { + "Contents/Resources/app/bin/code" +} else if cfg!(target_os = "windows") { + "bin/code.cmd,bin/code-insiders.cmd,bin/code-exploration.cmd" +} else { + "bin/code,bin/code-insiders,bin/code-exploration" +}; + +#[cfg(test)] +mod tests { + use std::{ + fs::{create_dir_all, File}, + io::Write, + }; + + use super::*; + + fn make_fake_vscode_install(path: &Path) { + let bin = DESKTOP_CLI_RELATIVE_PATH + .split(',') + .next() + .expect("expected exe path"); + + let binary_file_path = path.join(bin); + let parent_dir_path = binary_file_path.parent().expect("expected parent path"); + + create_dir_all(parent_dir_path).expect("expected to create parent dir"); + + let mut binary_file = File::create(binary_file_path).expect("expected to make file"); + binary_file + .write_all(b"") + .expect("expected to write binary"); + } + + fn make_multiple_vscode_install() -> tempfile::TempDir { + let dir = tempfile::tempdir().expect("expected to make temp dir"); + make_fake_vscode_install(&dir.path().join("desktop/stable")); + make_fake_vscode_install(&dir.path().join("desktop/1.68.2")); + dir + } + + #[test] + fn test_detect_installed_program() { + // developers can run this test and debug output manually; VS Code will not + // be installed in CI, so the test only makes sure it doesn't error out + let result = detect_installed_program(&log::Logger::test(), Quality::Insiders); + println!("result: {:?}", result); + assert!(result.is_ok()); + } + + #[test] + fn test_requested_version_parses() { + assert_eq!( + RequestedVersion::try_from("1.2.3").unwrap(), + RequestedVersion::Version { + quality: options::Quality::Stable, + version: "1.2.3".to_string(), + } + ); + + assert_eq!( + RequestedVersion::try_from("1.2.3-insider").unwrap(), + RequestedVersion::Version { + quality: options::Quality::Insiders, + version: "1.2.3-insider".to_string(), + } + ); + + assert_eq!( + RequestedVersion::try_from("stable").unwrap(), + RequestedVersion::Quality(options::Quality::Stable) + ); + + assert_eq!( + RequestedVersion::try_from("insiders").unwrap(), + RequestedVersion::Quality(options::Quality::Insiders) + ); + + assert_eq!( + RequestedVersion::try_from("insiders/92fd228156aafeb326b23f6604028d342152313b") + .unwrap(), + RequestedVersion::Commit { + commit: "92fd228156aafeb326b23f6604028d342152313b".to_string(), + quality: options::Quality::Insiders + } + ); + + assert_eq!( + RequestedVersion::try_from("stable/92fd228156aafeb326b23f6604028d342152313b").unwrap(), + RequestedVersion::Commit { + commit: "92fd228156aafeb326b23f6604028d342152313b".to_string(), + quality: options::Quality::Stable + } + ); + + let exe = std::env::current_exe() + .expect("expected to get exe") + .to_string_lossy() + .to_string(); + assert_eq!( + RequestedVersion::try_from(exe.as_str()).unwrap(), + RequestedVersion::Path(exe), + ); + } + + #[tokio::test] + async fn test_set_preferred_version() { + let dir = make_multiple_vscode_install(); + let lp = LauncherPaths::new_without_replacements(dir.path().to_owned()); + let vm1 = CodeVersionManager::new(log::Logger::test(), &lp, Platform::LinuxARM64); + + assert_eq!( + vm1.get_preferred_version(), + RequestedVersion::Quality(options::Quality::Stable) + ); + vm1.set_preferred_version( + RequestedVersion::Quality(options::Quality::Exploration), + dir.path().join("desktop/stable"), + ) + .await + .expect("expected to store"); + vm1.set_preferred_version( + RequestedVersion::Quality(options::Quality::Insiders), + dir.path().join("desktop/stable"), + ) + .await + .expect("expected to store"); + assert_eq!( + vm1.get_preferred_version(), + RequestedVersion::Quality(options::Quality::Insiders) + ); + + let vm2 = CodeVersionManager::new(log::Logger::test(), &lp, Platform::LinuxARM64); + assert_eq!( + vm2.get_preferred_version(), + RequestedVersion::Quality(options::Quality::Insiders) + ); + } + + #[tokio::test] + async fn test_gets_entrypoint() { + let dir = make_multiple_vscode_install(); + + assert!(CodeVersionManager::get_entrypoint_for_install_dir( + &dir.path().join("desktop").join("stable") + ) + .await + .is_some()); + + assert!( + CodeVersionManager::get_entrypoint_for_install_dir(&dir.path().join("invalid")) + .await + .is_none() + ); + } +} diff --git a/cli/src/lib.rs b/cli/src/lib.rs new file mode 100644 index 00000000000..a1ebce4b0ef --- /dev/null +++ b/cli/src/lib.rs @@ -0,0 +1,19 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +// todo: we should reduce the exported surface area over time as things are +// moved into a common CLI +pub mod auth; +pub mod constants; +#[macro_use] +pub mod log; +pub mod commands; +pub mod desktop; +pub mod options; +pub mod state; +pub mod tunnels; +pub mod self_update; +pub mod update_service; +pub mod util; diff --git a/cli/src/log.rs b/cli/src/log.rs new file mode 100644 index 00000000000..d31e02fb3bf --- /dev/null +++ b/cli/src/log.rs @@ -0,0 +1,397 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use chrono::Local; +use opentelemetry::{ + sdk::trace::{Tracer, TracerProvider}, + trace::{SpanBuilder, Tracer as TraitTracer, TracerProvider as TracerProviderTrait}, +}; +use std::fmt; +use std::{env, path::Path, sync::Arc}; +use std::{ + io::Write, + sync::atomic::{AtomicU32, Ordering}, +}; + +const NO_COLOR_ENV: &str = "NO_COLOR"; + +static INSTANCE_COUNTER: AtomicU32 = AtomicU32::new(0); + +// Gets a next incrementing number that can be used in logs +pub fn next_counter() -> u32 { + INSTANCE_COUNTER.fetch_add(1, Ordering::SeqCst) +} + +// Log level +#[derive(clap::ArgEnum, PartialEq, Eq, PartialOrd, Clone, Copy, Debug)] +pub enum Level { + Trace = 0, + Debug, + Info, + Warn, + Error, + Critical, + Off, +} + +impl Default for Level { + fn default() -> Self { + Level::Info + } +} + +impl fmt::Display for Level { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match self { + Level::Critical => write!(f, "critical"), + Level::Debug => write!(f, "debug"), + Level::Error => write!(f, "error"), + Level::Info => write!(f, "info"), + Level::Off => write!(f, "off"), + Level::Trace => write!(f, "trace"), + Level::Warn => write!(f, "warn"), + } + } +} + +impl Level { + pub fn name(&self) -> Option<&str> { + match self { + Level::Trace => Some("trace"), + Level::Debug => Some("debug"), + Level::Info => Some("info"), + Level::Warn => Some("warn"), + Level::Error => Some("error"), + Level::Critical => Some("critical"), + Level::Off => None, + } + } + + pub fn color_code(&self) -> Option<&str> { + if env::var(NO_COLOR_ENV).is_ok() || !atty::is(atty::Stream::Stdout) { + return None; + } + + match self { + Level::Trace => None, + Level::Debug => Some("\x1b[36m"), + Level::Info => Some("\x1b[35m"), + Level::Warn => Some("\x1b[33m"), + Level::Error => Some("\x1b[31m"), + Level::Critical => Some("\x1b[31m"), + Level::Off => None, + } + } + + pub fn to_u8(self) -> u8 { + self as u8 + } +} + +pub fn new_tunnel_prefix() -> String { + format!("[tunnel.{}]", next_counter()) +} + +pub fn new_code_server_prefix() -> String { + format!("[codeserver.{}]", next_counter()) +} + +pub fn new_rpc_prefix() -> String { + format!("[rpc.{}]", next_counter()) +} + +// Base logger implementation +#[derive(Clone)] +pub struct Logger { + tracer: Tracer, + sink: Vec>, + prefix: Option, +} + +// Copy trick from https://stackoverflow.com/a/30353928 +pub trait LogSinkClone { + fn clone_box(&self) -> Box; +} + +impl LogSinkClone for T +where + T: 'static + LogSink + Clone, +{ + fn clone_box(&self) -> Box { + Box::new(self.clone()) + } +} + +pub trait LogSink: LogSinkClone + Sync + Send { + fn write_log(&self, level: Level, prefix: &str, message: &str); + fn write_result(&self, message: &str); +} + +impl Clone for Box { + fn clone(&self) -> Box { + self.clone_box() + } +} + +#[derive(Clone)] +pub struct StdioLogSink { + level: Level, +} + +impl LogSink for StdioLogSink { + fn write_log(&self, level: Level, prefix: &str, message: &str) { + if level < self.level { + return; + } + + emit(level, prefix, message); + } + + fn write_result(&self, message: &str) { + println!("{}", message); + } +} + +#[derive(Clone)] +pub struct FileLogSink { + level: Level, + file: Arc>, +} + +impl FileLogSink { + pub fn new(level: Level, path: &Path) -> std::io::Result { + let file = std::fs::File::create(path)?; + Ok(Self { + level, + file: Arc::new(std::sync::Mutex::new(file)), + }) + } +} + +impl LogSink for FileLogSink { + fn write_log(&self, level: Level, prefix: &str, message: &str) { + if level < self.level { + return; + } + + let line = format(level, prefix, message); + + // ignore any errors, not much we can do if logging fails... + self.file.lock().unwrap().write_all(line.as_bytes()).ok(); + } + + fn write_result(&self, _message: &str) {} +} + +impl Logger { + pub fn test() -> Self { + Self { + tracer: TracerProvider::builder().build().tracer("codeclitest"), + sink: vec![], + prefix: None, + } + } + + pub fn new(tracer: Tracer, level: Level) -> Self { + Self { + tracer, + sink: vec![Box::new(StdioLogSink { level })], + prefix: None, + } + } + + pub fn span(&self, name: &str) -> SpanBuilder { + self.tracer.span_builder(format!("serverlauncher/{}", name)) + } + + pub fn tracer(&self) -> &Tracer { + &self.tracer + } + + pub fn emit(&self, level: Level, message: &str) { + let prefix = self.prefix.as_deref().unwrap_or(""); + for sink in &self.sink { + sink.write_log(level, prefix, message); + } + } + + pub fn result(&self, message: impl AsRef) { + for sink in &self.sink { + sink.write_result(message.as_ref()); + } + } + + pub fn prefixed(&self, prefix: &str) -> Logger { + Logger { + prefix: Some(match &self.prefix { + Some(p) => format!("{}{} ", p, prefix), + None => format!("{} ", prefix), + }), + ..self.clone() + } + } + + /// Creates a new logger with the additional log sink added. + pub fn tee(&self, sink: T) -> Logger + where + T: LogSink + 'static, + { + let mut new_sinks = self.sink.clone(); + new_sinks.push(Box::new(sink)); + + Logger { + sink: new_sinks, + ..self.clone() + } + } + + pub fn get_download_logger<'a>(&'a self, prefix: &'static str) -> DownloadLogger<'a> { + DownloadLogger { + prefix, + logger: self, + } + } +} + +pub struct DownloadLogger<'a> { + prefix: &'static str, + logger: &'a Logger, +} + +impl<'a> crate::util::io::ReportCopyProgress for DownloadLogger<'a> { + fn report_progress(&mut self, bytes_so_far: u64, total_bytes: u64) { + if total_bytes > 0 { + self.logger.emit( + Level::Trace, + &format!( + "{} {}/{} ({:.0}%)", + self.prefix, + bytes_so_far, + total_bytes, + (bytes_so_far as f64 / total_bytes as f64) * 100.0, + ), + ); + } else { + self.logger.emit( + Level::Trace, + &format!("{} {}/{}", self.prefix, bytes_so_far, total_bytes,), + ); + } + } +} + +pub fn format(level: Level, prefix: &str, message: &str) -> String { + let current = Local::now(); + let timestamp = current.format("%Y-%m-%d %H:%M:%S").to_string(); + + let name = level.name().unwrap(); + + if let Some(c) = level.color_code() { + format!( + "\x1b[2m[{}]\x1b[0m {}{}\x1b[0m {}{}\n", + timestamp, c, name, prefix, message + ) + } else { + format!("[{}] {} {}{}\n", timestamp, name, prefix, message) + } +} + +pub fn emit(level: Level, prefix: &str, message: &str) { + let line = format(level, prefix, message); + if level == Level::Trace { + print!("\x1b[2m{}\x1b[0m", line); + } else { + print!("{}", line); + } +} + +#[macro_export] +macro_rules! error { + ($logger:expr, $str:expr) => { + $logger.emit(log::Level::Error, $str) + }; + ($logger:expr, $($fmt:expr),+) => { + $logger.emit(log::Level::Error, &format!($($fmt),+)) + }; + } + +#[macro_export] +macro_rules! trace { + ($logger:expr, $str:expr) => { + $logger.emit(log::Level::Trace, $str) + }; + ($logger:expr, $($fmt:expr),+) => { + $logger.emit(log::Level::Trace, &format!($($fmt),+)) + }; + } + +#[macro_export] +macro_rules! debug { + ($logger:expr, $str:expr) => { + $logger.emit(log::Level::Debug, $str) + }; + ($logger:expr, $($fmt:expr),+) => { + $logger.emit(log::Level::Debug, &format!($($fmt),+)) + }; + } + +#[macro_export] +macro_rules! info { + ($logger:expr, $str:expr) => { + $logger.emit(log::Level::Info, $str) + }; + ($logger:expr, $($fmt:expr),+) => { + $logger.emit(log::Level::Info, &format!($($fmt),+)) + }; + } + +#[macro_export] +macro_rules! warning { + ($logger:expr, $str:expr) => { + $logger.emit(log::Level::Warn, $str) + }; + ($logger:expr, $($fmt:expr),+) => { + $logger.emit(log::Level::Warn, &format!($($fmt),+)) + }; + } + +#[macro_export] +macro_rules! span { + ($logger:expr, $span:expr, $func:expr) => {{ + use opentelemetry::trace::TraceContextExt; + + let span = $span.start($logger.tracer()); + let cx = opentelemetry::Context::current_with_span(span); + let guard = cx.clone().attach(); + let t = $func; + + if let Err(e) = &t { + cx.span().record_error(e); + } + + std::mem::drop(guard); + + t + }}; +} + +#[macro_export] +macro_rules! spanf { + ($logger:expr, $span:expr, $func:expr) => {{ + use opentelemetry::trace::{FutureExt, TraceContextExt}; + + let span = $span.start($logger.tracer()); + let cx = opentelemetry::Context::current_with_span(span); + let t = $func.with_context(cx.clone()).await; + + if let Err(e) = &t { + cx.span().record_error(e); + } + + cx.span().end(); + + t + }}; +} diff --git a/cli/src/options.rs b/cli/src/options.rs new file mode 100644 index 00000000000..4493c244e8d --- /dev/null +++ b/cli/src/options.rs @@ -0,0 +1,112 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::fmt; + +use serde::{Deserialize, Serialize}; + +#[derive(clap::ArgEnum, Copy, Clone, Debug, Hash, PartialEq, Eq, Serialize, Deserialize)] +pub enum Quality { + #[serde(rename = "stable")] + Stable, + #[serde(rename = "exploration")] + Exploration, + #[serde(other)] + Insiders, +} + +impl Quality { + /// Lowercased name in paths and protocol + pub fn get_machine_name(&self) -> &'static str { + match self { + Quality::Insiders => "insiders", + Quality::Exploration => "exploration", + Quality::Stable => "stable", + } + } + + /// Uppercased display name for humans + pub fn get_capitalized_name(&self) -> &'static str { + match self { + Quality::Insiders => "Insiders", + Quality::Exploration => "Exploration", + Quality::Stable => "Stable", + } + } + + pub fn get_macos_app_name(&self) -> &'static str { + match self { + Quality::Insiders => "Visual Studio Code - Insiders", + Quality::Exploration => "Visual Studio Code - Exploration", + Quality::Stable => "Visual Studio Code", + } + } + + pub fn get_commandline_name(&self) -> &'static str { + match self { + Quality::Insiders => "code-insiders", + Quality::Exploration => "code-exploration", + Quality::Stable => "code", + } + } + + #[cfg(target_os = "windows")] + pub fn server_entrypoint(&self) -> &'static str { + match self { + Quality::Insiders => "code-server-insiders.cmd", + Quality::Exploration => "code-server-exploration.cmd", + Quality::Stable => "code-server.cmd", + } + } + #[cfg(not(target_os = "windows"))] + pub fn server_entrypoint(&self) -> &'static str { + match self { + Quality::Insiders => "code-server-insiders", + Quality::Exploration => "code-server-exploration", + Quality::Stable => "code-server", + } + } +} + +impl fmt::Display for Quality { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + write!(f, "{}", self.get_capitalized_name()) + } +} + +impl TryFrom<&str> for Quality { + type Error = String; + + fn try_from(s: &str) -> Result { + match s { + "stable" => Ok(Quality::Stable), + "insiders" | "insider" => Ok(Quality::Insiders), + "exploration" => Ok(Quality::Exploration), + _ => Err(format!( + "Unknown quality: {}. Must be one of stable, insiders, or exploration.", + s + )), + } + } +} + +#[derive(clap::ArgEnum, Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub enum TelemetryLevel { + Off, + Crash, + Error, + All, +} + +impl fmt::Display for TelemetryLevel { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match self { + TelemetryLevel::Off => write!(f, "off"), + TelemetryLevel::Crash => write!(f, "crash"), + TelemetryLevel::Error => write!(f, "error"), + TelemetryLevel::All => write!(f, "all"), + } + } +} diff --git a/cli/src/self_update.rs b/cli/src/self_update.rs new file mode 100644 index 00000000000..3ea8274b338 --- /dev/null +++ b/cli/src/self_update.rs @@ -0,0 +1,163 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::{fs, path::Path, process::Command}; +use tempfile::tempdir; + +use crate::{ + constants::{VSCODE_CLI_COMMIT, VSCODE_CLI_QUALITY}, + options::Quality, + update_service::{unzip_downloaded_release, Platform, Release, TargetKind, UpdateService}, + util::{ + errors::{wrap, AnyError, CorruptDownload, UpdatesNotConfigured}, + http, + io::{ReportCopyProgress, SilentCopyProgress}, + }, +}; + +pub struct SelfUpdate<'a> { + commit: &'static str, + quality: Quality, + platform: Platform, + update_service: &'a UpdateService, +} + +impl<'a> SelfUpdate<'a> { + pub fn new(update_service: &'a UpdateService) -> Result { + let commit = VSCODE_CLI_COMMIT + .ok_or_else(|| UpdatesNotConfigured("unknown build commit".to_string()))?; + + let quality = VSCODE_CLI_QUALITY + .ok_or_else(|| UpdatesNotConfigured("no configured quality".to_string())) + .and_then(|q| Quality::try_from(q).map_err(UpdatesNotConfigured))?; + + let platform = Platform::env_default().ok_or_else(|| { + UpdatesNotConfigured("Unknown platform, please report this error".to_string()) + })?; + + Ok(Self { + commit, + quality, + platform, + update_service, + }) + } + + /// Gets the current release + pub async fn get_current_release(&self) -> Result { + self.update_service + .get_latest_commit(self.platform, TargetKind::Cli, self.quality) + .await + } + + /// Gets whether the given release is what this CLI is built against + pub fn is_up_to_date_with(&self, release: &Release) -> bool { + release.commit == self.commit + } + + /// Updates the CLI to the given release. + pub async fn do_update( + &self, + release: &Release, + progress: impl ReportCopyProgress, + ) -> Result<(), AnyError> { + // 1. Download the archive into a temporary directory + let tempdir = tempdir().map_err(|e| wrap(e, "Failed to create temp dir"))?; + let archive_path = tempdir.path().join("archive"); + let stream = self.update_service.get_download_stream(release).await?; + http::download_into_file(&archive_path, progress, stream).await?; + + // 2. Unzip the archive and get the binary + let target_path = + std::env::current_exe().map_err(|e| wrap(e, "could not get current exe"))?; + let staging_path = target_path.with_extension(".update"); + let archive_contents_path = tempdir.path().join("content"); + // unzipping the single binary is pretty small and fast--don't bother with passing progress + unzip_downloaded_release(&archive_path, &archive_contents_path, SilentCopyProgress())?; + copy_updated_cli_to_path(&archive_contents_path, &staging_path)?; + + // 3. Copy file metadata, make sure the new binary is executable\ + copy_file_metadata(&target_path, &staging_path) + .map_err(|e| wrap(e, "failed to set file permissions"))?; + validate_cli_is_good(&staging_path)?; + + // Try to rename the old CLI to the tempdir, where it can get cleaned up by the + // OS later. However, this can fail if the tempdir is on a different drive + // than the installation dir. In this case just rename it to ".old". + if fs::rename(&target_path, &tempdir.path().join("old-code-cli")).is_err() { + fs::rename(&target_path, &target_path.with_extension(".old")) + .map_err(|e| wrap(e, "failed to rename old CLI"))?; + } + + fs::rename(&staging_path, &target_path) + .map_err(|e| wrap(e, "failed to rename newly installed CLI"))?; + + Ok(()) + } +} + +fn validate_cli_is_good(exe_path: &Path) -> Result<(), AnyError> { + let o = Command::new(exe_path) + .args(["--version"]) + .output() + .map_err(|e| CorruptDownload(format!("could not execute new binary, aborting: {}", e)))?; + + if !o.status.success() { + let msg = format!( + "could not execute new binary, aborting. Stdout:\r\n\r\n{}\r\n\r\nStderr:\r\n\r\n{}", + String::from_utf8_lossy(&o.stdout), + String::from_utf8_lossy(&o.stderr), + ); + + return Err(CorruptDownload(msg).into()); + } + + Ok(()) +} + +fn copy_updated_cli_to_path(unzipped_content: &Path, staging_path: &Path) -> Result<(), AnyError> { + let unzipped_files = fs::read_dir(unzipped_content) + .map_err(|e| wrap(e, "could not read update contents"))? + .collect::>(); + if unzipped_files.len() != 1 { + let msg = format!( + "expected exactly one file in update, got {}", + unzipped_files.len() + ); + return Err(CorruptDownload(msg).into()); + } + + let archive_file = unzipped_files[0] + .as_ref() + .map_err(|e| wrap(e, "error listing update files"))?; + fs::copy(&archive_file.path(), staging_path) + .map_err(|e| wrap(e, "error copying to staging file"))?; + Ok(()) +} + +#[cfg(target_os = "windows")] +fn copy_file_metadata(from: &Path, to: &Path) -> Result<(), std::io::Error> { + let permissions = from.metadata()?.permissions(); + fs::set_permissions(&to, permissions)?; + Ok(()) +} + +#[cfg(not(target_os = "windows"))] +fn copy_file_metadata(from: &Path, to: &Path) -> Result<(), std::io::Error> { + use std::os::unix::ffi::OsStrExt; + use std::os::unix::fs::MetadataExt; + + let metadata = from.metadata()?; + fs::set_permissions(&to, metadata.permissions())?; + + // based on coreutils' chown https://github.com/uutils/coreutils/blob/72b4629916abe0852ad27286f4e307fbca546b6e/src/chown/chown.rs#L266-L281 + let s = std::ffi::CString::new(to.as_os_str().as_bytes()).unwrap(); + let ret = unsafe { libc::chown(s.as_ptr(), metadata.uid(), metadata.gid()) }; + if ret != 0 { + return Err(std::io::Error::last_os_error()); + } + + Ok(()) +} diff --git a/cli/src/state.rs b/cli/src/state.rs new file mode 100644 index 00000000000..1a33ea755f8 --- /dev/null +++ b/cli/src/state.rs @@ -0,0 +1,152 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +extern crate dirs; + +use std::{ + fs::{create_dir, read_to_string, remove_dir_all, write}, + path::{Path, PathBuf}, + sync::{Arc, Mutex}, +}; + +use serde::{de::DeserializeOwned, Serialize}; + +use crate::util::errors::{wrap, AnyError, NoHomeForLauncherError, WrappedError}; + +const HOME_DIR_ALTS: [&str; 2] = ["$HOME", "~"]; + +#[derive(Clone)] +pub struct LauncherPaths { + root: PathBuf, +} + +struct PersistedStateContainer +where + T: Clone + Serialize + DeserializeOwned + Default, +{ + path: PathBuf, + state: Option, +} + +impl PersistedStateContainer +where + T: Clone + Serialize + DeserializeOwned + Default, +{ + fn load_or_get(&mut self) -> T { + if let Some(state) = &self.state { + return state.clone(); + } + + let state = if let Ok(s) = read_to_string(&self.path) { + serde_json::from_str::(&s).unwrap_or_default() + } else { + T::default() + }; + + self.state = Some(state.clone()); + state + } + + fn save(&mut self, state: T) -> Result<(), WrappedError> { + let s = serde_json::to_string(&state).unwrap(); + self.state = Some(state); + write(&self.path, s).map_err(|e| { + wrap( + e, + format!("error saving launcher state into {}", self.path.display()), + ) + }) + } +} + +/// Container that holds some state value that is persisted to disk. +#[derive(Clone)] +pub struct PersistedState +where + T: Clone + Serialize + DeserializeOwned + Default, +{ + container: Arc>>, +} + +impl PersistedState +where + T: Clone + Serialize + DeserializeOwned + Default, +{ + /// Creates a new state container that persists to the given path. + pub fn new(path: PathBuf) -> PersistedState { + PersistedState { + container: Arc::new(Mutex::new(PersistedStateContainer { path, state: None })), + } + } + + /// Loads persisted state. + pub fn load(&self) -> T { + self.container.lock().unwrap().load_or_get() + } + + /// Saves persisted state. + pub fn save(&self, state: T) -> Result<(), WrappedError> { + self.container.lock().unwrap().save(state) + } + + /// Mutates persisted state. + pub fn update_with( + &self, + v: V, + mutator: fn(v: V, state: &mut T) -> R, + ) -> Result { + let mut container = self.container.lock().unwrap(); + let mut state = container.load_or_get(); + let r = mutator(v, &mut state); + container.save(state).map(|_| r) + } +} + +impl LauncherPaths { + pub fn new(root: &Option) -> Result { + let root = root.as_deref().unwrap_or("~/.vscode-cli"); + let mut replaced = root.to_owned(); + for token in HOME_DIR_ALTS { + if root.contains(token) { + if let Some(home) = dirs::home_dir() { + replaced = root.replace(token, &home.to_string_lossy()) + } else { + return Err(AnyError::from(NoHomeForLauncherError())); + } + } + } + + if !Path::new(&replaced).exists() { + create_dir(&replaced) + .map_err(|e| wrap(e, format!("error creating directory {}", &replaced)))?; + } + + Ok(LauncherPaths::new_without_replacements(PathBuf::from( + replaced, + ))) + } + + pub fn new_without_replacements(root: PathBuf) -> LauncherPaths { + LauncherPaths { root } + } + + /// Root directory for the server launcher + pub fn root(&self) -> &Path { + &self.root + } + + /// Removes the launcher data directory. + pub fn remove(&self) -> Result<(), WrappedError> { + remove_dir_all(&self.root).map_err(|e| { + wrap( + e, + format!( + "error removing launcher data directory {}", + self.root.display() + ), + ) + }) + } +} diff --git a/cli/src/tunnels.rs b/cli/src/tunnels.rs new file mode 100644 index 00000000000..d94e47addf3 --- /dev/null +++ b/cli/src/tunnels.rs @@ -0,0 +1,25 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +pub mod code_server; +pub mod dev_tunnels; +pub mod legal; +pub mod paths; + +mod control_server; +mod name_generator; +mod port_forwarder; +mod protocol; +#[cfg_attr(unix, path = "tunnels/server_bridge_unix.rs")] +#[cfg_attr(windows, path = "tunnels/server_bridge_windows.rs")] +mod server_bridge; +mod service; +#[cfg(target_os = "windows")] +mod service_windows; + +pub use control_server::serve; +pub use service::{ + create_service_manager, ServiceContainer, ServiceManager, SERVICE_LOG_FILE_NAME, +}; diff --git a/cli/src/tunnels/code_server.rs b/cli/src/tunnels/code_server.rs new file mode 100644 index 00000000000..559f5e075f6 --- /dev/null +++ b/cli/src/tunnels/code_server.rs @@ -0,0 +1,757 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use super::paths::{InstalledServer, LastUsedServers, ServerPaths}; +use crate::options::{Quality, TelemetryLevel}; +use crate::state::LauncherPaths; +use crate::update_service::{ + unzip_downloaded_release, Platform, Release, TargetKind, UpdateService, +}; +use crate::util::command::{capture_command, kill_tree}; +use crate::util::errors::{ + wrap, AnyError, ExtensionInstallFailed, MissingEntrypointError, WrappedError, +}; +use crate::util::http; +use crate::util::io::SilentCopyProgress; +use crate::util::machine::process_exists; +use crate::{debug, info, log, span, spanf, trace, warning}; +use lazy_static::lazy_static; +use opentelemetry::KeyValue; +use regex::Regex; +use serde::Deserialize; +use std::fs; +use std::fs::File; +use std::io::{ErrorKind, Write}; +use std::path::{Path, PathBuf}; +use std::time::Duration; +use tokio::fs::remove_file; +use tokio::io::{AsyncBufReadExt, BufReader}; +use tokio::process::{Child, Command}; +use tokio::sync::oneshot::Receiver; +use tokio::time::{interval, timeout}; +use uuid::Uuid; + +lazy_static! { + static ref LISTENING_PORT_RE: Regex = + Regex::new(r"Extension host agent listening on (.+)").unwrap(); + static ref WEB_UI_RE: Regex = Regex::new(r"Web UI available at (.+)").unwrap(); +} + +const MAX_RETAINED_SERVERS: usize = 5; + +#[derive(Clone, Debug, Default)] +pub struct CodeServerArgs { + pub host: Option, + pub port: Option, + pub socket_path: Option, + + // common argument + pub telemetry_level: Option, + pub log: Option, + pub accept_server_license_terms: bool, + pub verbose: bool, + // extension management + pub install_extensions: Vec, + pub uninstall_extensions: Vec, + pub list_extensions: bool, + pub show_versions: bool, + pub category: Option, + pub pre_release: bool, + pub force: bool, + pub start_server: bool, + // connection tokens + pub connection_token: Option, + pub connection_token_file: Option, + pub without_connection_token: bool, +} + +impl CodeServerArgs { + pub fn log_level(&self) -> log::Level { + if self.verbose { + log::Level::Trace + } else { + self.log.unwrap_or(log::Level::Info) + } + } + + pub fn telemetry_disabled(&self) -> bool { + self.telemetry_level == Some(TelemetryLevel::Off) + } + + pub fn command_arguments(&self) -> Vec { + let mut args = Vec::new(); + if let Some(i) = &self.socket_path { + args.push(format!("--socket-path={}", i)); + } else { + if let Some(i) = &self.host { + args.push(format!("--host={}", i)); + } + if let Some(i) = &self.port { + args.push(format!("--port={}", i)); + } + } + + if let Some(i) = &self.connection_token { + args.push(format!("--connection-token={}", i)); + } + if let Some(i) = &self.connection_token_file { + args.push(format!("--connection-token-file={}", i)); + } + if self.without_connection_token { + args.push(String::from("--without-connection-token")); + } + if self.accept_server_license_terms { + args.push(String::from("--accept-server-license-terms")); + } + if let Some(i) = self.telemetry_level { + args.push(format!("--telemetry-level={}", i)); + } + if let Some(i) = self.log { + args.push(format!("--log={}", i)); + } + + for extension in &self.install_extensions { + args.push(format!("--install-extension={}", extension)); + } + if !&self.install_extensions.is_empty() { + if self.pre_release { + args.push(String::from("--pre-release")); + } + if self.force { + args.push(String::from("--force")); + } + } + for extension in &self.uninstall_extensions { + args.push(format!("--uninstall-extension={}", extension)); + } + if self.list_extensions { + args.push(String::from("--list-extensions")); + if self.show_versions { + args.push(String::from("--show-versions")); + } + if let Some(i) = &self.category { + args.push(format!("--category={}", i)); + } + } + if self.start_server { + args.push(String::from("--start-server")); + } + args + } +} + +/// Base server params that can be `resolve()`d to a `ResolvedServerParams`. +/// Doing so fetches additional information like a commit ID if previously +/// unspecified. +pub struct ServerParamsRaw { + pub commit_id: Option, + pub quality: Quality, + pub code_server_args: CodeServerArgs, + pub headless: bool, + pub platform: Platform, +} + +/// Server params that can be used to start a VS Code server. +pub struct ResolvedServerParams { + pub release: Release, + pub code_server_args: CodeServerArgs, +} + +impl ResolvedServerParams { + fn as_installed_server(&self) -> InstalledServer { + InstalledServer { + commit: self.release.commit.clone(), + quality: self.release.quality, + headless: self.release.target == TargetKind::Server, + } + } +} + +impl ServerParamsRaw { + pub async fn resolve(self, log: &log::Logger) -> Result { + Ok(ResolvedServerParams { + release: self.get_or_fetch_commit_id(log).await?, + code_server_args: self.code_server_args, + }) + } + + async fn get_or_fetch_commit_id(&self, log: &log::Logger) -> Result { + let target = match self.headless { + true => TargetKind::Server, + false => TargetKind::Web, + }; + + if let Some(c) = &self.commit_id { + return Ok(Release { + commit: c.clone(), + quality: self.quality, + target, + name: String::new(), + platform: self.platform, + }); + } + + UpdateService::new(log.clone(), reqwest::Client::new()) + .get_latest_commit(self.platform, target, self.quality) + .await + } +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +#[allow(dead_code)] +struct UpdateServerVersion { + pub name: String, + pub version: String, + pub product_version: String, + pub timestamp: i64, +} + +/// Code server listening on a port address. +pub struct SocketCodeServer { + pub commit_id: String, + pub socket: PathBuf, + pub origin: CodeServerOrigin, +} + +/// Code server listening on a socket address. +pub struct PortCodeServer { + pub commit_id: String, + pub port: u16, + pub origin: CodeServerOrigin, +} + +/// A server listening on any address/location. +pub enum AnyCodeServer { + Socket(SocketCodeServer), + Port(PortCodeServer), +} + +// impl AnyCodeServer { +// pub fn origin(&mut self) -> &mut CodeServerOrigin { +// match self { +// AnyCodeServer::Socket(p) => &mut p.origin, +// AnyCodeServer::Port(p) => &mut p.origin, +// } +// } +// } + +pub enum CodeServerOrigin { + /// A new code server, that opens the barrier when it exits. + New(Box), + /// An existing code server with a PID. + Existing(u32), +} + +impl CodeServerOrigin { + pub async fn wait_for_exit(&mut self) { + match self { + CodeServerOrigin::New(child) => { + child.wait().await.ok(); + } + CodeServerOrigin::Existing(pid) => { + let mut interval = interval(Duration::from_secs(30)); + while process_exists(*pid) { + interval.tick().await; + } + } + } + } + + pub async fn kill(&mut self) { + match self { + CodeServerOrigin::New(child) => { + child.kill().await.ok(); + } + CodeServerOrigin::Existing(pid) => { + kill_tree(*pid).await.ok(); + } + } + } +} + +async fn check_and_create_dir(path: &Path) -> Result<(), WrappedError> { + tokio::fs::create_dir_all(path) + .await + .map_err(|e| wrap(e, "error creating server directory"))?; + Ok(()) +} + +async fn install_server_if_needed( + log: &log::Logger, + paths: &ServerPaths, + release: &Release, +) -> Result<(), AnyError> { + if paths.executable.exists() { + info!( + log, + "Found existing installation at {}", + paths.server_dir.display() + ); + return Ok(()); + } + + let tar_file_path = spanf!( + log, + log.span("server.download"), + download_server(&paths.server_dir, release, log) + )?; + + span!( + log, + log.span("server.extract"), + install_server(&tar_file_path, paths, log) + )?; + + Ok(()) +} + +async fn download_server( + path: &Path, + release: &Release, + log: &log::Logger, +) -> Result { + let response = UpdateService::new(log.clone(), reqwest::Client::new()) + .get_download_stream(release) + .await?; + + let mut save_path = path.to_owned(); + + let fname = response + .url() + .path_segments() + .and_then(|segments| segments.last()) + .and_then(|name| if name.is_empty() { None } else { Some(name) }) + .unwrap_or("tmp.zip"); + + info!( + log, + "Downloading VS Code server {} -> {}", + response.url(), + save_path.display() + ); + + save_path.push(fname); + http::download_into_file( + &save_path, + log.get_download_logger("server download progress:"), + response, + ) + .await?; + + Ok(save_path) +} + +fn install_server( + compressed_file: &Path, + paths: &ServerPaths, + log: &log::Logger, +) -> Result<(), AnyError> { + info!(log, "Setting up server..."); + + unzip_downloaded_release(compressed_file, &paths.server_dir, SilentCopyProgress())?; + + match fs::remove_file(&compressed_file) { + Ok(()) => {} + Err(e) => { + if e.kind() != ErrorKind::NotFound { + return Err(AnyError::from(wrap(e, "error removing downloaded file"))); + } + } + } + + if !paths.executable.exists() { + return Err(AnyError::from(MissingEntrypointError())); + } + + Ok(()) +} + +/// Ensures the given list of extensions are installed on the running server. +async fn do_extension_install_on_running_server( + start_script_path: &Path, + extensions: &[String], + log: &log::Logger, +) -> Result<(), AnyError> { + if extensions.is_empty() { + return Ok(()); + } + + debug!(log, "Installing extensions..."); + let command = format!( + "{} {}", + start_script_path.display(), + extensions + .iter() + .map(|s| get_extensions_flag(s)) + .collect::>() + .join(" ") + ); + + let result = capture_command("bash", &["-c", &command]).await?; + if !result.status.success() { + Err(AnyError::from(ExtensionInstallFailed( + String::from_utf8_lossy(&result.stderr).to_string(), + ))) + } else { + Ok(()) + } +} + +pub struct ServerBuilder<'a> { + logger: &'a log::Logger, + server_params: &'a ResolvedServerParams, + last_used: LastUsedServers<'a>, + server_paths: ServerPaths, +} + +impl<'a> ServerBuilder<'a> { + pub fn new( + logger: &'a log::Logger, + server_params: &'a ResolvedServerParams, + launcher_paths: &'a LauncherPaths, + ) -> Self { + Self { + logger, + server_params, + last_used: LastUsedServers::new(launcher_paths), + server_paths: server_params + .as_installed_server() + .server_paths(launcher_paths), + } + } + + /// Gets any already-running server from this directory. + pub async fn get_running(&self) -> Result, AnyError> { + info!( + self.logger, + "Checking {} and {} for a running server...", + self.server_paths.logfile.display(), + self.server_paths.pidfile.display() + ); + + let pid = match self.server_paths.get_running_pid() { + Some(pid) => pid, + None => return Ok(None), + }; + info!(self.logger, "Found running server (pid={})", pid); + if !Path::new(&self.server_paths.logfile).exists() { + warning!(self.logger, "VS Code Server is running but its logfile is missing. Don't delete the VS Code Server manually, run the command 'code-server prune'."); + return Ok(None); + } + + do_extension_install_on_running_server( + &self.server_paths.executable, + &self.server_params.code_server_args.install_extensions, + self.logger, + ) + .await?; + + let origin = CodeServerOrigin::Existing(pid); + let contents = fs::read_to_string(&self.server_paths.logfile) + .expect("Something went wrong reading log file"); + + if let Some(port) = parse_port_from(&contents) { + Ok(Some(AnyCodeServer::Port(PortCodeServer { + commit_id: self.server_params.release.commit.to_owned(), + port, + origin, + }))) + } else if let Some(socket) = parse_socket_from(&contents) { + Ok(Some(AnyCodeServer::Socket(SocketCodeServer { + commit_id: self.server_params.release.commit.to_owned(), + socket, + origin, + }))) + } else { + Ok(None) + } + } + + /// Ensures the server is set up in the configured directory. + pub async fn setup(&self) -> Result<(), AnyError> { + debug!(self.logger, "Installing and setting up VS Code Server..."); + check_and_create_dir(&self.server_paths.server_dir).await?; + install_server_if_needed(self.logger, &self.server_paths, &self.server_params.release) + .await?; + debug!(self.logger, "Server setup complete"); + + match self.last_used.add(self.server_params.as_installed_server()) { + Err(e) => warning!(self.logger, "Error adding server to last used: {}", e), + Ok(count) if count > MAX_RETAINED_SERVERS => { + if let Err(e) = self.last_used.trim(self.logger, MAX_RETAINED_SERVERS) { + warning!(self.logger, "Error trimming old servers: {}", e); + } + } + Ok(_) => {} + } + + Ok(()) + } + + pub async fn listen_on_default_socket(&self) -> Result { + let requested_file = if cfg!(target_os = "windows") { + PathBuf::from(format!(r"\\.\pipe\vscode-server-{}", Uuid::new_v4())) + } else { + std::env::temp_dir().join(format!("vscode-server-{}", Uuid::new_v4())) + }; + + self.listen_on_socket(&requested_file).await + } + + pub async fn listen_on_socket(&self, socket: &Path) -> Result { + Ok(spanf!( + self.logger, + self.logger.span("server.start").with_attributes(vec! { + KeyValue::new("commit_id", self.server_params.release.commit.to_string()), + KeyValue::new("quality", format!("{}", self.server_params.release.quality)), + }), + self._listen_on_socket(socket) + )?) + } + + async fn _listen_on_socket(&self, socket: &Path) -> Result { + remove_file(&socket).await.ok(); // ignore any error if it doesn't exist + + let mut cmd = self.get_base_command(); + cmd.arg("--start-server") + .arg("--without-connection-token") + .arg("--enable-remote-auto-shutdown") + .arg(format!("--socket-path={}", socket.display())); + + let child = self.spawn_server_process(cmd)?; + let log_file = self.get_logfile()?; + let plog = self.logger.prefixed(&log::new_code_server_prefix()); + + let (mut origin, listen_rx) = + monitor_server::(child, Some(log_file), plog, false); + + let socket = match timeout(Duration::from_secs(8), listen_rx).await { + Err(e) => { + origin.kill().await; + Err(wrap(e, "timed out looking for socket")) + } + Ok(Err(e)) => { + origin.kill().await; + Err(wrap(e, "server exited without writing socket")) + } + Ok(Ok(socket)) => Ok(socket), + }?; + + info!(self.logger, "Server started"); + + Ok(SocketCodeServer { + commit_id: self.server_params.release.commit.to_owned(), + socket, + origin, + }) + } + + /// Starts with a given opaque set of args. Does not set up any port or + /// socket, but does return one if present, in the form of a channel. + pub async fn start_opaque_with_args( + &self, + args: &[String], + ) -> Result<(CodeServerOrigin, Receiver), AnyError> + where + M: ServerOutputMatcher, + R: 'static + Send + std::fmt::Debug, + { + let mut cmd = self.get_base_command(); + cmd.args(args); + + let child = self.spawn_server_process(cmd)?; + let plog = self.logger.prefixed(&log::new_code_server_prefix()); + + Ok(monitor_server::(child, None, plog, true)) + } + + fn spawn_server_process(&self, mut cmd: Command) -> Result { + info!(self.logger, "Starting server..."); + + debug!(self.logger, "Starting server with command... {:?}", cmd); + + let child = cmd + .stderr(std::process::Stdio::piped()) + .stdout(std::process::Stdio::piped()) + .spawn() + .map_err(|e| wrap(e, "error spawning server"))?; + + self.server_paths + .write_pid(child.id().expect("expected server to have pid"))?; + + Ok(child) + } + + fn get_logfile(&self) -> Result { + File::create(&self.server_paths.logfile).map_err(|e| { + wrap( + e, + format!( + "error creating log file {}", + self.server_paths.logfile.display() + ), + ) + }) + } + + fn get_base_command(&self) -> Command { + let mut cmd = Command::new(&self.server_paths.executable); + cmd.stdin(std::process::Stdio::null()) + .args(self.server_params.code_server_args.command_arguments()); + cmd + } +} + +fn monitor_server( + mut child: Child, + log_file: Option, + plog: log::Logger, + write_directly: bool, +) -> (CodeServerOrigin, Receiver) +where + M: ServerOutputMatcher, + R: 'static + Send + std::fmt::Debug, +{ + let stdout = child + .stdout + .take() + .expect("child did not have a handle to stdout"); + + let stderr = child + .stderr + .take() + .expect("child did not have a handle to stdout"); + + let (listen_tx, listen_rx) = tokio::sync::oneshot::channel(); + + // Handle stderr and stdout in a separate task. Initially scan lines looking + // for the listening port. Afterwards, just scan and write out to the file. + tokio::spawn(async move { + let mut stdout_reader = BufReader::new(stdout).lines(); + let mut stderr_reader = BufReader::new(stderr).lines(); + let write_line = |line: &str| -> std::io::Result<()> { + if let Some(mut f) = log_file.as_ref() { + f.write_all(line.as_bytes())?; + f.write_all(&[b'\n'])?; + } + if write_directly { + println!("{}", line); + } else { + trace!(plog, line); + } + Ok(()) + }; + + loop { + let line = tokio::select! { + l = stderr_reader.next_line() => l, + l = stdout_reader.next_line() => l, + }; + + match line { + Err(e) => { + trace!(plog, "error reading from stdout/stderr: {}", e); + return; + } + Ok(None) => break, + Ok(Some(l)) => { + write_line(&l).ok(); + + if let Some(listen_on) = M::match_line(&l) { + trace!(plog, "parsed location: {:?}", listen_on); + listen_tx.send(listen_on).ok(); + break; + } + } + } + } + + loop { + let line = tokio::select! { + l = stderr_reader.next_line() => l, + l = stdout_reader.next_line() => l, + }; + + match line { + Err(e) => { + trace!(plog, "error reading from stdout/stderr: {}", e); + break; + } + Ok(None) => break, + Ok(Some(l)) => { + write_line(&l).ok(); + } + } + } + }); + + let origin = CodeServerOrigin::New(Box::new(child)); + (origin, listen_rx) +} + +fn get_extensions_flag(extension_id: &str) -> String { + format!("--install-extension={}", extension_id) +} + +/// A type that can be used to scan stdout from the VS Code server. Returns +/// some other type that, in turn, is returned from starting the server. +pub trait ServerOutputMatcher +where + R: Send, +{ + fn match_line(line: &str) -> Option; +} + +/// Parses a line like "Extension host agent listening on /tmp/foo.sock" +struct SocketMatcher(); + +impl ServerOutputMatcher for SocketMatcher { + fn match_line(line: &str) -> Option { + parse_socket_from(line) + } +} + +/// Parses a line like "Extension host agent listening on 9000" +pub struct PortMatcher(); + +impl ServerOutputMatcher for PortMatcher { + fn match_line(line: &str) -> Option { + parse_port_from(line) + } +} + +/// Parses a line like "Web UI available at http://localhost:9000/?tkn=..." +pub struct WebUiMatcher(); + +impl ServerOutputMatcher for WebUiMatcher { + fn match_line(line: &str) -> Option { + WEB_UI_RE.captures(line).and_then(|cap| { + cap.get(1) + .and_then(|uri| reqwest::Url::parse(uri.as_str()).ok()) + }) + } +} + +/// Does not do any parsing and just immediately returns an empty result. +pub struct NoOpMatcher(); + +impl ServerOutputMatcher<()> for NoOpMatcher { + fn match_line(_: &str) -> Option<()> { + Some(()) + } +} + +fn parse_socket_from(text: &str) -> Option { + LISTENING_PORT_RE + .captures(text) + .and_then(|cap| cap.get(1).map(|path| PathBuf::from(path.as_str()))) +} + +fn parse_port_from(text: &str) -> Option { + LISTENING_PORT_RE.captures(text).and_then(|cap| { + cap.get(1) + .and_then(|path| path.as_str().parse::().ok()) + }) +} diff --git a/cli/src/tunnels/control_server.rs b/cli/src/tunnels/control_server.rs new file mode 100644 index 00000000000..e106510ae66 --- /dev/null +++ b/cli/src/tunnels/control_server.rs @@ -0,0 +1,722 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use crate::commands::tunnels::ShutdownSignal; +use crate::constants::{CONTROL_PORT, PROTOCOL_VERSION, VSCODE_CLI_VERSION}; +use crate::log; +use crate::self_update::SelfUpdate; +use crate::state::LauncherPaths; +use crate::update_service::{Platform, UpdateService}; +use crate::util::errors::{ + wrap, AnyError, MismatchedLaunchModeError, NoAttachedServerError, ServerWriteError, +}; +use crate::util::io::SilentCopyProgress; +use crate::util::sync::{new_barrier, Barrier}; +use opentelemetry::trace::SpanKind; +use opentelemetry::KeyValue; +use serde::Serialize; +use std::convert::Infallible; +use std::env; +use std::path::PathBuf; +use std::sync::atomic::{AtomicUsize, Ordering}; +use std::sync::Arc; +use std::time::Instant; +use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, BufReader}; +use tokio::pin; +use tokio::sync::{mpsc, Mutex}; + +use super::code_server::{ + AnyCodeServer, CodeServerArgs, ServerBuilder, ServerParamsRaw, SocketCodeServer, +}; +use super::dev_tunnels::ActiveTunnel; +use super::paths::prune_stopped_servers; +use super::port_forwarder::{PortForwarding, PortForwardingProcessor}; +use super::protocol::{ + CallServerHttpParams, CallServerHttpResult, ClientRequestMethod, EmptyResult, ErrorResponse, + ForwardParams, ForwardResult, GetHostnameResponse, RefServerMessageParams, ResponseError, + ServeParams, ServerLog, ServerMessageParams, ServerRequestMethod, SuccessResponse, + ToClientRequest, ToServerRequest, UnforwardParams, UpdateParams, UpdateResult, VersionParams, +}; +use super::server_bridge::{get_socket_rw_stream, FromServerMessage, ServerBridge}; + +type ServerBridgeList = Option>; +type ServerBridgeListLock = Arc>; + +struct HandlerContext { + /// Exit barrier for the socket. + closer: Barrier<()>, + /// Log handle for the server + log: log::Logger, + /// A loopback channel to talk to the TCP server task. + server_tx: mpsc::Sender, + /// A loopback channel to talk to the socket server task. + socket_tx: mpsc::Sender, + /// Configured launcher paths. + launcher_paths: LauncherPaths, + /// Connected VS Code Server + code_server: Option, + /// Potentially many "websocket" connections to client + server_bridges: ServerBridgeListLock, + // the cli arguments used to start the code server + code_server_args: CodeServerArgs, + /// counter for the number of bytes received from the socket + rx_counter: Arc, + /// port forwarding functionality + port_forwarding: PortForwarding, + /// install platform for the VS Code server + platform: Platform, +} + +impl HandlerContext { + async fn dispose(self) { + let bridges: ServerBridgeList = { + let mut lock = self.server_bridges.lock().await; + let bridges = lock.take(); + *lock = None; + bridges + }; + + if let Some(b) = bridges { + for (_, bridge) in b { + if let Err(e) = bridge.close().await { + warning!( + self.log, + "Could not properly dispose of connection context: {}", + e + ) + } else { + debug!(self.log, "Closed server bridge."); + } + } + } + + info!(self.log, "Disposed of connection to running server."); + } +} + +enum ServerSignal { + /// Signalled when the server has been updated and we want to respawn. + /// We'd generally need to stop and then restart the launcher, but the + /// program might be managed by a supervisor like systemd. Instead, we + /// will stop the TCP listener and spawn the launcher again as a subprocess + /// with the same arguments we used. + Respawn, +} + +struct CloseReason(String); + +enum SocketSignal { + /// Signals bytes to send to the socket. + Send(Vec), + /// Closes the socket (e.g. as a result of an error) + CloseWith(CloseReason), + /// Disposes ServerBridge corresponding to an ID + CloseServerBridge(u16), +} + +impl SocketSignal { + fn from_message(msg: &T) -> Self + where + T: Serialize + ?Sized, + { + SocketSignal::Send(rmp_serde::to_vec_named(msg).unwrap()) + } +} + +impl FromServerMessage for SocketSignal { + fn from_server_message(i: u16, body: &[u8]) -> Self { + SocketSignal::from_message(&ToClientRequest { + id: None, + params: ClientRequestMethod::servermsg(RefServerMessageParams { i, body }), + }) + } + + fn from_closed_server_bridge(i: u16) -> Self { + SocketSignal::CloseServerBridge(i) + } +} + +pub struct ServerTermination { + /// Whether the server should be respawned in a new binary (see ServerSignal.Respawn). + pub respawn: bool, + pub tunnel: ActiveTunnel, +} + +fn print_listening(log: &log::Logger, tunnel_name: &str) { + debug!(log, "VS Code Server is listening for incoming connections"); + + let home_dir = dirs::home_dir().unwrap_or_else(|| PathBuf::from("")); + let current_dir = env::current_dir().unwrap_or_else(|_| PathBuf::from("")); + + let dir = if home_dir == current_dir { + PathBuf::from("") + } else { + current_dir + }; + + let mut addr = url::Url::parse("https://insiders.vscode.dev").unwrap(); + { + let mut ps = addr.path_segments_mut().unwrap(); + ps.push("tunnel"); + ps.push(tunnel_name); + for segment in &dir { + let as_str = segment.to_string_lossy(); + if !(as_str.len() == 1 && as_str.starts_with(std::path::MAIN_SEPARATOR)) { + ps.push(as_str.as_ref()); + } + } + } + + let message = &format!("\nOpen this link in your browser {}\n", addr); + log.result(message); +} + +// Runs the launcher server. Exits on a ctrl+c or when requested by a user. +// Note that client connections may not be closed when this returns; use +// `close_all_clients()` on the ServerTermination to make this happen. +pub async fn serve( + log: &log::Logger, + mut tunnel: ActiveTunnel, + launcher_paths: &LauncherPaths, + code_server_args: &CodeServerArgs, + platform: Platform, + shutdown_rx: mpsc::Receiver, +) -> Result { + let mut port = tunnel.add_port_direct(CONTROL_PORT).await?; + print_listening(log, &tunnel.name); + + let mut forwarding = PortForwardingProcessor::new(); + let (tx, mut rx) = mpsc::channel::(4); + let (exit_barrier, signal_exit) = new_barrier(); + + pin!(shutdown_rx); + + loop { + tokio::select! { + Some(r) = shutdown_rx.recv() => { + info!(log, "Shutting down: {}", r ); + drop(signal_exit); + return Ok(ServerTermination { + respawn: false, + tunnel, + }); + }, + c = rx.recv() => { + if let Some(ServerSignal::Respawn) = c { + drop(signal_exit); + return Ok(ServerTermination { + respawn: true, + tunnel, + }); + } + }, + Some(w) = forwarding.recv() => { + forwarding.process(w, &mut tunnel).await; + }, + l = port.recv() => { + let socket = match l { + Some(p) => p, + None => { + warning!(log, "ssh tunnel disposed, tearing down"); + return Ok(ServerTermination { + respawn: false, + tunnel, + }); + } + }; + + let own_log = log.prefixed(&log::new_rpc_prefix()); + let own_tx = tx.clone(); + let own_paths = launcher_paths.clone(); + let own_exit = exit_barrier.clone(); + let own_code_server_args = code_server_args.clone(); + let own_forwarding = forwarding.handle(); + + tokio::spawn(async move { + use opentelemetry::trace::{FutureExt, TraceContextExt}; + + let span = own_log.span("server.socket").with_kind(SpanKind::Consumer).start(own_log.tracer()); + let cx = opentelemetry::Context::current_with_span(span); + let serve_at = Instant::now(); + + debug!(own_log, "Serving new connection"); + + let (writehalf, readhalf) = socket.into_split(); + let stats = process_socket(own_exit, readhalf, writehalf, own_log, own_tx, own_paths, own_code_server_args, own_forwarding, platform).with_context(cx.clone()).await; + + cx.span().add_event( + "socket.bandwidth", + vec![ + KeyValue::new("tx", stats.tx as f64), + KeyValue::new("rx", stats.rx as f64), + KeyValue::new("duration_ms", serve_at.elapsed().as_millis() as f64), + ], + ); + cx.span().end(); + }); + } + } + } +} + +struct SocketStats { + rx: usize, + tx: usize, +} + +#[allow(clippy::too_many_arguments)] // necessary here +async fn process_socket( + mut exit_barrier: Barrier<()>, + readhalf: impl AsyncRead + Send + Unpin + 'static, + mut writehalf: impl AsyncWrite + Unpin, + log: log::Logger, + server_tx: mpsc::Sender, + launcher_paths: LauncherPaths, + code_server_args: CodeServerArgs, + port_forwarding: PortForwarding, + platform: Platform, +) -> SocketStats { + let (socket_tx, mut socket_rx) = mpsc::channel(4); + + let rx_counter = Arc::new(AtomicUsize::new(0)); + + let server_bridges: ServerBridgeListLock = Arc::new(Mutex::new(Some(vec![]))); + let server_bridges_lock = Arc::clone(&server_bridges); + let barrier_ctx = exit_barrier.clone(); + let log_ctx = log.clone(); + let rx_counter_ctx = rx_counter.clone(); + + tokio::spawn(async move { + let mut ctx = HandlerContext { + closer: barrier_ctx, + server_tx, + socket_tx, + log: log_ctx, + launcher_paths, + code_server_args, + rx_counter: rx_counter_ctx, + code_server: None, + server_bridges: server_bridges_lock, + port_forwarding, + platform, + }; + + send_version(&ctx.socket_tx).await; + + if let Err(e) = handle_socket_read(readhalf, &mut ctx).await { + debug!(ctx.log, "closing socket reader: {}", e); + ctx.socket_tx + .send(SocketSignal::CloseWith(CloseReason(format!("{}", e)))) + .await + .ok(); + } + + ctx.dispose().await; + }); + + let mut tx_counter = 0; + + loop { + tokio::select! { + _ = exit_barrier.wait() => { + writehalf.shutdown().await.ok(); + break; + }, + recv = socket_rx.recv() => match recv { + None => break, + Some(message) => match message { + SocketSignal::Send(bytes) => { + tx_counter += bytes.len(); + if let Err(e) = writehalf.write_all(&bytes).await { + debug!(log, "Closing connection: {}", e); + break; + } + } + SocketSignal::CloseWith(reason) => { + debug!(log, "Closing connection: {}", reason.0); + break; + } + SocketSignal::CloseServerBridge(id) => { + let mut lock = server_bridges.lock().await; + match &mut *lock { + Some(bridges) => { + if let Some(index) = bridges.iter().position(|(i, _)| *i == id) { + (*bridges).remove(index as usize); + } + }, + None => {} + } + } + } + } + } + } + + SocketStats { + tx: tx_counter, + rx: rx_counter.load(Ordering::Acquire), + } +} + +async fn send_version(tx: &mpsc::Sender) { + tx.send(SocketSignal::from_message(&ToClientRequest { + id: None, + params: ClientRequestMethod::version(VersionParams { + version: VSCODE_CLI_VERSION.unwrap_or("dev"), + protocol_version: PROTOCOL_VERSION, + }), + })) + .await + .ok(); +} +async fn handle_socket_read( + readhalf: impl AsyncRead + Unpin, + ctx: &mut HandlerContext, +) -> Result<(), std::io::Error> { + let mut socket_reader = BufReader::new(readhalf); + let mut decode_buf = vec![]; + let mut did_update = false; + + let result = loop { + match read_next(&mut socket_reader, ctx, &mut decode_buf, &mut did_update).await { + Ok(false) => break Ok(()), + Ok(true) => { /* continue */ } + Err(e) => break Err(e), + } + }; + + // The connection is now closed, asked to respawn if needed + if did_update { + ctx.server_tx.send(ServerSignal::Respawn).await.ok(); + } + + result +} + +/// Reads and handles the next data packet, returns true if the read loop should continue. +async fn read_next( + socket_reader: &mut BufReader, + ctx: &mut HandlerContext, + decode_buf: &mut Vec, + did_update: &mut bool, +) -> Result { + let msg_length = tokio::select! { + u = socket_reader.read_u32() => u? as usize, + _ = ctx.closer.wait() => return Ok(false), + }; + decode_buf.resize(msg_length, 0); + ctx.rx_counter + .fetch_add(msg_length + 4 /* u32 */, Ordering::Relaxed); + + tokio::select! { + r = socket_reader.read_exact(decode_buf) => r?, + _ = ctx.closer.wait() => return Ok(false), + }; + + let req = match rmp_serde::from_slice::(decode_buf) { + Ok(req) => req, + Err(e) => { + warning!(ctx.log, "Error decoding message: {}", e); + return Ok(true); // not fatal + } + }; + + let log = ctx.log.prefixed( + req.id + .map(|id| format!("[call.{}]", id)) + .as_deref() + .unwrap_or("notify"), + ); + + macro_rules! success { + ($r:expr) => { + req.id + .map(|id| rmp_serde::to_vec_named(&SuccessResponse { id, result: &$r })) + }; + } + + macro_rules! tj { + ($name:expr, $e:expr) => { + match (spanf!( + log, + log.span(&format!("call.{}", $name)) + .with_kind(opentelemetry::trace::SpanKind::Server), + $e + )) { + Ok(r) => success!(r), + Err(e) => { + warning!(log, "error handling call: {:?}", e); + req.id.map(|id| { + rmp_serde::to_vec_named(&ErrorResponse { + id, + error: ResponseError { + code: -1, + message: format!("{:?}", e), + }, + }) + }) + } + } + }; + } + + let response = match req.params { + ServerRequestMethod::ping(_) => success!(EmptyResult {}), + ServerRequestMethod::serve(p) => tj!("serve", handle_serve(ctx, &log, p)), + ServerRequestMethod::prune => tj!("prune", handle_prune(ctx)), + ServerRequestMethod::gethostname(_) => tj!("gethostname", handle_get_hostname()), + ServerRequestMethod::update(p) => tj!("update", async { + let r = handle_update(ctx, &p).await; + if matches!(&r, Ok(u) if u.did_update) { + *did_update = true; + } + r + }), + ServerRequestMethod::servermsg(m) => { + if let Err(e) = handle_server_message(ctx, m).await { + warning!(log, "error handling call: {:?}", e); + } + None + } + ServerRequestMethod::callserverhttp(p) => { + tj!("callserverhttp", handle_call_server_http(ctx, p)) + } + ServerRequestMethod::forward(p) => tj!("forward", handle_forward(ctx, p)), + ServerRequestMethod::unforward(p) => tj!("unforward", handle_unforward(ctx, p)), + }; + + if let Some(Ok(res)) = response { + if ctx.socket_tx.send(SocketSignal::Send(res)).await.is_err() { + return Ok(false); + } + } + + Ok(true) +} + +#[derive(Clone)] +struct ServerOutputSink { + tx: mpsc::Sender, +} + +impl log::LogSink for ServerOutputSink { + fn write_log(&self, level: log::Level, _prefix: &str, message: &str) { + let s = SocketSignal::from_message(&ToClientRequest { + id: None, + params: ClientRequestMethod::serverlog(ServerLog { + line: message, + level: level.to_u8(), + }), + }); + + self.tx.try_send(s).ok(); + } + + fn write_result(&self, _message: &str) {} +} + +async fn handle_serve( + ctx: &mut HandlerContext, + log: &log::Logger, + params: ServeParams, +) -> Result { + let mut code_server_args = ctx.code_server_args.clone(); + + // fill params.extensions into code_server_args.install_extensions + code_server_args + .install_extensions + .extend(params.extensions.into_iter()); + + let resolved = ServerParamsRaw { + commit_id: params.commit_id, + quality: params.quality, + code_server_args, + headless: true, + platform: ctx.platform, + } + .resolve(log) + .await?; + + if ctx.code_server.is_none() { + let install_log = log.tee(ServerOutputSink { + tx: ctx.socket_tx.clone(), + }); + let sb = ServerBuilder::new(&install_log, &resolved, &ctx.launcher_paths); + + let server = match sb.get_running().await? { + Some(AnyCodeServer::Socket(s)) => s, + Some(_) => return Err(AnyError::from(MismatchedLaunchModeError())), + None => { + sb.setup().await?; + sb.listen_on_default_socket().await? + } + }; + + ctx.code_server = Some(server); + } + + attach_server_bridge(ctx, params.socket_id).await?; + Ok(EmptyResult {}) +} + +async fn attach_server_bridge(ctx: &mut HandlerContext, socket_id: u16) -> Result { + let attached_fut = ServerBridge::new( + &ctx.code_server.as_ref().unwrap().socket, + socket_id, + &ctx.socket_tx, + ) + .await; + + match attached_fut { + Ok(a) => { + let mut lock = ctx.server_bridges.lock().await; + match &mut *lock { + Some(server_bridges) => (*server_bridges).push((socket_id, a)), + None => *lock = Some(vec![(socket_id, a)]), + } + trace!(ctx.log, "Attached to server"); + Ok(socket_id) + } + Err(e) => Err(e), + } +} + +async fn handle_server_message( + ctx: &mut HandlerContext, + params: ServerMessageParams, +) -> Result { + let mut lock = ctx.server_bridges.lock().await; + + match &mut *lock { + Some(server_bridges) => { + let matched_bridge = server_bridges.iter_mut().find(|(id, _)| *id == params.i); + + match matched_bridge { + Some((_, sb)) => sb + .write(params.body) + .await + .map_err(|_| AnyError::from(ServerWriteError()))?, + None => return Err(AnyError::from(NoAttachedServerError())), + } + } + None => return Err(AnyError::from(NoAttachedServerError())), + } + + Ok(EmptyResult {}) +} + +async fn handle_prune(ctx: &HandlerContext) -> Result, AnyError> { + prune_stopped_servers(&ctx.launcher_paths).map(|v| { + v.iter() + .map(|p| p.server_dir.display().to_string()) + .collect() + }) +} + +async fn handle_update( + ctx: &HandlerContext, + params: &UpdateParams, +) -> Result { + let update_service = UpdateService::new(ctx.log.clone(), reqwest::Client::new()); + let updater = SelfUpdate::new(&update_service)?; + let latest_release = updater.get_current_release().await?; + let up_to_date = updater.is_up_to_date_with(&latest_release); + + if !params.do_update || up_to_date { + return Ok(UpdateResult { + up_to_date, + did_update: false, + }); + } + + info!(ctx.log, "Updating CLI to {}", latest_release); + + updater + .do_update(&latest_release, SilentCopyProgress()) + .await?; + + Ok(UpdateResult { + up_to_date: true, + did_update: true, + }) +} + +async fn handle_get_hostname() -> Result { + Ok(GetHostnameResponse { + value: gethostname::gethostname().to_string_lossy().into_owned(), + }) +} + +async fn handle_forward( + ctx: &HandlerContext, + params: ForwardParams, +) -> Result { + info!(ctx.log, "Forwarding port {}", params.port); + let uri = ctx.port_forwarding.forward(params.port).await?; + Ok(ForwardResult { uri }) +} + +async fn handle_unforward( + ctx: &HandlerContext, + params: UnforwardParams, +) -> Result { + info!(ctx.log, "Unforwarding port {}", params.port); + ctx.port_forwarding.unforward(params.port).await?; + Ok(EmptyResult {}) +} + +async fn handle_call_server_http( + ctx: &HandlerContext, + params: CallServerHttpParams, +) -> Result { + use hyper::{body, client::conn::Builder, Body, Request}; + + // We use Hyper directly here since reqwest doesn't support sockets/pipes. + // See https://github.com/seanmonstar/reqwest/issues/39 + + let socket = match &ctx.code_server { + Some(cs) => &cs.socket, + None => return Err(AnyError::from(NoAttachedServerError())), + }; + + let rw = get_socket_rw_stream(socket).await?; + + let (mut request_sender, connection) = Builder::new() + .handshake(rw) + .await + .map_err(|e| wrap(e, "error establishing connection"))?; + + // start the connection processing; it's shut down when the sender is dropped + tokio::spawn(connection); + + let mut request_builder = Request::builder() + .method::<&str>(params.method.as_ref()) + .uri(format!("http://127.0.0.1{}", params.path)) + .header("Host", "127.0.0.1"); + + for (k, v) in params.headers { + request_builder = request_builder.header(k, v); + } + let request = request_builder + .body(Body::from(params.body.unwrap_or_default())) + .map_err(|e| wrap(e, "invalid request"))?; + + let response = request_sender + .send_request(request) + .await + .map_err(|e| wrap(e, "error sending request"))?; + + Ok(CallServerHttpResult { + status: response.status().as_u16(), + headers: response + .headers() + .into_iter() + .map(|(k, v)| (k.to_string(), v.to_str().unwrap_or("").to_string())) + .collect(), + body: body::to_bytes(response) + .await + .map_err(|e| wrap(e, "error reading response body"))? + .to_vec(), + }) +} diff --git a/cli/src/tunnels/dev_tunnels.rs b/cli/src/tunnels/dev_tunnels.rs new file mode 100644 index 00000000000..eb362ef8e5b --- /dev/null +++ b/cli/src/tunnels/dev_tunnels.rs @@ -0,0 +1,875 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use crate::auth; +use crate::constants::{CONTROL_PORT, TUNNEL_SERVICE_USER_AGENT}; +use crate::state::{LauncherPaths, PersistedState}; +use crate::util::errors::{ + wrap, AnyError, DevTunnelError, InvalidTunnelName, TunnelCreationFailed, WrappedError, +}; +use crate::util::input::prompt_placeholder; +use crate::{debug, info, log, spanf, trace, warning}; +use async_trait::async_trait; +use futures::TryFutureExt; +use rand::prelude::IteratorRandom; +use regex::Regex; +use reqwest::StatusCode; +use serde::{Deserialize, Serialize}; +use std::sync::{Arc, Mutex}; +use std::time::Duration; +use tokio::sync::{mpsc, watch}; +use tunnels::connections::{ForwardedPortConnection, RelayTunnelHost}; +use tunnels::contracts::{ + Tunnel, TunnelPort, TunnelRelayTunnelEndpoint, PORT_TOKEN, TUNNEL_PROTOCOL_AUTO, +}; +use tunnels::management::{ + new_tunnel_management, HttpError, TunnelLocator, TunnelManagementClient, TunnelRequestOptions, + NO_REQUEST_OPTIONS, +}; + +use super::name_generator; + +#[derive(Clone, Serialize, Deserialize)] +pub struct PersistedTunnel { + pub name: String, + pub id: String, + pub cluster: String, +} + +impl PersistedTunnel { + pub fn into_locator(self) -> TunnelLocator { + TunnelLocator::ID { + cluster: self.cluster, + id: self.id, + } + } + pub fn locator(&self) -> TunnelLocator { + TunnelLocator::ID { + cluster: self.cluster.clone(), + id: self.id.clone(), + } + } +} + +#[async_trait] +trait AccessTokenProvider: Send + Sync { + /// Gets the current access token. + async fn refresh_token(&self) -> Result; +} + +/// Access token provider that provides a fixed token without refreshing. +struct StaticAccessTokenProvider(String); + +impl StaticAccessTokenProvider { + pub fn new(token: String) -> Self { + Self(token) + } +} + +#[async_trait] +impl AccessTokenProvider for StaticAccessTokenProvider { + async fn refresh_token(&self) -> Result { + Ok(self.0.clone()) + } +} + +/// Access token provider that looks up the token from the tunnels API. +struct LookupAccessTokenProvider { + client: TunnelManagementClient, + locator: TunnelLocator, + log: log::Logger, + initial_token: Arc>>, +} + +impl LookupAccessTokenProvider { + pub fn new( + client: TunnelManagementClient, + locator: TunnelLocator, + log: log::Logger, + initial_token: Option, + ) -> Self { + Self { + client, + locator, + log, + initial_token: Arc::new(Mutex::new(initial_token)), + } + } +} + +#[async_trait] +impl AccessTokenProvider for LookupAccessTokenProvider { + async fn refresh_token(&self) -> Result { + if let Some(token) = self.initial_token.lock().unwrap().take() { + return Ok(token); + } + + let tunnel_lookup = spanf!( + self.log, + self.log.span("dev-tunnel.tag.get"), + self.client.get_tunnel( + &self.locator, + &TunnelRequestOptions { + token_scopes: vec!["host".to_string()], + ..Default::default() + } + ) + ); + + trace!(self.log, "Successfully refreshed access token"); + + match tunnel_lookup { + Ok(tunnel) => Ok(get_host_token_from_tunnel(&tunnel)), + Err(e) => Err(wrap(e, "failed to lookup tunnel")), + } + } +} + +#[derive(Clone)] +pub struct DevTunnels { + log: log::Logger, + launcher_tunnel: PersistedState>, + client: TunnelManagementClient, +} + +/// Representation of a tunnel returned from the `start` methods. +pub struct ActiveTunnel { + /// Name of the tunnel + pub name: String, + manager: ActiveTunnelManager, +} + +impl ActiveTunnel { + /// Closes and unregisters the tunnel. + pub async fn close(&mut self) -> Result<(), AnyError> { + self.manager.kill().await?; + Ok(()) + } + + /// Forwards a port to local connections. + pub async fn add_port_direct( + &mut self, + port_number: u16, + ) -> Result, AnyError> { + let port = self.manager.add_port_direct(port_number).await?; + Ok(port) + } + + /// Forwards a port over TCP. + pub async fn add_port_tcp(&mut self, port_number: u16) -> Result<(), AnyError> { + self.manager.add_port_tcp(port_number).await?; + Ok(()) + } + + /// Removes a forwarded port TCP. + pub async fn remove_port(&mut self, port_number: u16) -> Result<(), AnyError> { + self.manager.remove_port(port_number).await?; + Ok(()) + } + + /// Gets the public URI on which a forwarded port can be access in browser. + pub async fn get_port_uri(&mut self, port: u16) -> Result { + let endpoint = self.manager.get_endpoint().await?; + let format = endpoint + .base + .port_uri_format + .expect("expected to have port format"); + + Ok(format.replace(PORT_TOKEN, &port.to_string())) + } +} + +const VSCODE_CLI_TUNNEL_TAG: &str = "vscode-server-launcher"; +const MAX_TUNNEL_NAME_LENGTH: usize = 20; + +fn get_host_token_from_tunnel(tunnel: &Tunnel) -> String { + tunnel + .access_tokens + .as_ref() + .expect("expected to have access tokens") + .get("host") + .expect("expected to have host token") + .to_string() +} + +fn is_valid_name(name: &str) -> Result<(), InvalidTunnelName> { + if name.len() > MAX_TUNNEL_NAME_LENGTH { + return Err(InvalidTunnelName(format!( + "Names cannot be longer than {} characters. Please try a different name.", + MAX_TUNNEL_NAME_LENGTH + ))); + } + + let re = Regex::new(r"^([\w-]+)$").unwrap(); + + if !re.is_match(name) { + return Err(InvalidTunnelName( + "Names can only contain letters, numbers, and '-'. Spaces, commas, and all other special characters are not allowed. Please try a different name.".to_string() + )); + } + + Ok(()) +} + +/// Structure optionally passed into `start_existing_tunnel` to forward an existing tunnel. +#[derive(Clone, Debug)] +pub struct ExistingTunnel { + /// Name you'd like to assign preexisting tunnel to use to connect to the VS Code Server + pub tunnel_name: String, + + /// Token to authenticate and use preexisting tunnel + pub host_token: String, + + /// Id of preexisting tunnel to use to connect to the VS Code Server + pub tunnel_id: String, + + /// Cluster of preexisting tunnel to use to connect to the VS Code Server + pub cluster: String, +} + +impl DevTunnels { + pub fn new(log: &log::Logger, auth: auth::Auth, paths: &LauncherPaths) -> DevTunnels { + let mut client = new_tunnel_management(&TUNNEL_SERVICE_USER_AGENT); + client.authorization_provider(auth); + + DevTunnels { + log: log.clone(), + client: client.into(), + launcher_tunnel: PersistedState::new(paths.root().join("code_tunnel.json")), + } + } + + pub async fn remove_tunnel(&mut self) -> Result<(), AnyError> { + let tunnel = match self.launcher_tunnel.load() { + Some(t) => t, + None => { + return Ok(()); + } + }; + + spanf!( + self.log, + self.log.span("dev-tunnel.delete"), + self.client + .delete_tunnel(&tunnel.into_locator(), NO_REQUEST_OPTIONS) + ) + .map_err(|e| wrap(e, "failed to execute `tunnel delete`"))?; + + self.launcher_tunnel.save(None)?; + Ok(()) + } + + pub async fn rename_tunnel(&mut self, name: &str) -> Result<(), AnyError> { + is_valid_name(name)?; + + self.check_is_name_free(name).await?; + + let mut tunnel = match self.launcher_tunnel.load() { + Some(t) => t, + None => { + debug!(self.log, "No code server tunnel found, creating new one"); + let (persisted, _) = self.create_tunnel(name).await?; + self.launcher_tunnel.save(Some(persisted))?; + return Ok(()); + } + }; + + let locator = tunnel.locator(); + + let mut full_tunnel = spanf!( + self.log, + self.log.span("dev-tunnel.tag.get"), + self.client.get_tunnel(&locator, NO_REQUEST_OPTIONS) + ) + .map_err(|e| wrap(e, "failed to lookup tunnel"))?; + + full_tunnel.tags = vec![name.to_string(), VSCODE_CLI_TUNNEL_TAG.to_string()]; + spanf!( + self.log, + self.log.span("dev-tunnel.tag.update"), + self.client.update_tunnel(&full_tunnel, NO_REQUEST_OPTIONS) + ) + .map_err(|e| wrap(e, "failed to update tunnel tags"))?; + + tunnel.name = name.to_string(); + self.launcher_tunnel.save(Some(tunnel.clone()))?; + Ok(()) + } + + /// Starts a new tunnel for the code server on the port. Unlike `start_new_tunnel`, + /// this attempts to reuse or create a tunnel of a preferred name or of a generated friendly tunnel name. + pub async fn start_new_launcher_tunnel( + &mut self, + preferred_name: Option, + use_random_name: bool, + ) -> Result { + let (tunnel, persisted) = match self.launcher_tunnel.load() { + Some(mut persisted) => { + if let Some(name) = preferred_name { + if persisted.name.ne(&name) { + self.check_is_name_free(&name).await?; + let mut full_tunnel = spanf!( + self.log, + self.log.span("dev-tunnel.tag.get"), + self.client + .get_tunnel(&persisted.locator(), NO_REQUEST_OPTIONS) + ) + .map_err(|e| wrap(e, "failed to lookup tunnel"))?; + + info!(self.log, "Updating name of existing tunnel"); + + full_tunnel.tags = + vec![name.to_string(), VSCODE_CLI_TUNNEL_TAG.to_string()]; + if spanf!( + self.log, + self.log.span("dev-tunnel.tag.update"), + self.client.update_tunnel(&full_tunnel, NO_REQUEST_OPTIONS) + ) + .is_ok() + { + persisted.name = name.to_string(); + self.launcher_tunnel.save(Some(persisted.clone()))?; + } + } + } + + let tunnel_lookup = spanf!( + self.log, + self.log.span("dev-tunnel.tag.get"), + self.client.get_tunnel( + &persisted.locator(), + &TunnelRequestOptions { + include_ports: true, + token_scopes: vec!["host".to_string()], + ..Default::default() + } + ) + ); + + match tunnel_lookup { + Ok(ft) => (ft, persisted), + Err(HttpError::ResponseError(e)) + if e.status_code == StatusCode::NOT_FOUND + || e.status_code == StatusCode::FORBIDDEN => + { + let (persisted, tunnel) = self.create_tunnel(&persisted.name).await?; + self.launcher_tunnel.save(Some(persisted.clone()))?; + (tunnel, persisted) + } + Err(e) => return Err(AnyError::from(wrap(e, "failed to lookup tunnel"))), + } + } + None => { + debug!(self.log, "No code server tunnel found, creating new one"); + let name = self + .get_name_for_tunnel(preferred_name, use_random_name) + .await?; + let (persisted, full_tunnel) = self.create_tunnel(&name).await?; + self.launcher_tunnel.save(Some(persisted.clone()))?; + (full_tunnel, persisted) + } + }; + + let locator = TunnelLocator::try_from(&tunnel).unwrap(); + let host_token = get_host_token_from_tunnel(&tunnel); + + for port_to_delete in tunnel + .ports + .iter() + .filter(|p| p.port_number != CONTROL_PORT) + { + let output_fut = self.client.delete_tunnel_port( + &locator, + port_to_delete.port_number, + NO_REQUEST_OPTIONS, + ); + spanf!( + self.log, + self.log.span("dev-tunnel.port.delete"), + output_fut + ) + .map_err(|e| wrap(e, "failed to delete port"))?; + } + + // cleanup any old trailing tunnel endpoints + for endpoint in tunnel.endpoints { + let fut = self.client.delete_tunnel_endpoints( + &locator, + &endpoint.host_id, + None, + NO_REQUEST_OPTIONS, + ); + + spanf!(self.log, self.log.span("dev-tunnel.endpoint.prune"), fut) + .map_err(|e| wrap(e, "failed to prune tunnel endpoint"))?; + } + + self.start_tunnel( + locator.clone(), + &persisted, + self.client.clone(), + LookupAccessTokenProvider::new( + self.client.clone(), + locator, + self.log.clone(), + Some(host_token), + ), + ) + .await + } + + async fn create_tunnel(&mut self, name: &str) -> Result<(PersistedTunnel, Tunnel), AnyError> { + info!(self.log, "Creating tunnel with the name: {}", name); + + let mut tried_recycle = false; + + let new_tunnel = Tunnel { + tags: vec![name.to_string(), VSCODE_CLI_TUNNEL_TAG.to_string()], + ..Default::default() + }; + + loop { + let result = spanf!( + self.log, + self.log.span("dev-tunnel.create"), + self.client.create_tunnel(&new_tunnel, NO_REQUEST_OPTIONS) + ); + + match result { + Err(HttpError::ResponseError(e)) + if e.status_code == StatusCode::TOO_MANY_REQUESTS => + { + if !tried_recycle && self.try_recycle_tunnel().await? { + tried_recycle = true; + continue; + } + + return Err(AnyError::from(TunnelCreationFailed( + name.to_string(), + "You've exceeded the 10 machine limit for the port fowarding service. Please remove other machines before trying to add this machine.".to_string(), + ))); + } + Err(e) => { + return Err(AnyError::from(TunnelCreationFailed( + name.to_string(), + format!("{:?}", e), + ))) + } + Ok(t) => { + return Ok(( + PersistedTunnel { + cluster: t.cluster_id.clone().unwrap(), + id: t.tunnel_id.clone().unwrap(), + name: name.to_string(), + }, + t, + )) + } + } + } + } + + /// Tries to delete an unused tunnel, and then creates a tunnel with the + /// given `new_name`. + async fn try_recycle_tunnel(&mut self) -> Result { + trace!( + self.log, + "Tunnel limit hit, trying to recycle an old tunnel" + ); + + let existing_tunnels = self.list_all_server_tunnels().await?; + + let recyclable = existing_tunnels + .iter() + .filter(|t| { + t.status + .as_ref() + .and_then(|s| s.host_connection_count.as_ref()) + .map(|c| c.get_count()) + .unwrap_or(0) == 0 + }) + .choose(&mut rand::thread_rng()); + + match recyclable { + Some(tunnel) => { + trace!(self.log, "Recycling tunnel ID {:?}", tunnel.tunnel_id); + spanf!( + self.log, + self.log.span("dev-tunnel.delete"), + self.client + .delete_tunnel(&tunnel.try_into().unwrap(), NO_REQUEST_OPTIONS) + ) + .map_err(|e| wrap(e, "failed to execute `tunnel delete`"))?; + Ok(true) + } + None => { + trace!(self.log, "No tunnels available to recycle"); + Ok(false) + } + } + } + + async fn list_all_server_tunnels(&mut self) -> Result, AnyError> { + let tunnels = spanf!( + self.log, + self.log.span("dev-tunnel.listall"), + self.client.list_all_tunnels(&TunnelRequestOptions { + tags: vec![VSCODE_CLI_TUNNEL_TAG.to_string()], + require_all_tags: true, + ..Default::default() + }) + ) + .map_err(|e| wrap(e, "error listing current tunnels"))?; + + Ok(tunnels) + } + + async fn check_is_name_free(&mut self, name: &str) -> Result<(), AnyError> { + let existing = spanf!( + self.log, + self.log.span("dev-tunnel.rename.search"), + self.client.list_all_tunnels(&TunnelRequestOptions { + tags: vec![VSCODE_CLI_TUNNEL_TAG.to_string(), name.to_string()], + require_all_tags: true, + ..Default::default() + }) + ) + .map_err(|e| wrap(e, "failed to list existing tunnels"))?; + if !existing.is_empty() { + return Err(AnyError::from(TunnelCreationFailed( + name.to_string(), + "tunnel name already in use".to_string(), + ))); + }; + Ok(()) + } + + async fn get_name_for_tunnel( + &mut self, + preferred_name: Option, + mut use_random_name: bool, + ) -> Result { + let existing_tunnels = self.list_all_server_tunnels().await?; + let is_name_free = |n: &str| { + !existing_tunnels + .iter() + .any(|v| v.tags.iter().any(|t| t == n)) + }; + + if let Some(machine_name) = preferred_name { + let name = machine_name; + if let Err(e) = is_valid_name(&name) { + info!(self.log, "{} is an invalid name", e); + return Err(AnyError::from(wrap(e, "invalid name"))); + } + if is_name_free(&name) { + return Ok(name); + } + info!( + self.log, + "{} is already taken, using a random name instead", &name + ); + use_random_name = true; + } + + let mut placeholder_name = name_generator::generate_name(MAX_TUNNEL_NAME_LENGTH); + if use_random_name { + while !is_name_free(&placeholder_name) { + placeholder_name = name_generator::generate_name(MAX_TUNNEL_NAME_LENGTH); + } + return Ok(placeholder_name); + } + + loop { + let name = prompt_placeholder( + "What would you like to call this machine?", + &placeholder_name, + )?; + + if let Err(e) = is_valid_name(&name) { + info!(self.log, "{}", e); + continue; + } + + if is_name_free(&name) { + return Ok(name); + } + + info!(self.log, "The name {} is already in use", name); + } + } + + /// Hosts an existing tunnel, where the tunnel ID and host token are given. + pub async fn start_existing_tunnel( + &mut self, + tunnel: ExistingTunnel, + ) -> Result { + let tunnel_details = PersistedTunnel { + name: tunnel.tunnel_name, + id: tunnel.tunnel_id, + cluster: tunnel.cluster, + }; + + let mut mgmt = self.client.build(); + mgmt.authorization(tunnels::management::Authorization::Tunnel( + tunnel.host_token.clone(), + )); + + self.start_tunnel( + tunnel_details.locator(), + &tunnel_details, + mgmt.into(), + StaticAccessTokenProvider::new(tunnel.host_token), + ) + .await + } + + async fn start_tunnel( + &mut self, + locator: TunnelLocator, + tunnel_details: &PersistedTunnel, + client: TunnelManagementClient, + access_token: impl AccessTokenProvider + 'static, + ) -> Result { + let mut manager = ActiveTunnelManager::new(self.log.clone(), client, locator, access_token); + + let endpoint_result = spanf!( + self.log, + self.log.span("dev-tunnel.serve.callback"), + manager.get_endpoint() + ); + + let endpoint = match endpoint_result { + Ok(endpoint) => endpoint, + Err(e) => { + error!(self.log, "Error connecting to tunnel endpoint: {}", e); + manager.kill().await.ok(); + return Err(e); + } + }; + + debug!(self.log, "Connected to tunnel endpoint: {:?}", endpoint); + + Ok(ActiveTunnel { + name: tunnel_details.name.clone(), + manager, + }) + } +} + +struct ActiveTunnelManager { + close_tx: Option>, + endpoint_rx: watch::Receiver>>, + relay: Arc>, +} + +impl ActiveTunnelManager { + pub fn new( + log: log::Logger, + mgmt: TunnelManagementClient, + locator: TunnelLocator, + access_token: impl AccessTokenProvider + 'static, + ) -> ActiveTunnelManager { + let (endpoint_tx, endpoint_rx) = watch::channel(None); + let (close_tx, close_rx) = mpsc::channel(1); + + let relay = Arc::new(tokio::sync::Mutex::new(RelayTunnelHost::new(locator, mgmt))); + let relay_spawned = relay.clone(); + + tokio::spawn(async move { + ActiveTunnelManager::spawn_tunnel( + log, + relay_spawned, + close_rx, + endpoint_tx, + access_token, + ) + .await; + }); + + ActiveTunnelManager { + endpoint_rx, + relay, + close_tx: Some(close_tx), + } + } + + /// Adds a port for TCP/IP forwarding. + #[allow(dead_code)] // todo: port forwarding + pub async fn add_port_tcp(&self, port_number: u16) -> Result<(), WrappedError> { + self.relay + .lock() + .await + .add_port(&TunnelPort { + port_number, + protocol: Some(TUNNEL_PROTOCOL_AUTO.to_owned()), + ..Default::default() + }) + .await + .map_err(|e| wrap(e, "error adding port to relay"))?; + Ok(()) + } + + /// Adds a port for TCP/IP forwarding. + pub async fn add_port_direct( + &self, + port_number: u16, + ) -> Result, WrappedError> { + self.relay + .lock() + .await + .add_port_raw(&TunnelPort { + port_number, + protocol: Some(TUNNEL_PROTOCOL_AUTO.to_owned()), + ..Default::default() + }) + .await + .map_err(|e| wrap(e, "error adding port to relay")) + } + + /// Removes a port from TCP/IP forwarding. + pub async fn remove_port(&self, port_number: u16) -> Result<(), WrappedError> { + self.relay + .lock() + .await + .remove_port(port_number) + .await + .map_err(|e| wrap(e, "error remove port from relay")) + } + + /// Gets the most recent details from the tunnel process. Returns None if + /// the process exited before providing details. + pub async fn get_endpoint(&mut self) -> Result { + loop { + if let Some(details) = &*self.endpoint_rx.borrow() { + return details.clone().map_err(AnyError::from); + } + + if self.endpoint_rx.changed().await.is_err() { + return Err(DevTunnelError("tunnel creation cancelled".to_string()).into()); + } + } + } + + /// Kills the process, and waits for it to exit. + /// See https://tokio.rs/tokio/topics/shutdown#waiting-for-things-to-finish-shutting-down for how this works + pub async fn kill(&mut self) -> Result<(), AnyError> { + if let Some(tx) = self.close_tx.take() { + drop(tx); + } + + self.relay + .lock() + .await + .unregister() + .await + .map_err(|e| wrap(e, "error unregistering relay"))?; + + while self.endpoint_rx.changed().await.is_ok() {} + + Ok(()) + } + + async fn spawn_tunnel( + log: log::Logger, + relay: Arc>, + mut close_rx: mpsc::Receiver<()>, + endpoint_tx: watch::Sender>>, + access_token_provider: impl AccessTokenProvider + 'static, + ) { + let mut backoff = Backoff::new(Duration::from_secs(5), Duration::from_secs(120)); + + macro_rules! fail { + ($e: expr, $msg: expr) => { + warning!(log, "{}: {}", $msg, $e); + endpoint_tx.send(Some(Err($e))).ok(); + backoff.delay().await; + }; + } + + loop { + debug!(log, "Starting tunnel to server..."); + + let access_token = match access_token_provider.refresh_token().await { + Ok(t) => t, + Err(e) => { + fail!(e, "Error refreshing access token, will retry"); + continue; + } + }; + + // we don't bother making a client that can refresh the token, since + // the tunnel won't be able to host as soon as the access token expires. + let handle_res = { + let mut relay = relay.lock().await; + relay + .connect(&access_token) + .await + .map_err(|e| wrap(e, "error connecting to tunnel")) + }; + + let mut handle = match handle_res { + Ok(handle) => handle, + Err(e) => { + fail!(e, "Error connecting to relay, will retry"); + continue; + } + }; + + backoff.reset(); + endpoint_tx.send(Some(Ok(handle.endpoint().clone()))).ok(); + + tokio::select! { + // error is mapped like this prevent it being used across an await, + // which Rust dislikes since there's a non-sendable dyn Error in there + res = (&mut handle).map_err(|e| wrap(e, "error from tunnel connection")) => { + if let Err(e) = res { + fail!(e, "Tunnel exited unexpectedly, reconnecting"); + } else { + warning!(log, "Tunnel exited unexpectedly but gracefully, reconnecting"); + backoff.delay().await; + } + }, + _ = close_rx.recv() => { + trace!(log, "Tunnel closing gracefully"); + trace!(log, "Tunnel closed with result: {:?}", handle.close().await); + break; + } + } + } + } +} + +struct Backoff { + failures: u32, + base_duration: Duration, + max_duration: Duration, +} + +impl Backoff { + pub fn new(base_duration: Duration, max_duration: Duration) -> Self { + Self { + failures: 0, + base_duration, + max_duration, + } + } + + pub async fn delay(&mut self) { + tokio::time::sleep(self.next()).await + } + + pub fn next(&mut self) -> Duration { + self.failures += 1; + let duration = self + .base_duration + .checked_mul(self.failures) + .unwrap_or(self.max_duration); + std::cmp::min(duration, self.max_duration) + } + + pub fn reset(&mut self) { + self.failures = 0; + } +} diff --git a/cli/src/tunnels/legal.rs b/cli/src/tunnels/legal.rs new file mode 100644 index 00000000000..947fd07e4cd --- /dev/null +++ b/cli/src/tunnels/legal.rs @@ -0,0 +1,63 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use crate::state::{LauncherPaths, PersistedState}; +use crate::util::errors::{AnyError, MissingLegalConsent}; +use crate::util::input::prompt_yn; +use serde::{Deserialize, Serialize}; + +const LICENSE_TEXT: Option<&'static str> = option_env!("VSCODE_CLI_REMOTE_LICENSE_TEXT"); +const LICENSE_PROMPT: Option<&'static str> = option_env!("VSCODE_CLI_REMOTE_LICENSE_PROMPT"); + +#[derive(Clone, Default, Serialize, Deserialize)] +struct PersistedConsent { + pub consented: Option, +} + +pub fn require_consent( + paths: &LauncherPaths, + accept_server_license_terms: bool, +) -> Result<(), AnyError> { + match LICENSE_TEXT { + Some(t) => println!("{}", t.replace("\\n", "\r\n")), + None => return Ok(()), + } + + if accept_server_license_terms { + return Ok(()); + } + + let prompt = match LICENSE_PROMPT { + Some(p) => p, + None => return Ok(()), + }; + + let license: PersistedState = + PersistedState::new(paths.root().join("license_consent.json")); + + let mut save = false; + let mut load = license.load(); + + if !load.consented.unwrap_or(false) { + match prompt_yn(prompt) { + Ok(true) => { + save = true; + load.consented = Some(true); + } + Ok(false) => { + return Err(AnyError::from(MissingLegalConsent( + "Sorry you cannot use VS Code Server CLI without accepting the terms." + .to_string(), + ))) + } + Err(e) => return Err(AnyError::from(MissingLegalConsent(e.to_string()))), + } + } + + if save { + license.save(load)?; + } + + Ok(()) +} diff --git a/cli/src/tunnels/name_generator.rs b/cli/src/tunnels/name_generator.rs new file mode 100644 index 00000000000..f7c8cc92441 --- /dev/null +++ b/cli/src/tunnels/name_generator.rs @@ -0,0 +1,218 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use rand::prelude::*; + +// Adjectives in LEFT from Moby : +static LEFT: &[&str] = &[ + "admiring", + "adoring", + "affectionate", + "agitated", + "amazing", + "angry", + "awesome", + "beautiful", + "blissful", + "bold", + "boring", + "brave", + "busy", + "charming", + "clever", + "cool", + "compassionate", + "competent", + "condescending", + "confident", + "cranky", + "crazy", + "dazzling", + "determined", + "distracted", + "dreamy", + "eager", + "ecstatic", + "elastic", + "elated", + "elegant", + "eloquent", + "epic", + "exciting", + "fervent", + "festive", + "flamboyant", + "focused", + "friendly", + "frosty", + "funny", + "gallant", + "gifted", + "goofy", + "gracious", + "great", + "happy", + "hardcore", + "heuristic", + "hopeful", + "hungry", + "infallible", + "inspiring", + "interesting", + "intelligent", + "jolly", + "jovial", + "keen", + "kind", + "laughing", + "loving", + "lucid", + "magical", + "mystifying", + "modest", + "musing", + "naughty", + "nervous", + "nice", + "nifty", + "nostalgic", + "objective", + "optimistic", + "peaceful", + "pedantic", + "pensive", + "practical", + "priceless", + "quirky", + "quizzical", + "recursing", + "relaxed", + "reverent", + "romantic", + "sad", + "serene", + "sharp", + "silly", + "sleepy", + "stoic", + "strange", + "stupefied", + "suspicious", + "sweet", + "tender", + "thirsty", + "trusting", + "unruffled", + "upbeat", + "vibrant", + "vigilant", + "vigorous", + "wizardly", + "wonderful", + "xenodochial", + "youthful", + "zealous", + "zen", +]; + +static RIGHT: &[&str] = &[ + "albatross", + "antbird", + "antpitta", + "antshrike", + "antwren", + "babbler", + "barbet", + "blackbird", + "brushfinch", + "bulbul", + "bunting", + "cisticola", + "cormorant", + "crow", + "cuckoo", + "dove", + "drongo", + "duck", + "eagle", + "falcon", + "fantail", + "finch", + "flowerpecker", + "flycatcher", + "goose", + "goshawk", + "greenbul", + "grosbeak", + "gull", + "hawk", + "heron", + "honeyeater", + "hornbill", + "hummingbird", + "ibis", + "jay", + "kestrel", + "kingfisher", + "kite", + "lark", + "lorikeet", + "magpie", + "mockingbird", + "monarch", + "nightjar", + "oriole", + "owl", + "parakeet", + "parrot", + "partridge", + "penguin", + "petrel", + "pheasant", + "piculet", + "pigeon", + "pitta", + "prinia", + "puffin", + "quail", + "robin", + "sandpiper", + "seedeater", + "shearwater", + "sparrow", + "spinetail", + "starling", + "sunbird", + "swallow", + "swift", + "swiftlet", + "tanager", + "tapaculo", + "tern", + "thornbill", + "tinamou", + "trogon", + "tyrannulet", + "vireo", + "warbler", + "waxbill", + "weaver", + "whistler", + "woodpecker", + "wren", +]; + +/// Generates a random avian name, with the optional extra_random_length added +/// to reduce chance of in-flight collisions. +pub fn generate_name(max_length: usize) -> String { + let mut rng = rand::thread_rng(); + loop { + let left = LEFT[rng.gen_range(0..LEFT.len())]; + let right = RIGHT[rng.gen_range(0..RIGHT.len())]; + let s = format!("{}-{}", left, right); + if s.len() < max_length { + return s; + } + } +} diff --git a/cli/src/tunnels/paths.rs b/cli/src/tunnels/paths.rs new file mode 100644 index 00000000000..3c47b2575d7 --- /dev/null +++ b/cli/src/tunnels/paths.rs @@ -0,0 +1,216 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::{ + fs::{read_dir, read_to_string, remove_dir_all, write}, + path::PathBuf, +}; + +use serde::{Deserialize, Serialize}; + +use crate::{ + log, options, + state::{LauncherPaths, PersistedState}, + util::{ + errors::{wrap, AnyError, WrappedError}, + machine, + }, +}; + +const INSIDERS_INSTALL_FOLDER: &str = "server-insiders"; +const STABLE_INSTALL_FOLDER: &str = "server-stable"; +const EXPLORATION_INSTALL_FOLDER: &str = "server-exploration"; +const PIDFILE_SUFFIX: &str = ".pid"; +const LOGFILE_SUFFIX: &str = ".log"; + +pub struct ServerPaths { + // Directory into which the server is downloaded + pub server_dir: PathBuf, + // Executable path, within the server_id + pub executable: PathBuf, + // File where logs for the server should be written. + pub logfile: PathBuf, + // File where the process ID for the server should be written. + pub pidfile: PathBuf, +} + +impl ServerPaths { + // Queries the system to determine the process ID of the running server. + // Returns the process ID, if the server is running. + pub fn get_running_pid(&self) -> Option { + if let Some(pid) = self.read_pid() { + return match machine::process_at_path_exists(pid, &self.executable) { + true => Some(pid), + false => None, + }; + } + + if let Some(pid) = machine::find_running_process(&self.executable) { + // attempt to backfill process ID: + self.write_pid(pid).ok(); + return Some(pid); + } + + None + } + + /// Delete the server directory + pub fn delete(&self) -> Result<(), WrappedError> { + remove_dir_all(&self.server_dir).map_err(|e| { + wrap( + e, + format!("error deleting server dir {}", self.server_dir.display()), + ) + }) + } + + // VS Code Server pid + pub fn write_pid(&self, pid: u32) -> Result<(), WrappedError> { + write(&self.pidfile, &format!("{}", pid)).map_err(|e| { + wrap( + e, + format!("error writing process id into {}", self.pidfile.display()), + ) + }) + } + + fn read_pid(&self) -> Option { + read_to_string(&self.pidfile) + .ok() + .and_then(|s| s.parse::().ok()) + } +} + +#[derive(Serialize, Deserialize, Clone, PartialEq, Eq)] +pub struct InstalledServer { + pub quality: options::Quality, + pub commit: String, + pub headless: bool, +} + +impl InstalledServer { + /// Gets path information about where a specific server should be stored. + pub fn server_paths(&self, p: &LauncherPaths) -> ServerPaths { + let base_folder = self.get_install_folder(p); + let server_dir = base_folder.join("bin").join(&self.commit); + ServerPaths { + executable: server_dir + .join("bin") + .join(self.quality.server_entrypoint()), + server_dir, + logfile: base_folder.join(format!(".{}{}", self.commit, LOGFILE_SUFFIX)), + pidfile: base_folder.join(format!(".{}{}", self.commit, PIDFILE_SUFFIX)), + } + } + + fn get_install_folder(&self, p: &LauncherPaths) -> PathBuf { + let name = match self.quality { + options::Quality::Insiders => INSIDERS_INSTALL_FOLDER, + options::Quality::Exploration => EXPLORATION_INSTALL_FOLDER, + options::Quality::Stable => STABLE_INSTALL_FOLDER, + }; + + p.root().join(if !self.headless { + format!("{}-web", name) + } else { + name.to_string() + }) + } +} + +pub struct LastUsedServers<'a> { + state: PersistedState>, + paths: &'a LauncherPaths, +} + +impl<'a> LastUsedServers<'a> { + pub fn new(paths: &'a LauncherPaths) -> LastUsedServers { + LastUsedServers { + state: PersistedState::new(paths.root().join("last-used-servers.json")), + paths, + } + } + + /// Adds a server as having been used most recently. Returns the number of retained server. + pub fn add(&self, server: InstalledServer) -> Result { + self.state.update_with(server, |server, l| { + if let Some(index) = l.iter().position(|s| s == &server) { + l.remove(index); + } + l.insert(0, server); + l.len() + }) + } + + /// Trims so that at most `max_servers` are saved on disk. + pub fn trim(&self, log: &log::Logger, max_servers: usize) -> Result<(), WrappedError> { + let mut servers = self.state.load(); + while servers.len() > max_servers { + let server = servers.pop().unwrap(); + debug!( + log, + "Removing old server {}/{}", + server.quality.get_machine_name(), + server.commit + ); + let server_paths = server.server_paths(self.paths); + server_paths.delete()?; + } + self.state.save(servers)?; + Ok(()) + } +} + +/// Prunes servers not currently running, and returns the deleted servers. +pub fn prune_stopped_servers(launcher_paths: &LauncherPaths) -> Result, AnyError> { + get_all_servers(launcher_paths) + .into_iter() + .map(|s| s.server_paths(launcher_paths)) + .filter(|s| s.get_running_pid().is_none()) + .map(|s| s.delete().map(|_| s)) + .collect::>() + .map_err(AnyError::from) +} + +// Gets a list of all servers which look like they might be running. +pub fn get_all_servers(lp: &LauncherPaths) -> Vec { + let mut servers: Vec = vec![]; + let mut server = InstalledServer { + commit: "".to_owned(), + headless: false, + quality: options::Quality::Stable, + }; + + add_server_paths_in_folder(lp, &server, &mut servers); + + server.headless = true; + add_server_paths_in_folder(lp, &server, &mut servers); + + server.headless = false; + server.quality = options::Quality::Insiders; + add_server_paths_in_folder(lp, &server, &mut servers); + + server.headless = true; + add_server_paths_in_folder(lp, &server, &mut servers); + + servers +} + +fn add_server_paths_in_folder( + lp: &LauncherPaths, + server: &InstalledServer, + servers: &mut Vec, +) { + let dir = server.get_install_folder(lp).join("bin"); + if let Ok(children) = read_dir(dir) { + for bin in children.flatten() { + servers.push(InstalledServer { + quality: server.quality, + headless: server.headless, + commit: bin.file_name().to_string_lossy().into(), + }); + } + } +} diff --git a/cli/src/tunnels/port_forwarder.rs b/cli/src/tunnels/port_forwarder.rs new file mode 100644 index 00000000000..9c79bebd22f --- /dev/null +++ b/cli/src/tunnels/port_forwarder.rs @@ -0,0 +1,130 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::collections::HashSet; + +use tokio::sync::{mpsc, oneshot}; + +use crate::{ + constants::CONTROL_PORT, + util::errors::{AnyError, CannotForwardControlPort, ServerHasClosed}, +}; + +use super::dev_tunnels::ActiveTunnel; + +pub enum PortForwardingRec { + Forward(u16, oneshot::Sender>), + Unforward(u16, oneshot::Sender>), +} + +/// Provides a port forwarding service for connected clients. Clients can make +/// requests on it, which are (and *must be*) processed by calling the `.process()` +/// method on the forwarder. +pub struct PortForwardingProcessor { + tx: mpsc::Sender, + rx: mpsc::Receiver, + forwarded: HashSet, +} + +impl PortForwardingProcessor { + pub fn new() -> Self { + let (tx, rx) = mpsc::channel(8); + Self { + tx, + rx, + forwarded: HashSet::new(), + } + } + + /// Gets a handle that can be passed off to consumers of port forwarding. + pub fn handle(&self) -> PortForwarding { + PortForwarding { + tx: self.tx.clone(), + } + } + + /// Receives port forwarding requests. Consumers MUST call `process()` + /// with the received requests. + pub async fn recv(&mut self) -> Option { + self.rx.recv().await + } + + /// Processes the incoming forwarding request. + pub async fn process(&mut self, req: PortForwardingRec, tunnel: &mut ActiveTunnel) { + match req { + PortForwardingRec::Forward(port, tx) => { + tx.send(self.process_forward(port, tunnel).await).ok(); + } + PortForwardingRec::Unforward(port, tx) => { + tx.send(self.process_unforward(port, tunnel).await).ok(); + } + } + } + + async fn process_unforward( + &mut self, + port: u16, + tunnel: &mut ActiveTunnel, + ) -> Result<(), AnyError> { + if port == CONTROL_PORT { + return Err(CannotForwardControlPort().into()); + } + + tunnel.remove_port(port).await?; + self.forwarded.remove(&port); + Ok(()) + } + + async fn process_forward( + &mut self, + port: u16, + tunnel: &mut ActiveTunnel, + ) -> Result { + if port == CONTROL_PORT { + return Err(CannotForwardControlPort().into()); + } + + if !self.forwarded.contains(&port) { + tunnel.add_port_tcp(port).await?; + self.forwarded.insert(port); + } + + tunnel.get_port_uri(port).await + } +} + +pub struct PortForwarding { + tx: mpsc::Sender, +} + +impl PortForwarding { + pub async fn forward(&self, port: u16) -> Result { + let (tx, rx) = oneshot::channel(); + let req = PortForwardingRec::Forward(port, tx); + + if self.tx.send(req).await.is_err() { + return Err(ServerHasClosed().into()); + } + + match rx.await { + Ok(r) => r, + Err(_) => Err(ServerHasClosed().into()), + } + } + + pub async fn unforward(&self, port: u16) -> Result<(), AnyError> { + let (tx, rx) = oneshot::channel(); + let req = PortForwardingRec::Unforward(port, tx); + + if self.tx.send(req).await.is_err() { + return Err(ServerHasClosed().into()); + } + + match rx.await { + Ok(r) => r, + Err(_) => Err(ServerHasClosed().into()), + } + } +} diff --git a/cli/src/tunnels/protocol.rs b/cli/src/tunnels/protocol.rs new file mode 100644 index 00000000000..e4751ffb45c --- /dev/null +++ b/cli/src/tunnels/protocol.rs @@ -0,0 +1,151 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use std::collections::HashMap; + +use crate::options::Quality; +use serde::{Deserialize, Serialize}; + +#[derive(Deserialize, Debug)] +#[serde(tag = "method", content = "params")] +#[allow(non_camel_case_types)] +pub enum ServerRequestMethod { + serve(ServeParams), + prune, + ping(EmptyResult), + forward(ForwardParams), + unforward(UnforwardParams), + gethostname(EmptyResult), + update(UpdateParams), + servermsg(ServerMessageParams), + callserverhttp(CallServerHttpParams), +} + +#[derive(Serialize, Debug)] +#[serde(tag = "method", content = "params", rename_all = "camelCase")] +#[allow(non_camel_case_types)] +pub enum ClientRequestMethod<'a> { + servermsg(RefServerMessageParams<'a>), + serverlog(ServerLog<'a>), + version(VersionParams), +} + +#[derive(Deserialize, Debug)] +pub struct ForwardParams { + pub port: u16, +} + +#[derive(Deserialize, Debug)] +pub struct UnforwardParams { + pub port: u16, +} + +#[derive(Serialize)] +pub struct ForwardResult { + pub uri: String, +} + +#[derive(Deserialize, Debug)] +pub struct ServeParams { + pub socket_id: u16, + pub commit_id: Option, + pub quality: Quality, + pub extensions: Vec, +} + +#[derive(Deserialize, Serialize, Debug)] +pub struct EmptyResult {} + +#[derive(Serialize, Deserialize, Debug)] +pub struct UpdateParams { + pub do_update: bool, +} + +#[derive(Deserialize, Debug)] +pub struct ServerMessageParams { + pub i: u16, + #[serde(with = "serde_bytes")] + pub body: Vec, +} + +#[derive(Serialize, Debug)] +pub struct RefServerMessageParams<'a> { + pub i: u16, + #[serde(with = "serde_bytes")] + pub body: &'a [u8], +} + +#[derive(Serialize)] +pub struct UpdateResult { + pub up_to_date: bool, + pub did_update: bool, +} + +#[derive(Deserialize, Debug)] +pub struct ToServerRequest { + pub id: Option, + #[serde(flatten)] + pub params: ServerRequestMethod, +} + +#[derive(Serialize, Debug)] +pub struct ToClientRequest<'a> { + pub id: Option, + #[serde(flatten)] + pub params: ClientRequestMethod<'a>, +} + +#[derive(Serialize, Deserialize)] +pub struct SuccessResponse +where + T: Serialize, +{ + pub id: u8, + pub result: T, +} + +#[derive(Serialize, Deserialize)] +pub struct ErrorResponse { + pub id: u8, + pub error: ResponseError, +} + +#[derive(Serialize, Deserialize)] +pub struct ResponseError { + pub code: i32, + pub message: String, +} + +#[derive(Debug, Default, Serialize)] +pub struct ServerLog<'a> { + pub line: &'a str, + pub level: u8, +} + +#[derive(Serialize)] +pub struct GetHostnameResponse { + pub value: String, +} + +#[derive(Deserialize, Debug)] +pub struct CallServerHttpParams { + pub path: String, + pub method: String, + pub headers: HashMap, + pub body: Option>, +} + +#[derive(Serialize)] +pub struct CallServerHttpResult { + pub status: u16, + #[serde(with = "serde_bytes")] + pub body: Vec, + pub headers: HashMap, +} + +#[derive(Serialize, Debug)] +pub struct VersionParams { + pub version: &'static str, + pub protocol_version: u32, +} diff --git a/cli/src/tunnels/server_bridge_unix.rs b/cli/src/tunnels/server_bridge_unix.rs new file mode 100644 index 00000000000..f584ddfddc9 --- /dev/null +++ b/cli/src/tunnels/server_bridge_unix.rs @@ -0,0 +1,80 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use std::path::Path; + +use tokio::{ + io::{AsyncReadExt, AsyncWriteExt}, + net::{unix::OwnedWriteHalf, UnixStream}, + sync::mpsc::Sender, +}; + +use crate::util::errors::{wrap, AnyError}; + +pub struct ServerBridge { + write: OwnedWriteHalf, +} + +pub trait FromServerMessage { + fn from_server_message(index: u16, message: &[u8]) -> Self; + fn from_closed_server_bridge(i: u16) -> Self; +} + +pub async fn get_socket_rw_stream(path: &Path) -> Result { + let s = UnixStream::connect(path).await.map_err(|e| { + wrap( + e, + format!( + "error connecting to vscode server socket in {}", + path.display() + ), + ) + })?; + + Ok(s) +} + +const BUFFER_SIZE: usize = 65536; + +impl ServerBridge { + pub async fn new(path: &Path, index: u16, target: &Sender) -> Result + where + T: 'static + FromServerMessage + Send, + { + let stream = get_socket_rw_stream(path).await?; + let (mut read, write) = stream.into_split(); + + let tx = target.clone(); + tokio::spawn(async move { + let mut read_buf = vec![0; BUFFER_SIZE]; + loop { + match read.read(&mut read_buf).await { + Err(_) => return, + Ok(0) => { + let _ = tx.send(T::from_closed_server_bridge(index)).await; + return; // EOF + } + Ok(s) => { + let send = tx.send(T::from_server_message(index, &read_buf[..s])).await; + if send.is_err() { + return; + } + } + } + } + }); + + Ok(ServerBridge { write }) + } + + pub async fn write(&mut self, b: Vec) -> std::io::Result<()> { + self.write.write_all(&b).await?; + Ok(()) + } + + pub async fn close(mut self) -> std::io::Result<()> { + self.write.shutdown().await?; + Ok(()) + } +} diff --git a/cli/src/tunnels/server_bridge_windows.rs b/cli/src/tunnels/server_bridge_windows.rs new file mode 100644 index 00000000000..fb4b2b321f0 --- /dev/null +++ b/cli/src/tunnels/server_bridge_windows.rs @@ -0,0 +1,133 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::{path::Path, time::Duration}; + +use tokio::{ + io::{self, Interest}, + net::windows::named_pipe::{ClientOptions, NamedPipeClient}, + sync::mpsc, + time::sleep, +}; + +use crate::util::errors::{wrap, AnyError}; + +pub struct ServerBridge { + write_tx: mpsc::Sender>, +} + +pub trait FromServerMessage { + fn from_server_message(index: u16, message: &[u8]) -> Self; + fn from_closed_server_bridge(i: u16) -> Self; +} + +const BUFFER_SIZE: usize = 65536; + +pub async fn get_socket_rw_stream(path: &Path) -> Result { + // Tokio says we can need to try in a loop. Do so. + // https://docs.rs/tokio/latest/tokio/net/windows/named_pipe/struct.NamedPipeClient.html + let client = loop { + match ClientOptions::new().open(path) { + Ok(client) => break client, + // ERROR_PIPE_BUSY https://docs.microsoft.com/en-us/windows/win32/debug/system-error-codes--0-499- + Err(e) if e.raw_os_error() == Some(231) => sleep(Duration::from_millis(100)).await, + Err(e) => { + return Err(AnyError::WrappedError(wrap( + e, + format!( + "error connecting to vscode server socket in {}", + path.display() + ), + ))) + } + } + }; + + Ok(client) +} + +impl ServerBridge { + pub async fn new(path: &Path, index: u16, target: &mpsc::Sender) -> Result + where + T: 'static + FromServerMessage + Send, + { + let client = get_socket_rw_stream(path).await?; + let (write_tx, mut write_rx) = mpsc::channel(4); + let read_tx = target.clone(); + tokio::spawn(async move { + let mut read_buf = vec![0; BUFFER_SIZE]; + let mut pending_recv: Option> = None; + + // See https://docs.rs/tokio/1.17.0/tokio/net/windows/named_pipe/struct.NamedPipeClient.html#method.ready + // With additional complications. If there's nothing queued to write, we wait for the + // pipe to be readable, or for something to come in. If there is something to + // write, wait until the pipe is either readable or writable. + loop { + let ready_result = if pending_recv.is_none() { + tokio::select! { + msg = write_rx.recv() => match msg { + Some(msg) => { + pending_recv = Some(msg); + client.ready(Interest::READABLE | Interest::WRITABLE).await + }, + None => return + }, + r = client.ready(Interest::READABLE) => r, + } + } else { + client.ready(Interest::READABLE | Interest::WRITABLE).await + }; + + let ready = match ready_result { + Ok(r) => r, + Err(_) => return, + }; + + if ready.is_readable() { + match client.try_read(&mut read_buf) { + Ok(0) => return, // EOF + Ok(s) => { + let send = read_tx + .send(T::from_server_message(index, &read_buf[..s])) + .await; + if send.is_err() { + return; + } + } + Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => { + continue; + } + Err(_) => return, + } + } + + if let Some(msg) = &pending_recv { + if ready.is_writable() { + match client.try_write(msg) { + Ok(n) if n == msg.len() => pending_recv = None, + Ok(n) => pending_recv = Some(msg[n..].to_vec()), + Err(e) if e.kind() == io::ErrorKind::WouldBlock => { + continue; + } + Err(_) => return, + } + } + } + } + }); + + Ok(ServerBridge { write_tx }) + } + + pub async fn write(&self, b: Vec) -> std::io::Result<()> { + self.write_tx.send(b).await.ok(); + Ok(()) + } + + pub async fn close(self) -> std::io::Result<()> { + drop(self.write_tx); + Ok(()) + } +} diff --git a/cli/src/tunnels/service.rs b/cli/src/tunnels/service.rs new file mode 100644 index 00000000000..8085f3b069a --- /dev/null +++ b/cli/src/tunnels/service.rs @@ -0,0 +1,82 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::path::PathBuf; + +use async_trait::async_trait; +use tokio::sync::mpsc; + +use crate::commands::tunnels::ShutdownSignal; +use crate::log; +use crate::state::LauncherPaths; +use crate::util::errors::AnyError; + +pub const SERVICE_LOG_FILE_NAME: &str = "tunnel-service.log"; + +#[async_trait] +pub trait ServiceContainer: Send { + async fn run_service( + &mut self, + log: log::Logger, + launcher_paths: LauncherPaths, + shutdown_rx: mpsc::Receiver, + ) -> Result<(), AnyError>; +} + +pub trait ServiceManager { + /// Registers the current executable as a service to run with the given set + /// of arguments. + fn register(&self, exe: PathBuf, args: &[&str]) -> Result<(), AnyError>; + + /// Runs the service using the given handle. The executable *must not* take + /// any action which may fail prior to calling this to ensure service + /// states may update. + fn run( + &self, + launcher_paths: LauncherPaths, + handle: impl 'static + ServiceContainer, + ) -> Result<(), AnyError>; + + /// Unregisters the current executable as a service. + fn unregister(&self) -> Result<(), AnyError>; +} + +#[cfg(target_os = "windows")] +pub type ServiceManagerImpl = super::service_windows::WindowsService; + +#[cfg(not(target_os = "windows"))] +pub type ServiceManagerImpl = UnimplementedServiceManager; + +#[allow(unreachable_code)] +pub fn create_service_manager(log: log::Logger) -> ServiceManagerImpl { + ServiceManagerImpl::new(log) +} + +pub struct UnimplementedServiceManager(); + +#[allow(dead_code)] +impl UnimplementedServiceManager { + fn new(_log: log::Logger) -> Self { + Self() + } +} + +impl ServiceManager for UnimplementedServiceManager { + fn register(&self, _exe: PathBuf, _args: &[&str]) -> Result<(), AnyError> { + unimplemented!("Service management is not supported on this platform"); + } + + fn run( + &self, + _launcher_paths: LauncherPaths, + _handle: impl 'static + ServiceContainer, + ) -> Result<(), AnyError> { + unimplemented!("Service management is not supported on this platform"); + } + + fn unregister(&self) -> Result<(), AnyError> { + unimplemented!("Service management is not supported on this platform"); + } +} diff --git a/cli/src/tunnels/service_windows.rs b/cli/src/tunnels/service_windows.rs new file mode 100644 index 00000000000..3d011dfa22b --- /dev/null +++ b/cli/src/tunnels/service_windows.rs @@ -0,0 +1,280 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use dialoguer::{theme::ColorfulTheme, Input, Password}; +use lazy_static::lazy_static; +use std::{ffi::OsString, sync::Mutex, thread, time::Duration}; +use tokio::sync::mpsc; +use windows_service::{ + define_windows_service, + service::{ + ServiceAccess, ServiceControl, ServiceControlAccept, ServiceErrorControl, ServiceExitCode, + ServiceInfo, ServiceStartType, ServiceState, ServiceStatus, ServiceType, + }, + service_control_handler::{self, ServiceControlHandlerResult}, + service_dispatcher, + service_manager::{ServiceManager, ServiceManagerAccess}, +}; + +use crate::{ + commands::tunnels::ShutdownSignal, + util::errors::{wrap, AnyError, WindowsNeedsElevation}, +}; +use crate::{ + log::{self, FileLogSink}, + state::LauncherPaths, +}; + +use super::service::{ + ServiceContainer, ServiceManager as CliServiceManager, SERVICE_LOG_FILE_NAME, +}; + +pub struct WindowsService { + log: log::Logger, +} + +const SERVICE_NAME: &str = "code_tunnel"; +const SERVICE_TYPE: ServiceType = ServiceType::OWN_PROCESS; + +impl WindowsService { + pub fn new(log: log::Logger) -> Self { + Self { log } + } +} + +impl CliServiceManager for WindowsService { + fn register(&self, exe: std::path::PathBuf, args: &[&str]) -> Result<(), AnyError> { + let service_manager = ServiceManager::local_computer( + None::<&str>, + ServiceManagerAccess::CONNECT | ServiceManagerAccess::CREATE_SERVICE, + ) + .map_err(|e| WindowsNeedsElevation(format!("error getting service manager: {}", e)))?; + + let mut service_info = ServiceInfo { + name: OsString::from(SERVICE_NAME), + display_name: OsString::from("VS Code Tunnel"), + service_type: SERVICE_TYPE, + start_type: ServiceStartType::AutoStart, + error_control: ServiceErrorControl::Normal, + executable_path: exe, + launch_arguments: args.iter().map(OsString::from).collect(), + dependencies: vec![], + account_name: None, + account_password: None, + }; + + let existing_service = service_manager.open_service( + SERVICE_NAME, + ServiceAccess::QUERY_STATUS | ServiceAccess::START | ServiceAccess::CHANGE_CONFIG, + ); + let service = if let Ok(service) = existing_service { + service + .change_config(&service_info) + .map_err(|e| wrap(e, "error updating existing service"))?; + service + } else { + loop { + let (username, password) = prompt_credentials()?; + service_info.account_name = Some(format!(".\\{}", username).into()); + service_info.account_password = Some(password.into()); + + match service_manager.create_service( + &service_info, + ServiceAccess::CHANGE_CONFIG | ServiceAccess::START, + ) { + Ok(service) => break service, + Err(windows_service::Error::Winapi(e)) if Some(1057) == e.raw_os_error() => { + error!( + self.log, + "Invalid username or password, please try again..." + ); + } + Err(e) => return Err(wrap(e, "error registering service").into()), + } + } + }; + + service + .set_description("Service that runs `code tunnel` for access on vscode.dev") + .ok(); + + info!(self.log, "Successfully registered service..."); + + let status = service + .query_status() + .map(|s| s.current_state) + .unwrap_or(ServiceState::Stopped); + + if status == ServiceState::Stopped { + service + .start::<&str>(&[]) + .map_err(|e| wrap(e, "error starting service"))?; + } + + info!(self.log, "Tunnel service successfully started"); + Ok(()) + } + + #[allow(unused_must_use)] // triggers incorrectly on `define_windows_service!` + fn run( + &self, + launcher_paths: LauncherPaths, + handle: impl 'static + ServiceContainer, + ) -> Result<(), AnyError> { + let log = match FileLogSink::new( + log::Level::Debug, + &launcher_paths.root().join(SERVICE_LOG_FILE_NAME), + ) { + Ok(sink) => self.log.tee(sink), + Err(e) => { + warning!(self.log, "Failed to create service log file: {}", e); + self.log.clone() + } + }; + + // We put the handle into the global "impl" type and then take it out in + // my_service_main. This is needed just since we have to have that + // function at the root level, but need to pass in data later here... + SERVICE_IMPL.lock().unwrap().replace(ServiceImpl { + container: Box::new(handle), + launcher_paths, + log, + }); + + define_windows_service!(ffi_service_main, service_main); + + service_dispatcher::start(SERVICE_NAME, ffi_service_main) + .map_err(|e| wrap(e, "error starting service dispatcher").into()) + } + + fn unregister(&self) -> Result<(), AnyError> { + let service_manager = + ServiceManager::local_computer(None::<&str>, ServiceManagerAccess::CONNECT) + .map_err(|e| wrap(e, "error getting service manager"))?; + + let service = service_manager.open_service( + SERVICE_NAME, + ServiceAccess::QUERY_STATUS | ServiceAccess::STOP | ServiceAccess::DELETE, + ); + + let service = match service { + Ok(service) => service, + // Service does not exist: + Err(windows_service::Error::Winapi(e)) if Some(1060) == e.raw_os_error() => { + return Ok(()) + } + Err(e) => return Err(wrap(e, "error getting service handle").into()), + }; + + let service_status = service + .query_status() + .map_err(|e| wrap(e, "error getting service status"))?; + + if service_status.current_state != ServiceState::Stopped { + service + .stop() + .map_err(|e| wrap(e, "error getting stopping service"))?; + + while let Ok(ServiceState::Stopped) = service.query_status().map(|s| s.current_state) { + info!(self.log, "Polling for service to stop..."); + thread::sleep(Duration::from_secs(1)); + } + } + + service + .delete() + .map_err(|e| wrap(e, "error deleting service"))?; + + Ok(()) + } +} + +struct ServiceImpl { + container: Box, + launcher_paths: LauncherPaths, + log: log::Logger, +} + +lazy_static! { + static ref SERVICE_IMPL: Mutex> = Mutex::new(None); +} + +/// "main" function that the service calls in its own thread. +fn service_main(_arguments: Vec) -> Result<(), AnyError> { + let mut service = SERVICE_IMPL.lock().unwrap().take().unwrap(); + + // Create a channel to be able to poll a stop event from the service worker loop. + let (shutdown_tx, shutdown_rx) = mpsc::channel::(5); + let mut shutdown_tx = Some(shutdown_tx); + + // Define system service event handler that will be receiving service events. + let event_handler = move |control_event| -> ServiceControlHandlerResult { + match control_event { + ServiceControl::Interrogate => ServiceControlHandlerResult::NoError, + ServiceControl::Stop => { + shutdown_tx.take().and_then(|tx| tx.blocking_send(ShutdownSignal::ServiceStopped).ok()); + ServiceControlHandlerResult::NoError + } + _ => ServiceControlHandlerResult::NotImplemented, + } + }; + + let status_handle = service_control_handler::register(SERVICE_NAME, event_handler) + .map_err(|e| wrap(e, "error registering service event handler"))?; + + // Tell the system that service is running + status_handle + .set_service_status(ServiceStatus { + service_type: SERVICE_TYPE, + current_state: ServiceState::Running, + controls_accepted: ServiceControlAccept::STOP, + exit_code: ServiceExitCode::Win32(0), + checkpoint: 0, + wait_hint: Duration::default(), + process_id: None, + }) + .map_err(|e| wrap(e, "error marking service as running"))?; + + let result = tokio::runtime::Builder::new_multi_thread() + .enable_all() + .build() + .unwrap() + .block_on( + service + .container + .run_service(service.log, service.launcher_paths, shutdown_rx), + ); + + status_handle + .set_service_status(ServiceStatus { + service_type: SERVICE_TYPE, + current_state: ServiceState::Stopped, + controls_accepted: ServiceControlAccept::empty(), + exit_code: ServiceExitCode::Win32(0), + checkpoint: 0, + wait_hint: Duration::default(), + process_id: None, + }) + .map_err(|e| wrap(e, "error marking service as stopped"))?; + + result +} + +fn prompt_credentials() -> Result<(String, String), AnyError> { + println!("Running a Windows service under your user requires your username and password."); + println!("These are sent to the Windows Service Manager and are not stored by VS Code."); + + let username: String = Input::with_theme(&ColorfulTheme::default()) + .with_prompt("Windows username:") + .interact_text() + .map_err(|e| wrap(e, "Failed to read username"))?; + + let password = Password::with_theme(&ColorfulTheme::default()) + .with_prompt("Windows password:") + .interact() + .map_err(|e| wrap(e, "Failed to read password"))?; + + Ok((username, password)) +} diff --git a/cli/src/update_service.rs b/cli/src/update_service.rs new file mode 100644 index 00000000000..3c1456ecc59 --- /dev/null +++ b/cli/src/update_service.rs @@ -0,0 +1,307 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::path::Path; + +use serde::Deserialize; + +use crate::{ + constants::VSCODE_CLI_UPDATE_ENDPOINT, + debug, log, options, spanf, + util::{ + errors::{ + AnyError, StatusError, UnsupportedPlatformError, UpdatesNotConfigured, WrappedError, + }, + io::ReportCopyProgress, + }, +}; + +/// Implementation of the VS Code Update service for use in the CLI. +pub struct UpdateService { + client: reqwest::Client, + log: log::Logger, +} + +/// Describes a specific release, can be created manually or returned from the update service. +pub struct Release { + pub name: String, + pub platform: Platform, + pub target: TargetKind, + pub quality: options::Quality, + pub commit: String, +} + +impl std::fmt::Display for Release { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "{} (commit {})", self.name, self.commit) + } +} + +#[derive(Deserialize)] +struct UpdateServerVersion { + pub version: String, + pub name: String, +} + +fn quality_download_segment(quality: options::Quality) -> &'static str { + match quality { + options::Quality::Stable => "stable", + options::Quality::Insiders => "insider", + options::Quality::Exploration => "exploration", + } +} + +impl UpdateService { + pub fn new(log: log::Logger, client: reqwest::Client) -> Self { + UpdateService { client, log } + } + + pub async fn get_release_by_semver_version( + &self, + platform: Platform, + target: TargetKind, + quality: options::Quality, + version: &str, + ) -> Result { + let update_endpoint = + VSCODE_CLI_UPDATE_ENDPOINT.ok_or_else(UpdatesNotConfigured::no_url)?; + let download_segment = target + .download_segment(platform) + .ok_or(UnsupportedPlatformError())?; + let download_url = format!( + "{}/api/versions/{}/{}/{}", + update_endpoint, + version, + download_segment, + quality_download_segment(quality), + ); + + let response = spanf!( + self.log, + self.log.span("server.version.resolve"), + self.client.get(download_url).send() + )?; + + if !response.status().is_success() { + return Err(StatusError::from_res(response).await?.into()); + } + + let res = response.json::().await?; + debug!(self.log, "Resolved version {} to {}", version, res.version); + + Ok(Release { + target, + platform, + quality, + name: res.name, + commit: res.version, + }) + } + + /// Gets the latest commit for the target of the given quality. + pub async fn get_latest_commit( + &self, + platform: Platform, + target: TargetKind, + quality: options::Quality, + ) -> Result { + let update_endpoint = + VSCODE_CLI_UPDATE_ENDPOINT.ok_or_else(UpdatesNotConfigured::no_url)?; + let download_segment = target + .download_segment(platform) + .ok_or(UnsupportedPlatformError())?; + let download_url = format!( + "{}/api/latest/{}/{}", + update_endpoint, + download_segment, + quality_download_segment(quality), + ); + + let response = spanf!( + self.log, + self.log.span("server.version.resolve"), + self.client.get(download_url).send() + )?; + + if !response.status().is_success() { + return Err(StatusError::from_res(response).await?.into()); + } + + let res = response.json::().await?; + debug!(self.log, "Resolved quality {} to {}", quality, res.version); + + Ok(Release { + target, + platform, + quality, + name: res.name, + commit: res.version, + }) + } + + /// Gets the download stream for the release. + pub async fn get_download_stream( + &self, + release: &Release, + ) -> Result { + let update_endpoint = + VSCODE_CLI_UPDATE_ENDPOINT.ok_or_else(UpdatesNotConfigured::no_url)?; + let download_segment = release + .target + .download_segment(release.platform) + .ok_or(UnsupportedPlatformError())?; + + let download_url = format!( + "{}/commit:{}/{}/{}", + update_endpoint, + release.commit, + download_segment, + quality_download_segment(release.quality), + ); + + let response = reqwest::get(&download_url).await?; + if !response.status().is_success() { + return Err(StatusError::from_res(response).await?.into()); + } + + Ok(response) + } +} + +pub fn unzip_downloaded_release( + compressed_file: &Path, + target_dir: &Path, + reporter: T, +) -> Result<(), WrappedError> +where + T: ReportCopyProgress, +{ + #[cfg(any(target_os = "windows", target_os = "macos"))] + { + use crate::util::zipper; + zipper::unzip_file(compressed_file, target_dir, reporter) + } + #[cfg(target_os = "linux")] + { + use crate::util::tar; + tar::decompress_tarball(compressed_file, target_dir, reporter) + } +} + +#[derive(Eq, PartialEq, Copy, Clone)] +pub enum TargetKind { + Server, + Archive, + Web, + Cli, +} + +impl TargetKind { + fn download_segment(&self, platform: Platform) -> Option { + match *self { + TargetKind::Server => Some(platform.headless()), + TargetKind::Archive => platform.archive(), + TargetKind::Web => Some(platform.web()), + TargetKind::Cli => Some(platform.cli()), + } + } +} + +#[derive(Debug, Copy, Clone)] +pub enum Platform { + LinuxAlpineX64, + LinuxAlpineARM64, + LinuxX64, + LinuxARM64, + LinuxARM32, + DarwinX64, + DarwinARM64, + WindowsX64, + WindowsX86, + WindowsARM64 +} + +impl Platform { + pub fn archive(&self) -> Option { + match self { + Platform::LinuxX64 => Some("linux-x64".to_owned()), + Platform::LinuxARM64 => Some("linux-arm64".to_owned()), + Platform::LinuxARM32 => Some("linux-armhf".to_owned()), + Platform::DarwinX64 => Some("darwin".to_owned()), + Platform::DarwinARM64 => Some("darwin-arm64".to_owned()), + Platform::WindowsX64 => Some("win32-x64-archive".to_owned()), + Platform::WindowsX86 => Some("win32-archive".to_owned()), + Platform::WindowsARM64 => Some("win32-arm64-archive".to_owned()), + _ => None, + } + } + pub fn headless(&self) -> String { + match self { + Platform::LinuxAlpineARM64 => "server-alpine-arm64", + Platform::LinuxAlpineX64 => "server-linux-alpine", + Platform::LinuxX64 => "server-linux-x64", + Platform::LinuxARM64 => "server-linux-arm64", + Platform::LinuxARM32 => "server-linux-armhf", + Platform::DarwinX64 => "server-darwin", + Platform::DarwinARM64 => "server-darwin-arm64", + Platform::WindowsX64 => "server-win32-x64", + Platform::WindowsX86 => "server-win32", + Platform::WindowsARM64 => "server-win32-arm64", + } + .to_owned() + } + + pub fn cli(&self) -> String { + match self { + Platform::LinuxAlpineARM64 => "cli-alpine-arm64", + Platform::LinuxAlpineX64 => "cli-alpine-x64", + Platform::LinuxX64 => "cli-linux-x64", + Platform::LinuxARM64 => "cli-linux-arm64", + Platform::LinuxARM32 => "cli-linux-armhf", + Platform::DarwinX64 => "cli-darwin-x64", + Platform::DarwinARM64 => "cli-darwin-arm64", + Platform::WindowsARM64 => "cli-win32-arm64", + Platform::WindowsX64 => "cli-win32-x64", + Platform::WindowsX86 => "cli-win32", + } + .to_owned() + } + + pub fn web(&self) -> String { + format!("{}-web", self.headless()) + } + + pub fn env_default() -> Option { + if cfg!(all( + target_os = "linux", + target_arch = "x86_64", + target_env = "musl" + )) { + Some(Platform::LinuxAlpineX64) + } else if cfg!(all( + target_os = "linux", + target_arch = "aarch64", + target_env = "musl" + )) { + Some(Platform::LinuxAlpineARM64) + } else if cfg!(all(target_os = "linux", target_arch = "x86_64")) { + Some(Platform::LinuxX64) + } else if cfg!(all(target_os = "linux", target_arch = "armhf")) { + Some(Platform::LinuxARM32) + } else if cfg!(all(target_os = "linux", target_arch = "aarch64")) { + Some(Platform::LinuxARM64) + } else if cfg!(all(target_os = "macos", target_arch = "x86_64")) { + Some(Platform::DarwinX64) + } else if cfg!(all(target_os = "macos", target_arch = "aarch64")) { + Some(Platform::DarwinARM64) + } else if cfg!(all(target_os = "windows", target_arch = "x86_64")) { + Some(Platform::WindowsX64) + } else if cfg!(all(target_os = "windows", target_arch = "x86")) { + Some(Platform::WindowsX86) + } else { + None + } + } +} diff --git a/cli/src/util.rs b/cli/src/util.rs new file mode 100644 index 00000000000..2ed47f2f263 --- /dev/null +++ b/cli/src/util.rs @@ -0,0 +1,22 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +mod is_integrated; + +pub mod command; +pub mod errors; +pub mod http; +pub mod input; +pub mod io; +pub mod machine; +pub mod prereqs; +pub mod sync; +pub use is_integrated::*; + +#[cfg(target_os = "linux")] +pub mod tar; + +#[cfg(any(target_os = "windows", target_os = "macos"))] +pub mod zipper; diff --git a/cli/src/util/command.rs b/cli/src/util/command.rs new file mode 100644 index 00000000000..7a7795e1590 --- /dev/null +++ b/cli/src/util/command.rs @@ -0,0 +1,77 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use super::errors::{wrap, WrappedError}; +use std::{ffi::OsStr, process::Stdio}; +use tokio::process::Command; + +pub async fn capture_command( + command_str: A, + args: I, +) -> Result +where + A: AsRef, + I: IntoIterator, + S: AsRef, +{ + Command::new(&command_str) + .args(args) + .stdin(Stdio::null()) + .stdout(Stdio::piped()) + .output() + .await + .map_err(|e| { + wrap( + e, + format!( + "failed to execute command '{}'", + command_str.as_ref().to_string_lossy() + ), + ) + }) +} + +/// Kills and processes and all of its children. +#[cfg(target_os = "windows")] +pub async fn kill_tree(process_id: u32) -> Result<(), WrappedError> { + capture_command("taskkill", &["/t", "/pid", &process_id.to_string()]).await?; + Ok(()) +} + +/// Kills and processes and all of its children. +#[cfg(not(target_os = "windows"))] +pub async fn kill_tree(process_id: u32) -> Result<(), WrappedError> { + use futures::future::join_all; + use tokio::io::{AsyncBufReadExt, BufReader}; + + async fn kill_single_pid(process_id_str: String) { + capture_command("kill", &[&process_id_str]).await.ok(); + } + + // Rusty version of https://github.com/microsoft/vscode-js-debug/blob/main/src/targets/node/terminateProcess.sh + + let parent_id = process_id.to_string(); + let mut prgrep_cmd = Command::new("pgrep") + .arg("-P") + .arg(&parent_id) + .stdin(Stdio::null()) + .stdout(Stdio::piped()) + .spawn() + .map_err(|e| wrap(e, "error enumerating process tree"))?; + + let mut kill_futures = vec![tokio::spawn( + async move { kill_single_pid(parent_id).await }, + )]; + + if let Some(stdout) = prgrep_cmd.stdout.take() { + let mut reader = BufReader::new(stdout).lines(); + while let Some(line) = reader.next_line().await.unwrap_or(None) { + kill_futures.push(tokio::spawn(async move { kill_single_pid(line).await })) + } + } + + join_all(kill_futures).await; + prgrep_cmd.kill().await.ok(); + Ok(()) +} diff --git a/cli/src/util/errors.rs b/cli/src/util/errors.rs new file mode 100644 index 00000000000..31fba617b5e --- /dev/null +++ b/cli/src/util/errors.rs @@ -0,0 +1,443 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use std::fmt::Display; + +use crate::constants::CONTROL_PORT; + +// Wraps another error with additional info. +#[derive(Debug, Clone)] +pub struct WrappedError { + message: String, + original: String, +} + +impl std::fmt::Display for WrappedError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "{}: {}", self.message, self.original) + } +} + +impl std::error::Error for WrappedError { + fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { + None + } +} + +impl WrappedError { + // fn new(original: Box, message: String) -> WrappedError { + // WrappedError { message, original } + // } +} + +impl From for WrappedError { + fn from(e: reqwest::Error) -> WrappedError { + WrappedError { + message: format!( + "error requesting {}", + e.url().map_or("", |u| u.as_str()) + ), + original: format!("{}", e), + } + } +} + +pub fn wrap(original: T, message: S) -> WrappedError +where + T: Display, + S: Into, +{ + WrappedError { + message: message.into(), + original: format!("{}", original), + } +} + +// Error generated by an unsuccessful HTTP response +#[derive(Debug)] +pub struct StatusError { + url: String, + status_code: u16, + body: String, +} + +impl std::fmt::Display for StatusError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!( + f, + "error requesting {}: {} {}", + self.url, self.status_code, self.body + ) + } +} + +impl StatusError { + pub async fn from_res(res: reqwest::Response) -> Result { + let status_code = res.status().as_u16(); + let url = res.url().to_string(); + let body = res.text().await.map_err(|e| { + wrap( + e, + format!( + "failed to read response body on {} code from {}", + status_code, url + ), + ) + })?; + + Ok(StatusError { + url, + status_code, + body, + }) + } +} + +// When the user has not consented to the licensing terms in using the Launcher +#[derive(Debug)] +pub struct MissingLegalConsent(pub String); + +impl std::fmt::Display for MissingLegalConsent { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "{}", self.0) + } +} + +// When the provided connection token doesn't match the one used to set up the original VS Code Server +// This is most likely due to a new user joining. +#[derive(Debug)] +pub struct MismatchConnectionToken(pub String); + +impl std::fmt::Display for MismatchConnectionToken { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "{}", self.0) + } +} + +// When the VS Code server has an unrecognized extension (rather than zip or gz) +#[derive(Debug)] +pub struct InvalidServerExtensionError(pub String); + +impl std::fmt::Display for InvalidServerExtensionError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "invalid server extension '{}'", self.0) + } +} + +// When the tunnel fails to open +#[derive(Debug, Clone)] +pub struct DevTunnelError(pub String); + +impl std::fmt::Display for DevTunnelError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "could not open tunnel: {}", self.0) + } +} + +impl std::error::Error for DevTunnelError { + fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { + None + } +} + +// When the server was downloaded, but the entrypoint scripts don't exist. +#[derive(Debug)] +pub struct MissingEntrypointError(); + +impl std::fmt::Display for MissingEntrypointError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "Missing entrypoints in server download. Most likely this is a corrupted download. Please retry") + } +} + +#[derive(Debug)] +pub struct SetupError(pub String); + +impl std::fmt::Display for SetupError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!( + f, + "{}\r\n\r\nMore info at https://code.visualstudio.com/docs/remote/linux", + self.0 + ) + } +} + +#[derive(Debug)] +pub struct NoHomeForLauncherError(); + +impl std::fmt::Display for NoHomeForLauncherError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!( + f, + "No $HOME variable was found in your environment. Either set it, or specify a `--data-dir` manually when invoking the launcher.", + ) + } +} + +#[derive(Debug)] +pub struct InvalidTunnelName(pub String); + +impl std::fmt::Display for InvalidTunnelName { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "{}", &self.0) + } +} + +#[derive(Debug)] +pub struct TunnelCreationFailed(pub String, pub String); + +impl std::fmt::Display for TunnelCreationFailed { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!( + f, + "Could not create tunnel with name: {}\nReason: {}", + &self.0, &self.1 + ) + } +} + +#[derive(Debug)] +pub struct TunnelHostFailed(pub String); + +impl std::fmt::Display for TunnelHostFailed { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "{}", &self.0) + } +} + +#[derive(Debug)] +pub struct ExtensionInstallFailed(pub String); + +impl std::fmt::Display for ExtensionInstallFailed { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "Extension install failed: {}", &self.0) + } +} + +#[derive(Debug)] +pub struct MismatchedLaunchModeError(); + +impl std::fmt::Display for MismatchedLaunchModeError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "A server is already running, but it was not launched in the same listening mode (port vs. socket) as this request") + } +} + +#[derive(Debug)] +pub struct NoAttachedServerError(); + +impl std::fmt::Display for NoAttachedServerError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "No server is running") + } +} + +#[derive(Debug)] +pub struct ServerWriteError(); + +impl std::fmt::Display for ServerWriteError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "Error writing to the server, it should be restarted") + } +} + +#[derive(Debug)] +pub struct RefreshTokenNotAvailableError(); + +impl std::fmt::Display for RefreshTokenNotAvailableError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "Refresh token not available, authentication is required") + } +} + +#[derive(Debug)] +pub struct UnsupportedPlatformError(); + +impl std::fmt::Display for UnsupportedPlatformError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!( + f, + "This operation is not supported on your current platform" + ) + } +} + +#[derive(Debug)] +pub struct NoInstallInUserProvidedPath(pub String); + +impl std::fmt::Display for NoInstallInUserProvidedPath { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!( + f, + "No VS Code installation could be found in {}. You can run `code --use-quality=stable` to switch to the latest stable version of VS Code.", + self.0 + ) + } +} + +#[derive(Debug)] +pub struct InvalidRequestedVersion(); + +impl std::fmt::Display for InvalidRequestedVersion { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!( + f, + "The reqested version is invalid, expected one of 'stable', 'insiders', version number (x.y.z), or absolute path.", + ) + } +} + +#[derive(Debug)] +pub struct UserCancelledInstallation(); + +impl std::fmt::Display for UserCancelledInstallation { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "Installation aborted.") + } +} + +#[derive(Debug)] +pub struct CannotForwardControlPort(); + +impl std::fmt::Display for CannotForwardControlPort { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "Cannot forward or unforward port {}.", CONTROL_PORT) + } +} + +#[derive(Debug)] +pub struct ServerHasClosed(); + +impl std::fmt::Display for ServerHasClosed { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "Request cancelled because the server has closed") + } +} + +#[derive(Debug)] +pub struct UpdatesNotConfigured(pub String); + +impl UpdatesNotConfigured { + pub fn no_url() -> Self { + UpdatesNotConfigured("no service url".to_owned()) + } +} + +impl std::fmt::Display for UpdatesNotConfigured { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "Update service is not configured: {}", self.0) + } +} +#[derive(Debug)] +pub struct ServiceAlreadyRegistered(); + +impl std::fmt::Display for ServiceAlreadyRegistered { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "Already registered the service. Run `code tunnel service uninstall` to unregister it first") + } +} + +#[derive(Debug)] +pub struct WindowsNeedsElevation(pub String); + +impl std::fmt::Display for WindowsNeedsElevation { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + writeln!(f, "{}", self.0)?; + writeln!(f)?; + writeln!(f, "You may need to run this command as an administrator:")?; + writeln!(f, " 1. Open the start menu and search for Powershell")?; + writeln!(f, " 2. Right click and 'Run as administrator'")?; + if let Ok(exe) = std::env::current_exe() { + writeln!( + f, + " 3. Run &'{}' '{}'", + exe.display(), + std::env::args().skip(1).collect::>().join("' '") + ) + } else { + writeln!(f, " 3. Run the same command again",) + } + } +} + +#[derive(Debug)] +pub struct CorruptDownload(pub String); + +impl std::fmt::Display for CorruptDownload { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "Error updating the VS Code CLI: {}", self.0) + } +} + +// Makes an "AnyError" enum that contains any of the given errors, in the form +// `enum AnyError { FooError(FooError) }` (when given `makeAnyError!(FooError)`). +// Useful to easily deal with application error types without making tons of "From" +// clauses. +macro_rules! makeAnyError { + ($($e:ident),*) => { + + #[derive(Debug)] + #[allow(clippy::enum_variant_names)] + pub enum AnyError { + $($e($e),)* + } + + impl std::fmt::Display for AnyError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + match *self { + $(AnyError::$e(ref e) => e.fmt(f),)* + } + } + } + + impl std::error::Error for AnyError { + fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { + None + } + } + + $(impl From<$e> for AnyError { + fn from(e: $e) -> AnyError { + AnyError::$e(e) + } + })* + }; +} + +makeAnyError!( + MissingLegalConsent, + MismatchConnectionToken, + DevTunnelError, + StatusError, + WrappedError, + InvalidServerExtensionError, + MissingEntrypointError, + SetupError, + NoHomeForLauncherError, + TunnelCreationFailed, + TunnelHostFailed, + InvalidTunnelName, + ExtensionInstallFailed, + MismatchedLaunchModeError, + NoAttachedServerError, + ServerWriteError, + UnsupportedPlatformError, + RefreshTokenNotAvailableError, + NoInstallInUserProvidedPath, + UserCancelledInstallation, + InvalidRequestedVersion, + CannotForwardControlPort, + ServerHasClosed, + ServiceAlreadyRegistered, + WindowsNeedsElevation, + UpdatesNotConfigured, + CorruptDownload +); + +impl From for AnyError { + fn from(e: reqwest::Error) -> AnyError { + AnyError::WrappedError(WrappedError::from(e)) + } +} diff --git a/cli/src/util/http.rs b/cli/src/util/http.rs new file mode 100644 index 00000000000..2dfd5cbe65a --- /dev/null +++ b/cli/src/util/http.rs @@ -0,0 +1,36 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use crate::util::errors::{self, WrappedError}; +use futures::stream::TryStreamExt; +use tokio::fs; +use tokio_util::compat::FuturesAsyncReadCompatExt; + +use super::io::{copy_async_progress, ReportCopyProgress}; + +pub async fn download_into_file( + filename: &std::path::Path, + progress: T, + res: reqwest::Response, +) -> Result +where + T: ReportCopyProgress, +{ + let mut file = fs::File::create(filename) + .await + .map_err(|e| errors::wrap(e, "failed to create file"))?; + + let content_length = res.content_length().unwrap_or(0); + let mut read = res + .bytes_stream() + .map_err(|e| futures::io::Error::new(futures::io::ErrorKind::Other, e)) + .into_async_read() + .compat(); + + copy_async_progress(progress, &mut read, &mut file, content_length) + .await + .map_err(|e| errors::wrap(e, "failed to download file"))?; + + Ok(file) +} diff --git a/cli/src/util/input.rs b/cli/src/util/input.rs new file mode 100644 index 00000000000..5f1acd7a266 --- /dev/null +++ b/cli/src/util/input.rs @@ -0,0 +1,69 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use crate::util::errors::wrap; +use dialoguer::{theme::ColorfulTheme, Confirm, Input, Select}; +use indicatif::ProgressBar; +use std::fmt::Display; + +use super::{errors::WrappedError, io::ReportCopyProgress}; + +/// Wrapper around indicatif::ProgressBar that implements ReportCopyProgress. +pub struct ProgressBarReporter { + bar: ProgressBar, + has_set_total: bool, +} + +impl From for ProgressBarReporter { + fn from(bar: ProgressBar) -> Self { + ProgressBarReporter { + bar, + has_set_total: false, + } + } +} + +impl ReportCopyProgress for ProgressBarReporter { + fn report_progress(&mut self, bytes_so_far: u64, total_bytes: u64) { + if !self.has_set_total { + self.bar.set_length(total_bytes); + } + + if bytes_so_far == total_bytes { + self.bar.finish_and_clear(); + } else { + self.bar.set_position(bytes_so_far); + } + } +} + +pub fn prompt_yn(text: &str) -> Result { + Confirm::with_theme(&ColorfulTheme::default()) + .with_prompt(text) + .default(true) + .interact() + .map_err(|e| wrap(e, "Failed to read confirm input")) +} + +pub fn prompt_options(text: &str, options: &[T]) -> Result +where + T: Display + Copy, +{ + let chosen = Select::with_theme(&ColorfulTheme::default()) + .with_prompt(text) + .items(options) + .default(0) + .interact() + .map_err(|e| wrap(e, "Failed to read select input"))?; + + Ok(options[chosen]) +} + +pub fn prompt_placeholder(question: &str, placeholder: &str) -> Result { + Input::with_theme(&ColorfulTheme::default()) + .with_prompt(question) + .default(placeholder.to_string()) + .interact_text() + .map_err(|e| wrap(e, "Failed to read confirm input")) +} diff --git a/cli/src/util/io.rs b/cli/src/util/io.rs new file mode 100644 index 00000000000..c55a9135e12 --- /dev/null +++ b/cli/src/util/io.rs @@ -0,0 +1,59 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use std::io; + +use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt}; + +pub trait ReportCopyProgress { + fn report_progress(&mut self, bytes_so_far: u64, total_bytes: u64); +} + +/// Type that doesn't emit anything for download progress. +pub struct SilentCopyProgress(); + +impl ReportCopyProgress for SilentCopyProgress { + fn report_progress(&mut self, _bytes_so_far: u64, _total_bytes: u64) {} +} + +/// Copies from the reader to the writer, reporting progress to the provided +/// reporter every so often. +pub async fn copy_async_progress( + mut reporter: T, + reader: &mut R, + writer: &mut W, + total_bytes: u64, +) -> io::Result +where + R: AsyncRead + Unpin, + W: AsyncWrite + Unpin, + T: ReportCopyProgress, +{ + let mut buf = vec![0; 8 * 1024]; + let mut bytes_so_far = 0; + let mut bytes_last_reported = 0; + let report_granularity = std::cmp::min(total_bytes / 10, 2 * 1024 * 1024); + + reporter.report_progress(0, total_bytes); + + loop { + let read_buf = match reader.read(&mut buf).await { + Ok(0) => break, + Ok(n) => &buf[..n], + Err(e) => return Err(e), + }; + + writer.write_all(read_buf).await?; + + bytes_so_far += read_buf.len() as u64; + if bytes_so_far - bytes_last_reported > report_granularity { + bytes_last_reported = bytes_so_far; + reporter.report_progress(bytes_so_far, total_bytes); + } + } + + reporter.report_progress(bytes_so_far, total_bytes); + + Ok(bytes_so_far) +} diff --git a/cli/src/util/is_integrated.rs b/cli/src/util/is_integrated.rs new file mode 100644 index 00000000000..2bc87f47962 --- /dev/null +++ b/cli/src/util/is_integrated.rs @@ -0,0 +1,30 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::{env, io}; + +/// Gets whether the current CLI seems like it's running in integrated mode, +/// by looking at the location of the exe and known VS Code files. +pub fn is_integrated_cli() -> io::Result { + let exe = env::current_exe()?; + + let parent = match exe.parent() { + Some(parent) if parent.file_name().and_then(|n| n.to_str()) == Some("bin") => parent, + _ => return Ok(false), + }; + + let parent = match parent.parent() { + Some(p) => p, + None => return Ok(false), + }; + + let expected_file = if cfg!(target_os = "macos") { + "node_modules.asar" + } else { + "resources.pak" + }; + + Ok(parent.join(expected_file).exists()) +} diff --git a/cli/src/util/machine.rs b/cli/src/util/machine.rs new file mode 100644 index 00000000000..cac5407893a --- /dev/null +++ b/cli/src/util/machine.rs @@ -0,0 +1,51 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +use std::path::Path; +use sysinfo::{Pid, PidExt, ProcessExt, System, SystemExt}; + +pub fn process_at_path_exists(pid: u32, name: &Path) -> bool { + // TODO https://docs.rs/sysinfo/latest/sysinfo/index.html#usage + let mut sys = System::new_all(); + sys.refresh_processes(); + + let name_str = format!("{}", name.display()); + match sys.process(Pid::from_u32(pid)) { + Some(process) => { + for cmd in process.cmd() { + if cmd.contains(&name_str) { + return true; + } + } + } + None => { + return false; + } + } + + false +} +pub fn process_exists(pid: u32) -> bool { + let mut sys = System::new_all(); + sys.refresh_processes(); + sys.process(Pid::from_u32(pid)).is_some() +} + +pub fn find_running_process(name: &Path) -> Option { + // TODO https://docs.rs/sysinfo/latest/sysinfo/index.html#usage + let mut sys = System::new_all(); + sys.refresh_processes(); + + let name_str = format!("{}", name.display()); + + for (pid, process) in sys.processes() { + for cmd in process.cmd() { + if cmd.contains(&name_str) { + return Some(pid.as_u32()); + } + } + } + None +} diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs new file mode 100644 index 00000000000..86d5020efa1 --- /dev/null +++ b/cli/src/util/prereqs.rs @@ -0,0 +1,301 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use std::cmp::Ordering; + +use super::command::capture_command; +use crate::update_service::Platform; +use crate::util::errors::SetupError; +use lazy_static::lazy_static; +use regex::bytes::Regex as BinRegex; +use regex::Regex; +use tokio::fs; + +use super::errors::AnyError; + +lazy_static! { + static ref LDCONFIG_STDC_RE: Regex = Regex::new(r"libstdc\+\+.* => (.+)").unwrap(); + static ref LDD_VERSION_RE: BinRegex = BinRegex::new(r"^ldd.*(.+)\.(.+)\s").unwrap(); + static ref LIBSTD_CXX_VERSION_RE: BinRegex = + BinRegex::new(r"GLIBCXX_([0-9]+)\.([0-9]+)(?:\.([0-9]+))?").unwrap(); + static ref MIN_CXX_VERSION: SimpleSemver = SimpleSemver::new(3, 4, 18); + static ref MIN_LDD_VERSION: SimpleSemver = SimpleSemver::new(2, 17, 0); +} + +pub struct PreReqChecker {} + +impl Default for PreReqChecker { + fn default() -> Self { + Self::new() + } +} + +impl PreReqChecker { + pub fn new() -> PreReqChecker { + PreReqChecker {} + } + + #[cfg(not(target_os = "linux"))] + pub async fn verify(&self) -> Result { + Platform::env_default().ok_or_else(|| { + SetupError("VS Code it not supported on this platform".to_owned()).into() + }) + } + + #[cfg(target_os = "linux")] + pub async fn verify(&self) -> Result { + let (gnu_a, gnu_b, or_musl) = tokio::join!( + check_glibc_version(), + check_glibcxx_version(), + check_musl_interpreter() + ); + + if gnu_a.is_ok() && gnu_b.is_ok() { + return Ok(if cfg!(target_arch = "x86_64") { + Platform::LinuxX64 + } else if cfg!(target_arch = "armhf") { + Platform::LinuxARM32 + } else { + Platform::LinuxARM64 + }); + } + + if or_musl.is_ok() { + return Ok(if cfg!(target_arch = "x86_64") { + Platform::LinuxAlpineX64 + } else { + Platform::LinuxAlpineARM64 + }); + } + + let mut errors: Vec = vec![]; + if let Err(e) = gnu_a { + errors.push(e); + } else if let Err(e) = gnu_b { + errors.push(e); + } + + if let Err(e) = or_musl { + errors.push(e); + } + + let bullets = errors + .iter() + .map(|e| format!(" - {}", e)) + .collect::>() + .join("\n"); + + Err(AnyError::from(SetupError(format!( + "This machine not meet VS Code Server's prerequisites, expected either...\n{}", + bullets, + )))) + } +} + +#[allow(dead_code)] +async fn check_musl_interpreter() -> Result<(), String> { + const MUSL_PATH: &str = if cfg!(target_platform = "aarch64") { + "/lib/ld-musl-aarch64.so.1" + } else { + "/lib/ld-musl-x86_64.so.1" + }; + + if fs::metadata(MUSL_PATH).await.is_err() { + return Err(format!( + "find {}, which is required to run the VS Code Server in musl environments", + MUSL_PATH + )); + } + + Ok(()) +} + +#[allow(dead_code)] +async fn check_glibc_version() -> Result<(), String> { + let ldd_version = capture_command("ldd", ["--version"]) + .await + .ok() + .and_then(|o| extract_ldd_version(&o.stdout)); + + if let Some(v) = ldd_version { + return if v.gte(&MIN_LDD_VERSION) { + Ok(()) + } else { + Err(format!( + "find GLIBC >= 2.17 (but found {} instead) for GNU environments", + v + )) + }; + } + + Ok(()) +} + +#[allow(dead_code)] +async fn check_glibcxx_version() -> Result<(), String> { + let mut libstdc_path: Option = None; + + const DEFAULT_LIB_PATH: &str = "/usr/lib64/libstdc++.so.6"; + const LDCONFIG_PATH: &str = "/sbin/ldconfig"; + + if fs::metadata(DEFAULT_LIB_PATH).await.is_ok() { + libstdc_path = Some(DEFAULT_LIB_PATH.to_owned()); + } else if fs::metadata(LDCONFIG_PATH).await.is_ok() { + libstdc_path = capture_command(LDCONFIG_PATH, ["-p"]) + .await + .ok() + .and_then(|o| extract_libstd_from_ldconfig(&o.stdout)); + } + + match libstdc_path { + Some(path) => match fs::read(&path).await { + Ok(contents) => check_for_sufficient_glibcxx_versions(contents), + Err(e) => Err(format!( + "validate GLIBCXX version for GNU environments, but could not: {}", + e + )), + }, + None => Err("find libstdc++.so or ldconfig for GNU environments".to_owned()), + } +} + +#[allow(dead_code)] +fn check_for_sufficient_glibcxx_versions(contents: Vec) -> Result<(), String> { + let all_versions: Vec = LIBSTD_CXX_VERSION_RE + .captures_iter(&contents) + .map(|m| SimpleSemver { + major: m.get(1).map_or(0, |s| u32_from_bytes(s.as_bytes())), + minor: m.get(2).map_or(0, |s| u32_from_bytes(s.as_bytes())), + patch: m.get(3).map_or(0, |s| u32_from_bytes(s.as_bytes())), + }) + .collect(); + + if !all_versions.iter().any(|v| MIN_CXX_VERSION.gte(v)) { + return Err(format!( + "find GLIBCXX >= 3.4.18 (but found {} instead) for GNU environments", + all_versions + .iter() + .map(String::from) + .collect::>() + .join(", ") + )); + } + + Ok(()) +} + +fn extract_ldd_version(output: &[u8]) -> Option { + LDD_VERSION_RE.captures(output).map(|m| SimpleSemver { + major: m.get(1).map_or(0, |s| u32_from_bytes(s.as_bytes())), + minor: m.get(2).map_or(0, |s| u32_from_bytes(s.as_bytes())), + patch: 0, + }) +} + +fn extract_libstd_from_ldconfig(output: &[u8]) -> Option { + String::from_utf8_lossy(output) + .lines() + .find_map(|l| LDCONFIG_STDC_RE.captures(l)) + .and_then(|cap| cap.get(1)) + .map(|cap| cap.as_str().to_owned()) +} + +fn u32_from_bytes(b: &[u8]) -> u32 { + String::from_utf8_lossy(b).parse::().unwrap_or(0) +} + +#[derive(Debug, PartialEq)] +struct SimpleSemver { + major: u32, + minor: u32, + patch: u32, +} + +impl From<&SimpleSemver> for String { + fn from(s: &SimpleSemver) -> Self { + format!("v{}.{}.{}", s.major, s.minor, s.patch) + } +} + +impl std::fmt::Display for SimpleSemver { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + write!(f, "{}", String::from(self)) + } +} + +#[allow(dead_code)] +impl SimpleSemver { + fn new(major: u32, minor: u32, patch: u32) -> SimpleSemver { + SimpleSemver { + major, + minor, + patch, + } + } + + fn gte(&self, other: &SimpleSemver) -> bool { + match self.major.cmp(&other.major) { + Ordering::Greater => true, + Ordering::Less => false, + Ordering::Equal => match self.minor.cmp(&other.minor) { + Ordering::Greater => true, + Ordering::Less => false, + Ordering::Equal => self.patch >= other.patch, + }, + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_extract_libstd_from_ldconfig() { + let actual = " + libstoken.so.1 (libc6,x86-64) => /lib/x86_64-linux-gnu/libstoken.so.1 + libstemmer.so.0d (libc6,x86-64) => /lib/x86_64-linux-gnu/libstemmer.so.0d + libstdc++.so.6 (libc6,x86-64) => /lib/x86_64-linux-gnu/libstdc++.so.6 + libstartup-notification-1.so.0 (libc6,x86-64) => /lib/x86_64-linux-gnu/libstartup-notification-1.so.0 + libssl3.so (libc6,x86-64) => /lib/x86_64-linux-gnu/libssl3.so + ".to_owned().into_bytes(); + + assert_eq!( + extract_libstd_from_ldconfig(&actual), + Some("/lib/x86_64-linux-gnu/libstdc++.so.6".to_owned()), + ); + + assert_eq!( + extract_libstd_from_ldconfig(&"nothing here!".to_owned().into_bytes()), + None, + ); + } + + #[test] + fn test_gte() { + assert!(SimpleSemver::new(1, 2, 3).gte(&SimpleSemver::new(1, 2, 3))); + assert!(SimpleSemver::new(1, 2, 3).gte(&SimpleSemver::new(0, 10, 10))); + assert!(SimpleSemver::new(1, 2, 3).gte(&SimpleSemver::new(1, 1, 10))); + + assert!(!SimpleSemver::new(1, 2, 3).gte(&SimpleSemver::new(1, 2, 10))); + assert!(!SimpleSemver::new(1, 2, 3).gte(&SimpleSemver::new(1, 3, 1))); + assert!(!SimpleSemver::new(1, 2, 3).gte(&SimpleSemver::new(2, 2, 1))); + } + + #[test] + fn check_for_sufficient_glibcxx_versions() { + let actual = "ldd (Ubuntu GLIBC 2.31-0ubuntu9.7) 2.31 + Copyright (C) 2020 Free Software Foundation, Inc. + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Written by Roland McGrath and Ulrich Drepper." + .to_owned() + .into_bytes(); + + assert_eq!( + extract_ldd_version(&actual), + Some(SimpleSemver::new(2, 31, 0)), + ); + } +} diff --git a/cli/src/util/sync.rs b/cli/src/util/sync.rs new file mode 100644 index 00000000000..5f33419488a --- /dev/null +++ b/cli/src/util/sync.rs @@ -0,0 +1,87 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use tokio::sync::watch::{ + self, + error::{RecvError, SendError}, +}; + +#[derive(Clone)] +pub struct Barrier(watch::Receiver>) +where + T: Copy; + +impl Barrier +where + T: Copy, +{ + /// Waits for the barrier to be closed, returning a value if one was sent. + pub async fn wait(&mut self) -> Result { + loop { + self.0.changed().await?; + + if let Some(v) = *(self.0.borrow()) { + return Ok(v); + } + } + } +} + +pub struct BarrierOpener(watch::Sender>); + +impl BarrierOpener { + /// Closes the barrier. + pub fn open(self, value: T) -> Result<(), SendError>> { + self.0.send(Some(value)) + } +} + +/// The Barrier is something that can be opened once from one side, +/// and is thereafter permanently closed. It can contain a value. +pub fn new_barrier() -> (Barrier, BarrierOpener) +where + T: Copy, +{ + let (closed_tx, closed_rx) = watch::channel(None); + (Barrier(closed_rx), BarrierOpener(closed_tx)) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[tokio::test] + async fn test_barrier_close_after_spawn() { + let (mut barrier, opener) = new_barrier::(); + let (tx, rx) = tokio::sync::oneshot::channel::(); + + tokio::spawn(async move { + tx.send(barrier.wait().await.unwrap()).unwrap(); + }); + + opener.open(42).unwrap(); + + assert!(rx.await.unwrap() == 42); + } + + #[tokio::test] + async fn test_barrier_close_before_spawn() { + let (barrier, opener) = new_barrier::(); + let (tx1, rx1) = tokio::sync::oneshot::channel::(); + let (tx2, rx2) = tokio::sync::oneshot::channel::(); + + opener.open(42).unwrap(); + let mut b1 = barrier.clone(); + tokio::spawn(async move { + tx1.send(b1.wait().await.unwrap()).unwrap(); + }); + let mut b2 = barrier.clone(); + tokio::spawn(async move { + tx2.send(b2.wait().await.unwrap()).unwrap(); + }); + + assert!(rx1.await.unwrap() == 42); + assert!(rx2.await.unwrap() == 42); + } +} diff --git a/cli/src/util/tar.rs b/cli/src/util/tar.rs new file mode 100644 index 00000000000..b5884e67afd --- /dev/null +++ b/cli/src/util/tar.rs @@ -0,0 +1,105 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use crate::util::errors::{wrap, WrappedError}; + +use flate2::read::GzDecoder; +use std::fs; +use std::io::{Seek, SeekFrom}; +use std::path::{Path, PathBuf}; +use tar::Archive; + +use super::io::ReportCopyProgress; + +fn should_skip_first_segment(file: &fs::File) -> Result { + // unfortunately, we need to re-read the archive here since you cannot reuse + // `.entries()`. But this will generally only look at one or two files, so this + // should be acceptably speedy... If not, we could hardcode behavior for + // different types of archives. + + let tar = GzDecoder::new(file); + let mut archive = Archive::new(tar); + let mut entries = archive + .entries() + .map_err(|e| wrap(e, "error opening archive"))?; + + let first_name = { + let file = entries + .next() + .expect("expected not to have an empty archive") + .map_err(|e| wrap(e, "error reading entry file"))?; + + let path = file.path().expect("expected to have path"); + + path.iter() + .next() + .expect("expected to have non-empty name") + .to_owned() + }; + + let mut had_multiple = false; + for file in entries.flatten() { + had_multiple = true; + if let Ok(name) = file.path() { + if name.iter().next() != Some(&first_name) { + return Ok(false); + } + } + } + + Ok(had_multiple) // prefix removal is invalid if there's only a single file +} + +pub fn decompress_tarball( + path: &Path, + parent_path: &Path, + mut reporter: T, +) -> Result<(), WrappedError> +where + T: ReportCopyProgress, +{ + let mut tar_gz = fs::File::open(path) + .map_err(|e| wrap(e, format!("error opening file {}", path.display())))?; + let skip_first = should_skip_first_segment(&tar_gz)?; + + // reset since skip logic read the tar already: + tar_gz + .seek(SeekFrom::Start(0)) + .map_err(|e| wrap(e, "error resetting seek position"))?; + + let tar = GzDecoder::new(tar_gz); + let mut archive = Archive::new(tar); + + let results = archive + .entries() + .map_err(|e| wrap(e, format!("error opening archive {}", path.display())))? + .filter_map(|e| e.ok()) + .map(|mut entry| { + let entry_path = entry + .path() + .map_err(|e| wrap(e, "error reading entry path"))?; + + let path = parent_path.join(if skip_first { + entry_path.iter().skip(1).collect::() + } else { + entry_path.into_owned() + }); + + if let Some(p) = path.parent() { + fs::create_dir_all(&p) + .map_err(|e| wrap(e, format!("could not create dir for {}", p.display())))?; + } + + entry + .unpack(&path) + .map_err(|e| wrap(e, format!("error unpacking {}", path.display())))?; + Ok(path) + }) + .collect::, WrappedError>>()?; + + // Tarballs don't have a way to get the number of entries ahead of time + reporter.report_progress(results.len() as u64, results.len() as u64); + + Ok(()) +} diff --git a/cli/src/util/zipper.rs b/cli/src/util/zipper.rs new file mode 100644 index 00000000000..bfb7f4085b6 --- /dev/null +++ b/cli/src/util/zipper.rs @@ -0,0 +1,155 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +use super::errors::{wrap, WrappedError}; +use super::io::ReportCopyProgress; +use std::fs::{self, File}; +use std::io; +use std::path::Path; +use std::path::PathBuf; +use zip::read::ZipFile; +use zip::{self, ZipArchive}; + +// Borrowed and modified from https://github.com/zip-rs/zip/blob/master/examples/extract.rs + +/// Returns whether all files in the archive start with the same path segment. +/// If so, it's an indication we should skip that segment when extracting. +fn should_skip_first_segment(archive: &mut ZipArchive) -> bool { + let first_name = { + let file = archive + .by_index_raw(0) + .expect("expected not to have an empty archive"); + + let path = file + .enclosed_name() + .expect("expected to have path") + .iter() + .next() + .expect("expected to have non-empty name"); + + path.to_owned() + }; + + for i in 1..archive.len() { + if let Ok(file) = archive.by_index_raw(i) { + if let Some(name) = file.enclosed_name() { + if name.iter().next() != Some(&first_name) { + return false; + } + } + } + } + + archive.len() > 1 // prefix removal is invalid if there's only a single file +} + +pub fn unzip_file(path: &Path, parent_path: &Path, mut reporter: T) -> Result<(), WrappedError> +where + T: ReportCopyProgress, +{ + let file = fs::File::open(path) + .map_err(|e| wrap(e, format!("unable to open file {}", path.display())))?; + + let mut archive = zip::ZipArchive::new(file) + .map_err(|e| wrap(e, format!("failed to open zip archive {}", path.display())))?; + + let skip_segments_no = if should_skip_first_segment(&mut archive) { + 1 + } else { + 0 + }; + + for i in 0..archive.len() { + reporter.report_progress(i as u64, archive.len() as u64); + let mut file = archive + .by_index(i) + .map_err(|e| wrap(e, format!("could not open zip entry {}", i)))?; + + let outpath: PathBuf = match file.enclosed_name() { + Some(path) => { + let mut full_path = PathBuf::from(parent_path); + full_path.push(PathBuf::from_iter(path.iter().skip(skip_segments_no))); + full_path + } + None => continue, + }; + + if file.is_dir() || file.name().ends_with('/') { + fs::create_dir_all(&outpath) + .map_err(|e| wrap(e, format!("could not create dir for {}", outpath.display())))?; + apply_permissions(&file, &outpath)?; + continue; + } + + if let Some(p) = outpath.parent() { + fs::create_dir_all(&p) + .map_err(|e| wrap(e, format!("could not create dir for {}", outpath.display())))?; + } + + #[cfg(unix)] + { + use libc::S_IFLNK; + use std::io::Read; + use std::os::unix::ffi::OsStringExt; + + if matches!(file.unix_mode(), Some(mode) if mode & (S_IFLNK as u32) == (S_IFLNK as u32)) + { + let mut link_to = Vec::new(); + file.read_to_end(&mut link_to).map_err(|e| { + wrap( + e, + format!("could not read symlink linkpath {}", outpath.display()), + ) + })?; + + let link_path = PathBuf::from(std::ffi::OsString::from_vec(link_to)); + std::os::unix::fs::symlink(link_path, &outpath).map_err(|e| { + wrap(e, format!("could not create symlink {}", outpath.display())) + })?; + continue; + } + } + + let mut outfile = fs::File::create(&outpath).map_err(|e| { + wrap( + e, + format!( + "unable to open file to write {} (from {:?})", + outpath.display(), + file.enclosed_name().map(|p| p.to_string_lossy()), + ), + ) + })?; + + io::copy(&mut file, &mut outfile) + .map_err(|e| wrap(e, format!("error copying file {}", outpath.display())))?; + + apply_permissions(&file, &outpath)?; + } + + reporter.report_progress(archive.len() as u64, archive.len() as u64); + + Ok(()) +} + +#[cfg(unix)] +fn apply_permissions(file: &ZipFile, outpath: &Path) -> Result<(), WrappedError> { + use std::os::unix::fs::PermissionsExt; + + if let Some(mode) = file.unix_mode() { + fs::set_permissions(&outpath, fs::Permissions::from_mode(mode)).map_err(|e| { + wrap( + e, + format!("error setting permissions on {}", outpath.display()), + ) + })?; + } + + Ok(()) +} + +#[cfg(windows)] +fn apply_permissions(_file: &ZipFile, _outpath: &Path) -> Result<(), WrappedError> { + Ok(()) +} diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json index f2ebd926da2..37a5a9137bb 100644 --- a/extensions/configuration-editing/package.json +++ b/extensions/configuration-editing/package.json @@ -21,7 +21,7 @@ }, "dependencies": { "jsonc-parser": "^2.2.1", - "vscode-nls": "^5.0.0" + "vscode-nls": "^5.2.0" }, "capabilities": { "virtualWorkspaces": true, @@ -52,7 +52,8 @@ ".devcontainer.json" ], "filenamePatterns": [ - "**/User/snippets/*.json" + "**/User/snippets/*.json", + "**/User/profiles/*/snippets/*.json" ] }, { "id": "json", @@ -70,6 +71,10 @@ "fileMatch": "%APP_SETTINGS_HOME%/keybindings.json", "url": "vscode://schemas/keybindings" }, + { + "fileMatch": "%APP_SETTINGS_HOME%/profiles/*/keybindings.json", + "url": "vscode://schemas/keybindings" + }, { "fileMatch": "vscode://defaultsettings/*.json", "url": "vscode://schemas/settings/default" @@ -78,6 +83,10 @@ "fileMatch": "%APP_SETTINGS_HOME%/settings.json", "url": "vscode://schemas/settings/user" }, + { + "fileMatch": "%APP_SETTINGS_HOME%/profiles/*/settings.json", + "url": "vscode://schemas/settings/profile" + }, { "fileMatch": "%MACHINE_SETTINGS_HOME%/settings.json", "url": "vscode://schemas/settings/machine" @@ -114,6 +123,10 @@ "fileMatch": "%APP_SETTINGS_HOME%/snippets/*.json", "url": "vscode://schemas/snippets" }, + { + "fileMatch": "%APP_SETTINGS_HOME%/profiles/*/snippets/.json", + "url": "vscode://schemas/snippets" + }, { "fileMatch": "%APP_SETTINGS_HOME%/sync/snippets/preview/*.json", "url": "vscode://schemas/snippets" diff --git a/extensions/configuration-editing/schemas/devContainer.codespaces.schema.json b/extensions/configuration-editing/schemas/devContainer.codespaces.schema.json new file mode 100644 index 00000000000..681ca6105cf --- /dev/null +++ b/extensions/configuration-editing/schemas/devContainer.codespaces.schema.json @@ -0,0 +1,196 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "type": "object", + "properties": { + "customizations": { + "type": "object", + "properties": { + "codespaces": { + "type": "object", + "description": "Customizations specific to GitHub Codespaces", + "properties": { + "repositories": { + "type": "object", + "description": "Configuration relative to the given repositories, following the format 'owner/repo'.\n A wildcard (*) is permitted for the repo name (eg: 'microsoft/*')", + "patternProperties": { + "^[a-zA-Z0-9-_.]+[.]*\/[a-zA-Z0-9-_*]+[.]*$": { + "type": "object", + "additionalProperties": true, + "oneOf": [ + { + "properties": { + "permissions": { + "type": "object", + "description": "Additional repository permissions.\n See https://aka.ms/ghcs/multi-repo-auth for more info.", + "additionalProperties": true, + "anyOf": [ + { + "properties": { + "actions": { + "type": "string", + "enum": [ + "read", + "write" + ] + } + } + }, + { + "properties": { + "checks": { + "type": "string", + "enum": [ + "read", + "write" + ] + } + } + }, + { + "properties": { + "contents": { + "type": "string", + "enum": [ + "read", + "write" + ] + } + } + }, + { + "properties": { + "deployments": { + "type": "string", + "enum": [ + "read", + "write" + ] + } + } + }, + { + "properties": { + "discussions": { + "type": "string", + "enum": [ + "read", + "write" + ] + } + } + }, + { + "properties": { + "issues": { + "type": "string", + "enum": [ + "read", + "write" + ] + } + } + }, + { + "properties": { + "packages": { + "type": "string", + "enum": [ + "read" + ] + } + } + }, + { + "properties": { + "pages": { + "type": "string", + "enum": [ + "read", + "write" + ] + } + } + }, + { + "properties": { + "pull_requests": { + "type": "string", + "enum": [ + "read", + "write" + ] + } + } + }, + { + "properties": { + "repository_projects": { + "type": "string", + "enum": [ + "read", + "write" + ] + } + } + }, + { + "properties": { + "statuses": { + "type": "string", + "enum": [ + "read", + "write" + ] + } + } + }, + { + "properties": { + "workflows": { + "type": "string", + "enum": [ + "write" + ] + } + } + } + ] + } + } + }, + { + "properties": { + "permissions": { + "type": "string", + "description": "Additional repository permissions.\n See https://aka.ms/ghcs/multi-repo-auth for more info.", + "enum": [ + "read-all", + "write-all" + ] + } + } + } + ] + } + } + }, + "openFiles": { + "type": "array", + "description": "The paths to the files to open when the codespace is created. Paths are relative to the workspace.", + "items": { + "type": "string" + } + } + } + } + } + }, + "codespaces": { + "type": "object", + "additionalProperties": true, + "description": "Codespaces-specific configuration.", + "deprecated": true, + "deprecationMessage": "Use 'customizations/codespaces' instead" + } + } +} diff --git a/extensions/configuration-editing/schemas/devContainer.schema.generated.json b/extensions/configuration-editing/schemas/devContainer.schema.generated.json index 4ae5033f3f1..f94a40021e1 100644 --- a/extensions/configuration-editing/schemas/devContainer.schema.generated.json +++ b/extensions/configuration-editing/schemas/devContainer.schema.generated.json @@ -62,24 +62,6 @@ ] } }, - "containerEnv": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Container environment variables." - }, - "containerUser": { - "type": "string", - "description": "The user the container will be started with. The default is the user on the Docker image." - }, - "mounts": { - "type": "array", - "description": "Mount points to set up when creating the container. See Docker's documentation for the --mount option for the supported syntax.", - "items": { - "type": "string" - } - }, "runArgs": { "type": "array", "description": "The arguments required when starting in the container.", @@ -278,6 +260,83 @@ "type": "boolean", "description": "Controls whether on Linux the container's user should be updated with the local user's UID and GID. On by default when opening from a local folder." }, + "containerEnv": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Container environment variables." + }, + "containerUser": { + "type": "string", + "description": "The user the container will be started with. The default is the user on the Docker image." + }, + "mounts": { + "type": "array", + "description": "Mount points to set up when creating the container. See Docker's documentation for the --mount option for the supported syntax.", + "items": { + "anyOf": [ + { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": [ + "bind", + "volume" + ], + "description": "Mount type." + }, + "source": { + "type": "string", + "description": "Mount source." + }, + "target": { + "type": "string", + "description": "Mount target." + } + }, + "required": [ + "type", + "source", + "target" + ], + "additionalProperties": false + }, + { + "type": "string" + } + ] + } + }, + "init": { + "type": "boolean", + "description": "Passes the --init flag when creating the dev container." + }, + "privileged": { + "type": "boolean", + "description": "Passes the --privileged flag when creating the dev container." + }, + "capAdd": { + "type": "array", + "description": "Passes docker capabilities to include when creating the dev container.", + "examples": [ + "SYS_PTRACE" + ], + "items": { + "type": "string" + } + }, + "securityOpt": { + "type": "array", + "description": "Passes docker security options to include when creating the dev container.", + "examples": [ + "seccomp=unconfined" + ], + "items": { + "type": "string" + } + }, "remoteEnv": { "type": "object", "additionalProperties": { @@ -600,6 +659,13 @@ } }, "additionalProperties": false + }, + "openFiles": { + "type": "array", + "description": "The paths to the files to open when the codespace is created. Paths are relative to the workspace.", + "items": { + "type": "string" + } } }, "additionalProperties": false @@ -672,24 +738,6 @@ ] } }, - "containerEnv": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Container environment variables." - }, - "containerUser": { - "type": "string", - "description": "The user the container will be started with. The default is the user on the Docker image." - }, - "mounts": { - "type": "array", - "description": "Mount points to set up when creating the container. See Docker's documentation for the --mount option for the supported syntax.", - "items": { - "type": "string" - } - }, "runArgs": { "type": "array", "description": "The arguments required when starting in the container.", @@ -888,6 +936,83 @@ "type": "boolean", "description": "Controls whether on Linux the container's user should be updated with the local user's UID and GID. On by default when opening from a local folder." }, + "containerEnv": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Container environment variables." + }, + "containerUser": { + "type": "string", + "description": "The user the container will be started with. The default is the user on the Docker image." + }, + "mounts": { + "type": "array", + "description": "Mount points to set up when creating the container. See Docker's documentation for the --mount option for the supported syntax.", + "items": { + "anyOf": [ + { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": [ + "bind", + "volume" + ], + "description": "Mount type." + }, + "source": { + "type": "string", + "description": "Mount source." + }, + "target": { + "type": "string", + "description": "Mount target." + } + }, + "required": [ + "type", + "source", + "target" + ], + "additionalProperties": false + }, + { + "type": "string" + } + ] + } + }, + "init": { + "type": "boolean", + "description": "Passes the --init flag when creating the dev container." + }, + "privileged": { + "type": "boolean", + "description": "Passes the --privileged flag when creating the dev container." + }, + "capAdd": { + "type": "array", + "description": "Passes docker capabilities to include when creating the dev container.", + "examples": [ + "SYS_PTRACE" + ], + "items": { + "type": "string" + } + }, + "securityOpt": { + "type": "array", + "description": "Passes docker security options to include when creating the dev container.", + "examples": [ + "seccomp=unconfined" + ], + "items": { + "type": "string" + } + }, "remoteEnv": { "type": "object", "additionalProperties": { @@ -1210,6 +1335,13 @@ } }, "additionalProperties": false + }, + "openFiles": { + "type": "array", + "description": "The paths to the files to open when the codespace is created. Paths are relative to the workspace.", + "items": { + "type": "string" + } } }, "additionalProperties": false @@ -1248,24 +1380,6 @@ ] } }, - "containerEnv": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Container environment variables." - }, - "containerUser": { - "type": "string", - "description": "The user the container will be started with. The default is the user on the Docker image." - }, - "mounts": { - "type": "array", - "description": "Mount points to set up when creating the container. See Docker's documentation for the --mount option for the supported syntax.", - "items": { - "type": "string" - } - }, "runArgs": { "type": "array", "description": "The arguments required when starting in the container.", @@ -1464,6 +1578,83 @@ "type": "boolean", "description": "Controls whether on Linux the container's user should be updated with the local user's UID and GID. On by default when opening from a local folder." }, + "containerEnv": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Container environment variables." + }, + "containerUser": { + "type": "string", + "description": "The user the container will be started with. The default is the user on the Docker image." + }, + "mounts": { + "type": "array", + "description": "Mount points to set up when creating the container. See Docker's documentation for the --mount option for the supported syntax.", + "items": { + "anyOf": [ + { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": [ + "bind", + "volume" + ], + "description": "Mount type." + }, + "source": { + "type": "string", + "description": "Mount source." + }, + "target": { + "type": "string", + "description": "Mount target." + } + }, + "required": [ + "type", + "source", + "target" + ], + "additionalProperties": false + }, + { + "type": "string" + } + ] + } + }, + "init": { + "type": "boolean", + "description": "Passes the --init flag when creating the dev container." + }, + "privileged": { + "type": "boolean", + "description": "Passes the --privileged flag when creating the dev container." + }, + "capAdd": { + "type": "array", + "description": "Passes docker capabilities to include when creating the dev container.", + "examples": [ + "SYS_PTRACE" + ], + "items": { + "type": "string" + } + }, + "securityOpt": { + "type": "array", + "description": "Passes docker security options to include when creating the dev container.", + "examples": [ + "seccomp=unconfined" + ], + "items": { + "type": "string" + } + }, "remoteEnv": { "type": "object", "additionalProperties": { @@ -1786,6 +1977,13 @@ } }, "additionalProperties": false + }, + "openFiles": { + "type": "array", + "description": "The paths to the files to open when the codespace is created. Paths are relative to the workspace.", + "items": { + "type": "string" + } } }, "additionalProperties": false @@ -2014,6 +2212,83 @@ "type": "boolean", "description": "Controls whether on Linux the container's user should be updated with the local user's UID and GID. On by default when opening from a local folder." }, + "containerEnv": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Container environment variables." + }, + "containerUser": { + "type": "string", + "description": "The user the container will be started with. The default is the user on the Docker image." + }, + "mounts": { + "type": "array", + "description": "Mount points to set up when creating the container. See Docker's documentation for the --mount option for the supported syntax.", + "items": { + "anyOf": [ + { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": [ + "bind", + "volume" + ], + "description": "Mount type." + }, + "source": { + "type": "string", + "description": "Mount source." + }, + "target": { + "type": "string", + "description": "Mount target." + } + }, + "required": [ + "type", + "source", + "target" + ], + "additionalProperties": false + }, + { + "type": "string" + } + ] + } + }, + "init": { + "type": "boolean", + "description": "Passes the --init flag when creating the dev container." + }, + "privileged": { + "type": "boolean", + "description": "Passes the --privileged flag when creating the dev container." + }, + "capAdd": { + "type": "array", + "description": "Passes docker capabilities to include when creating the dev container.", + "examples": [ + "SYS_PTRACE" + ], + "items": { + "type": "string" + } + }, + "securityOpt": { + "type": "array", + "description": "Passes docker security options to include when creating the dev container.", + "examples": [ + "seccomp=unconfined" + ], + "items": { + "type": "string" + } + }, "remoteEnv": { "type": "object", "additionalProperties": { @@ -2336,6 +2611,13 @@ } }, "additionalProperties": false + }, + "openFiles": { + "type": "array", + "description": "The paths to the files to open when the codespace is created. Paths are relative to the workspace.", + "items": { + "type": "string" + } } }, "additionalProperties": false @@ -2529,6 +2811,83 @@ "type": "boolean", "description": "Controls whether on Linux the container's user should be updated with the local user's UID and GID. On by default when opening from a local folder." }, + "containerEnv": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Container environment variables." + }, + "containerUser": { + "type": "string", + "description": "The user the container will be started with. The default is the user on the Docker image." + }, + "mounts": { + "type": "array", + "description": "Mount points to set up when creating the container. See Docker's documentation for the --mount option for the supported syntax.", + "items": { + "anyOf": [ + { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": [ + "bind", + "volume" + ], + "description": "Mount type." + }, + "source": { + "type": "string", + "description": "Mount source." + }, + "target": { + "type": "string", + "description": "Mount target." + } + }, + "required": [ + "type", + "source", + "target" + ], + "additionalProperties": false + }, + { + "type": "string" + } + ] + } + }, + "init": { + "type": "boolean", + "description": "Passes the --init flag when creating the dev container." + }, + "privileged": { + "type": "boolean", + "description": "Passes the --privileged flag when creating the dev container." + }, + "capAdd": { + "type": "array", + "description": "Passes docker capabilities to include when creating the dev container.", + "examples": [ + "SYS_PTRACE" + ], + "items": { + "type": "string" + } + }, + "securityOpt": { + "type": "array", + "description": "Passes docker security options to include when creating the dev container.", + "examples": [ + "seccomp=unconfined" + ], + "items": { + "type": "string" + } + }, "remoteEnv": { "type": "object", "additionalProperties": { @@ -2851,6 +3210,13 @@ } }, "additionalProperties": false + }, + "openFiles": { + "type": "array", + "description": "The paths to the files to open when the codespace is created. Paths are relative to the workspace.", + "items": { + "type": "string" + } } }, "additionalProperties": false diff --git a/extensions/configuration-editing/schemas/devContainer.schema.src.json b/extensions/configuration-editing/schemas/devContainer.schema.src.json index 73456101bb9..f908f29ac59 100644 --- a/extensions/configuration-editing/schemas/devContainer.schema.src.json +++ b/extensions/configuration-editing/schemas/devContainer.schema.src.json @@ -177,6 +177,55 @@ "type": "boolean", "description": "Controls whether on Linux the container's user should be updated with the local user's UID and GID. On by default when opening from a local folder." }, + "containerEnv": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Container environment variables." + }, + "containerUser": { + "type": "string", + "description": "The user the container will be started with. The default is the user on the Docker image." + }, + "mounts": { + "type": "array", + "description": "Mount points to set up when creating the container. See Docker's documentation for the --mount option for the supported syntax.", + "items": { + "anyOf": [ + { + "$ref": "#/definitions/Mount" + }, + { + "type": "string" + } + ] + } + }, + "init": { + "type": "boolean", + "description": "Passes the --init flag when creating the dev container." + }, + "privileged": { + "type": "boolean", + "description": "Passes the --privileged flag when creating the dev container." + }, + "capAdd": { + "type": "array", + "description": "Passes docker capabilities to include when creating the dev container.", + "examples": [ "SYS_PTRACE" ], + "items": { + "type": "string" + } + }, + "securityOpt": { + "type": "array", + "description": "Passes docker security options to include when creating the dev container.", + "examples": [ "seccomp=unconfined" ], + "items": { + "type": "string" + } + }, "remoteEnv": { "type": "object", "additionalProperties": { @@ -501,6 +550,13 @@ ] } } + }, + "openFiles": { + "type": "array", + "description": "The paths to the files to open when the codespace is created. Paths are relative to the workspace.", + "items": { + "type": "string" + } } } } @@ -529,24 +585,6 @@ ] } }, - "containerEnv": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Container environment variables." - }, - "containerUser": { - "type": "string", - "description": "The user the container will be started with. The default is the user on the Docker image." - }, - "mounts": { - "type": "array", - "description": "Mount points to set up when creating the container. See Docker's documentation for the --mount option for the supported syntax.", - "items": { - "type": "string" - } - }, "runArgs": { "type": "array", "description": "The arguments required when starting in the container.", @@ -728,6 +766,33 @@ "service", "workspaceFolder" ] + }, + "Mount": { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": [ + "bind", + "volume" + ], + "description": "Mount type." + }, + "source": { + "type": "string", + "description": "Mount source." + }, + "target": { + "type": "string", + "description": "Mount target." + } + }, + "required": [ + "type", + "source", + "target" + ], + "additionalProperties": false } }, "oneOf": [ diff --git a/extensions/configuration-editing/schemas/devContainer.vscode.schema.json b/extensions/configuration-editing/schemas/devContainer.vscode.schema.json new file mode 100644 index 00000000000..e0f2a8aa68f --- /dev/null +++ b/extensions/configuration-editing/schemas/devContainer.vscode.schema.json @@ -0,0 +1,56 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "type": "object", + "properties": { + "customizations": { + "type": "object", + "properties": { + "vscode": { + "type": "object", + "properties": { + "extensions": { + "type": "array", + "description": "An array of extensions that should be installed into the container.", + "items": { + "type": "string", + "pattern": "^([a-z0-9A-Z][a-z0-9A-Z-]*)\\.([a-z0-9A-Z][a-z0-9A-Z-]*)(@(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)?$", + "errorMessage": "Expected format: '${publisher}.${name}' or '${publisher}.${name}@${version}'. Example: 'ms-dotnettools.csharp'." + } + }, + "settings": { + "$ref": "vscode://schemas/settings/machine", + "description": "Machine specific settings that should be copied into the container. These are only copied when connecting to the container for the first time, rebuilding the container then triggers it again." + }, + "devPort": { + "type": "integer", + "description": "The port VS Code can use to connect to its backend." + } + } + } + } + }, + "extensions": { + "type": "array", + "description": "An array of extensions that should be installed into the container.", + "items": { + "type": "string", + "pattern": "^([a-z0-9A-Z][a-z0-9A-Z-]*)\\.([a-z0-9A-Z][a-z0-9A-Z-]*)((@(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)|@prerelease)?$", + "errorMessage": "Expected format: '${publisher}.${name}' or '${publisher}.${name}@${version}'. Example: 'ms-dotnettools.csharp'." + }, + "deprecated": true, + "deprecationMessage": "Use 'customizations/vscode/extensions' instead" + }, + "settings": { + "$ref": "vscode://schemas/settings/machine", + "description": "Machine specific settings that should be copied into the container. These are only copied when connecting to the container for the first time, rebuilding the container then triggers it again.", + "deprecated": true, + "deprecationMessage": "Use 'customizations/vscode/settings' instead" + }, + "devPort": { + "type": "integer", + "description": "The port VS Code can use to connect to its backend.", + "deprecated": true, + "deprecationMessage": "Use 'customizations/vscode/devPort' instead" + } + } +} diff --git a/extensions/configuration-editing/src/configurationEditingMain.ts b/extensions/configuration-editing/src/configurationEditingMain.ts index a90364ad93e..224a57370b4 100644 --- a/extensions/configuration-editing/src/configurationEditingMain.ts +++ b/extensions/configuration-editing/src/configurationEditingMain.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { getLocation, JSONPath, parse, visit } from 'jsonc-parser'; +import { getLocation, JSONPath, parse, visit, Location } from 'jsonc-parser'; import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; import { SettingsDocument } from './settingsDocumentHelper'; @@ -39,9 +39,11 @@ function registerVariableCompletions(pattern: string): vscode.Disposable { return vscode.languages.registerCompletionItemProvider({ language: 'jsonc', pattern }, { provideCompletionItems(document, position, _token) { const location = getLocation(document.getText(), document.offsetAt(position)); - if (!location.isAtPropertyKey && location.previousNode && location.previousNode.type === 'string') { - const indexOf$ = document.lineAt(position.line).text.lastIndexOf('$', position.character); - const startPosition = indexOf$ >= 0 ? new vscode.Position(position.line, indexOf$) : position; + if (isCompletingInsidePropertyStringValue(document, location, position)) { + let range = document.getWordRangeAtPosition(position, /\$\{[^"\}]*\}?/); + if (!range || range.start.isEqual(position) || range.end.isEqual(position) && document.getText(range).endsWith('}')) { + range = new vscode.Range(position, position); + } return [ { label: 'workspaceFolder', detail: localize('workspaceFolder', "The path of the folder opened in VS Code") }, @@ -61,7 +63,7 @@ function registerVariableCompletions(pattern: string): vscode.Disposable { { label: 'extensionInstallFolder', detail: localize('extensionInstallFolder', "The path where an an extension is installed."), param: 'publisher.extension' }, ].map(variable => ({ label: `\${${variable.label}}`, - range: new vscode.Range(startPosition, position), + range, insertText: variable.param ? new vscode.SnippetString(`\${${variable.label}:`).appendPlaceholder(variable.param).appendText('}') : (`\${${variable.label}}`), detail: variable.detail })); @@ -72,6 +74,18 @@ function registerVariableCompletions(pattern: string): vscode.Disposable { }); } +function isCompletingInsidePropertyStringValue(document: vscode.TextDocument, location: Location, pos: vscode.Position) { + if (location.isAtPropertyKey) { + return false; + } + const previousNode = location.previousNode; + if (previousNode && previousNode.type === 'string') { + const offset = document.offsetAt(pos); + return offset > previousNode.offset && offset < previousNode.offset + previousNode.length; + } + return false; +} + interface IExtensionsContent { recommendations: string[]; } @@ -84,8 +98,8 @@ function registerExtensionsCompletionsInExtensionsDocument(): vscode.Disposable return vscode.languages.registerCompletionItemProvider({ pattern: '**/extensions.json' }, { provideCompletionItems(document, position, _token) { const location = getLocation(document.getText(), document.offsetAt(position)); - const range = document.getWordRangeAtPosition(position) || new vscode.Range(position, position); if (location.path[0] === 'recommendations') { + const range = getReplaceRange(document, location, position); const extensionsContent = parse(document.getText()); return provideInstalledExtensionProposals(extensionsContent && extensionsContent.recommendations || [], '', range, false); } @@ -98,8 +112,8 @@ function registerExtensionsCompletionsInWorkspaceConfigurationDocument(): vscode return vscode.languages.registerCompletionItemProvider({ pattern: '**/*.code-workspace' }, { provideCompletionItems(document, position, _token) { const location = getLocation(document.getText(), document.offsetAt(position)); - const range = document.getWordRangeAtPosition(position) || new vscode.Range(position, position); if (location.path[0] === 'extensions' && location.path[1] === 'recommendations') { + const range = getReplaceRange(document, location, position); const extensionsContent = parse(document.getText())['extensions']; return provideInstalledExtensionProposals(extensionsContent && extensionsContent.recommendations || [], '', range, false); } @@ -108,6 +122,17 @@ function registerExtensionsCompletionsInWorkspaceConfigurationDocument(): vscode }); } +function getReplaceRange(document: vscode.TextDocument, location: Location, position: vscode.Position) { + const node = location.previousNode; + if (node) { + const nodeStart = document.positionAt(node.offset), nodeEnd = document.positionAt(node.offset + node.length); + if (nodeStart.isBeforeOrEqual(position) && nodeEnd.isAfterOrEqual(position)) { + return new vscode.Range(nodeStart, nodeEnd); + } + } + return new vscode.Range(position, position); +} + vscode.languages.registerDocumentSymbolProvider({ pattern: '**/launch.json', language: 'jsonc' }, { provideDocumentSymbols(document: vscode.TextDocument, _token: vscode.CancellationToken): vscode.ProviderResult { const result: vscode.SymbolInformation[] = []; @@ -180,28 +205,11 @@ function registerContextKeyCompletions(): vscode.Disposable { } } - if (!isValidLocation) { + if (!isValidLocation || !isCompletingInsidePropertyStringValue(document, location, position)) { return; } - // for JSON everything with quotes is a word - const jsonWord = document.getWordRangeAtPosition(position); - if (!jsonWord || jsonWord.start.isEqual(position) || jsonWord.end.isEqual(position)) { - // we aren't inside a "JSON word" or on its quotes - return; - } - - let replacing: vscode.Range | undefined; - if (jsonWord.end.character - jsonWord.start.character === 2 || document.getWordRangeAtPosition(position, /\s+/)) { - // empty json word or on whitespace - replacing = new vscode.Range(position, position); - } else { - replacing = document.getWordRangeAtPosition(position, /[a-zA-Z.]+/); - } - - if (!replacing) { - return; - } + const replacing = document.getWordRangeAtPosition(position, /[a-zA-Z.]+/) || new vscode.Range(position, position); const inserting = replacing.with(undefined, position); const data = await vscode.commands.executeCommand('getContextKeyInfo'); diff --git a/extensions/configuration-editing/src/extensionsProposals.ts b/extensions/configuration-editing/src/extensionsProposals.ts index 458f3be4ce5..ab648e05f3c 100644 --- a/extensions/configuration-editing/src/extensionsProposals.ts +++ b/extensions/configuration-editing/src/extensionsProposals.ts @@ -8,7 +8,7 @@ import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); -export function provideInstalledExtensionProposals(existing: string[], additionalText: string, range: vscode.Range, includeBuiltinExtensions: boolean): vscode.ProviderResult { +export async function provideInstalledExtensionProposals(existing: string[], additionalText: string, range: vscode.Range, includeBuiltinExtensions: boolean): Promise { if (Array.isArray(existing)) { const extensions = includeBuiltinExtensions ? vscode.extensions.all : vscode.extensions.all.filter(e => !(e.id.startsWith('vscode.') || e.id === 'Microsoft.vscode-markdown')); const knownExtensionProposals = extensions.filter(e => existing.indexOf(e.id) === -1); @@ -30,10 +30,10 @@ export function provideInstalledExtensionProposals(existing: string[], additiona return [example]; } } - return undefined; + return []; } -export function provideWorkspaceTrustExtensionProposals(existing: string[], range: vscode.Range): vscode.ProviderResult { +export async function provideWorkspaceTrustExtensionProposals(existing: string[], range: vscode.Range): Promise { if (Array.isArray(existing)) { const extensions = vscode.extensions.all.filter(e => e.packageJSON.main); const extensionProposals = extensions.filter(e => existing.indexOf(e.id) === -1); @@ -56,5 +56,5 @@ export function provideWorkspaceTrustExtensionProposals(existing: string[], rang } } - return undefined; + return []; } diff --git a/extensions/configuration-editing/src/settingsDocumentHelper.ts b/extensions/configuration-editing/src/settingsDocumentHelper.ts index d5928592b5a..ab41c8220c2 100644 --- a/extensions/configuration-editing/src/settingsDocumentHelper.ts +++ b/extensions/configuration-editing/src/settingsDocumentHelper.ts @@ -15,32 +15,27 @@ export class SettingsDocument { constructor(private document: vscode.TextDocument) { } - public provideCompletionItems(position: vscode.Position, _token: vscode.CancellationToken): vscode.ProviderResult { + public async provideCompletionItems(position: vscode.Position, _token: vscode.CancellationToken): Promise { const location = getLocation(this.document.getText(), this.document.offsetAt(position)); - const range = this.document.getWordRangeAtPosition(position) || new vscode.Range(position, position); // window.title if (location.path[0] === 'window.title') { - return this.provideWindowTitleCompletionItems(location, range); + return this.provideWindowTitleCompletionItems(location, position); } // files.association if (location.path[0] === 'files.associations') { - return this.provideFilesAssociationsCompletionItems(location, range); + return this.provideFilesAssociationsCompletionItems(location, position); } // files.exclude, search.exclude if (location.path[0] === 'files.exclude' || location.path[0] === 'search.exclude') { - return this.provideExcludeCompletionItems(location, range); + return this.provideExcludeCompletionItems(location, position); } // files.defaultLanguage if (location.path[0] === 'files.defaultLanguage') { - return this.provideLanguageCompletionItems(location, range).then(items => { - - // Add special item '${activeEditorLanguage}' - return [this.newSimpleCompletionItem(JSON.stringify('${activeEditorLanguage}'), range, localize('activeEditor', "Use the language of the currently active text editor if any")), ...items]; - }); + return this.provideLanguageCompletionItems(location, position); } // settingsSync.ignoredExtensions @@ -49,6 +44,7 @@ export class SettingsDocument { try { ignoredExtensions = parse(this.document.getText())['settingsSync.ignoredExtensions']; } catch (e) {/* ignore error */ } + const range = this.getReplaceRange(location, position); return provideInstalledExtensionProposals(ignoredExtensions, '', range, true); } @@ -58,44 +54,85 @@ export class SettingsDocument { try { alreadyConfigured = Object.keys(parse(this.document.getText())['remote.extensionKind']); } catch (e) {/* ignore error */ } - return provideInstalledExtensionProposals(alreadyConfigured, `: [\n\t"ui"\n]`, range, true); + const range = this.getReplaceRange(location, position); + return provideInstalledExtensionProposals(alreadyConfigured, location.previousNode ? '' : `: [\n\t"ui"\n]`, range, true); } // remote.portsAttributes if (location.path[0] === 'remote.portsAttributes' && location.path.length === 2 && location.isAtPropertyKey) { - return this.providePortsAttributesCompletionItem(range); + return this.providePortsAttributesCompletionItem(this.getReplaceRange(location, position)); } return this.provideLanguageOverridesCompletionItems(location, position); } - private provideWindowTitleCompletionItems(_location: Location, range: vscode.Range): vscode.ProviderResult { - const completions: vscode.CompletionItem[] = []; - - completions.push(this.newSimpleCompletionItem('${activeEditorShort}', range, localize('activeEditorShort', "the file name (e.g. myFile.txt)"))); - completions.push(this.newSimpleCompletionItem('${activeEditorMedium}', range, localize('activeEditorMedium', "the path of the file relative to the workspace folder (e.g. myFolder/myFileFolder/myFile.txt)"))); - completions.push(this.newSimpleCompletionItem('${activeEditorLong}', range, localize('activeEditorLong', "the full path of the file (e.g. /Users/Development/myFolder/myFileFolder/myFile.txt)"))); - completions.push(this.newSimpleCompletionItem('${activeFolderShort}', range, localize('activeFolderShort', "the name of the folder the file is contained in (e.g. myFileFolder)"))); - completions.push(this.newSimpleCompletionItem('${activeFolderMedium}', range, localize('activeFolderMedium', "the path of the folder the file is contained in, relative to the workspace folder (e.g. myFolder/myFileFolder)"))); - completions.push(this.newSimpleCompletionItem('${activeFolderLong}', range, localize('activeFolderLong', "the full path of the folder the file is contained in (e.g. /Users/Development/myFolder/myFileFolder)"))); - completions.push(this.newSimpleCompletionItem('${rootName}', range, localize('rootName', "name of the workspace (e.g. myFolder or myWorkspace)"))); - completions.push(this.newSimpleCompletionItem('${rootPath}', range, localize('rootPath', "file path of the workspace (e.g. /Users/Development/myWorkspace)"))); - completions.push(this.newSimpleCompletionItem('${folderName}', range, localize('folderName', "name of the workspace folder the file is contained in (e.g. myFolder)"))); - completions.push(this.newSimpleCompletionItem('${folderPath}', range, localize('folderPath', "file path of the workspace folder the file is contained in (e.g. /Users/Development/myFolder)"))); - completions.push(this.newSimpleCompletionItem('${appName}', range, localize('appName', "e.g. VS Code"))); - completions.push(this.newSimpleCompletionItem('${remoteName}', range, localize('remoteName', "e.g. SSH"))); - completions.push(this.newSimpleCompletionItem('${dirty}', range, localize('dirty', "an indicator for when the active editor has unsaved changes"))); - completions.push(this.newSimpleCompletionItem('${separator}', range, localize('separator', "a conditional separator (' - ') that only shows when surrounded by variables with values"))); - - return Promise.resolve(completions); + private getReplaceRange(location: Location, position: vscode.Position) { + const node = location.previousNode; + if (node) { + const nodeStart = this.document.positionAt(node.offset), nodeEnd = this.document.positionAt(node.offset + node.length); + if (nodeStart.isBeforeOrEqual(position) && nodeEnd.isAfterOrEqual(position)) { + return new vscode.Range(nodeStart, nodeEnd); + } + } + return new vscode.Range(position, position); } - private provideFilesAssociationsCompletionItems(location: Location, range: vscode.Range): vscode.ProviderResult { + private isCompletingPropertyValue(location: Location, pos: vscode.Position) { + if (location.isAtPropertyKey) { + return false; + } + const previousNode = location.previousNode; + if (previousNode) { + const offset = this.document.offsetAt(pos); + return offset >= previousNode.offset && offset <= previousNode.offset + previousNode.length; + } + return true; + } + + private async provideWindowTitleCompletionItems(location: Location, pos: vscode.Position): Promise { + const completions: vscode.CompletionItem[] = []; + + if (!this.isCompletingPropertyValue(location, pos)) { + return completions; + } + + let range = this.document.getWordRangeAtPosition(pos, /\$\{[^"\}]*\}?/); + if (!range || range.start.isEqual(pos) || range.end.isEqual(pos) && this.document.getText(range).endsWith('}')) { + range = new vscode.Range(pos, pos); + } + + const getText = (variable: string) => { + const text = '${' + variable + '}'; + return location.previousNode ? text : JSON.stringify(text); + }; + + + completions.push(this.newSimpleCompletionItem(getText('activeEditorShort'), range, localize('activeEditorShort', "the file name (e.g. myFile.txt)"))); + completions.push(this.newSimpleCompletionItem(getText('activeEditorMedium'), range, localize('activeEditorMedium', "the path of the file relative to the workspace folder (e.g. myFolder/myFileFolder/myFile.txt)"))); + completions.push(this.newSimpleCompletionItem(getText('activeEditorLong'), range, localize('activeEditorLong', "the full path of the file (e.g. /Users/Development/myFolder/myFileFolder/myFile.txt)"))); + completions.push(this.newSimpleCompletionItem(getText('activeFolderShort'), range, localize('activeFolderShort', "the name of the folder the file is contained in (e.g. myFileFolder)"))); + completions.push(this.newSimpleCompletionItem(getText('activeFolderMedium'), range, localize('activeFolderMedium', "the path of the folder the file is contained in, relative to the workspace folder (e.g. myFolder/myFileFolder)"))); + completions.push(this.newSimpleCompletionItem(getText('activeFolderLong'), range, localize('activeFolderLong', "the full path of the folder the file is contained in (e.g. /Users/Development/myFolder/myFileFolder)"))); + completions.push(this.newSimpleCompletionItem(getText('rootName'), range, localize('rootName', "name of the workspace (e.g. myFolder or myWorkspace)"))); + completions.push(this.newSimpleCompletionItem(getText('rootPath'), range, localize('rootPath', "file path of the workspace (e.g. /Users/Development/myWorkspace)"))); + completions.push(this.newSimpleCompletionItem(getText('folderName'), range, localize('folderName', "name of the workspace folder the file is contained in (e.g. myFolder)"))); + completions.push(this.newSimpleCompletionItem(getText('folderPath'), range, localize('folderPath', "file path of the workspace folder the file is contained in (e.g. /Users/Development/myFolder)"))); + completions.push(this.newSimpleCompletionItem(getText('appName'), range, localize('appName', "e.g. VS Code"))); + completions.push(this.newSimpleCompletionItem(getText('remoteName'), range, localize('remoteName', "e.g. SSH"))); + completions.push(this.newSimpleCompletionItem(getText('dirty'), range, localize('dirty', "an indicator for when the active editor has unsaved changes"))); + completions.push(this.newSimpleCompletionItem(getText('separator'), range, localize('separator', "a conditional separator (' - ') that only shows when surrounded by variables with values"))); + + return completions; + } + + private async provideFilesAssociationsCompletionItems(location: Location, position: vscode.Position): Promise { const completions: vscode.CompletionItem[] = []; if (location.path.length === 2) { // Key - if (!location.isAtPropertyKey || location.path[1] === '') { + if (location.path[1] === '') { + const range = this.getReplaceRange(location, position); + completions.push(this.newSnippetCompletionItem({ label: localize('assocLabelFile', "Files with Extension"), documentation: localize('assocDescriptionFile', "Map all files matching the glob pattern in their filename to the language with the given identifier."), @@ -109,68 +146,68 @@ export class SettingsDocument { snippet: location.isAtPropertyKey ? '"/${1:path to file}/*.${2:extension}": "${3:language}"' : '{ "/${1:path to file}/*.${2:extension}": "${3:language}" }', range })); - } else { + } else if (this.isCompletingPropertyValue(location, position)) { // Value - return this.provideLanguageCompletionItemsForLanguageOverrides(location, range); + return this.provideLanguageCompletionItemsForLanguageOverrides(this.getReplaceRange(location, position)); } } - return Promise.resolve(completions); + return completions; } - private provideExcludeCompletionItems(location: Location, range: vscode.Range): vscode.ProviderResult { + private async provideExcludeCompletionItems(location: Location, position: vscode.Position): Promise { const completions: vscode.CompletionItem[] = []; // Key - if (location.path.length === 1) { + if (location.path.length === 1 || (location.path.length === 2 && location.path[1] === '')) { + const range = this.getReplaceRange(location, position); + completions.push(this.newSnippetCompletionItem({ label: localize('fileLabel', "Files by Extension"), documentation: localize('fileDescription', "Match all files of a specific file extension."), - snippet: location.isAtPropertyKey ? '"**/*.${1:extension}": true' : '{ "**/*.${1:extension}": true }', + snippet: location.path.length === 2 ? '"**/*.${1:extension}": true' : '{ "**/*.${1:extension}": true }', range })); completions.push(this.newSnippetCompletionItem({ label: localize('filesLabel', "Files with Multiple Extensions"), documentation: localize('filesDescription', "Match all files with any of the file extensions."), - snippet: location.isAtPropertyKey ? '"**/*.{ext1,ext2,ext3}": true' : '{ "**/*.{ext1,ext2,ext3}": true }', + snippet: location.path.length === 2 ? '"**/*.{ext1,ext2,ext3}": true' : '{ "**/*.{ext1,ext2,ext3}": true }', range })); completions.push(this.newSnippetCompletionItem({ label: localize('derivedLabel', "Files with Siblings by Name"), documentation: localize('derivedDescription', "Match files that have siblings with the same name but a different extension."), - snippet: location.isAtPropertyKey ? '"**/*.${1:source-extension}": { "when": "$(basename).${2:target-extension}" }' : '{ "**/*.${1:source-extension}": { "when": "$(basename).${2:target-extension}" } }', + snippet: location.path.length === 2 ? '"**/*.${1:source-extension}": { "when": "$(basename).${2:target-extension}" }' : '{ "**/*.${1:source-extension}": { "when": "$(basename).${2:target-extension}" } }', range })); completions.push(this.newSnippetCompletionItem({ label: localize('topFolderLabel', "Folder by Name (Top Level)"), documentation: localize('topFolderDescription', "Match a top level folder with a specific name."), - snippet: location.isAtPropertyKey ? '"${1:name}": true' : '{ "${1:name}": true }', + snippet: location.path.length === 2 ? '"${1:name}": true' : '{ "${1:name}": true }', range })); completions.push(this.newSnippetCompletionItem({ label: localize('topFoldersLabel', "Folders with Multiple Names (Top Level)"), documentation: localize('topFoldersDescription', "Match multiple top level folders."), - snippet: location.isAtPropertyKey ? '"{folder1,folder2,folder3}": true' : '{ "{folder1,folder2,folder3}": true }', + snippet: location.path.length === 2 ? '"{folder1,folder2,folder3}": true' : '{ "{folder1,folder2,folder3}": true }', range })); completions.push(this.newSnippetCompletionItem({ label: localize('folderLabel', "Folder by Name (Any Location)"), documentation: localize('folderDescription', "Match a folder with a specific name in any location."), - snippet: location.isAtPropertyKey ? '"**/${1:name}": true' : '{ "**/${1:name}": true }', + snippet: location.path.length === 2 ? '"**/${1:name}": true' : '{ "**/${1:name}": true }', range })); } // Value - else { - completions.push(this.newSimpleCompletionItem('false', range, localize('falseDescription', "Disable the pattern."))); - completions.push(this.newSimpleCompletionItem('true', range, localize('trueDescription', "Enable the pattern."))); - + else if (location.path.length === 2 && this.isCompletingPropertyValue(location, position)) { + const range = this.getReplaceRange(location, position); completions.push(this.newSnippetCompletionItem({ label: localize('derivedLabel', "Files with Siblings by Name"), documentation: localize('siblingsDescription', "Match files that have siblings with the same name but a different extension."), @@ -179,15 +216,22 @@ export class SettingsDocument { })); } - return Promise.resolve(completions); + return completions; } - private provideLanguageCompletionItems(_location: Location, range: vscode.Range, formatFunc: (string: string) => string = (l) => JSON.stringify(l)): Thenable { - return vscode.languages.getLanguages() - .then(languages => languages.map(l => this.newSimpleCompletionItem(formatFunc(l), range))); + private async provideLanguageCompletionItems(location: Location, position: vscode.Position): Promise { + if (location.path.length === 1 && this.isCompletingPropertyValue(location, position)) { + const range = this.getReplaceRange(location, position); + const languages = await vscode.languages.getLanguages(); + return [ + this.newSimpleCompletionItem(JSON.stringify('${activeEditorLanguage}'), range, localize('activeEditor', "Use the language of the currently active text editor if any")), + ...languages.map(l => this.newSimpleCompletionItem(JSON.stringify(l), range)) + ]; + } + return []; } - private async provideLanguageCompletionItemsForLanguageOverrides(_location: Location, range: vscode.Range): Promise { + private async provideLanguageCompletionItemsForLanguageOverrides(range: vscode.Range): Promise { const languages = await vscode.languages.getLanguages(); const completionItems = []; for (const language of languages) { @@ -200,7 +244,7 @@ export class SettingsDocument { } private async provideLanguageOverridesCompletionItems(location: Location, position: vscode.Position): Promise { - if (location.path.length === 1 && location.previousNode && typeof location.previousNode.value === 'string' && location.previousNode.value.startsWith('[')) { + if (location.path.length === 1 && location.isAtPropertyKey && location.previousNode && typeof location.previousNode.value === 'string' && location.previousNode.value.startsWith('[')) { const startPosition = this.document.positionAt(location.previousNode.offset + 1); const endPosition = startPosition.translate(undefined, location.previousNode.value.length); const donotSuggestLanguages: string[] = []; diff --git a/extensions/configuration-editing/src/test/completion.test.ts b/extensions/configuration-editing/src/test/completion.test.ts new file mode 100644 index 00000000000..e5aec5fc46a --- /dev/null +++ b/extensions/configuration-editing/src/test/completion.test.ts @@ -0,0 +1,594 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as vscode from 'vscode'; +import * as assert from 'assert'; +import { promises as fs } from 'fs'; +import * as path from 'path'; +import * as os from 'os'; +import 'mocha'; + + +const testFolder = fs.mkdtemp(path.join(os.tmpdir(), 'conf-editing-')); + +suite('Completions in settings.json', () => { + const testFile = 'settings.json'; + + test('window.title', async () => { + { // inserting after text + const content = [ + '{', + ' "window.title": "custom|"', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "window.title": "custom${activeEditorShort}"', + '}', + ].join('\n'); + const expected = { label: '${activeEditorShort}', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + { // inserting before a variable + const content = [ + '{', + ' "window.title": "|${activeEditorShort}"', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "window.title": "${folderPath}${activeEditorShort}"', + '}', + ].join('\n'); + const expected = { label: '${folderPath}', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + { // inserting after a variable + const content = [ + '{', + ' "window.title": "${activeEditorShort}|"', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "window.title": "${activeEditorShort}${folderPath}"', + '}', + ].join('\n'); + const expected = { label: '${folderPath}', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + { // replacing an variable + const content = [ + '{', + ' "window.title": "${a|ctiveEditorShort}"', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "window.title": "${activeEditorMedium}"', + '}', + ].join('\n'); + const expected = { label: '${activeEditorMedium}', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + { // replacing a partial variable + const content = [ + '{', + ' "window.title": "${a|"', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "window.title": "${dirty}"', + '}', + ].join('\n'); + const expected = { label: '${dirty}', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + { // inserting a literal + const content = [ + '{', + ' "window.title": |', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "window.title": "${activeEditorMedium}"', + '}', + ].join('\n'); + const expected = { label: '"${activeEditorMedium}"', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + { // no proposals after literal + const content = [ + '{', + ' "window.title": "${activeEditorShort}" |', + '}', + ].join('\n'); + const expected = { label: '${activeEditorMedium}', notAvailable: true }; + await testCompletion(testFile, 'jsonc', content, expected); + } + }); + + test('files.associations', async () => { + { + const content = [ + '{', + ' "files.associations": {', + ' |', + ' }', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "files.associations": {', + ' "*.${1:extension}": "${2:language}"', + ' }', + '}', + ].join('\n'); + const expected = { label: 'Files with Extension', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + { + const content = [ + '{', + ' "files.associations": {', + ' |', + ' }', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "files.associations": {', + ' "/${1:path to file}/*.${2:extension}": "${3:language}"', + ' }', + '}', + ].join('\n'); + const expected = { label: 'Files with Path', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + { + const content = [ + '{', + ' "files.associations": {', + ' "*.extension": "|bat"', + ' }', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "files.associations": {', + ' "*.extension": "json"', + ' }', + '}', + ].join('\n'); + const expected = { label: '"json"', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + { + const content = [ + '{', + ' "files.associations": {', + ' "*.extension": "bat"|', + ' }', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "files.associations": {', + ' "*.extension": "json"', + ' }', + '}', + ].join('\n'); + const expected = { label: '"json"', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + { + const content = [ + '{', + ' "files.associations": {', + ' "*.extension": "bat" |', + ' }', + '}', + ].join('\n'); + const expected = { label: '"json"', notAvailable: true }; + await testCompletion(testFile, 'jsonc', content, expected); + } + }); + test('files.exclude', async () => { + { + const content = [ + '{', + ' "files.exclude": {', + ' |', + ' }', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "files.exclude": {', + ' "**/*.${1:extension}": true', + ' }', + '}', + ].join('\n'); + const expected = { label: 'Files by Extension', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + { + const content = [ + '{', + ' "files.exclude": {', + ' "**/*.extension": |true', + ' }', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "files.exclude": {', + ' "**/*.extension": { "when": "$(basename).${1:extension}" }', + ' }', + '}', + ].join('\n'); + const expected = { label: 'Files with Siblings by Name', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + }); + test('files.defaultLanguage', async () => { + { + const content = [ + '{', + ' "files.defaultLanguage": "json|"', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "files.defaultLanguage": "jsonc"', + '}', + ].join('\n'); + const expected = { label: '"jsonc"', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + { + const content = [ + '{', + ' "files.defaultLanguage": |', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "files.defaultLanguage": "jsonc"', + '}', + ].join('\n'); + const expected = { label: '"jsonc"', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + }); + test('remote.extensionKind', async () => { + { + const content = [ + '{', + '\t"remote.extensionKind": {', + '\t\t|', + '\t}', + '}', + ].join('\n'); + const expected = { label: 'vscode.npm' }; + await testCompletion(testFile, 'jsonc', content, expected); + } + }); + test('remote.portsAttributes', async () => { + { + const content = [ + '{', + ' "remote.portsAttributes": {', + ' |', + ' }', + '}', + ].join('\n'); + const expected = { label: '"3000"' }; + await testCompletion(testFile, 'jsonc', content, expected); + } + }); +}); + +suite('Completions in extensions.json', () => { + const testFile = 'extensions.json'; + test('change recommendation', async () => { + { + const content = [ + '{', + ' "recommendations": [', + ' "|a.b"', + ' ]', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "recommendations": [', + ' "ms-vscode.js-debug"', + ' ]', + '}', + ].join('\n'); + const expected = { label: 'ms-vscode.js-debug', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + }); + test('add recommendation', async () => { + { + const content = [ + '{', + ' "recommendations": [', + ' |', + ' ]', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "recommendations": [', + ' "ms-vscode.js-debug"', + ' ]', + '}', + ].join('\n'); + const expected = { label: 'ms-vscode.js-debug', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + }); +}); + +suite('Completions in launch.json', () => { + const testFile = 'launch.json'; + test('variable completions', async () => { + { + const content = [ + '{', + ' "version": "0.2.0",', + ' "configurations": [', + ' {', + ' "name": "Run Extension",', + ' "type": "extensionHost",', + ' "preLaunchTask": "${|defaultBuildTask}"', + ' }', + ' ]', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "version": "0.2.0",', + ' "configurations": [', + ' {', + ' "name": "Run Extension",', + ' "type": "extensionHost",', + ' "preLaunchTask": "${cwd}"', + ' }', + ' ]', + '}', + ].join('\n'); + const expected = { label: '${cwd}', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + { + const content = [ + '{', + ' "version": "0.2.0",', + ' "configurations": [', + ' {', + ' "name": "Run Extension",', + ' "type": "extensionHost",', + ' "preLaunchTask": "|${defaultBuildTask}"', + ' }', + ' ]', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "version": "0.2.0",', + ' "configurations": [', + ' {', + ' "name": "Run Extension",', + ' "type": "extensionHost",', + ' "preLaunchTask": "${cwd}${defaultBuildTask}"', + ' }', + ' ]', + '}', + ].join('\n'); + const expected = { label: '${cwd}', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + { + const content = [ + '{', + ' "version": "0.2.0",', + ' "configurations": [', + ' {', + ' "name": "Do It",', + ' "program": "${workspace|"', + ' }', + ' ]', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "version": "0.2.0",', + ' "configurations": [', + ' {', + ' "name": "Do It",', + ' "program": "${cwd}"', + ' }', + ' ]', + '}', + ].join('\n'); + const expected = { label: '${cwd}', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + }); +}); + +suite('Completions in tasks.json', () => { + const testFile = 'tasks.json'; + test('variable completions', async () => { + { + const content = [ + '{', + ' "version": "0.2.0",', + ' "tasks": [', + ' {', + ' "type": "shell",', + ' "command": "${|defaultBuildTask}"', + ' }', + ' ]', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "version": "0.2.0",', + ' "tasks": [', + ' {', + ' "type": "shell",', + ' "command": "${cwd}"', + ' }', + ' ]', + '}', + ].join('\n'); + const expected = { label: '${cwd}', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + { + const content = [ + '{', + ' "version": "0.2.0",', + ' "tasks": [', + ' {', + ' "type": "shell",', + ' "command": "${defaultBuildTask}|"', + ' }', + ' ]', + '}', + ].join('\n'); + const resultText = [ + '{', + ' "version": "0.2.0",', + ' "tasks": [', + ' {', + ' "type": "shell",', + ' "command": "${defaultBuildTask}${cwd}"', + ' }', + ' ]', + '}', + ].join('\n'); + const expected = { label: '${cwd}', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + }); +}); + +suite('Completions in keybindings.json', () => { + const testFile = 'keybindings.json'; + test('context key insertion', async () => { + { + const content = [ + '[', + ' {', + ' "key": "ctrl+k ctrl+,",', + ' "command": "editor.jumpToNextFold",', + ' "when": "|"', + ' }', + ']', + ].join('\n'); + const resultText = [ + '[', + ' {', + ' "key": "ctrl+k ctrl+,",', + ' "command": "editor.jumpToNextFold",', + ' "when": "resourcePath"', + ' }', + ']', + ].join('\n'); + const expected = { label: 'resourcePath', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + }); + + test('context key replace', async () => { + { + const content = [ + '[', + ' {', + ' "key": "ctrl+k ctrl+,",', + ' "command": "editor.jumpToNextFold",', + ' "when": "resou|rcePath"', + ' }', + ']', + ].join('\n'); + const resultText = [ + '[', + ' {', + ' "key": "ctrl+k ctrl+,",', + ' "command": "editor.jumpToNextFold",', + ' "when": "resource"', + ' }', + ']', + ].join('\n'); + const expected = { label: 'resource', resultText }; + await testCompletion(testFile, 'jsonc', content, expected); + } + }); +}); + +interface ItemDescription { + label: string; + resultText?: string; + notAvailable?: boolean; +} + +async function testCompletion(testFileName: string, languageId: string, content: string, expected: ItemDescription) { + + const offset = content.indexOf('|'); + content = content.substring(0, offset) + content.substring(offset + 1); + + const docUri = vscode.Uri.file(path.join(await testFolder, testFileName)); + await fs.writeFile(docUri.fsPath, content); + + const editor = await setTestContent(docUri, languageId, content); + const position = editor.document.positionAt(offset); + + // Executing the command `vscode.executeCompletionItemProvider` to simulate triggering completion + const actualCompletions = (await vscode.commands.executeCommand('vscode.executeCompletionItemProvider', docUri, position)) as vscode.CompletionList; + + const matches = actualCompletions.items.filter(completion => { + return completion.label === expected.label; + }); + if (expected.notAvailable) { + assert.strictEqual(matches.length, 0, `${expected.label} should not existing is results`); + } else { + assert.strictEqual(matches.length, 1, `${expected.label} should only existing once: Actual: ${actualCompletions.items.map(c => c.label).join(', ')}`); + + if (expected.resultText) { + const match = matches[0]; + if (match.range && match.insertText) { + const range = match.range instanceof vscode.Range ? match.range : match.range.replacing; + const text = typeof match.insertText === 'string' ? match.insertText : match.insertText.value; + + await editor.edit(eb => eb.replace(range, text)); + assert.strictEqual(editor.document.getText(), expected.resultText); + } else { + assert.fail(`Range or insertText missing`); + } + } + } +} + +async function setTestContent(docUri: vscode.Uri, languageId: string, content: string): Promise { + const ext = vscode.extensions.getExtension('vscode.configuration-editing')!; + await ext.activate(); + + const doc = await vscode.workspace.openTextDocument(docUri); + await vscode.languages.setTextDocumentLanguage(doc, languageId); + const editor = await vscode.window.showTextDocument(doc); + + const fullRange = new vscode.Range(new vscode.Position(0, 0), doc.positionAt(doc.getText().length)); + await editor.edit(eb => eb.replace(fullRange, content)); + return editor; + +} diff --git a/extensions/vscode-notebook-tests/src/index.ts b/extensions/configuration-editing/src/test/index.ts similarity index 81% rename from extensions/vscode-notebook-tests/src/index.ts rename to extensions/configuration-editing/src/test/index.ts index 2f8fb129206..beec6063928 100644 --- a/extensions/vscode-notebook-tests/src/index.ts +++ b/extensions/configuration-editing/src/test/index.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ const path = require('path'); -const testRunner = require('../../../test/integration/electron/testrunner'); +const testRunner = require('../../../../test/integration/electron/testrunner'); const options: any = { ui: 'tdd', @@ -17,11 +17,11 @@ const options: any = { // for the test results file name let suite = ''; if (process.env.VSCODE_BROWSER) { - suite = `${process.env.VSCODE_BROWSER} Browser Integration Notebook Tests`; + suite = `${process.env.VSCODE_BROWSER} Browser Integration Configuration-Editing Tests`; } else if (process.env.REMOTE_VSCODE) { - suite = 'Remote Integration Notebook Tests'; + suite = 'Remote Integration Configuration-Editing Tests'; } else { - suite = 'Integration Notebook Tests'; + suite = 'Integration Configuration-Editing Tests'; } if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) { diff --git a/extensions/configuration-editing/yarn.lock b/extensions/configuration-editing/yarn.lock index f7ac959fc09..5bb8132d373 100644 --- a/extensions/configuration-editing/yarn.lock +++ b/extensions/configuration-editing/yarn.lock @@ -12,7 +12,7 @@ jsonc-parser@^2.2.1: resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.2.1.tgz#db73cd59d78cce28723199466b2a03d1be1df2bc" integrity sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w== -vscode-nls@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840" - integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA== +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== diff --git a/extensions/cpp/build/update-grammars.js b/extensions/cpp/build/update-grammars.js index dd265436a28..983e61488ef 100644 --- a/extensions/cpp/build/update-grammars.js +++ b/extensions/cpp/build/update-grammars.js @@ -6,12 +6,16 @@ var updateGrammar = require('vscode-grammar-updater'); -updateGrammar.update('jeff-hykin/cpp-textmate-grammar', 'syntaxes/c.tmLanguage.json', './syntaxes/c.tmLanguage.json', undefined, 'master', 'source/languages/cpp/'); -updateGrammar.update('jeff-hykin/cpp-textmate-grammar', 'syntaxes/cpp.tmLanguage.json', './syntaxes/cpp.tmLanguage.json', undefined, 'master', 'source/languages/cpp/'); -updateGrammar.update('jeff-hykin/cpp-textmate-grammar', 'syntaxes/cpp.embedded.macro.tmLanguage.json', './syntaxes/cpp.embedded.macro.tmLanguage.json', undefined, 'master', 'source/languages/cpp/'); +async function updateGrammars() { + await updateGrammar.update('jeff-hykin/better-c-syntax', 'autogenerated/c.tmLanguage.json', './syntaxes/c.tmLanguage.json', undefined, 'master'); + await updateGrammar.update('jeff-hykin/better-cpp-syntax', 'autogenerated/cpp.tmLanguage.json', './syntaxes/cpp.tmLanguage.json', undefined, 'master'); + await updateGrammar.update('jeff-hykin/better-cpp-syntax', 'autogenerated/cpp.embedded.macro.tmLanguage.json', './syntaxes/cpp.embedded.macro.tmLanguage.json', undefined, 'master'); -updateGrammar.update('NVIDIA/cuda-cpp-grammar', 'syntaxes/cuda-cpp.tmLanguage.json', './syntaxes/cuda-cpp.tmLanguage.json', undefined, 'master'); + await updateGrammar.update('NVIDIA/cuda-cpp-grammar', 'syntaxes/cuda-cpp.tmLanguage.json', './syntaxes/cuda-cpp.tmLanguage.json', undefined, 'master'); // `source.c.platform` which is still included by other grammars -updateGrammar.update('textmate/c.tmbundle', 'Syntaxes/Platform.tmLanguage', './syntaxes/platform.tmLanguage.json'); + await updateGrammar.update('textmate/c.tmbundle', 'Syntaxes/Platform.tmLanguage', './syntaxes/platform.tmLanguage.json'); +} + +updateGrammars(); diff --git a/extensions/cpp/cgmanifest.json b/extensions/cpp/cgmanifest.json index f2bf269a5f4..92d0016b0e6 100644 --- a/extensions/cpp/cgmanifest.json +++ b/extensions/cpp/cgmanifest.json @@ -4,14 +4,27 @@ "component": { "type": "git", "git": { - "name": "jeff-hykin/cpp-textmate-grammar", - "repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar", - "commitHash": "db3f4e4a5d8335b2f6d689bec490c23f8313630f" + "name": "jeff-hykin/better-cpp-syntax", + "repositoryUrl": "https://github.com/jeff-hykin/better-cpp-syntax", + "commitHash": "32be139c7d3cdf07195af4b3a5c639ebf4e3b356" } }, "license": "MIT", - "version": "1.15.6", - "description": "The files syntaxes/c.json and syntaxes/c++.json were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle." + "version": "1.15.23", + "description": "The original JSON grammars were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle." + }, + { + "component": { + "type": "git", + "git": { + "name": "jeff-hykin/better-c-syntax", + "repositoryUrl": "https://github.com/jeff-hykin/better-c-syntax", + "commitHash": "34712a6106a4ffb0a04d2fa836fd28ff6c5849a4" + } + }, + "license": "MIT", + "version": "1.13.2", + "description": "The original JSON grammars were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle." }, { "component": { diff --git a/extensions/cpp/language-configuration.json b/extensions/cpp/language-configuration.json index 9a88814ff35..0f365702269 100644 --- a/extensions/cpp/language-configuration.json +++ b/extensions/cpp/language-configuration.json @@ -13,7 +13,8 @@ { "open": "{", "close": "}" }, { "open": "(", "close": ")" }, { "open": "'", "close": "'", "notIn": ["string", "comment"] }, - { "open": "\"", "close": "\"", "notIn": ["string"] } + { "open": "\"", "close": "\"", "notIn": ["string"] }, + { "open": "/*", "close": "*/", "notIn": ["string", "comment"] } ], "surroundingPairs": [ ["{", "}"], diff --git a/extensions/cpp/syntaxes/c.tmLanguage.json b/extensions/cpp/syntaxes/c.tmLanguage.json index 80852872cd8..47f73833ed2 100644 --- a/extensions/cpp/syntaxes/c.tmLanguage.json +++ b/extensions/cpp/syntaxes/c.tmLanguage.json @@ -1,10 +1,10 @@ { "information_for_contributors": [ - "This file has been converted from https://github.com/jeff-hykin/cpp-textmate-grammar/blob/master/syntaxes/c.tmLanguage.json", + "This file has been converted from https://github.com/jeff-hykin/better-c-syntax/blob/master/autogenerated/c.tmLanguage.json", "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/0ef79f098ed80ce5a86be4ed40f99ebcdbac4895", + "version": "https://github.com/jeff-hykin/better-c-syntax/commit/34712a6106a4ffb0a04d2fa836fd28ff6c5849a4", "name": "C", "scopeName": "source.c", "patterns": [ @@ -27,35 +27,28 @@ "include": "#switch_statement" }, { - "match": "\\b(break|continue|do|else|for|goto|if|_Pragma|return|while)\\b", - "name": "keyword.control.c" + "include": "#anon_pattern_1" }, { "include": "#storage_types" }, { - "match": "typedef", - "name": "keyword.other.typedef.c" + "include": "#anon_pattern_2" }, { - "match": "\\b(const|extern|register|restrict|static|volatile|inline)\\b", - "name": "storage.modifier.c" + "include": "#anon_pattern_3" }, { - "match": "\\bk[A-Z]\\w*\\b", - "name": "constant.other.variable.mac-classic.c" + "include": "#anon_pattern_4" }, { - "match": "\\bg[A-Z]\\w*\\b", - "name": "variable.other.readwrite.global.mac-classic.c" + "include": "#anon_pattern_5" }, { - "match": "\\bs[A-Z]\\w*\\b", - "name": "variable.other.readwrite.static.mac-classic.c" + "include": "#anon_pattern_6" }, { - "match": "\\b(NULL|true|false|TRUE|FALSE)\\b", - "name": "constant.language.c" + "include": "#anon_pattern_7" }, { "include": "#operators" @@ -67,6 +60,183 @@ "include": "#strings" }, { + "include": "#anon_pattern_range_1" + }, + { + "include": "#anon_pattern_range_2" + }, + { + "include": "#anon_pattern_range_3" + }, + { + "include": "#pragma-mark" + }, + { + "include": "#anon_pattern_range_4" + }, + { + "include": "#anon_pattern_range_5" + }, + { + "include": "#anon_pattern_range_6" + }, + { + "include": "#anon_pattern_8" + }, + { + "include": "#anon_pattern_9" + }, + { + "include": "#anon_pattern_10" + }, + { + "include": "#anon_pattern_11" + }, + { + "include": "#anon_pattern_12" + }, + { + "include": "#anon_pattern_13" + }, + { + "include": "#block" + }, + { + "include": "#parens" + }, + { + "include": "#anon_pattern_range_7" + }, + { + "include": "#line_continuation_character" + }, + { + "include": "#anon_pattern_range_8" + }, + { + "include": "#anon_pattern_range_9" + }, + { + "include": "#anon_pattern_14" + }, + { + "include": "#anon_pattern_15" + } + ], + "repository": { + "access-method": { + "name": "meta.function-call.member.c", + "begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()", + "beginCaptures": { + "1": { + "name": "variable.object.c" + }, + "2": { + "name": "punctuation.separator.dot-access.c" + }, + "3": { + "name": "punctuation.separator.pointer-access.c" + }, + "4": { + "patterns": [ + { + "match": "\\.", + "name": "punctuation.separator.dot-access.c" + }, + { + "match": "->", + "name": "punctuation.separator.pointer-access.c" + }, + { + "match": "[a-zA-Z_][a-zA-Z_0-9]*", + "name": "variable.object.c" + }, + { + "name": "everything.else.c", + "match": ".+" + } + ] + }, + "5": { + "name": "entity.name.function.member.c" + }, + "6": { + "name": "punctuation.section.arguments.begin.bracket.round.function.member.c" + } + }, + "end": "\\)", + "endCaptures": { + "0": { + "name": "punctuation.section.arguments.end.bracket.round.function.member.c" + } + }, + "patterns": [ + { + "include": "#function-call-innards" + } + ] + }, + "anon_pattern_1": { + "match": "\\b(break|continue|do|else|for|goto|if|_Pragma|return|while)\\b", + "name": "keyword.control.c" + }, + "anon_pattern_10": { + "match": "(?x) \\b\n(int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t\n|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t\n|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t\n|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t\n|uintmax_t|uintmax_t)\n\\b", + "name": "support.type.stdint.c" + }, + "anon_pattern_11": { + "match": "\\b(noErr|kNilOptions|kInvalidID|kVariableLengthArray)\\b", + "name": "support.constant.mac-classic.c" + }, + "anon_pattern_12": { + "match": "(?x) \\b\n(AbsoluteTime|Boolean|Byte|ByteCount|ByteOffset|BytePtr|CompTimeValue|ConstLogicalAddress|ConstStrFileNameParam\n|ConstStringPtr|Duration|Fixed|FixedPtr|Float32|Float32Point|Float64|Float80|Float96|FourCharCode|Fract|FractPtr\n|Handle|ItemCount|LogicalAddress|OptionBits|OSErr|OSStatus|OSType|OSTypePtr|PhysicalAddress|ProcessSerialNumber\n|ProcessSerialNumberPtr|ProcHandle|Ptr|ResType|ResTypePtr|ShortFixed|ShortFixedPtr|SignedByte|SInt16|SInt32|SInt64\n|SInt8|Size|StrFileName|StringHandle|StringPtr|TimeBase|TimeRecord|TimeScale|TimeValue|TimeValue64|UInt16|UInt32\n|UInt64|UInt8|UniChar|UniCharCount|UniCharCountPtr|UniCharPtr|UnicodeScalarValue|UniversalProcHandle|UniversalProcPtr\n|UnsignedFixed|UnsignedFixedPtr|UnsignedWide|UTF16Char|UTF32Char|UTF8Char)\n\\b", + "name": "support.type.mac-classic.c" + }, + "anon_pattern_13": { + "match": "\\b([A-Za-z0-9_]+_t)\\b", + "name": "support.type.posix-reserved.c" + }, + "anon_pattern_14": { + "match": ";", + "name": "punctuation.terminator.statement.c" + }, + "anon_pattern_15": { + "match": ",", + "name": "punctuation.separator.delimiter.c" + }, + "anon_pattern_2": { + "match": "typedef", + "name": "keyword.other.typedef.c" + }, + "anon_pattern_3": { + "match": "\\b(const|extern|register|restrict|static|volatile|inline)\\b", + "name": "storage.modifier.c" + }, + "anon_pattern_4": { + "match": "\\bk[A-Z]\\w*\\b", + "name": "constant.other.variable.mac-classic.c" + }, + "anon_pattern_5": { + "match": "\\bg[A-Z]\\w*\\b", + "name": "variable.other.readwrite.global.mac-classic.c" + }, + "anon_pattern_6": { + "match": "\\bs[A-Z]\\w*\\b", + "name": "variable.other.readwrite.static.mac-classic.c" + }, + "anon_pattern_7": { + "match": "\\b(NULL|true|false|TRUE|FALSE)\\b", + "name": "constant.language.c" + }, + "anon_pattern_8": { + "match": "\\b(u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t)\\b", + "name": "support.type.sys-types.c" + }, + "anon_pattern_9": { + "match": "\\b(pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t)\\b", + "name": "support.type.pthread.c" + }, + "anon_pattern_range_1": { "name": "meta.preprocessor.macro.c", "begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((#)\\s*define\\b)\\s+((?))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()", - "beginCaptures": { - "1": { - "name": "variable.object.c" - }, - "2": { - "name": "punctuation.separator.dot-access.c" - }, - "3": { - "name": "punctuation.separator.pointer-access.c" - }, - "4": { - "patterns": [ - { - "match": "\\.", - "name": "punctuation.separator.dot-access.c" - }, - { - "match": "->", - "name": "punctuation.separator.pointer-access.c" - }, - { - "match": "[a-zA-Z_][a-zA-Z_0-9]*", - "name": "variable.object.c" - }, - { - "name": "everything.else.c", - "match": ".+" - } - ] - }, - "5": { - "name": "entity.name.function.member.c" - }, - "6": { - "name": "punctuation.section.arguments.begin.bracket.round.function.member.c" - } - }, - "end": "\\)", - "endCaptures": { - "0": { - "name": "punctuation.section.arguments.end.bracket.round.function.member.c" - } - }, - "patterns": [ - { - "include": "#function-call-innards" - } - ] - }, "backslash_escapes": { "match": "(?x)\\\\ (\n\\\\\t\t\t |\n[abefnprtv'\"?] |\n[0-3][0-7]{,2}\t |\n[4-7]\\d?\t\t|\nx[a-fA-F0-9]{,2} |\nu[a-fA-F0-9]{,4} |\nU[a-fA-F0-9]{,8} )", "name": "constant.character.escape.c" @@ -491,6 +563,40 @@ } ] }, + "block_comment": { + "patterns": [ + { + "begin": "\\s*+(\\/\\*)", + "end": "\\*\\/", + "beginCaptures": { + "1": { + "name": "punctuation.definition.comment.begin.c" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.comment.end.c" + } + }, + "name": "comment.block.c" + }, + { + "begin": "\\s*+(\\/\\*)", + "end": "\\*\\/", + "beginCaptures": { + "1": { + "name": "punctuation.definition.comment.begin.c" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.comment.end.c" + } + }, + "name": "comment.block.c" + } + ] + }, "block_innards": { "patterns": [ { @@ -557,7 +663,7 @@ "include": "#parens-block" }, { - "include": "$base" + "include": "$self" } ] }, @@ -632,339 +738,359 @@ "comments": { "patterns": [ { - "name": "comment.line.double-slash.documentation.c", - "begin": "(?:^)(?>\\s*)(\\/\\/[!\\/]+)", - "beginCaptures": { - "1": { - "name": "punctuation.definition.comment.documentation.c" - } - }, - "end": "(?<=\\n)(?|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?", - "name": "storage.type.class.doxygen.c" - }, - { - "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)", - "captures": { - "1": { - "name": "storage.type.class.doxygen.c" - }, - "2": { - "name": "markup.italic.doxygen.c" - } - } - }, - { - "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)", - "captures": { - "1": { - "name": "storage.type.class.doxygen.c" - }, - "2": { - "name": "markup.bold.doxygen.c" - } - } - }, - { - "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)", - "captures": { - "1": { - "name": "storage.type.class.doxygen.c" - }, - "2": { - "name": "markup.inline.raw.string.c" - } - } - }, - { - "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?", - "name": "storage.type.class.doxygen.c" - }, - { - "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?", - "name": "storage.type.class.doxygen.c" - }, - { - "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)", - "captures": { - "1": { - "name": "storage.type.class.doxygen.c" - }, - "2": { + "patterns": [ + { + "name": "comment.line.double-slash.documentation.c", + "begin": "(?:^)(?>\\s*)(\\/\\/[!\\/]+)", + "beginCaptures": { + "1": { + "name": "punctuation.definition.comment.documentation.c" + } + }, + "end": "(?<=\\n)(?|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?", + "name": "storage.type.class.doxygen.c" + }, + { + "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)", + "captures": { + "1": { + "name": "storage.type.class.doxygen.c" + }, + "2": { + "name": "markup.italic.doxygen.c" + } + } + }, + { + "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)", + "captures": { + "1": { + "name": "storage.type.class.doxygen.c" + }, + "2": { + "name": "markup.bold.doxygen.c" + } + } + }, + { + "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)", + "captures": { + "1": { + "name": "storage.type.class.doxygen.c" + }, + "2": { + "name": "markup.inline.raw.string.c" + } + } + }, + { + "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?", + "name": "storage.type.class.doxygen.c" + }, + { + "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?", + "name": "storage.type.class.doxygen.c" + }, + { + "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)", + "captures": { + "1": { + "name": "storage.type.class.doxygen.c" + }, + "2": { + "patterns": [ + { + "match": "in|out", + "name": "keyword.other.parameter.direction.$0.c" + } + ] + }, + "3": { + "name": "variable.parameter.c" + } + } + }, + { + "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?", + "name": "storage.type.class.doxygen.c" + }, + { + "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?", + "name": "storage.type.class.doxygen.c" + }, + { + "match": "(?:\\b[A-Z]+:|@[a-z_]+:)", + "name": "storage.type.class.gtkdoc" } ] }, - "3": { - "name": "variable.parameter.c" - } - } - }, - { - "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?", - "name": "storage.type.class.doxygen.c" - }, - { - "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?", - "name": "storage.type.class.doxygen.c" - }, - { - "match": "(?:\\b[A-Z]+:|@[a-z_]+:)", - "name": "storage.type.class.gtkdoc" - } - ] - }, - { - "match": "(\\/\\*[!*]+(?=\\s))(.+)([!*]*\\*\\/)", - "captures": { - "1": { - "name": "punctuation.definition.comment.begin.documentation.c" - }, - "2": { - "patterns": [ { - "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?", - "name": "storage.type.class.doxygen.c" - }, - { - "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)", + "match": "(\\/\\*[!*]+(?=\\s))(.+)([!*]*\\*\\/)", "captures": { "1": { - "name": "storage.type.class.doxygen.c" - }, - "2": { - "name": "markup.italic.doxygen.c" - } - } - }, - { - "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)", - "captures": { - "1": { - "name": "storage.type.class.doxygen.c" - }, - "2": { - "name": "markup.bold.doxygen.c" - } - } - }, - { - "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)", - "captures": { - "1": { - "name": "storage.type.class.doxygen.c" - }, - "2": { - "name": "markup.inline.raw.string.c" - } - } - }, - { - "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?", - "name": "storage.type.class.doxygen.c" - }, - { - "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?", - "name": "storage.type.class.doxygen.c" - }, - { - "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)", - "captures": { - "1": { - "name": "storage.type.class.doxygen.c" + "name": "punctuation.definition.comment.begin.documentation.c" }, "2": { "patterns": [ { - "match": "in|out", - "name": "keyword.other.parameter.direction.$0.c" + "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?", + "name": "storage.type.class.doxygen.c" + }, + { + "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)", + "captures": { + "1": { + "name": "storage.type.class.doxygen.c" + }, + "2": { + "name": "markup.italic.doxygen.c" + } + } + }, + { + "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)", + "captures": { + "1": { + "name": "storage.type.class.doxygen.c" + }, + "2": { + "name": "markup.bold.doxygen.c" + } + } + }, + { + "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)", + "captures": { + "1": { + "name": "storage.type.class.doxygen.c" + }, + "2": { + "name": "markup.inline.raw.string.c" + } + } + }, + { + "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?", + "name": "storage.type.class.doxygen.c" + }, + { + "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?", + "name": "storage.type.class.doxygen.c" + }, + { + "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)", + "captures": { + "1": { + "name": "storage.type.class.doxygen.c" + }, + "2": { + "patterns": [ + { + "match": "in|out", + "name": "keyword.other.parameter.direction.$0.c" + } + ] + }, + "3": { + "name": "variable.parameter.c" + } + } + }, + { + "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?", + "name": "storage.type.class.doxygen.c" + }, + { + "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?", + "name": "storage.type.class.doxygen.c" + }, + { + "match": "(?:\\b[A-Z]+:|@[a-z_]+:)", + "name": "storage.type.class.gtkdoc" } ] }, "3": { - "name": "variable.parameter.c" + "name": "punctuation.definition.comment.end.documentation.c" + } + }, + "name": "comment.block.documentation.c" + }, + { + "name": "comment.block.documentation.c", + "begin": "((?>\\s*)\\/\\*[!*]+(?:(?:\\n|$)|(?=\\s)))", + "beginCaptures": { + "1": { + "name": "punctuation.definition.comment.begin.documentation.c" + } + }, + "end": "([!*]*\\*\\/)", + "endCaptures": { + "1": { + "name": "punctuation.definition.comment.end.documentation.c" + } + }, + "patterns": [ + { + "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?", + "name": "storage.type.class.doxygen.c" + }, + { + "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)", + "captures": { + "1": { + "name": "storage.type.class.doxygen.c" + }, + "2": { + "name": "markup.italic.doxygen.c" + } + } + }, + { + "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)", + "captures": { + "1": { + "name": "storage.type.class.doxygen.c" + }, + "2": { + "name": "markup.bold.doxygen.c" + } + } + }, + { + "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)", + "captures": { + "1": { + "name": "storage.type.class.doxygen.c" + }, + "2": { + "name": "markup.inline.raw.string.c" + } + } + }, + { + "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?", + "name": "storage.type.class.doxygen.c" + }, + { + "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?", + "name": "storage.type.class.doxygen.c" + }, + { + "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)", + "captures": { + "1": { + "name": "storage.type.class.doxygen.c" + }, + "2": { + "patterns": [ + { + "match": "in|out", + "name": "keyword.other.parameter.direction.$0.c" + } + ] + }, + "3": { + "name": "variable.parameter.c" + } + } + }, + { + "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?", + "name": "storage.type.class.doxygen.c" + }, + { + "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?", + "name": "storage.type.class.doxygen.c" + }, + { + "match": "(?:\\b[A-Z]+:|@[a-z_]+:)", + "name": "storage.type.class.gtkdoc" + } + ] + }, + { + "match": "^\\/\\* =(\\s*.*?)\\s*= \\*\\/$\\n?", + "captures": { + "1": { + "name": "meta.toc-list.banner.block.c" + } + }, + "name": "comment.block.banner.c" + }, + { + "name": "comment.block.c", + "begin": "(\\/\\*)", + "beginCaptures": { + "1": { + "name": "punctuation.definition.comment.begin.c" + } + }, + "end": "(\\*\\/)", + "endCaptures": { + "1": { + "name": "punctuation.definition.comment.end.c" } } }, { - "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?", - "name": "storage.type.class.doxygen.c" + "match": "^\\/\\/ =(\\s*.*?)\\s*=$\\n?", + "captures": { + "1": { + "name": "meta.toc-list.banner.line.c" + } + }, + "name": "comment.line.banner.c" }, { - "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?", - "name": "storage.type.class.doxygen.c" - }, - { - "match": "(?:\\b[A-Z]+:|@[a-z_]+:)", - "name": "storage.type.class.gtkdoc" - } - ] - }, - "3": { - "name": "punctuation.definition.comment.end.documentation.c" - } - }, - "name": "comment.block.documentation.c" - }, - { - "name": "comment.block.documentation.c", - "begin": "((?>\\s*)\\/\\*[!*]+(?:(?:\\n|$)|(?=\\s)))", - "beginCaptures": { - "1": { - "name": "punctuation.definition.comment.begin.documentation.c" - } - }, - "end": "([!*]*\\*\\/)", - "endCaptures": { - "1": { - "name": "punctuation.definition.comment.end.documentation.c" - } - }, - "patterns": [ - { - "match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?", - "name": "storage.type.class.doxygen.c" - }, - { - "match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)", - "captures": { - "1": { - "name": "storage.type.class.doxygen.c" - }, - "2": { - "name": "markup.italic.doxygen.c" - } - } - }, - { - "match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)", - "captures": { - "1": { - "name": "storage.type.class.doxygen.c" - }, - "2": { - "name": "markup.bold.doxygen.c" - } - } - }, - { - "match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)", - "captures": { - "1": { - "name": "storage.type.class.doxygen.c" - }, - "2": { - "name": "markup.inline.raw.string.c" - } - } - }, - { - "match": "(?<=[\\s*!\\/])[\\\\@](?:a|anchor|b|c|cite|copybrief|copydetail|copydoc|def|dir|dontinclude|e|em|emoji|enum|example|extends|file|idlexcept|implements|include|includedoc|includelineno|latexinclude|link|memberof|namespace|p|package|ref|refitem|related|relates|relatedalso|relatesalso|verbinclude)\\b(?:\\{[^}]*\\})?", - "name": "storage.type.class.doxygen.c" - }, - { - "match": "(?<=[\\s*!\\/])[\\\\@](?:addindex|addtogroup|category|class|defgroup|diafile|dotfile|elseif|fn|headerfile|if|ifnot|image|ingroup|interface|line|mainpage|mscfile|name|overload|page|property|protocol|section|skip|skipline|snippet|snippetdoc|snippetlineno|struct|subpage|subsection|subsubsection|typedef|union|until|vhdlflow|weakgroup)\\b(?:\\{[^}]*\\})?", - "name": "storage.type.class.doxygen.c" - }, - { - "match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)", - "captures": { - "1": { - "name": "storage.type.class.doxygen.c" - }, - "2": { + "begin": "((?:^[ \\t]+)?)(?=\\/\\/)", + "beginCaptures": { + "1": { + "name": "punctuation.whitespace.comment.leading.c" + } + }, + "end": "(?!\\G)", "patterns": [ { - "match": "in|out", - "name": "keyword.other.parameter.direction.$0.c" + "name": "comment.line.double-slash.c", + "begin": "(\\/\\/)", + "beginCaptures": { + "1": { + "name": "punctuation.definition.comment.c" + } + }, + "end": "(?=\\n)", + "patterns": [ + { + "include": "#line_continuation_character" + } + ] } ] - }, - "3": { - "name": "variable.parameter.c" - } - } - }, - { - "match": "(?<=[\\s*!\\/])[\\\\@](?:arg|attention|author|authors|brief|bug|copyright|date|deprecated|details|exception|invariant|li|note|par|paragraph|param|post|pre|remark|remarks|result|return|returns|retval|sa|see|short|since|test|throw|todo|tparam|version|warning|xrefitem)\\b(?:\\{[^}]*\\})?", - "name": "storage.type.class.doxygen.c" - }, - { - "match": "(?<=[\\s*!\\/])[\\\\@](?:code|cond|docbookonly|dot|htmlonly|internal|latexonly|link|manonly|msc|parblock|rtfonly|secreflist|uml|verbatim|xmlonly|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|enduml|endverbatim|endxmlonly)\\b(?:\\{[^}]*\\})?", - "name": "storage.type.class.doxygen.c" - }, - { - "match": "(?:\\b[A-Z]+:|@[a-z_]+:)", - "name": "storage.type.class.gtkdoc" - } - ] - }, - { - "match": "^\\/\\* =(\\s*.*?)\\s*= \\*\\/$\\n?", - "captures": { - "1": { - "name": "meta.toc-list.banner.block.c" - } - }, - "name": "comment.block.banner.c" - }, - { - "name": "comment.block.c", - "begin": "(\\/\\*)", - "beginCaptures": { - "1": { - "name": "punctuation.definition.comment.begin.c" - } - }, - "end": "(\\*\\/)", - "endCaptures": { - "1": { - "name": "punctuation.definition.comment.end.c" - } - } - }, - { - "match": "^\\/\\/ =(\\s*.*?)\\s*=$\\n?", - "captures": { - "1": { - "name": "meta.toc-list.banner.line.c" - } - }, - "name": "comment.line.banner.c" - }, - { - "begin": "((?:^[ \\t]+)?)(?=\\/\\/)", - "beginCaptures": { - "1": { - "name": "punctuation.whitespace.comment.leading.c" - } - }, - "end": "(?!\\G)", - "patterns": [ - { - "name": "comment.line.double-slash.c", - "begin": "(\\/\\/)", - "beginCaptures": { - "1": { - "name": "punctuation.definition.comment.c" - } - }, - "end": "(?=\\n)", - "patterns": [ - { - "include": "#line_continuation_character" } ] + }, + { + "include": "#block_comment" + }, + { + "include": "#line_comment" } ] + }, + { + "include": "#block_comment" + }, + { + "include": "#line_comment" } ] }, @@ -1034,7 +1160,7 @@ "include": "#function-call-innards" }, { - "include": "$base" + "include": "$self" } ] }, @@ -1161,32 +1287,122 @@ ] }, { - "include": "$base" + "include": "$self" } ] }, "inline_comment": { - "match": "(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/))", - "captures": { - "1": { - "name": "comment.block.c punctuation.definition.comment.begin.c" - }, - "2": { - "name": "comment.block.c" - }, - "3": { + "patterns": [ + { "patterns": [ { - "match": "\\*\\/", - "name": "comment.block.c punctuation.definition.comment.end.c" + "match": "(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/))", + "captures": { + "1": { + "name": "comment.block.c punctuation.definition.comment.begin.c" + }, + "2": { + "name": "comment.block.c" + }, + "3": { + "patterns": [ + { + "match": "\\*\\/", + "name": "comment.block.c punctuation.definition.comment.end.c" + }, + { + "match": "\\*", + "name": "comment.block.c" + } + ] + } + } }, { - "match": "\\*", + "match": "(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/))", + "captures": { + "1": { + "name": "comment.block.c punctuation.definition.comment.begin.c" + }, + "2": { + "name": "comment.block.c" + }, + "3": { + "patterns": [ + { + "match": "\\*\\/", + "name": "comment.block.c punctuation.definition.comment.end.c" + }, + { + "match": "\\*", + "name": "comment.block.c" + } + ] + } + } + } + ] + }, + { + "match": "(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/))", + "captures": { + "1": { + "name": "comment.block.c punctuation.definition.comment.begin.c" + }, + "2": { "name": "comment.block.c" + }, + "3": { + "patterns": [ + { + "match": "\\*\\/", + "name": "comment.block.c punctuation.definition.comment.end.c" + }, + { + "match": "\\*", + "name": "comment.block.c" + } + ] + } + } + } + ] + }, + "line_comment": { + "patterns": [ + { + "begin": "\\s*+(\\/\\/)", + "end": "(?<=\\n)(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))::((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())", + "begin": "\\s*+((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))::((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())", "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\{)", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\{)", "end": "\\}|(?=(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(~(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(~(?|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))::((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))~\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())", + "begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))::((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))~\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())", "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?((?:error|warning)))\\b(?:(?:\\s)+)?", - "end": "(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?(::))?(?:(?:\\s)+)?((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?(::))?(?:(?:\\s)+)?((?|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?(\\()", + "begin": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?(\\()", "end": "\\)|(?=(?))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\()", + "begin": "(?:(?:^|\\G|(?<=;|\\}))|(?<=>))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\()", "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))", + "match": "((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))", "captures": { "1": { "name": "storage.modifier.$1.cpp" @@ -3998,7 +3992,7 @@ ] }, { - "match": "(?<=^|\\))(?:(?:\\s)+)?(->)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)?(?![\\w<:.]))", + "match": "(?<=^|\\))(?:(?:\\s)+)?(->)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)?(?![\\w<:.]))", "captures": { "1": { "name": "punctuation.definition.function.return-type.cpp" @@ -4246,7 +4240,7 @@ ] }, "function_pointer": { - "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", "end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", "end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)?(?![\\w<:.]))", + "match": "(?<=protected|virtual|private|public|,|:)(?:(?:\\s)+)?(?!(?:(?:(?:protected)|(?:private)|(?:public))|virtual))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)?(?![\\w<:.]))", "captures": { "1": { "name": "meta.qualified_type.cpp", @@ -5340,15 +5334,23 @@ "name": "storage.modifier.lambda.$0.cpp" }, { - "match": "(->)((?:.+?(?=\\{|$))?)", - "captures": { - "1": { + "begin": "->", + "end": "(?=\\{)|(?=(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?line\\b", - "end": "(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?define\\b)(?:(?:\\s)+)?((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<4>?)+>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<4>?)+>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(operator)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(?:(?:((?:(?:delete\\[\\])|(?:delete)|(?:new\\[\\])|(?:<=>)|(?:<<=)|(?:new)|(?:>>=)|(?:\\->\\*)|(?:\\/=)|(?:%=)|(?:&=)|(?:>=)|(?:\\|=)|(?:\\+\\+)|(?:\\-\\-)|(?:\\(\\))|(?:\\[\\])|(?:\\->)|(?:\\+\\+)|(?:<<)|(?:>>)|(?:\\-\\-)|(?:<=)|(?:\\^=)|(?:==)|(?:!=)|(?:&&)|(?:\\|\\|)|(?:\\+=)|(?:\\-=)|(?:\\*=)|,|(?:\\+)|(?:\\-)|!|~|(?:\\*)|&|(?:\\*)|(?:\\/)|%|(?:\\+)|(?:\\-)|<|>|&|(?:\\^)|(?:\\|)|=))|((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:\\[\\])?)))|(\"\")((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\<|\\()", + "begin": "(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(operator)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(?:(?:((?:(?:delete\\[\\])|(?:delete)|(?:new\\[\\])|(?:<=>)|(?:<<=)|(?:new)|(?:>>=)|(?:\\->\\*)|(?:\\/=)|(?:%=)|(?:&=)|(?:>=)|(?:\\|=)|(?:\\+\\+)|(?:\\-\\-)|(?:\\(\\))|(?:\\[\\])|(?:\\->)|(?:\\+\\+)|(?:<<)|(?:>>)|(?:\\-\\-)|(?:<=)|(?:\\^=)|(?:==)|(?:!=)|(?:&&)|(?:\\|\\|)|(?:\\+=)|(?:\\-=)|(?:\\*=)|,|(?:\\+)|(?:\\-)|!|~|(?:\\*)|&|(?:\\*)|(?:\\/)|%|(?:\\+)|(?:\\-)|<|>|&|(?:\\^)|(?:\\|)|=))|((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:\\[\\])?)))|(\"\")((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\<|\\()", "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))", + "captures": { + "1": { + "name": "keyword.operator.assignment.cpp" + }, + "2": { + "patterns": [ + { + "include": "source.cpp#inline_comment" + } + ] + }, + "3": { + "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" + }, + "4": { + "name": "comment.block.cpp" + }, + "5": { + "patterns": [ + { + "match": "\\*\\/", + "name": "comment.block.cpp punctuation.definition.comment.end.cpp" + }, + { + "match": "\\*", + "name": "comment.block.cpp" + } + ] + }, + "6": { + "name": "keyword.other.default.function.cpp" + }, + "7": { + "name": "keyword.other.delete.function.cpp" + } + } + }, { "include": "$self" } @@ -6912,14 +6954,14 @@ }, { "match": "&|\\||\\^|~", - "name": "keyword.operator.cpp" + "name": "keyword.operator.bitwise.cpp" }, { "include": "source.cpp#assignment_operator" }, { "match": "%|\\*|\\/|-|\\+", - "name": "keyword.operator.cpp" + "name": "keyword.operator.arithmetic.cpp" }, { "include": "#ternary_operator" @@ -6976,7 +7018,7 @@ "include": "source.cpp#vararg_ellipses" }, { - "match": "((?:((?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)", + "match": "((?:((?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)", "captures": { "1": { "patterns": [ @@ -7356,7 +7398,7 @@ "include": "source.cpp#vararg_ellipses" }, { - "match": "((?:((?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)", + "match": "((?:((?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)", "captures": { "1": { "patterns": [ @@ -7708,7 +7750,7 @@ }, "pragma": { "begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?pragma\\b", - "end": "(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", "end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<6>?)+>)(?:\\s)*+)?::)*\\s*+)?((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<6>?)+>)(?:\\s)*+)?::)*\\s*+)?((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?|\\?\\?>)|(?=[;>\\[\\]=]))", "beginCaptures": { "0": { @@ -1653,10 +1650,10 @@ ] }, "6": { - "name": "keyword.other.default.constructor.cpp" + "name": "keyword.other.default.function.cpp keyword.other.default.constructor.cpp" }, "7": { - "name": "keyword.other.delete.constructor.cpp" + "name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp" } } }, @@ -1804,7 +1801,7 @@ ] }, "constructor_root": { - "begin": "\\s*+((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))::((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())", + "begin": "\\s*+((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))::((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())", "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))", "beginCaptures": { "0": { @@ -2028,10 +2025,10 @@ ] }, "6": { - "name": "keyword.other.default.constructor.cpp" + "name": "keyword.other.default.function.cpp keyword.other.default.constructor.cpp" }, "7": { - "name": "keyword.other.delete.constructor.cpp" + "name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp" } } }, @@ -2285,7 +2282,7 @@ ] }, "curly_initializer": { - "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\{)", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\{)", "end": "\\}", "beginCaptures": { "1": { @@ -3126,14 +3123,11 @@ "patterns": [ { "include": "#evaluation_context" - }, - { - "include": "#c_conditional_context" } ] }, "destructor_inline": { - "begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(~(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(~(?|\\?\\?>)|(?=[;>\\[\\]=]))", "beginCaptures": { "0": { @@ -3302,10 +3296,10 @@ ] }, "6": { - "name": "keyword.other.default.constructor.cpp" + "name": "keyword.other.default.function.cpp keyword.other.default.constructor.cpp keyword.other.default.destructor.cpp" }, "7": { - "name": "keyword.other.delete.constructor.cpp" + "name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp keyword.other.delete.destructor.cpp" } } }, @@ -3369,7 +3363,7 @@ ] }, "destructor_root": { - "begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))::((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))~\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())", + "begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))::((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))~\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())", "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))", "beginCaptures": { "0": { @@ -3593,10 +3587,10 @@ ] }, "6": { - "name": "keyword.other.default.constructor.cpp" + "name": "keyword.other.default.function.cpp keyword.other.default.constructor.cpp keyword.other.default.destructor.cpp" }, "7": { - "name": "keyword.other.delete.constructor.cpp" + "name": "keyword.other.delete.function.cpp keyword.other.delete.constructor.cpp keyword.other.delete.destructor.cpp" } } }, @@ -3661,7 +3655,7 @@ }, "diagnostic": { "begin": "(^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?((?:error|warning)))\\b(?:(?:\\s)+)?", - "end": "(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?(::))?(?:(?:\\s)+)?((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?(::))?(?:(?:\\s)+)?((?|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))", "beginCaptures": { "0": { @@ -4525,7 +4519,7 @@ ] }, "function_call": { - "begin": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?(\\()", + "begin": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?(\\()", "end": "\\)", "beginCaptures": { "1": { @@ -4599,7 +4593,7 @@ ] }, "function_definition": { - "begin": "(?:(?:^|\\G|(?<=;|\\}))|(?<=>))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\()", + "begin": "(?:(?:^|\\G|(?<=;|\\}))|(?<=>))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\()", "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))", "beginCaptures": { "0": { @@ -4671,7 +4665,7 @@ "11": { "patterns": [ { - "match": "((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))", + "match": "((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))", "captures": { "1": { "name": "storage.modifier.$1.cpp" @@ -5162,7 +5156,7 @@ ] }, { - "match": "(?<=^|\\))(?:(?:\\s)+)?(->)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)?(?![\\w<:.]))", + "match": "(?<=^|\\))(?:(?:\\s)+)?(->)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)?(?![\\w<:.]))", "captures": { "1": { "name": "punctuation.definition.function.return-type.cpp" @@ -5410,7 +5404,7 @@ ] }, "function_pointer": { - "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", "end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()", "beginCaptures": { "1": { @@ -5761,7 +5755,7 @@ ] }, "function_pointer_parameter": { - "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", "end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()", "beginCaptures": { "1": { @@ -6112,7 +6106,7 @@ ] }, "functional_specifiers_pre_parameters": { - "match": "(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)", + "match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)", "captures": { "1": { - "name": "keyword.control.goto.cpp" - }, - "2": { "patterns": [ { "include": "#inline_comment" } ] }, - "3": { + "2": { "patterns": [ { "match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))", @@ -6219,7 +6210,44 @@ } ] }, + "3": { + "name": "keyword.control.goto.cpp" + }, "4": { + "patterns": [ + { + "include": "#inline_comment" + } + ] + }, + "5": { + "patterns": [ + { + "match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))", + "captures": { + "1": { + "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" + }, + "2": { + "name": "comment.block.cpp" + }, + "3": { + "patterns": [ + { + "match": "\\*\\/", + "name": "comment.block.cpp punctuation.definition.comment.end.cpp" + }, + { + "match": "\\*", + "name": "comment.block.cpp" + } + ] + } + } + } + ] + }, + "6": { "name": "entity.name.label.call.cpp" } } @@ -6482,7 +6510,7 @@ "name": "storage.type.modifier.virtual.cpp" }, { - "match": "(?<=protected|virtual|private|public|,|:)(?:(?:\\s)+)?(?!(?:(?:(?:protected)|(?:private)|(?:public))|virtual))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)?(?![\\w<:.]))", + "match": "(?<=protected|virtual|private|public|,|:)(?:(?:\\s)+)?(?!(?:(?:(?:protected)|(?:private)|(?:public))|virtual))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)?(?![\\w<:.]))", "captures": { "1": { "name": "meta.qualified_type.cpp", @@ -6916,15 +6944,23 @@ "name": "storage.modifier.lambda.$0.cpp" }, { - "match": "(->)((?:.+?(?=\\{|$))?)", - "captures": { - "1": { + "begin": "->", + "end": "(?=\\{)", + "beginCaptures": { + "0": { "name": "punctuation.definition.lambda.return-type.cpp" + } + }, + "endCaptures": {}, + "patterns": [ + { + "include": "#comments" }, - "2": { + { + "match": "\\S+", "name": "storage.type.return-type.lambda.cpp" } - } + ] }, { "begin": "\\{", @@ -6954,7 +6990,7 @@ }, "line": { "begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?line\\b", - "end": "(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?define\\b)(?:(?:\\s)+)?((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:(?:\\s)+)?(?:(?:\\.\\*|\\.)|(?:->\\*|->))(?:(?:\\s)+)?)*)(?:(?:\\s)+)?(\\b(?!uint_least32_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint_least16_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint_least64_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_least32_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_least64_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint_fast32_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint_fast64_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint_least8_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint_fast16_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_least16_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_fast16_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_least8_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint_fast8_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_fast64_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_fast32_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_fast8_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|suseconds_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|useconds_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|in_addr_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uintmax_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uintmax_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uintmax_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|in_port_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uintptr_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|blksize_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint32_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint64_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|u_quad_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|intmax_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|intmax_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|unsigned[^Pattern.new(\n match: \\/\\w\\/,\n)]|blkcnt_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint16_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|intptr_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|swblk_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|wchar_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|u_short[^Pattern.new(\n match: \\/\\w\\/,\n)]|qaddr_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|caddr_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|daddr_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|fixpt_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|nlink_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|segsz_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|clock_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|ssize_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int16_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int32_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int64_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint8_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int8_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|mode_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|quad_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|ushort[^Pattern.new(\n match: \\/\\w\\/,\n)]|u_long[^Pattern.new(\n match: \\/\\w\\/,\n)]|u_char[^Pattern.new(\n match: \\/\\w\\/,\n)]|double[^Pattern.new(\n match: \\/\\w\\/,\n)]|signed[^Pattern.new(\n match: \\/\\w\\/,\n)]|time_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|size_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|key_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|div_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|ino_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uid_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|gid_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|off_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|pid_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|float[^Pattern.new(\n match: \\/\\w\\/,\n)]|dev_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|u_int[^Pattern.new(\n match: \\/\\w\\/,\n)]|short[^Pattern.new(\n match: \\/\\w\\/,\n)]|bool[^Pattern.new(\n match: \\/\\w\\/,\n)]|id_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint[^Pattern.new(\n match: \\/\\w\\/,\n)]|long[^Pattern.new(\n match: \\/\\w\\/,\n)]|char[^Pattern.new(\n match: \\/\\w\\/,\n)]|void[^Pattern.new(\n match: \\/\\w\\/,\n)]|auto[^Pattern.new(\n match: \\/\\w\\/,\n)]|id_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int[^Pattern.new(\n match: \\/\\w\\/,\n)])(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b(?!\\())", + "match": "(?:((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:(?:\\s)+)?(?:(?:\\.\\*|\\.)|(?:->\\*|->))(?:(?:\\s)+)?)*)(?:(?:\\s)+)?(\\b(?!uint_least32_t[^\\w]|uint_least16_t[^\\w]|uint_least64_t[^\\w]|int_least32_t[^\\w]|int_least64_t[^\\w]|uint_fast32_t[^\\w]|uint_fast64_t[^\\w]|uint_least8_t[^\\w]|uint_fast16_t[^\\w]|int_least16_t[^\\w]|int_fast16_t[^\\w]|int_least8_t[^\\w]|uint_fast8_t[^\\w]|int_fast64_t[^\\w]|int_fast32_t[^\\w]|int_fast8_t[^\\w]|suseconds_t[^\\w]|useconds_t[^\\w]|in_addr_t[^\\w]|uintmax_t[^\\w]|uintmax_t[^\\w]|uintmax_t[^\\w]|in_port_t[^\\w]|uintptr_t[^\\w]|blksize_t[^\\w]|uint32_t[^\\w]|uint64_t[^\\w]|u_quad_t[^\\w]|intmax_t[^\\w]|intmax_t[^\\w]|unsigned[^\\w]|blkcnt_t[^\\w]|uint16_t[^\\w]|intptr_t[^\\w]|swblk_t[^\\w]|wchar_t[^\\w]|u_short[^\\w]|qaddr_t[^\\w]|caddr_t[^\\w]|daddr_t[^\\w]|fixpt_t[^\\w]|nlink_t[^\\w]|segsz_t[^\\w]|clock_t[^\\w]|ssize_t[^\\w]|int16_t[^\\w]|int32_t[^\\w]|int64_t[^\\w]|uint8_t[^\\w]|int8_t[^\\w]|mode_t[^\\w]|quad_t[^\\w]|ushort[^\\w]|u_long[^\\w]|u_char[^\\w]|double[^\\w]|signed[^\\w]|time_t[^\\w]|size_t[^\\w]|key_t[^\\w]|div_t[^\\w]|ino_t[^\\w]|uid_t[^\\w]|gid_t[^\\w]|off_t[^\\w]|pid_t[^\\w]|float[^\\w]|dev_t[^\\w]|u_int[^\\w]|short[^\\w]|bool[^\\w]|id_t[^\\w]|uint[^\\w]|long[^\\w]|char[^\\w]|void[^\\w]|auto[^\\w]|id_t[^\\w]|int[^\\w])(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b(?!\\())", "captures": { "1": { "patterns": [ @@ -7474,7 +7511,7 @@ ] }, "misc_keywords": { - "match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<8>?)+>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<8>?)+>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<4>?)+>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<4>?)+>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(operator)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(?:(?:((?:(?:delete\\[\\])|(?:delete)|(?:new\\[\\])|(?:<=>)|(?:<<=)|(?:new)|(?:>>=)|(?:\\->\\*)|(?:\\/=)|(?:%=)|(?:&=)|(?:>=)|(?:\\|=)|(?:\\+\\+)|(?:\\-\\-)|(?:\\(\\))|(?:\\[\\])|(?:\\->)|(?:\\+\\+)|(?:<<)|(?:>>)|(?:\\-\\-)|(?:<=)|(?:\\^=)|(?:==)|(?:!=)|(?:&&)|(?:\\|\\|)|(?:\\+=)|(?:\\-=)|(?:\\*=)|,|(?:\\+)|(?:\\-)|!|~|(?:\\*)|&|(?:\\*)|(?:\\/)|%|(?:\\+)|(?:\\-)|<|>|&|(?:\\^)|(?:\\|)|=))|((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:\\[\\])?)))|(\"\")((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\<|\\()", + "begin": "(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(operator)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(?:(?:((?:(?:delete\\[\\])|(?:delete)|(?:new\\[\\])|(?:<=>)|(?:<<=)|(?:new)|(?:>>=)|(?:\\->\\*)|(?:\\/=)|(?:%=)|(?:&=)|(?:>=)|(?:\\|=)|(?:\\+\\+)|(?:\\-\\-)|(?:\\(\\))|(?:\\[\\])|(?:\\->)|(?:\\+\\+)|(?:<<)|(?:>>)|(?:\\-\\-)|(?:<=)|(?:\\^=)|(?:==)|(?:!=)|(?:&&)|(?:\\|\\|)|(?:\\+=)|(?:\\-=)|(?:\\*=)|,|(?:\\+)|(?:\\-)|!|~|(?:\\*)|&|(?:\\*)|(?:\\/)|%|(?:\\+)|(?:\\-)|<|>|&|(?:\\^)|(?:\\|)|=))|((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:\\[\\])?)))|(\"\")((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\<|\\()", "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))", "beginCaptures": { "0": { @@ -8707,6 +8744,45 @@ { "include": "#qualifiers_and_specifiers_post_parameters" }, + { + "match": "(\\=)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))", + "captures": { + "1": { + "name": "keyword.operator.assignment.cpp" + }, + "2": { + "patterns": [ + { + "include": "#inline_comment" + } + ] + }, + "3": { + "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" + }, + "4": { + "name": "comment.block.cpp" + }, + "5": { + "patterns": [ + { + "match": "\\*\\/", + "name": "comment.block.cpp punctuation.definition.comment.end.cpp" + }, + { + "match": "\\*", + "name": "comment.block.cpp" + } + ] + }, + "6": { + "name": "keyword.other.default.function.cpp" + }, + "7": { + "name": "keyword.other.delete.function.cpp" + } + } + }, { "include": "$self" } @@ -9062,14 +9138,14 @@ }, { "match": "&|\\||\\^|~", - "name": "keyword.operator.cpp" + "name": "keyword.operator.bitwise.cpp" }, { "include": "#assignment_operator" }, { "match": "%|\\*|\\/|-|\\+", - "name": "keyword.operator.cpp" + "name": "keyword.operator.arithmetic.cpp" }, { "include": "#ternary_operator" @@ -9079,7 +9155,7 @@ "over_qualified_types": { "patterns": [ { - "match": "(struct)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\bstruct)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.struct.parameter.cpp" @@ -9408,7 +9484,7 @@ } }, { - "match": "(enum)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\benum)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.enum.parameter.cpp" @@ -9737,7 +9813,7 @@ } }, { - "match": "(union)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\bunion)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.union.parameter.cpp" @@ -10066,7 +10142,7 @@ } }, { - "match": "(class)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\bclass)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.class.parameter.cpp" @@ -10446,7 +10522,7 @@ "include": "#vararg_ellipses" }, { - "match": "((?:((?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)", + "match": "((?:((?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)", "captures": { "1": { "patterns": [ @@ -10768,7 +10844,7 @@ ] }, "parameter_class": { - "match": "(class)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\bclass)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.class.parameter.cpp" @@ -11097,7 +11173,7 @@ } }, "parameter_enum": { - "match": "(enum)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\benum)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.enum.parameter.cpp" @@ -11484,7 +11560,7 @@ "include": "#vararg_ellipses" }, { - "match": "((?:((?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)", + "match": "((?:((?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)", "captures": { "1": { "patterns": [ @@ -11808,7 +11884,7 @@ ] }, "parameter_struct": { - "match": "(struct)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\bstruct)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.struct.parameter.cpp" @@ -12137,7 +12213,7 @@ } }, "parameter_union": { - "match": "(union)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\bunion)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.union.parameter.cpp" @@ -12494,7 +12570,7 @@ }, "pragma": { "begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?pragma\\b", - "end": "(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)?(?![\\w<:.])", + "match": "\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)?(?![\\w<:.])", "captures": { "0": { "patterns": [ @@ -13013,27 +13089,27 @@ "name": "meta.qualified_type.cpp" }, "qualifiers_and_specifiers_post_parameters": { - "match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))", + "match": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))", - "captures": { - "1": { - "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" }, - "2": { - "name": "comment.block.cpp" - }, - "3": { - "patterns": [ - { - "match": "\\*\\/", - "name": "comment.block.cpp punctuation.definition.comment.end.cpp" - }, - { - "match": "\\*", - "name": "comment.block.cpp" - } - ] + "5": { + "name": "storage.modifier.specifier.functional.post-parameters.$5.cpp" } } } @@ -13089,7 +13131,7 @@ } }, "scope_resolution": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13111,7 +13153,7 @@ } }, "scope_resolution_function_call": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13133,7 +13175,7 @@ } }, "scope_resolution_function_call_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13171,7 +13213,7 @@ } }, "scope_resolution_function_definition": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13193,7 +13235,7 @@ } }, "scope_resolution_function_definition_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13231,7 +13273,7 @@ } }, "scope_resolution_function_definition_operator_overload": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13253,7 +13295,7 @@ } }, "scope_resolution_function_definition_operator_overload_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13291,7 +13333,7 @@ } }, "scope_resolution_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13329,7 +13371,7 @@ } }, "scope_resolution_namespace_alias": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13351,7 +13393,7 @@ } }, "scope_resolution_namespace_alias_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13389,7 +13431,7 @@ } }, "scope_resolution_namespace_block": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13411,7 +13453,7 @@ } }, "scope_resolution_namespace_block_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13449,7 +13491,7 @@ } }, "scope_resolution_namespace_using": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13471,7 +13513,7 @@ } }, "scope_resolution_namespace_using_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13509,7 +13551,7 @@ } }, "scope_resolution_parameter": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13531,7 +13573,7 @@ } }, "scope_resolution_parameter_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13569,7 +13611,7 @@ } }, "scope_resolution_template_call": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13591,7 +13633,7 @@ } }, "scope_resolution_template_call_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13629,7 +13671,7 @@ } }, "scope_resolution_template_definition": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13651,7 +13693,7 @@ } }, "scope_resolution_template_definition_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13693,7 +13735,7 @@ "name": "punctuation.terminator.statement.cpp" }, "simple_type": { - "match": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)?(?![\\w<:.]))(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?", + "match": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)?(?![\\w<:.]))(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?", "captures": { "1": { "name": "meta.qualified_type.cpp", @@ -15207,7 +15249,7 @@ } }, "storage_specifiers": { - "match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\s)+)+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))|((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:(?:\\s)+)?(\\.\\.\\.)(?:(?:\\s)+)?((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))(?:(?:\\s)+)?(?:(,)|(?=>|$))", + "match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\s)+)+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))|((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:(?:\\s)+)?(\\.\\.\\.)(?:(?:\\s)+)?((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))|(?)(?:(?:\\s)+)?(class|typename)(?:(?:\\s)+((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))?)(?:(?:\\s)+)?(?:(\\=)(?:(?:\\s)+)?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?(?:(,)|(?=>|$))", "captures": { "1": { "patterns": [ @@ -16311,7 +16347,7 @@ "name": "entity.name.type.template.cpp" }, "6": { - "name": "storage.type.template.cpp" + "name": "storage.type.template.argument.$6.cpp" }, "7": { "name": "punctuation.vararg-ellipses.template.definition.cpp" @@ -16320,6 +16356,30 @@ "name": "entity.name.type.template.cpp" }, "9": { + "name": "storage.type.template.cpp" + }, + "10": { + "name": "punctuation.section.angle-brackets.begin.template.definition.cpp" + }, + "11": { + "name": "storage.type.template.argument.$11.cpp" + }, + "12": { + "name": "entity.name.type.template.cpp" + }, + "13": { + "name": "punctuation.section.angle-brackets.end.template.definition.cpp" + }, + "14": { + "name": "storage.type.template.argument.$14.cpp" + }, + "15": { + "name": "entity.name.type.template.cpp" + }, + "16": { + "name": "keyword.operator.assignment.cpp" + }, + "17": { "name": "punctuation.separator.delimiter.comma.template.argument.cpp" } } @@ -16344,13 +16404,13 @@ ] }, "template_isolated_definition": { - "match": "(?(?:(?:\\s)+)?$)", + "match": "(?)(?:(?:\\s)+)?$", "captures": { "1": { "name": "storage.type.template.cpp" }, "2": { - "name": "punctuation.section.angle-brackets.start.template.definition.cpp" + "name": "punctuation.section.angle-brackets.begin.template.definition.cpp" }, "3": { "name": "meta.template.definition.cpp", @@ -16503,7 +16563,7 @@ } }, "type_alias": { - "match": "(using)(?:(?:\\s)+)?(?!namespace)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)?(?![\\w<:.]))(?:(?:\\s)+)?(\\=)(?:(?:\\s)+)?((?:typename)?)(?:(?:\\s)+)?((?:(?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)?(?![\\w<:.]))|(.*(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)?(?:(?:\\s)+)?(?:(;)|\\n)", + "match": "(using)(?:(?:\\s)+)?(?!namespace)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)?(?![\\w<:.]))(?:(?:\\s)+)?(\\=)(?:(?:\\s)+)?((?:typename)?)(?:(?:\\s)+)?((?:(?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)?(?![\\w<:.]))|(.*(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)?(?:(?:\\s)+)?(?:(;)|\\n)", "captures": { "1": { "name": "keyword.other.using.directive.cpp" @@ -17593,7 +17653,7 @@ "endCaptures": {}, "patterns": [ { - "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", "end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()", "beginCaptures": { "1": { @@ -18878,7 +18938,7 @@ ] }, "typename": { - "match": "(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<17>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<17>?)+>)?(?![\\w<:.]))", + "match": "(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<17>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<17>?)+>)?(?![\\w<:.]))", "captures": { "1": { "name": "storage.modifier.cpp" @@ -19767,7 +19827,7 @@ } }, "using_namespace": { - "begin": "(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<6>?)+>)(?:\\s)*+)?::)*\\s*+)?((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<6>?)+>)(?:\\s)*+)?::)*\\s*+)?((? ({ languageId, settingId: `${languageId}.format.enable`, provider: undefined })); // Options to control the language client - let clientOptions: LanguageClientOptions = { + const clientOptions: LanguageClientOptions = { documentSelector, synchronize: { configurationSection: ['css', 'scss', 'less'] @@ -98,7 +98,7 @@ export async function startClient(context: ExtensionContext, newLanguageClient: }; // Create the language client and start the client. - let client = newLanguageClient('css', localize('cssserver.name', 'CSS Language Server'), clientOptions); + const client = newLanguageClient('css', localize('cssserver.name', 'CSS Language Server'), clientOptions); client.registerProposedFeatures(); await client.start(); @@ -125,17 +125,17 @@ export async function startClient(context: ExtensionContext, newLanguageClient: return languages.registerCompletionItemProvider(documentSelector, { provideCompletionItems(doc: TextDocument, pos: Position) { - let lineUntilPos = doc.getText(new Range(new Position(pos.line, 0), pos)); - let match = lineUntilPos.match(regionCompletionRegExpr); + const lineUntilPos = doc.getText(new Range(new Position(pos.line, 0), pos)); + const match = lineUntilPos.match(regionCompletionRegExpr); if (match) { - let range = new Range(new Position(pos.line, match[1].length), pos); - let beginProposal = new CompletionItem('#region', CompletionItemKind.Snippet); + const range = new Range(new Position(pos.line, match[1].length), pos); + const beginProposal = new CompletionItem('#region', CompletionItemKind.Snippet); beginProposal.range = range; TextEdit.replace(range, '/* #region */'); beginProposal.insertText = new SnippetString('/* #region $1*/'); beginProposal.documentation = localize('folding.start', 'Folding Region Start'); beginProposal.filterText = match[2]; beginProposal.sortText = 'za'; - let endProposal = new CompletionItem('#endregion', CompletionItemKind.Snippet); + const endProposal = new CompletionItem('#endregion', CompletionItemKind.Snippet); endProposal.range = range; endProposal.insertText = '/* #endregion */'; endProposal.documentation = localize('folding.end', 'Folding Region End'); @@ -151,13 +151,13 @@ export async function startClient(context: ExtensionContext, newLanguageClient: commands.registerCommand('_css.applyCodeAction', applyCodeAction); function applyCodeAction(uri: string, documentVersion: number, edits: TextEdit[]) { - let textEditor = window.activeTextEditor; + const textEditor = window.activeTextEditor; if (textEditor && textEditor.document.uri.toString() === uri) { if (textEditor.document.version !== documentVersion) { window.showInformationMessage(`CSS fix is outdated and can't be applied to the document.`); } textEditor.edit(mutator => { - for (let edit of edits) { + for (const edit of edits) { mutator.replace(client.protocol2CodeConverter.asRange(edit.range), edit.newText); } }).then(success => { diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json index ccf0518633f..497f6cd735c 100644 --- a/extensions/css-language-features/package.json +++ b/extensions/css-language-features/package.json @@ -994,9 +994,9 @@ ] }, "dependencies": { - "vscode-languageclient": "^8.0.2-next.4", - "vscode-nls": "^5.0.0", - "vscode-uri": "^3.0.3" + "vscode-languageclient": "^8.1.0-next.1", + "vscode-nls": "^5.2.0", + "vscode-uri": "^3.0.6" }, "devDependencies": { "@types/node": "16.x" diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json index 0885f1b1d07..2528682c661 100644 --- a/extensions/css-language-features/server/package.json +++ b/extensions/css-language-features/server/package.json @@ -10,9 +10,9 @@ "main": "./out/node/cssServerMain", "browser": "./dist/browser/cssServerMain", "dependencies": { - "vscode-css-languageservice": "^6.0.1", - "vscode-languageserver": "^8.0.2-next.4", - "vscode-uri": "^3.0.3" + "vscode-css-languageservice": "^6.1.1", + "vscode-languageserver": "^8.1.0-next.1", + "vscode-uri": "^3.0.6" }, "devDependencies": { "@types/mocha": "^9.1.1", diff --git a/extensions/css-language-features/server/src/cssServer.ts b/extensions/css-language-features/server/src/cssServer.ts index 314aa8aebc0..c5db57340fd 100644 --- a/extensions/css-language-features/server/src/cssServer.ts +++ b/extensions/css-language-features/server/src/cssServer.ts @@ -7,7 +7,7 @@ import { Connection, TextDocuments, InitializeParams, InitializeResult, ServerCapabilities, ConfigurationRequest, WorkspaceFolder, TextDocumentSyncKind, NotificationType, Disposable, TextDocumentIdentifier, Range, FormattingOptions, TextEdit, Diagnostic } from 'vscode-languageserver'; import { URI } from 'vscode-uri'; -import { getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, LanguageSettings, LanguageService, Stylesheet, TextDocument, Position, CSSFormatConfiguration } from 'vscode-css-languageservice'; +import { getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, LanguageSettings, LanguageService, Stylesheet, TextDocument, Position } from 'vscode-css-languageservice'; import { getLanguageModelCache } from './languageModelCache'; import { runSafeAsync } from './utils/runner'; import { DiagnosticsSupport, registerDiagnosticsPullSupport, registerDiagnosticsPushSupport } from './utils/validation'; @@ -74,7 +74,7 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment) if (!Array.isArray(workspaceFolders)) { workspaceFolders = []; if (params.rootPath) { - workspaceFolders.push({ name: '', uri: URI.file(params.rootPath).toString() }); + workspaceFolders.push({ name: '', uri: URI.file(params.rootPath).toString(true) }); } } @@ -223,7 +223,7 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment) if (document) { await dataProvidersReady; const stylesheet = stylesheets.get(document); - return getLanguageService(document).findDocumentSymbols(document, stylesheet); + return getLanguageService(document).findDocumentSymbols2(document, stylesheet); } return []; }, [], `Error while computing document symbols for ${documentSymbolParams.textDocument.uri}`, token); @@ -356,8 +356,7 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment) async function onFormat(textDocument: TextDocumentIdentifier, range: Range | undefined, options: FormattingOptions): Promise { const document = documents.get(textDocument.uri); if (document) { - console.log(JSON.stringify(options)); - const edits = getLanguageService(document).format(document, range ?? getFullRange(document), options as CSSFormatConfiguration); + const edits = getLanguageService(document).format(document, range ?? getFullRange(document), options); if (edits.length > formatterMaxNumberOfEdits) { const newText = TextDocument.applyEdits(document, edits); return [TextEdit.replace(getFullRange(document), newText)]; diff --git a/extensions/css-language-features/server/src/languageModelCache.ts b/extensions/css-language-features/server/src/languageModelCache.ts index 343d57a9ad6..f39eada6f44 100644 --- a/extensions/css-language-features/server/src/languageModelCache.ts +++ b/extensions/css-language-features/server/src/languageModelCache.ts @@ -18,10 +18,10 @@ export function getLanguageModelCache(maxEntries: number, cleanupIntervalTime let cleanupInterval: NodeJS.Timer | undefined = undefined; if (cleanupIntervalTimeInSec > 0) { cleanupInterval = setInterval(() => { - let cutoffTime = Date.now() - cleanupIntervalTimeInSec * 1000; - let uris = Object.keys(languageModels); - for (let uri of uris) { - let languageModelInfo = languageModels[uri]; + const cutoffTime = Date.now() - cleanupIntervalTimeInSec * 1000; + const uris = Object.keys(languageModels); + for (const uri of uris) { + const languageModelInfo = languageModels[uri]; if (languageModelInfo.cTime < cutoffTime) { delete languageModels[uri]; nModels--; @@ -32,14 +32,14 @@ export function getLanguageModelCache(maxEntries: number, cleanupIntervalTime return { get(document: TextDocument): T { - let version = document.version; - let languageId = document.languageId; - let languageModelInfo = languageModels[document.uri]; + const version = document.version; + const languageId = document.languageId; + const languageModelInfo = languageModels[document.uri]; if (languageModelInfo && languageModelInfo.version === version && languageModelInfo.languageId === languageId) { languageModelInfo.cTime = Date.now(); return languageModelInfo.languageModel; } - let languageModel = parse(document); + const languageModel = parse(document); languageModels[document.uri] = { languageModel, version, languageId, cTime: Date.now() }; if (!languageModelInfo) { nModels++; @@ -48,8 +48,8 @@ export function getLanguageModelCache(maxEntries: number, cleanupIntervalTime if (nModels === maxEntries) { let oldestTime = Number.MAX_VALUE; let oldestUri = null; - for (let uri in languageModels) { - let languageModelInfo = languageModels[uri]; + for (const uri in languageModels) { + const languageModelInfo = languageModels[uri]; if (languageModelInfo.cTime < oldestTime) { oldestUri = uri; oldestTime = languageModelInfo.cTime; @@ -64,7 +64,7 @@ export function getLanguageModelCache(maxEntries: number, cleanupIntervalTime }, onDocumentRemoved(document: TextDocument) { - let uri = document.uri; + const uri = document.uri; if (languageModels[uri]) { delete languageModels[uri]; nModels--; diff --git a/extensions/css-language-features/server/src/requests.ts b/extensions/css-language-features/server/src/requests.ts index 0726af35c56..3d21e542362 100644 --- a/extensions/css-language-features/server/src/requests.ts +++ b/extensions/css-language-features/server/src/requests.ts @@ -65,7 +65,7 @@ export interface RequestService { export function getRequestService(handledSchemas: string[], connection: Connection, runtime: RuntimeEnvironment): RequestService { const builtInHandlers: { [protocol: string]: RequestService | undefined } = {}; - for (let protocol of handledSchemas) { + for (const protocol of handledSchemas) { if (protocol === 'file') { builtInHandlers[protocol] = runtime.file; } else if (protocol === 'http' || protocol === 'https') { diff --git a/extensions/css-language-features/server/src/test/completion.test.ts b/extensions/css-language-features/server/src/test/completion.test.ts index 6881dd0e3e3..efb2953e3ec 100644 --- a/extensions/css-language-features/server/src/test/completion.test.ts +++ b/extensions/css-language-features/server/src/test/completion.test.ts @@ -19,13 +19,13 @@ export interface ItemDescription { suite('Completions', () => { - let assertCompletion = function (completions: CompletionList, expected: ItemDescription, document: TextDocument, _offset: number) { - let matches = completions.items.filter(completion => { + const assertCompletion = function (completions: CompletionList, expected: ItemDescription, document: TextDocument, _offset: number) { + const matches = completions.items.filter(completion => { return completion.label === expected.label; }); assert.strictEqual(matches.length, 1, `${expected.label} should only existing once: Actual: ${completions.items.map(c => c.label).join(', ')}`); - let match = matches[0]; + const match = matches[0]; if (expected.resultText && TextEdit.is(match.textEdit)) { assert.strictEqual(TextDocument.applyEdits(document, [match.textEdit]), expected.resultText); } @@ -47,21 +47,21 @@ suite('Completions', () => { const context = getDocumentContext(testUri, workspaceFolders); const stylesheet = cssLanguageService.parseStylesheet(document); - let list = await cssLanguageService.doComplete2(document, position, stylesheet, context); + const list = await cssLanguageService.doComplete2(document, position, stylesheet, context); if (expected.count) { assert.strictEqual(list.items.length, expected.count); } if (expected.items) { - for (let item of expected.items) { + for (const item of expected.items) { assertCompletion(list, item, document, offset); } } } test('CSS url() Path completion', async function () { - let testUri = URI.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString(); - let folders = [{ name: 'x', uri: URI.file(path.resolve(__dirname, '../../test')).toString() }]; + const testUri = URI.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString(true); + const folders = [{ name: 'x', uri: URI.file(path.resolve(__dirname, '../../test')).toString(true) }]; await assertCompletions('html { background-image: url("./|")', { items: [ @@ -119,8 +119,8 @@ suite('Completions', () => { }); test('CSS url() Path Completion - Unquoted url', async function () { - let testUri = URI.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString(); - let folders = [{ name: 'x', uri: URI.file(path.resolve(__dirname, '../../test')).toString() }]; + const testUri = URI.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString(true); + const folders = [{ name: 'x', uri: URI.file(path.resolve(__dirname, '../../test')).toString(true) }]; await assertCompletions('html { background-image: url(./|)', { items: [ @@ -148,8 +148,8 @@ suite('Completions', () => { }); test('CSS @import Path completion', async function () { - let testUri = URI.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString(); - let folders = [{ name: 'x', uri: URI.file(path.resolve(__dirname, '../../test')).toString() }]; + const testUri = URI.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString(true); + const folders = [{ name: 'x', uri: URI.file(path.resolve(__dirname, '../../test')).toString(true) }]; await assertCompletions(`@import './|'`, { items: [ @@ -171,8 +171,8 @@ suite('Completions', () => { * For SCSS, `@import 'foo';` can be used for importing partial file `_foo.scss` */ test('SCSS @import Path completion', async function () { - let testCSSUri = URI.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString(); - let folders = [{ name: 'x', uri: URI.file(path.resolve(__dirname, '../../test')).toString() }]; + const testCSSUri = URI.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString(true); + const folders = [{ name: 'x', uri: URI.file(path.resolve(__dirname, '../../test')).toString(true) }]; /** * We are in a CSS file, so no special treatment for SCSS partial files @@ -184,7 +184,7 @@ suite('Completions', () => { ] }, testCSSUri, folders); - let testSCSSUri = URI.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/scss/main.scss')).toString(); + const testSCSSUri = URI.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/scss/main.scss')).toString(true); await assertCompletions(`@import './|'`, { items: [ { label: '_foo.scss', resultText: `@import './foo'` } @@ -193,8 +193,8 @@ suite('Completions', () => { }); test('Completion should ignore files/folders starting with dot', async function () { - let testUri = URI.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString(); - let folders = [{ name: 'x', uri: URI.file(path.resolve(__dirname, '../../test')).toString() }]; + const testUri = URI.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString(true); + const folders = [{ name: 'x', uri: URI.file(path.resolve(__dirname, '../../test')).toString(true) }]; await assertCompletions('html { background-image: url("../|")', { count: 4 diff --git a/extensions/css-language-features/server/src/test/links.test.ts b/extensions/css-language-features/server/src/test/links.test.ts index bc4c6db6477..f6b1a349c70 100644 --- a/extensions/css-language-features/server/src/test/links.test.ts +++ b/extensions/css-language-features/server/src/test/links.test.ts @@ -21,13 +21,13 @@ export interface ItemDescription { suite('Links', () => { const cssLanguageService = getCSSLanguageService({ fileSystemProvider: getNodeFSRequestService() }); - let assertLink = function (links: DocumentLink[], expected: ItemDescription, document: TextDocument) { - let matches = links.filter(link => { + const assertLink = function (links: DocumentLink[], expected: ItemDescription, document: TextDocument) { + const matches = links.filter(link => { return document.offsetAt(link.range.start) === expected.offset; }); assert.strictEqual(matches.length, 1, `${expected.offset} should only existing once: Actual: ${links.map(l => document.offsetAt(l.range.start)).join(', ')}`); - let match = matches[0]; + const match = matches[0]; assert.strictEqual(document.getText(match.range), expected.value); assert.strictEqual(match.target, expected.target); }; @@ -45,33 +45,43 @@ suite('Links', () => { const context = getDocumentContext(testUri, workspaceFolders); const stylesheet = cssLanguageService.parseStylesheet(document); - let links = await cssLanguageService.findDocumentLinks2(document, stylesheet, context)!; + const links = await cssLanguageService.findDocumentLinks2(document, stylesheet, context)!; assert.strictEqual(links.length, expected.length); - for (let item of expected) { + for (const item of expected) { assertLink(links, item, document); } } function getTestResource(path: string) { - return URI.file(resolve(__dirname, '../../test/linksTestFixtures', path)).toString(); + return URI.file(resolve(__dirname, '../../test/linksTestFixtures', path)).toString(true); } test('url links', async function () { - let testUri = getTestResource('about.css'); - let folders = [{ name: 'x', uri: getTestResource('') }]; + const testUri = getTestResource('about.css'); + const folders = [{ name: 'x', uri: getTestResource('') }]; await assertLinks('html { background-image: url("hello.html|")', [{ offset: 29, value: '"hello.html"', target: getTestResource('hello.html') }], testUri, folders ); }); + test('url links - untitled', async function () { + + const testUri = 'untitled:untitled-1'; + const folders = [{ name: 'x', uri: getTestResource('') }]; + + await assertLinks('@import url("base.css|");")', + [{ offset: 12, value: '"base.css"', target: 'untitled:base.css' }], testUri, folders + ); + }); + test('node module resolving', async function () { - let testUri = getTestResource('about.css'); - let folders = [{ name: 'x', uri: getTestResource('') }]; + const testUri = getTestResource('about.css'); + const folders = [{ name: 'x', uri: getTestResource('') }]; await assertLinks('html { background-image: url("~foo/hello.html|")', [{ offset: 29, value: '"~foo/hello.html"', target: getTestResource('node_modules/foo/hello.html') }], testUri, folders @@ -80,8 +90,8 @@ suite('Links', () => { test('node module subfolder resolving', async function () { - let testUri = getTestResource('subdir/about.css'); - let folders = [{ name: 'x', uri: getTestResource('') }]; + const testUri = getTestResource('subdir/about.css'); + const folders = [{ name: 'x', uri: getTestResource('') }]; await assertLinks('html { background-image: url("~foo/hello.html|")', [{ offset: 29, value: '"~foo/hello.html"', target: getTestResource('node_modules/foo/hello.html') }], testUri, folders diff --git a/extensions/css-language-features/server/src/utils/documentContext.ts b/extensions/css-language-features/server/src/utils/documentContext.ts index a7beffd0310..c9f46fb7578 100644 --- a/extensions/css-language-features/server/src/utils/documentContext.ts +++ b/extensions/css-language-features/server/src/utils/documentContext.ts @@ -10,7 +10,7 @@ import { Utils, URI } from 'vscode-uri'; export function getDocumentContext(documentUri: string, workspaceFolders: WorkspaceFolder[]): DocumentContext { function getRootFolder(): string | undefined { - for (let folder of workspaceFolders) { + for (const folder of workspaceFolders) { let folderURI = folder.uri; if (!endsWith(folderURI, '/')) { folderURI = folderURI + '/'; @@ -25,13 +25,14 @@ export function getDocumentContext(documentUri: string, workspaceFolders: Worksp return { resolveReference: (ref: string, base = documentUri) => { if (ref[0] === '/') { // resolve absolute path against the current workspace folder - let folderUri = getRootFolder(); + const folderUri = getRootFolder(); if (folderUri) { - return folderUri + ref.substr(1); + return folderUri + ref.substring(1); } } - base = base.substr(0, base.lastIndexOf('/') + 1); - return Utils.resolvePath(URI.parse(base), ref).toString(); + const baseUri = URI.parse(base); + const baseUriDir = baseUri.path.endsWith('/') ? baseUri : Utils.dirname(baseUri); + return Utils.resolvePath(baseUriDir, ref).toString(true); }, }; } diff --git a/extensions/css-language-features/server/src/utils/runner.ts b/extensions/css-language-features/server/src/utils/runner.ts index 47c587537aa..383b88e4487 100644 --- a/extensions/css-language-features/server/src/utils/runner.ts +++ b/extensions/css-language-features/server/src/utils/runner.ts @@ -8,7 +8,7 @@ import { RuntimeEnvironment } from '../cssServer'; export function formatError(message: string, err: any): string { if (err instanceof Error) { - let error = err; + const error = err; return `${message}: ${error.message}\n${error.stack}`; } else if (typeof err === 'string') { return `${message}: ${err}`; diff --git a/extensions/css-language-features/server/src/utils/strings.ts b/extensions/css-language-features/server/src/utils/strings.ts index 0e9ed34f83d..1e53c4204fd 100644 --- a/extensions/css-language-features/server/src/utils/strings.ts +++ b/extensions/css-language-features/server/src/utils/strings.ts @@ -21,7 +21,7 @@ export function startsWith(haystack: string, needle: string): boolean { * Determines if haystack ends with needle. */ export function endsWith(haystack: string, needle: string): boolean { - let diff = haystack.length - needle.length; + const diff = haystack.length - needle.length; if (diff > 0) { return haystack.lastIndexOf(needle) === diff; } else if (diff === 0) { diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock index 9a9938963fd..ec35ce87045 100644 --- a/extensions/css-language-features/server/yarn.lock +++ b/extensions/css-language-features/server/yarn.lock @@ -12,57 +12,52 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== -vscode-css-languageservice@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.0.1.tgz#ccf94944e094dcc5833d1b4ac276994b698e9283" - integrity sha512-81n/eeYuJwQdvpoy6IK1258PtPbO720fl13FcJ5YQECPyHMFkmld1qKHwPJkyLbLPfboqJPM53ys4xW8v+iBVw== +vscode-css-languageservice@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.1.1.tgz#36daefd96e56b7453da16ff8c16f4ee693f32521" + integrity sha512-7d2NCq2plT0njAKmGZ11uof95y2fwbgq8QuToE3kX9uYQfVmejHX2/lFGKbK5AV5+Ja0L80UZoU0QspwqMKMHA== dependencies: - vscode-languageserver-textdocument "^1.0.4" - vscode-languageserver-types "^3.17.1" - vscode-nls "^5.0.1" - vscode-uri "^3.0.3" + vscode-languageserver-textdocument "^1.0.7" + vscode-languageserver-types "^3.17.2" + vscode-nls "^5.2.0" + vscode-uri "^3.0.4" -vscode-jsonrpc@8.0.2-next.1: - version "8.0.2-next.1" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2-next.1.tgz#6bdc39fd194782032e34047eeefce562941259c6" - integrity sha512-sbbvGSWja7NVBLHPGawtgezc8DHYJaP4qfr/AaJiyDapWcSFtHyPtm18+LnYMLTmB7bhOUW/lf5PeeuLpP6bKA== +vscode-jsonrpc@8.1.0-next.1: + version "8.1.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.1.tgz#7c38cb1cbd968c409522593004fdac845a55b155" + integrity sha512-FiPG+9TuMIga3t+kkalQytwqMtJu1djI+Pq+Ut2tvAJpcNHDJ0PYdjFv5mgEvTEJLujrYwjWHVkNe+XfHPBD/w== -vscode-languageserver-protocol@3.17.2-next.5: - version "3.17.2-next.5" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2-next.5.tgz#9bc747411c3ce9e1d73c2714bf6555e0199eec26" - integrity sha512-UlH+QL4Q4lX94of/UPDDwwWIkd8w7dtMW4khzvEDUoykiG9tba0iG6V0bAiv8XVpnBIUYjL2FNFiL3zl+TY1Sw== +vscode-languageserver-protocol@3.17.3-next.1: + version "3.17.3-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.1.tgz#804880c172b4c48d1a48a91c4c23250121effb19" + integrity sha512-vgjvPE0zox+1Fi4ljsSFJ+B3g8wGNbuAEEdulueVdv+R2VHtc06+dgxhWiG4LKPqXwjPDmiuxCnvd2xk3fzTTw== dependencies: - vscode-jsonrpc "8.0.2-next.1" - vscode-languageserver-types "3.17.2-next.2" + vscode-jsonrpc "8.1.0-next.1" + vscode-languageserver-types "3.17.2" -vscode-languageserver-textdocument@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz#3cd56dd14cec1d09e86c4bb04b09a246cb3df157" - integrity sha512-/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ== +vscode-languageserver-textdocument@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz#16df468d5c2606103c90554ae05f9f3d335b771b" + integrity sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg== -vscode-languageserver-types@3.17.2-next.2: - version "3.17.2-next.2" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2-next.2.tgz#af5d6978eee7682aab87c1419323f5b141ac6596" - integrity sha512-TiAkLABgqkVWdAlC3XlOfdhdjIAdVU4YntPUm9kKGbXr+MGwpVnKz2KZMNBcvG0CFx8Hi8qliL0iq+ndPB720w== +vscode-languageserver-types@3.17.2, vscode-languageserver-types@^3.17.2: + version "3.17.2" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2" + integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA== -vscode-languageserver-types@^3.17.1: - version "3.17.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.1.tgz#c2d87fa7784f8cac389deb3ff1e2d9a7bef07e16" - integrity sha512-K3HqVRPElLZVVPtMeKlsyL9aK0GxGQpvtAUTfX4k7+iJ4mc1M+JM+zQwkgGy2LzY0f0IAafe8MKqIkJrxfGGjQ== - -vscode-languageserver@^8.0.2-next.4: - version "8.0.2-next.4" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.0.2-next.4.tgz#c10cc95be06325b56b7ec1d10271c9e4adf3ef07" - integrity sha512-B3roWH4TmJiB6Zh5+r7zu0QdlLqJsPdGo0LeEi6OiLfrHYCDlcI7DNcQ7F17vWmxC3C82SrxMt/EuLBMpKQM0A== +vscode-languageserver@^8.1.0-next.1: + version "8.1.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.1.0-next.1.tgz#1c173de554889bd18ca6e20eaf4bdc84164c86b4" + integrity sha512-u14Rk4JgXI+7iS6AEXI2pNc1dWh/5JEXtaqa4TeBECKJlN+5242mbGBBPaHMOE7sSI1Kh66XhEMZJhPYjUfjHw== dependencies: - vscode-languageserver-protocol "3.17.2-next.5" + vscode-languageserver-protocol "3.17.3-next.1" -vscode-nls@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.1.tgz#ba23fc4d4420d25e7f886c8e83cbdcec47aa48b2" - integrity sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A== +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== -vscode-uri@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84" - integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA== +vscode-uri@^3.0.6, vscode-uri@^3.0.4: + version "3.0.6" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.6.tgz#5e6e2e1a4170543af30151b561a41f71db1d6f91" + integrity sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ== diff --git a/extensions/css-language-features/yarn.lock b/extensions/css-language-features/yarn.lock index 9b7854145e5..dc44620a06b 100644 --- a/extensions/css-language-features/yarn.lock +++ b/extensions/css-language-features/yarn.lock @@ -12,18 +12,12 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== dependencies: balanced-match "^1.0.0" - concat-map "0.0.1" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= lru-cache@^6.0.0: version "6.0.0" @@ -32,56 +26,56 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== +minimatch@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" + integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== dependencies: - brace-expansion "^1.1.7" + brace-expansion "^2.0.1" -semver@^7.3.5: +semver@^7.3.7: version "7.3.7" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== dependencies: lru-cache "^6.0.0" -vscode-jsonrpc@8.0.2-next.1: - version "8.0.2-next.1" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2-next.1.tgz#6bdc39fd194782032e34047eeefce562941259c6" - integrity sha512-sbbvGSWja7NVBLHPGawtgezc8DHYJaP4qfr/AaJiyDapWcSFtHyPtm18+LnYMLTmB7bhOUW/lf5PeeuLpP6bKA== +vscode-jsonrpc@8.1.0-next.1: + version "8.1.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.1.tgz#7c38cb1cbd968c409522593004fdac845a55b155" + integrity sha512-FiPG+9TuMIga3t+kkalQytwqMtJu1djI+Pq+Ut2tvAJpcNHDJ0PYdjFv5mgEvTEJLujrYwjWHVkNe+XfHPBD/w== -vscode-languageclient@^8.0.2-next.4: - version "8.0.2-next.4" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.0.2-next.4.tgz#87dd364ffbd4356aff3af14e7b557d9fe34d2b67" - integrity sha512-j9BEiCYMN9IoKwYdk9iickV6WNPVGPoVO11SMdoxFnWPIT3y5UAe3qf/WsfA9OdklAIaxxYasfgyKCpBjSPNuw== +vscode-languageclient@^8.1.0-next.1: + version "8.1.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.1.0-next.1.tgz#44b63bc2d215c13f1dea1dc54267a354ea5451cb" + integrity sha512-lJraJ8IrqXr83ZciAs4dN32f9kEPuOb/FqAeUTgnW5cAxo0Qux0/EMgKyU33Qf9LdEI0I9iwRVxQWtawbyUUfg== dependencies: - minimatch "^3.0.4" - semver "^7.3.5" - vscode-languageserver-protocol "3.17.2-next.5" + minimatch "^5.1.0" + semver "^7.3.7" + vscode-languageserver-protocol "3.17.3-next.1" -vscode-languageserver-protocol@3.17.2-next.5: - version "3.17.2-next.5" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2-next.5.tgz#9bc747411c3ce9e1d73c2714bf6555e0199eec26" - integrity sha512-UlH+QL4Q4lX94of/UPDDwwWIkd8w7dtMW4khzvEDUoykiG9tba0iG6V0bAiv8XVpnBIUYjL2FNFiL3zl+TY1Sw== +vscode-languageserver-protocol@3.17.3-next.1: + version "3.17.3-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.1.tgz#804880c172b4c48d1a48a91c4c23250121effb19" + integrity sha512-vgjvPE0zox+1Fi4ljsSFJ+B3g8wGNbuAEEdulueVdv+R2VHtc06+dgxhWiG4LKPqXwjPDmiuxCnvd2xk3fzTTw== dependencies: - vscode-jsonrpc "8.0.2-next.1" - vscode-languageserver-types "3.17.2-next.2" + vscode-jsonrpc "8.1.0-next.1" + vscode-languageserver-types "3.17.2" -vscode-languageserver-types@3.17.2-next.2: - version "3.17.2-next.2" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2-next.2.tgz#af5d6978eee7682aab87c1419323f5b141ac6596" - integrity sha512-TiAkLABgqkVWdAlC3XlOfdhdjIAdVU4YntPUm9kKGbXr+MGwpVnKz2KZMNBcvG0CFx8Hi8qliL0iq+ndPB720w== +vscode-languageserver-types@3.17.2: + version "3.17.2" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2" + integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA== -vscode-nls@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840" - integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA== +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== -vscode-uri@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84" - integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA== +vscode-uri@^3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.6.tgz#5e6e2e1a4170543af30151b561a41f71db1d6f91" + integrity sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ== yallist@^4.0.0: version "4.0.0" diff --git a/extensions/dart/cgmanifest.json b/extensions/dart/cgmanifest.json index 84f084ffdbd..d98ab2e7ef6 100644 --- a/extensions/dart/cgmanifest.json +++ b/extensions/dart/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "dart-lang/dart-syntax-highlight", "repositoryUrl": "https://github.com/dart-lang/dart-syntax-highlight", - "commitHash": "9d4857e114b7000d94232d83187ad142961c678a" + "commitHash": "bd5cbdfe533c455a7ff7875923c4a94a5b497382" } }, "licenseDetail": [ diff --git a/extensions/dart/syntaxes/dart.tmLanguage.json b/extensions/dart/syntaxes/dart.tmLanguage.json index 00f374a6ba2..2970d1067cb 100644 --- a/extensions/dart/syntaxes/dart.tmLanguage.json +++ b/extensions/dart/syntaxes/dart.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/dart-lang/dart-syntax-highlight/commit/9d4857e114b7000d94232d83187ad142961c678a", + "version": "https://github.com/dart-lang/dart-syntax-highlight/commit/bd5cbdfe533c455a7ff7875923c4a94a5b497382", "name": "Dart", "scopeName": "source.dart", "patterns": [ @@ -230,7 +230,15 @@ "class-identifier": { "patterns": [ { - "match": "(??]|,\\s*|\\s+extends\\s+)+>)?|bool\\b|num\\b|int\\b|double\\b|dynamic\\b|(void)\\b)", + "name": "storage.type.primitive.dart", + "match": "\\bvoid\\b" + }, + { + "name": "support.class.dart", + "match": "\\b(bool|num|int|double|dynamic)\\b" + }, + { + "match": "\\b([_$]*[A-Z][a-zA-Z0-9_$]*)(<(?:[a-zA-Z0-9_$<>?]|,\\s*|\\s+extends\\s+)+>)?", "captures": { "1": { "name": "support.class.dart" @@ -241,9 +249,6 @@ "include": "#type-args" } ] - }, - "3": { - "name": "storage.type.primitive.dart" } } } diff --git a/extensions/debug-auto-launch/package.json b/extensions/debug-auto-launch/package.json index 82c9054c456..87690afef24 100644 --- a/extensions/debug-auto-launch/package.json +++ b/extensions/debug-auto-launch/package.json @@ -16,7 +16,7 @@ } }, "activationEvents": [ - "*" + "onStartupFinished" ], "main": "./out/extension", "scripts": { @@ -33,7 +33,7 @@ ] }, "dependencies": { - "vscode-nls": "^4.0.0" + "vscode-nls": "^5.2.0" }, "devDependencies": { "@types/node": "16.x" diff --git a/extensions/debug-auto-launch/src/extension.ts b/extensions/debug-auto-launch/src/extension.ts index a4a48f5c380..86de0ac6ea4 100644 --- a/extensions/debug-auto-launch/src/extension.ts +++ b/extensions/debug-auto-launch/src/extension.ts @@ -8,6 +8,12 @@ import { createServer, Server } from 'net'; import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; +const enum State { + Disabled = 'disabled', + OnlyWithFlag = 'onlyWithFlag', + Smart = 'smart', + Always = 'always', +} const localize = nls.loadMessageBundle(); const TEXT_STATUSBAR_LABEL = { [State.Disabled]: localize('status.text.auto.attach.disabled', 'Auto Attach: Disabled'), @@ -62,12 +68,6 @@ const SETTINGS_CAUSE_REFRESH = new Set( ['autoAttachSmartPattern', SETTING_STATE].map(s => `${SETTING_SECTION}.${s}`), ); -const enum State { - Disabled = 'disabled', - OnlyWithFlag = 'onlyWithFlag', - Smart = 'smart', - Always = 'always', -} let currentState: Promise<{ context: vscode.ExtensionContext; state: State | null }>; let statusItem: vscode.StatusBarItem | undefined; // and there is no status bar item @@ -243,7 +243,7 @@ const createServerInner = async (ipcAddress: string) => { const createServerInstance = (ipcAddress: string) => new Promise((resolve, reject) => { const s = createServer(socket => { - let data: Buffer[] = []; + const data: Buffer[] = []; socket.on('data', async chunk => { if (chunk[chunk.length - 1] !== 0) { // terminated with NUL byte @@ -392,7 +392,7 @@ async function getIpcAddress(context: vscode.ExtensionContext) { } function getJsDebugSettingKey() { - let o: { [key: string]: unknown } = {}; + const o: { [key: string]: unknown } = {}; const config = vscode.workspace.getConfiguration(SETTING_SECTION); for (const setting of SETTINGS_CAUSE_REFRESH) { o[setting] = config.get(setting); diff --git a/extensions/debug-auto-launch/yarn.lock b/extensions/debug-auto-launch/yarn.lock index 22c406bc73f..8b8c7a6c15b 100644 --- a/extensions/debug-auto-launch/yarn.lock +++ b/extensions/debug-auto-launch/yarn.lock @@ -7,7 +7,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== -vscode-nls@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" - integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw== +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== diff --git a/extensions/debug-server-ready/package.json b/extensions/debug-server-ready/package.json index 29cee88c0c5..09cd096bff3 100644 --- a/extensions/debug-server-ready/package.json +++ b/extensions/debug-server-ready/package.json @@ -150,7 +150,7 @@ ] }, "dependencies": { - "vscode-nls": "^4.0.0" + "vscode-nls": "^5.2.0" }, "devDependencies": { "@types/node": "16.x" diff --git a/extensions/debug-server-ready/src/extension.ts b/extensions/debug-server-ready/src/extension.ts index d112651fd09..a3214e1207b 100644 --- a/extensions/debug-server-ready/src/extension.ts +++ b/extensions/debug-server-ready/src/extension.ts @@ -57,7 +57,7 @@ class ServerReadyDetector extends vscode.Disposable { } static stop(session: vscode.DebugSession): void { - let detector = ServerReadyDetector.detectors.get(session); + const detector = ServerReadyDetector.detectors.get(session); if (detector) { ServerReadyDetector.detectors.delete(session); detector.dispose(); @@ -65,7 +65,7 @@ class ServerReadyDetector extends vscode.Disposable { } static rememberShellPid(session: vscode.DebugSession, pid: number) { - let detector = ServerReadyDetector.detectors.get(session); + const detector = ServerReadyDetector.detectors.get(session); if (detector) { detector.shellPid = pid; } @@ -77,7 +77,7 @@ class ServerReadyDetector extends vscode.Disposable { // first find the detector with a matching pid const pid = await e.terminal.processId; - for (let [, detector] of this.detectors) { + for (const [, detector] of this.detectors) { if (detector.shellPid === pid) { detector.detectPattern(e.data); return; @@ -85,7 +85,7 @@ class ServerReadyDetector extends vscode.Disposable { } // if none found, try all detectors until one matches - for (let [, detector] of this.detectors) { + for (const [, detector] of this.detectors) { if (detector.detectPattern(e.data)) { return; } diff --git a/extensions/debug-server-ready/yarn.lock b/extensions/debug-server-ready/yarn.lock index 22c406bc73f..8b8c7a6c15b 100644 --- a/extensions/debug-server-ready/yarn.lock +++ b/extensions/debug-server-ready/yarn.lock @@ -7,7 +7,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== -vscode-nls@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" - integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw== +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json index 659be1e0fce..2ec3d79ce6f 100644 --- a/extensions/emmet/package.json +++ b/extensions/emmet/package.json @@ -65,6 +65,7 @@ "emmet.showAbbreviationSuggestions": { "type": "boolean", "default": true, + "scope": "language-overridable", "markdownDescription": "%emmetShowAbbreviationSuggestions%" }, "emmet.includeLanguages": { @@ -73,7 +74,6 @@ "type": "string" }, "default": {}, - "scope": "resource", "markdownDescription": "%emmetIncludeLanguages%" }, "emmet.variables": { @@ -92,13 +92,11 @@ "type": "string" }, "default": {}, - "scope": "resource", "markdownDescription": "%emmetVariables%" }, "emmet.syntaxProfiles": { "type": "object", "default": {}, - "scope": "resource", "markdownDescription": "%emmetSyntaxProfiles%" }, "emmet.excludeLanguages": { @@ -109,7 +107,6 @@ "default": [ "markdown" ], - "scope": "resource", "markdownDescription": "%emmetExclude%" }, "emmet.extensionsPath": { @@ -125,12 +122,17 @@ "emmet.triggerExpansionOnTab": { "type": "boolean", "default": false, + "scope": "language-overridable", "markdownDescription": "%emmetTriggerExpansionOnTab%" }, + "emmet.useInlineCompletions": { + "type": "boolean", + "default": false, + "markdownDescription": "%emmetUseInlineCompletions%" + }, "emmet.preferences": { "type": "object", "default": {}, - "scope": "resource", "markdownDescription": "%emmetPreferences%", "properties": { "css.intUnit": { diff --git a/extensions/emmet/package.nls.json b/extensions/emmet/package.nls.json index 1cac53a6081..2a58c39641d 100644 --- a/extensions/emmet/package.nls.json +++ b/extensions/emmet/package.nls.json @@ -31,7 +31,7 @@ "emmetShowAbbreviationSuggestions": "Shows possible Emmet abbreviations as suggestions. Not applicable in stylesheets or when emmet.showExpandedAbbreviation is set to `\"never\"`.", "emmetIncludeLanguages": "Enable Emmet abbreviations in languages that are not supported by default. Add a mapping here between the language and Emmet supported language.\n For example: `{\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}`", "emmetVariables": "Variables to be used in Emmet snippets.", - "emmetTriggerExpansionOnTab": "When enabled, Emmet abbreviations are expanded when pressing TAB.", + "emmetTriggerExpansionOnTab": "When enabled, Emmet abbreviations are expanded when pressing TAB, even when completions do not show up. When disabled, completions that show up can still be accepted by pressing TAB.", "emmetPreferences": "Preferences used to modify behavior of some actions and resolvers of Emmet.", "emmetPreferencesIntUnit": "Default unit for integer values.", "emmetPreferencesFloatUnit": "Default unit for float values.", @@ -59,5 +59,6 @@ "emmetPreferencesOutputInlineBreak": "The number of sibling inline elements needed for line breaks to be placed between those elements. If `0`, inline elements are always expanded onto a single line.", "emmetPreferencesOutputReverseAttributes": "If `true`, reverses attribute merging directions when resolving snippets.", "emmetPreferencesOutputSelfClosingStyle": "Style of self-closing tags: html (`
`), xml (`
`) or xhtml (`
`).", - "emmetPreferencesCssColorShort": "If `true`, color values like `#f` will be expanded to `#fff` instead of `#ffffff`." + "emmetPreferencesCssColorShort": "If `true`, color values like `#f` will be expanded to `#fff` instead of `#ffffff`.", + "emmetUseInlineCompletions": "If `true`, Emmet will use inline completions to suggest expansions. To prevent the non-inline completion item provider from showing up as often while this setting is `true`, turn `#editor.quickSuggestions#` to `inline` or `off` for the `other` item." } diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts index 1462a2ec4d7..c8a6f657d75 100644 --- a/extensions/emmet/src/defaultCompletionProvider.ts +++ b/extensions/emmet/src/defaultCompletionProvider.ts @@ -49,7 +49,7 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi const mappedLanguages = getMappingForIncludedLanguages(); const isSyntaxMapped = mappedLanguages[document.languageId] ? true : false; - let emmetMode = getEmmetMode((isSyntaxMapped ? mappedLanguages[document.languageId] : document.languageId), mappedLanguages, excludedLanguages); + const emmetMode = getEmmetMode((isSyntaxMapped ? mappedLanguages[document.languageId] : document.languageId), mappedLanguages, excludedLanguages); if (!emmetMode || emmetConfig['showExpandedAbbreviation'] === 'never' @@ -135,7 +135,7 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi const offset = document.offsetAt(position); if (isStyleSheet(document.languageId) && context.triggerKind !== vscode.CompletionTriggerKind.TriggerForIncompleteCompletions) { validateLocation = true; - let usePartialParsing = vscode.workspace.getConfiguration('emmet')['optimizeStylesheetParsing'] === true; + const usePartialParsing = vscode.workspace.getConfiguration('emmet')['optimizeStylesheetParsing'] === true; rootNode = usePartialParsing && document.lineCount > 1000 ? parsePartialStylesheet(document, position) : getRootNode(document, true); if (!rootNode) { return; @@ -152,8 +152,8 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi if (!rootNode) { return; } - let flatNode = getFlatNode(rootNode, offset, true); - let embeddedCssNode = getEmbeddedCssNodeIfAny(document, flatNode, position); + const flatNode = getFlatNode(rootNode, offset, true); + const embeddedCssNode = getEmbeddedCssNodeIfAny(document, flatNode, position); currentNode = getFlatNode(embeddedCssNode, offset, true); } @@ -167,7 +167,7 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi // Check for document symbols in js/ts/jsx/tsx and avoid triggering emmet for abbreviations of the form symbolName.sometext // Presence of > or * or + in the abbreviation denotes valid abbreviation that should trigger emmet if (!isStyleSheet(syntax) && (document.languageId === 'javascript' || document.languageId === 'javascriptreact' || document.languageId === 'typescript' || document.languageId === 'typescriptreact')) { - let abbreviation: string = extractAbbreviationResults.abbreviation; + const abbreviation: string = extractAbbreviationResults.abbreviation; // For the second condition, we don't want abbreviations that have [] characters but not ='s in them to expand // In turn, users must explicitly expand abbreviations of the form Component[attr1 attr2], but it means we don't try to expand a[i]. if (abbreviation.startsWith('this.') || /\[[^\]=]*\]/.test(abbreviation)) { @@ -194,14 +194,14 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi } } - let newItems: vscode.CompletionItem[] = []; + const newItems: vscode.CompletionItem[] = []; if (result && result.items) { result.items.forEach((item: any) => { - let newItem = new vscode.CompletionItem(item.label); + const newItem = new vscode.CompletionItem(item.label); newItem.documentation = item.documentation; newItem.detail = item.detail; newItem.insertText = new vscode.SnippetString(item.textEdit.newText); - let oldrange = item.textEdit.range; + const oldrange = item.textEdit.range; newItem.range = new vscode.Range(oldrange.start.line, oldrange.start.character, oldrange.end.line, oldrange.end.character); newItem.filterText = item.filterText; diff --git a/extensions/emmet/src/editPoint.ts b/extensions/emmet/src/editPoint.ts index 239df1f4cc2..b5137795dc9 100644 --- a/extensions/emmet/src/editPoint.ts +++ b/extensions/emmet/src/editPoint.ts @@ -12,9 +12,9 @@ export function fetchEditPoint(direction: string): void { } const editor = vscode.window.activeTextEditor; - let newSelections: vscode.Selection[] = []; + const newSelections: vscode.Selection[] = []; editor.selections.forEach(selection => { - let updatedSelection = direction === 'next' ? nextEditPoint(selection, editor) : prevEditPoint(selection, editor); + const updatedSelection = direction === 'next' ? nextEditPoint(selection, editor) : prevEditPoint(selection, editor); newSelections.push(updatedSelection); }); editor.selections = newSelections; @@ -23,7 +23,7 @@ export function fetchEditPoint(direction: string): void { function nextEditPoint(selection: vscode.Selection, editor: vscode.TextEditor): vscode.Selection { for (let lineNum = selection.anchor.line; lineNum < editor.document.lineCount; lineNum++) { - let updatedSelection = findEditPoint(lineNum, editor, selection.anchor, 'next'); + const updatedSelection = findEditPoint(lineNum, editor, selection.anchor, 'next'); if (updatedSelection) { return updatedSelection; } @@ -33,7 +33,7 @@ function nextEditPoint(selection: vscode.Selection, editor: vscode.TextEditor): function prevEditPoint(selection: vscode.Selection, editor: vscode.TextEditor): vscode.Selection { for (let lineNum = selection.anchor.line; lineNum >= 0; lineNum--) { - let updatedSelection = findEditPoint(lineNum, editor, selection.anchor, 'prev'); + const updatedSelection = findEditPoint(lineNum, editor, selection.anchor, 'prev'); if (updatedSelection) { return updatedSelection; } @@ -43,7 +43,7 @@ function prevEditPoint(selection: vscode.Selection, editor: vscode.TextEditor): function findEditPoint(lineNum: number, editor: vscode.TextEditor, position: vscode.Position, direction: string): vscode.Selection | undefined { - let line = editor.document.lineAt(lineNum); + const line = editor.document.lineAt(lineNum); let lineContent = line.text; if (lineNum !== position.line && line.isEmptyOrWhitespace && lineContent.length) { @@ -53,8 +53,8 @@ function findEditPoint(lineNum: number, editor: vscode.TextEditor, position: vsc if (lineNum === position.line && direction === 'prev') { lineContent = lineContent.substr(0, position.character); } - let emptyAttrIndex = direction === 'next' ? lineContent.indexOf('""', lineNum === position.line ? position.character : 0) : lineContent.lastIndexOf('""'); - let emptyTagIndex = direction === 'next' ? lineContent.indexOf('><', lineNum === position.line ? position.character : 0) : lineContent.lastIndexOf('><'); + const emptyAttrIndex = direction === 'next' ? lineContent.indexOf('""', lineNum === position.line ? position.character : 0) : lineContent.lastIndexOf('""'); + const emptyTagIndex = direction === 'next' ? lineContent.indexOf('><', lineNum === position.line ? position.character : 0) : lineContent.lastIndexOf('><'); let winner = -1; diff --git a/extensions/emmet/src/emmetCommon.ts b/extensions/emmet/src/emmetCommon.ts index 5a5e0d872c3..daed62d7c65 100644 --- a/extensions/emmet/src/emmetCommon.ts +++ b/extensions/emmet/src/emmetCommon.ts @@ -23,7 +23,7 @@ import { addFileToParseCache, clearParseCache, removeFileFromParseCache } from ' export function activateEmmetExtension(context: vscode.ExtensionContext) { migrateEmmetExtensionsPath(); - registerCompletionProviders(context); + refreshCompletionProviders(context); updateEmmetExtensionsPath(); context.subscriptions.push(vscode.commands.registerCommand('editor.emmet.action.wrapWithAbbreviation', (args) => { @@ -122,8 +122,8 @@ export function activateEmmetExtension(context: vscode.ExtensionContext) { })); context.subscriptions.push(vscode.workspace.onDidChangeConfiguration((e) => { - if (e.affectsConfiguration('emmet.includeLanguages')) { - registerCompletionProviders(context); + if (e.affectsConfiguration('emmet.includeLanguages') || e.affectsConfiguration('emmet.useInlineCompletions')) { + refreshCompletionProviders(context); } if (e.affectsConfiguration('emmet.extensionsPath')) { updateEmmetExtensionsPath(); @@ -158,45 +158,82 @@ export function activateEmmetExtension(context: vscode.ExtensionContext) { * Holds any registered completion providers by their language strings */ const languageMappingForCompletionProviders: Map = new Map(); -const completionProvidersMapping: Map = new Map(); +const completionProviderDisposables: vscode.Disposable[] = []; -function registerCompletionProviders(context: vscode.ExtensionContext) { - let completionProvider = new DefaultCompletionItemProvider(); - let includedLanguages = getMappingForIncludedLanguages(); +function refreshCompletionProviders(_: vscode.ExtensionContext) { + clearCompletionProviderInfo(); + const completionProvider = new DefaultCompletionItemProvider(); + const inlineCompletionProvider: vscode.InlineCompletionItemProvider = { + async provideInlineCompletionItems(document: vscode.TextDocument, position: vscode.Position, _: vscode.InlineCompletionContext, token: vscode.CancellationToken) { + const items = await completionProvider.provideCompletionItems(document, position, token, { triggerCharacter: undefined, triggerKind: vscode.CompletionTriggerKind.Invoke }); + if (!items) { + return undefined; + } + const item = items.items[0]; + if (!item) { + return undefined; + } + const range = item.range as vscode.Range; + + if (document.getText(range) !== item.label) { + // We only want to show an inline completion if we are really sure the user meant emmet. + // If the user types `d`, we don't want to suggest `
`. + return undefined; + } + + return [ + { + insertText: item.insertText as any, + filterText: item.label as any, + range + } + ]; + } + }; + + const useInlineCompletionProvider = vscode.workspace.getConfiguration('emmet').get('useInlineCompletions'); + const includedLanguages = getMappingForIncludedLanguages(); Object.keys(includedLanguages).forEach(language => { if (languageMappingForCompletionProviders.has(language) && languageMappingForCompletionProviders.get(language) === includedLanguages[language]) { return; } - if (languageMappingForCompletionProviders.has(language)) { - const mapping = completionProvidersMapping.get(language); - if (mapping) { - mapping.dispose(); - } - languageMappingForCompletionProviders.delete(language); - completionProvidersMapping.delete(language); + if (useInlineCompletionProvider) { + const inlineCompletionsProvider = vscode.languages.registerInlineCompletionItemProvider({ language, scheme: '*' }, inlineCompletionProvider); + completionProviderDisposables.push(inlineCompletionsProvider); } - const provider = vscode.languages.registerCompletionItemProvider({ language, scheme: '*' }, completionProvider, ...LANGUAGE_MODES[includedLanguages[language]]); - context.subscriptions.push(provider); + const explicitProvider = vscode.languages.registerCompletionItemProvider({ language, scheme: '*' }, completionProvider, ...LANGUAGE_MODES[includedLanguages[language]]); + completionProviderDisposables.push(explicitProvider); languageMappingForCompletionProviders.set(language, includedLanguages[language]); - completionProvidersMapping.set(language, provider); }); Object.keys(LANGUAGE_MODES).forEach(language => { if (!languageMappingForCompletionProviders.has(language)) { - const provider = vscode.languages.registerCompletionItemProvider({ language, scheme: '*' }, completionProvider, ...LANGUAGE_MODES[language]); - context.subscriptions.push(provider); + if (useInlineCompletionProvider) { + const inlineCompletionsProvider = vscode.languages.registerInlineCompletionItemProvider({ language, scheme: '*' }, inlineCompletionProvider); + completionProviderDisposables.push(inlineCompletionsProvider); + } + + const explicitProvider = vscode.languages.registerCompletionItemProvider({ language, scheme: '*' }, completionProvider, ...LANGUAGE_MODES[language]); + completionProviderDisposables.push(explicitProvider); languageMappingForCompletionProviders.set(language, language); - completionProvidersMapping.set(language, provider); } }); } +function clearCompletionProviderInfo() { + languageMappingForCompletionProviders.clear(); + let disposable: vscode.Disposable | undefined; + while (disposable = completionProviderDisposables.pop()) { + disposable.dispose(); + } +} + export function deactivate() { - completionProvidersMapping.clear(); + clearCompletionProviderInfo(); clearParseCache(); } diff --git a/extensions/emmet/src/incrementDecrement.ts b/extensions/emmet/src/incrementDecrement.ts index 9e0afa4acf1..f7adf444978 100644 --- a/extensions/emmet/src/incrementDecrement.ts +++ b/extensions/emmet/src/incrementDecrement.ts @@ -21,7 +21,7 @@ export function incrementDecrement(delta: number): Thenable | undefined return editor.edit(editBuilder => { editor.selections.forEach(selection => { - let rangeToReplace = locate(editor.document, selection.isReversed ? selection.anchor : selection.active); + const rangeToReplace = locate(editor.document, selection.isReversed ? selection.anchor : selection.active); if (!rangeToReplace) { return; } @@ -40,7 +40,7 @@ export function incrementDecrement(delta: number): Thenable | undefined */ export function update(numString: string, delta: number): string { let m: RegExpMatchArray | null; - let decimals = (m = numString.match(/\.(\d+)$/)) ? m[1].length : 1; + const decimals = (m = numString.match(/\.(\d+)$/)) ? m[1].length : 1; let output = String((parseFloat(numString) + delta).toFixed(decimals)).replace(/\.0+$/, ''); if (m = numString.match(/^\-?(0\d+)/)) { diff --git a/extensions/emmet/src/matchTag.ts b/extensions/emmet/src/matchTag.ts index d7331a465b2..1c928fb7371 100644 --- a/extensions/emmet/src/matchTag.ts +++ b/extensions/emmet/src/matchTag.ts @@ -20,7 +20,7 @@ export function matchTag() { return; } - let updatedSelections: vscode.Selection[] = []; + const updatedSelections: vscode.Selection[] = []; editor.selections.forEach(selection => { const updatedSelection = getUpdatedSelections(document, rootNode, selection.start); if (updatedSelection) { diff --git a/extensions/emmet/src/removeTag.ts b/extensions/emmet/src/removeTag.ts index c43a9a03e72..b8b5b9eebdf 100644 --- a/extensions/emmet/src/removeTag.ts +++ b/extensions/emmet/src/removeTag.ts @@ -19,7 +19,7 @@ export function removeTag() { return; } - let finalRangesToRemove = Array.from(editor.selections).reverse() + const finalRangesToRemove = Array.from(editor.selections).reverse() .reduce((prev, selection) => prev.concat(getRangesToRemove(editor.document, rootNode, selection)), []); @@ -68,7 +68,7 @@ function getRangesToRemove(document: vscode.TextDocument, rootNode: HtmlFlatNode } } - let rangesToRemove = []; + const rangesToRemove = []; if (openTagRange) { rangesToRemove.push(openTagRange); if (closeTagRange) { diff --git a/extensions/emmet/src/selectItem.ts b/extensions/emmet/src/selectItem.ts index 52e672eddf3..437dbed7ec9 100644 --- a/extensions/emmet/src/selectItem.ts +++ b/extensions/emmet/src/selectItem.ts @@ -21,7 +21,7 @@ export function fetchSelectItem(direction: string): void { return; } - let newSelections: vscode.Selection[] = []; + const newSelections: vscode.Selection[] = []; editor.selections.forEach(selection => { const selectionStart = selection.isReversed ? selection.active : selection.anchor; const selectionEnd = selection.isReversed ? selection.anchor : selection.active; diff --git a/extensions/emmet/src/selectItemStylesheet.ts b/extensions/emmet/src/selectItemStylesheet.ts index 557d971361b..09f45ee8879 100644 --- a/extensions/emmet/src/selectItemStylesheet.ts +++ b/extensions/emmet/src/selectItemStylesheet.ts @@ -28,7 +28,7 @@ export function nextItemStylesheet(document: vscode.TextDocument, startPosition: if (currentNode.type === 'property' && startOffset >= (currentNode).valueToken.start && endOffset <= (currentNode).valueToken.end) { - let singlePropertyValue = getSelectionFromProperty(document, currentNode, startOffset, endOffset, false, 'next'); + const singlePropertyValue = getSelectionFromProperty(document, currentNode, startOffset, endOffset, false, 'next'); if (singlePropertyValue) { return singlePropertyValue; } @@ -77,7 +77,7 @@ export function prevItemStylesheet(document: vscode.TextDocument, startPosition: if (currentNode.type === 'property' && startOffset >= (currentNode).valueToken.start && endOffset <= (currentNode).valueToken.end) { - let singlePropertyValue = getSelectionFromProperty(document, currentNode, startOffset, endOffset, false, 'prev'); + const singlePropertyValue = getSelectionFromProperty(document, currentNode, startOffset, endOffset, false, 'prev'); if (singlePropertyValue) { return singlePropertyValue; } @@ -115,7 +115,7 @@ function getSelectionFromProperty(document: vscode.TextDocument, node: Node | un } const propertyNode = node; - let propertyValue = propertyNode.valueToken.stream.substring(propertyNode.valueToken.start, propertyNode.valueToken.end); + const propertyValue = propertyNode.valueToken.stream.substring(propertyNode.valueToken.start, propertyNode.valueToken.end); selectFullValue = selectFullValue || (direction === 'prev' && selectionStart === propertyNode.valueToken.start && selectionEnd < propertyNode.valueToken.end); @@ -144,7 +144,7 @@ function getSelectionFromProperty(document: vscode.TextDocument, node: Node | un } - let [newSelectionStartOffset, newSelectionEndOffset] = direction === 'prev' ? findPrevWord(propertyValue, pos) : findNextWord(propertyValue, pos); + const [newSelectionStartOffset, newSelectionEndOffset] = direction === 'prev' ? findPrevWord(propertyValue, pos) : findNextWord(propertyValue, pos); if (!newSelectionStartOffset && !newSelectionEndOffset) { return; } diff --git a/extensions/emmet/src/test/abbreviationAction.test.ts b/extensions/emmet/src/test/abbreviationAction.test.ts index c185400bd75..3f18a1ffc5d 100644 --- a/extensions/emmet/src/test/abbreviationAction.test.ts +++ b/extensions/emmet/src/test/abbreviationAction.test.ts @@ -48,7 +48,7 @@ const invokeCompletionContext: CompletionContext = { suite('Tests for Expand Abbreviations (HTML)', () => { const oldValueForExcludeLanguages = workspace.getConfiguration('emmet').inspect('excludeLanguages'); - const oldValueForInlcudeLanguages = workspace.getConfiguration('emmet').inspect('includeLanguages'); + const oldValueForIncludeLanguages = workspace.getConfiguration('emmet').inspect('includeLanguages'); teardown(closeAllEditors); test('Expand snippets (HTML)', () => { @@ -374,7 +374,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => { await expandPromise; assert.strictEqual(editor.document.getText(), htmlContents.replace('span.bye', '')); }); - return workspace.getConfiguration('emmet').update('includeLanguages', oldValueForInlcudeLanguages || {}, ConfigurationTarget.Global); + return workspace.getConfiguration('emmet').update('includeLanguages', oldValueForIncludeLanguages || {}, ConfigurationTarget.Global); }); test('Expand html in completion list when inside script tag with javascript type if js is mapped to html (HTML)', async () => { @@ -399,7 +399,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => { assert.strictEqual(((emmetCompletionItem.documentation) || '').replace(/\|/g, ''), expandedText, `Docs of completion item doesnt match.`); return Promise.resolve(); }); - return workspace.getConfiguration('emmet').update('includeLanguages', oldValueForInlcudeLanguages || {}, ConfigurationTarget.Global); + return workspace.getConfiguration('emmet').update('includeLanguages', oldValueForIncludeLanguages || {}, ConfigurationTarget.Global); }); // test('No expanding when html is excluded in the settings', () => { diff --git a/extensions/emmet/src/test/editPointSelectItemBalance.test.ts b/extensions/emmet/src/test/editPointSelectItemBalance.test.ts index b631b156d24..c698e85c683 100644 --- a/extensions/emmet/src/test/editPointSelectItemBalance.test.ts +++ b/extensions/emmet/src/test/editPointSelectItemBalance.test.ts @@ -62,13 +62,13 @@ suite('Tests for Next/Previous Select/Edit point and Balance actions', () => { return withRandomFileEditor(htmlContents, '.html', (editor, _) => { editor.selections = [new Selection(1, 5, 1, 5)]; - let expectedNextEditPoints: [number, number][] = [[4, 16], [6, 8], [10, 2], [10, 2]]; + const expectedNextEditPoints: [number, number][] = [[4, 16], [6, 8], [10, 2], [10, 2]]; expectedNextEditPoints.forEach(([line, col]) => { fetchEditPoint('next'); testSelection(editor.selection, col, line); }); - let expectedPrevEditPoints = [[6, 8], [4, 16], [4, 16]]; + const expectedPrevEditPoints = [[6, 8], [4, 16], [4, 16]]; expectedPrevEditPoints.forEach(([line, col]) => { fetchEditPoint('prev'); testSelection(editor.selection, col, line); @@ -82,7 +82,7 @@ suite('Tests for Next/Previous Select/Edit point and Balance actions', () => { return withRandomFileEditor(htmlContents, '.html', (editor, _) => { editor.selections = [new Selection(2, 2, 2, 2)]; - let expectedNextItemPoints: [number, number, number][] = [ + const expectedNextItemPoints: [number, number, number][] = [ [2, 1, 5], // html [2, 6, 15], // lang="en" [2, 12, 14], // en @@ -141,7 +141,7 @@ suite('Tests for Next/Previous Select/Edit point and Balance actions', () => { return withRandomFileEditor(templateContents, '.html', (editor, _) => { editor.selections = [new Selection(2, 2, 2, 2)]; - let expectedNextItemPoints: [number, number, number][] = [ + const expectedNextItemPoints: [number, number, number][] = [ [2, 2, 5], // div [2, 6, 20], // class="header" [2, 13, 19], // header @@ -170,7 +170,7 @@ suite('Tests for Next/Previous Select/Edit point and Balance actions', () => { return withRandomFileEditor(cssContents, '.css', (editor, _) => { editor.selections = [new Selection(0, 0, 0, 0)]; - let expectedNextItemPoints: [number, number, number][] = [ + const expectedNextItemPoints: [number, number, number][] = [ [1, 0, 4], // .boo [2, 1, 19], // margin: 20px 10px; [2, 9, 18], // 20px 10px @@ -201,7 +201,7 @@ suite('Tests for Next/Previous Select/Edit point and Balance actions', () => { return withRandomFileEditor(scssContents, '.scss', (editor, _) => { editor.selections = [new Selection(0, 0, 0, 0)]; - let expectedNextItemPoints: [number, number, number][] = [ + const expectedNextItemPoints: [number, number, number][] = [ [1, 0, 4], // .boo [2, 1, 19], // margin: 20px 10px; [2, 9, 18], // 20px 10px @@ -232,7 +232,7 @@ suite('Tests for Next/Previous Select/Edit point and Balance actions', () => { return withRandomFileEditor(htmlContents, 'html', (editor, _) => { editor.selections = [new Selection(14, 6, 14, 10)]; - let expectedBalanceOutRanges: [number, number, number, number][] = [ + const expectedBalanceOutRanges: [number, number, number, number][] = [ [14, 3, 14, 32], //
  • Item 1
    • [13, 23, 16, 2], // inner contents of
      [13, 2, 16, 7], // outer contents of
        @@ -249,7 +249,7 @@ suite('Tests for Next/Previous Select/Edit point and Balance actions', () => { }); editor.selections = [new Selection(12, 7, 12, 7)]; - let expectedBalanceInRanges: [number, number, number, number][] = [ + const expectedBalanceInRanges: [number, number, number, number][] = [ [12, 21, 17, 1], // inner contents of
        [13, 2, 16, 7], // outer contents of
          [13, 23, 16, 2], // inner contents of
            @@ -269,7 +269,7 @@ suite('Tests for Next/Previous Select/Edit point and Balance actions', () => { return withRandomFileEditor(htmlContents, 'html', (editor, _) => { editor.selections = [new Selection(15, 6, 15, 10)]; - let expectedBalanceOutRanges: [number, number, number, number][] = [ + const expectedBalanceOutRanges: [number, number, number, number][] = [ [15, 3, 15, 32], //
          • Item 2
            • [13, 23, 16, 2], // inner contents of
              [13, 2, 16, 7], // outer contents of
                @@ -327,7 +327,7 @@ suite('Tests for Next/Previous Select/Edit point and Balance actions', () => { return withRandomFileEditor(htmlTemplate, 'html', (editor, _) => { editor.selections = [new Selection(5, 24, 5, 24)]; - let expectedBalanceOutRanges: [number, number, number, number][] = [ + const expectedBalanceOutRanges: [number, number, number, number][] = [ [5, 20, 5, 26], //
              • ``Item 2''
                • [5, 2, 5, 31], // ``
              • Item 2
                • '' [3, 22, 6, 1], // inner contents of ul diff --git a/extensions/emmet/src/test/partialParsingStylesheet.test.ts b/extensions/emmet/src/test/partialParsingStylesheet.test.ts index d29348af3af..03b6a1a5dbd 100644 --- a/extensions/emmet/src/test/partialParsingStylesheet.test.ts +++ b/extensions/emmet/src/test/partialParsingStylesheet.test.ts @@ -30,12 +30,12 @@ p { } p `; return withRandomFileEditor(cssContents, '.css', (_, doc) => { - let rangesForEmmet = [ + const rangesForEmmet = [ new vscode.Range(3, 18, 3, 19), // Same line after block comment new vscode.Range(4, 1, 4, 2), // p after block comment new vscode.Range(5, 1, 5, 3) // p. after block comment ]; - let rangesNotEmmet = [ + const rangesNotEmmet = [ new vscode.Range(1, 0, 1, 1), // Selector new vscode.Range(2, 9, 2, 10), // Property value new vscode.Range(3, 3, 3, 5), // dn inside block comment @@ -65,7 +65,7 @@ dn { } bg `; return withRandomFileEditor(sassContents, '.scss', (_, doc) => { - let rangesNotEmmet = [ + const rangesNotEmmet = [ new vscode.Range(1, 0, 1, 4), // Selector new vscode.Range(2, 3, 2, 7), // Line commented selector new vscode.Range(3, 3, 3, 7), // Block commented selector @@ -94,12 +94,12 @@ comment */ } p `; return withRandomFileEditor(cssContents, '.css', (_, doc) => { - let rangesForEmmet = [ + const rangesForEmmet = [ new vscode.Range(7, 18, 7, 19), // Same line after block comment new vscode.Range(8, 1, 8, 2), // p after block comment new vscode.Range(9, 1, 9, 3) // p. after block comment ]; - let rangesNotEmmet = [ + const rangesNotEmmet = [ new vscode.Range(1, 2, 1, 3), // Selector new vscode.Range(3, 3, 3, 4), // Inside multiline comment new vscode.Range(5, 0, 5, 1), // Opening Brace @@ -133,13 +133,13 @@ comment */ }}} `; return withRandomFileEditor(sassContents, '.scss', (_, doc) => { - let rangesForEmmet = [ + const rangesForEmmet = [ new vscode.Range(2, 1, 2, 2), // Inside a ruleset before errors new vscode.Range(3, 1, 3, 2), // Inside a ruleset after no serious error new vscode.Range(7, 1, 7, 2), // @ inside a so far well structured ruleset new vscode.Range(9, 2, 9, 3), // @ inside a so far well structured nested ruleset ]; - let rangesNotEmmet = [ + const rangesNotEmmet = [ new vscode.Range(4, 4, 4, 5), // p inside ruleset without proper selector new vscode.Range(6, 3, 6, 4) // In selector ]; @@ -158,14 +158,14 @@ comment */ .foo{dn}.bar{.boo{dn}dn}.comd{/*{dn*/p{div{dn}} }.foo{.other{dn}} dn `; return withRandomFileEditor(sassContents, '.scss', (_, doc) => { - let rangesForEmmet = [ + const rangesForEmmet = [ new vscode.Range(1, 5, 1, 7), // Inside a ruleset new vscode.Range(1, 18, 1, 20), // Inside a nested ruleset new vscode.Range(1, 21, 1, 23), // Inside ruleset after nested one. new vscode.Range(1, 43, 1, 45), // Inside nested ruleset after comment new vscode.Range(1, 61, 1, 63) // Inside nested ruleset ]; - let rangesNotEmmet = [ + const rangesNotEmmet = [ new vscode.Range(1, 3, 1, 4), // In foo selector new vscode.Range(1, 10, 1, 11), // In bar selector new vscode.Range(1, 15, 1, 16), // In boo selector @@ -197,11 +197,11 @@ p.#{dn} { } `; return withRandomFileEditor(sassContents, '.scss', (_, doc) => { - let rangesForEmmet = [ + const rangesForEmmet = [ new vscode.Range(2, 1, 2, 4), // p.3 inside a ruleset whose selector uses interpolation new vscode.Range(4, 1, 4, 3) // dn inside ruleset after property with variable ]; - let rangesNotEmmet = [ + const rangesNotEmmet = [ new vscode.Range(1, 0, 1, 1), // In p in selector new vscode.Range(1, 2, 1, 3), // In # in selector new vscode.Range(1, 4, 1, 6), // In dn inside variable in selector @@ -237,13 +237,13 @@ ment */{ } `; return withRandomFileEditor(sassContents, '.scss', (_, doc) => { - let rangesForEmmet = [ + const rangesForEmmet = [ new vscode.Range(2, 14, 2, 21), // brs6-2p with a block commented line comment ('/* */' overrides '//') new vscode.Range(3, 1, 3, 3), // dn after a line with combined comments inside a ruleset new vscode.Range(9, 1, 9, 4), // m10 inside ruleset whose selector is before a comment new vscode.Range(12, 1, 12, 5) // op3 inside a ruleset with commented extra braces ]; - let rangesNotEmmet = [ + const rangesNotEmmet = [ new vscode.Range(2, 4, 2, 5), // In p inside block comment new vscode.Range(2, 9, 2, 10), // In p inside block comment and after line comment new vscode.Range(6, 3, 6, 4) // In c inside block comment diff --git a/extensions/emmet/src/test/tagActions.test.ts b/extensions/emmet/src/test/tagActions.test.ts index c9f8a7fe4fe..c8680dd66f0 100644 --- a/extensions/emmet/src/test/tagActions.test.ts +++ b/extensions/emmet/src/test/tagActions.test.ts @@ -43,7 +43,7 @@ suite('Tests for Emmet actions on html tags', () => {
        `; - let contentsWithTemplate = ` + const contentsWithTemplate = ` ', 'javascript', ' var i = 0; '); assertEmbeddedLanguageContent('', 'javascript', ' var i = 0; '); + assertEmbeddedLanguageContent('', 'javascript', ' /* this comment should not give error */ '); + assertEmbeddedLanguageContent('', 'javascript', ' /* this comment should not give error */ console.log("logging"); '); + assertEmbeddedLanguageContent('', 'javascript', ' var data=100; /* this comment should not give error */ '); assertEmbeddedLanguageContent('
        ', 'javascript', ' foo(); bar(); '); assertEmbeddedLanguageContent('
        ', 'javascript', ' return; '); - + assertEmbeddedLanguageContent('
        ', 'javascript', ' return;\n foo(); '); }); }); diff --git a/extensions/html-language-features/server/src/test/formatting.test.ts b/extensions/html-language-features/server/src/test/formatting.test.ts index 140942868e4..ebc319d20b6 100644 --- a/extensions/html-language-features/server/src/test/formatting.test.ts +++ b/extensions/html-language-features/server/src/test/formatting.test.ts @@ -15,7 +15,7 @@ import { getNodeFileFS } from '../node/nodeFs'; suite('HTML Embedded Formatting', () => { async function assertFormat(value: string, expected: string, options?: any, formatOptions?: FormattingOptions, message?: string): Promise { - let workspace = { + const workspace = { settings: options, folders: [{ name: 'foo', uri: 'test://foo' }] }; @@ -32,21 +32,21 @@ suite('HTML Embedded Formatting', () => { rangeStartOffset = 0; rangeEndOffset = value.length; } - let document = TextDocument.create('test://test/test.html', 'html', 0, value); - let range = Range.create(document.positionAt(rangeStartOffset), document.positionAt(rangeEndOffset)); + const document = TextDocument.create('test://test/test.html', 'html', 0, value); + const range = Range.create(document.positionAt(rangeStartOffset), document.positionAt(rangeEndOffset)); if (!formatOptions) { formatOptions = FormattingOptions.create(2, true); } - let result = await format(languageModes, document, range, formatOptions, undefined, { css: true, javascript: true }); + const result = await format(languageModes, document, range, formatOptions, undefined, { css: true, javascript: true }); - let actual = TextDocument.applyEdits(document, result); + const actual = TextDocument.applyEdits(document, result); assert.strictEqual(actual, expected, message); } async function assertFormatWithFixture(fixtureName: string, expectedPath: string, options?: any, formatOptions?: FormattingOptions): Promise { - let input = fs.readFileSync(path.join(__dirname, '..', '..', 'src', 'test', 'fixtures', 'inputs', fixtureName)).toString().replace(/\r\n/mg, '\n'); - let expected = fs.readFileSync(path.join(__dirname, '..', '..', 'src', 'test', 'fixtures', 'expected', expectedPath)).toString().replace(/\r\n/mg, '\n'); + const input = fs.readFileSync(path.join(__dirname, '..', '..', 'src', 'test', 'fixtures', 'inputs', fixtureName)).toString().replace(/\r\n/mg, '\n'); + const expected = fs.readFileSync(path.join(__dirname, '..', '..', 'src', 'test', 'fixtures', 'expected', expectedPath)).toString().replace(/\r\n/mg, '\n'); await assertFormat(input, expected, options, formatOptions, expectedPath); } @@ -85,16 +85,12 @@ suite('HTML Embedded Formatting', () => { }); test('EndWithNewline', async () => { - let options = { - html: { - format: { - endWithNewline: true - } - } - }; - await assertFormat('

        Hello

        ', '\n\n\n

        Hello

        \n\n\n\n', options); - await assertFormat('|

        Hello

        |', '\n

        Hello

        \n', options); - await assertFormat('', '\n\n\n \n\n\n\n', options); + const options : FormattingOptions = FormattingOptions.create(2, true); + options.insertFinalNewline = true; + + await assertFormat('

        Hello

        ', '\n\n\n

        Hello

        \n\n\n\n', {}, options); + await assertFormat('|

        Hello

        |', '\n

        Hello

        \n', {}, options); + await assertFormat('', '\n\n\n \n\n\n\n', {}, options); }); test('Inside script', async () => { @@ -160,7 +156,7 @@ suite('HTML Embedded Formatting', () => { ); }); test('#58435', async () => { - let options = { + const options = { html: { format: { contentUnformatted: 'textarea' diff --git a/extensions/html-language-features/server/src/test/selectionRanges.test.ts b/extensions/html-language-features/server/src/test/selectionRanges.test.ts index afd286e3db5..28e32dc2903 100644 --- a/extensions/html-language-features/server/src/test/selectionRanges.test.ts +++ b/extensions/html-language-features/server/src/test/selectionRanges.test.ts @@ -15,7 +15,7 @@ async function assertRanges(content: string, expected: (number | string)[][]): P const offset = content.indexOf('|'); content = content.substr(0, offset) + content.substr(offset + 1); - let workspace = { + const workspace = { settings: {}, folders: [{ name: 'foo', uri: 'test://foo' }] }; diff --git a/extensions/html-language-features/server/src/test/semanticTokens.test.ts b/extensions/html-language-features/server/src/test/semanticTokens.test.ts index 2db27dd9f17..4f479d9163d 100644 --- a/extensions/html-language-features/server/src/test/semanticTokens.test.ts +++ b/extensions/html-language-features/server/src/test/semanticTokens.test.ts @@ -28,7 +28,7 @@ async function assertTokens(lines: string[], expected: ExpectedToken[], ranges?: const legend = semanticTokensProvider.legend; const actual = await semanticTokensProvider.getSemanticTokens(document, ranges); - let actualRanges = []; + const actualRanges = []; let lastLine = 0; let lastCharacter = 0; for (let i = 0; i < actual.length; i += 5) { diff --git a/extensions/html-language-features/server/src/utils/arrays.ts b/extensions/html-language-features/server/src/utils/arrays.ts index 16b5b46475d..265e8bd4d0a 100644 --- a/extensions/html-language-features/server/src/utils/arrays.ts +++ b/extensions/html-language-features/server/src/utils/arrays.ts @@ -40,7 +40,7 @@ function _divideAndMerge(data: T[], compare: (a: T, b: T) => number): void { let rightIdx = 0; let i = 0; while (leftIdx < left.length && rightIdx < right.length) { - let ret = compare(left[leftIdx], right[rightIdx]); + const ret = compare(left[leftIdx], right[rightIdx]); if (ret <= 0) { // smaller_equal -> take left to preserve order data[i++] = left[leftIdx++]; @@ -62,8 +62,8 @@ export function binarySearch(array: T[], key: T, comparator: (op1: T, op2: T) high = array.length - 1; while (low <= high) { - let mid = ((low + high) / 2) | 0; - let comp = comparator(array[mid], key); + const mid = ((low + high) / 2) | 0; + const comp = comparator(array[mid], key); if (comp < 0) { low = mid + 1; } else if (comp > 0) { diff --git a/extensions/html-language-features/server/src/utils/documentContext.ts b/extensions/html-language-features/server/src/utils/documentContext.ts index f8bc67f8b10..9cf8ce9ea76 100644 --- a/extensions/html-language-features/server/src/utils/documentContext.ts +++ b/extensions/html-language-features/server/src/utils/documentContext.ts @@ -6,11 +6,11 @@ import { DocumentContext } from 'vscode-css-languageservice'; import { endsWith, startsWith } from '../utils/strings'; import { WorkspaceFolder } from 'vscode-languageserver'; -import { resolvePath } from '../requests'; +import { URI, Utils } from 'vscode-uri'; export function getDocumentContext(documentUri: string, workspaceFolders: WorkspaceFolder[]): DocumentContext { function getRootFolder(): string | undefined { - for (let folder of workspaceFolders) { + for (const folder of workspaceFolders) { let folderURI = folder.uri; if (!endsWith(folderURI, '/')) { folderURI = folderURI + '/'; @@ -24,14 +24,19 @@ export function getDocumentContext(documentUri: string, workspaceFolders: Worksp return { resolveReference: (ref: string, base = documentUri) => { + if (ref.match(/^\w[\w\d+.-]*:/)) { + // starts with a schema + return ref; + } if (ref[0] === '/') { // resolve absolute path against the current workspace folder - let folderUri = getRootFolder(); + const folderUri = getRootFolder(); if (folderUri) { return folderUri + ref.substr(1); } } - base = base.substr(0, base.lastIndexOf('/') + 1); - return resolvePath(base, ref); + const baseUri = URI.parse(base); + const baseUriDir = baseUri.path.endsWith('/') ? baseUri : Utils.dirname(baseUri); + return Utils.resolvePath(baseUriDir, ref).toString(true); }, }; } diff --git a/extensions/html-language-features/server/src/utils/runner.ts b/extensions/html-language-features/server/src/utils/runner.ts index 69e5c05e61f..6be8c9f2128 100644 --- a/extensions/html-language-features/server/src/utils/runner.ts +++ b/extensions/html-language-features/server/src/utils/runner.ts @@ -8,7 +8,7 @@ import { RuntimeEnvironment } from '../htmlServer'; export function formatError(message: string, err: any): string { if (err instanceof Error) { - let error = err; + const error = err; return `${message}: ${error.message}\n${error.stack}`; } else if (typeof err === 'string') { return `${message}: ${err}`; diff --git a/extensions/html-language-features/server/src/utils/strings.ts b/extensions/html-language-features/server/src/utils/strings.ts index 00a2ddcbd51..c79f41df8f2 100644 --- a/extensions/html-language-features/server/src/utils/strings.ts +++ b/extensions/html-language-features/server/src/utils/strings.ts @@ -8,11 +8,11 @@ export function getWordAtText(text: string, offset: number, wordDefinition: RegE while (lineStart > 0 && !isNewlineCharacter(text.charCodeAt(lineStart - 1))) { lineStart--; } - let offsetInLine = offset - lineStart; - let lineText = text.substr(lineStart); + const offsetInLine = offset - lineStart; + const lineText = text.substr(lineStart); // make a copy of the regex as to not keep the state - let flags = wordDefinition.ignoreCase ? 'gi' : 'g'; + const flags = wordDefinition.ignoreCase ? 'gi' : 'g'; wordDefinition = new RegExp(wordDefinition.source, flags); let match = wordDefinition.exec(lineText); @@ -41,7 +41,7 @@ export function startsWith(haystack: string, needle: string): boolean { } export function endsWith(haystack: string, needle: string): boolean { - let diff = haystack.length - needle.length; + const diff = haystack.length - needle.length; if (diff > 0) { return haystack.indexOf(needle, diff) === diff; } else if (diff === 0) { diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock index 6f3a8b7b5b1..2532ccb506a 100644 --- a/extensions/html-language-features/server/yarn.lock +++ b/extensions/html-language-features/server/yarn.lock @@ -12,67 +12,62 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== -vscode-css-languageservice@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.0.1.tgz#ccf94944e094dcc5833d1b4ac276994b698e9283" - integrity sha512-81n/eeYuJwQdvpoy6IK1258PtPbO720fl13FcJ5YQECPyHMFkmld1qKHwPJkyLbLPfboqJPM53ys4xW8v+iBVw== +vscode-css-languageservice@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.1.1.tgz#36daefd96e56b7453da16ff8c16f4ee693f32521" + integrity sha512-7d2NCq2plT0njAKmGZ11uof95y2fwbgq8QuToE3kX9uYQfVmejHX2/lFGKbK5AV5+Ja0L80UZoU0QspwqMKMHA== dependencies: - vscode-languageserver-textdocument "^1.0.4" - vscode-languageserver-types "^3.17.1" - vscode-nls "^5.0.1" - vscode-uri "^3.0.3" + vscode-languageserver-textdocument "^1.0.7" + vscode-languageserver-types "^3.17.2" + vscode-nls "^5.2.0" + vscode-uri "^3.0.4" -vscode-html-languageservice@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-5.0.0.tgz#c68613f836d7fcff125183d78e6f1f0ff326fa55" - integrity sha512-KJG13z54aLszskp3ETf8b1EKDypr2Sf5RUsfR6OXmKqEl2ZUfyIxsWz4gbJWjPzoJZx/bGH0ZXVwxJ1rg8OKRQ== +vscode-html-languageservice@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-5.0.2.tgz#a66cb9d779f3094a8d14dd3a8f7935748435fd2a" + integrity sha512-TQmeyE14Ure/w/S+RV2IItuRWmw/i1QaS+om6t70iHCpamuTTWnACQPMSltVGm/DlbdyMquUePJREjd/h3AVkQ== dependencies: - vscode-languageserver-textdocument "^1.0.4" - vscode-languageserver-types "^3.17.1" - vscode-nls "^5.0.1" - vscode-uri "^3.0.3" + vscode-languageserver-textdocument "^1.0.7" + vscode-languageserver-types "^3.17.2" + vscode-nls "^5.2.0" + vscode-uri "^3.0.4" -vscode-jsonrpc@8.0.2-next.1: - version "8.0.2-next.1" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2-next.1.tgz#6bdc39fd194782032e34047eeefce562941259c6" - integrity sha512-sbbvGSWja7NVBLHPGawtgezc8DHYJaP4qfr/AaJiyDapWcSFtHyPtm18+LnYMLTmB7bhOUW/lf5PeeuLpP6bKA== +vscode-jsonrpc@8.1.0-next.1: + version "8.1.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.1.tgz#7c38cb1cbd968c409522593004fdac845a55b155" + integrity sha512-FiPG+9TuMIga3t+kkalQytwqMtJu1djI+Pq+Ut2tvAJpcNHDJ0PYdjFv5mgEvTEJLujrYwjWHVkNe+XfHPBD/w== -vscode-languageserver-protocol@3.17.2-next.5: - version "3.17.2-next.5" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2-next.5.tgz#9bc747411c3ce9e1d73c2714bf6555e0199eec26" - integrity sha512-UlH+QL4Q4lX94of/UPDDwwWIkd8w7dtMW4khzvEDUoykiG9tba0iG6V0bAiv8XVpnBIUYjL2FNFiL3zl+TY1Sw== +vscode-languageserver-protocol@3.17.3-next.1: + version "3.17.3-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.1.tgz#804880c172b4c48d1a48a91c4c23250121effb19" + integrity sha512-vgjvPE0zox+1Fi4ljsSFJ+B3g8wGNbuAEEdulueVdv+R2VHtc06+dgxhWiG4LKPqXwjPDmiuxCnvd2xk3fzTTw== dependencies: - vscode-jsonrpc "8.0.2-next.1" - vscode-languageserver-types "3.17.2-next.2" + vscode-jsonrpc "8.1.0-next.1" + vscode-languageserver-types "3.17.2" -vscode-languageserver-textdocument@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz#3cd56dd14cec1d09e86c4bb04b09a246cb3df157" - integrity sha512-/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ== +vscode-languageserver-textdocument@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz#16df468d5c2606103c90554ae05f9f3d335b771b" + integrity sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg== -vscode-languageserver-types@3.17.2-next.2: - version "3.17.2-next.2" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2-next.2.tgz#af5d6978eee7682aab87c1419323f5b141ac6596" - integrity sha512-TiAkLABgqkVWdAlC3XlOfdhdjIAdVU4YntPUm9kKGbXr+MGwpVnKz2KZMNBcvG0CFx8Hi8qliL0iq+ndPB720w== +vscode-languageserver-types@3.17.2, vscode-languageserver-types@^3.17.2: + version "3.17.2" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2" + integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA== -vscode-languageserver-types@^3.17.1: - version "3.17.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.1.tgz#c2d87fa7784f8cac389deb3ff1e2d9a7bef07e16" - integrity sha512-K3HqVRPElLZVVPtMeKlsyL9aK0GxGQpvtAUTfX4k7+iJ4mc1M+JM+zQwkgGy2LzY0f0IAafe8MKqIkJrxfGGjQ== - -vscode-languageserver@^8.0.2-next.4: - version "8.0.2-next.4" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.0.2-next.4.tgz#c10cc95be06325b56b7ec1d10271c9e4adf3ef07" - integrity sha512-B3roWH4TmJiB6Zh5+r7zu0QdlLqJsPdGo0LeEi6OiLfrHYCDlcI7DNcQ7F17vWmxC3C82SrxMt/EuLBMpKQM0A== +vscode-languageserver@^8.1.0-next.1: + version "8.1.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.1.0-next.1.tgz#1c173de554889bd18ca6e20eaf4bdc84164c86b4" + integrity sha512-u14Rk4JgXI+7iS6AEXI2pNc1dWh/5JEXtaqa4TeBECKJlN+5242mbGBBPaHMOE7sSI1Kh66XhEMZJhPYjUfjHw== dependencies: - vscode-languageserver-protocol "3.17.2-next.5" + vscode-languageserver-protocol "3.17.3-next.1" -vscode-nls@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.1.tgz#ba23fc4d4420d25e7f886c8e83cbdcec47aa48b2" - integrity sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A== +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== -vscode-uri@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84" - integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA== +vscode-uri@^3.0.6, vscode-uri@^3.0.4: + version "3.0.6" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.6.tgz#5e6e2e1a4170543af30151b561a41f71db1d6f91" + integrity sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ== diff --git a/extensions/html-language-features/yarn.lock b/extensions/html-language-features/yarn.lock index c7c2faeae0f..478e8548591 100644 --- a/extensions/html-language-features/yarn.lock +++ b/extensions/html-language-features/yarn.lock @@ -2,33 +2,66 @@ # yarn lockfile v1 +"@microsoft/1ds-core-js@3.2.6", "@microsoft/1ds-core-js@^3.2.3": + version "3.2.6" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.6.tgz#8a77909f89f991aa2f0b4ae8825c75042962e68e" + integrity sha512-6OpppYCEA+rXjcs2w0KnWji3Y6ZDx0wykY7ZL3QF68NS323C45GHSpkDpVRT/lDU6Xbau/PvQm2zTYAzLcperA== + dependencies: + "@microsoft/applicationinsights-core-js" "2.8.6" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/1ds-post-js@^3.2.3": + version "3.2.6" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.6.tgz#cdfa74acfc3205c0a5b79925284d6d166aa43901" + integrity sha512-Zdyl3FU6kU/a7TlVVSTBZg+hSECTT65iI99FsjMOx88HudyVyk9M/0lVbA+FVXvGaxzmtBW6Lw0qRHYp4tBMSA== + dependencies: + "@microsoft/1ds-core-js" "3.2.6" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/applicationinsights-core-js@2.8.6": + version "2.8.6" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.6.tgz#4f0f9ad809aacfc96cb882139b69b3625519c51a" + integrity sha512-rL+ceda1Y6HaHBe1vIbNT/f5JGuHiD5Ydq+DoAfu56o13wyJu4sao3QKaabgaIM59pPO+3BMeGsK8NNUGYaT3w== + dependencies: + "@microsoft/applicationinsights-shims" "2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/applicationinsights-shims@2.0.1", "@microsoft/applicationinsights-shims@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.1.tgz#5d72fb7aaf4056c4fda54f9d7c93ccf8ca9bcbfd" + integrity sha512-G0MXf6R6HndRbDy9BbEj0zrLeuhwt2nsXk2zKtF0TnYo39KgYqhYC2ayIzKPTm2KAE+xzD7rgyLdZnrcRvt9WQ== + +"@microsoft/dynamicproto-js@^1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc" + integrity sha512-D1Oivw1A4bIXhzBIy3/BBPn3p2On+kpO2NiYt9shICDK7L/w+cR6FFBUsBZ05l6iqzTeL+Jm8lAYn0g6G7DmDg== + "@types/node@16.x": version "16.11.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== -"@vscode/extension-telemetry@0.5.1": - version "0.5.1" - resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.5.1.tgz#20150976629663b3d33799a4ad25944a1535f7db" - integrity sha512-cvFq8drxdLRF8KN72WcV4lTEa9GqDiRwy9EbnYuoSCD9Jdk8zHFF49MmACC1qs4R9Ko/C1uMOmeLJmVi8EA0rQ== +"@vscode/extension-telemetry@0.6.2": + version "0.6.2" + resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.6.2.tgz#b86814ee680615730da94220c2b03ea9c3c14a8e" + integrity sha512-yb/wxLuaaCRcBAZtDCjNYSisAXz3FWsSqAha5nhHcYxx2ZPdQdWuZqVXGKq0ZpHVndBWWtK6XqtpCN2/HB4S1w== + dependencies: + "@microsoft/1ds-core-js" "^3.2.3" + "@microsoft/1ds-post-js" "^3.2.3" balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== dependencies: balanced-match "^1.0.0" - concat-map "0.0.1" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= lru-cache@^6.0.0: version "6.0.0" @@ -37,56 +70,56 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== +minimatch@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" + integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== dependencies: - brace-expansion "^1.1.7" + brace-expansion "^2.0.1" -semver@^7.3.5: +semver@^7.3.7: version "7.3.7" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== dependencies: lru-cache "^6.0.0" -vscode-jsonrpc@8.0.2-next.1: - version "8.0.2-next.1" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2-next.1.tgz#6bdc39fd194782032e34047eeefce562941259c6" - integrity sha512-sbbvGSWja7NVBLHPGawtgezc8DHYJaP4qfr/AaJiyDapWcSFtHyPtm18+LnYMLTmB7bhOUW/lf5PeeuLpP6bKA== +vscode-jsonrpc@8.1.0-next.1: + version "8.1.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.1.tgz#7c38cb1cbd968c409522593004fdac845a55b155" + integrity sha512-FiPG+9TuMIga3t+kkalQytwqMtJu1djI+Pq+Ut2tvAJpcNHDJ0PYdjFv5mgEvTEJLujrYwjWHVkNe+XfHPBD/w== -vscode-languageclient@^8.0.2-next.4: - version "8.0.2-next.4" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.0.2-next.4.tgz#87dd364ffbd4356aff3af14e7b557d9fe34d2b67" - integrity sha512-j9BEiCYMN9IoKwYdk9iickV6WNPVGPoVO11SMdoxFnWPIT3y5UAe3qf/WsfA9OdklAIaxxYasfgyKCpBjSPNuw== +vscode-languageclient@^8.1.0-next.1: + version "8.1.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.1.0-next.1.tgz#44b63bc2d215c13f1dea1dc54267a354ea5451cb" + integrity sha512-lJraJ8IrqXr83ZciAs4dN32f9kEPuOb/FqAeUTgnW5cAxo0Qux0/EMgKyU33Qf9LdEI0I9iwRVxQWtawbyUUfg== dependencies: - minimatch "^3.0.4" - semver "^7.3.5" - vscode-languageserver-protocol "3.17.2-next.5" + minimatch "^5.1.0" + semver "^7.3.7" + vscode-languageserver-protocol "3.17.3-next.1" -vscode-languageserver-protocol@3.17.2-next.5: - version "3.17.2-next.5" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2-next.5.tgz#9bc747411c3ce9e1d73c2714bf6555e0199eec26" - integrity sha512-UlH+QL4Q4lX94of/UPDDwwWIkd8w7dtMW4khzvEDUoykiG9tba0iG6V0bAiv8XVpnBIUYjL2FNFiL3zl+TY1Sw== +vscode-languageserver-protocol@3.17.3-next.1: + version "3.17.3-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.1.tgz#804880c172b4c48d1a48a91c4c23250121effb19" + integrity sha512-vgjvPE0zox+1Fi4ljsSFJ+B3g8wGNbuAEEdulueVdv+R2VHtc06+dgxhWiG4LKPqXwjPDmiuxCnvd2xk3fzTTw== dependencies: - vscode-jsonrpc "8.0.2-next.1" - vscode-languageserver-types "3.17.2-next.2" + vscode-jsonrpc "8.1.0-next.1" + vscode-languageserver-types "3.17.2" -vscode-languageserver-types@3.17.2-next.2: - version "3.17.2-next.2" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2-next.2.tgz#af5d6978eee7682aab87c1419323f5b141ac6596" - integrity sha512-TiAkLABgqkVWdAlC3XlOfdhdjIAdVU4YntPUm9kKGbXr+MGwpVnKz2KZMNBcvG0CFx8Hi8qliL0iq+ndPB720w== +vscode-languageserver-types@3.17.2: + version "3.17.2" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2" + integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA== -vscode-nls@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.1.tgz#ba23fc4d4420d25e7f886c8e83cbdcec47aa48b2" - integrity sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A== +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== -vscode-uri@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84" - integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA== +vscode-uri@^3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.6.tgz#5e6e2e1a4170543af30151b561a41f71db1d6f91" + integrity sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ== yallist@^4.0.0: version "4.0.0" diff --git a/extensions/html/package.json b/extensions/html/package.json index aad035c05cc..238f1348955 100644 --- a/extensions/html/package.json +++ b/extensions/html/package.json @@ -76,6 +76,12 @@ "meta.tag string.quoted": "other" } } + ], + "snippets": [ + { + "language": "html", + "path": "./snippets/html.code-snippets" + } ] }, "repository": { diff --git a/extensions/html/snippets/html.code-snippets b/extensions/html/snippets/html.code-snippets new file mode 100644 index 00000000000..62d61b43b7b --- /dev/null +++ b/extensions/html/snippets/html.code-snippets @@ -0,0 +1,18 @@ +{ + "html doc": { + "isFileTemplate": true, + "body": [ + "", + "", + "", + "\t", + "\t${1:title}", + "", + "", + "\t$0", + "", + "" + ], + "description": "HTML Document" + } +} diff --git a/extensions/image-preview/README.md b/extensions/image-preview/README.md deleted file mode 100644 index d3f0bd6cb6c..00000000000 --- a/extensions/image-preview/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# Image Preview - -**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled. - -## Features - -This extension provides VS Code's built-in image preview functionality. - -Supported image formats: - -- `*.jpg`, `*.jpe`, `*.jpeg` -- `*.png` -- `*.bmp` -- `*.gif` -- `*.ico` -- `*.webp` diff --git a/extensions/image-preview/package.nls.json b/extensions/image-preview/package.nls.json deleted file mode 100644 index d1860bc2fb5..00000000000 --- a/extensions/image-preview/package.nls.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "displayName": "Image Preview", - "description": "Provides VS Code's built-in image preview", - "customEditors.displayName": "Image Preview", - "command.zoomIn": "Zoom in", - "command.zoomOut": "Zoom out" -} diff --git a/extensions/image-preview/src/extension.ts b/extensions/image-preview/src/extension.ts deleted file mode 100644 index 10722360dd5..00000000000 --- a/extensions/image-preview/src/extension.ts +++ /dev/null @@ -1,35 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import * as vscode from 'vscode'; -import { BinarySizeStatusBarEntry } from './binarySizeStatusBarEntry'; -import { PreviewManager } from './preview'; -import { SizeStatusBarEntry } from './sizeStatusBarEntry'; -import { ZoomStatusBarEntry } from './zoomStatusBarEntry'; - -export function activate(context: vscode.ExtensionContext) { - const sizeStatusBarEntry = new SizeStatusBarEntry(); - context.subscriptions.push(sizeStatusBarEntry); - - const binarySizeStatusBarEntry = new BinarySizeStatusBarEntry(); - context.subscriptions.push(binarySizeStatusBarEntry); - - const zoomStatusBarEntry = new ZoomStatusBarEntry(); - context.subscriptions.push(zoomStatusBarEntry); - - const previewManager = new PreviewManager(context.extensionUri, sizeStatusBarEntry, binarySizeStatusBarEntry, zoomStatusBarEntry); - - context.subscriptions.push(vscode.window.registerCustomEditorProvider(PreviewManager.viewType, previewManager, { - supportsMultipleEditorsPerDocument: true, - })); - - context.subscriptions.push(vscode.commands.registerCommand('imagePreview.zoomIn', () => { - previewManager.activePreview?.zoomIn(); - })); - - context.subscriptions.push(vscode.commands.registerCommand('imagePreview.zoomOut', () => { - previewManager.activePreview?.zoomOut(); - })); -} diff --git a/extensions/image-preview/yarn.lock b/extensions/image-preview/yarn.lock deleted file mode 100644 index 2e316e14a9f..00000000000 --- a/extensions/image-preview/yarn.lock +++ /dev/null @@ -1,13 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@vscode/extension-telemetry@0.4.10": - version "0.4.10" - resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.4.10.tgz#be960c05bdcbea0933866346cf244acad6cac910" - integrity sha512-XgyUoWWRQExTmd9DynIIUQo1NPex/zIeetdUAXeBjVuW9ioojM1TcDaSqOa/5QLC7lx+oEXwSU1r0XSBgzyz6w== - -vscode-nls@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840" - integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA== diff --git a/extensions/ini/package.json b/extensions/ini/package.json index 324e4c87f6e..0c7dda3c880 100644 --- a/extensions/ini/package.json +++ b/extensions/ini/package.json @@ -27,9 +27,9 @@ { "id": "properties", "extensions": [ + ".conf", ".properties", ".cfg", - ".conf", ".directory", ".gitattributes", ".gitconfig", @@ -37,7 +37,8 @@ ".editorconfig" ], "filenames": [ - "gitconfig" + "gitconfig", + ".env" ], "filenamePatterns": [ "**/.config/git/config", diff --git a/extensions/ipynb/.gitignore b/extensions/ipynb/.gitignore index 170d890802b..8c0ca40ca20 100644 --- a/extensions/ipynb/.gitignore +++ b/extensions/ipynb/.gitignore @@ -2,3 +2,4 @@ out dist node_modules *.vsix +notebook-out diff --git a/extensions/ipynb/.vscode/launch.json b/extensions/ipynb/.vscode/launch.json new file mode 100644 index 00000000000..30130a429d5 --- /dev/null +++ b/extensions/ipynb/.vscode/launch.json @@ -0,0 +1,19 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "args": [ + "--extensionDevelopmentPath=${workspaceFolder}" + ], + "name": "Launch Extension", + "outFiles": [ + "${workspaceFolder}/out/**/*.js" + ], + "request": "launch", + "type": "extensionHost" + } + ] +} \ No newline at end of file diff --git a/extensions/ipynb/.vscodeignore b/extensions/ipynb/.vscodeignore index 08245c01482..69a1b29e0ce 100644 --- a/extensions/ipynb/.vscodeignore +++ b/extensions/ipynb/.vscodeignore @@ -1,9 +1,10 @@ .vscode/** src/** +notebook-src/** out/** tsconfig.json extension.webpack.config.js extension-browser.webpack.config.js yarn.lock .gitignore - +esbuild.js diff --git a/extensions/ipynb/esbuild.js b/extensions/ipynb/esbuild.js new file mode 100644 index 00000000000..4128889bf76 --- /dev/null +++ b/extensions/ipynb/esbuild.js @@ -0,0 +1,47 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +//@ts-check + +const path = require('path'); +const fse = require('fs-extra'); +const esbuild = require('esbuild'); + +const args = process.argv.slice(2); + +const isWatch = args.indexOf('--watch') >= 0; + +let outputRoot = __dirname; +const outputRootIndex = args.indexOf('--outputRoot'); +if (outputRootIndex >= 0) { + outputRoot = args[outputRootIndex + 1]; +} + +const srcDir = path.join(__dirname, 'notebook-src'); +const outDir = path.join(outputRoot, 'notebook-out'); + +async function build() { + await esbuild.build({ + entryPoints: [ + path.join(srcDir, 'cellAttachmentRenderer.ts'), + ], + bundle: true, + minify: false, + sourcemap: false, + format: 'esm', + outdir: outDir, + platform: 'browser', + target: ['es2020'], + }); +} + + +build().catch(() => process.exit(1)); + +if (isWatch) { + const watcher = require('@parcel/watcher'); + watcher.subscribe(srcDir, () => { + return build(); + }); +} diff --git a/extensions/ipynb/notebook-src/cellAttachmentRenderer.ts b/extensions/ipynb/notebook-src/cellAttachmentRenderer.ts new file mode 100644 index 00000000000..122c8267036 --- /dev/null +++ b/extensions/ipynb/notebook-src/cellAttachmentRenderer.ts @@ -0,0 +1,47 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import type * as MarkdownIt from 'markdown-it'; +import type * as MarkdownItToken from 'markdown-it/lib/token'; +import type { RendererContext } from 'vscode-notebook-renderer'; + +interface MarkdownItRenderer { + extendMarkdownIt(fn: (md: MarkdownIt) => void): void; +} + +export async function activate(ctx: RendererContext) { + const markdownItRenderer = (await ctx.getRenderer('vscode.markdown-it-renderer')) as MarkdownItRenderer | any; + if (!markdownItRenderer) { + throw new Error(`Could not load 'vscode.markdown-it-renderer'`); + } + + markdownItRenderer.extendMarkdownIt((md: MarkdownIt) => { + const original = md.renderer.rules.image; + md.renderer.rules.image = (tokens: MarkdownItToken[], idx: number, options, env, self) => { + const token = tokens[idx]; + const src = token.attrGet('src'); + const attachments: Record> = env.outputItem.metadata.attachments; + if (attachments && src) { + const imageAttachment = attachments[src.replace('attachment:', '')]; + if (imageAttachment) { + // objEntries will always be length 1, with objEntries[0] holding [0]=mime,[1]=b64 + // if length = 0, something is wrong with the attachment, mime/b64 weren't copied over + const objEntries = Object.entries(imageAttachment); + if (objEntries.length) { + const [attachmentKey, attachmentVal] = objEntries[0]; + const b64Markdown = 'data:' + attachmentKey + ';base64,' + attachmentVal; + token.attrSet('src', b64Markdown); + } + } + } + + if (original) { + return original(tokens, idx, options, env, self); + } else { + return self.renderToken(tokens, idx, options); + } + }; + }); +} diff --git a/extensions/ipynb/package.json b/extensions/ipynb/package.json index 1e251a5a19b..9facfaa3322 100644 --- a/extensions/ipynb/package.json +++ b/extensions/ipynb/package.json @@ -9,10 +9,12 @@ "vscode": "^1.57.0" }, "enabledApiProposals": [ - "notebookWorkspaceEdit" + "documentPaste", + "diffContentOptions" ], "activationEvents": [ - "*" + "onNotebook:jupyter-notebook", + "onCommand:ipynb.newUntitledIpynb" ], "extensionKind": [ "workspace", @@ -27,6 +29,21 @@ } }, "contributes": { + "configuration": [ + { + "properties": { + "ipynb.experimental.pasteImages.enabled": { + "type": "boolean", + "scope": "resource", + "markdownDescription": "%ipynb.experimental.pasteImages.enabled%", + "default": false, + "tags": [ + "experimental" + ] + } + } + } + ], "commands": [ { "command": "ipynb.newUntitledIpynb", @@ -37,6 +54,10 @@ { "command": "ipynb.openIpynbInNotebookEditor", "title": "Open ipynb file in notebook editor" + }, + { + "command": "ipynb.cleanInvalidImageAttachment", + "title": "Clean invalid image attachment reference" } ], "notebooks": [ @@ -51,6 +72,16 @@ "priority": "default" } ], + "notebookRenderer": [ + { + "id": "vscode.markdown-it-cell-attachment-renderer", + "displayName": "Markdown it ipynb Cell Attachment renderer", + "entrypoint": { + "extends": "vscode.markdown-it-renderer", + "path": "./notebook-out/cellAttachmentRenderer.js" + } + } + ], "menus": { "file/newFile": [ { @@ -65,13 +96,18 @@ { "command": "ipynb.openIpynbInNotebookEditor", "when": "false" + }, + { + "command": "ipynb.cleanInvalidImageAttachment", + "when": "false" } ] } }, "scripts": { - "compile": "npx gulp compile-extension:ipynb", - "watch": "npx gulp watch-extension:ipynb" + "compile": "npx gulp compile-extension:ipynb && npm run build-notebook", + "watch": "npx gulp watch-extension:ipynb", + "build-notebook": "node ./esbuild" }, "dependencies": { "@enonic/fnv-plus": "^1.3.0", @@ -80,6 +116,7 @@ }, "devDependencies": { "@jupyterlab/nbformat": "^3.2.9", + "@types/markdown-it": "12.2.3", "@types/uuid": "^8.3.1" }, "repository": { diff --git a/extensions/ipynb/package.nls.json b/extensions/ipynb/package.nls.json index 6f2f7e47c0c..e003f299b56 100644 --- a/extensions/ipynb/package.nls.json +++ b/extensions/ipynb/package.nls.json @@ -1,4 +1,5 @@ { "displayName": ".ipynb support", - "description": "Provides basic support for opening and reading Jupyter's .ipynb notebook files" + "description": "Provides basic support for opening and reading Jupyter's .ipynb notebook files", + "ipynb.experimental.pasteImages.enabled":"Enable/Disable pasting images into markdown cells within ipynb files. Requires enabling `#editor.experimental.pasteActions.enabled#`." } diff --git a/extensions/ipynb/src/cellIdService.ts b/extensions/ipynb/src/cellIdService.ts index ddda0a9fd5f..2eccb586ef4 100644 --- a/extensions/ipynb/src/cellIdService.ts +++ b/extensions/ipynb/src/cellIdService.ts @@ -8,7 +8,7 @@ import { v4 as uuid } from 'uuid'; import { getCellMetadata } from './serializers'; import { CellMetadata } from './common'; import { getNotebookMetadata } from './notebookSerializer'; -import * as nbformat from '@jupyterlab/nbformat'; +import type * as nbformat from '@jupyterlab/nbformat'; /** * Ensure all new cells in notebooks with nbformat >= 4.5 have an id. diff --git a/extensions/ipynb/src/common.ts b/extensions/ipynb/src/common.ts index de72fbbbfc3..d5ff5f86069 100644 --- a/extensions/ipynb/src/common.ts +++ b/extensions/ipynb/src/common.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as nbformat from '@jupyterlab/nbformat'; +import type * as nbformat from '@jupyterlab/nbformat'; /** * Metadata we store in VS Code cell output items. @@ -44,7 +44,7 @@ export interface CellOutputMetadata { /** * Metadata we store in VS Code cells. - * This contains the original metadata from the Jupyuter cells. + * This contains the original metadata from the Jupyter cells. */ export interface CellMetadata { /** diff --git a/extensions/ipynb/src/constants.ts b/extensions/ipynb/src/constants.ts index 17419359414..43e13b3b510 100644 --- a/extensions/ipynb/src/constants.ts +++ b/extensions/ipynb/src/constants.ts @@ -3,4 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import * as vscode from 'vscode'; + export const defaultNotebookFormat = { major: 4, minor: 2 }; +export const ATTACHMENT_CLEANUP_COMMANDID = 'ipynb.cleanInvalidImageAttachment'; + +export const JUPYTER_NOTEBOOK_MARKDOWN_SELECTOR: vscode.DocumentSelector = { notebookType: 'jupyter-notebook', language: 'markdown' }; diff --git a/extensions/ipynb/src/deserializers.ts b/extensions/ipynb/src/deserializers.ts index 50a3a1271b0..bea8025be31 100644 --- a/extensions/ipynb/src/deserializers.ts +++ b/extensions/ipynb/src/deserializers.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as nbformat from '@jupyterlab/nbformat'; +import type * as nbformat from '@jupyterlab/nbformat'; import { extensions, NotebookCellData, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData } from 'vscode'; import { CellMetadata, CellOutputMetadata } from './common'; @@ -149,21 +149,29 @@ function convertJupyterOutputToBuffer(mime: string, value: unknown): NotebookCel } } -function getNotebookCellMetadata(cell: nbformat.IBaseCell): CellMetadata { +function getNotebookCellMetadata(cell: nbformat.IBaseCell): { + [key: string]: any; +} { + const cellMetadata: { [key: string]: any } = {}; // We put this only for VSC to display in diff view. // Else we don't use this. - const propertiesToClone: (keyof CellMetadata)[] = ['metadata', 'attachments']; const custom: CellMetadata = {}; - propertiesToClone.forEach((propertyToClone) => { - if (cell[propertyToClone]) { - custom[propertyToClone] = JSON.parse(JSON.stringify(cell[propertyToClone])); - } - }); + if (cell['metadata']) { + custom['metadata'] = JSON.parse(JSON.stringify(cell['metadata'])); + } + if ('id' in cell && typeof cell.id === 'string') { custom.id = cell.id; } - return custom; + + cellMetadata.custom = custom; + + if (cell['attachments']) { + cellMetadata.attachments = JSON.parse(JSON.stringify(cell['attachments'])); + } + return cellMetadata; } + function getOutputMetadata(output: nbformat.IOutput): CellOutputMetadata { // Add on transient data if we have any. This should be removed by our save functions elsewhere. const metadata: CellOutputMetadata = { @@ -284,7 +292,7 @@ export function jupyterCellOutputToCellOutput(output: nbformat.IOutput): Noteboo function createNotebookCellDataFromRawCell(cell: nbformat.IRawCell): NotebookCellData { const cellData = new NotebookCellData(NotebookCellKind.Code, concatMultilineString(cell.source), 'raw'); cellData.outputs = []; - cellData.metadata = { custom: getNotebookCellMetadata(cell) }; + cellData.metadata = getNotebookCellMetadata(cell); return cellData; } function createNotebookCellDataFromMarkdownCell(cell: nbformat.IMarkdownCell): NotebookCellData { @@ -294,7 +302,7 @@ function createNotebookCellDataFromMarkdownCell(cell: nbformat.IMarkdownCell): N 'markdown' ); cellData.outputs = []; - cellData.metadata = { custom: getNotebookCellMetadata(cell) }; + cellData.metadata = getNotebookCellMetadata(cell); return cellData; } function createNotebookCellDataFromCodeCell(cell: nbformat.ICodeCell, cellLanguage: string): NotebookCellData { @@ -313,7 +321,7 @@ function createNotebookCellDataFromCodeCell(cell: nbformat.ICodeCell, cellLangua const cellData = new NotebookCellData(NotebookCellKind.Code, source, cellLanguageId); cellData.outputs = outputs; - cellData.metadata = { custom: getNotebookCellMetadata(cell) }; + cellData.metadata = getNotebookCellMetadata(cell); cellData.executionSummary = executionSummary; return cellData; } diff --git a/extensions/ipynb/src/helper.ts b/extensions/ipynb/src/helper.ts new file mode 100644 index 00000000000..5fa03514640 --- /dev/null +++ b/extensions/ipynb/src/helper.ts @@ -0,0 +1,137 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +export function deepClone(obj: T): T { + if (!obj || typeof obj !== 'object') { + return obj; + } + if (obj instanceof RegExp) { + // See https://github.com/microsoft/TypeScript/issues/10990 + return obj as any; + } + const result: any = Array.isArray(obj) ? [] : {}; + Object.keys(obj).forEach((key: string) => { + if ((obj)[key] && typeof (obj)[key] === 'object') { + result[key] = deepClone((obj)[key]); + } else { + result[key] = (obj)[key]; + } + }); + return result; +} + +// from https://github.com/microsoft/vscode/blob/43ae27a30e7b5e8711bf6b218ee39872ed2b8ef6/src/vs/base/common/objects.ts#L117 +export function objectEquals(one: any, other: any) { + if (one === other) { + return true; + } + if (one === null || one === undefined || other === null || other === undefined) { + return false; + } + if (typeof one !== typeof other) { + return false; + } + if (typeof one !== 'object') { + return false; + } + if ((Array.isArray(one)) !== (Array.isArray(other))) { + return false; + } + + let i: number; + let key: string; + + if (Array.isArray(one)) { + if (one.length !== other.length) { + return false; + } + for (i = 0; i < one.length; i++) { + if (!objectEquals(one[i], other[i])) { + return false; + } + } + } else { + const oneKeys: string[] = []; + + for (key in one) { + oneKeys.push(key); + } + oneKeys.sort(); + const otherKeys: string[] = []; + for (key in other) { + otherKeys.push(key); + } + otherKeys.sort(); + if (!objectEquals(oneKeys, otherKeys)) { + return false; + } + for (i = 0; i < oneKeys.length; i++) { + if (!objectEquals(one[oneKeys[i]], other[oneKeys[i]])) { + return false; + } + } + } + + return true; +} + +interface Options { + callback: (value: T) => void; + + merge?: (input: T[]) => T; + delay?: number; +} + + +export class DebounceTrigger { + + private _isPaused = 0; + protected _queue: T[] = []; + private _callbackFn: (value: T) => void; + private _mergeFn?: (input: T[]) => T; + private readonly _delay: number; + private _handle: any | undefined; + + constructor(options: Options) { + this._callbackFn = options.callback; + this._mergeFn = options.merge; + this._delay = options.delay ?? 100; + } + + private pause(): void { + this._isPaused++; + } + + private resume(): void { + if (this._isPaused !== 0 && --this._isPaused === 0) { + if (this._mergeFn) { + const items = Array.from(this._queue); + this._queue = []; + this._callbackFn(this._mergeFn(items)); + + } else { + while (!this._isPaused && this._queue.length !== 0) { + this._callbackFn(this._queue.shift()!); + } + } + } + } + + trigger(item: T): void { + if (!this._handle) { + this.pause(); + this._handle = setTimeout(() => { + this._handle = undefined; + this.resume(); + }, this._delay); + } + + if (this._isPaused !== 0) { + this._queue.push(item); + } else { + this._callbackFn(item); + } + } +} diff --git a/extensions/ipynb/src/ipynbMain.ts b/extensions/ipynb/src/ipynbMain.ts index 33bb1456af8..79c5037b2b9 100644 --- a/extensions/ipynb/src/ipynbMain.ts +++ b/extensions/ipynb/src/ipynbMain.ts @@ -4,8 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import { ensureAllNewCellsHaveCellIds } from './cellIdService'; import { NotebookSerializer } from './notebookSerializer'; +import { ensureAllNewCellsHaveCellIds } from './cellIdService'; +import { notebookImagePasteSetup } from './notebookImagePaste'; +import { AttachmentCleaner } from './notebookAttachmentCleaner'; // From {nbformat.INotebookMetadata} in @jupyterlab/coreutils type NotebookMetadata = { @@ -33,9 +35,13 @@ export function activate(context: vscode.ExtensionContext) { transientOutputs: false, transientCellMetadata: { breakpointMargin: true, - custom: false + custom: false, + attachments: false + }, + cellContentMetadata: { + attachments: true } - })); + } as vscode.NotebookDocumentContentOptions)); vscode.languages.registerCodeLensProvider({ pattern: '**/*.ipynb' }, { provideCodeLenses: (document) => { @@ -77,12 +83,21 @@ export function activate(context: vscode.ExtensionContext) { await vscode.window.showNotebookDocument(document); })); + context.subscriptions.push(notebookImagePasteSetup()); + + const enabled = vscode.workspace.getConfiguration('ipynb').get('experimental.pasteImages.enabled', false); + if (enabled) { + const cleaner = new AttachmentCleaner(); + context.subscriptions.push(cleaner); + } + // Update new file contribution vscode.extensions.onDidChange(() => { vscode.commands.executeCommand('setContext', 'jupyterEnabled', vscode.extensions.getExtension('ms-toolsai.jupyter')); }); vscode.commands.executeCommand('setContext', 'jupyterEnabled', vscode.extensions.getExtension('ms-toolsai.jupyter')); + return { exportNotebook: (notebook: vscode.NotebookData): string => { return exportNotebook(notebook, serializer); diff --git a/extensions/ipynb/src/notebookAttachmentCleaner.ts b/extensions/ipynb/src/notebookAttachmentCleaner.ts new file mode 100644 index 00000000000..a72761754df --- /dev/null +++ b/extensions/ipynb/src/notebookAttachmentCleaner.ts @@ -0,0 +1,350 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as vscode from 'vscode'; +import { ATTACHMENT_CLEANUP_COMMANDID, JUPYTER_NOTEBOOK_MARKDOWN_SELECTOR } from './constants'; +import { DebounceTrigger, deepClone, objectEquals } from './helper'; + +interface AttachmentCleanRequest { + notebook: vscode.NotebookDocument; + document: vscode.TextDocument; + cell: vscode.NotebookCell; +} + +interface IAttachmentData { + [key: string /** mimetype */]: string;/** b64-encoded */ +} + +interface IAttachmentDiagnostic { + name: string; + ranges: vscode.Range[]; +} + +export enum DiagnosticCode { + missing_attachment = 'notebook.missing-attachment' +} + +export class AttachmentCleaner implements vscode.CodeActionProvider { + private _attachmentCache: + Map>> = new Map(); + + private _disposables: vscode.Disposable[]; + private _imageDiagnosticCollection: vscode.DiagnosticCollection; + constructor() { + this._disposables = []; + const debounceTrigger = new DebounceTrigger({ + callback: (change: AttachmentCleanRequest) => { + this.cleanNotebookAttachments(change); + }, + delay: 500 + }); + + this._imageDiagnosticCollection = vscode.languages.createDiagnosticCollection('Notebook Image Attachment'); + this._disposables.push(this._imageDiagnosticCollection); + + this._disposables.push(vscode.commands.registerCommand(ATTACHMENT_CLEANUP_COMMANDID, async (document: vscode.Uri, range: vscode.Range) => { + const workspaceEdit = new vscode.WorkspaceEdit(); + workspaceEdit.delete(document, range); + await vscode.workspace.applyEdit(workspaceEdit); + })); + + this._disposables.push(vscode.languages.registerCodeActionsProvider(JUPYTER_NOTEBOOK_MARKDOWN_SELECTOR, this, { + providedCodeActionKinds: [ + vscode.CodeActionKind.QuickFix + ], + })); + + this._disposables.push(vscode.workspace.onDidChangeNotebookDocument(e => { + e.cellChanges.forEach(change => { + if (!change.document) { + return; + } + + if (change.cell.kind !== vscode.NotebookCellKind.Markup) { + return; + } + + debounceTrigger.trigger({ + notebook: e.notebook, + cell: change.cell, + document: change.document + }); + }); + })); + + this._disposables.push(vscode.workspace.onDidCloseNotebookDocument(e => { + this._attachmentCache.delete(e.uri.toString()); + })); + + this._disposables.push(vscode.workspace.onWillRenameFiles(e => { + const re = /\.ipynb$/; + for (const file of e.files) { + if (!re.exec(file.oldUri.toString())) { + continue; + } + + // transfer cache to new uri + if (this._attachmentCache.has(file.oldUri.toString())) { + this._attachmentCache.set(file.newUri.toString(), this._attachmentCache.get(file.oldUri.toString())!); + this._attachmentCache.delete(file.oldUri.toString()); + } + } + })); + + this._disposables.push(vscode.workspace.onDidOpenTextDocument(e => { + this.analyzeMissingAttachments(e); + })); + + this._disposables.push(vscode.workspace.onDidCloseTextDocument(e => { + this.analyzeMissingAttachments(e); + })); + + vscode.workspace.textDocuments.forEach(document => { + this.analyzeMissingAttachments(document); + }); + } + + provideCodeActions(document: vscode.TextDocument, _range: vscode.Range | vscode.Selection, context: vscode.CodeActionContext, _token: vscode.CancellationToken): vscode.ProviderResult<(vscode.CodeAction | vscode.Command)[]> { + const fixes: vscode.CodeAction[] = []; + + for (const diagnostic of context.diagnostics) { + switch (diagnostic.code) { + case DiagnosticCode.missing_attachment: + { + const fix = new vscode.CodeAction( + 'Remove invalid image attachment reference', + vscode.CodeActionKind.QuickFix); + + fix.command = { + command: ATTACHMENT_CLEANUP_COMMANDID, + title: 'Remove invalid image attachment reference', + arguments: [document.uri, diagnostic.range], + }; + fixes.push(fix); + } + break; + } + } + + return fixes; + } + + /** + * take in a NotebookDocumentChangeEvent, and clean the attachment data for the cell(s) that have had their markdown source code changed + * @param e NotebookDocumentChangeEvent from the onDidChangeNotebookDocument listener + */ + private cleanNotebookAttachments(e: AttachmentCleanRequest) { + if (e.notebook.isClosed) { + return; + } + const document = e.document; + const cell = e.cell; + + const markdownAttachmentsInUse: { [key: string /** filename */]: IAttachmentData } = {}; + const cellFragment = cell.document.uri.fragment; + const notebookUri = e.notebook.uri.toString(); + const diagnostics: IAttachmentDiagnostic[] = []; + const markdownAttachmentsRefedInCell = this.getAttachmentNames(document); + + if (markdownAttachmentsRefedInCell.size === 0) { + // no attachments used in this cell, cache all images from cell metadata + this.saveAllAttachmentsToCache(cell.metadata, notebookUri, cellFragment); + } + + if (this.checkMetadataHasAttachmentsField(cell.metadata)) { + // the cell metadata contains attachments, check if any are used in the markdown source + + for (const [currFilename, attachment] of Object.entries(cell.metadata.attachments)) { + // means markdown reference is present in the metadata, rendering will work properly + // therefore, we don't need to check it in the next loop either + if (markdownAttachmentsRefedInCell.has(currFilename)) { + // attachment reference is present in the markdown source, no need to cache it + markdownAttachmentsRefedInCell.get(currFilename)!.valid = true; + markdownAttachmentsInUse[currFilename] = attachment as IAttachmentData; + } else { + // attachment reference is not present in the markdown source, cache it + this.saveAttachmentToCache(notebookUri, cellFragment, currFilename, cell.metadata); + } + } + } + + for (const [currFilename, attachment] of markdownAttachmentsRefedInCell) { + if (attachment.valid) { + // attachment reference is present in both the markdown source and the metadata, no op + continue; + } + + // if image is referenced in markdown source but not in metadata -> check if we have image in the cache + const cachedImageAttachment = this._attachmentCache.get(notebookUri)?.get(cellFragment)?.get(currFilename); + if (cachedImageAttachment) { + markdownAttachmentsInUse[currFilename] = cachedImageAttachment; + this._attachmentCache.get(notebookUri)?.get(cellFragment)?.delete(currFilename); + } else { + // if image is not in the cache, show warning + diagnostics.push({ name: currFilename, ranges: attachment.ranges }); + } + } + + if (!objectEquals(markdownAttachmentsInUse, cell.metadata.attachments)) { + const updateMetadata: { [key: string]: any } = deepClone(cell.metadata); + updateMetadata.attachments = markdownAttachmentsInUse; + const metadataEdit = vscode.NotebookEdit.updateCellMetadata(cell.index, updateMetadata); + const workspaceEdit = new vscode.WorkspaceEdit(); + workspaceEdit.set(e.notebook.uri, [metadataEdit]); + vscode.workspace.applyEdit(workspaceEdit); + } + + this.updateDiagnostics(cell.document.uri, diagnostics); + } + + private analyzeMissingAttachments(document: vscode.TextDocument): void { + if (document.uri.scheme !== 'vscode-notebook-cell') { + // not notebook + return; + } + + if (document.isClosed) { + this.updateDiagnostics(document.uri, []); + return; + } + + let notebook: vscode.NotebookDocument | undefined; + let activeCell: vscode.NotebookCell | undefined; + for (const notebookDocument of vscode.workspace.notebookDocuments) { + const cell = notebookDocument.getCells().find(cell => cell.document === document); + if (cell) { + notebook = notebookDocument; + activeCell = cell; + break; + } + } + + if (!notebook || !activeCell) { + return; + } + + const diagnostics: IAttachmentDiagnostic[] = []; + const markdownAttachments = this.getAttachmentNames(document); + if (this.checkMetadataHasAttachmentsField(activeCell.metadata)) { + for (const [currFilename, attachment] of markdownAttachments) { + if (!activeCell.metadata.attachments[currFilename]) { + // no attachment reference in the metadata + diagnostics.push({ name: currFilename, ranges: attachment.ranges }); + } + } + } + + this.updateDiagnostics(activeCell.document.uri, diagnostics); + } + + private updateDiagnostics(cellUri: vscode.Uri, diagnostics: IAttachmentDiagnostic[]) { + const vscodeDiagnostics: vscode.Diagnostic[] = []; + for (const currDiagnostic of diagnostics) { + currDiagnostic.ranges.forEach(range => { + const diagnostic = new vscode.Diagnostic(range, `The image named: '${currDiagnostic.name}' is not present in cell metadata.`, vscode.DiagnosticSeverity.Warning); + diagnostic.code = DiagnosticCode.missing_attachment; + vscodeDiagnostics.push(diagnostic); + }); + } + + this._imageDiagnosticCollection.set(cellUri, vscodeDiagnostics); + } + + /** + * remove attachment from metadata and add it to the cache + * @param notebookUri uri of the notebook currently being edited + * @param cellFragment fragment of the cell currently being edited + * @param currFilename filename of the image being pulled into the cell + * @param metadata metadata of the cell currently being edited + */ + private saveAttachmentToCache(notebookUri: string, cellFragment: string, currFilename: string, metadata: { [key: string]: any }): void { + const documentCache = this._attachmentCache.get(notebookUri); + if (!documentCache) { + // no cache for this notebook yet + const cellCache = new Map(); + cellCache.set(currFilename, this.getMetadataAttachment(metadata, currFilename)); + const documentCache = new Map(); + documentCache.set(cellFragment, cellCache); + this._attachmentCache.set(notebookUri, documentCache); + } else if (!documentCache.has(cellFragment)) { + // no cache for this cell yet + const cellCache = new Map(); + cellCache.set(currFilename, this.getMetadataAttachment(metadata, currFilename)); + documentCache.set(cellFragment, cellCache); + } else { + // cache for this cell already exists + // add to cell cache + documentCache.get(cellFragment)?.set(currFilename, this.getMetadataAttachment(metadata, currFilename)); + } + } + + /** + * get an attachment entry from the given metadata + * @param metadata metadata to extract image data from + * @param currFilename filename of image being extracted + * @returns + */ + private getMetadataAttachment(metadata: { [key: string]: any }, currFilename: string): { [key: string]: any } { + return metadata.attachments[currFilename]; + } + + /** + * returns a boolean that represents if there are any images in the attachment field of a cell's metadata + * @param metadata metadata of cell + * @returns boolean representing the presence of any attachments + */ + private checkMetadataHasAttachmentsField(metadata: { [key: string]: unknown }): metadata is { readonly attachments: Record } { + return !!metadata.attachments && typeof metadata.attachments === 'object'; + } + + /** + * given metadata from a cell, cache every image (used in cases with no image links in markdown source) + * @param metadata metadata for a cell with no images in markdown source + * @param notebookUri uri for the notebook being edited + * @param cellFragment fragment of cell being edited + */ + private saveAllAttachmentsToCache(metadata: { [key: string]: unknown }, notebookUri: string, cellFragment: string): void { + const documentCache = this._attachmentCache.get(notebookUri) ?? new Map(); + this._attachmentCache.set(notebookUri, documentCache); + const cellCache = documentCache.get(cellFragment) ?? new Map(); + documentCache.set(cellFragment, cellCache); + + if (metadata.attachments && typeof metadata.attachments === 'object') { + for (const [currFilename, attachment] of Object.entries(metadata.attachments)) { + cellCache.set(currFilename, attachment); + } + } + } + + /** + * pass in all of the markdown source code, and get a dictionary of all images referenced in the markdown. keys are image filenames, values are render state + * @param document the text document for the cell, formatted as a string + */ + private getAttachmentNames(document: vscode.TextDocument) { + const source = document.getText(); + const filenames: Map = new Map(); + const re = /!\[.*?\]\(attachment:(?.*?)\)/gm; + + let match; + while ((match = re.exec(source))) { + if (match.groups?.filename) { + const index = match.index; + const length = match[0].length; + const startPosition = document.positionAt(index); + const endPosition = document.positionAt(index + length); + const range = new vscode.Range(startPosition, endPosition); + const filename = filenames.get(match.groups.filename) ?? { valid: false, ranges: [] }; + filenames.set(match.groups.filename, filename); + filename.ranges.push(range); + } + } + return filenames; + } + + dispose() { + this._disposables.forEach(d => d.dispose()); + } +} + diff --git a/extensions/ipynb/src/notebookImagePaste.ts b/extensions/ipynb/src/notebookImagePaste.ts new file mode 100644 index 00000000000..81325a09257 --- /dev/null +++ b/extensions/ipynb/src/notebookImagePaste.ts @@ -0,0 +1,157 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as vscode from 'vscode'; +import { JUPYTER_NOTEBOOK_MARKDOWN_SELECTOR } from './constants'; + +class CopyPasteEditProvider implements vscode.DocumentPasteEditProvider { + + async provideDocumentPasteEdits( + document: vscode.TextDocument, + _ranges: readonly vscode.Range[], + dataTransfer: vscode.DataTransfer, + _token: vscode.CancellationToken + ): Promise { + + const enabled = vscode.workspace.getConfiguration('ipynb', document).get('experimental.pasteImages.enabled', false); + if (!enabled) { + return undefined; + } + + // get b64 data from paste + // TODO: dataTransfer.get() limits to one image pasted + const dataItem = dataTransfer.get('image/png'); + if (!dataItem) { + return undefined; + } + const fileDataAsUint8 = await dataItem.asFile()?.data(); + if (!fileDataAsUint8) { + return undefined; + } + + // get filename data from paste + const clipboardFilename = dataItem.asFile()?.name; + if (!clipboardFilename) { + return undefined; + } + const separatorIndex = clipboardFilename?.lastIndexOf('.'); + const filename = clipboardFilename?.slice(0, separatorIndex); + const filetype = clipboardFilename?.slice(separatorIndex); + if (!filename || !filetype) { + return undefined; + } + + const currentCell = this.getCellFromCellDocument(document); + if (!currentCell) { + return undefined; + } + const notebookUri = currentCell.notebook.uri; + + // create updated metadata for cell (prep for WorkspaceEdit) + const b64string = encodeBase64(fileDataAsUint8); + const startingAttachments = currentCell.metadata.attachments; + const newAttachment = buildAttachment(b64string, currentCell, filename, filetype, startingAttachments); + + // build edits + const nbEdit = vscode.NotebookEdit.updateCellMetadata(currentCell.index, newAttachment.metadata); + const workspaceEdit = new vscode.WorkspaceEdit(); + workspaceEdit.set(notebookUri, [nbEdit]); + + // create a snippet for paste + const pasteSnippet = new vscode.SnippetString(); + pasteSnippet.appendText('!['); + pasteSnippet.appendPlaceholder(`${clipboardFilename}`); + pasteSnippet.appendText(`](attachment:${newAttachment.filename})`); + + return { insertText: pasteSnippet, additionalEdit: workspaceEdit }; + } + + private getCellFromCellDocument(cellDocument: vscode.TextDocument): vscode.NotebookCell | undefined { + for (const notebook of vscode.workspace.notebookDocuments) { + if (notebook.uri.path === cellDocument.uri.path) { + for (const cell of notebook.getCells()) { + if (cell.document === cellDocument) { + return cell; + } + } + } + } + return undefined; + } +} + +/** + * Taken from https://github.com/microsoft/vscode/blob/743b016722db90df977feecde0a4b3b4f58c2a4c/src/vs/base/common/buffer.ts#L350-L387 + */ +function encodeBase64(buffer: Uint8Array, padded = true, urlSafe = false) { + const base64Alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'; + const base64UrlSafeAlphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_'; + + const dictionary = urlSafe ? base64UrlSafeAlphabet : base64Alphabet; + let output = ''; + + const remainder = buffer.byteLength % 3; + + let i = 0; + for (; i < buffer.byteLength - remainder; i += 3) { + const a = buffer[i + 0]; + const b = buffer[i + 1]; + const c = buffer[i + 2]; + + output += dictionary[a >>> 2]; + output += dictionary[(a << 4 | b >>> 4) & 0b111111]; + output += dictionary[(b << 2 | c >>> 6) & 0b111111]; + output += dictionary[c & 0b111111]; + } + + if (remainder === 1) { + const a = buffer[i + 0]; + output += dictionary[a >>> 2]; + output += dictionary[(a << 4) & 0b111111]; + if (padded) { output += '=='; } + } else if (remainder === 2) { + const a = buffer[i + 0]; + const b = buffer[i + 1]; + output += dictionary[a >>> 2]; + output += dictionary[(a << 4 | b >>> 4) & 0b111111]; + output += dictionary[(b << 2) & 0b111111]; + if (padded) { output += '='; } + } + + return output; +} + +function buildAttachment(b64: string, cell: vscode.NotebookCell, filename: string, filetype: string, startingAttachments: any): { metadata: { [key: string]: any }; filename: string } { + const cellMetadata = { ...cell.metadata }; + let tempFilename = filename + filetype; + + if (!cellMetadata.attachments) { + cellMetadata['attachments'] = { [tempFilename]: { 'image/png': b64 } }; + } else { + for (let appendValue = 2; tempFilename in startingAttachments; appendValue++) { + const objEntries = Object.entries(startingAttachments[tempFilename]); + if (objEntries.length) { // check that mime:b64 are present + const [, attachmentb64] = objEntries[0]; + if (attachmentb64 === b64) { // checking if filename can be reused, based on camparison of image data + break; + } else { + tempFilename = filename.concat(`-${appendValue}`) + filetype; + } + } + } + cellMetadata.attachments[tempFilename] = { 'image/png': b64 }; + } + + return { + metadata: cellMetadata, + filename: tempFilename + }; +} + +export function notebookImagePasteSetup() { + return vscode.languages.registerDocumentPasteEditProvider(JUPYTER_NOTEBOOK_MARKDOWN_SELECTOR, new CopyPasteEditProvider(), { + pasteMimeTypes: ['image/png'], + }); +} diff --git a/extensions/ipynb/src/notebookSerializer.ts b/extensions/ipynb/src/notebookSerializer.ts index 37eee49b1be..0c3ccd09723 100644 --- a/extensions/ipynb/src/notebookSerializer.ts +++ b/extensions/ipynb/src/notebookSerializer.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as nbformat from '@jupyterlab/nbformat'; +import type * as nbformat from '@jupyterlab/nbformat'; import * as detectIndent from 'detect-indent'; import * as vscode from 'vscode'; import { defaultNotebookFormat } from './constants'; diff --git a/extensions/ipynb/src/serializers.ts b/extensions/ipynb/src/serializers.ts index 078bb408cc5..96da8f2c617 100644 --- a/extensions/ipynb/src/serializers.ts +++ b/extensions/ipynb/src/serializers.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as nbformat from '@jupyterlab/nbformat'; +import type * as nbformat from '@jupyterlab/nbformat'; import { NotebookCell, NotebookCellData, NotebookCellKind, NotebookCellOutput } from 'vscode'; -import { CellMetadata, CellOutputMetadata } from './common'; +import { CellOutputMetadata } from './common'; import { textMimeTypes } from './deserializers'; const textDecoder = new TextDecoder(); @@ -55,8 +55,14 @@ export function sortObjectPropertiesRecursively(obj: any): any { } export function getCellMetadata(cell: NotebookCell | NotebookCellData) { - return cell.metadata?.custom as CellMetadata | undefined; + return { + // it contains the cell id, and the cell metadata, along with other nb cell metadata + ...(cell.metadata?.custom ?? {}), + // promote the cell attachments to the top level + attachments: cell.metadata?.custom?.attachments ?? cell.metadata?.attachments + }; } + function createCodeCellFromNotebookCell(cell: NotebookCellData, preferredLanguage: string | undefined): nbformat.ICodeCell { const cellMetadata = getCellMetadata(cell); let metadata = cellMetadata?.metadata || {}; // This cannot be empty. @@ -274,7 +280,7 @@ function convertStreamOutput(output: NotebookCellOutput): JupyterOutput { .filter((opit) => opit.mime === CellOutputMimeTypes.stderr || opit.mime === CellOutputMimeTypes.stdout) .map((opit) => textDecoder.decode(opit.data)) .forEach(value => { - // Ensure each line is a seprate entry in an array (ending with \n). + // Ensure each line is a separate entry in an array (ending with \n). const lines = value.split('\n'); // If the last item in `outputs` is not empty and the first item in `lines` is not empty, then concate them. // As they are part of the same line. @@ -335,7 +341,7 @@ function convertOutputMimeToJupyterOutput(mime: string, value: Uint8Array) { } } -function createMarkdownCellFromNotebookCell(cell: NotebookCellData): nbformat.IMarkdownCell { +export function createMarkdownCellFromNotebookCell(cell: NotebookCellData): nbformat.IMarkdownCell { const cellMetadata = getCellMetadata(cell); const markdownCell: any = { cell_type: 'markdown', diff --git a/extensions/ipynb/src/test/serializers.test.ts b/extensions/ipynb/src/test/serializers.test.ts index d945d1f4223..b8f56fc5dcb 100644 --- a/extensions/ipynb/src/test/serializers.test.ts +++ b/extensions/ipynb/src/test/serializers.test.ts @@ -3,13 +3,14 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as nbformat from '@jupyterlab/nbformat'; +import type * as nbformat from '@jupyterlab/nbformat'; import * as assert from 'assert'; import * as vscode from 'vscode'; import { jupyterCellOutputToCellOutput, jupyterNotebookModelToNotebookData } from '../deserializers'; +import { createMarkdownCellFromNotebookCell, getCellMetadata } from '../serializers'; function deepStripProperties(obj: any, props: string[]) { - for (let prop in obj) { + for (const prop in obj) { if (obj[prop]) { delete obj[prop]; } else if (typeof obj[prop] === 'object') { @@ -52,6 +53,71 @@ suite('ipynb serializer', () => { assert.deepStrictEqual(notebook.cells, [expectedCodeCell, expectedMarkdownCell]); }); + + + test('Serialize', async () => { + const markdownCell = new vscode.NotebookCellData(vscode.NotebookCellKind.Markup, '# header1', 'markdown'); + markdownCell.metadata = { + attachments: { + 'image.png': { + 'image/png': 'abc' + } + }, + custom: { + id: '123', + metadata: { + foo: 'bar' + } + } + }; + + const cellMetadata = getCellMetadata(markdownCell); + assert.deepStrictEqual(cellMetadata, { + id: '123', + metadata: { + foo: 'bar', + }, + attachments: { + 'image.png': { + 'image/png': 'abc' + } + } + }); + + const markdownCell2 = new vscode.NotebookCellData(vscode.NotebookCellKind.Markup, '# header1', 'markdown'); + markdownCell2.metadata = { + custom: { + id: '123', + metadata: { + foo: 'bar' + }, + attachments: { + 'image.png': { + 'image/png': 'abc' + } + } + } + }; + + const nbMarkdownCell = createMarkdownCellFromNotebookCell(markdownCell); + const nbMarkdownCell2 = createMarkdownCellFromNotebookCell(markdownCell2); + assert.deepStrictEqual(nbMarkdownCell, nbMarkdownCell2); + + assert.deepStrictEqual(nbMarkdownCell, { + cell_type: 'markdown', + source: ['# header1'], + metadata: { + foo: 'bar', + }, + attachments: { + 'image.png': { + 'image/png': 'abc' + } + }, + id: '123' + }); + }); + suite('Outputs', () => { function validateCellOutputTranslation( outputs: nbformat.IOutput[], diff --git a/extensions/ipynb/tsconfig.json b/extensions/ipynb/tsconfig.json index a8006017458..f440ed24bea 100644 --- a/extensions/ipynb/tsconfig.json +++ b/extensions/ipynb/tsconfig.json @@ -9,6 +9,6 @@ "include": [ "src/**/*", "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.notebookWorkspaceEdit.d.ts" + "../../src/vscode-dts/vscode.proposed.documentPaste.d.ts" ] } diff --git a/extensions/ipynb/yarn.lock b/extensions/ipynb/yarn.lock index c932570ecc0..7b5488e7109 100644 --- a/extensions/ipynb/yarn.lock +++ b/extensions/ipynb/yarn.lock @@ -8,21 +8,39 @@ integrity sha512-BCN9uNWH8AmiP7BXBJqEinUY9KXalmRzo+L0cB/mQsmFfzODxwQrbvxCHXUNH2iP+qKkWYtB4vyy8N62PViMFw== "@jupyterlab/nbformat@^3.2.9": - version "3.2.9" - resolved "https://registry.yarnpkg.com/@jupyterlab/nbformat/-/nbformat-3.2.9.tgz#e7d854719612133498af4280d9a8caa0873205b0" - integrity sha512-WSf9OQo8yfFjyodbXRdFoaNwMkaAL5jFZiD6V2f8HqI380ipansWrrV7R9CGzPfgKHpUGZMO1tYKmUwzMhvZ4w== + version "3.4.3" + resolved "https://registry.yarnpkg.com/@jupyterlab/nbformat/-/nbformat-3.4.3.tgz#cbab1bf507677b7f0f309d8353fc83fe5a973c82" + integrity sha512-i/yADrwhhAJJCUOTa+fEBMyJO7fvX9Y73I0B7V6dQhGcrmrEKLC3wk4yOo63+jRntd5+dupbiOtz3w1ncIXwIA== dependencies: - "@lumino/coreutils" "^1.5.3" + "@lumino/coreutils" "^1.11.0" -"@lumino/coreutils@^1.5.3": +"@lumino/coreutils@^1.11.0": version "1.12.0" resolved "https://registry.yarnpkg.com/@lumino/coreutils/-/coreutils-1.12.0.tgz#fbdef760f736eaf2bd396a5c6fc3a68a4b449b15" integrity sha512-DSglh4ylmLi820CNx9soJmDJCpUgymckdWeGWuN0Ash5g60oQvrQDfosVxEhzmNvtvXv45WZEqSBzDP6E5SEmQ== +"@types/linkify-it@*": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9" + integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA== + +"@types/markdown-it@12.2.3": + version "12.2.3" + resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51" + integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ== + dependencies: + "@types/linkify-it" "*" + "@types/mdurl" "*" + +"@types/mdurl@*": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9" + integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA== + "@types/uuid@^8.3.1": - version "8.3.1" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.1.tgz#1a32969cf8f0364b3d8c8af9cc3555b7805df14f" - integrity sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg== + version "8.3.4" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" + integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw== detect-indent@^6.0.0: version "6.1.0" diff --git a/extensions/jake/package.json b/extensions/jake/package.json index 0e5ebc4ea8b..4e6a94a8b24 100644 --- a/extensions/jake/package.json +++ b/extensions/jake/package.json @@ -17,7 +17,7 @@ "watch": "gulp watch-extension:jake" }, "dependencies": { - "vscode-nls": "^4.0.0" + "vscode-nls": "^5.2.0" }, "devDependencies": { "@types/node": "16.x" diff --git a/extensions/jake/src/main.ts b/extensions/jake/src/main.ts index 93fa1aa285b..eba135e1530 100644 --- a/extensions/jake/src/main.ts +++ b/extensions/jake/src/main.ts @@ -33,7 +33,7 @@ function exec(command: string, options: cp.ExecOptions): Promise<{ stdout: strin const buildNames: string[] = ['build', 'compile', 'watch']; function isBuildTask(name: string): boolean { - for (let buildName of buildNames) { + for (const buildName of buildNames) { if (name.indexOf(buildName) !== -1) { return true; } @@ -43,7 +43,7 @@ function isBuildTask(name: string): boolean { const testNames: string[] = ['test']; function isTestTask(name: string): boolean { - for (let testName of testNames) { + for (const testName of testNames) { if (name.indexOf(testName) !== -1) { return true; } @@ -68,7 +68,7 @@ function showError() { async function findJakeCommand(rootPath: string): Promise { let jakeCommand: string; - let platform = process.platform; + const platform = process.platform; if (platform === 'win32' && await exists(path.join(rootPath!, 'node_modules', '.bin', 'jake.cmd'))) { jakeCommand = path.join('.', 'node_modules', '.bin', 'jake.cmd'); } else if ((platform === 'linux' || platform === 'darwin') && await exists(path.join(rootPath!, 'node_modules', '.bin', 'jake'))) { @@ -103,7 +103,7 @@ class FolderDetector { } public start(): void { - let pattern = path.join(this._workspaceFolder.uri.fsPath, '{node_modules,Jakefile,Jakefile.js}'); + const pattern = path.join(this._workspaceFolder.uri.fsPath, '{node_modules,Jakefile,Jakefile.js}'); this.fileWatcher = vscode.workspace.createFileSystemWatcher(pattern); this.fileWatcher.onDidChange(() => this.promise = undefined); this.fileWatcher.onDidCreate(() => this.promise = undefined); @@ -124,17 +124,17 @@ class FolderDetector { public async getTask(_task: vscode.Task): Promise { const jakeTask = (_task.definition).task; if (jakeTask) { - let kind: JakeTaskDefinition = (_task.definition); - let options: vscode.ShellExecutionOptions = { cwd: this.workspaceFolder.uri.fsPath }; - let task = new vscode.Task(kind, this.workspaceFolder, jakeTask, 'jake', new vscode.ShellExecution(await this._jakeCommand, [jakeTask], options)); + const kind: JakeTaskDefinition = (_task.definition); + const options: vscode.ShellExecutionOptions = { cwd: this.workspaceFolder.uri.fsPath }; + const task = new vscode.Task(kind, this.workspaceFolder, jakeTask, 'jake', new vscode.ShellExecution(await this._jakeCommand, [jakeTask], options)); return task; } return undefined; } private async computeTasks(): Promise { - let rootPath = this._workspaceFolder.uri.scheme === 'file' ? this._workspaceFolder.uri.fsPath : undefined; - let emptyTasks: vscode.Task[] = []; + const rootPath = this._workspaceFolder.uri.scheme === 'file' ? this._workspaceFolder.uri.fsPath : undefined; + const emptyTasks: vscode.Task[] = []; if (!rootPath) { return emptyTasks; } @@ -146,32 +146,32 @@ class FolderDetector { } } - let commandLine = `${await this._jakeCommand} --tasks`; + const commandLine = `${await this._jakeCommand} --tasks`; try { - let { stdout, stderr } = await exec(commandLine, { cwd: rootPath }); + const { stdout, stderr } = await exec(commandLine, { cwd: rootPath }); if (stderr) { getOutputChannel().appendLine(stderr); showError(); } - let result: vscode.Task[] = []; + const result: vscode.Task[] = []; if (stdout) { - let lines = stdout.split(/\r{0,1}\n/); - for (let line of lines) { + const lines = stdout.split(/\r{0,1}\n/); + for (const line of lines) { if (line.length === 0) { continue; } - let regExp = /^jake\s+([^\s]+)\s/g; - let matches = regExp.exec(line); + const regExp = /^jake\s+([^\s]+)\s/g; + const matches = regExp.exec(line); if (matches && matches.length === 2) { - let taskName = matches[1]; - let kind: JakeTaskDefinition = { + const taskName = matches[1]; + const kind: JakeTaskDefinition = { type: 'jake', task: taskName }; - let options: vscode.ShellExecutionOptions = { cwd: this.workspaceFolder.uri.fsPath }; - let task = new vscode.Task(kind, taskName, 'jake', new vscode.ShellExecution(`${await this._jakeCommand} ${taskName}`, options)); + const options: vscode.ShellExecutionOptions = { cwd: this.workspaceFolder.uri.fsPath }; + const task = new vscode.Task(kind, taskName, 'jake', new vscode.ShellExecution(`${await this._jakeCommand} ${taskName}`, options)); result.push(task); - let lowerCaseLine = line.toLowerCase(); + const lowerCaseLine = line.toLowerCase(); if (isBuildTask(lowerCaseLine)) { task.group = vscode.TaskGroup.Build; } else if (isTestTask(lowerCaseLine)) { @@ -182,7 +182,7 @@ class FolderDetector { } return result; } catch (err) { - let channel = getOutputChannel(); + const channel = getOutputChannel(); if (err.stderr) { channel.appendLine(err.stderr); } @@ -212,7 +212,7 @@ class TaskDetector { } public start(): void { - let folders = vscode.workspace.workspaceFolders; + const folders = vscode.workspace.workspaceFolders; if (folders) { this.updateWorkspaceFolders(folders, []); } @@ -229,15 +229,15 @@ class TaskDetector { } private updateWorkspaceFolders(added: readonly vscode.WorkspaceFolder[], removed: readonly vscode.WorkspaceFolder[]): void { - for (let remove of removed) { - let detector = this.detectors.get(remove.uri.toString()); + for (const remove of removed) { + const detector = this.detectors.get(remove.uri.toString()); if (detector) { detector.dispose(); this.detectors.delete(remove.uri.toString()); } } - for (let add of added) { - let detector = new FolderDetector(add, findJakeCommand(add.uri.fsPath)); + for (const add of added) { + const detector = new FolderDetector(add, findJakeCommand(add.uri.fsPath)); this.detectors.set(add.uri.toString(), detector); if (detector.isEnabled()) { detector.start(); @@ -247,15 +247,15 @@ class TaskDetector { } private updateConfiguration(): void { - for (let detector of this.detectors.values()) { + for (const detector of this.detectors.values()) { detector.dispose(); this.detectors.delete(detector.workspaceFolder.uri.toString()); } - let folders = vscode.workspace.workspaceFolders; + const folders = vscode.workspace.workspaceFolders; if (folders) { - for (let folder of folders) { + for (const folder of folders) { if (!this.detectors.has(folder.uri.toString())) { - let detector = new FolderDetector(folder, findJakeCommand(folder.uri.fsPath)); + const detector = new FolderDetector(folder, findJakeCommand(folder.uri.fsPath)); this.detectors.set(folder.uri.toString(), detector); if (detector.isEnabled()) { detector.start(); @@ -294,13 +294,13 @@ class TaskDetector { } else if (this.detectors.size === 1) { return this.detectors.values().next().value.getTasks(); } else { - let promises: Promise[] = []; - for (let detector of this.detectors.values()) { + const promises: Promise[] = []; + for (const detector of this.detectors.values()) { promises.push(detector.getTasks().then((value) => value, () => [])); } return Promise.all(promises).then((values) => { - let result: vscode.Task[] = []; - for (let tasks of values) { + const result: vscode.Task[] = []; + for (const tasks of values) { if (tasks && tasks.length > 0) { result.push(...tasks); } diff --git a/extensions/jake/yarn.lock b/extensions/jake/yarn.lock index 22c406bc73f..8b8c7a6c15b 100644 --- a/extensions/jake/yarn.lock +++ b/extensions/jake/yarn.lock @@ -7,7 +7,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== -vscode-nls@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" - integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw== +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json index 04a23eca114..ed2e78282ca 100644 --- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json +++ b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/4d30ff834ec324f56291addd197aa1e423cedfdd", + "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/c2744520e325330d0608fc1d1993d7fe98e66202", "name": "JavaScript (with React support)", "scopeName": "source.js", "patterns": [ @@ -2271,11 +2271,47 @@ "name": "keyword.control.from.js", "match": "\\bfrom\\b" }, + { + "include": "#import-export-assert-clause" + }, { "include": "#import-export-clause" } ] }, + "import-export-assert-clause": { + "begin": "(?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|(===|!==|==|!=)|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)", + "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)))\\s*$)", "beginCaptures": { "1": { "name": "storage.modifier.async.js" @@ -3269,13 +3308,16 @@ } }, { - "begin": "(?]|\\|\\||\\&\\&|\\!\\=\\=|$|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|((?\\s*$)", + "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name|resolution-mode)\\s*=\\s*((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))+\\s*/>\\s*$)", "beginCaptures": { "1": { "name": "punctuation.definition.comment.js" @@ -5092,7 +5134,7 @@ "patterns": [ { "name": "entity.other.attribute-name.directive.js", - "match": "path|types|no-default-lib|lib|name" + "match": "path|types|no-default-lib|lib|name|resolution-mode" }, { "name": "keyword.operator.assignment.js", @@ -5775,10 +5817,6 @@ "name": "punctuation.definition.entity.js" } } - }, - { - "name": "invalid.illegal.bad-ampersand.js", - "match": "&" } ] }, diff --git a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json index 5d3448bdfe4..88910529ee4 100644 --- a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json +++ b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/4d30ff834ec324f56291addd197aa1e423cedfdd", + "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/c2744520e325330d0608fc1d1993d7fe98e66202", "name": "JavaScript (with React support)", "scopeName": "source.js.jsx", "patterns": [ @@ -2271,11 +2271,47 @@ "name": "keyword.control.from.js.jsx", "match": "\\bfrom\\b" }, + { + "include": "#import-export-assert-clause" + }, { "include": "#import-export-clause" } ] }, + "import-export-assert-clause": { + "begin": "(?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|(===|!==|==|!=)|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)", + "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)))\\s*$)", "beginCaptures": { "1": { "name": "storage.modifier.async.js.jsx" @@ -3269,13 +3308,16 @@ } }, { - "begin": "(?]|\\|\\||\\&\\&|\\!\\=\\=|$|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|((?\\s*$)", + "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name|resolution-mode)\\s*=\\s*((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))+\\s*/>\\s*$)", "beginCaptures": { "1": { "name": "punctuation.definition.comment.js.jsx" @@ -5092,7 +5134,7 @@ "patterns": [ { "name": "entity.other.attribute-name.directive.js.jsx", - "match": "path|types|no-default-lib|lib|name" + "match": "path|types|no-default-lib|lib|name|resolution-mode" }, { "name": "keyword.operator.assignment.js.jsx", @@ -5775,10 +5817,6 @@ "name": "punctuation.definition.entity.js.jsx" } } - }, - { - "name": "invalid.illegal.bad-ampersand.js.jsx", - "match": "&" } ] }, diff --git a/extensions/json-language-features/client/src/jsonClient.ts b/extensions/json-language-features/client/src/jsonClient.ts index 60225af8cef..b33e9c59601 100644 --- a/extensions/json-language-features/client/src/jsonClient.ts +++ b/extensions/json-language-features/client/src/jsonClient.ts @@ -9,19 +9,19 @@ const localize = nls.loadMessageBundle(); export type JSONLanguageStatus = { schemas: string[] }; import { - workspace, window, languages, commands, ExtensionContext, extensions, Uri, - Diagnostic, StatusBarAlignment, TextEditor, TextDocument, FormattingOptions, CancellationToken, - ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, + workspace, window, languages, commands, ExtensionContext, extensions, Uri, ColorInformation, + Diagnostic, StatusBarAlignment, TextEditor, TextDocument, FormattingOptions, CancellationToken, FoldingRange, + ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation } from 'vscode'; import { LanguageClientOptions, RequestType, NotificationType, DidChangeConfigurationNotification, HandleDiagnosticsSignature, ResponseError, DocumentRangeFormattingParams, - DocumentRangeFormattingRequest, ProvideCompletionItemsSignature, ProvideHoverSignature, BaseLanguageClient + DocumentRangeFormattingRequest, ProvideCompletionItemsSignature, ProvideHoverSignature, BaseLanguageClient, ProvideFoldingRangeSignature, ProvideDocumentSymbolsSignature, ProvideDocumentColorsSignature } from 'vscode-languageclient'; import { hash } from './utils/hash'; -import { createLanguageStatusItem } from './languageStatus'; +import { createDocumentColorsLimitItem, createDocumentSymbolsLimitItem, createLanguageStatusItem, createLimitStatusItem } from './languageStatus'; namespace VSCodeContentRequest { export const type: RequestType = new RequestType('vscode/content'); @@ -53,16 +53,15 @@ namespace SchemaAssociationNotification { export const type: NotificationType = new NotificationType('json/schemaAssociations'); } -namespace ResultLimitReachedNotification { - export const type: NotificationType = new NotificationType('json/resultLimitReached'); -} - type Settings = { json?: { schemas?: JSONSchemaSettings[]; format?: { enable?: boolean }; + keepLines?: { enable?: boolean }; validate?: { enable?: boolean }; resultLimit?: number; + jsonFoldingLimit?: number; + jsoncFoldingLimit?: number; }; http?: { proxy?: string; @@ -76,15 +75,15 @@ export type JSONSchemaSettings = { schema?: any; }; -namespace SettingIds { +export namespace SettingIds { export const enableFormatter = 'json.format.enable'; + export const enableKeepLines = 'json.format.keepLines'; export const enableValidation = 'json.validate.enable'; export const enableSchemaDownload = 'json.schemaDownload.enable'; export const maxItemsComputed = 'json.maxItemsComputed'; -} -namespace StorageIds { - export const maxItemsExceededInformation = 'json.maxItemsExceededInformation'; + export const editorSection = 'editor'; + export const foldingMaximumRegions = 'foldingMaximumRegions'; } export interface TelemetryReporter { @@ -109,6 +108,10 @@ export interface SchemaRequestService { export const languageServerDescription = localize('jsonserver.name', 'JSON Language Server'); +let resultLimit = 5000; +let jsonFoldingLimit = 5000; +let jsoncFoldingLimit = 5000; + export async function startClient(context: ExtensionContext, newLanguageClient: LanguageClientConstructor, runtime: Runtime): Promise { const toDispose = context.subscriptions; @@ -127,6 +130,10 @@ export async function startClient(context: ExtensionContext, newLanguageClient: let isClientReady = false; + const documentSymbolsLimitStatusbarItem = createLimitStatusItem((limit: number) => createDocumentSymbolsLimitItem(documentSelector, SettingIds.maxItemsComputed, limit)); + const documentColorsLimitStatusbarItem = createLimitStatusItem((limit: number) => createDocumentColorsLimitItem(documentSelector, SettingIds.maxItemsComputed, limit)); + toDispose.push(documentSymbolsLimitStatusbarItem, documentColorsLimitStatusbarItem); + toDispose.push(commands.registerCommand('json.clearCache', async () => { if (isClientReady && runtime.schemaRequests.clearCache) { const cachedSchemas = await runtime.schemaRequests.clearCache(); @@ -211,6 +218,51 @@ export async function startClient(context: ExtensionContext, newLanguageClient: return r.then(updateHover); } return updateHover(r); + }, + provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken, next: ProvideFoldingRangeSignature) { + const r = next(document, context, token); + if (isThenable(r)) { + return r; + } + return r; + }, + provideDocumentColors(document: TextDocument, token: CancellationToken, next: ProvideDocumentColorsSignature) { + function checkLimit(r: ColorInformation[] | null | undefined): ColorInformation[] | null | undefined { + if (Array.isArray(r) && r.length > resultLimit) { + r.length = resultLimit; // truncate + documentColorsLimitStatusbarItem.update(document, resultLimit); + } else { + documentColorsLimitStatusbarItem.update(document, false); + } + return r; + } + const r = next(document, token); + if (isThenable(r)) { + return r.then(checkLimit); + } + return checkLimit(r); + }, + provideDocumentSymbols(document: TextDocument, token: CancellationToken, next: ProvideDocumentSymbolsSignature) { + type T = SymbolInformation[] | DocumentSymbol[]; + function countDocumentSymbols(symbols: DocumentSymbol[]): number { + return symbols.reduce((previousValue, s) => previousValue + 1 + countDocumentSymbols(s.children), 0); + } + function isDocumentSymbol(r: T): r is DocumentSymbol[] { + return r[0] instanceof DocumentSymbol; + } + function checkLimit(r: T | null | undefined): T | null | undefined { + if (Array.isArray(r) && (isDocumentSymbol(r) ? countDocumentSymbols(r) : r.length) > resultLimit) { + documentSymbolsLimitStatusbarItem.update(document, resultLimit); + } else { + documentSymbolsLimitStatusbarItem.update(document, false); + } + return r; + } + const r = next(document, token); + if (isThenable(r)) { + return r.then(checkLimit); + } + return checkLimit(r); } } }; @@ -328,21 +380,6 @@ export async function startClient(context: ExtensionContext, newLanguageClient: } })); - client.onNotification(ResultLimitReachedNotification.type, async message => { - const shouldPrompt = context.globalState.get(StorageIds.maxItemsExceededInformation) !== false; - if (shouldPrompt) { - const ok = localize('ok', "OK"); - const openSettings = localize('goToSetting', 'Open Settings'); - const neverAgain = localize('yes never again', "Don't Show Again"); - const pick = await window.showInformationMessage(`${message}\n${localize('configureLimit', 'Use setting \'{0}\' to configure the limit.', SettingIds.maxItemsComputed)}`, ok, openSettings, neverAgain); - if (pick === neverAgain) { - await context.globalState.update(StorageIds.maxItemsExceededInformation, false); - } else if (pick === openSettings) { - await commands.executeCommand('workbench.action.openSettings', SettingIds.maxItemsComputed); - } - } - }); - toDispose.push(createLanguageStatusItem(documentSelector, (uri: string) => client.sendRequest(LanguageStatusRequest.type, uri))); function updateFormatterRegistration() { @@ -432,7 +469,11 @@ function getSettings(): Settings { const configuration = workspace.getConfiguration(); const httpSettings = workspace.getConfiguration('http'); - const resultLimit: number = Math.trunc(Math.max(0, Number(workspace.getConfiguration().get(SettingIds.maxItemsComputed)))) || 5000; + const normalizeLimit = (settingValue: any) => Math.trunc(Math.max(0, Number(settingValue))) || 5000; + + resultLimit = normalizeLimit(workspace.getConfiguration().get(SettingIds.maxItemsComputed)); + jsonFoldingLimit = normalizeLimit(workspace.getConfiguration(SettingIds.editorSection, { languageId: 'json' }).get(SettingIds.foldingMaximumRegions)); + jsoncFoldingLimit = normalizeLimit(workspace.getConfiguration(SettingIds.editorSection, { languageId: 'jsonc' }).get(SettingIds.foldingMaximumRegions)); const settings: Settings = { http: { @@ -442,8 +483,11 @@ function getSettings(): Settings { json: { validate: { enable: configuration.get(SettingIds.enableValidation) }, format: { enable: configuration.get(SettingIds.enableFormatter) }, + keepLines: { enable: configuration.get(SettingIds.enableKeepLines) }, schemas: [], - resultLimit + resultLimit: resultLimit + 1, // ask for one more so we can detect if the limit has been exceeded + jsonFoldingLimit: jsonFoldingLimit + 1, + jsoncFoldingLimit: jsoncFoldingLimit + 1 } }; const schemaSettingsById: { [schemaId: string]: JSONSchemaSettings } = Object.create(null); diff --git a/extensions/json-language-features/client/src/languageStatus.ts b/extensions/json-language-features/client/src/languageStatus.ts index 152759c39a1..a200da53d29 100644 --- a/extensions/json-language-features/client/src/languageStatus.ts +++ b/extensions/json-language-features/client/src/languageStatus.ts @@ -3,7 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { window, languages, Uri, LanguageStatusSeverity, Disposable, commands, QuickPickItem, extensions, workspace, Extension, WorkspaceFolder, QuickPickItemKind, ThemeIcon } from 'vscode'; +import { + window, languages, Uri, Disposable, commands, QuickPickItem, + extensions, workspace, Extension, WorkspaceFolder, QuickPickItemKind, + ThemeIcon, TextDocument, LanguageStatusSeverity +} from 'vscode'; import { JSONLanguageStatus, JSONSchemaSettings } from './jsonClient'; import * as nls from 'vscode-nls'; @@ -177,7 +181,7 @@ export function createLanguageStatusItem(documentSelector: string[], statusReque async function updateLanguageStatus() { const document = window.activeTextEditor?.document; - if (document && documentSelector.indexOf(document.languageId) !== -1) { + if (document) { try { statusItem.text = '$(loading~spin)'; statusItem.detail = localize('pending.detail', 'Loading JSON info'); @@ -187,13 +191,13 @@ export function createLanguageStatusItem(documentSelector: string[], statusReque statusItem.detail = undefined; if (schemas.length === 0) { statusItem.text = localize('status.noSchema.short', "No Schema Validation"); - statusItem.detail = localize('status.noSchema', 'No JSON schema configured.'); + statusItem.detail = localize('status.noSchema', 'no JSON schema configured'); } else if (schemas.length === 1) { statusItem.text = localize('status.withSchema.short', "Schema Validated"); - statusItem.detail = localize('status.singleSchema', 'JSON schema configured.'); + statusItem.detail = localize('status.singleSchema', 'JSON schema configured'); } else { statusItem.text = localize('status.withSchemas.short', "Schema Validated"); - statusItem.detail = localize('status.multipleSchema', 'Multiple JSON schemas configured.'); + statusItem.detail = localize('status.multipleSchema', 'multiple JSON schemas configured'); } statusItem.command = { command: '_json.showAssociatedSchemaList', @@ -201,12 +205,12 @@ export function createLanguageStatusItem(documentSelector: string[], statusReque arguments: [{ schemas, uri: document.uri.toString() } as ShowSchemasInput] }; } catch (e) { - statusItem.text = localize('status.error', 'Unable to compute used schemas'); + statusItem.text = localize('status.error1', 'Unable to compute used schemas: {0}', e.message); statusItem.detail = undefined; statusItem.command = undefined; } } else { - statusItem.text = localize('status.notJSON', 'Not a JSON editor'); + statusItem.text = localize('status.error2', 'Unable to compute used schemas: No document'); statusItem.detail = undefined; statusItem.command = undefined; } @@ -217,3 +221,85 @@ export function createLanguageStatusItem(documentSelector: string[], statusReque return Disposable.from(statusItem, activeEditorListener, showSchemasCommand); } +export function createLimitStatusItem(newItem: (limit: number) => Disposable) { + let statusItem: Disposable | undefined; + const activeLimits: Map = new Map(); + + const toDispose: Disposable[] = []; + toDispose.push(window.onDidChangeActiveTextEditor(textEditor => { + statusItem?.dispose(); + statusItem = undefined; + const doc = textEditor?.document; + if (doc) { + const limit = activeLimits.get(doc); + if (limit !== undefined) { + statusItem = newItem(limit); + } + } + })); + toDispose.push(workspace.onDidCloseTextDocument(document => { + activeLimits.delete(document); + })); + + function update(document: TextDocument, limitApplied: number | false) { + if (limitApplied === false) { + activeLimits.delete(document); + if (statusItem && document === window.activeTextEditor?.document) { + statusItem.dispose(); + statusItem = undefined; + } + } else { + activeLimits.set(document, limitApplied); + if (document === window.activeTextEditor?.document) { + if (!statusItem || limitApplied !== activeLimits.get(document)) { + statusItem?.dispose(); + statusItem = newItem(limitApplied); + } + } + } + } + return { + update, + dispose() { + statusItem?.dispose(); + toDispose.forEach(d => d.dispose()); + toDispose.length = 0; + statusItem = undefined; + activeLimits.clear(); + } + }; +} + +const openSettingsCommand = 'workbench.action.openSettings'; +const configureSettingsLabel = localize('status.button.configure', "Configure"); + +export function createFoldingRangeLimitItem(documentSelector: string[], settingId: string, limit: number): Disposable { + const statusItem = languages.createLanguageStatusItem('json.foldingRangesStatus', documentSelector); + statusItem.name = localize('foldingRangesStatusItem.name', "JSON Folding Status"); + statusItem.severity = LanguageStatusSeverity.Warning; + statusItem.text = localize('status.limitedFoldingRanges.short', "Folding Ranges Limited"); + statusItem.detail = localize('status.limitedFoldingRanges.details', 'only {0} folding ranges shown', limit); + statusItem.command = { command: openSettingsCommand, arguments: [settingId], title: configureSettingsLabel }; + return Disposable.from(statusItem); +} + +export function createDocumentSymbolsLimitItem(documentSelector: string[], settingId: string, limit: number): Disposable { + const statusItem = languages.createLanguageStatusItem('json.documentSymbolsStatus', documentSelector); + statusItem.name = localize('documentSymbolsStatusItem.name', "JSON Outline Status"); + statusItem.severity = LanguageStatusSeverity.Warning; + statusItem.text = localize('status.limitedDocumentSymbols.short', "Outline Limited"); + statusItem.detail = localize('status.limitedDocumentSymbols.details', 'only {0} document symbols shown', limit); + statusItem.command = { command: openSettingsCommand, arguments: [settingId], title: configureSettingsLabel }; + return Disposable.from(statusItem); +} + +export function createDocumentColorsLimitItem(documentSelector: string[], settingId: string, limit: number): Disposable { + const statusItem = languages.createLanguageStatusItem('json.documentColorsStatus', documentSelector); + statusItem.name = localize('documentColorsStatusItem.name', "JSON Color Symbol Status"); + statusItem.severity = LanguageStatusSeverity.Warning; + statusItem.text = localize('status.limitedDocumentColors.short', "Color Symbols Limited"); + statusItem.detail = localize('status.limitedDocumentColors.details', 'only {0} color decorators shown', limit); + statusItem.command = { command: openSettingsCommand, arguments: [settingId], title: configureSettingsLabel }; + return Disposable.from(statusItem); +} + diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json index 1a5d679e950..6548db06e11 100644 --- a/extensions/json-language-features/package.json +++ b/extensions/json-language-features/package.json @@ -5,7 +5,7 @@ "version": "1.0.0", "publisher": "vscode", "license": "MIT", - "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", + "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255", "engines": { "vscode": "0.10.x" }, @@ -85,6 +85,12 @@ "default": true, "description": "%json.format.enable.desc%" }, + "json.format.keepLines": { + "type": "boolean", + "scope": "window", + "default": false, + "description": "%json.format.keepLines.desc%" + }, "json.trace.server": { "type": "string", "scope": "window", @@ -147,10 +153,10 @@ ] }, "dependencies": { - "@vscode/extension-telemetry": "0.5.1", + "@vscode/extension-telemetry": "0.6.2", "request-light": "^0.5.8", - "vscode-languageclient": "^8.0.2-next.4", - "vscode-nls": "^5.0.1" + "vscode-languageclient": "^8.1.0-next.1", + "vscode-nls": "^5.2.0" }, "devDependencies": { "@types/node": "16.x" diff --git a/extensions/json-language-features/package.nls.json b/extensions/json-language-features/package.nls.json index 8afec56a90f..a0d0a84b32c 100644 --- a/extensions/json-language-features/package.nls.json +++ b/extensions/json-language-features/package.nls.json @@ -7,6 +7,7 @@ "json.schemas.fileMatch.item.desc": "A file pattern that can contain '*' to match against when resolving JSON files to schemas.", "json.schemas.schema.desc": "The schema definition for the given URL. The schema only needs to be provided to avoid accesses to the schema URL.", "json.format.enable.desc": "Enable/disable default JSON formatter", + "json.format.keepLines.desc" : "Keep all existing new lines when formatting.", "json.validate.enable.desc": "Enable/disable JSON validation.", "json.tracing.desc": "Traces the communication between VS Code and the JSON language server.", "json.colorDecorators.enable.desc": "Enables or disables color decorators", diff --git a/extensions/json-language-features/server/README.md b/extensions/json-language-features/server/README.md index e82ae06d776..1285255a607 100644 --- a/extensions/json-language-features/server/README.md +++ b/extensions/json-language-features/server/README.md @@ -68,8 +68,9 @@ The server supports the following settings: - `fileMatch`: an array of file names or paths (separated by `/`). `*` can be used as a wildcard. Exclusion patterns can also be defined and start with '!'. A file matches when there is at least one matching pattern and the last matching pattern is not an exclusion pattern. - `url`: The URL of the schema, optional when also a schema is provided. - `schema`: The schema content. - - `resultLimit`: The max number folding ranges and outline symbols to be computed (for performance reasons) - + - `resultLimit`: The max number of color decorators and outline symbols to be computed (for performance reasons) + - `jsonFoldingLimit`: The max number of folding ranges to be computed for json documents (for performance reasons) + - `jsoncFoldingLimit`: The max number of folding ranges to be computed for jsonc documents (for performance reasons) ```json { "http": { @@ -187,13 +188,8 @@ Notification: ### Item Limit -If the setting `resultLimit` is set, the JSON language server will limit the number of folding ranges and document symbols computed. -When the limit is reached, a notification `json/resultLimitReached` is sent that can be shown that can be shown to the user. - -Notification: -- method: 'json/resultLimitReached' -- params: a human readable string to show to the user. - +If the setting `resultLimit` is set, the JSON language server will limit the number of color symbols and document symbols computed. +If the setting `jsonFoldingLimit` or `jsoncFoldingLimit` is set, the JSON language server will limit the number of folding ranges computed. ## Try diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json index ae471f515cd..04a3ec18dfd 100644 --- a/extensions/json-language-features/server/package.json +++ b/extensions/json-language-features/server/package.json @@ -12,11 +12,11 @@ }, "main": "./out/node/jsonServerMain", "dependencies": { - "jsonc-parser": "^3.0.0", + "jsonc-parser": "^3.2.0", "request-light": "^0.5.8", - "vscode-json-languageservice": "^5.0.0", - "vscode-languageserver": "^8.0.2-next.4", - "vscode-uri": "^3.0.3" + "vscode-json-languageservice": "^5.1.1", + "vscode-languageserver": "^8.1.0-next.1", + "vscode-uri": "^3.0.6" }, "devDependencies": { "@types/mocha": "^9.1.1", diff --git a/extensions/json-language-features/server/src/jsonServer.ts b/extensions/json-language-features/server/src/jsonServer.ts index 9594d242f51..39055e0965b 100644 --- a/extensions/json-language-features/server/src/jsonServer.ts +++ b/extensions/json-language-features/server/src/jsonServer.ts @@ -31,10 +31,6 @@ namespace SchemaContentChangeNotification { export const type: NotificationType = new NotificationType('json/schemaContent'); } -namespace ResultLimitReachedNotification { - export const type: NotificationType = new NotificationType('json/resultLimitReached'); -} - namespace ForceValidateRequest { export const type: RequestType = new RequestType('json/validate'); } @@ -69,7 +65,7 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment) function getSchemaRequestService(handledSchemas: string[] = ['https', 'http', 'file']) { const builtInHandlers: { [protocol: string]: RequestService | undefined } = {}; - for (let protocol of handledSchemas) { + for (const protocol of handledSchemas) { if (protocol === 'file') { builtInHandlers[protocol] = runtime.file; } else if (protocol === 'http' || protocol === 'https') { @@ -110,8 +106,9 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment) let hierarchicalDocumentSymbolSupport = false; let foldingRangeLimitDefault = Number.MAX_VALUE; - let foldingRangeLimit = Number.MAX_VALUE; let resultLimit = Number.MAX_VALUE; + let jsonFoldingRangeLimit = Number.MAX_VALUE; + let jsoncFoldingRangeLimit = Number.MAX_VALUE; let formatterMaxNumberOfEdits = Number.MAX_VALUE; let diagnosticsSupport: DiagnosticsSupport | undefined; @@ -188,8 +185,11 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment) json?: { schemas?: JSONSchemaSettings[]; format?: { enable?: boolean }; + keepLines?: { enable?: boolean }; validate?: { enable?: boolean }; resultLimit?: number; + jsonFoldingLimit?: number; + jsoncFoldingLimit?: number; }; http?: { proxy?: string; @@ -204,62 +204,26 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment) } - const limitExceededWarnings = function () { - const pendingWarnings: { [uri: string]: { features: { [name: string]: string }; timeout?: Disposable } } = {}; - - const showLimitedNotification = (uri: string, resultLimit: number) => { - const warning = pendingWarnings[uri]; - connection.sendNotification(ResultLimitReachedNotification.type, `${Utils.basename(URI.parse(uri))}: For performance reasons, ${Object.keys(warning.features).join(' and ')} have been limited to ${resultLimit} items.`); - warning.timeout = undefined; - }; - - return { - cancel(uri: string) { - const warning = pendingWarnings[uri]; - if (warning && warning.timeout) { - warning.timeout.dispose(); - delete pendingWarnings[uri]; - } - }, - - onResultLimitExceeded(uri: string, resultLimit: number, name: string) { - return () => { - let warning = pendingWarnings[uri]; - if (warning) { - if (!warning.timeout) { - // already shown - return; - } - warning.features[name] = name; - warning.timeout.dispose(); - warning.timeout = runtime.timer.setTimeout(() => showLimitedNotification(uri, resultLimit), 2000); - } else { - warning = { features: { [name]: name } }; - warning.timeout = runtime.timer.setTimeout(() => showLimitedNotification(uri, resultLimit), 2000); - pendingWarnings[uri] = warning; - } - }; - } - }; - }(); let jsonConfigurationSettings: JSONSchemaSettings[] | undefined = undefined; let schemaAssociations: ISchemaAssociations | SchemaConfiguration[] | undefined = undefined; let formatterRegistrations: Thenable[] | null = null; let validateEnabled = true; + let keepLinesEnabled = false; - // The settings have changed. Is send on server activation as well. + // The settings have changed. Is sent on server activation as well. connection.onDidChangeConfiguration((change) => { - let settings = change.settings; - if (runtime.configureHttpRequests) { - runtime.configureHttpRequests(settings?.http?.proxy, !!settings.http?.proxyStrictSSL); - } + const settings = change.settings; + runtime.configureHttpRequests?.(settings?.http?.proxy, !!settings.http?.proxyStrictSSL); jsonConfigurationSettings = settings.json?.schemas; validateEnabled = !!settings.json?.validate?.enable; + keepLinesEnabled = settings.json?.keepLines?.enable || false; updateConfiguration(); - foldingRangeLimit = Math.trunc(Math.max(settings.json?.resultLimit || foldingRangeLimitDefault, 0)); - resultLimit = Math.trunc(Math.max(settings.json?.resultLimit || Number.MAX_VALUE, 0)); + const sanitizeLimitSetting = (settingValue: any) => Math.trunc(Math.max(settingValue, 0)); + resultLimit = sanitizeLimitSetting(settings.json?.resultLimit || Number.MAX_VALUE); + jsonFoldingRangeLimit = sanitizeLimitSetting(settings.json?.jsonFoldingLimit || foldingRangeLimitDefault); + jsoncFoldingRangeLimit = sanitizeLimitSetting(settings.json?.jsoncFoldingLimit || foldingRangeLimitDefault); // dynamically enable & disable the formatter if (dynamicFormatterRegistration) { @@ -419,11 +383,10 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment) const document = documents.get(documentSymbolParams.textDocument.uri); if (document) { const jsonDocument = getJSONDocument(document); - const onResultLimitExceeded = limitExceededWarnings.onResultLimitExceeded(document.uri, resultLimit, 'document symbols'); if (hierarchicalDocumentSymbolSupport) { - return languageService.findDocumentSymbols2(document, jsonDocument, { resultLimit, onResultLimitExceeded }); + return languageService.findDocumentSymbols2(document, jsonDocument, { resultLimit }); } else { - return languageService.findDocumentSymbols(document, jsonDocument, { resultLimit, onResultLimitExceeded }); + return languageService.findDocumentSymbols(document, jsonDocument, { resultLimit }); } } return []; @@ -431,6 +394,7 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment) }); function onFormat(textDocument: TextDocumentIdentifier, range: Range | undefined, options: FormattingOptions): TextEdit[] { + options.keepLines = keepLinesEnabled; const document = documents.get(textDocument.uri); if (document) { const edits = languageService.format(document, range ?? getFullRange(document), options); @@ -455,9 +419,9 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment) return runSafeAsync(runtime, async () => { const document = documents.get(params.textDocument.uri); if (document) { - const onResultLimitExceeded = limitExceededWarnings.onResultLimitExceeded(document.uri, resultLimit, 'document colors'); + const jsonDocument = getJSONDocument(document); - return languageService.findDocumentColors(document, jsonDocument, { resultLimit, onResultLimitExceeded }); + return languageService.findDocumentColors(document, jsonDocument, { resultLimit }); } return []; }, [], `Error while computing document colors for ${params.textDocument.uri}`, token); @@ -478,8 +442,8 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment) return runSafe(runtime, () => { const document = documents.get(params.textDocument.uri); if (document) { - const onRangeLimitExceeded = limitExceededWarnings.onResultLimitExceeded(document.uri, foldingRangeLimit, 'folding ranges'); - return languageService.getFoldingRanges(document, { rangeLimit: foldingRangeLimit, onRangeLimitExceeded }); + const rangeLimit = document.languageId === 'jsonc' ? jsoncFoldingRangeLimit : jsonFoldingRangeLimit; + return languageService.getFoldingRanges(document, { rangeLimit }); } return null; }, null, `Error while computing folding ranges for ${params.textDocument.uri}`, token); diff --git a/extensions/json-language-features/server/src/languageModelCache.ts b/extensions/json-language-features/server/src/languageModelCache.ts index 6deac59515e..17ffe2add4f 100644 --- a/extensions/json-language-features/server/src/languageModelCache.ts +++ b/extensions/json-language-features/server/src/languageModelCache.ts @@ -18,10 +18,10 @@ export function getLanguageModelCache(maxEntries: number, cleanupIntervalTime let cleanupInterval: NodeJS.Timer | undefined = undefined; if (cleanupIntervalTimeInSec > 0) { cleanupInterval = setInterval(() => { - let cutoffTime = Date.now() - cleanupIntervalTimeInSec * 1000; - let uris = Object.keys(languageModels); - for (let uri of uris) { - let languageModelInfo = languageModels[uri]; + const cutoffTime = Date.now() - cleanupIntervalTimeInSec * 1000; + const uris = Object.keys(languageModels); + for (const uri of uris) { + const languageModelInfo = languageModels[uri]; if (languageModelInfo.cTime < cutoffTime) { delete languageModels[uri]; nModels--; @@ -32,14 +32,14 @@ export function getLanguageModelCache(maxEntries: number, cleanupIntervalTime return { get(document: TextDocument): T { - let version = document.version; - let languageId = document.languageId; - let languageModelInfo = languageModels[document.uri]; + const version = document.version; + const languageId = document.languageId; + const languageModelInfo = languageModels[document.uri]; if (languageModelInfo && languageModelInfo.version === version && languageModelInfo.languageId === languageId) { languageModelInfo.cTime = Date.now(); return languageModelInfo.languageModel; } - let languageModel = parse(document); + const languageModel = parse(document); languageModels[document.uri] = { languageModel, version, languageId, cTime: Date.now() }; if (!languageModelInfo) { nModels++; @@ -48,8 +48,8 @@ export function getLanguageModelCache(maxEntries: number, cleanupIntervalTime if (nModels === maxEntries) { let oldestTime = Number.MAX_VALUE; let oldestUri = null; - for (let uri in languageModels) { - let languageModelInfo = languageModels[uri]; + for (const uri in languageModels) { + const languageModelInfo = languageModels[uri]; if (languageModelInfo.cTime < oldestTime) { oldestUri = uri; oldestTime = languageModelInfo.cTime; @@ -64,7 +64,7 @@ export function getLanguageModelCache(maxEntries: number, cleanupIntervalTime }, onDocumentRemoved(document: TextDocument) { - let uri = document.uri; + const uri = document.uri; if (languageModels[uri]) { delete languageModels[uri]; nModels--; diff --git a/extensions/json-language-features/server/src/utils/runner.ts b/extensions/json-language-features/server/src/utils/runner.ts index 2d3cfaef51a..f7762f6ff31 100644 --- a/extensions/json-language-features/server/src/utils/runner.ts +++ b/extensions/json-language-features/server/src/utils/runner.ts @@ -8,7 +8,7 @@ import { RuntimeEnvironment } from '../jsonServer'; export function formatError(message: string, err: any): string { if (err instanceof Error) { - let error = err; + const error = err; return `${message}: ${error.message}\n${error.stack}`; } else if (typeof err === 'string') { return `${message}: ${err}`; @@ -47,7 +47,7 @@ export function runSafe(runtime: RuntimeEnvironment, func: () => T, errorV resolve(cancelValue()); } else { try { - let result = func(); + const result = func(); if (token.isCancellationRequested) { resolve(cancelValue()); return; diff --git a/extensions/json-language-features/server/src/utils/strings.ts b/extensions/json-language-features/server/src/utils/strings.ts index 42a617f8a8a..f706b150a18 100644 --- a/extensions/json-language-features/server/src/utils/strings.ts +++ b/extensions/json-language-features/server/src/utils/strings.ts @@ -7,7 +7,7 @@ * Determines if haystack ends with needle. */ export function endsWith(haystack: string, needle: string): boolean { - let diff = haystack.length - needle.length; + const diff = haystack.length - needle.length; if (diff > 0) { return haystack.lastIndexOf(needle) === diff; } else if (diff === 0) { diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock index 83a722965dd..feb920a12d7 100644 --- a/extensions/json-language-features/server/yarn.lock +++ b/extensions/json-language-features/server/yarn.lock @@ -12,68 +12,63 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== -jsonc-parser@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22" - integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA== +jsonc-parser@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76" + integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w== request-light@^0.5.8: version "0.5.8" resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.5.8.tgz#8bf73a07242b9e7b601fac2fa5dc22a094abcc27" integrity sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg== -vscode-json-languageservice@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-5.0.0.tgz#465d76cfe5dfeed4c3d5a2123b50e3f115bb7f78" - integrity sha512-1/+1TJBRFrfCNizmrW0fbIvguKzzO+4ehlqWCCnF7ioSACUGHrYop4ANb+eRnFaCP6fi3+i+llJC5Y5yAvmL6w== +vscode-json-languageservice@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-5.1.1.tgz#d7e36351cf54abc1a5456fe29ae04a6a5f801e88" + integrity sha512-EtAcTD6MOfyf8+MokDsAHNM7ttuZvCo077w9aMtJiyps41gkOcoBThAbXDk6Y0Oi6ki5aDs8lgY4KxYiVW/lxA== dependencies: - jsonc-parser "^3.0.0" - vscode-languageserver-textdocument "^1.0.4" - vscode-languageserver-types "^3.17.1" - vscode-nls "^5.0.1" - vscode-uri "^3.0.3" + jsonc-parser "^3.2.0" + vscode-languageserver-textdocument "^1.0.7" + vscode-languageserver-types "^3.17.2" + vscode-nls "^5.2.0" + vscode-uri "^3.0.6" -vscode-jsonrpc@8.0.2-next.1: - version "8.0.2-next.1" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2-next.1.tgz#6bdc39fd194782032e34047eeefce562941259c6" - integrity sha512-sbbvGSWja7NVBLHPGawtgezc8DHYJaP4qfr/AaJiyDapWcSFtHyPtm18+LnYMLTmB7bhOUW/lf5PeeuLpP6bKA== +vscode-jsonrpc@8.1.0-next.1: + version "8.1.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.1.tgz#7c38cb1cbd968c409522593004fdac845a55b155" + integrity sha512-FiPG+9TuMIga3t+kkalQytwqMtJu1djI+Pq+Ut2tvAJpcNHDJ0PYdjFv5mgEvTEJLujrYwjWHVkNe+XfHPBD/w== -vscode-languageserver-protocol@3.17.2-next.5: - version "3.17.2-next.5" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2-next.5.tgz#9bc747411c3ce9e1d73c2714bf6555e0199eec26" - integrity sha512-UlH+QL4Q4lX94of/UPDDwwWIkd8w7dtMW4khzvEDUoykiG9tba0iG6V0bAiv8XVpnBIUYjL2FNFiL3zl+TY1Sw== +vscode-languageserver-protocol@3.17.3-next.1: + version "3.17.3-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.1.tgz#804880c172b4c48d1a48a91c4c23250121effb19" + integrity sha512-vgjvPE0zox+1Fi4ljsSFJ+B3g8wGNbuAEEdulueVdv+R2VHtc06+dgxhWiG4LKPqXwjPDmiuxCnvd2xk3fzTTw== dependencies: - vscode-jsonrpc "8.0.2-next.1" - vscode-languageserver-types "3.17.2-next.2" + vscode-jsonrpc "8.1.0-next.1" + vscode-languageserver-types "3.17.2" -vscode-languageserver-textdocument@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz#3cd56dd14cec1d09e86c4bb04b09a246cb3df157" - integrity sha512-/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ== +vscode-languageserver-textdocument@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz#16df468d5c2606103c90554ae05f9f3d335b771b" + integrity sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg== -vscode-languageserver-types@3.17.2-next.2: - version "3.17.2-next.2" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2-next.2.tgz#af5d6978eee7682aab87c1419323f5b141ac6596" - integrity sha512-TiAkLABgqkVWdAlC3XlOfdhdjIAdVU4YntPUm9kKGbXr+MGwpVnKz2KZMNBcvG0CFx8Hi8qliL0iq+ndPB720w== +vscode-languageserver-types@3.17.2, vscode-languageserver-types@^3.17.2: + version "3.17.2" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2" + integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA== -vscode-languageserver-types@^3.17.1: - version "3.17.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.1.tgz#c2d87fa7784f8cac389deb3ff1e2d9a7bef07e16" - integrity sha512-K3HqVRPElLZVVPtMeKlsyL9aK0GxGQpvtAUTfX4k7+iJ4mc1M+JM+zQwkgGy2LzY0f0IAafe8MKqIkJrxfGGjQ== - -vscode-languageserver@^8.0.2-next.4: - version "8.0.2-next.4" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.0.2-next.4.tgz#c10cc95be06325b56b7ec1d10271c9e4adf3ef07" - integrity sha512-B3roWH4TmJiB6Zh5+r7zu0QdlLqJsPdGo0LeEi6OiLfrHYCDlcI7DNcQ7F17vWmxC3C82SrxMt/EuLBMpKQM0A== +vscode-languageserver@^8.1.0-next.1: + version "8.1.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.1.0-next.1.tgz#1c173de554889bd18ca6e20eaf4bdc84164c86b4" + integrity sha512-u14Rk4JgXI+7iS6AEXI2pNc1dWh/5JEXtaqa4TeBECKJlN+5242mbGBBPaHMOE7sSI1Kh66XhEMZJhPYjUfjHw== dependencies: - vscode-languageserver-protocol "3.17.2-next.5" + vscode-languageserver-protocol "3.17.3-next.1" -vscode-nls@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.1.tgz#ba23fc4d4420d25e7f886c8e83cbdcec47aa48b2" - integrity sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A== +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== -vscode-uri@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84" - integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA== +vscode-uri@^3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.6.tgz#5e6e2e1a4170543af30151b561a41f71db1d6f91" + integrity sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ== diff --git a/extensions/json-language-features/yarn.lock b/extensions/json-language-features/yarn.lock index 983804a240d..f880319e095 100644 --- a/extensions/json-language-features/yarn.lock +++ b/extensions/json-language-features/yarn.lock @@ -2,33 +2,66 @@ # yarn lockfile v1 +"@microsoft/1ds-core-js@3.2.3", "@microsoft/1ds-core-js@^3.2.3": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.3.tgz#2217d92ec8b073caa4577a13f40ea3a5c4c4d4e7" + integrity sha512-796A8fd90oUKDRO7UXUT9BwZ3G+a9XzJj5v012FcCN/2qRhEsIV3x/0wkx2S08T4FiQEUPkB2uoYHpEjEneM7g== + dependencies: + "@microsoft/applicationinsights-core-js" "2.8.4" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/1ds-post-js@^3.2.3": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.3.tgz#1fa7d51615a44f289632ae8c588007ba943db216" + integrity sha512-tcGJQXXr2LYoBbIXPoUVe1KCF3OtBsuKDFL7BXfmNtuSGtWF0yejm6H83DrR8/cUIGMRMUP9lqNlqFGwDYiwAQ== + dependencies: + "@microsoft/1ds-core-js" "3.2.3" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/applicationinsights-core-js@2.8.4": + version "2.8.4" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.4.tgz#607e531bb241a8920d43960f68a7c76a6f9af596" + integrity sha512-FoA0FNOsFbJnLyTyQlYs6+HR7HMEa6nAOE6WOm9WVejBHMHQ/Bdb+hfVFi6slxwCimr/ner90jchi4/sIYdnyQ== + dependencies: + "@microsoft/applicationinsights-shims" "2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/applicationinsights-shims@2.0.1", "@microsoft/applicationinsights-shims@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.1.tgz#5d72fb7aaf4056c4fda54f9d7c93ccf8ca9bcbfd" + integrity sha512-G0MXf6R6HndRbDy9BbEj0zrLeuhwt2nsXk2zKtF0TnYo39KgYqhYC2ayIzKPTm2KAE+xzD7rgyLdZnrcRvt9WQ== + +"@microsoft/dynamicproto-js@^1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc" + integrity sha512-D1Oivw1A4bIXhzBIy3/BBPn3p2On+kpO2NiYt9shICDK7L/w+cR6FFBUsBZ05l6iqzTeL+Jm8lAYn0g6G7DmDg== + "@types/node@16.x": version "16.11.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== -"@vscode/extension-telemetry@0.5.1": - version "0.5.1" - resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.5.1.tgz#20150976629663b3d33799a4ad25944a1535f7db" - integrity sha512-cvFq8drxdLRF8KN72WcV4lTEa9GqDiRwy9EbnYuoSCD9Jdk8zHFF49MmACC1qs4R9Ko/C1uMOmeLJmVi8EA0rQ== +"@vscode/extension-telemetry@0.6.2": + version "0.6.2" + resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.6.2.tgz#b86814ee680615730da94220c2b03ea9c3c14a8e" + integrity sha512-yb/wxLuaaCRcBAZtDCjNYSisAXz3FWsSqAha5nhHcYxx2ZPdQdWuZqVXGKq0ZpHVndBWWtK6XqtpCN2/HB4S1w== + dependencies: + "@microsoft/1ds-core-js" "^3.2.3" + "@microsoft/1ds-post-js" "^3.2.3" balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== dependencies: balanced-match "^1.0.0" - concat-map "0.0.1" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= lru-cache@^6.0.0: version "6.0.0" @@ -37,56 +70,56 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== +minimatch@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" + integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== dependencies: - brace-expansion "^1.1.7" + brace-expansion "^2.0.1" request-light@^0.5.8: version "0.5.8" resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.5.8.tgz#8bf73a07242b9e7b601fac2fa5dc22a094abcc27" integrity sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg== -semver@^7.3.5: +semver@^7.3.7: version "7.3.7" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== dependencies: lru-cache "^6.0.0" -vscode-jsonrpc@8.0.2-next.1: - version "8.0.2-next.1" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2-next.1.tgz#6bdc39fd194782032e34047eeefce562941259c6" - integrity sha512-sbbvGSWja7NVBLHPGawtgezc8DHYJaP4qfr/AaJiyDapWcSFtHyPtm18+LnYMLTmB7bhOUW/lf5PeeuLpP6bKA== +vscode-jsonrpc@8.1.0-next.1: + version "8.1.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0-next.1.tgz#7c38cb1cbd968c409522593004fdac845a55b155" + integrity sha512-FiPG+9TuMIga3t+kkalQytwqMtJu1djI+Pq+Ut2tvAJpcNHDJ0PYdjFv5mgEvTEJLujrYwjWHVkNe+XfHPBD/w== -vscode-languageclient@^8.0.2-next.4: - version "8.0.2-next.4" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.0.2-next.4.tgz#87dd364ffbd4356aff3af14e7b557d9fe34d2b67" - integrity sha512-j9BEiCYMN9IoKwYdk9iickV6WNPVGPoVO11SMdoxFnWPIT3y5UAe3qf/WsfA9OdklAIaxxYasfgyKCpBjSPNuw== +vscode-languageclient@^8.1.0-next.1: + version "8.1.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.1.0-next.1.tgz#44b63bc2d215c13f1dea1dc54267a354ea5451cb" + integrity sha512-lJraJ8IrqXr83ZciAs4dN32f9kEPuOb/FqAeUTgnW5cAxo0Qux0/EMgKyU33Qf9LdEI0I9iwRVxQWtawbyUUfg== dependencies: - minimatch "^3.0.4" - semver "^7.3.5" - vscode-languageserver-protocol "3.17.2-next.5" + minimatch "^5.1.0" + semver "^7.3.7" + vscode-languageserver-protocol "3.17.3-next.1" -vscode-languageserver-protocol@3.17.2-next.5: - version "3.17.2-next.5" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2-next.5.tgz#9bc747411c3ce9e1d73c2714bf6555e0199eec26" - integrity sha512-UlH+QL4Q4lX94of/UPDDwwWIkd8w7dtMW4khzvEDUoykiG9tba0iG6V0bAiv8XVpnBIUYjL2FNFiL3zl+TY1Sw== +vscode-languageserver-protocol@3.17.3-next.1: + version "3.17.3-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3-next.1.tgz#804880c172b4c48d1a48a91c4c23250121effb19" + integrity sha512-vgjvPE0zox+1Fi4ljsSFJ+B3g8wGNbuAEEdulueVdv+R2VHtc06+dgxhWiG4LKPqXwjPDmiuxCnvd2xk3fzTTw== dependencies: - vscode-jsonrpc "8.0.2-next.1" - vscode-languageserver-types "3.17.2-next.2" + vscode-jsonrpc "8.1.0-next.1" + vscode-languageserver-types "3.17.2" -vscode-languageserver-types@3.17.2-next.2: - version "3.17.2-next.2" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2-next.2.tgz#af5d6978eee7682aab87c1419323f5b141ac6596" - integrity sha512-TiAkLABgqkVWdAlC3XlOfdhdjIAdVU4YntPUm9kKGbXr+MGwpVnKz2KZMNBcvG0CFx8Hi8qliL0iq+ndPB720w== +vscode-languageserver-types@3.17.2: + version "3.17.2" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2" + integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA== -vscode-nls@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.1.tgz#ba23fc4d4420d25e7f886c8e83cbdcec47aa48b2" - integrity sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A== +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== yallist@^4.0.0: version "4.0.0" diff --git a/extensions/json/language-configuration.json b/extensions/json/language-configuration.json index 8f270cd2b24..f9ec3fec781 100644 --- a/extensions/json/language-configuration.json +++ b/extensions/json/language-configuration.json @@ -15,9 +15,8 @@ { "open": "\"", "close": "\"", "notIn": ["string", "comment"] }, { "open": "`", "close": "`", "notIn": ["string", "comment"] } ], - "wordPattern": "(\"(?:[^\\\\\\\"]*(?:\\\\.)?)*\"?)|[^\\s{}\\[\\],:]+", "indentationRules": { - "increaseIndentPattern": "({+(?=([^\"]*\"[^\"]*\")*[^\"}]*$))|(\\[+(?=([^\"]*\"[^\"]*\")*[^\"\\]]*$))", + "increaseIndentPattern": "({+(?=((\\\\.|[^\"\\\\])*\"(\\\\.|[^\"\\\\])*\")*[^\"}]*)$)|(\\[+(?=((\\\\.|[^\"\\\\])*\"(\\\\.|[^\"\\\\])*\")*[^\"\\]]*)$)", "decreaseIndentPattern": "^\\s*[}\\]],?\\s*$" } } diff --git a/extensions/json/package.json b/extensions/json/package.json index 8cb003806d4..ba3b94b8c78 100644 --- a/extensions/json/package.json +++ b/extensions/json/package.json @@ -61,7 +61,8 @@ "filenames": [ "babel.config.json", ".babelrc.json", - ".ember-cli" + ".ember-cli", + "typedoc.json" ], "configuration": "./language-configuration.json" } diff --git a/extensions/latex/cgmanifest.json b/extensions/latex/cgmanifest.json index cb6266c338a..7d36599bab8 100644 --- a/extensions/latex/cgmanifest.json +++ b/extensions/latex/cgmanifest.json @@ -6,11 +6,11 @@ "git": { "name": "jlelong/vscode-latex-basics", "repositoryUrl": "https://github.com/jlelong/vscode-latex-basics", - "commitHash": "8f2c528619535333a2ff12e321fb6f6efcba38e4" + "commitHash": "e02a22742b3e6e0ee088e9c11109950abd7441d0" } }, "license": "MIT", - "version": "1.3.0", + "version": "1.4.0", "description": "The files in syntaxes/ were originally part of https://github.com/James-Yu/LaTeX-Workshop. They have been extracted in the hope that they can useful outside of the LaTeX-Workshop extension.", "licenseDetail": [ "Copyright (c) vscode-latex-basics authors", diff --git a/extensions/latex/syntaxes/LaTeX.tmLanguage.json b/extensions/latex/syntaxes/LaTeX.tmLanguage.json index e2061e78fa2..c2a0f0529f7 100644 --- a/extensions/latex/syntaxes/LaTeX.tmLanguage.json +++ b/extensions/latex/syntaxes/LaTeX.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/jlelong/vscode-latex-basics/commit/8f2c528619535333a2ff12e321fb6f6efcba38e4", + "version": "https://github.com/jlelong/vscode-latex-basics/commit/e02a22742b3e6e0ee088e9c11109950abd7441d0", "name": "LaTeX", "scopeName": "text.tex.latex", "patterns": [ @@ -119,7 +119,7 @@ "1": { "patterns": [ { - "include": "#env-mandatory-arg" + "include": "#begin-env-tokenizer" } ] } @@ -160,12 +160,12 @@ }, "patterns": [ { - "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:cpp|c)\\})", + "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:c|cpp)\\})", "captures": { "1": { "patterns": [ { - "include": "#env-mandatory-arg" + "include": "#begin-env-tokenizer" } ] } @@ -179,12 +179,31 @@ "end": "(\\\\end\\{minted\\})" }, { - "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{css\\})", + "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:asy|asymptote)\\})", "captures": { "1": { "patterns": [ { - "include": "#env-mandatory-arg" + "include": "#begin-env-tokenizer" + } + ] + } + }, + "contentName": "source.asy", + "patterns": [ + { + "include": "source.asy" + } + ], + "end": "(\\\\end\\{minted\\})" + }, + { + "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:css)\\})", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" } ] } @@ -198,12 +217,31 @@ "end": "(\\\\end\\{minted\\})" }, { - "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{html\\})", + "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:hs|haskell)\\})", "captures": { "1": { "patterns": [ { - "include": "#env-mandatory-arg" + "include": "#begin-env-tokenizer" + } + ] + } + }, + "contentName": "source.haskell", + "patterns": [ + { + "include": "source.haskell" + } + ], + "end": "(\\\\end\\{minted\\})" + }, + { + "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:html)\\})", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" } ] } @@ -217,12 +255,31 @@ "end": "(\\\\end\\{minted\\})" }, { - "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{java\\})", + "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:xml)\\})", "captures": { "1": { "patterns": [ { - "include": "#env-mandatory-arg" + "include": "#begin-env-tokenizer" + } + ] + } + }, + "contentName": "text.xml", + "patterns": [ + { + "include": "text.xml" + } + ], + "end": "(\\\\end\\{minted\\})" + }, + { + "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:java)\\})", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" } ] } @@ -235,13 +292,70 @@ ], "end": "(\\\\end\\{minted\\})" }, + { + "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:lua)\\})", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] + } + }, + "contentName": "source.lua", + "patterns": [ + { + "include": "source.lua" + } + ], + "end": "(\\\\end\\{minted\\})" + }, + { + "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:jl|julia)\\})", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] + } + }, + "contentName": "source.julia", + "patterns": [ + { + "include": "source.julia" + } + ], + "end": "(\\\\end\\{minted\\})" + }, + { + "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:rb|ruby)\\})", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] + } + }, + "contentName": "source.ruby", + "patterns": [ + { + "include": "source.ruby" + } + ], + "end": "(\\\\end\\{minted\\})" + }, { "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:js|javascript)\\})", "captures": { "1": { "patterns": [ { - "include": "#env-mandatory-arg" + "include": "#begin-env-tokenizer" } ] } @@ -260,7 +374,7 @@ "1": { "patterns": [ { - "include": "#env-mandatory-arg" + "include": "#begin-env-tokenizer" } ] } @@ -274,31 +388,12 @@ "end": "(\\\\end\\{minted\\})" }, { - "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{lua\\})", + "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:py|python)\\})", "captures": { "1": { "patterns": [ { - "include": "#env-mandatory-arg" - } - ] - } - }, - "contentName": "source.lua", - "patterns": [ - { - "include": "source.lua" - } - ], - "end": "(\\\\end\\{minted\\})" - }, - { - "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:python|py)\\})", - "captures": { - "1": { - "patterns": [ - { - "include": "#env-mandatory-arg" + "include": "#begin-env-tokenizer" } ] } @@ -312,69 +407,12 @@ "end": "(\\\\end\\{minted\\})" }, { - "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(julia)\\})", + "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:yaml)\\})", "captures": { "1": { "patterns": [ { - "include": "#env-mandatory-arg" - } - ] - } - }, - "contentName": "source.julia", - "patterns": [ - { - "include": "source.julia" - } - ], - "end": "(\\\\end\\{minted\\})" - }, - { - "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(ruby)\\})", - "captures": { - "1": { - "patterns": [ - { - "include": "#env-mandatory-arg" - } - ] - } - }, - "contentName": "source.ruby", - "patterns": [ - { - "include": "source.ruby" - } - ], - "end": "(\\\\end\\{minted\\})" - }, - { - "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{xml\\})", - "captures": { - "1": { - "patterns": [ - { - "include": "#env-mandatory-arg" - } - ] - } - }, - "contentName": "text.xml", - "patterns": [ - { - "include": "text.xml" - } - ], - "end": "(\\\\end\\{minted\\})" - }, - { - "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{yaml\\})", - "captures": { - "1": { - "patterns": [ - { - "include": "#env-mandatory-arg" + "include": "#begin-env-tokenizer" } ] } @@ -387,13 +425,32 @@ ], "end": "(\\\\end\\{minted\\})" }, + { + "begin": "(\\\\begin\\{minted\\}(?:\\[.*\\])?\\{(?:rust)\\})", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] + } + }, + "contentName": "source.rust", + "patterns": [ + { + "include": "source.rust" + } + ], + "end": "(\\\\end\\{minted\\})" + }, { "begin": "(\\\\begin\\{(?:lstlisting|minted|pyglist)\\}(?:\\[.*\\])?)", "captures": { "1": { "patterns": [ { - "include": "#env-mandatory-arg" + "include": "#begin-env-tokenizer" } ] } @@ -405,12 +462,12 @@ ] }, { - "begin": "((?:\\s*)\\\\begin\\{(cppcode(?:\\*)?)\\}(?:\\[.*\\])?)", + "begin": "(\\s*\\\\begin\\{((?:cppcode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)", "captures": { "1": { "patterns": [ { - "include": "#code-env" + "include": "#begin-env-tokenizer" } ] } @@ -419,20 +476,17 @@ "patterns": [ { "include": "source.cpp.embedded.latex" - }, - { - "include": "source.cpp" } ], "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)" }, { - "begin": "((?:\\s*)\\\\begin\\{(hscode(?:\\*)?)\\}(?:\\[.*\\])?)", + "begin": "(\\s*\\\\begin\\{((?:hscode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)", "captures": { "1": { "patterns": [ { - "include": "#code-env" + "include": "#begin-env-tokenizer" } ] } @@ -446,12 +500,12 @@ "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)" }, { - "begin": "((?:\\s*)\\\\begin\\{(luacode(?:\\*)?)\\}(?:\\[.*\\])?)", + "begin": "(\\s*\\\\begin\\{((?:luacode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)", "captures": { "1": { "patterns": [ { - "include": "#code-env" + "include": "#begin-env-tokenizer" } ] } @@ -465,12 +519,12 @@ "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)" }, { - "begin": "((?:\\s*)\\\\begin\\{((?:julia|jl)(?:code|verbatim|block|concode|console|converbatim)(?:\\*)?)\\}(?:\\[.*\\])?)", + "begin": "(\\s*\\\\begin\\{((?:jlcode|jlverbatim|jlblock|jlconcode|jlconsole|jlconverbatim)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)", "captures": { "1": { "patterns": [ { - "include": "#code-env" + "include": "#begin-env-tokenizer" } ] } @@ -484,12 +538,31 @@ "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)" }, { - "begin": "((?:\\s*)\\\\begin\\{((?:(?:(?:py|pylab|sympy)(?:code|verbatim|block|concode|console|converbatim))|sageblock|sagesilent|sageverbatim|sageexample|sagecommandline)(?:\\*)?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)", + "begin": "(\\s*\\\\begin\\{((?:juliacode|juliaverbatim|juliablock|juliaconcode|juliaconsole|juliaconverbatim)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)", "captures": { "1": { "patterns": [ { - "include": "#env-mandatory-arg" + "include": "#begin-env-tokenizer" + } + ] + } + }, + "contentName": "source.julia", + "patterns": [ + { + "include": "source.julia" + } + ], + "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)" + }, + { + "begin": "(\\s*\\\\begin\\{((?:sageblock|sagesilent|sageverbatim|sageexample|sagecommandline|python|pythonq|pythonrepl)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" } ] } @@ -503,12 +576,69 @@ "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)" }, { - "begin": "((?:\\s*)\\\\begin\\{(scalacode(?:\\*)?)\\}(?:\\[.*\\])?)", + "begin": "(\\s*\\\\begin\\{((?:pycode|pyverbatim|pyblock|pyconcode|pyconsole|pyconverbatim)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)", "captures": { "1": { "patterns": [ { - "include": "#code-env" + "include": "#begin-env-tokenizer" + } + ] + } + }, + "contentName": "source.python", + "patterns": [ + { + "include": "source.python" + } + ], + "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)" + }, + { + "begin": "(\\s*\\\\begin\\{((?:pylabcode|pylabverbatim|pylabblock|pylabconcode|pylabconsole|pylabconverbatim)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] + } + }, + "contentName": "source.python", + "patterns": [ + { + "include": "source.python" + } + ], + "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)" + }, + { + "begin": "(\\s*\\\\begin\\{((?:sympycode|sympyverbatim|sympyblock|sympyconcode|sympyconsole|sympyconverbatim)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] + } + }, + "contentName": "source.python", + "patterns": [ + { + "include": "source.python" + } + ], + "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)" + }, + { + "begin": "(\\s*\\\\begin\\{((?:scalacode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" } ] } @@ -522,25 +652,12 @@ "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)" }, { - "begin": "((?:\\s*)\\\\begin\\{([a-z]*code(?:\\*)?)\\}(?:\\[.*\\])?)", + "begin": "(\\s*\\\\begin\\{((?:asy|asycode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)", "captures": { "1": { "patterns": [ { - "include": "#code-env" - } - ] - } - }, - "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)" - }, - { - "begin": "((?:\\s*)\\\\begin\\{asy\\}(?:\\[.*\\])?)", - "captures": { - "1": { - "patterns": [ - { - "include": "#code-env" + "include": "#begin-env-tokenizer" } ] } @@ -551,15 +668,15 @@ "include": "source.asymptote" } ], - "end": "(\\\\end\\{asy\\}(?:\\s*\\n)?)" + "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)" }, { - "begin": "((?:\\s*)\\\\begin\\{dot2tex\\}(?:\\[.*\\])?)", + "begin": "(\\s*\\\\begin\\{((?:dot2tex|dotcode)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)", "captures": { "1": { "patterns": [ { - "include": "#code-env" + "include": "#begin-env-tokenizer" } ] } @@ -570,15 +687,15 @@ "include": "source.dot" } ], - "end": "(\\\\end\\{dot2tex\\}(?:\\s*\\n)?)" + "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)" }, { - "begin": "((?:\\s*)\\\\begin\\{gnuplot\\}(?:\\[.*\\])?)", + "begin": "(\\s*\\\\begin\\{((?:gnuplot)\\*?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)", "captures": { "1": { "patterns": [ { - "include": "#code-env" + "include": "#begin-env-tokenizer" } ] } @@ -589,7 +706,20 @@ "include": "source.gnuplot" } ], - "end": "(\\\\end\\{gnuplot\\}(?:\\s*\\n)?)" + "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)" + }, + { + "begin": "((?:\\s*)\\\\begin\\{([a-z]*code(?:\\*)?)\\}(?:\\[.*\\])?(?:\\{.*\\})?)", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] + } + }, + "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)" }, { "begin": "((\\\\)addplot)(?:\\+?)((?:\\[[^\\[]*\\]))*\\s*(gnuplot)\\s*((?:\\[[^\\[]*\\]))*\\s*(\\{)", @@ -639,81 +769,48 @@ "end": "\\s*(\\};)" }, { - "begin": "(?:\\s*)((\\\\)begin)(\\{)((?:fboxv|boxedv|V|v|spv)erbatim\\*?)(\\})", + "begin": "(\\s*\\\\begin\\{((?:fboxv|boxedv|V|v|spv)erbatim\\*?)\\})", "captures": { "1": { - "name": "support.function.be.latex" - }, - "2": { - "name": "punctuation.definition.function.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "4": { - "name": "variable.parameter.function.latex" - }, - "5": { - "name": "punctuation.definition.arguments.end.latex" + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] } }, "contentName": "markup.raw.verbatim.latex", - "end": "((\\\\)end)(\\{)(\\4)(\\})", + "end": "(\\\\end\\{\\2\\})", "name": "meta.function.verbatim.latex" }, { - "begin": "(?:\\s*)((\\\\)begin)(\\{)(VerbatimOut)(\\})(\\{)([^\\}]*)(\\})", + "begin": "(\\s*\\\\begin\\{VerbatimOut\\}\\{[^\\}]*\\})", "captures": { "1": { - "name": "support.function.be.latex" - }, - "2": { - "name": "punctuation.definition.function.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "4": { - "name": "variable.parameter.function.latex" - }, - "5": { - "name": "punctuation.definition.arguments.end.latex" - }, - "6": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "7": { - "name": "support.class.latex" - }, - "8": { - "name": "punctuation.definition.arguments.end.latex" + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] } }, "contentName": "markup.raw.verbatim.latex", - "end": "((\\\\)end)(\\{)(\\VerbatimOut)(\\})", + "end": "(\\\\end\\{\\VerbatimOut\\})", "name": "meta.function.verbatim.latex" }, { - "begin": "(?:\\s*)((\\\\)begin)(\\{)(alltt)(\\})", + "begin": "(\\s*\\\\begin\\{alltt\\})", "captures": { "1": { - "name": "support.function.be.latex" - }, - "2": { - "name": "punctuation.definition.function.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "4": { - "name": "variable.parameter.function.latex" - }, - "5": { - "name": "punctuation.definition.arguments.end.latex" + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] } }, "contentName": "markup.raw.verbatim.latex", - "end": "((\\\\)end)(\\{)(alltt)(\\})", + "end": "(\\\\end\\{alltt\\})", "name": "meta.function.alltt.latex", "patterns": [ { @@ -728,26 +825,18 @@ ] }, { - "begin": "(?:\\s*)((\\\\)begin)(\\{)((?:C|c)omment)(\\})", + "begin": "(\\s*\\\\begin\\{([Cc]omment)\\})", "captures": { "1": { - "name": "support.function.be.latex" - }, - "2": { - "name": "punctuation.definition.function.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "4": { - "name": "variable.parameter.function.latex" - }, - "5": { - "name": "punctuation.definition.arguments.end.latex" + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] } }, "contentName": "punctuation.definition.comment.latex", - "end": "((\\\\)end)(\\{)(\\4)(\\})", + "end": "(\\\\end\\{\\2\\})", "name": "meta.function.verbatim.latex" }, { @@ -772,50 +861,34 @@ "name": "meta.function.link.url.latex" }, { - "captures": { - "1": { - "name": "support.function.be.latex" - }, - "2": { - "name": "punctuation.definition.function.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "4": { - "name": "variable.parameter.function.latex" - }, - "5": { - "name": "punctuation.definition.arguments.end.latex" - } - }, "comment": "These two patterns match the \\begin{document} and \\end{document} commands, so that the environment matching pattern following them will ignore those commands.", - "match": "(?:\\s*)((\\\\)begin)(\\{)(document)(\\})", - "name": "meta.function.begin-document.latex" - }, - { + "match": "(\\s*\\\\begin\\{document\\})", + "name": "meta.function.begin-document.latex", "captures": { "1": { - "name": "support.function.be.latex" - }, - "2": { - "name": "punctuation.definition.function.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "4": { - "name": "variable.parameter.function.latex" - }, - "5": { - "name": "punctuation.definition.arguments.end.latex" + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] } - }, - "match": "(?:\\s*)((\\\\)end)(\\{)(document)(\\})", - "name": "meta.function.end-document.latex" + } }, { - "begin": "(?:\\s*)((\\\\)begin)(\\{)((?:array|equation|(?:IEEE)?eqnarray|multline|align|aligned|alignat|alignedat|flalign|flaligned|flalignat|split|gather|gathered|cases|(?:display)?math|[a-zA-Z]*matrix|(?:(?:arg)?(?:mini|maxi)))(?:\\*|!)?)(\\})(\\s*\\n)?", + "match": "(\\s*\\\\end\\{document\\})", + "name": "meta.function.end-document.latex", + "captures": { + "1": { + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] + } + } + }, + { + "begin": "(?:\\s*)((\\\\)begin)(\\{)((?:\\+?array|equation|(?:IEEE)?eqnarray|multline|align|aligned|alignat|alignedat|flalign|flaligned|flalignat|split|gather|gathered|\\+?cases|(?:display)?math|\\+?[a-zA-Z]*matrix|[pbBvV]?NiceMatrix|[pbBvV]?NiceArray|(?:(?:arg)?(?:mini|maxi)))(?:\\*|!)?)(\\})(\\s*\\n)?", "captures": { "1": { "name": "support.function.be.latex" @@ -862,7 +935,7 @@ "1": { "patterns": [ { - "include": "#env-mandatory-arg" + "include": "#begin-env-tokenizer" } ] } @@ -891,26 +964,18 @@ ] }, { - "begin": "(?:\\s*)((\\\\)begin)(\\{)(tabular[xy*]?|xltabular|longtable|(?:long)?tabu|(?:long|tall)?tblr|NiceTabular[X*]?)(\\})(\\s*\\n)?", + "begin": "(\\s*\\\\begin\\{(tabular[xy*]?|xltabular|longtable|(?:long)?tabu|(?:long|tall)?tblr|NiceTabular[X*]?)\\}(\\s*\\n)?)", "captures": { "1": { - "name": "support.function.be.latex" - }, - "2": { - "name": "punctuation.definition.function.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "4": { - "name": "variable.parameter.function.latex" - }, - "5": { - "name": "punctuation.definition.arguments.end.latex" + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] } }, "contentName": "meta.data.environment.tabular.latex", - "end": "(?:\\s*)((\\\\)end)(\\{)(\\4)(\\})(?:\\s*\\n)?", + "end": "(\\s*\\\\end\\{(\\2)\\}(?:\\s*\\n)?)", "name": "meta.function.environment.tabular.latex", "patterns": [ { @@ -927,25 +992,17 @@ ] }, { - "begin": "(?:\\s*)((\\\\)begin)(\\{)(itemize|enumerate|description|list)(\\})", + "begin": "(\\s*\\\\begin\\{(itemize|enumerate|description|list)\\})", "captures": { "1": { - "name": "support.function.be.latex" - }, - "2": { - "name": "punctuation.definition.function.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "4": { - "name": "variable.parameter.function.latex" - }, - "5": { - "name": "punctuation.definition.arguments.end.latex" + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] } }, - "end": "((\\\\)end)(\\{)(\\4)(\\})(?:\\s*\\n)?", + "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)", "name": "meta.function.environment.list.latex", "patterns": [ { @@ -954,25 +1011,17 @@ ] }, { - "begin": "(?:\\s*)((\\\\)begin)(\\{)(tikzpicture)(\\})", + "begin": "(\\s*\\\\begin\\{tikzpicture\\})", "captures": { "1": { - "name": "support.function.be.latex" - }, - "2": { - "name": "punctuation.definition.function.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "4": { - "name": "variable.parameter.function.latex" - }, - "5": { - "name": "punctuation.definition.arguments.end.latex" + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] } }, - "end": "((\\\\)end)(\\{)(tikzpicture)(\\})(?:\\s*\\n)?", + "end": "(\\\\end\\{tikzpicture\\}(?:\\s*\\n)?)", "name": "meta.function.environment.latex.tikz", "patterns": [ { @@ -981,25 +1030,17 @@ ] }, { - "begin": "(?:\\s*)((\\\\)begin)(\\{)(frame)(\\})", + "begin": "(\\s*\\\\begin\\{frame\\})", "captures": { "1": { - "name": "support.function.be.latex" - }, - "2": { - "name": "punctuation.definition.function.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "4": { - "name": "variable.parameter.function.latex" - }, - "5": { - "name": "punctuation.definition.arguments.end.latex" + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] } }, - "end": "((\\\\)end)(\\{)(frame)(\\})", + "end": "(\\\\end\\{frame\\})", "name": "meta.function.environment.frame.latex", "patterns": [ { @@ -1008,47 +1049,31 @@ ] }, { - "begin": "(?:\\s*)((\\\\)begin)(\\{)(mpost[*]?)(\\})", + "begin": "(\\s*\\\\begin\\{(mpost\\*?)\\})", "captures": { "1": { - "name": "support.function.be.latex" - }, - "2": { - "name": "punctuation.definition.function.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "4": { - "name": "variable.parameter.function.latex" - }, - "5": { - "name": "punctuation.definition.arguments.end.latex" + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] } }, - "end": "((\\\\)end)(\\{)(\\4)(\\})(?:\\s*\\n)?", + "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)", "name": "meta.function.environment.latex.mpost" }, { - "begin": "(?:\\s*)?((\\\\)begin(\\{)(markdown)\\})", + "begin": "(\\s*\\\\begin\\{markdown\\})", "captures": { "1": { - "name": "support.function.be.latex" - }, - "2": { - "name": "punctuation.definition.function.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "4": { - "name": "variable.parameter.function.latex" - }, - "5": { - "name": "punctuation.definition.arguments.end.latex" + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] } }, - "end": "((\\\\)end)(\\{)(markdown)(\\})", + "end": "(\\\\end\\{markdown\\})", "contentName": "meta.embedded.markdown_latex_combined", "patterns": [ { @@ -1057,25 +1082,17 @@ ] }, { - "begin": "(?:\\s*)((\\\\)begin)(\\{)(\\w+[*]?)(\\})", + "begin": "(\\s*\\\\begin\\{(\\w+\\*?)\\})", "captures": { "1": { - "name": "support.function.be.latex" - }, - "2": { - "name": "punctuation.definition.function.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "4": { - "name": "variable.parameter.function.latex" - }, - "5": { - "name": "punctuation.definition.arguments.end.latex" + "patterns": [ + { + "include": "#begin-env-tokenizer" + } + ] } }, - "end": "((\\\\)end)(\\{)(\\4)(\\})(?:\\s*\\n)?", + "end": "(\\\\end\\{\\2\\}(?:\\s*\\n)?)", "name": "meta.function.environment.general.latex", "patterns": [ { @@ -1396,7 +1413,7 @@ ] }, { - "begin": "((\\\\)(?:\\w*[r|R]ef\\*?))(\\{)", + "begin": "((\\\\)(?:\\w*[rR]ef\\*?))(\\{)", "beginCaptures": { "1": { "name": "keyword.control.ref.latex" @@ -1603,7 +1620,7 @@ "name": "punctuation.definition.verb.latex" } }, - "match": "((\\\\)(?:py|pycon|pylab|pylabcon|sympy|sympycon)[cv]?)((?:\\[[^\\[]*?\\])?)(?:(?:([^a-zA-Z\\{])(.*?)(\\4))|(?:(\\{)(.*?)(\\})))", + "match": "((\\\\)(?:(?:py|pycon|pylab|pylabcon|sympy|sympycon)[cv]?|pyq|pycq|pyif))((?:\\[[^\\[]*?\\])?)(?:(?:([^a-zA-Z\\{])(.*?)(\\4))|(?:(\\{)(.*?)(\\})))", "name": "meta.function.verb.latex" }, { @@ -1839,7 +1856,7 @@ } ] }, - "env-mandatory-arg": { + "begin-env-tokenizer": { "captures": { "1": { "name": "support.function.be.latex" @@ -1879,33 +1896,7 @@ "name": "punctuation.definition.arguments.end.latex" } }, - "match": "((\\\\)(?:begin|end))(\\{)([a-z]*)(\\})(?:(\\[)(.*)(\\]))?(?:(\\{)([^{}]*)(\\}))?" - }, - "code-env": { - "captures": { - "1": { - "name": "support.function.be.latex" - }, - "2": { - "name": "punctuation.definition.function.latex" - }, - "3": { - "name": "punctuation.definition.arguments.begin.latex" - }, - "4": { - "name": "variable.parameter.function.latex" - }, - "5": { - "name": "punctuation.definition.arguments.end.latex" - }, - "6": { - "name": "punctuation.definition.arguments.optional.begin.latex" - }, - "7": { - "name": "punctuation.definition.arguments.optional.end.latex" - } - }, - "match": "(?:\\s*)((\\\\)(?:begin|end))(\\{)([a-z]+(?:\\*)?)(\\})(?:(\\[).*(\\]))?" + "match": "\\s*((\\\\)(?:begin|end))(\\{)([a-zA-Z]*\\*?)(\\})(?:(\\[)(.*)(\\]))?(?:(\\{)([^{}]*)(\\}))?" }, "definition-label": { "begin": "((\\\\)label)((?:\\[[^\\[]*?\\])*)(\\{)", diff --git a/extensions/latex/syntaxes/TeX.tmLanguage.json b/extensions/latex/syntaxes/TeX.tmLanguage.json index ff494480295..4e3e4d697b5 100644 --- a/extensions/latex/syntaxes/TeX.tmLanguage.json +++ b/extensions/latex/syntaxes/TeX.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/jlelong/vscode-latex-basics/commit/b98c2d4911652824fc990f4b26c9c30be59b78a2", + "version": "https://github.com/jlelong/vscode-latex-basics/commit/8776a0856846b63d9e5765e8ec42a8a2f4f52219", "name": "TeX", "scopeName": "text.tex", "patterns": [ @@ -167,7 +167,7 @@ "name": "punctuation.math.bracket.pair.tex" }, { - "match": "\\\\(left|right|((big|bigg|Big|Bigg)[lr]?))([\\(\\[\\<\\>\\]\\)\\.\\|]|\\\\[{}|]|\\\\[lr]?[Vv]ert|\\\\[lr]angle|\\\\\\|)", + "match": "\\\\(left|right|((big|bigg|Big|Bigg)[lr]?))([\\(\\[\\<\\>\\]\\)\\.\\|]|\\\\[{}|]|\\\\[lr]?[Vv]ert|\\\\[lr]angle)", "name": "punctuation.math.bracket.pair.big.tex" }, { diff --git a/extensions/latex/syntaxes/cpp-grammar-bailout.tmLanguage.json b/extensions/latex/syntaxes/cpp-grammar-bailout.tmLanguage.json index bf084fd2fd2..a303594f0ae 100644 --- a/extensions/latex/syntaxes/cpp-grammar-bailout.tmLanguage.json +++ b/extensions/latex/syntaxes/cpp-grammar-bailout.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/jlelong/vscode-latex-basics/commit/db888fc191f6b5610cd6866cc49017fc3dfb00b5", + "version": "https://github.com/jlelong/vscode-latex-basics/commit/ffe263692d6096b24e4897650e933c587fa9c55f", "name": "C++", "scopeName": "source.cpp.embedded.latex", "patterns": [ @@ -573,7 +573,7 @@ "name": "comment.block.cpp" }, "builtin_storage_type_initilizer": { - "begin": "(?:\\s)*+(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { @@ -1804,7 +1801,7 @@ ] }, "constructor_root": { - "begin": "\\s*+((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))::((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())", + "begin": "\\s*+((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))::((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())", "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { @@ -2179,7 +2176,7 @@ ] }, "control_flow_keywords": { - "match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\{)", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\{)", "end": "\\}|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "1": { @@ -3126,14 +3123,11 @@ "patterns": [ { "include": "#evaluation_context" - }, - { - "include": "#c_conditional_context" } ] }, "destructor_inline": { - "begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(~(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:consteval)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(~(?|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { @@ -3369,7 +3363,7 @@ ] }, "destructor_root": { - "begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))::((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))~\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())", + "begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)(((?>(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))::((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))~\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())", "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { @@ -3661,7 +3655,7 @@ }, "diagnostic": { "begin": "(^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?((?:error|warning)))\\b(?:(?:\\s)+)?", - "end": "(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?(::))?(?:(?:\\s)+)?((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?(::))?(?:(?:\\s)+)?((?|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { @@ -4525,7 +4519,7 @@ ] }, "function_call": { - "begin": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?(\\()", + "begin": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?(\\()", "end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "1": { @@ -4599,7 +4593,7 @@ ] }, "function_definition": { - "begin": "(?:(?:^|\\G|(?<=;|\\}))|(?<=>))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\()", + "begin": "(?:(?:^|\\G|(?<=;|\\}))|(?<=>))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<60>?)+>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\()", "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { @@ -4671,7 +4665,7 @@ "11": { "patterns": [ { - "match": "((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))", + "match": "((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))", "captures": { "1": { "name": "storage.modifier.$1.cpp" @@ -5162,7 +5156,7 @@ ] }, { - "match": "(?<=^|\\))(?:(?:\\s)+)?(->)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)?(?![\\w<:.]))", + "match": "(?<=^|\\))(?:(?:\\s)+)?(->)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<23>?)+>)?(?![\\w<:.]))", "captures": { "1": { "name": "punctuation.definition.function.return-type.cpp" @@ -5410,7 +5404,7 @@ ] }, "function_pointer": { - "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", "end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "1": { @@ -5761,7 +5755,7 @@ ] }, "function_pointer_parameter": { - "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", "end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "1": { @@ -6112,7 +6106,7 @@ ] }, "functional_specifiers_pre_parameters": { - "match": "(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)", + "match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)", "captures": { "1": { - "name": "keyword.control.goto.cpp" - }, - "2": { "patterns": [ { "include": "#inline_comment" } ] }, - "3": { + "2": { "patterns": [ { "match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))", @@ -6219,7 +6210,44 @@ } ] }, + "3": { + "name": "keyword.control.goto.cpp" + }, "4": { + "patterns": [ + { + "include": "#inline_comment" + } + ] + }, + "5": { + "patterns": [ + { + "match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))", + "captures": { + "1": { + "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" + }, + "2": { + "name": "comment.block.cpp" + }, + "3": { + "patterns": [ + { + "match": "\\*\\/", + "name": "comment.block.cpp punctuation.definition.comment.end.cpp" + }, + { + "match": "\\*", + "name": "comment.block.cpp" + } + ] + } + } + } + ] + }, + "6": { "name": "entity.name.label.call.cpp" } } @@ -6482,7 +6510,7 @@ "name": "storage.type.modifier.virtual.cpp" }, { - "match": "(?<=protected|virtual|private|public|,|:)(?:(?:\\s)+)?(?!(?:(?:(?:protected)|(?:private)|(?:public))|virtual))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)?(?![\\w<:.]))", + "match": "(?<=protected|virtual|private|public|,|:)(?:(?:\\s)+)?(?!(?:(?:(?:protected)|(?:private)|(?:public))|virtual))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)?(?![\\w<:.]))", "captures": { "1": { "name": "meta.qualified_type.cpp", @@ -6680,7 +6708,7 @@ ] }, "inline_builtin_storage_type": { - "match": "(?:\\s)*+(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?line\\b", - "end": "(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?define\\b)(?:(?:\\s)+)?((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:(?:\\s)+)?(?:(?:\\.\\*|\\.)|(?:->\\*|->))(?:(?:\\s)+)?)*)(?:(?:\\s)+)?(\\b(?!uint_least32_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint_least16_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint_least64_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_least32_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_least64_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint_fast32_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint_fast64_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint_least8_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint_fast16_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_least16_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_fast16_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_least8_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint_fast8_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_fast64_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_fast32_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int_fast8_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|suseconds_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|useconds_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|in_addr_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uintmax_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uintmax_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uintmax_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|in_port_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uintptr_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|blksize_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint32_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint64_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|u_quad_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|intmax_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|intmax_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|unsigned[^Pattern.new(\n match: \\/\\w\\/,\n)]|blkcnt_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint16_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|intptr_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|swblk_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|wchar_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|u_short[^Pattern.new(\n match: \\/\\w\\/,\n)]|qaddr_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|caddr_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|daddr_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|fixpt_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|nlink_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|segsz_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|clock_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|ssize_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int16_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int32_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int64_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint8_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int8_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|mode_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|quad_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|ushort[^Pattern.new(\n match: \\/\\w\\/,\n)]|u_long[^Pattern.new(\n match: \\/\\w\\/,\n)]|u_char[^Pattern.new(\n match: \\/\\w\\/,\n)]|double[^Pattern.new(\n match: \\/\\w\\/,\n)]|signed[^Pattern.new(\n match: \\/\\w\\/,\n)]|time_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|size_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|key_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|div_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|ino_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uid_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|gid_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|off_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|pid_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|float[^Pattern.new(\n match: \\/\\w\\/,\n)]|dev_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|u_int[^Pattern.new(\n match: \\/\\w\\/,\n)]|short[^Pattern.new(\n match: \\/\\w\\/,\n)]|bool[^Pattern.new(\n match: \\/\\w\\/,\n)]|id_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|uint[^Pattern.new(\n match: \\/\\w\\/,\n)]|long[^Pattern.new(\n match: \\/\\w\\/,\n)]|char[^Pattern.new(\n match: \\/\\w\\/,\n)]|void[^Pattern.new(\n match: \\/\\w\\/,\n)]|auto[^Pattern.new(\n match: \\/\\w\\/,\n)]|id_t[^Pattern.new(\n match: \\/\\w\\/,\n)]|int[^Pattern.new(\n match: \\/\\w\\/,\n)])(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b(?!\\())", + "match": "(?:((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:(?:\\s)+)?(?:(?:\\.\\*|\\.)|(?:->\\*|->))(?:(?:\\s)+)?)*)(?:(?:\\s)+)?(\\b(?!uint_least16_t[^\\w]|uint_least32_t[^\\w]|uint_least64_t[^\\w]|int_least16_t[^\\w]|int_least32_t[^\\w]|int_least64_t[^\\w]|uint_least8_t[^\\w]|uint_fast16_t[^\\w]|uint_fast32_t[^\\w]|uint_fast64_t[^\\w]|int_least8_t[^\\w]|int_fast16_t[^\\w]|int_fast32_t[^\\w]|int_fast64_t[^\\w]|uint_fast8_t[^\\w]|suseconds_t[^\\w]|int_fast8_t[^\\w]|useconds_t[^\\w]|blksize_t[^\\w]|in_addr_t[^\\w]|in_port_t[^\\w]|uintptr_t[^\\w]|uintmax_t[^\\w]|uintmax_t[^\\w]|uintmax_t[^\\w]|unsigned[^\\w]|u_quad_t[^\\w]|blkcnt_t[^\\w]|uint16_t[^\\w]|uint32_t[^\\w]|uint64_t[^\\w]|intptr_t[^\\w]|intmax_t[^\\w]|intmax_t[^\\w]|wchar_t[^\\w]|u_short[^\\w]|qaddr_t[^\\w]|caddr_t[^\\w]|daddr_t[^\\w]|fixpt_t[^\\w]|nlink_t[^\\w]|segsz_t[^\\w]|swblk_t[^\\w]|clock_t[^\\w]|ssize_t[^\\w]|int16_t[^\\w]|int32_t[^\\w]|int64_t[^\\w]|uint8_t[^\\w]|signed[^\\w]|double[^\\w]|u_char[^\\w]|u_long[^\\w]|ushort[^\\w]|quad_t[^\\w]|mode_t[^\\w]|size_t[^\\w]|time_t[^\\w]|int8_t[^\\w]|short[^\\w]|float[^\\w]|u_int[^\\w]|div_t[^\\w]|dev_t[^\\w]|gid_t[^\\w]|ino_t[^\\w]|key_t[^\\w]|pid_t[^\\w]|off_t[^\\w]|uid_t[^\\w]|auto[^\\w]|void[^\\w]|char[^\\w]|long[^\\w]|bool[^\\w]|uint[^\\w]|id_t[^\\w]|id_t[^\\w]|int[^\\w])(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b(?!\\())", "captures": { "1": { "patterns": [ @@ -7474,7 +7503,7 @@ ] }, "misc_keywords": { - "match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<8>?)+>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<8>?)+>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<4>?)+>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<4>?)+>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(operator)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(?:(?:((?:(?:delete\\[\\])|(?:delete)|(?:new\\[\\])|(?:<=>)|(?:<<=)|(?:new)|(?:>>=)|(?:\\->\\*)|(?:\\/=)|(?:%=)|(?:&=)|(?:>=)|(?:\\|=)|(?:\\+\\+)|(?:\\-\\-)|(?:\\(\\))|(?:\\[\\])|(?:\\->)|(?:\\+\\+)|(?:<<)|(?:>>)|(?:\\-\\-)|(?:<=)|(?:\\^=)|(?:==)|(?:!=)|(?:&&)|(?:\\|\\|)|(?:\\+=)|(?:\\-=)|(?:\\*=)|,|(?:\\+)|(?:\\-)|!|~|(?:\\*)|&|(?:\\*)|(?:\\/)|%|(?:\\+)|(?:\\-)|<|>|&|(?:\\^)|(?:\\|)|=))|((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:\\[\\])?)))|(\"\")((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\<|\\()", + "begin": "(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(operator)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<55>?)+>)(?:\\s)*+)?::)*+)(?:(?:((?:(?:delete\\[\\])|(?:delete)|(?:new\\[\\])|(?:new)|(?:\\->\\*)|(?:<<=)|(?:>>=)|(?:<=>)|(?:\\+\\+)|(?:\\-\\-)|(?:\\(\\))|(?:\\[\\])|(?:\\->)|(?:\\+\\+)|(?:\\-\\-)|(?:<<)|(?:>>)|(?:<=)|(?:>=)|(?:==)|(?:!=)|(?:&&)|(?:\\|\\|)|(?:\\+=)|(?:\\-=)|(?:\\*=)|(?:\\/=)|(?:%=)|(?:&=)|(?:\\^=)|(?:\\|=)|(?:\\+)|(?:\\-)|!|~|(?:\\*)|&|(?:\\*)|(?:\\/)|%|(?:\\+)|(?:\\-)|<|>|&|(?:\\^)|(?:\\|)|=|,))|((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:\\[\\])?)))|(\"\")((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\<|\\()", "end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { @@ -9062,14 +9091,14 @@ }, { "match": "&|\\||\\^|~", - "name": "keyword.operator.cpp" + "name": "keyword.operator.bitwise.cpp" }, { "include": "#assignment_operator" }, { "match": "%|\\*|\\/|-|\\+", - "name": "keyword.operator.cpp" + "name": "keyword.operator.arithmetic.cpp" }, { "include": "#ternary_operator" @@ -9079,7 +9108,7 @@ "over_qualified_types": { "patterns": [ { - "match": "(struct)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\bstruct)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.struct.parameter.cpp" @@ -9408,7 +9437,7 @@ } }, { - "match": "(enum)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\benum)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.enum.parameter.cpp" @@ -9737,7 +9766,7 @@ } }, { - "match": "(union)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\bunion)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.union.parameter.cpp" @@ -10066,7 +10095,7 @@ } }, { - "match": "(class)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\bclass)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.class.parameter.cpp" @@ -10446,7 +10475,7 @@ "include": "#vararg_ellipses" }, { - "match": "((?:((?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)", + "match": "((?:((?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)", "captures": { "1": { "patterns": [ @@ -10768,7 +10797,7 @@ ] }, "parameter_class": { - "match": "(class)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\bclass)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.class.parameter.cpp" @@ -11097,7 +11126,7 @@ } }, "parameter_enum": { - "match": "(enum)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\benum)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.enum.parameter.cpp" @@ -11484,7 +11513,7 @@ "include": "#vararg_ellipses" }, { - "match": "((?:((?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)", + "match": "((?:((?:(?:thread_local)|(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))+)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\s)*+(?(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)", "captures": { "1": { "patterns": [ @@ -11808,7 +11837,7 @@ ] }, "parameter_struct": { - "match": "(struct)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\bstruct)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.struct.parameter.cpp" @@ -12137,7 +12166,7 @@ } }, "parameter_union": { - "match": "(union)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", + "match": "(\\bunion)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:\\[((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?=,|\\)|\\n)", "captures": { "1": { "name": "storage.type.union.parameter.cpp" @@ -12494,7 +12523,7 @@ }, "pragma": { "begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?pragma\\b", - "end": "(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)?(?![\\w<:.])", + "match": "\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)?(?![\\w<:.])", "captures": { "0": { "patterns": [ @@ -13089,7 +13118,7 @@ } }, "scope_resolution": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13111,7 +13140,7 @@ } }, "scope_resolution_function_call": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13133,7 +13162,7 @@ } }, "scope_resolution_function_call_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13171,7 +13200,7 @@ } }, "scope_resolution_function_definition": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13193,7 +13222,7 @@ } }, "scope_resolution_function_definition_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13231,7 +13260,7 @@ } }, "scope_resolution_function_definition_operator_overload": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13253,7 +13282,7 @@ } }, "scope_resolution_function_definition_operator_overload_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13291,7 +13320,7 @@ } }, "scope_resolution_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13329,7 +13358,7 @@ } }, "scope_resolution_namespace_alias": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13351,7 +13380,7 @@ } }, "scope_resolution_namespace_alias_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13389,7 +13418,7 @@ } }, "scope_resolution_namespace_block": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13411,7 +13440,7 @@ } }, "scope_resolution_namespace_block_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13449,7 +13478,7 @@ } }, "scope_resolution_namespace_using": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13471,7 +13500,7 @@ } }, "scope_resolution_namespace_using_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13509,7 +13538,7 @@ } }, "scope_resolution_parameter": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13531,7 +13560,7 @@ } }, "scope_resolution_parameter_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13569,7 +13598,7 @@ } }, "scope_resolution_template_call": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13591,7 +13620,7 @@ } }, "scope_resolution_template_call_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13629,7 +13658,7 @@ } }, "scope_resolution_template_definition": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:\\s)*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -13651,7 +13680,7 @@ } }, "scope_resolution_template_definition_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:\\s)*+)?(::)", "captures": { "1": { "patterns": [ @@ -13693,7 +13722,7 @@ "name": "punctuation.terminator.statement.cpp" }, "simple_type": { - "match": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)?(?![\\w<:.]))(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?", + "match": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)?(?![\\w<:.]))(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?", "captures": { "1": { "name": "meta.qualified_type.cpp", @@ -15207,7 +15236,7 @@ } }, "storage_specifiers": { - "match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)?(?![\\w<:.]))(?:(?:\\s)+)?(\\=)(?:(?:\\s)+)?((?:typename)?)(?:(?:\\s)+)?((?:(?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)?(?![\\w<:.]))|(.*(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)?(?:(?:\\s)+)?(?:(;)|\\n)", + "match": "(using)(?:(?:\\s)+)?(?!namespace)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)?(?![\\w<:.]))(?:(?:\\s)+)?(\\=)(?:(?:\\s)+)?((?:typename)?)(?:(?:\\s)+)?((?:(?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<29>?)+>)?(?![\\w<:.]))|(.*(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)?(?:(?:\\s)+)?(?:(;)|\\n)", "captures": { "1": { "name": "keyword.other.using.directive.cpp" @@ -17593,7 +17616,7 @@ "endCaptures": {}, "patterns": [ { - "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:\\s)*+)?::)*+)?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)?(?![\\w<:.]))(((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", "end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "1": { @@ -18878,7 +18901,7 @@ ] }, "typename": { - "match": "(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<17>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<17>?)+>)?(?![\\w<:.]))", + "match": "(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|__has_include|atomic_cancel|atomic_commit|dynamic_cast|thread_local|synchronized|static_cast|const_cast|co_return|constexpr|consteval|constexpr|constexpr|consteval|protected|namespace|constinit|co_return|noexcept|noexcept|continue|co_await|co_yield|volatile|register|restrict|explicit|volatile|noexcept|template|operator|decltype|typename|requires|co_await|co_yield|reflexpr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|compl|bitor|throw|or_eq|while|catch|break|class|union|const|const|endif|ifdef|undef|error|using|else|goto|case|enum|elif|else|line|this|not|new|xor|and|for|try|asm|or|do|if|if)\\b)(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<17>?)+>)(?:\\s)*+)?::)*+)?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:__has_include)|(?:atomic_cancel)|(?:atomic_commit)|(?:dynamic_cast)|(?:thread_local)|(?:synchronized)|(?:static_cast)|(?:const_cast)|(?:co_return)|(?:constexpr)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:consteval)|(?:protected)|(?:namespace)|(?:constinit)|(?:co_return)|(?:noexcept)|(?:noexcept)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:noexcept)|(?:template)|(?:operator)|(?:decltype)|(?:typename)|(?:requires)|(?:co_await)|(?:co_yield)|(?:reflexpr)|(?:alignof)|(?:alignas)|(?:default)|(?:nullptr)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:sizeof)|(?:delete)|(?:not_eq)|(?:bitand)|(?:and_eq)|(?:xor_eq)|(?:typeid)|(?:switch)|(?:return)|(?:static)|(?:extern)|(?:inline)|(?:friend)|(?:public)|(?:ifndef)|(?:define)|(?:pragma)|(?:export)|(?:import)|(?:module)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:false)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:else)|(?:goto)|(?:case)|(?:NULL)|(?:true)|(?:elif)|(?:else)|(?:line)|(?:this)|(?:not)|(?:new)|(?:xor)|(?:and)|(?:for)|(?:try)|(?:asm)|(?:or)|(?:do)|(?:if)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<17>?)+>)?(?![\\w<:.]))", "captures": { "1": { "name": "storage.modifier.cpp" @@ -19767,7 +19790,7 @@ } }, "using_namespace": { - "begin": "(?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<6>?)+>)(?:\\s)*+)?::)*\\s*+)?((?]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<6>?)+>)(?:\\s)*+)?::)*\\s*+)?((?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n ((?>[^\\s()]+)|\\(\\g*\\))*)(>?) # The url\n [ \\t]* # Optional whitespace\n (?:\n ((\\().+?(\\))) # Match title in parensâ€Ļ\n | ((\").+?(\")) # or in double quotesâ€Ļ\n | ((').+?(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n", + "match": "(?x)\n (\\[)((?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n # The url\n [ \\t]*\n (\n (<)([^<>\\n]*)(>)\n | ((?(?>[^\\s()]+)|\\(\\g*\\))*)\n )\n [ \\t]*\n # The title \n (?:\n ((\\()[^()]*(\\))) # Match title in parensâ€Ļ\n | ((\")[^\"]*(\")) # or in double quotesâ€Ļ\n | ((')[^']*(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n", "name": "meta.link.inline.markdown" }, "link-ref": { @@ -2793,7 +2849,24 @@ "name": "punctuation.definition.link.title.begin.markdown" }, "2": { - "name": "string.other.link.title.markdown" + "name": "string.other.link.title.markdown", + "patterns": [ + { + "include": "#raw" + }, + { + "include": "#bold" + }, + { + "include": "#italic" + }, + { + "include": "#strikethrough" + }, + { + "include": "#image-inline" + } + ] }, "4": { "name": "punctuation.definition.link.title.end.markdown" @@ -2808,7 +2881,7 @@ "name": "punctuation.definition.constant.end.markdown" } }, - "match": "(\\[)((?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])(\\[)([^\\]]*+)(\\])", + "match": "(?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])(\\[)([^\\]]*+)(\\])", "name": "meta.link.reference.markdown" }, "link-ref-literal": { @@ -2829,7 +2902,7 @@ "name": "punctuation.definition.constant.end.markdown" } }, - "match": "(\\[)((?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])[ ]?(\\[)(\\])", + "match": "(?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])[ ]?(\\[)(\\])", "name": "meta.link.reference.literal.markdown" }, "link-ref-shortcut": { @@ -2844,7 +2917,7 @@ "name": "punctuation.definition.link.title.end.markdown" } }, - "match": "(\\[)(\\S+?)(\\])", + "match": "(?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n ((?>[^\\s()]+)|\\(\\g*\\))*)(>?) # The url\n [ \\t]* # Optional whitespace\n (?:\n ((\\().+?(\\))) # Match title in parensâ€Ļ\n | ((\").+?(\")) # or in double quotesâ€Ļ\n | ((').+?(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n", + "match": "(?x)\n (\\[)((?[^\\[\\]\\\\]|\\\\.|\\[\\g*+\\])*+)(\\])\n # Match the link text.\n (\\() # Opening paren for url\n # The url\n [ \\t]*\n (\n (<)([^<>\\n]*)(>)\n | ((?(?>[^\\s()]+)|\\(\\g*\\))*)\n )\n [ \\t]*\n # The title \n (?:\n ((\\()[^()]*(\\))) # Match title in parensâ€Ļ\n | ((\")[^\"]*(\")) # or in double quotesâ€Ļ\n | ((')[^']*(')) # or in single quotes.\n )? # Title is optional\n \\s* # Optional whitespace\n (\\))\n", "name": "meta.link.inline.markdown" }, "link-ref": { @@ -2823,7 +2843,24 @@ "name": "punctuation.definition.link.title.begin.markdown" }, "2": { - "name": "string.other.link.title.markdown" + "name": "string.other.link.title.markdown", + "patterns": [ + { + "include": "#raw" + }, + { + "include": "#bold" + }, + { + "include": "#italic" + }, + { + "include": "#strikethrough" + }, + { + "include": "#image-inline" + } + ] }, "4": { "name": "punctuation.definition.link.title.end.markdown" @@ -2954,7 +2991,7 @@ "name": "punctuation.definition.strikethrough.markdown" } }, - "match": "(~{2,})((?:[^~]|(?!(? = (ctx) => { code { font-size: 1em; + font-family: var(--vscode-editor-font-family); } pre code { - font-family: var(--vscode-editor-font-family); - line-height: 1.357em; white-space: pre-wrap; } @@ -327,7 +392,7 @@ function slugify(text: string): string { .toLowerCase() .replace(/\s+/g, '-') // Replace whitespace with - // allow-any-unicode-next-line - .replace(/[\]\[\!\'\#\$\%\&\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\_\{\|\}\~\`。īŧŒã€īŧ›īŧšīŧŸīŧâ€Ļâ€”ÂˇË‰Â¨â€˜â€™â€œâ€ã€…īŊžâ€–âˆļīŧ‚īŧ‡īŊ€īŊœã€ƒã€”〕〈〉《》「」『』īŧŽã€–〗【】īŧˆīŧ‰īŧģīŧŊīŊ›īŊ]/g, '') // Remove known punctuators + .replace(/[\]\[\!\/\'\"\#\$\%\&\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\{\|\}\~\`。īŧŒã€īŧ›īŧšīŧŸīŧâ€Ļâ€”ÂˇË‰Â¨â€˜â€™â€œâ€ã€…īŊžâ€–âˆļīŧ‚īŧ‡īŊ€īŊœã€ƒã€”〕〈〉《》「」『』īŧŽã€–〗【】īŧˆīŧ‰īŧģīŧŊīŊ›īŊ]/g, '') // Remove known punctuators .replace(/^\-+/, '') // Remove leading - .replace(/\-+$/, '') // Remove trailing - ); diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json index f78e85fa0cb..fbcc7885bef 100644 --- a/extensions/markdown-language-features/package.json +++ b/extensions/markdown-language-features/package.json @@ -6,9 +6,9 @@ "icon": "icon.png", "publisher": "vscode", "license": "MIT", - "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", + "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255", "engines": { - "vscode": "^1.20.0" + "vscode": "^1.70.0" }, "main": "./out/extension", "browser": "./dist/browser/extension", @@ -16,7 +16,6 @@ "Programming Languages" ], "enabledApiProposals": [ - "textEditorDrop", "documentPaste" ], "activationEvents": [ @@ -31,6 +30,8 @@ "onCommand:markdown.api.render", "onCommand:markdown.api.reloadPlugins", "onCommand:markdown.findAllFileReferences", + "onCommand:markdown.editor.insertLinkFromWorkspace", + "onCommand:markdown.editor.insertImageFromWorkspace", "onWebviewPanel:markdown.preview", "onCustomEditor:vscode.markdown.preview.editor" ], @@ -47,7 +48,7 @@ "contributes": { "notebookRenderer": [ { - "id": "markdownItRenderer", + "id": "vscode.markdown-it-renderer", "displayName": "Markdown it renderer", "entrypoint": "./notebook-out/index.js", "mimeTypes": [ @@ -176,6 +177,18 @@ "command": "markdown.findAllFileReferences", "title": "%markdown.findAllFileReferences%", "category": "Markdown" + }, + { + "command": "markdown.editor.insertLinkFromWorkspace", + "title": "%markdown.editor.insertLinkFromWorkspace%", + "category": "Markdown", + "enablement": "editorLangId == markdown" + }, + { + "command": "markdown.editor.insertImageFromWorkspace", + "title": "%markdown.editor.insertImageFromWorkspace%", + "category": "Markdown", + "enablement": "editorLangId == markdown" } ], "menus": { @@ -188,22 +201,22 @@ }, { "command": "markdown.showSource", - "when": "markdownPreviewFocus", + "when": "activeWebviewPanelId == 'markdown.preview' || activeCustomEditorId == 'vscode.markdown.preview.editor'", "group": "navigation" }, { "command": "markdown.preview.refresh", - "when": "markdownPreviewFocus", + "when": "activeWebviewPanelId == 'markdown.preview' || activeCustomEditorId == 'vscode.markdown.preview.editor'", "group": "1_markdown" }, { "command": "markdown.preview.toggleLock", - "when": "markdownPreviewFocus", + "when": "activeWebviewPanelId == 'markdown.preview' || activeCustomEditorId == 'vscode.markdown.preview.editor'", "group": "1_markdown" }, { "command": "markdown.showPreviewSecuritySelector", - "when": "markdownPreviewFocus", + "when": "activeWebviewPanelId == 'markdown.preview' || activeCustomEditorId == 'vscode.markdown.preview.editor'", "group": "1_markdown" } ], @@ -248,7 +261,7 @@ }, { "command": "markdown.showSource", - "when": "markdownPreviewFocus", + "when": "activeWebviewPanelId == 'markdown.preview' || activeCustomEditorId == 'vscode.markdown.preview.editor'", "group": "navigation" }, { @@ -257,11 +270,11 @@ }, { "command": "markdown.showPreviewSecuritySelector", - "when": "markdownPreviewFocus" + "when": "activeWebviewPanelId == 'markdown.preview' || activeCustomEditorId == 'vscode.markdown.preview.editor'" }, { "command": "markdown.preview.toggleLock", - "when": "markdownPreviewFocus" + "when": "activeWebviewPanelId == 'markdown.preview' || activeCustomEditorId == 'vscode.markdown.preview.editor'" }, { "command": "markdown.preview.refresh", @@ -269,7 +282,7 @@ }, { "command": "markdown.preview.refresh", - "when": "markdownPreviewFocus" + "when": "activeWebviewPanelId == 'markdown.preview' || activeCustomEditorId == 'vscode.markdown.preview.editor'" }, { "command": "markdown.findAllFileReferences", @@ -399,16 +412,27 @@ "description": "%configuration.markdown.suggest.paths.enabled.description%", "scope": "resource" }, - "markdown.trace": { + "markdown.trace.extension": { "type": "string", "enum": [ "off", "verbose" ], "default": "off", - "description": "%markdown.trace.desc%", + "description": "%markdown.trace.extension.desc%", "scope": "window" }, + "markdown.trace.server": { + "type": "string", + "scope": "window", + "enum": [ + "off", + "messages", + "verbose" + ], + "default": "off", + "description": "%markdown.trace.server.desc%" + }, "markdown.editor.drop.enabled": { "type": "boolean", "default": true, @@ -419,79 +443,144 @@ "type": "boolean", "scope": "resource", "markdownDescription": "%configuration.markdown.editor.pasteLinks.enabled%", - "default": false, + "default": true, "tags": [ "experimental" ] }, - "markdown.experimental.validate.enabled": { + "markdown.validate.enabled": { "type": "boolean", "scope": "resource", - "description": "%configuration.markdown.experimental.validate.enabled.description%", - "default": false, - "tags": [ - "experimental" - ] + "description": "%configuration.markdown.validate.enabled.description%", + "default": false }, - "markdown.experimental.validate.referenceLinks.enabled": { + "markdown.validate.referenceLinks.enabled": { "type": "string", "scope": "resource", - "markdownDescription": "%configuration.markdown.experimental.validate.referenceLinks.enabled.description%", + "markdownDescription": "%configuration.markdown.validate.referenceLinks.enabled.description%", "default": "warning", "enum": [ "ignore", "warning", "error" - ], - "tags": [ - "experimental" ] }, - "markdown.experimental.validate.headerLinks.enabled": { + "markdown.validate.fragmentLinks.enabled": { "type": "string", "scope": "resource", - "markdownDescription": "%configuration.markdown.experimental.validate.headerLinks.enabled.description%", + "markdownDescription": "%configuration.markdown.validate.fragmentLinks.enabled.description%", "default": "warning", "enum": [ "ignore", "warning", "error" - ], - "tags": [ - "experimental" ] }, - "markdown.experimental.validate.fileLinks.enabled": { + "markdown.validate.fileLinks.enabled": { "type": "string", "scope": "resource", - "markdownDescription": "%configuration.markdown.experimental.validate.fileLinks.enabled.description%", + "markdownDescription": "%configuration.markdown.validate.fileLinks.enabled.description%", "default": "warning", "enum": [ "ignore", "warning", "error" - ], - "tags": [ - "experimental" ] }, - "markdown.experimental.validate.ignoreLinks": { + "markdown.validate.fileLinks.markdownFragmentLinks": { + "type": "string", + "scope": "resource", + "markdownDescription": "%configuration.markdown.validate.fileLinks.markdownFragmentLinks.description%", + "default": "inherit", + "enum": [ + "inherit", + "ignore", + "warning", + "error" + ] + }, + "markdown.validate.ignoredLinks": { "type": "array", "scope": "resource", - "markdownDescription": "%configuration.markdown.experimental.validate.ignoreLinks.description%", + "markdownDescription": "%configuration.markdown.validate.ignoredLinks.description%", "items": { "type": "string" - }, - "tags": [ - "experimental" + } + }, + "markdown.validate.unusedLinkDefinitions.enabled": { + "type": "string", + "scope": "resource", + "markdownDescription": "%configuration.markdown.validate.unusedLinkDefinitions.description%", + "default": "hint", + "enum": [ + "ignore", + "hint", + "warning", + "error" ] + }, + "markdown.validate.duplicateLinkDefinitions.enabled": { + "type": "string", + "scope": "resource", + "markdownDescription": "%configuration.markdown.validate.duplicateLinkDefinitions.description%", + "default": "warning", + "enum": [ + "ignore", + "warning", + "error" + ] + }, + "markdown.updateLinksOnFileMove.enabled": { + "type": "string", + "enum": [ + "prompt", + "always", + "never" + ], + "markdownEnumDescriptions": [ + "%configuration.markdown.updateLinksOnFileMove.enabled.prompt%", + "%configuration.markdown.updateLinksOnFileMove.enabled.always%", + "%configuration.markdown.updateLinksOnFileMove.enabled.never%" + ], + "default": "never", + "markdownDescription": "%configuration.markdown.updateLinksOnFileMove.enabled%", + "scope": "window" + }, + "markdown.updateLinksOnFileMove.include": { + "type": "array", + "markdownDescription": "%configuration.markdown.updateLinksOnFileMove.include%", + "scope": "window", + "items": { + "type": "string", + "description": "%configuration.markdown.updateLinksOnFileMove.include.property%" + }, + "default": [ + "**/*.{md,mkd,mdwn,mdown,markdown,markdn,mdtxt,mdtext,workbook}", + "**/*.{jpg,jpe,jpeg,png,bmp,gif,ico,webp,avif,tiff,svg,mp4}" + ] + }, + "markdown.updateLinksOnFileMove.enableForDirectories": { + "type": "boolean", + "default": true, + "description": "%configuration.markdown.updateLinksOnFileMove.enableForDirectories%", + "scope": "window" + }, + "markdown.occurrencesHighlight.enabled": { + "type": "boolean", + "default": false, + "description": "%configuration.markdown.occurrencesHighlight.enabled%", + "scope": "resource" } } }, "configurationDefaults": { "[markdown]": { "editor.wordWrap": "on", - "editor.quickSuggestions": false + "editor.quickSuggestions": { + "comments": "off", + "strings": "off", + "other": "off" + } } }, "jsonValidation": [ @@ -521,8 +610,8 @@ ] }, "scripts": { - "compile": "gulp compile-extension:markdown-language-features && npm run build-preview && npm run build-notebook", - "watch": "npm run build-preview && gulp watch-extension:markdown-language-features", + "compile": "gulp compile-extension:markdown-language-features-languageService && gulp compile-extension:markdown-language-features-server && gulp compile-extension:markdown-language-features && npm run build-preview && npm run build-notebook", + "watch": "npm run build-preview && gulp watch-extension:markdown-language-features watch-extension:markdown-language-features-languageService watch-extension:markdown-language-features-server", "vscode:prepublish": "npm run build-ext && npm run build-preview", "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:markdown-language-features ./tsconfig.json", "build-notebook": "node ./esbuild-notebook", @@ -531,15 +620,15 @@ "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose" }, "dependencies": { - "@vscode/extension-telemetry": "0.4.10", + "@vscode/extension-telemetry": "0.6.2", "dompurify": "^2.3.3", "highlight.js": "^11.4.0", "markdown-it": "^12.3.2", "markdown-it-front-matter": "^0.2.1", "morphdom": "^2.6.1", "picomatch": "^2.3.1", - "vscode-languageserver-textdocument": "^1.0.4", - "vscode-nls": "^5.0.0", + "vscode-languageclient": "^8.0.2", + "vscode-nls": "^5.2.0", "vscode-uri": "^3.0.3" }, "devDependencies": { @@ -549,7 +638,9 @@ "@types/picomatch": "^2.3.0", "@types/vscode-notebook-renderer": "^1.60.0", "@types/vscode-webview": "^1.57.0", - "lodash.throttle": "^4.1.1" + "lodash.throttle": "^4.1.1", + "vscode-languageserver-types": "^3.17.2", + "vscode-markdown-languageservice": "^0.0.0-alpha.10" }, "repository": { "type": "git", diff --git a/extensions/markdown-language-features/package.nls.json b/extensions/markdown-language-features/package.nls.json index c7c4c6e5c21..92bada66562 100644 --- a/extensions/markdown-language-features/package.nls.json +++ b/extensions/markdown-language-features/package.nls.json @@ -17,23 +17,37 @@ "markdown.showSource.title": "Show Source", "markdown.styles.dec": "A list of URLs or local paths to CSS style sheets to use from the Markdown preview. Relative paths are interpreted relative to the folder open in the Explorer. If there is no open folder, they are interpreted relative to the location of the Markdown file. All '\\' need to be written as '\\\\'.", "markdown.showPreviewSecuritySelector.title": "Change Preview Security Settings", - "markdown.trace.desc": "Enable debug logging for the Markdown extension.", + "markdown.trace.extension.desc": "Enable debug logging for the Markdown extension.", + "markdown.trace.server.desc": "Traces the communication between VS Code and the Markdown language server.", "markdown.preview.refresh.title": "Refresh Preview", "markdown.preview.toggleLock.title": "Toggle Preview Locking", "markdown.findAllFileReferences": "Find File References", + "markdown.editor.insertLinkFromWorkspace": "Insert Link to File in Workspace", + "markdown.editor.insertImageFromWorkspace": "Insert Image from Workspace", "configuration.markdown.preview.openMarkdownLinks.description": "Controls how links to other Markdown files in the Markdown preview should be opened.", "configuration.markdown.preview.openMarkdownLinks.inEditor": "Try to open links in the editor.", "configuration.markdown.preview.openMarkdownLinks.inPreview": "Try to open links in the Markdown preview.", "configuration.markdown.links.openLocation.description": "Controls where links in Markdown files should be opened.", "configuration.markdown.links.openLocation.currentGroup": "Open links in the active editor group.", "configuration.markdown.links.openLocation.beside": "Open links beside the active editor.", - "configuration.markdown.suggest.paths.enabled.description": "Enable/disable path suggestions for markdown links", - "configuration.markdown.editor.drop.enabled": "Enable/disable dropping into the markdown editor to insert shift. Requires enabling `#workbench.experimental.editor.dropIntoEditor.enabled#`.", - "configuration.markdown.editor.pasteLinks.enabled": "Enable/disable pasting files into a Markdown editor inserts Markdown links.", - "configuration.markdown.experimental.validate.enabled.description": "Enable/disable all error reporting in Markdown files.", - "configuration.markdown.experimental.validate.referenceLinks.enabled.description": "Validate reference links in Markdown files, e.g. `[link][ref]`. Requires enabling `#markdown.experimental.validate.enabled#`.", - "configuration.markdown.experimental.validate.headerLinks.enabled.description": "Validate links to headers in Markdown files, e.g. `[link](#header)`. Requires enabling `#markdown.experimental.validate.enabled#`.", - "configuration.markdown.experimental.validate.fileLinks.enabled.description": "Validate links to other files in Markdown files, e.g. `[link](/path/to/file.md)`. This checks that the target files exists. Requires enabling `#markdown.experimental.validate.enabled#`.", - "configuration.markdown.experimental.validate.ignoreLinks.description": "Configure links that should not be validated. For example `/about` would not validate the link `[about](/about)`, while the glob `/assets/**/*.svg` would let you skip validation for any link to `.svg` files under the `assets` directory.", + "configuration.markdown.suggest.paths.enabled.description": "Enable/disable path suggestions while writing links in Markdown files.", + "configuration.markdown.editor.drop.enabled": "Enable/disable dropping files into a Markdown editor by holding down shift. Requires enabling `#editor.dropIntoEditor.enabled#`.", + "configuration.markdown.editor.pasteLinks.enabled": "Enable/disable pasting files into a Markdown editor inserts Markdown links. Requires enabling `#editor.experimental.pasteActions.enabled#`.", + "configuration.markdown.validate.enabled.description": "Enable/disable all error reporting in Markdown files.", + "configuration.markdown.validate.referenceLinks.enabled.description": "Validate reference links in Markdown files, e.g. `[link][ref]`. Requires enabling `#markdown.validate.enabled#`.", + "configuration.markdown.validate.fragmentLinks.enabled.description": "Validate fragment links to headers in the current Markdown file, e.g. `[link](#header)`. Requires enabling `#markdown.validate.enabled#`.", + "configuration.markdown.validate.fileLinks.enabled.description": "Validate links to other files in Markdown files, e.g. `[link](/path/to/file.md)`. This checks that the target files exists. Requires enabling `#markdown.validate.enabled#`.", + "configuration.markdown.validate.fileLinks.markdownFragmentLinks.description": "Validate the fragment part of links to headers in other files in Markdown files, e.g. `[link](/path/to/file.md#header)`. Inherits the setting value from `#markdown.validate.fragmentLinks.enabled#` by default.", + "configuration.markdown.validate.ignoredLinks.description": "Configure links that should not be validated. For example adding `/about` would not validate the link `[about](/about)`, while the glob `/assets/**/*.svg` would let you skip validation for any link to `.svg` files under the `assets` directory.", + "configuration.markdown.validate.unusedLinkDefinitions.description": "Validate link definitions that are unused in the current file.", + "configuration.markdown.validate.duplicateLinkDefinitions.description": "Validate duplicated definitions in the current file.", + "configuration.markdown.updateLinksOnFileMove.enabled": "Try to update links in Markdown files when a file is renamed/moved in the workspace. Use `#markdown.updateLinksOnFileMove.include#` to configure which files trigger link updates.", + "configuration.markdown.updateLinksOnFileMove.enabled.prompt": "Prompt on each file move.", + "configuration.markdown.updateLinksOnFileMove.enabled.always": "Always update links automatically.", + "configuration.markdown.updateLinksOnFileMove.enabled.never": "Never try to update link and don't prompt.", + "configuration.markdown.updateLinksOnFileMove.include": "Glob patterns that specifies which files that trigger automatic link updates. See `#markdown.updateLinksOnFileMove.enabled#` for details about this feature.", + "configuration.markdown.updateLinksOnFileMove.include.property": "The glob pattern to match file paths against. Set to true or false to enable or disable the pattern.", + "configuration.markdown.updateLinksOnFileMove.enableForDirectories": "Enable/disable updating links when a directory is moved or renamed in the workspace.", + "configuration.markdown.occurrencesHighlight.enabled": "Enable/disable highlighting link occurrences in the current document.", "workspaceTrust": "Required for loading styles configured in the workspace." } diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts index 743d3c1c306..174a7d35692 100644 --- a/extensions/markdown-language-features/preview-src/index.ts +++ b/extensions/markdown-language-features/preview-src/index.ts @@ -87,6 +87,10 @@ onceDocumentLoaded(() => { } }); } + + if (typeof settings.settings.selectedLine === 'number') { + marker.onDidChangeTextEditorSelection(settings.settings.selectedLine, documentVersion); + } }); const onUpdateView = (() => { @@ -110,7 +114,6 @@ window.addEventListener('resize', () => { }, true); window.addEventListener('message', async event => { - switch (event.data.type) { case 'onDidChangeTextEditorSelection': if (event.data.source === documentResource) { @@ -235,7 +238,7 @@ document.addEventListener('dblclick', event => { } const offset = event.pageY; - const line = getEditorLineNumberForPageOffset(offset, documentVersion, settings); + const line = getEditorLineNumberForPageOffset(offset, documentVersion); if (typeof line === 'number' && !isNaN(line)) { messaging.postMessage('didClick', { line: Math.floor(line) }); } @@ -284,7 +287,7 @@ window.addEventListener('scroll', throttle(() => { if (scrollDisabledCount > 0) { scrollDisabledCount -= 1; } else { - const line = getEditorLineNumberForPageOffset(window.scrollY, documentVersion, settings); + const line = getEditorLineNumberForPageOffset(window.scrollY, documentVersion); if (typeof line === 'number' && !isNaN(line)) { messaging.postMessage('revealLine', { line }); } diff --git a/extensions/markdown-language-features/preview-src/loading.ts b/extensions/markdown-language-features/preview-src/loading.ts index fea2d653d4d..c6439188766 100644 --- a/extensions/markdown-language-features/preview-src/loading.ts +++ b/extensions/markdown-language-features/preview-src/loading.ts @@ -29,9 +29,7 @@ export class StyleLoadingMonitor { return; } this.finishedLoading = true; - if (this.poster) { - this.poster.postMessage('previewStyleLoadError', { unloadedStyles: this.unloadedStyles }); - } + this.poster?.postMessage('previewStyleLoadError', { unloadedStyles: this.unloadedStyles }); }); } @@ -41,4 +39,4 @@ export class StyleLoadingMonitor { poster.postMessage('previewStyleLoadError', { unloadedStyles: this.unloadedStyles }); } } -} \ No newline at end of file +} diff --git a/extensions/markdown-language-features/preview-src/scroll-sync.ts b/extensions/markdown-language-features/preview-src/scroll-sync.ts index 9694f9bf5e8..e9fc98a269b 100644 --- a/extensions/markdown-language-features/preview-src/scroll-sync.ts +++ b/extensions/markdown-language-features/preview-src/scroll-sync.ts @@ -7,14 +7,6 @@ import { SettingsManager } from './settings'; const codeLineClass = 'code-line'; -function clamp(min: number, max: number, value: number) { - return Math.min(max, Math.max(min, value)); -} - -function clampLine(line: number, lineCount: number) { - return clamp(0, lineCount - 1, line); -} - export interface CodeLineElement { element: HTMLElement; @@ -38,6 +30,8 @@ const getCodeLineElements = (() => { // Fenched code blocks are a special case since the `code-line` can only be marked on // the `` element and not the parent `
        ` element.
 					cachedElements.push({ element: element.parentElement as HTMLElement, line });
+				} else if (element.tagName === 'UL' || element.tagName === 'OL') {
+					// Skip adding list elements since the first child has the same code line (and should be preferred)
 				} else {
 					cachedElements.push({ element: element as HTMLElement, line });
 				}
@@ -149,20 +143,17 @@ export function scrollToRevealSourceLine(line: number, documentVersion: number,
 	window.scroll(window.scrollX, Math.max(1, window.scrollY + scrollTo));
 }
 
-export function getEditorLineNumberForPageOffset(offset: number, documentVersion: number, settingsManager: SettingsManager) {
-	const lineCount = settingsManager.settings?.lineCount ?? 0;
+export function getEditorLineNumberForPageOffset(offset: number, documentVersion: number) {
 	const { previous, next } = getLineElementsAtPageOffset(offset, documentVersion);
 	if (previous) {
 		const previousBounds = getElementBounds(previous);
 		const offsetFromPrevious = (offset - window.scrollY - previousBounds.top);
 		if (next) {
 			const progressBetweenElements = offsetFromPrevious / (getElementBounds(next).top - previousBounds.top);
-			const line = previous.line + progressBetweenElements * (next.line - previous.line);
-			return clampLine(line, lineCount);
+			return previous.line + progressBetweenElements * (next.line - previous.line);
 		} else {
 			const progressWithinElement = offsetFromPrevious / (previousBounds.height);
-			const line = previous.line + progressWithinElement;
-			return clampLine(line, lineCount);
+			return previous.line + progressWithinElement;
 		}
 	}
 	return null;
diff --git a/extensions/markdown-language-features/preview-src/settings.ts b/extensions/markdown-language-features/preview-src/settings.ts
index 1ba5604f90e..1bbe3477f25 100644
--- a/extensions/markdown-language-features/preview-src/settings.ts
+++ b/extensions/markdown-language-features/preview-src/settings.ts
@@ -7,7 +7,8 @@ export interface PreviewSettings {
 	readonly source: string;
 	readonly line?: number;
 	readonly fragment?: string;
-	readonly lineCount: number;
+	readonly selectedLine?: number;
+
 	readonly scrollPreviewWithEditor?: boolean;
 	readonly scrollEditorWithPreview: boolean;
 	readonly disableSecurityWarnings: boolean;
diff --git a/extensions/markdown-language-features/server/.npmignore b/extensions/markdown-language-features/server/.npmignore
new file mode 100644
index 00000000000..bfd4215998c
--- /dev/null
+++ b/extensions/markdown-language-features/server/.npmignore
@@ -0,0 +1,12 @@
+.vscode/
+.github/
+out/test/
+src/
+.eslintrc.js
+.gitignore
+tsconfig*.json
+*.tsbuildinfo
+*.map
+example.cjs
+CODE_OF_CONDUCT.md
+SECURITY.md
\ No newline at end of file
diff --git a/extensions/markdown-language-features/server/.vscode/launch.json b/extensions/markdown-language-features/server/.vscode/launch.json
new file mode 100644
index 00000000000..fd9033bffaa
--- /dev/null
+++ b/extensions/markdown-language-features/server/.vscode/launch.json
@@ -0,0 +1,16 @@
+{
+	"version": "0.1.0",
+	// List of configurations. Add new configurations or edit existing ones.
+	"configurations": [
+		{
+			"name": "Attach",
+			"type": "node",
+			"request": "attach",
+			"port": 7997,
+			"sourceMaps": true,
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/extensions/markdown-language-features/server/.vscode/settings.json b/extensions/markdown-language-features/server/.vscode/settings.json
new file mode 100644
index 00000000000..7a73a41bfdf
--- /dev/null
+++ b/extensions/markdown-language-features/server/.vscode/settings.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/extensions/markdown-language-features/server/.vscode/tasks.json b/extensions/markdown-language-features/server/.vscode/tasks.json
new file mode 100644
index 00000000000..ecc951a7baf
--- /dev/null
+++ b/extensions/markdown-language-features/server/.vscode/tasks.json
@@ -0,0 +1,27 @@
+{
+	"version": "2.0.0",
+	"command": "npm",
+	"args": [
+		"run",
+		"watch"
+	],
+	"isBackground": true,
+	"problemMatcher": "$tsc-watch",
+	"tasks": [
+		{
+			"label": "npm",
+			"type": "shell",
+			"command": "npm",
+			"args": [
+				"run",
+				"watch"
+			],
+			"isBackground": true,
+			"problemMatcher": "$tsc-watch",
+			"group": {
+				"_id": "build",
+				"isDefault": false
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/extensions/markdown-language-features/server/README.md b/extensions/markdown-language-features/server/README.md
new file mode 100644
index 00000000000..1fd38302195
--- /dev/null
+++ b/extensions/markdown-language-features/server/README.md
@@ -0,0 +1,135 @@
+# Markdown Language Server
+
+> **❗ Import** This is still in development. While the language server is being used by VS Code, it has not yet been tested with other clients.
+
+The Markdown language server powers VS Code's built-in markdown support, providing tools for writing and browsing Markdown files. It runs as a separate executable and implements the [language server protocol](https://microsoft.github.io/language-server-protocol/overview).
+
+This server uses the [Markdown Language Service](https://github.com/microsoft/vscode-markdown-languageservice) to implement almost all of the language features. You can use that library if you need a library for working with Markdown instead of a full language server.
+
+
+## Server capabilities
+
+- [Completions](https://microsoft.github.io/language-server-protocol/specification#textDocument_completion) for Markdown links.
+
+- [Folding](https://microsoft.github.io/language-server-protocol/specification#textDocument_foldingRange) of Markdown regions, block elements, and header sections.
+
+- [Smart selection](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_selectionRange) for inline elements, block elements, and header sections.
+
+- [Document Symbols](https://microsoft.github.io/language-server-protocol/specification#textDocument_documentSymbol) for quick navigation to headers in a document.
+
+- [Workspace Symbols](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspace_symbol) for quick navigation to headers in the workspace
+
+- [Document links](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_documentLink) for making Markdown links in a document clickable.
+
+- [Find all references](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_references) to headers and links across all Markdown files in the workspace.
+
+- [Go to definition](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_definition) from links to headers or link definitions.
+
+- [Rename](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_rename) of headers and links across all Markdown files in the workspace.
+
+- Find all references to a file. Uses a custom `markdown/getReferencesToFileInWorkspace` message.
+
+- [Code Actions](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_codeAction)
+
+	- Organize link definitions source action.
+	- Extract link to definition refactoring.
+
+- Updating links when a file is moved / renamed. Uses a custom `markdown/getEditForFileRenames` message.
+
+- [Pull diagnostics (validation)](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_pullDiagnostics) for links.
+
+
+## Client requirements
+
+### Initialization options
+
+The client can send the following initialization options to the server:
+
+- `markdownFileExtensions` Array file extensions that should be considered as Markdown. These should not include the leading `.`. For example: `['md', 'mdown', 'markdown']`.
+
+### Settings
+
+Clients may send a `workspace/didChangeConfiguration` notification to notify the server of settings changes.
+The server supports the following settings:
+
+- `markdown`
+	- `suggest`
+		- `paths`
+			- `enabled` — Enable/disable path suggestions.
+
+	- `occurrencesHighlight`
+		- `enabled` — Enable/disable highlighting of link occurrences.
+
+	- `validate`
+		- `enabled` — Enable/disable all validation.
+		- `referenceLinks`
+			- `enabled` — Enable/disable validation of reference links: `[text][ref]`
+		- `fragmentLinks`
+			- `enabled` — Enable/disable validation of links to fragments in the current files: `[text](#head)`
+		- `fileLinks`
+			- `enabled` — Enable/disable validation of links to file in the workspace.
+			- `markdownFragmentLinks` — Enable/disable validation of links to headers in other Markdown files. Use `inherit` to inherit the `fragmentLinks` setting.
+		- `ignoredLinks` — Array of glob patterns for files that should not be validated.
+		- `unusedLinkDefinitions`
+			- `enabled` — Enable/disable validation of unused link definitions.
+		- `duplicateLinkDefinitions`
+			- `enabled` — Enable/disable validation of duplicated link definitions.
+
+### Custom requests
+
+To support all of the features of the language server, the client needs to implement a few custom request types. The definitions of these request types can be found in [`protocol.ts`](./src/protocol.ts)
+
+#### `markdown/parse`
+
+Get the tokens for a Markdown file. Clients are expected to use [Markdown-it](https://github.com/markdown-it/markdown-it) for this.
+
+We require that clients bring their own version of Markdown-it so that they can customize/extend Markdown-it.
+
+#### `markdown/fs/readFile`
+
+Read the contents of a file in the workspace.
+
+#### `markdown/fs/readDirectory`
+
+Read the contents of a directory in the workspace.
+
+#### `markdown/fs/stat`
+
+Check if a given file/directory exists in the workspace.
+
+#### `markdown/fs/watcher/create`
+
+Create a file watcher. This is needed for diagnostics support.
+
+#### `markdown/fs/watcher/delete`
+
+Delete a previously created file watcher.
+
+#### `markdown/findMarkdownFilesInWorkspace`
+
+Get a list of all markdown files in the workspace.
+
+
+## Contribute
+
+The source code of the Markdown language server can be found in the [VSCode repository](https://github.com/microsoft/vscode) at [extensions/markdown-language-features/server](https://github.com/microsoft/vscode/tree/master/extensions/markdown-language-features/server).
+
+File issues and pull requests in the [VSCode GitHub Issues](https://github.com/microsoft/vscode/issues). See the document [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) on how to build and run from source.
+
+Most of the functionality of the server is located in libraries:
+
+- [vscode-markdown-languageservice](https://github.com/microsoft/vscode-markdown-languageservice) contains the implementation of all features as a reusable library.
+- [vscode-languageserver-node](https://github.com/microsoft/vscode-languageserver-node) contains the implementation of language server for NodeJS.
+
+Help on any of these projects is very welcome.
+
+## Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
+
+## License
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Licensed under the [MIT](https://github.com/microsoft/vscode/blob/master/LICENSE.txt) License.
+
diff --git a/extensions/markdown-language-features/server/extension-browser.webpack.config.js b/extensions/markdown-language-features/server/extension-browser.webpack.config.js
new file mode 100644
index 00000000000..b36d36f936d
--- /dev/null
+++ b/extensions/markdown-language-features/server/extension-browser.webpack.config.js
@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withBrowserDefaults = require('../../shared.webpack.config').browser;
+const path = require('path');
+
+module.exports = withBrowserDefaults({
+	context: __dirname,
+	entry: {
+		extension: './src/browser/main.ts',
+	},
+	output: {
+		filename: 'main.js',
+		path: path.join(__dirname, 'dist', 'browser'),
+		libraryTarget: 'var',
+		library: 'serverExportVar'
+	}
+});
diff --git a/extensions/markdown-language-features/server/extension.webpack.config.js b/extensions/markdown-language-features/server/extension.webpack.config.js
new file mode 100644
index 00000000000..a1917b54dc6
--- /dev/null
+++ b/extensions/markdown-language-features/server/extension.webpack.config.js
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../../shared.webpack.config');
+const path = require('path');
+
+module.exports = withDefaults({
+	context: path.join(__dirname),
+	entry: {
+		extension: './src/node/main.ts',
+	},
+	output: {
+		filename: 'main.js',
+		path: path.join(__dirname, 'dist', 'node'),
+	}
+});
diff --git a/extensions/markdown-language-features/server/package.json b/extensions/markdown-language-features/server/package.json
new file mode 100644
index 00000000000..1de6bdafbfd
--- /dev/null
+++ b/extensions/markdown-language-features/server/package.json
@@ -0,0 +1,32 @@
+{
+  "name": "vscode-markdown-languageserver",
+  "description": "Markdown language server",
+  "version": "0.2.0-alpha.7",
+  "author": "Microsoft Corporation",
+  "license": "MIT",
+  "engines": {
+    "node": "*"
+  },
+  "main": "./out/node/main",
+  "browser": "./dist/browser/main",
+  "files": [
+    "dist/**/*.js",
+    "out/**/*.js"
+  ],
+  "dependencies": {
+    "vscode-languageserver": "^8.0.2",
+    "vscode-languageserver-textdocument": "^1.0.5",
+    "vscode-languageserver-types": "^3.17.1",
+    "vscode-markdown-languageservice": "^0.2.0-alpha.7",
+    "vscode-nls": "^5.2.0",
+    "vscode-uri": "^3.0.3"
+  },
+  "devDependencies": {
+    "@types/node": "16.x"
+  },
+  "scripts": {
+    "compile": "gulp compile-extension:markdown-language-features-server",
+    "prepublishOnly": "npm run compile",
+    "watch": "gulp watch-extension:markdown-language-features-server"
+  }
+}
diff --git a/extensions/markdown-language-features/server/package/README.md b/extensions/markdown-language-features/server/package/README.md
new file mode 100644
index 00000000000..1fd38302195
--- /dev/null
+++ b/extensions/markdown-language-features/server/package/README.md
@@ -0,0 +1,135 @@
+# Markdown Language Server
+
+> **❗ Import** This is still in development. While the language server is being used by VS Code, it has not yet been tested with other clients.
+
+The Markdown language server powers VS Code's built-in markdown support, providing tools for writing and browsing Markdown files. It runs as a separate executable and implements the [language server protocol](https://microsoft.github.io/language-server-protocol/overview).
+
+This server uses the [Markdown Language Service](https://github.com/microsoft/vscode-markdown-languageservice) to implement almost all of the language features. You can use that library if you need a library for working with Markdown instead of a full language server.
+
+
+## Server capabilities
+
+- [Completions](https://microsoft.github.io/language-server-protocol/specification#textDocument_completion) for Markdown links.
+
+- [Folding](https://microsoft.github.io/language-server-protocol/specification#textDocument_foldingRange) of Markdown regions, block elements, and header sections.
+
+- [Smart selection](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_selectionRange) for inline elements, block elements, and header sections.
+
+- [Document Symbols](https://microsoft.github.io/language-server-protocol/specification#textDocument_documentSymbol) for quick navigation to headers in a document.
+
+- [Workspace Symbols](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspace_symbol) for quick navigation to headers in the workspace
+
+- [Document links](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_documentLink) for making Markdown links in a document clickable.
+
+- [Find all references](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_references) to headers and links across all Markdown files in the workspace.
+
+- [Go to definition](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_definition) from links to headers or link definitions.
+
+- [Rename](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_rename) of headers and links across all Markdown files in the workspace.
+
+- Find all references to a file. Uses a custom `markdown/getReferencesToFileInWorkspace` message.
+
+- [Code Actions](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_codeAction)
+
+	- Organize link definitions source action.
+	- Extract link to definition refactoring.
+
+- Updating links when a file is moved / renamed. Uses a custom `markdown/getEditForFileRenames` message.
+
+- [Pull diagnostics (validation)](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_pullDiagnostics) for links.
+
+
+## Client requirements
+
+### Initialization options
+
+The client can send the following initialization options to the server:
+
+- `markdownFileExtensions` Array file extensions that should be considered as Markdown. These should not include the leading `.`. For example: `['md', 'mdown', 'markdown']`.
+
+### Settings
+
+Clients may send a `workspace/didChangeConfiguration` notification to notify the server of settings changes.
+The server supports the following settings:
+
+- `markdown`
+	- `suggest`
+		- `paths`
+			- `enabled` — Enable/disable path suggestions.
+
+	- `occurrencesHighlight`
+		- `enabled` — Enable/disable highlighting of link occurrences.
+
+	- `validate`
+		- `enabled` — Enable/disable all validation.
+		- `referenceLinks`
+			- `enabled` — Enable/disable validation of reference links: `[text][ref]`
+		- `fragmentLinks`
+			- `enabled` — Enable/disable validation of links to fragments in the current files: `[text](#head)`
+		- `fileLinks`
+			- `enabled` — Enable/disable validation of links to file in the workspace.
+			- `markdownFragmentLinks` — Enable/disable validation of links to headers in other Markdown files. Use `inherit` to inherit the `fragmentLinks` setting.
+		- `ignoredLinks` — Array of glob patterns for files that should not be validated.
+		- `unusedLinkDefinitions`
+			- `enabled` — Enable/disable validation of unused link definitions.
+		- `duplicateLinkDefinitions`
+			- `enabled` — Enable/disable validation of duplicated link definitions.
+
+### Custom requests
+
+To support all of the features of the language server, the client needs to implement a few custom request types. The definitions of these request types can be found in [`protocol.ts`](./src/protocol.ts)
+
+#### `markdown/parse`
+
+Get the tokens for a Markdown file. Clients are expected to use [Markdown-it](https://github.com/markdown-it/markdown-it) for this.
+
+We require that clients bring their own version of Markdown-it so that they can customize/extend Markdown-it.
+
+#### `markdown/fs/readFile`
+
+Read the contents of a file in the workspace.
+
+#### `markdown/fs/readDirectory`
+
+Read the contents of a directory in the workspace.
+
+#### `markdown/fs/stat`
+
+Check if a given file/directory exists in the workspace.
+
+#### `markdown/fs/watcher/create`
+
+Create a file watcher. This is needed for diagnostics support.
+
+#### `markdown/fs/watcher/delete`
+
+Delete a previously created file watcher.
+
+#### `markdown/findMarkdownFilesInWorkspace`
+
+Get a list of all markdown files in the workspace.
+
+
+## Contribute
+
+The source code of the Markdown language server can be found in the [VSCode repository](https://github.com/microsoft/vscode) at [extensions/markdown-language-features/server](https://github.com/microsoft/vscode/tree/master/extensions/markdown-language-features/server).
+
+File issues and pull requests in the [VSCode GitHub Issues](https://github.com/microsoft/vscode/issues). See the document [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) on how to build and run from source.
+
+Most of the functionality of the server is located in libraries:
+
+- [vscode-markdown-languageservice](https://github.com/microsoft/vscode-markdown-languageservice) contains the implementation of all features as a reusable library.
+- [vscode-languageserver-node](https://github.com/microsoft/vscode-languageserver-node) contains the implementation of language server for NodeJS.
+
+Help on any of these projects is very welcome.
+
+## Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
+
+## License
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Licensed under the [MIT](https://github.com/microsoft/vscode/blob/master/LICENSE.txt) License.
+
diff --git a/extensions/markdown-language-features/server/package/package.json b/extensions/markdown-language-features/server/package/package.json
new file mode 100644
index 00000000000..c7540437c7d
--- /dev/null
+++ b/extensions/markdown-language-features/server/package/package.json
@@ -0,0 +1,32 @@
+{
+  "name": "vscode-markdown-languageserver",
+  "description": "Markdown language server",
+  "version": "0.2.0-alpha.4",
+  "author": "Microsoft Corporation",
+  "license": "MIT",
+  "engines": {
+    "node": "*"
+  },
+  "main": "./out/node/main",
+  "browser": "./dist/browser/main",
+  "files": [
+    "dist/**/*.js",
+    "out/**/*.js"
+  ],
+  "dependencies": {
+    "vscode-languageserver": "^8.0.2",
+    "vscode-languageserver-textdocument": "^1.0.5",
+    "vscode-languageserver-types": "^3.17.1",
+    "vscode-markdown-languageservice": "^0.2.0-alpha.4",
+    "vscode-nls": "^5.2.0",
+    "vscode-uri": "^3.0.3"
+  },
+  "devDependencies": {
+    "@types/node": "16.x"
+  },
+  "scripts": {
+    "compile": "gulp compile-extension:markdown-language-features-server",
+    "prepublishOnly": "npm run compile",
+    "watch": "gulp watch-extension:markdown-language-features-server"
+  }
+}
diff --git a/extensions/markdown-language-features/server/src/browser/main.ts b/extensions/markdown-language-features/server/src/browser/main.ts
new file mode 100644
index 00000000000..b862a923104
--- /dev/null
+++ b/extensions/markdown-language-features/server/src/browser/main.ts
@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BrowserMessageReader, BrowserMessageWriter, createConnection } from 'vscode-languageserver/browser';
+import { startVsCodeServer } from '../server';
+
+declare let self: any;
+
+const messageReader = new BrowserMessageReader(self);
+const messageWriter = new BrowserMessageWriter(self);
+
+const connection = createConnection(messageReader, messageWriter);
+
+startVsCodeServer(connection);
diff --git a/extensions/markdown-language-features/server/src/config.ts b/extensions/markdown-language-features/server/src/config.ts
new file mode 100644
index 00000000000..5992258b0b6
--- /dev/null
+++ b/extensions/markdown-language-features/server/src/config.ts
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { LsConfiguration } from 'vscode-markdown-languageservice';
+
+export { LsConfiguration };
+
+const defaultConfig: LsConfiguration = {
+	markdownFileExtensions: ['md'],
+	knownLinkedToFileExtensions: [
+		'jpg',
+		'jpeg',
+		'png',
+		'gif',
+		'webp',
+		'bmp',
+		'tiff',
+	],
+	excludePaths: [
+		'**/.*',
+		'**/node_modules/**',
+	]
+};
+
+export function getLsConfiguration(overrides: Partial): LsConfiguration {
+	return {
+		...defaultConfig,
+		...overrides,
+	};
+}
diff --git a/extensions/markdown-language-features/server/src/configuration.ts b/extensions/markdown-language-features/server/src/configuration.ts
new file mode 100644
index 00000000000..c5668003a16
--- /dev/null
+++ b/extensions/markdown-language-features/server/src/configuration.ts
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Connection, Emitter } from 'vscode-languageserver';
+import { Disposable } from './util/dispose';
+
+export type ValidateEnabled = 'ignore' | 'warning' | 'error' | 'hint';
+
+interface Settings {
+	readonly markdown: {
+		readonly occurrencesHighlight: {
+			readonly enabled: boolean;
+		};
+
+		readonly suggest: {
+			readonly paths: {
+				readonly enabled: boolean;
+			};
+		};
+
+		readonly validate: {
+			readonly enabled: true;
+			readonly referenceLinks: {
+				readonly enabled: ValidateEnabled;
+			};
+			readonly fragmentLinks: {
+				readonly enabled: ValidateEnabled;
+			};
+			readonly fileLinks: {
+				readonly enabled: ValidateEnabled;
+				readonly markdownFragmentLinks: ValidateEnabled | 'inherit';
+			};
+			readonly ignoredLinks: readonly string[];
+			readonly unusedLinkDefinitions: {
+				readonly enabled: ValidateEnabled;
+			};
+			readonly duplicateLinkDefinitions: {
+				readonly enabled: ValidateEnabled;
+			};
+		};
+	};
+}
+
+
+export class ConfigurationManager extends Disposable {
+
+	private readonly _onDidChangeConfiguration = this._register(new Emitter());
+	public readonly onDidChangeConfiguration = this._onDidChangeConfiguration.event;
+
+	private _settings?: Settings;
+
+	constructor(connection: Connection) {
+		super();
+
+		// The settings have changed. Is send on server activation as well.
+		this._register(connection.onDidChangeConfiguration((change) => {
+			this._settings = change.settings;
+			this._onDidChangeConfiguration.fire(this._settings!);
+		}));
+	}
+
+	public getSettings(): Settings | undefined {
+		return this._settings;
+	}
+}
diff --git a/extensions/markdown-language-features/server/src/languageFeatures/diagnostics.ts b/extensions/markdown-language-features/server/src/languageFeatures/diagnostics.ts
new file mode 100644
index 00000000000..0f7e6954dbc
--- /dev/null
+++ b/extensions/markdown-language-features/server/src/languageFeatures/diagnostics.ts
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Connection, FullDocumentDiagnosticReport, TextDocuments, UnchangedDocumentDiagnosticReport } from 'vscode-languageserver';
+import * as md from 'vscode-markdown-languageservice';
+import { Disposable } from 'vscode-notebook-renderer/events';
+import { URI } from 'vscode-uri';
+import { ConfigurationManager, ValidateEnabled } from '../configuration';
+import { disposeAll } from '../util/dispose';
+
+const defaultDiagnosticOptions: md.DiagnosticOptions = {
+	validateFileLinks: md.DiagnosticLevel.ignore,
+	validateReferences: md.DiagnosticLevel.ignore,
+	validateFragmentLinks: md.DiagnosticLevel.ignore,
+	validateMarkdownFileLinkFragments: md.DiagnosticLevel.ignore,
+	validateUnusedLinkDefinitions: md.DiagnosticLevel.ignore,
+	validateDuplicateLinkDefinitions: md.DiagnosticLevel.ignore,
+	ignoreLinks: [],
+};
+
+function convertDiagnosticLevel(enabled: ValidateEnabled): md.DiagnosticLevel | undefined {
+	switch (enabled) {
+		case 'error': return md.DiagnosticLevel.error;
+		case 'warning': return md.DiagnosticLevel.warning;
+		case 'ignore': return md.DiagnosticLevel.ignore;
+		case 'hint': return md.DiagnosticLevel.hint;
+		default: return md.DiagnosticLevel.ignore;
+	}
+}
+
+function getDiagnosticsOptions(config: ConfigurationManager): md.DiagnosticOptions {
+	const settings = config.getSettings();
+	if (!settings) {
+		return defaultDiagnosticOptions;
+	}
+
+	const validateFragmentLinks = convertDiagnosticLevel(settings.markdown.validate.fragmentLinks.enabled);
+	return {
+		validateFileLinks: convertDiagnosticLevel(settings.markdown.validate.fileLinks.enabled),
+		validateReferences: convertDiagnosticLevel(settings.markdown.validate.referenceLinks.enabled),
+		validateFragmentLinks: convertDiagnosticLevel(settings.markdown.validate.fragmentLinks.enabled),
+		validateMarkdownFileLinkFragments: settings.markdown.validate.fileLinks.markdownFragmentLinks === 'inherit' ? validateFragmentLinks : convertDiagnosticLevel(settings.markdown.validate.fileLinks.markdownFragmentLinks),
+		validateUnusedLinkDefinitions: convertDiagnosticLevel(settings.markdown.validate.unusedLinkDefinitions.enabled),
+		validateDuplicateLinkDefinitions: convertDiagnosticLevel(settings.markdown.validate.duplicateLinkDefinitions.enabled),
+		ignoreLinks: settings.markdown.validate.ignoredLinks,
+	};
+}
+
+export function registerValidateSupport(
+	connection: Connection,
+	workspace: md.IWorkspace,
+	documents: TextDocuments,
+	ls: md.IMdLanguageService,
+	config: ConfigurationManager,
+	logger: md.ILogger,
+): Disposable {
+	let diagnosticOptions: md.DiagnosticOptions = defaultDiagnosticOptions;
+	function updateDiagnosticsSetting(): void {
+		diagnosticOptions = getDiagnosticsOptions(config);
+	}
+
+	const subs: Disposable[] = [];
+	const manager = ls.createPullDiagnosticsManager();
+	subs.push(manager);
+
+	subs.push(manager.onLinkedToFileChanged(() => {
+		// TODO: We only need to refresh certain files
+		connection.languages.diagnostics.refresh();
+	}));
+
+	const emptyDiagnosticsResponse = Object.freeze({ kind: 'full', items: [] });
+
+	connection.languages.diagnostics.on(async (params, token): Promise => {
+		logger.log(md.LogLevel.Trace, 'Server: connection.languages.diagnostics.on', params.textDocument.uri);
+
+		if (!config.getSettings()?.markdown.validate.enabled) {
+			return emptyDiagnosticsResponse;
+		}
+
+		const uri = URI.parse(params.textDocument.uri);
+		if (!workspace.hasMarkdownDocument(uri)) {
+			return emptyDiagnosticsResponse;
+		}
+
+		const document = await workspace.openMarkdownDocument(uri);
+		if (!document) {
+			return emptyDiagnosticsResponse;
+		}
+
+		const diagnostics = await manager.computeDiagnostics(document, diagnosticOptions, token);
+		return {
+			kind: 'full',
+			items: diagnostics,
+		};
+	});
+
+	updateDiagnosticsSetting();
+	subs.push(config.onDidChangeConfiguration(() => {
+		updateDiagnosticsSetting();
+		connection.languages.diagnostics.refresh();
+	}));
+
+	subs.push(documents.onDidClose(e => {
+		manager.disposeDocumentResources(URI.parse(e.document.uri));
+	}));
+
+	return {
+		dispose: () => {
+			disposeAll(subs);
+		}
+	};
+}
diff --git a/extensions/markdown-language-features/server/src/logging.ts b/extensions/markdown-language-features/server/src/logging.ts
new file mode 100644
index 00000000000..2fc08c25b7a
--- /dev/null
+++ b/extensions/markdown-language-features/server/src/logging.ts
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ILogger, LogLevel } from 'vscode-markdown-languageservice';
+
+export class LogFunctionLogger implements ILogger {
+
+	private static now(): string {
+		const now = new Date();
+		return String(now.getUTCHours()).padStart(2, '0')
+			+ ':' + String(now.getMinutes()).padStart(2, '0')
+			+ ':' + String(now.getUTCSeconds()).padStart(2, '0') + '.' + String(now.getMilliseconds()).padStart(3, '0');
+	}
+
+	private static data2String(data: any): string {
+		if (data instanceof Error) {
+			if (typeof data.stack === 'string') {
+				return data.stack;
+			}
+			return data.message;
+		}
+		if (typeof data === 'string') {
+			return data;
+		}
+		return JSON.stringify(data, undefined, 2);
+	}
+
+	constructor(
+		private readonly _logFn: typeof console.log
+	) { }
+
+
+	public log(level: LogLevel, title: string, message: string, data?: any): void {
+		this.appendLine(`[${level} ${LogFunctionLogger.now()}] ${title}: ${message}`);
+		if (data) {
+			this.appendLine(LogFunctionLogger.data2String(data));
+		}
+	}
+
+	private appendLine(value: string): void {
+		this._logFn(value);
+	}
+}
+
+export const consoleLogger = new LogFunctionLogger(console.log);
diff --git a/extensions/markdown-language-features/server/src/node/main.ts b/extensions/markdown-language-features/server/src/node/main.ts
new file mode 100644
index 00000000000..7945d44acf6
--- /dev/null
+++ b/extensions/markdown-language-features/server/src/node/main.ts
@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Connection, createConnection } from 'vscode-languageserver/node';
+import { startVsCodeServer } from '../server';
+
+// Create a connection for the server.
+const connection: Connection = createConnection();
+
+console.log = connection.console.log.bind(connection.console);
+console.error = connection.console.error.bind(connection.console);
+
+process.on('unhandledRejection', (e: any) => {
+	connection.console.error(`Unhandled exception ${e}`);
+});
+
+startVsCodeServer(connection);
diff --git a/extensions/markdown-language-features/server/src/protocol.ts b/extensions/markdown-language-features/server/src/protocol.ts
new file mode 100644
index 00000000000..e1dc9aee785
--- /dev/null
+++ b/extensions/markdown-language-features/server/src/protocol.ts
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { FileRename, RequestType } from 'vscode-languageserver';
+import type * as lsp from 'vscode-languageserver-types';
+import type * as md from 'vscode-markdown-languageservice';
+
+//#region From server
+export const parse = new RequestType<{ uri: string }, md.Token[], any>('markdown/parse');
+
+export const fs_readFile = new RequestType<{ uri: string }, number[], any>('markdown/fs/readFile');
+export const fs_readDirectory = new RequestType<{ uri: string }, [string, { isDirectory: boolean }][], any>('markdown/fs/readDirectory');
+export const fs_stat = new RequestType<{ uri: string }, { isDirectory: boolean } | undefined, any>('markdown/fs/stat');
+
+export const fs_watcher_create = new RequestType<{ id: number; uri: string; options: md.FileWatcherOptions; watchParentDirs: boolean }, void, any>('markdown/fs/watcher/create');
+export const fs_watcher_delete = new RequestType<{ id: number }, void, any>('markdown/fs/watcher/delete');
+
+export const findMarkdownFilesInWorkspace = new RequestType<{}, string[], any>('markdown/findMarkdownFilesInWorkspace');
+//#endregion
+
+//#region To server
+export const getReferencesToFileInWorkspace = new RequestType<{ uri: string }, lsp.Location[], any>('markdown/getReferencesToFileInWorkspace');
+export const getEditForFileRenames = new RequestType('markdown/getEditForFileRenames');
+
+export const fs_watcher_onChange = new RequestType<{ id: number; uri: string; kind: 'create' | 'change' | 'delete' }, void, any>('markdown/fs/watcher/onChange');
+
+export const resolveLinkTarget = new RequestType<{ linkText: string; uri: string }, md.ResolvedDocumentLinkTarget, any>('markdown/resolveLinkTarget');
+//#endregion
diff --git a/extensions/markdown-language-features/server/src/server.ts b/extensions/markdown-language-features/server/src/server.ts
new file mode 100644
index 00000000000..a9dbfe940f3
--- /dev/null
+++ b/extensions/markdown-language-features/server/src/server.ts
@@ -0,0 +1,324 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationToken, Connection, InitializeParams, InitializeResult, NotebookDocuments, ResponseError, TextDocuments } from 'vscode-languageserver';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+import * as lsp from 'vscode-languageserver-types';
+import * as md from 'vscode-markdown-languageservice';
+import * as nls from 'vscode-nls';
+import { URI } from 'vscode-uri';
+import { getLsConfiguration, LsConfiguration } from './config';
+import { ConfigurationManager } from './configuration';
+import { registerValidateSupport } from './languageFeatures/diagnostics';
+import { LogFunctionLogger } from './logging';
+import * as protocol from './protocol';
+import { IDisposable } from './util/dispose';
+import { VsCodeClientWorkspace } from './workspace';
+
+const localize = nls.loadMessageBundle();
+
+interface MdServerInitializationOptions extends LsConfiguration { }
+
+const organizeLinkDefKind = 'source.organizeLinkDefinitions';
+
+export async function startVsCodeServer(connection: Connection) {
+	const logger = new LogFunctionLogger(connection.console.log.bind(connection.console));
+
+	const parser = new class implements md.IMdParser {
+		slugifier = md.githubSlugifier;
+
+		tokenize(document: md.ITextDocument): Promise {
+			return connection.sendRequest(protocol.parse, { uri: document.uri.toString() });
+		}
+	};
+
+	const documents = new TextDocuments(TextDocument);
+	const notebooks = new NotebookDocuments(documents);
+
+	const workspaceFactory: WorkspaceFactory = ({ connection, config, workspaceFolders }) => {
+		const workspace = new VsCodeClientWorkspace(connection, config, documents, notebooks, logger);
+		workspace.workspaceFolders = (workspaceFolders ?? []).map(x => URI.parse(x.uri));
+		return workspace;
+	};
+
+	return startServer(connection, { documents, notebooks, logger, parser, workspaceFactory });
+}
+
+type WorkspaceFactory = (config: {
+	connection: Connection;
+	config: LsConfiguration;
+	workspaceFolders?: lsp.WorkspaceFolder[] | null;
+}) => md.IWorkspace;
+
+export async function startServer(connection: Connection, serverConfig: {
+	documents: TextDocuments;
+	notebooks?: NotebookDocuments;
+	logger: md.ILogger;
+	parser: md.IMdParser;
+	workspaceFactory: WorkspaceFactory;
+}) {
+	const { documents, notebooks } = serverConfig;
+
+	let mdLs: md.IMdLanguageService | undefined;
+
+	connection.onInitialize((params: InitializeParams): InitializeResult => {
+		const initOptions = params.initializationOptions as MdServerInitializationOptions | undefined;
+		const config = getLsConfiguration(initOptions ?? {});
+
+		const configurationManager = new ConfigurationManager(connection);
+
+		const workspace = serverConfig.workspaceFactory({ connection, config, workspaceFolders: params.workspaceFolders });
+		mdLs = md.createLanguageService({
+			workspace,
+			parser: serverConfig.parser,
+			logger: serverConfig.logger,
+			markdownFileExtensions: config.markdownFileExtensions,
+			excludePaths: config.excludePaths,
+		});
+
+		registerCompletionsSupport(connection, documents, mdLs, configurationManager);
+		registerDocumentHightlightSupport(connection, documents, mdLs, configurationManager);
+		registerValidateSupport(connection, workspace, documents, mdLs, configurationManager, serverConfig.logger);
+
+		return {
+			capabilities: {
+				diagnosticProvider: {
+					documentSelector: null,
+					identifier: 'markdown',
+					interFileDependencies: true,
+					workspaceDiagnostics: false,
+				},
+				codeActionProvider: { resolveProvider: true },
+				completionProvider: { triggerCharacters: ['.', '/', '#'] },
+				definitionProvider: true,
+				documentLinkProvider: { resolveProvider: true },
+				documentHighlightProvider: true,
+				documentSymbolProvider: true,
+				foldingRangeProvider: true,
+				referencesProvider: true,
+				renameProvider: { prepareProvider: true, },
+				selectionRangeProvider: true,
+				workspaceSymbolProvider: true,
+				workspace: {
+					workspaceFolders: {
+						supported: true,
+						changeNotifications: true,
+					},
+				}
+			}
+		};
+	});
+
+	connection.onDocumentLinks(async (params, token): Promise => {
+		const document = documents.get(params.textDocument.uri);
+		if (!document) {
+			return [];
+		}
+		return mdLs!.getDocumentLinks(document, token);
+	});
+
+	connection.onDocumentLinkResolve(async (link, token): Promise => {
+		return mdLs!.resolveDocumentLink(link, token);
+	});
+
+	connection.onDocumentSymbol(async (params, token): Promise => {
+		const document = documents.get(params.textDocument.uri);
+		if (!document) {
+			return [];
+		}
+		return mdLs!.getDocumentSymbols(document, { includeLinkDefinitions: true }, token);
+	});
+
+	connection.onFoldingRanges(async (params, token): Promise => {
+		const document = documents.get(params.textDocument.uri);
+		if (!document) {
+			return [];
+		}
+		return mdLs!.getFoldingRanges(document, token);
+	});
+
+	connection.onSelectionRanges(async (params, token): Promise => {
+		const document = documents.get(params.textDocument.uri);
+		if (!document) {
+			return [];
+		}
+		return mdLs!.getSelectionRanges(document, params.positions, token);
+	});
+
+	connection.onWorkspaceSymbol(async (params, token): Promise => {
+		return mdLs!.getWorkspaceSymbols(params.query, token);
+	});
+
+	connection.onReferences(async (params, token): Promise => {
+		const document = documents.get(params.textDocument.uri);
+		if (!document) {
+			return [];
+		}
+		return mdLs!.getReferences(document, params.position, params.context, token);
+	});
+
+	connection.onDefinition(async (params, token): Promise => {
+		const document = documents.get(params.textDocument.uri);
+		if (!document) {
+			return undefined;
+		}
+		return mdLs!.getDefinition(document, params.position, token);
+	});
+
+	connection.onPrepareRename(async (params, token) => {
+		const document = documents.get(params.textDocument.uri);
+		if (!document) {
+			return undefined;
+		}
+
+		try {
+			return await mdLs!.prepareRename(document, params.position, token);
+		} catch (e) {
+			if (e instanceof md.RenameNotSupportedAtLocationError) {
+				throw new ResponseError(0, e.message);
+			} else {
+				throw e;
+			}
+		}
+	});
+
+	connection.onRenameRequest(async (params, token) => {
+		const document = documents.get(params.textDocument.uri);
+		if (!document) {
+			return undefined;
+		}
+		return mdLs!.getRenameEdit(document, params.position, params.newName, token);
+	});
+
+	interface OrganizeLinkActionData {
+		readonly uri: string;
+	}
+
+	connection.onCodeAction(async (params, token) => {
+		const document = documents.get(params.textDocument.uri);
+		if (!document) {
+			return undefined;
+		}
+
+		if (params.context.only?.some(kind => kind === 'source' || kind.startsWith('source.'))) {
+			const action: lsp.CodeAction = {
+				title: localize('organizeLinkDefAction.title', "Organize link definitions"),
+				kind: organizeLinkDefKind,
+				data: { uri: document.uri }
+			};
+			return [action];
+		}
+
+		return mdLs!.getCodeActions(document, params.range, params.context, token);
+	});
+
+	connection.onCodeActionResolve(async (codeAction, token) => {
+		if (codeAction.kind === organizeLinkDefKind) {
+			const data = codeAction.data as OrganizeLinkActionData;
+			const document = documents.get(data.uri);
+			if (!document) {
+				return codeAction;
+			}
+
+			const edits = (await mdLs?.organizeLinkDefinitions(document, { removeUnused: true }, token)) || [];
+			codeAction.edit = {
+				changes: {
+					[data.uri]: edits
+				}
+			};
+			return codeAction;
+		}
+
+		return codeAction;
+	});
+
+	connection.onRequest(protocol.getReferencesToFileInWorkspace, (async (params: { uri: string }, token: CancellationToken) => {
+		return mdLs!.getFileReferences(URI.parse(params.uri), token);
+	}));
+
+	connection.onRequest(protocol.getEditForFileRenames, (async (params, token: CancellationToken) => {
+		const result = await mdLs!.getRenameFilesInWorkspaceEdit(params.map(x => ({ oldUri: URI.parse(x.oldUri), newUri: URI.parse(x.newUri) })), token);
+		if (!result) {
+			return result;
+		}
+
+		return {
+			edit: result.edit,
+			participatingRenames: result.participatingRenames.map(rename => ({ oldUri: rename.oldUri.toString(), newUri: rename.newUri.toString() }))
+		};
+	}));
+
+	connection.onRequest(protocol.resolveLinkTarget, (async (params, token: CancellationToken) => {
+		return mdLs!.resolveLinkTarget(params.linkText, URI.parse(params.uri), token);
+	}));
+
+	documents.listen(connection);
+	notebooks?.listen(connection);
+	connection.listen();
+}
+
+
+function registerCompletionsSupport(
+	connection: Connection,
+	documents: TextDocuments,
+	ls: md.IMdLanguageService,
+	config: ConfigurationManager,
+): IDisposable {
+	// let registration: Promise | undefined;
+	function update() {
+		// TODO: client still makes the request in this case. Figure our how to properly unregister.
+		return;
+		// const settings = config.getSettings();
+		// if (settings?.markdown.suggest.paths.enabled) {
+		// 	if (!registration) {
+		// 		registration = connection.client.register(CompletionRequest.type);
+		// 	}
+		// } else {
+		// 	registration?.then(x => x.dispose());
+		// 	registration = undefined;
+		// }
+	}
+
+	connection.onCompletion(async (params, token): Promise => {
+		try {
+			const settings = config.getSettings();
+			if (!settings?.markdown.suggest.paths.enabled) {
+				return [];
+			}
+
+			const document = documents.get(params.textDocument.uri);
+			if (document) {
+				return await ls.getCompletionItems(document, params.position, params.context!, token);
+			}
+		} catch (e) {
+			console.error(e.stack);
+		}
+		return [];
+	});
+
+	update();
+	return config.onDidChangeConfiguration(() => update());
+}
+
+function registerDocumentHightlightSupport(
+	connection: Connection,
+	documents: TextDocuments,
+	mdLs: md.IMdLanguageService,
+	configurationManager: ConfigurationManager
+) {
+	connection.onDocumentHighlight(async (params, token) => {
+		const settings = configurationManager.getSettings();
+		if (!settings?.markdown.occurrencesHighlight.enabled) {
+			return undefined;
+		}
+
+		const document = documents.get(params.textDocument.uri);
+		if (!document) {
+			return undefined;
+		}
+
+		return mdLs!.getDocumentHighlights(document, params.position, token);
+	});
+}
diff --git a/extensions/vscode-custom-editor-tests/src/dispose.ts b/extensions/markdown-language-features/server/src/util/dispose.ts
similarity index 58%
rename from extensions/vscode-custom-editor-tests/src/dispose.ts
rename to extensions/markdown-language-features/server/src/util/dispose.ts
index 548094c28e5..2e9d8dc6a14 100644
--- a/extensions/vscode-custom-editor-tests/src/dispose.ts
+++ b/extensions/markdown-language-features/server/src/util/dispose.ts
@@ -3,21 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
+export function disposeAll(disposables: Iterable) {
+	const errors: any[] = [];
 
-export function disposeAll(disposables: vscode.Disposable[]) {
-	while (disposables.length) {
-		const item = disposables.pop();
-		if (item) {
-			item.dispose();
+	for (const disposable of disposables) {
+		try {
+			disposable.dispose();
+		} catch (e) {
+			errors.push(e);
 		}
 	}
+
+	if (errors.length === 1) {
+		throw errors[0];
+	} else if (errors.length > 1) {
+		throw new AggregateError(errors, 'Encountered errors while disposing of store');
+	}
+}
+
+export interface IDisposable {
+	dispose(): void;
 }
 
 export abstract class Disposable {
 	private _isDisposed = false;
 
-	protected _disposables: vscode.Disposable[] = [];
+	protected _disposables: IDisposable[] = [];
 
 	public dispose(): any {
 		if (this._isDisposed) {
@@ -27,7 +38,7 @@ export abstract class Disposable {
 		disposeAll(this._disposables);
 	}
 
-	protected _register(value: T): T {
+	protected _register(value: T): T {
 		if (this._isDisposed) {
 			value.dispose();
 		} else {
@@ -39,4 +50,5 @@ export abstract class Disposable {
 	protected get isDisposed() {
 		return this._isDisposed;
 	}
-}
\ No newline at end of file
+}
+
diff --git a/extensions/markdown-language-features/server/src/util/file.ts b/extensions/markdown-language-features/server/src/util/file.ts
new file mode 100644
index 00000000000..10e95bf5dcf
--- /dev/null
+++ b/extensions/markdown-language-features/server/src/util/file.ts
@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TextDocument } from 'vscode-languageserver-textdocument';
+import { URI, Utils } from 'vscode-uri';
+import { LsConfiguration } from '../config';
+
+export function looksLikeMarkdownPath(config: LsConfiguration, resolvedHrefPath: URI) {
+	return config.markdownFileExtensions.includes(Utils.extname(resolvedHrefPath).toLowerCase().replace('.', ''));
+}
+
+export function isMarkdownFile(document: TextDocument) {
+	return document.languageId === 'markdown';
+}
diff --git a/extensions/markdown-language-features/src/util/limiter.ts b/extensions/markdown-language-features/server/src/util/limiter.ts
similarity index 100%
rename from extensions/markdown-language-features/src/util/limiter.ts
rename to extensions/markdown-language-features/server/src/util/limiter.ts
diff --git a/extensions/markdown-language-features/server/src/util/resourceMap.ts b/extensions/markdown-language-features/server/src/util/resourceMap.ts
new file mode 100644
index 00000000000..7cec9d661d3
--- /dev/null
+++ b/extensions/markdown-language-features/server/src/util/resourceMap.ts
@@ -0,0 +1,69 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from 'vscode-uri';
+
+
+type ResourceToKey = (uri: URI) => string;
+
+const defaultResourceToKey = (resource: URI): string => resource.toString();
+
+export class ResourceMap {
+
+	private readonly map = new Map();
+
+	private readonly toKey: ResourceToKey;
+
+	constructor(toKey: ResourceToKey = defaultResourceToKey) {
+		this.toKey = toKey;
+	}
+
+	public set(uri: URI, value: T): this {
+		this.map.set(this.toKey(uri), { uri, value });
+		return this;
+	}
+
+	public get(resource: URI): T | undefined {
+		return this.map.get(this.toKey(resource))?.value;
+	}
+
+	public has(resource: URI): boolean {
+		return this.map.has(this.toKey(resource));
+	}
+
+	public get size(): number {
+		return this.map.size;
+	}
+
+	public clear(): void {
+		this.map.clear();
+	}
+
+	public delete(resource: URI): boolean {
+		return this.map.delete(this.toKey(resource));
+	}
+
+	public *values(): IterableIterator {
+		for (const entry of this.map.values()) {
+			yield entry.value;
+		}
+	}
+
+	public *keys(): IterableIterator {
+		for (const entry of this.map.values()) {
+			yield entry.uri;
+		}
+	}
+
+	public *entries(): IterableIterator<[URI, T]> {
+		for (const entry of this.map.values()) {
+			yield [entry.uri, entry.value];
+		}
+	}
+
+	public [Symbol.iterator](): IterableIterator<[URI, T]> {
+		return this.entries();
+	}
+}
diff --git a/extensions/markdown-language-features/server/src/util/schemes.ts b/extensions/markdown-language-features/server/src/util/schemes.ts
new file mode 100644
index 00000000000..67b75e0a0d6
--- /dev/null
+++ b/extensions/markdown-language-features/server/src/util/schemes.ts
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export const Schemes = Object.freeze({
+	notebookCell: 'vscode-notebook-cell',
+});
diff --git a/extensions/markdown-language-features/server/src/workspace.ts b/extensions/markdown-language-features/server/src/workspace.ts
new file mode 100644
index 00000000000..a41329fe7a8
--- /dev/null
+++ b/extensions/markdown-language-features/server/src/workspace.ts
@@ -0,0 +1,413 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Connection, Emitter, FileChangeType, NotebookDocuments, Position, Range, TextDocuments } from 'vscode-languageserver';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+import * as md from 'vscode-markdown-languageservice';
+import { ContainingDocumentContext, FileWatcherOptions, IFileSystemWatcher } from 'vscode-markdown-languageservice/out/workspace';
+import { URI } from 'vscode-uri';
+import { LsConfiguration } from './config';
+import * as protocol from './protocol';
+import { isMarkdownFile, looksLikeMarkdownPath } from './util/file';
+import { Limiter } from './util/limiter';
+import { ResourceMap } from './util/resourceMap';
+import { Schemes } from './util/schemes';
+
+declare const TextDecoder: any;
+
+class VsCodeDocument implements md.ITextDocument {
+
+	private inMemoryDoc?: TextDocument;
+	private onDiskDoc?: TextDocument;
+
+	readonly uri: string;
+
+	constructor(uri: string, init: { inMemoryDoc: TextDocument });
+	constructor(uri: string, init: { onDiskDoc: TextDocument });
+	constructor(uri: string, init: { inMemoryDoc?: TextDocument; onDiskDoc?: TextDocument }) {
+		this.uri = uri;
+		this.inMemoryDoc = init?.inMemoryDoc;
+		this.onDiskDoc = init?.onDiskDoc;
+	}
+
+	get version(): number {
+		return this.inMemoryDoc?.version ?? this.onDiskDoc?.version ?? 0;
+	}
+
+	get lineCount(): number {
+		return this.inMemoryDoc?.lineCount ?? this.onDiskDoc?.lineCount ?? 0;
+	}
+
+	getText(range?: Range): string {
+		if (this.inMemoryDoc) {
+			return this.inMemoryDoc.getText(range);
+		}
+
+		if (this.onDiskDoc) {
+			return this.onDiskDoc.getText(range);
+		}
+
+		throw new Error('Document has been closed');
+	}
+
+	positionAt(offset: number): Position {
+		if (this.inMemoryDoc) {
+			return this.inMemoryDoc.positionAt(offset);
+		}
+
+		if (this.onDiskDoc) {
+			return this.onDiskDoc.positionAt(offset);
+		}
+
+		throw new Error('Document has been closed');
+	}
+
+	hasInMemoryDoc(): boolean {
+		return !this.inMemoryDoc;
+	}
+
+	isDetached(): boolean {
+		return !this.onDiskDoc && !this.inMemoryDoc;
+	}
+
+	setInMemoryDoc(doc: TextDocument | undefined) {
+		this.inMemoryDoc = doc;
+	}
+
+	setOnDiskDoc(doc: TextDocument | undefined) {
+		this.onDiskDoc = doc;
+	}
+}
+
+export class VsCodeClientWorkspace implements md.IWorkspaceWithWatching {
+
+	private readonly _onDidCreateMarkdownDocument = new Emitter();
+	public readonly onDidCreateMarkdownDocument = this._onDidCreateMarkdownDocument.event;
+
+	private readonly _onDidChangeMarkdownDocument = new Emitter();
+	public readonly onDidChangeMarkdownDocument = this._onDidChangeMarkdownDocument.event;
+
+	private readonly _onDidDeleteMarkdownDocument = new Emitter();
+	public readonly onDidDeleteMarkdownDocument = this._onDidDeleteMarkdownDocument.event;
+
+	private readonly _documentCache = new ResourceMap();
+
+	private readonly _utf8Decoder = new TextDecoder('utf-8');
+
+	private _watcherPool = 0;
+	private readonly _watchers = new Map;
+		readonly onDidCreate: Emitter;
+		readonly onDidDelete: Emitter;
+	}>();
+
+	constructor(
+		private readonly connection: Connection,
+		private readonly config: LsConfiguration,
+		private readonly documents: TextDocuments,
+		private readonly notebooks: NotebookDocuments,
+		private readonly logger: md.ILogger,
+	) {
+		documents.onDidOpen(e => {
+			if (!this.isRelevantMarkdownDocument(e.document)) {
+				return;
+			}
+
+			this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace: TextDocument.onDidOpen', `${e.document.uri}`);
+
+			const uri = URI.parse(e.document.uri);
+			const doc = this._documentCache.get(uri);
+
+			if (doc) {
+				// File already existed on disk
+				doc.setInMemoryDoc(e.document);
+
+				// The content visible to the language service may have changed since the in-memory doc
+				// may differ from the one on-disk. To be safe we always fire a change event.
+				this._onDidChangeMarkdownDocument.fire(doc);
+			} else {
+				// We're creating the file for the first time
+				const doc = new VsCodeDocument(e.document.uri, { inMemoryDoc: e.document });
+				this._documentCache.set(uri, doc);
+				this._onDidCreateMarkdownDocument.fire(doc);
+			}
+		});
+
+		documents.onDidChangeContent(e => {
+			if (!this.isRelevantMarkdownDocument(e.document)) {
+				return;
+			}
+
+			this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace: TextDocument.onDidChanceContent', `${e.document.uri}`);
+
+			const uri = URI.parse(e.document.uri);
+			const entry = this._documentCache.get(uri);
+			if (entry) {
+				entry.setInMemoryDoc(e.document);
+				this._onDidChangeMarkdownDocument.fire(entry);
+			}
+		});
+
+		documents.onDidClose(async e => {
+			if (!this.isRelevantMarkdownDocument(e.document)) {
+				return;
+			}
+
+			this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace: TextDocument.onDidClose', `${e.document.uri}`);
+
+			const uri = URI.parse(e.document.uri);
+			const doc = this._documentCache.get(uri);
+			if (!doc) {
+				// Document was never opened
+				return;
+			}
+
+			doc.setInMemoryDoc(undefined);
+			if (doc.isDetached()) {
+				// The document has been fully closed
+				this.doDeleteDocument(uri);
+				return;
+			}
+
+			// Check that if file has been deleted on disk.
+			// This can happen when directories are renamed / moved. VS Code's file system watcher does not
+			// notify us when this happens.
+			if (await this.stat(uri) === undefined) {
+				if (this._documentCache.get(uri) === doc && !doc.hasInMemoryDoc()) {
+					this.doDeleteDocument(uri);
+					return;
+				}
+			}
+
+			// The document still exists on disk
+			// To be safe, tell the service that the document has changed because the
+			// in-memory doc contents may be different than the disk doc contents.
+			this._onDidChangeMarkdownDocument.fire(doc);
+		});
+
+		connection.onDidChangeWatchedFiles(async ({ changes }) => {
+			for (const change of changes) {
+				const resource = URI.parse(change.uri);
+				this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace: onDidChangeWatchedFiles', `${change.type}: ${resource}`);
+				switch (change.type) {
+					case FileChangeType.Changed: {
+						const entry = this._documentCache.get(resource);
+						if (entry) {
+							// Refresh the on-disk state
+							const document = await this.openMarkdownDocumentFromFs(resource);
+							if (document) {
+								this._onDidChangeMarkdownDocument.fire(document);
+							}
+						}
+						break;
+					}
+					case FileChangeType.Created: {
+						const entry = this._documentCache.get(resource);
+						if (entry) {
+							// Create or update the on-disk state
+							const document = await this.openMarkdownDocumentFromFs(resource);
+							if (document) {
+								this._onDidCreateMarkdownDocument.fire(document);
+							}
+						}
+						break;
+					}
+					case FileChangeType.Deleted: {
+						const entry = this._documentCache.get(resource);
+						if (entry) {
+							entry.setOnDiskDoc(undefined);
+							if (entry.isDetached()) {
+								this.doDeleteDocument(resource);
+							}
+						}
+						break;
+					}
+				}
+			}
+		});
+
+		connection.onRequest(protocol.fs_watcher_onChange, params => {
+			this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace: fs_watcher_onChange', `${params.kind}: ${params.uri}`);
+
+			const watcher = this._watchers.get(params.id);
+			if (!watcher) {
+				return;
+			}
+
+			switch (params.kind) {
+				case 'create': watcher.onDidCreate.fire(URI.parse(params.uri)); return;
+				case 'change': watcher.onDidChange.fire(URI.parse(params.uri)); return;
+				case 'delete': watcher.onDidDelete.fire(URI.parse(params.uri)); return;
+			}
+		});
+	}
+
+	public listen() {
+		this.connection.workspace.onDidChangeWorkspaceFolders(async () => {
+			this.workspaceFolders = (await this.connection.workspace.getWorkspaceFolders() ?? []).map(x => URI.parse(x.uri));
+		});
+	}
+
+	private _workspaceFolders: readonly URI[] = [];
+
+	get workspaceFolders(): readonly URI[] {
+		return this._workspaceFolders;
+	}
+
+	set workspaceFolders(value: readonly URI[]) {
+		this._workspaceFolders = value;
+	}
+
+	async getAllMarkdownDocuments(): Promise> {
+		// Add opened files (such as untitled files)
+		const openTextDocumentResults = this.documents.all()
+			.filter(doc => this.isRelevantMarkdownDocument(doc));
+
+		const allDocs = new ResourceMap();
+		for (const doc of openTextDocumentResults) {
+			allDocs.set(URI.parse(doc.uri), doc);
+		}
+
+		// And then add files on disk
+		const maxConcurrent = 20;
+		const limiter = new Limiter(maxConcurrent);
+		const resources = await this.connection.sendRequest(protocol.findMarkdownFilesInWorkspace, {});
+		await Promise.all(resources.map(strResource => {
+			return limiter.queue(async () => {
+				const resource = URI.parse(strResource);
+				if (allDocs.has(resource)) {
+					return;
+				}
+
+				const doc = await this.openMarkdownDocument(resource);
+				if (doc) {
+					allDocs.set(resource, doc);
+				}
+				return doc;
+			});
+		}));
+
+		return allDocs.values();
+	}
+
+	hasMarkdownDocument(resource: URI): boolean {
+		return !!this.documents.get(resource.toString());
+	}
+
+	async openMarkdownDocument(resource: URI): Promise {
+		const existing = this._documentCache.get(resource);
+		if (existing) {
+			return existing;
+		}
+
+		const matchingDocument = this.documents.get(resource.toString());
+		if (matchingDocument) {
+			let entry = this._documentCache.get(resource);
+			if (entry) {
+				entry.setInMemoryDoc(matchingDocument);
+			} else {
+				entry = new VsCodeDocument(resource.toString(), { inMemoryDoc: matchingDocument });
+				this._documentCache.set(resource, entry);
+			}
+
+			return entry;
+		}
+
+		return this.openMarkdownDocumentFromFs(resource);
+	}
+
+	private async openMarkdownDocumentFromFs(resource: URI): Promise {
+		if (!looksLikeMarkdownPath(this.config, resource)) {
+			return undefined;
+		}
+
+		try {
+			const response = await this.connection.sendRequest(protocol.fs_readFile, { uri: resource.toString() });
+			// TODO: LSP doesn't seem to handle Array buffers well
+			const bytes = new Uint8Array(response);
+
+			// We assume that markdown is in UTF-8
+			const text = this._utf8Decoder.decode(bytes);
+			const doc = new VsCodeDocument(resource.toString(), {
+				onDiskDoc: TextDocument.create(resource.toString(), 'markdown', 0, text)
+			});
+			this._documentCache.set(resource, doc);
+			return doc;
+		} catch (e) {
+			return undefined;
+		}
+	}
+
+	async stat(resource: URI): Promise {
+		this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace: stat', `${resource}`);
+		if (this._documentCache.has(resource) || this.documents.get(resource.toString())) {
+			return { isDirectory: false };
+		}
+		return this.connection.sendRequest(protocol.fs_stat, { uri: resource.toString() });
+	}
+
+	async readDirectory(resource: URI): Promise<[string, md.FileStat][]> {
+		this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace: readDir', `${resource}`);
+		return this.connection.sendRequest(protocol.fs_readDirectory, { uri: resource.toString() });
+	}
+
+	getContainingDocument(resource: URI): ContainingDocumentContext | undefined {
+		if (resource.scheme === Schemes.notebookCell) {
+			const nb = this.notebooks.findNotebookDocumentForCell(resource.toString());
+			if (nb) {
+				return {
+					uri: URI.parse(nb.uri),
+					children: nb.cells.map(cell => ({ uri: URI.parse(cell.document) })),
+				};
+			}
+		}
+		return undefined;
+	}
+
+	watchFile(resource: URI, options: FileWatcherOptions): IFileSystemWatcher {
+		const id = this._watcherPool++;
+		this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace: watchFile', `(${id}) ${resource}`);
+
+		const entry = {
+			resource,
+			options,
+			onDidCreate: new Emitter(),
+			onDidChange: new Emitter(),
+			onDidDelete: new Emitter(),
+		};
+		this._watchers.set(id, entry);
+
+		this.connection.sendRequest(protocol.fs_watcher_create, {
+			id,
+			uri: resource.toString(),
+			options,
+			watchParentDirs: true,
+		});
+
+		return {
+			onDidCreate: entry.onDidCreate.event,
+			onDidChange: entry.onDidChange.event,
+			onDidDelete: entry.onDidDelete.event,
+			dispose: () => {
+				this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace: disposeWatcher', `(${id}) ${resource}`);
+				this.connection.sendRequest(protocol.fs_watcher_delete, { id });
+				this._watchers.delete(id);
+			}
+		};
+	}
+
+	private isRelevantMarkdownDocument(doc: TextDocument) {
+		return isMarkdownFile(doc) && URI.parse(doc.uri).scheme !== 'vscode-bulkeditpreview';
+	}
+
+	private doDeleteDocument(uri: URI) {
+		this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace: deleteDocument', `${uri}`);
+
+		this._documentCache.delete(uri);
+		this._onDidDeleteMarkdownDocument.fire(uri);
+	}
+}
diff --git a/extensions/markdown-language-features/server/tsconfig.json b/extensions/markdown-language-features/server/tsconfig.json
new file mode 100644
index 00000000000..8b4aedde27d
--- /dev/null
+++ b/extensions/markdown-language-features/server/tsconfig.json
@@ -0,0 +1,9 @@
+{
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"outDir": "./out"
+	},
+	"include": [
+		"src/**/*"
+	]
+}
diff --git a/extensions/markdown-language-features/server/yarn.lock b/extensions/markdown-language-features/server/yarn.lock
new file mode 100644
index 00000000000..e47bcdc3504
--- /dev/null
+++ b/extensions/markdown-language-features/server/yarn.lock
@@ -0,0 +1,64 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/node@16.x":
+  version "16.11.59"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.59.tgz#823f238b9063ccc3b3b7f13186f143a57926c4f6"
+  integrity sha512-6u+36Dj3aDzhfBVUf/mfmc92OEdzQ2kx2jcXGdigfl70E/neV21ZHE6UCz4MDzTRcVqGAM27fk+DLXvyDsn3Jw==
+
+picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
+vscode-jsonrpc@8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz#f239ed2cd6004021b6550af9fd9d3e47eee3cac9"
+  integrity sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ==
+
+vscode-languageserver-protocol@3.17.2:
+  version "3.17.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz#beaa46aea06ed061576586c5e11368a9afc1d378"
+  integrity sha512-8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg==
+  dependencies:
+    vscode-jsonrpc "8.0.2"
+    vscode-languageserver-types "3.17.2"
+
+vscode-languageserver-textdocument@^1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz#16df468d5c2606103c90554ae05f9f3d335b771b"
+  integrity sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg==
+
+vscode-languageserver-types@3.17.2, vscode-languageserver-types@^3.17.1:
+  version "3.17.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2"
+  integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==
+
+vscode-languageserver@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.0.2.tgz#cfe2f0996d9dfd40d3854e786b2821604dfec06d"
+  integrity sha512-bpEt2ggPxKzsAOZlXmCJ50bV7VrxwCS5BI4+egUmure/oI/t4OlFzi/YNtVvY24A2UDOZAgwFGgnZPwqSJubkA==
+  dependencies:
+    vscode-languageserver-protocol "3.17.2"
+
+vscode-markdown-languageservice@^0.2.0-alpha.7:
+  version "0.2.0-alpha.7"
+  resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.2.0-alpha.7.tgz#1f5fd345630e9d0d585cb00155d433c2320fa9c2"
+  integrity sha512-5QYz1+LpvazK21Hphx8wZiZIXE9cQ9R3jzhQr+I89xNHJi+NWTEBA555ZFkaaYR68B7SI7OQ4jihjkGLZTUTnw==
+  dependencies:
+    picomatch "^2.3.1"
+    vscode-languageserver-textdocument "^1.0.5"
+    vscode-languageserver-types "^3.17.1"
+    vscode-nls "^5.0.1"
+    vscode-uri "^3.0.3"
+
+vscode-nls@^5.0.1, vscode-nls@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
+  integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
+
+vscode-uri@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84"
+  integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==
diff --git a/extensions/markdown-language-features/src/client/client.ts b/extensions/markdown-language-features/src/client/client.ts
new file mode 100644
index 00000000000..118a71dd473
--- /dev/null
+++ b/extensions/markdown-language-features/src/client/client.ts
@@ -0,0 +1,153 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { BaseLanguageClient, LanguageClientOptions, NotebookDocumentSyncRegistrationType } from 'vscode-languageclient';
+import * as nls from 'vscode-nls';
+import { IMdParser } from '../markdownEngine';
+import * as proto from './protocol';
+import { looksLikeMarkdownPath, markdownFileExtensions } from '../util/file';
+import { VsCodeMdWorkspace } from './workspace';
+import { FileWatcherManager } from './fileWatchingManager';
+import { IDisposable } from '../util/dispose';
+
+const localize = nls.loadMessageBundle();
+
+export type LanguageClientConstructor = (name: string, description: string, clientOptions: LanguageClientOptions) => BaseLanguageClient;
+
+export class MdLanguageClient implements IDisposable {
+
+	constructor(
+		private readonly _client: BaseLanguageClient,
+		private readonly _workspace: VsCodeMdWorkspace,
+	) { }
+
+	dispose(): void {
+		this._client.stop();
+		this._workspace.dispose();
+	}
+
+	resolveLinkTarget(linkText: string, uri: vscode.Uri): Promise {
+		return this._client.sendRequest(proto.resolveLinkTarget, { linkText, uri: uri.toString() });
+	}
+
+	getEditForFileRenames(files: ReadonlyArray<{ oldUri: string; newUri: string }>, token: vscode.CancellationToken) {
+		return this._client.sendRequest(proto.getEditForFileRenames, files, token);
+	}
+
+	getReferencesToFileInWorkspace(resource: vscode.Uri, token: vscode.CancellationToken) {
+		return this._client.sendRequest(proto.getReferencesToFileInWorkspace, { uri: resource.toString() }, token);
+	}
+}
+
+export async function startClient(factory: LanguageClientConstructor, parser: IMdParser): Promise {
+
+	const mdFileGlob = `**/*.{${markdownFileExtensions.join(',')}}`;
+
+	const clientOptions: LanguageClientOptions = {
+		documentSelector: [{ language: 'markdown' }],
+		synchronize: {
+			configurationSection: ['markdown'],
+			fileEvents: vscode.workspace.createFileSystemWatcher(mdFileGlob),
+		},
+		initializationOptions: {
+			markdownFileExtensions,
+		},
+		diagnosticPullOptions: {
+			onChange: true,
+			onTabs: true,
+			match(_documentSelector, resource) {
+				return looksLikeMarkdownPath(resource);
+			},
+		},
+	};
+
+	const client = factory('markdown', localize('markdownServer.name', 'Markdown Language Server'), clientOptions);
+
+	client.registerProposedFeatures();
+
+	const notebookFeature = client.getFeature(NotebookDocumentSyncRegistrationType.method);
+	if (notebookFeature !== undefined) {
+		notebookFeature.register({
+			id: String(Date.now()),
+			registerOptions: {
+				notebookSelector: [{
+					notebook: '*',
+					cells: [{ language: 'markdown' }]
+				}]
+			}
+		});
+	}
+
+	const workspace = new VsCodeMdWorkspace();
+
+	client.onRequest(proto.parse, async (e) => {
+		const uri = vscode.Uri.parse(e.uri);
+		const doc = await workspace.getOrLoadMarkdownDocument(uri);
+		if (doc) {
+			return parser.tokenize(doc);
+		} else {
+			return [];
+		}
+	});
+
+	client.onRequest(proto.fs_readFile, async (e): Promise => {
+		const uri = vscode.Uri.parse(e.uri);
+		return Array.from(await vscode.workspace.fs.readFile(uri));
+	});
+
+	client.onRequest(proto.fs_stat, async (e): Promise<{ isDirectory: boolean } | undefined> => {
+		const uri = vscode.Uri.parse(e.uri);
+		try {
+			const stat = await vscode.workspace.fs.stat(uri);
+			return { isDirectory: stat.type === vscode.FileType.Directory };
+		} catch {
+			return undefined;
+		}
+	});
+
+	client.onRequest(proto.fs_readDirectory, async (e): Promise<[string, { isDirectory: boolean }][]> => {
+		const uri = vscode.Uri.parse(e.uri);
+		const result = await vscode.workspace.fs.readDirectory(uri);
+		return result.map(([name, type]) => [name, { isDirectory: type === vscode.FileType.Directory }]);
+	});
+
+	client.onRequest(proto.findMarkdownFilesInWorkspace, async (): Promise => {
+		return (await vscode.workspace.findFiles(mdFileGlob, '**/node_modules/**')).map(x => x.toString());
+	});
+
+	const watchers = new FileWatcherManager();
+
+	client.onRequest(proto.fs_watcher_create, async (params): Promise => {
+		const id = params.id;
+		const uri = vscode.Uri.parse(params.uri);
+
+		const sendWatcherChange = (kind: 'create' | 'change' | 'delete') => {
+			client.sendRequest(proto.fs_watcher_onChange, { id, uri: params.uri, kind });
+		};
+
+		watchers.create(id, uri, params.watchParentDirs, {
+			create: params.options.ignoreCreate ? undefined : () => sendWatcherChange('create'),
+			change: params.options.ignoreChange ? undefined : () => sendWatcherChange('change'),
+			delete: params.options.ignoreDelete ? undefined : () => sendWatcherChange('delete'),
+		});
+	});
+
+	client.onRequest(proto.fs_watcher_delete, async (params): Promise => {
+		watchers.delete(params.id);
+	});
+
+	vscode.commands.registerCommand('vscodeMarkdownLanguageservice.open', (uri, args) => {
+		return vscode.commands.executeCommand('vscode.open', uri, args);
+	});
+
+	vscode.commands.registerCommand('vscodeMarkdownLanguageservice.rename', (uri, pos) => {
+		return vscode.commands.executeCommand('editor.action.rename', [vscode.Uri.from(uri), new vscode.Position(pos.line, pos.character)]);
+	});
+
+	await client.start();
+
+	return new MdLanguageClient(client, workspace);
+}
diff --git a/extensions/markdown-language-features/src/client/fileWatchingManager.ts b/extensions/markdown-language-features/src/client/fileWatchingManager.ts
new file mode 100644
index 00000000000..78ddf27d3de
--- /dev/null
+++ b/extensions/markdown-language-features/src/client/fileWatchingManager.ts
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { disposeAll } from 'vscode-markdown-languageservice/out/util/dispose';
+import { ResourceMap } from 'vscode-markdown-languageservice/out/util/resourceMap';
+import { Utils } from 'vscode-uri';
+import { IDisposable } from '../util/dispose';
+import { Schemes } from '../util/schemes';
+
+type DirWatcherEntry = {
+	readonly uri: vscode.Uri;
+	readonly listeners: IDisposable[];
+};
+
+
+export class FileWatcherManager {
+
+	private readonly fileWatchers = new Map();
+
+	private readonly dirWatchers = new ResourceMap<{
+		readonly watcher: vscode.FileSystemWatcher;
+		refCount: number;
+	}>();
+
+	create(id: number, uri: vscode.Uri, watchParentDirs: boolean, listeners: { create?: () => void; change?: () => void; delete?: () => void }): void {
+		const watcher = vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(uri, '*'), !listeners.create, !listeners.change, !listeners.delete);
+		const parentDirWatchers: DirWatcherEntry[] = [];
+		this.fileWatchers.set(id, { watcher, dirWatchers: parentDirWatchers });
+
+		if (listeners.create) { watcher.onDidCreate(listeners.create); }
+		if (listeners.change) { watcher.onDidChange(listeners.change); }
+		if (listeners.delete) { watcher.onDidDelete(listeners.delete); }
+
+		if (watchParentDirs && uri.scheme !== Schemes.untitled) {
+			// We need to watch the parent directories too for when these are deleted / created
+			for (let dirUri = Utils.dirname(uri); dirUri.path.length > 1; dirUri = Utils.dirname(dirUri)) {
+				const dirWatcher: DirWatcherEntry = { uri: dirUri, listeners: [] };
+
+				let parentDirWatcher = this.dirWatchers.get(dirUri);
+				if (!parentDirWatcher) {
+					const glob = new vscode.RelativePattern(Utils.dirname(dirUri), Utils.basename(dirUri));
+					const parentWatcher = vscode.workspace.createFileSystemWatcher(glob, !listeners.create, true, !listeners.delete);
+					parentDirWatcher = { refCount: 0, watcher: parentWatcher };
+					this.dirWatchers.set(dirUri, parentDirWatcher);
+				}
+				parentDirWatcher.refCount++;
+
+				if (listeners.create) {
+					dirWatcher.listeners.push(parentDirWatcher.watcher.onDidCreate(async () => {
+						// Just because the parent dir was created doesn't mean our file was created
+						try {
+							const stat = await vscode.workspace.fs.stat(uri);
+							if (stat.type === vscode.FileType.File) {
+								listeners.create!();
+							}
+						} catch {
+							// Noop
+						}
+					}));
+				}
+
+				if (listeners.delete) {
+					// When the parent dir is deleted, consider our file deleted too
+					// TODO: this fires if the file previously did not exist and then the parent is deleted
+					dirWatcher.listeners.push(parentDirWatcher.watcher.onDidDelete(listeners.delete));
+				}
+
+				parentDirWatchers.push(dirWatcher);
+			}
+		}
+	}
+
+	delete(id: number): void {
+		const entry = this.fileWatchers.get(id);
+		if (entry) {
+			for (const dirWatcher of entry.dirWatchers) {
+				disposeAll(dirWatcher.listeners);
+
+				const dirWatcherEntry = this.dirWatchers.get(dirWatcher.uri);
+				if (dirWatcherEntry) {
+					if (--dirWatcherEntry.refCount <= 0) {
+						dirWatcherEntry.watcher.dispose();
+						this.dirWatchers.delete(dirWatcher.uri);
+					}
+				}
+			}
+
+			entry.watcher.dispose();
+		}
+
+		this.fileWatchers.delete(id);
+	}
+}
diff --git a/extensions/markdown-language-features/src/client/inMemoryDocument.ts b/extensions/markdown-language-features/src/client/inMemoryDocument.ts
new file mode 100644
index 00000000000..56deb225195
--- /dev/null
+++ b/extensions/markdown-language-features/src/client/inMemoryDocument.ts
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { ITextDocument } from '../types/textDocument';
+
+export class InMemoryDocument implements ITextDocument {
+
+	constructor(
+		public readonly uri: vscode.Uri,
+		private readonly contents: string,
+		public readonly version = 0,
+	) { }
+
+	getText(): string {
+		return this.contents;
+	}
+}
diff --git a/extensions/markdown-language-features/src/client/protocol.ts b/extensions/markdown-language-features/src/client/protocol.ts
new file mode 100644
index 00000000000..f906460fce9
--- /dev/null
+++ b/extensions/markdown-language-features/src/client/protocol.ts
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type Token = require('markdown-it/lib/token');
+import * as vscode from 'vscode';
+import { FileRename, RequestType } from 'vscode-languageclient';
+import type * as lsp from 'vscode-languageserver-types';
+import type * as md from 'vscode-markdown-languageservice';
+
+
+export type ResolvedDocumentLinkTarget =
+	| { readonly kind: 'file'; readonly uri: vscode.Uri; position?: lsp.Position; fragment?: string }
+	| { readonly kind: 'folder'; readonly uri: vscode.Uri }
+	| { readonly kind: 'external'; readonly uri: vscode.Uri };
+
+//#region From server
+export const parse = new RequestType<{ uri: string }, Token[], any>('markdown/parse');
+
+export const fs_readFile = new RequestType<{ uri: string }, number[], any>('markdown/fs/readFile');
+export const fs_readDirectory = new RequestType<{ uri: string }, [string, { isDirectory: boolean }][], any>('markdown/fs/readDirectory');
+export const fs_stat = new RequestType<{ uri: string }, { isDirectory: boolean } | undefined, any>('markdown/fs/stat');
+
+export const fs_watcher_create = new RequestType<{ id: number; uri: string; options: md.FileWatcherOptions; watchParentDirs: boolean }, void, any>('markdown/fs/watcher/create');
+export const fs_watcher_delete = new RequestType<{ id: number }, void, any>('markdown/fs/watcher/delete');
+
+export const findMarkdownFilesInWorkspace = new RequestType<{}, string[], any>('markdown/findMarkdownFilesInWorkspace');
+//#endregion
+
+//#region To server
+export const getReferencesToFileInWorkspace = new RequestType<{ uri: string }, lsp.Location[], any>('markdown/getReferencesToFileInWorkspace');
+export const getEditForFileRenames = new RequestType, { participatingRenames: readonly FileRename[]; edit: lsp.WorkspaceEdit }, any>('markdown/getEditForFileRenames');
+
+export const fs_watcher_onChange = new RequestType<{ id: number; uri: string; kind: 'create' | 'change' | 'delete' }, void, any>('markdown/fs/watcher/onChange');
+
+export const resolveLinkTarget = new RequestType<{ linkText: string; uri: string }, ResolvedDocumentLinkTarget, any>('markdown/resolveLinkTarget');
+//#endregion
diff --git a/extensions/markdown-language-features/src/client/workspace.ts b/extensions/markdown-language-features/src/client/workspace.ts
new file mode 100644
index 00000000000..138d3d4d95d
--- /dev/null
+++ b/extensions/markdown-language-features/src/client/workspace.ts
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { ITextDocument } from '../types/textDocument';
+import { Disposable } from '../util/dispose';
+import { isMarkdownFile, looksLikeMarkdownPath } from '../util/file';
+import { InMemoryDocument } from './inMemoryDocument';
+import { ResourceMap } from '../util/resourceMap';
+
+/**
+ * Provides set of markdown files known to VS Code.
+ *
+ * This includes both opened text documents and markdown files in the workspace.
+ */
+export class VsCodeMdWorkspace extends Disposable {
+
+	private _watcher: vscode.FileSystemWatcher | undefined;
+
+	private readonly _documentCache = new ResourceMap();
+
+	private readonly utf8Decoder = new TextDecoder('utf-8');
+
+	constructor() {
+		super();
+
+		this._watcher = this._register(vscode.workspace.createFileSystemWatcher('**/*.md'));
+
+		this._register(this._watcher.onDidChange(async resource => {
+			this._documentCache.delete(resource);
+		}));
+
+		this._register(this._watcher.onDidDelete(resource => {
+			this._documentCache.delete(resource);
+		}));
+
+		this._register(vscode.workspace.onDidOpenTextDocument(e => {
+			this._documentCache.delete(e.uri);
+		}));
+
+		this._register(vscode.workspace.onDidCloseTextDocument(e => {
+			this._documentCache.delete(e.uri);
+		}));
+	}
+
+	private isRelevantMarkdownDocument(doc: vscode.TextDocument) {
+		return isMarkdownFile(doc) && doc.uri.scheme !== 'vscode-bulkeditpreview';
+	}
+
+	public async getOrLoadMarkdownDocument(resource: vscode.Uri): Promise {
+		const existing = this._documentCache.get(resource);
+		if (existing) {
+			return existing;
+		}
+
+		const matchingDocument = vscode.workspace.textDocuments.find((doc) => this.isRelevantMarkdownDocument(doc) && doc.uri.toString() === resource.toString());
+		if (matchingDocument) {
+			this._documentCache.set(resource, matchingDocument);
+			return matchingDocument;
+		}
+
+		if (!looksLikeMarkdownPath(resource)) {
+			return undefined;
+		}
+
+		try {
+			const bytes = await vscode.workspace.fs.readFile(resource);
+
+			// We assume that markdown is in UTF-8
+			const text = this.utf8Decoder.decode(bytes);
+			const doc = new InMemoryDocument(resource, text, 0);
+			this._documentCache.set(resource, doc);
+			return doc;
+		} catch {
+			return undefined;
+		}
+	}
+}
diff --git a/extensions/markdown-language-features/src/commands/index.ts b/extensions/markdown-language-features/src/commands/index.ts
index d810fab4931..8904d4a547c 100644
--- a/extensions/markdown-language-features/src/commands/index.ts
+++ b/extensions/markdown-language-features/src/commands/index.ts
@@ -3,13 +3,41 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export { MoveCursorToPositionCommand } from './moveCursorToPosition';
-export { OpenDocumentLinkCommand } from './openDocumentLink';
-export { RefreshPreviewCommand } from './refreshPreview';
-export { ReloadPlugins } from './reloadPlugins';
-export { RenderDocument } from './renderDocument';
-export { ShowLockedPreviewToSideCommand, ShowPreviewCommand, ShowPreviewToSideCommand } from './showPreview';
-export { ShowPreviewSecuritySelectorCommand } from './showPreviewSecuritySelector';
-export { ShowSourceCommand } from './showSource';
-export { ToggleLockCommand } from './toggleLock';
+import * as vscode from 'vscode';
+import { CommandManager } from '../commandManager';
+import { MarkdownItEngine } from '../markdownEngine';
+import { MarkdownPreviewManager } from '../preview/previewManager';
+import { ContentSecurityPolicyArbiter, PreviewSecuritySelector } from '../preview/security';
+import { TelemetryReporter } from '../telemetryReporter';
+import { InsertLinkFromWorkspace, InsertImageFromWorkspace } from './insertResource';
+import { RefreshPreviewCommand } from './refreshPreview';
+import { ReloadPlugins } from './reloadPlugins';
+import { RenderDocument } from './renderDocument';
+import { ShowLockedPreviewToSideCommand, ShowPreviewCommand, ShowPreviewToSideCommand } from './showPreview';
+import { ShowPreviewSecuritySelectorCommand } from './showPreviewSecuritySelector';
+import { ShowSourceCommand } from './showSource';
+import { ToggleLockCommand } from './toggleLock';
 
+export function registerMarkdownCommands(
+	commandManager: CommandManager,
+	previewManager: MarkdownPreviewManager,
+	telemetryReporter: TelemetryReporter,
+	cspArbiter: ContentSecurityPolicyArbiter,
+	engine: MarkdownItEngine,
+): vscode.Disposable {
+	const previewSecuritySelector = new PreviewSecuritySelector(cspArbiter, previewManager);
+
+	commandManager.register(new ShowPreviewCommand(previewManager, telemetryReporter));
+	commandManager.register(new ShowPreviewToSideCommand(previewManager, telemetryReporter));
+	commandManager.register(new ShowLockedPreviewToSideCommand(previewManager, telemetryReporter));
+	commandManager.register(new ShowSourceCommand(previewManager));
+	commandManager.register(new RefreshPreviewCommand(previewManager, engine));
+	commandManager.register(new ShowPreviewSecuritySelectorCommand(previewSecuritySelector, previewManager));
+	commandManager.register(new ToggleLockCommand(previewManager));
+	commandManager.register(new RenderDocument(engine));
+	commandManager.register(new ReloadPlugins(previewManager, engine));
+	commandManager.register(new InsertLinkFromWorkspace());
+	commandManager.register(new InsertImageFromWorkspace());
+
+	return commandManager;
+}
diff --git a/extensions/markdown-language-features/src/commands/insertResource.ts b/extensions/markdown-language-features/src/commands/insertResource.ts
new file mode 100644
index 00000000000..aef9bf648b8
--- /dev/null
+++ b/extensions/markdown-language-features/src/commands/insertResource.ts
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as nls from 'vscode-nls';
+import { Utils } from 'vscode-uri';
+import { Command } from '../commandManager';
+import { createUriListSnippet, getParentDocumentUri, imageFileExtensions } from '../languageFeatures/dropIntoEditor';
+import { coalesce } from '../util/arrays';
+import { Schemes } from '../util/schemes';
+
+const localize = nls.loadMessageBundle();
+
+
+export class InsertLinkFromWorkspace implements Command {
+	public readonly id = 'markdown.editor.insertLinkFromWorkspace';
+
+	public async execute(resources?: vscode.Uri[]) {
+		const activeEditor = vscode.window.activeTextEditor;
+		if (!activeEditor) {
+			return;
+		}
+
+		resources ??= await vscode.window.showOpenDialog({
+			canSelectFiles: true,
+			canSelectFolders: false,
+			canSelectMany: true,
+			openLabel: localize('insertLink.openLabel', "Insert link"),
+			title: localize('insertLink.title', "Insert link"),
+			defaultUri: getDefaultUri(activeEditor.document),
+		});
+
+		return insertLink(activeEditor, resources ?? [], false);
+	}
+}
+
+export class InsertImageFromWorkspace implements Command {
+	public readonly id = 'markdown.editor.insertImageFromWorkspace';
+
+	public async execute(resources?: vscode.Uri[]) {
+		const activeEditor = vscode.window.activeTextEditor;
+		if (!activeEditor) {
+			return;
+		}
+
+		resources ??= await vscode.window.showOpenDialog({
+			canSelectFiles: true,
+			canSelectFolders: false,
+			canSelectMany: true,
+			filters: {
+				[localize('insertImage.imagesLabel', "Images")]: Array.from(imageFileExtensions)
+			},
+			openLabel: localize('insertImage.openLabel', "Insert image"),
+			title: localize('insertImage.title', "Insert image"),
+			defaultUri: getDefaultUri(activeEditor.document),
+		});
+
+		return insertLink(activeEditor, resources ?? [], true);
+	}
+}
+
+function getDefaultUri(document: vscode.TextDocument) {
+	const docUri = getParentDocumentUri(document);
+	if (docUri.scheme === Schemes.untitled) {
+		return vscode.workspace.workspaceFolders?.[0]?.uri;
+	}
+	return Utils.dirname(docUri);
+}
+
+async function insertLink(activeEditor: vscode.TextEditor, selectedFiles: vscode.Uri[], insertAsImage: boolean): Promise {
+	if (!selectedFiles.length) {
+		return;
+	}
+
+	const edit = createInsertLinkEdit(activeEditor, selectedFiles, insertAsImage);
+	await vscode.workspace.applyEdit(edit);
+}
+
+function createInsertLinkEdit(activeEditor: vscode.TextEditor, selectedFiles: vscode.Uri[], insertAsImage: boolean) {
+	const snippetEdits = coalesce(activeEditor.selections.map((selection, i): vscode.SnippetTextEdit | undefined => {
+		const selectionText = activeEditor.document.getText(selection);
+		const snippet = createUriListSnippet(activeEditor.document, selectedFiles, {
+			insertAsImage: insertAsImage,
+			placeholderText: selectionText,
+			placeholderStartIndex: (i + 1) * selectedFiles.length,
+			separator: insertAsImage ? '\n' : ' ',
+		});
+
+		return snippet ? new vscode.SnippetTextEdit(selection, snippet) : undefined;
+	}));
+
+	const edit = new vscode.WorkspaceEdit();
+	edit.set(activeEditor.document.uri, snippetEdits);
+	return edit;
+}
diff --git a/extensions/markdown-language-features/src/commands/moveCursorToPosition.ts b/extensions/markdown-language-features/src/commands/moveCursorToPosition.ts
deleted file mode 100644
index c0d175f370d..00000000000
--- a/extensions/markdown-language-features/src/commands/moveCursorToPosition.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as vscode from 'vscode';
-import { Command } from '../commandManager';
-
-export class MoveCursorToPositionCommand implements Command {
-	public readonly id = '_markdown.moveCursorToPosition';
-
-	public execute(line: number, character: number) {
-		if (!vscode.window.activeTextEditor) {
-			return;
-		}
-		const position = new vscode.Position(line, character);
-		const selection = new vscode.Selection(position, position);
-		vscode.window.activeTextEditor.revealRange(selection);
-		vscode.window.activeTextEditor.selection = selection;
-	}
-}
diff --git a/extensions/markdown-language-features/src/commands/openDocumentLink.ts b/extensions/markdown-language-features/src/commands/openDocumentLink.ts
deleted file mode 100644
index 060e280c7f6..00000000000
--- a/extensions/markdown-language-features/src/commands/openDocumentLink.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as vscode from 'vscode';
-import { Command } from '../commandManager';
-import { MarkdownEngine } from '../markdownEngine';
-import { openDocumentLink } from '../util/openDocumentLink';
-
-type UriComponents = {
-	readonly scheme?: string;
-	readonly path: string;
-	readonly fragment?: string;
-	readonly authority?: string;
-	readonly query?: string;
-};
-
-export interface OpenDocumentLinkArgs {
-	readonly parts: UriComponents;
-	readonly fragment: string;
-	readonly fromResource: UriComponents;
-}
-
-export class OpenDocumentLinkCommand implements Command {
-	private static readonly id = '_markdown.openDocumentLink';
-	public readonly id = OpenDocumentLinkCommand.id;
-
-	public static createCommandUri(
-		fromResource: vscode.Uri,
-		path: vscode.Uri,
-		fragment: string,
-	): vscode.Uri {
-		const toJson = (uri: vscode.Uri): UriComponents => {
-			return {
-				scheme: uri.scheme,
-				authority: uri.authority,
-				path: uri.path,
-				fragment: uri.fragment,
-				query: uri.query,
-			};
-		};
-		return vscode.Uri.parse(`command:${OpenDocumentLinkCommand.id}?${encodeURIComponent(JSON.stringify({
-			parts: toJson(path),
-			fragment,
-			fromResource: toJson(fromResource),
-		}))}`);
-	}
-
-	public constructor(
-		private readonly engine: MarkdownEngine
-	) { }
-
-	public async execute(args: OpenDocumentLinkArgs) {
-		const fromResource = vscode.Uri.parse('').with(args.fromResource);
-		const targetResource = reviveUri(args.parts).with({ fragment: args.fragment });
-		return openDocumentLink(this.engine, targetResource, fromResource);
-	}
-}
-
-function reviveUri(parts: any) {
-	if (parts.scheme === 'file') {
-		return vscode.Uri.file(parts.path);
-	}
-	return vscode.Uri.parse('').with(parts);
-}
diff --git a/extensions/markdown-language-features/src/commands/refreshPreview.ts b/extensions/markdown-language-features/src/commands/refreshPreview.ts
index ec8888b5c59..c75d79347ac 100644
--- a/extensions/markdown-language-features/src/commands/refreshPreview.ts
+++ b/extensions/markdown-language-features/src/commands/refreshPreview.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Command } from '../commandManager';
-import { MarkdownEngine } from '../markdownEngine';
+import { MarkdownItEngine } from '../markdownEngine';
 import { MarkdownPreviewManager } from '../preview/previewManager';
 
 export class RefreshPreviewCommand implements Command {
@@ -12,7 +12,7 @@ export class RefreshPreviewCommand implements Command {
 
 	public constructor(
 		private readonly webviewManager: MarkdownPreviewManager,
-		private readonly engine: MarkdownEngine
+		private readonly engine: MarkdownItEngine
 	) { }
 
 	public execute() {
diff --git a/extensions/markdown-language-features/src/commands/reloadPlugins.ts b/extensions/markdown-language-features/src/commands/reloadPlugins.ts
index ffa69b6977c..640ea9832b9 100644
--- a/extensions/markdown-language-features/src/commands/reloadPlugins.ts
+++ b/extensions/markdown-language-features/src/commands/reloadPlugins.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Command } from '../commandManager';
-import { MarkdownEngine } from '../markdownEngine';
+import { MarkdownItEngine } from '../markdownEngine';
 import { MarkdownPreviewManager } from '../preview/previewManager';
 
 export class ReloadPlugins implements Command {
@@ -12,7 +12,7 @@ export class ReloadPlugins implements Command {
 
 	public constructor(
 		private readonly webviewManager: MarkdownPreviewManager,
-		private readonly engine: MarkdownEngine,
+		private readonly engine: MarkdownItEngine,
 	) { }
 
 	public execute(): void {
diff --git a/extensions/markdown-language-features/src/commands/renderDocument.ts b/extensions/markdown-language-features/src/commands/renderDocument.ts
index 098f2da771a..675f4ce196c 100644
--- a/extensions/markdown-language-features/src/commands/renderDocument.ts
+++ b/extensions/markdown-language-features/src/commands/renderDocument.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Command } from '../commandManager';
-import { MarkdownEngine } from '../markdownEngine';
-import { SkinnyTextDocument } from '../workspaceContents';
+import { MarkdownItEngine } from '../markdownEngine';
+import { ITextDocument } from '../types/textDocument';
 
 export class RenderDocument implements Command {
 	public readonly id = 'markdown.api.render';
 
 	public constructor(
-		private readonly engine: MarkdownEngine
+		private readonly engine: MarkdownItEngine
 	) { }
 
-	public async execute(document: SkinnyTextDocument | string): Promise {
+	public async execute(document: ITextDocument | string): Promise {
 		return (await (this.engine.render(document))).html;
 	}
 }
diff --git a/extensions/markdown-language-features/src/extension.browser.ts b/extensions/markdown-language-features/src/extension.browser.ts
new file mode 100644
index 00000000000..7e5de11e17d
--- /dev/null
+++ b/extensions/markdown-language-features/src/extension.browser.ts
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { LanguageClient, LanguageClientOptions } from 'vscode-languageclient/browser';
+import { MdLanguageClient, startClient } from './client/client';
+import { activateShared } from './extension.shared';
+import { VsCodeOutputLogger } from './logging';
+import { IMdParser, MarkdownItEngine } from './markdownEngine';
+import { getMarkdownExtensionContributions } from './markdownExtensions';
+import { githubSlugifier } from './slugify';
+
+export async function activate(context: vscode.ExtensionContext) {
+	const contributions = getMarkdownExtensionContributions(context);
+	context.subscriptions.push(contributions);
+
+	const logger = new VsCodeOutputLogger();
+	context.subscriptions.push(logger);
+
+	const engine = new MarkdownItEngine(contributions, githubSlugifier, logger);
+
+	const client = await startServer(context, engine);
+	context.subscriptions.push(client);
+	activateShared(context, client, engine, logger, contributions);
+}
+
+function startServer(context: vscode.ExtensionContext, parser: IMdParser): Promise {
+	const serverMain = vscode.Uri.joinPath(context.extensionUri, 'server/dist/browser/main.js');
+	const worker = new Worker(serverMain.toString());
+
+	return startClient((id: string, name: string, clientOptions: LanguageClientOptions) => {
+		return new LanguageClient(id, name, clientOptions, worker);
+	}, parser);
+}
diff --git a/extensions/markdown-language-features/src/extension.shared.ts b/extensions/markdown-language-features/src/extension.shared.ts
new file mode 100644
index 00000000000..dbfafc2bdb5
--- /dev/null
+++ b/extensions/markdown-language-features/src/extension.shared.ts
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { MdLanguageClient } from './client/client';
+import { CommandManager } from './commandManager';
+import { registerMarkdownCommands } from './commands/index';
+import { registerPasteSupport } from './languageFeatures/copyPaste';
+import { registerDiagnosticSupport } from './languageFeatures/diagnostics';
+import { registerDropIntoEditorSupport } from './languageFeatures/dropIntoEditor';
+import { registerFindFileReferenceSupport } from './languageFeatures/fileReferences';
+import { registerUpdateLinksOnRename } from './languageFeatures/linkUpdater';
+import { ILogger } from './logging';
+import { MarkdownItEngine } from './markdownEngine';
+import { MarkdownContributionProvider } from './markdownExtensions';
+import { MdDocumentRenderer } from './preview/documentRenderer';
+import { MarkdownPreviewManager } from './preview/previewManager';
+import { ExtensionContentSecurityPolicyArbiter } from './preview/security';
+import { loadDefaultTelemetryReporter } from './telemetryReporter';
+import { MdLinkOpener } from './util/openDocumentLink';
+
+export function activateShared(
+	context: vscode.ExtensionContext,
+	client: MdLanguageClient,
+	engine: MarkdownItEngine,
+	logger: ILogger,
+	contributions: MarkdownContributionProvider,
+) {
+	const telemetryReporter = loadDefaultTelemetryReporter();
+	context.subscriptions.push(telemetryReporter);
+
+	const cspArbiter = new ExtensionContentSecurityPolicyArbiter(context.globalState, context.workspaceState);
+	const commandManager = new CommandManager();
+
+	const opener = new MdLinkOpener(client);
+
+	const contentProvider = new MdDocumentRenderer(engine, context, cspArbiter, contributions, logger);
+	const previewManager = new MarkdownPreviewManager(contentProvider, logger, contributions, opener);
+	context.subscriptions.push(previewManager);
+
+	context.subscriptions.push(registerMarkdownLanguageFeatures(client, commandManager));
+	context.subscriptions.push(registerMarkdownCommands(commandManager, previewManager, telemetryReporter, cspArbiter, engine));
+
+	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(() => {
+		previewManager.updateConfiguration();
+	}));
+}
+
+function registerMarkdownLanguageFeatures(
+	client: MdLanguageClient,
+	commandManager: CommandManager,
+): vscode.Disposable {
+	const selector: vscode.DocumentSelector = { language: 'markdown', scheme: '*' };
+	return vscode.Disposable.from(
+		// Language features
+		registerDiagnosticSupport(selector, commandManager),
+		registerDropIntoEditorSupport(selector),
+		registerFindFileReferenceSupport(commandManager, client),
+		registerPasteSupport(selector),
+		registerUpdateLinksOnRename(client),
+	);
+}
+
diff --git a/extensions/markdown-language-features/src/extension.ts b/extensions/markdown-language-features/src/extension.ts
index 0f2399692e9..3f711a7583d 100644
--- a/extensions/markdown-language-features/src/extension.ts
+++ b/extensions/markdown-language-features/src/extension.ts
@@ -4,105 +4,44 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { CommandManager } from './commandManager';
-import * as commands from './commands/index';
-import { registerPasteProvider } from './languageFeatures/copyPaste';
-import { MdDefinitionProvider } from './languageFeatures/definitionProvider';
-import { register as registerDiagnostics } from './languageFeatures/diagnostics';
-import { MdLinkProvider } from './languageFeatures/documentLinkProvider';
-import { MdDocumentSymbolProvider } from './languageFeatures/documentSymbolProvider';
-import { registerDropIntoEditor } from './languageFeatures/dropIntoEditor';
-import { registerFindFileReferences } from './languageFeatures/fileReferences';
-import { MdFoldingProvider } from './languageFeatures/foldingProvider';
-import { MdPathCompletionProvider } from './languageFeatures/pathCompletions';
-import { MdReferencesProvider } from './languageFeatures/references';
-import { MdRenameProvider } from './languageFeatures/rename';
-import { MdSmartSelect } from './languageFeatures/smartSelect';
-import { MdWorkspaceSymbolProvider } from './languageFeatures/workspaceSymbolProvider';
-import { Logger } from './logger';
-import { MarkdownEngine } from './markdownEngine';
+import { LanguageClient, ServerOptions, TransportKind } from 'vscode-languageclient/node';
+import { MdLanguageClient, startClient } from './client/client';
+import { activateShared } from './extension.shared';
+import { VsCodeOutputLogger } from './logging';
+import { IMdParser, MarkdownItEngine } from './markdownEngine';
 import { getMarkdownExtensionContributions } from './markdownExtensions';
-import { MarkdownContentProvider } from './preview/previewContentProvider';
-import { MarkdownPreviewManager } from './preview/previewManager';
-import { ContentSecurityPolicyArbiter, ExtensionContentSecurityPolicyArbiter, PreviewSecuritySelector } from './preview/security';
 import { githubSlugifier } from './slugify';
-import { loadDefaultTelemetryReporter, TelemetryReporter } from './telemetryReporter';
-import { VsCodeMdWorkspaceContents } from './workspaceContents';
-
-
-export function activate(context: vscode.ExtensionContext) {
-	const telemetryReporter = loadDefaultTelemetryReporter();
-	context.subscriptions.push(telemetryReporter);
 
+export async function activate(context: vscode.ExtensionContext) {
 	const contributions = getMarkdownExtensionContributions(context);
 	context.subscriptions.push(contributions);
 
-	const cspArbiter = new ExtensionContentSecurityPolicyArbiter(context.globalState, context.workspaceState);
-	const engine = new MarkdownEngine(contributions, githubSlugifier);
-	const logger = new Logger();
-	const commandManager = new CommandManager();
+	const logger = new VsCodeOutputLogger();
+	context.subscriptions.push(logger);
 
-	const contentProvider = new MarkdownContentProvider(engine, context, cspArbiter, contributions, logger);
-	const symbolProvider = new MdDocumentSymbolProvider(engine);
-	const previewManager = new MarkdownPreviewManager(contentProvider, logger, contributions, engine);
-	context.subscriptions.push(previewManager);
+	const engine = new MarkdownItEngine(contributions, githubSlugifier, logger);
 
-	context.subscriptions.push(registerMarkdownLanguageFeatures(commandManager, symbolProvider, engine));
-	context.subscriptions.push(registerMarkdownCommands(commandManager, previewManager, telemetryReporter, cspArbiter, engine));
-
-	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(() => {
-		logger.updateConfiguration();
-		previewManager.updateConfiguration();
-	}));
+	const client = await startServer(context, engine);
+	context.subscriptions.push(client);
+	activateShared(context, client, engine, logger, contributions);
 }
 
-function registerMarkdownLanguageFeatures(
-	commandManager: CommandManager,
-	symbolProvider: MdDocumentSymbolProvider,
-	engine: MarkdownEngine
-): vscode.Disposable {
-	const selector: vscode.DocumentSelector = { language: 'markdown', scheme: '*' };
+function startServer(context: vscode.ExtensionContext, parser: IMdParser): Promise {
+	const clientMain = vscode.extensions.getExtension('vscode.markdown-language-features')?.packageJSON?.main || '';
 
-	const linkProvider = new MdLinkProvider(engine);
-	const workspaceContents = new VsCodeMdWorkspaceContents();
+	const serverMain = `./server/${clientMain.indexOf('/dist/') !== -1 ? 'dist' : 'out'}/node/main`;
+	const serverModule = context.asAbsolutePath(serverMain);
 
-	const referencesProvider = new MdReferencesProvider(linkProvider, workspaceContents, engine, githubSlugifier);
-	return vscode.Disposable.from(
-		vscode.languages.registerDocumentSymbolProvider(selector, symbolProvider),
-		vscode.languages.registerDocumentLinkProvider(selector, linkProvider),
-		vscode.languages.registerFoldingRangeProvider(selector, new MdFoldingProvider(engine)),
-		vscode.languages.registerSelectionRangeProvider(selector, new MdSmartSelect(engine)),
-		vscode.languages.registerWorkspaceSymbolProvider(new MdWorkspaceSymbolProvider(symbolProvider, workspaceContents)),
-		vscode.languages.registerReferenceProvider(selector, referencesProvider),
-		vscode.languages.registerRenameProvider(selector, new MdRenameProvider(referencesProvider, workspaceContents, githubSlugifier)),
-		vscode.languages.registerDefinitionProvider(selector, new MdDefinitionProvider(referencesProvider)),
-		MdPathCompletionProvider.register(selector, engine, linkProvider),
-		registerDiagnostics(selector, engine, workspaceContents, linkProvider, commandManager),
-		registerDropIntoEditor(selector),
-		registerPasteProvider(selector),
-		registerFindFileReferences(commandManager, referencesProvider),
-	);
-}
-
-function registerMarkdownCommands(
-	commandManager: CommandManager,
-	previewManager: MarkdownPreviewManager,
-	telemetryReporter: TelemetryReporter,
-	cspArbiter: ContentSecurityPolicyArbiter,
-	engine: MarkdownEngine
-): vscode.Disposable {
-	const previewSecuritySelector = new PreviewSecuritySelector(cspArbiter, previewManager);
-
-	commandManager.register(new commands.ShowPreviewCommand(previewManager, telemetryReporter));
-	commandManager.register(new commands.ShowPreviewToSideCommand(previewManager, telemetryReporter));
-	commandManager.register(new commands.ShowLockedPreviewToSideCommand(previewManager, telemetryReporter));
-	commandManager.register(new commands.ShowSourceCommand(previewManager));
-	commandManager.register(new commands.RefreshPreviewCommand(previewManager, engine));
-	commandManager.register(new commands.MoveCursorToPositionCommand());
-	commandManager.register(new commands.ShowPreviewSecuritySelectorCommand(previewSecuritySelector, previewManager));
-	commandManager.register(new commands.OpenDocumentLinkCommand(engine));
-	commandManager.register(new commands.ToggleLockCommand(previewManager));
-	commandManager.register(new commands.RenderDocument(engine));
-	commandManager.register(new commands.ReloadPlugins(previewManager, engine));
-	return commandManager;
+	// The debug options for the server
+	const debugOptions = { execArgv: ['--nolazy', '--inspect=' + (7000 + Math.round(Math.random() * 999))] };
+
+	// If the extension is launch in debug mode the debug server options are use
+	// Otherwise the run options are used
+	const serverOptions: ServerOptions = {
+		run: { module: serverModule, transport: TransportKind.ipc },
+		debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions }
+	};
+	return startClient((id, name, clientOptions) => {
+		return new LanguageClient(id, name, serverOptions, clientOptions);
+	}, parser);
 }
diff --git a/extensions/markdown-language-features/src/languageFeatures/copyPaste.ts b/extensions/markdown-language-features/src/languageFeatures/copyPaste.ts
index d9e939b463c..960d01b7a19 100644
--- a/extensions/markdown-language-features/src/languageFeatures/copyPaste.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/copyPaste.ts
@@ -3,24 +3,104 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as path from 'path';
 import * as vscode from 'vscode';
-import { tryInsertUriList } from './dropIntoEditor';
+import { Utils } from 'vscode-uri';
+import { Schemes } from '../util/schemes';
+import { createUriListSnippet, tryGetUriListSnippet } from './dropIntoEditor';
 
-export function registerPasteProvider(selector: vscode.DocumentSelector) {
-	return vscode.languages.registerDocumentPasteEditProvider(selector, new class implements vscode.DocumentPasteEditProvider {
+const supportedImageMimes = new Set([
+	'image/png',
+	'image/jpg',
+]);
 
-		async provideDocumentPasteEdits(
-			document: vscode.TextDocument,
-			range: vscode.Range,
-			dataTransfer: vscode.DataTransfer,
-			token: vscode.CancellationToken,
-		): Promise {
-			const enabled = vscode.workspace.getConfiguration('markdown', document).get('experimental.editor.pasteLinks.enabled', false);
-			if (!enabled) {
-				return;
-			}
+class PasteEditProvider implements vscode.DocumentPasteEditProvider {
 
-			return tryInsertUriList(document, range, dataTransfer, token);
+	async provideDocumentPasteEdits(
+		document: vscode.TextDocument,
+		_ranges: readonly vscode.Range[],
+		dataTransfer: vscode.DataTransfer,
+		token: vscode.CancellationToken,
+	): Promise {
+		const enabled = vscode.workspace.getConfiguration('markdown', document).get('experimental.editor.pasteLinks.enabled', true);
+		if (!enabled) {
+			return;
 		}
+
+		if (document.uri.scheme === Schemes.notebookCell) {
+			return;
+		}
+
+		for (const imageMime of supportedImageMimes) {
+			const file = dataTransfer.get(imageMime)?.asFile();
+			if (file) {
+				const edit = await this.makeCreateImagePasteEdit(document, file, token);
+				if (token.isCancellationRequested) {
+					return;
+				}
+
+				if (edit) {
+					return edit;
+				}
+			}
+		}
+
+		const snippet = await tryGetUriListSnippet(document, dataTransfer, token);
+		return snippet ? new vscode.DocumentPasteEdit(snippet) : undefined;
+	}
+
+	private async makeCreateImagePasteEdit(document: vscode.TextDocument, file: vscode.DataTransferFile, token: vscode.CancellationToken): Promise {
+		if (file.uri) {
+			// If file is already in workspace, we don't want to create a copy of it
+			const workspaceFolder = vscode.workspace.getWorkspaceFolder(file.uri);
+			if (workspaceFolder) {
+				const snippet = createUriListSnippet(document, [file.uri]);
+				return snippet ? new vscode.DocumentPasteEdit(snippet) : undefined;
+			}
+		}
+
+		const uri = await this.getNewFileName(document, file);
+		if (token.isCancellationRequested) {
+			return;
+		}
+
+		const snippet = createUriListSnippet(document, [uri]);
+		if (!snippet) {
+			return;
+		}
+
+		// Note that there is currently no way to undo the file creation :/
+		const workspaceEdit = new vscode.WorkspaceEdit();
+		workspaceEdit.createFile(uri, { contents: await file.data() });
+
+		const pasteEdit = new vscode.DocumentPasteEdit(snippet);
+		pasteEdit.additionalEdit = workspaceEdit;
+		return pasteEdit;
+	}
+
+	private async getNewFileName(document: vscode.TextDocument, file: vscode.DataTransferFile): Promise {
+		const root = Utils.dirname(document.uri);
+
+		const ext = path.extname(file.name);
+		const baseName = path.basename(file.name, ext);
+		for (let i = 0; ; ++i) {
+			const name = i === 0 ? baseName : `${baseName}-${i}`;
+			const uri = vscode.Uri.joinPath(root, `${name}${ext}`);
+			try {
+				await vscode.workspace.fs.stat(uri);
+			} catch {
+				// Does not exist
+				return uri;
+			}
+		}
+	}
+}
+
+export function registerPasteSupport(selector: vscode.DocumentSelector,) {
+	return vscode.languages.registerDocumentPasteEditProvider(selector, new PasteEditProvider(), {
+		pasteMimeTypes: [
+			'text/uri-list',
+			...supportedImageMimes,
+		]
 	});
 }
diff --git a/extensions/markdown-language-features/src/languageFeatures/definitionProvider.ts b/extensions/markdown-language-features/src/languageFeatures/definitionProvider.ts
deleted file mode 100644
index 622d6bf87a6..00000000000
--- a/extensions/markdown-language-features/src/languageFeatures/definitionProvider.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-import * as vscode from 'vscode';
-import { Disposable } from '../util/dispose';
-import { SkinnyTextDocument } from '../workspaceContents';
-import { MdReferencesProvider } from './references';
-
-export class MdDefinitionProvider extends Disposable implements vscode.DefinitionProvider {
-
-	constructor(private readonly referencesProvider: MdReferencesProvider) {
-		super();
-	}
-
-	async provideDefinition(document: SkinnyTextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise {
-		const allRefs = await this.referencesProvider.getAllReferencesAtPosition(document, position, token);
-
-		return allRefs.find(ref => ref.kind === 'link' && ref.isDefinition)?.location;
-	}
-}
diff --git a/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts b/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts
index 4db32d614f7..30c6b5be49c 100644
--- a/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts
@@ -5,511 +5,18 @@
 
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
-import * as picomatch from 'picomatch';
-import { MarkdownEngine } from '../markdownEngine';
-import { TableOfContents } from '../tableOfContents';
-import { Delayer } from '../util/async';
-import { Disposable } from '../util/dispose';
-import { isMarkdownFile } from '../util/file';
-import { Limiter } from '../util/limiter';
-import { MdWorkspaceContents, SkinnyTextDocument } from '../workspaceContents';
-import { InternalHref, LinkDefinitionSet, MdLink, MdLinkProvider, MdLinkSource } from './documentLinkProvider';
-import { tryFindMdDocumentForLink } from './references';
 import { CommandManager } from '../commandManager';
 
 const localize = nls.loadMessageBundle();
 
-export interface DiagnosticConfiguration {
-	/**
-	 * Fired when the configuration changes.
-	 */
-	readonly onDidChange: vscode.Event;
-
-	getOptions(resource: vscode.Uri): DiagnosticOptions;
+// Copied from markdown language service
+export enum DiagnosticCode {
+	link_noSuchReferences = 'link.no-such-reference',
+	link_noSuchHeaderInOwnFile = 'link.no-such-header-in-own-file',
+	link_noSuchFile = 'link.no-such-file',
+	link_noSuchHeaderInFile = 'link.no-such-header-in-file',
 }
 
-export enum DiagnosticLevel {
-	ignore = 'ignore',
-	warning = 'warning',
-	error = 'error',
-}
-
-export interface DiagnosticOptions {
-	readonly enabled: boolean;
-	readonly validateReferences: DiagnosticLevel;
-	readonly validateOwnHeaders: DiagnosticLevel;
-	readonly validateFilePaths: DiagnosticLevel;
-	readonly ignoreLinks: readonly string[];
-}
-
-function toSeverity(level: DiagnosticLevel): vscode.DiagnosticSeverity | undefined {
-	switch (level) {
-		case DiagnosticLevel.error: return vscode.DiagnosticSeverity.Error;
-		case DiagnosticLevel.warning: return vscode.DiagnosticSeverity.Warning;
-		case DiagnosticLevel.ignore: return undefined;
-	}
-}
-
-class VSCodeDiagnosticConfiguration extends Disposable implements DiagnosticConfiguration {
-
-	private readonly _onDidChange = this._register(new vscode.EventEmitter());
-	public readonly onDidChange = this._onDidChange.event;
-
-	constructor() {
-		super();
-
-		this._register(vscode.workspace.onDidChangeConfiguration(e => {
-			if (
-				e.affectsConfiguration('markdown.experimental.validate.enabled')
-				|| e.affectsConfiguration('markdown.experimental.validate.referenceLinks.enabled')
-				|| e.affectsConfiguration('markdown.experimental.validate.headerLinks.enabled')
-				|| e.affectsConfiguration('markdown.experimental.validate.fileLinks.enabled')
-				|| e.affectsConfiguration('markdown.experimental.validate.ignoreLinks')
-			) {
-				this._onDidChange.fire();
-			}
-		}));
-	}
-
-	public getOptions(resource: vscode.Uri): DiagnosticOptions {
-		const config = vscode.workspace.getConfiguration('markdown', resource);
-		return {
-			enabled: config.get('experimental.validate.enabled', false),
-			validateReferences: config.get('experimental.validate.referenceLinks.enabled', DiagnosticLevel.ignore),
-			validateOwnHeaders: config.get('experimental.validate.headerLinks.enabled', DiagnosticLevel.ignore),
-			validateFilePaths: config.get('experimental.validate.fileLinks.enabled', DiagnosticLevel.ignore),
-			ignoreLinks: config.get('experimental.validate.ignoreLinks', []),
-		};
-	}
-}
-
-class InflightDiagnosticRequests {
-
-	private readonly inFlightRequests = new Map();
-
-	public trigger(resource: vscode.Uri, compute: (token: vscode.CancellationToken) => Promise) {
-		this.cancel(resource);
-
-		const key = this.getResourceKey(resource);
-		const cts = new vscode.CancellationTokenSource();
-		const entry = { cts };
-		this.inFlightRequests.set(key, entry);
-
-		compute(cts.token).finally(() => {
-			if (this.inFlightRequests.get(key) === entry) {
-				this.inFlightRequests.delete(key);
-			}
-			cts.dispose();
-		});
-	}
-
-	public cancel(resource: vscode.Uri) {
-		const key = this.getResourceKey(resource);
-		const existing = this.inFlightRequests.get(key);
-		if (existing) {
-			existing.cts.cancel();
-			this.inFlightRequests.delete(key);
-		}
-	}
-
-	public dispose() {
-		this.clear();
-	}
-
-	public clear() {
-		for (const { cts } of this.inFlightRequests.values()) {
-			cts.dispose();
-		}
-		this.inFlightRequests.clear();
-	}
-
-	private getResourceKey(resource: vscode.Uri): string {
-		return resource.toString();
-	}
-}
-
-class LinkWatcher extends Disposable {
-
-	private readonly _onDidChangeLinkedToFile = this._register(new vscode.EventEmitter>);
-	/**
-	 * Event fired with a list of document uri when one of the links in the document changes
-	 */
-	public readonly onDidChangeLinkedToFile = this._onDidChangeLinkedToFile.event;
-
-	private readonly _watchers = new Map;
-	}>();
-
-	override dispose() {
-		super.dispose();
-
-		for (const entry of this._watchers.values()) {
-			entry.watcher.dispose();
-		}
-		this._watchers.clear();
-	}
-
-	/**
-	 * Set the known links in a markdown document, adding and removing file watchers as needed
-	 */
-	updateLinksForDocument(document: vscode.Uri, links: readonly MdLink[]) {
-		const linkedToResource = new Set(
-			links
-				.filter(link => link.href.kind === 'internal')
-				.map(link => (link.href as InternalHref).path));
-
-		// First decrement watcher counter for previous document state
-		for (const entry of this._watchers.values()) {
-			entry.documents.delete(document.toString());
-		}
-
-		// Then create/update watchers for new document state
-		for (const path of linkedToResource) {
-			let entry = this._watchers.get(path.toString());
-			if (!entry) {
-				entry = {
-					watcher: this.startWatching(path),
-					documents: new Map(),
-				};
-				this._watchers.set(path.toString(), entry);
-			}
-
-			entry.documents.set(document.toString(), document);
-		}
-
-		// Finally clean up watchers for links that are no longer are referenced anywhere
-		for (const [key, value] of this._watchers) {
-			if (value.documents.size === 0) {
-				value.watcher.dispose();
-				this._watchers.delete(key);
-			}
-		}
-	}
-
-	deleteDocument(resource: vscode.Uri) {
-		this.updateLinksForDocument(resource, []);
-	}
-
-	private startWatching(path: vscode.Uri): vscode.Disposable {
-		const watcher = vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(path, '*'), false, true, false);
-		const handler = (resource: vscode.Uri) => this.onLinkedResourceChanged(resource);
-		return vscode.Disposable.from(
-			watcher,
-			watcher.onDidDelete(handler),
-			watcher.onDidCreate(handler),
-		);
-	}
-
-	private onLinkedResourceChanged(resource: vscode.Uri) {
-		const entry = this._watchers.get(resource.toString());
-		if (entry) {
-			this._onDidChangeLinkedToFile.fire(entry.documents.values());
-		}
-	}
-}
-
-class LinkDoesNotExistDiagnostic extends vscode.Diagnostic {
-
-	public readonly link: string;
-
-	constructor(range: vscode.Range, message: string, severity: vscode.DiagnosticSeverity, link: string) {
-		super(range, message, severity);
-		this.link = link;
-	}
-}
-
-export class DiagnosticManager extends Disposable {
-
-	private readonly collection: vscode.DiagnosticCollection;
-
-	private readonly diagnosticDelayer: Delayer;
-	private readonly pendingDiagnostics = new Set();
-	private readonly inFlightDiagnostics = this._register(new InflightDiagnosticRequests());
-
-	private readonly linkWatcher = this._register(new LinkWatcher());
-
-	constructor(
-		private readonly computer: DiagnosticComputer,
-		private readonly configuration: DiagnosticConfiguration,
-	) {
-		super();
-
-		this.diagnosticDelayer = this._register(new Delayer(300));
-
-		this.collection = this._register(vscode.languages.createDiagnosticCollection('markdown'));
-
-		this._register(this.configuration.onDidChange(() => {
-			this.rebuild();
-		}));
-
-		this._register(vscode.workspace.onDidOpenTextDocument(doc => {
-			this.triggerDiagnostics(doc);
-		}));
-
-		this._register(vscode.workspace.onDidChangeTextDocument(e => {
-			this.triggerDiagnostics(e.document);
-		}));
-
-		this._register(vscode.workspace.onDidCloseTextDocument(({ uri }) => {
-			this.pendingDiagnostics.delete(uri);
-			this.inFlightDiagnostics.cancel(uri);
-			this.linkWatcher.deleteDocument(uri);
-			this.collection.delete(uri);
-		}));
-
-		this._register(this.linkWatcher.onDidChangeLinkedToFile(changedDocuments => {
-			for (const resource of changedDocuments) {
-				const doc = vscode.workspace.textDocuments.find(doc => doc.uri.toString() === resource.toString());
-				if (doc) {
-					this.triggerDiagnostics(doc);
-				}
-			}
-		}));
-
-		this.rebuild();
-	}
-
-	public override dispose() {
-		super.dispose();
-		this.pendingDiagnostics.clear();
-	}
-
-	public async recomputeDiagnosticState(doc: SkinnyTextDocument, token: vscode.CancellationToken): Promise<{ diagnostics: readonly vscode.Diagnostic[]; links: readonly MdLink[]; config: DiagnosticOptions }> {
-		const config = this.configuration.getOptions(doc.uri);
-		if (!config.enabled) {
-			return { diagnostics: [], links: [], config };
-		}
-		return { ...await this.computer.getDiagnostics(doc, config, token), config };
-	}
-
-	private async recomputePendingDiagnostics(): Promise {
-		const pending = [...this.pendingDiagnostics];
-		this.pendingDiagnostics.clear();
-
-		for (const resource of pending) {
-			const doc = vscode.workspace.textDocuments.find(doc => doc.uri.fsPath === resource.fsPath);
-			if (doc) {
-				this.inFlightDiagnostics.trigger(doc.uri, async (token) => {
-					const state = await this.recomputeDiagnosticState(doc, token);
-					this.linkWatcher.updateLinksForDocument(doc.uri, state.config.enabled && state.config.validateFilePaths ? state.links : []);
-					this.collection.set(doc.uri, state.diagnostics);
-				});
-			}
-		}
-	}
-
-	private async rebuild() {
-		this.collection.clear();
-		this.pendingDiagnostics.clear();
-		this.inFlightDiagnostics.clear();
-
-		const allOpenedTabResources = this.getAllTabResources();
-		await Promise.all(
-			vscode.workspace.textDocuments
-				.filter(doc => allOpenedTabResources.has(doc.uri.toString()) && isMarkdownFile(doc))
-				.map(doc => this.triggerDiagnostics(doc)));
-	}
-
-	private getAllTabResources() {
-		const openedTabDocs = new Map();
-		for (const group of vscode.window.tabGroups.all) {
-			for (const tab of group.tabs) {
-				if (tab.input instanceof vscode.TabInputText) {
-					openedTabDocs.set(tab.input.uri.toString(), tab.input.uri);
-				}
-			}
-		}
-		return openedTabDocs;
-	}
-
-	private triggerDiagnostics(doc: vscode.TextDocument) {
-		this.inFlightDiagnostics.cancel(doc.uri);
-
-		if (isMarkdownFile(doc)) {
-			this.pendingDiagnostics.add(doc.uri);
-			this.diagnosticDelayer.trigger(() => this.recomputePendingDiagnostics());
-		}
-	}
-}
-
-interface FileLinksData {
-	readonly path: vscode.Uri;
-
-	readonly links: Array<{
-		readonly source: MdLinkSource;
-		readonly fragment: string;
-	}>;
-}
-
-/**
- * Map of file paths to markdown links to that file.
- */
-class FileLinkMap {
-
-	private readonly _filesToLinksMap = new Map();
-
-	constructor(links: Iterable) {
-		for (const link of links) {
-			if (link.href.kind !== 'internal') {
-				continue;
-			}
-
-			const fileKey = link.href.path.toString();
-			const existingFileEntry = this._filesToLinksMap.get(fileKey);
-			const linkData = { source: link.source, fragment: link.href.fragment };
-			if (existingFileEntry) {
-				existingFileEntry.links.push(linkData);
-			} else {
-				this._filesToLinksMap.set(fileKey, { path: link.href.path, links: [linkData] });
-			}
-		}
-	}
-
-	public get size(): number {
-		return this._filesToLinksMap.size;
-	}
-
-	public entries(): Iterable {
-		return this._filesToLinksMap.values();
-	}
-}
-
-export class DiagnosticComputer {
-
-	constructor(
-		private readonly engine: MarkdownEngine,
-		private readonly workspaceContents: MdWorkspaceContents,
-		private readonly linkProvider: MdLinkProvider,
-	) { }
-
-	public async getDiagnostics(doc: SkinnyTextDocument, options: DiagnosticOptions, token: vscode.CancellationToken): Promise<{ readonly diagnostics: vscode.Diagnostic[]; readonly links: MdLink[] }> {
-		const links = await this.linkProvider.getAllLinks(doc, token);
-		if (token.isCancellationRequested) {
-			return { links, diagnostics: [] };
-		}
-
-		return {
-			links,
-			diagnostics: (await Promise.all([
-				this.validateFileLinks(doc, options, links, token),
-				Array.from(this.validateReferenceLinks(options, links)),
-				this.validateOwnHeaderLinks(doc, options, links, token),
-			])).flat()
-		};
-	}
-
-	private async validateOwnHeaderLinks(doc: SkinnyTextDocument, options: DiagnosticOptions, links: readonly MdLink[], token: vscode.CancellationToken): Promise {
-		const severity = toSeverity(options.validateOwnHeaders);
-		if (typeof severity === 'undefined') {
-			return [];
-		}
-
-		const toc = await TableOfContents.create(this.engine, doc);
-		if (token.isCancellationRequested) {
-			return [];
-		}
-
-		const diagnostics: vscode.Diagnostic[] = [];
-		for (const link of links) {
-			if (link.href.kind === 'internal'
-				&& link.href.path.toString() === doc.uri.toString()
-				&& link.href.fragment
-				&& !toc.lookup(link.href.fragment)
-			) {
-				if (!this.isIgnoredLink(options, link.source.text)) {
-					diagnostics.push(new LinkDoesNotExistDiagnostic(
-						link.source.hrefRange,
-						localize('invalidHeaderLink', 'No header found: \'{0}\'', link.href.fragment),
-						severity,
-						link.source.text));
-				}
-			}
-		}
-
-		return diagnostics;
-	}
-
-	private *validateReferenceLinks(options: DiagnosticOptions, links: readonly MdLink[]): Iterable {
-		const severity = toSeverity(options.validateReferences);
-		if (typeof severity === 'undefined') {
-			return [];
-		}
-
-		const definitionSet = new LinkDefinitionSet(links);
-		for (const link of links) {
-			if (link.href.kind === 'reference' && !definitionSet.lookup(link.href.ref)) {
-				yield new vscode.Diagnostic(
-					link.source.hrefRange,
-					localize('invalidReferenceLink', 'No link definition found: \'{0}\'', link.href.ref),
-					severity);
-			}
-		}
-	}
-
-	private async validateFileLinks(doc: SkinnyTextDocument, options: DiagnosticOptions, links: readonly MdLink[], token: vscode.CancellationToken): Promise {
-		const severity = toSeverity(options.validateFilePaths);
-		if (typeof severity === 'undefined') {
-			return [];
-		}
-
-		const linkSet = new FileLinkMap(links);
-		if (linkSet.size === 0) {
-			return [];
-		}
-
-		const limiter = new Limiter(10);
-
-		const diagnostics: vscode.Diagnostic[] = [];
-		await Promise.all(
-			Array.from(linkSet.entries()).map(({ path, links }) => {
-				return limiter.queue(async () => {
-					if (token.isCancellationRequested) {
-						return;
-					}
-
-					const hrefDoc = await tryFindMdDocumentForLink({ kind: 'internal', path: path, fragment: '' }, this.workspaceContents);
-					if (hrefDoc && hrefDoc.uri.toString() === doc.uri.toString()) {
-						// We've already validated our own links in `validateOwnHeaderLinks`
-						return;
-					}
-
-					if (!hrefDoc && !await this.workspaceContents.pathExists(path)) {
-						const msg = localize('invalidPathLink', 'File does not exist at path: {0}', path.fsPath);
-						for (const link of links) {
-							if (!this.isIgnoredLink(options, link.source.pathText)) {
-								diagnostics.push(new LinkDoesNotExistDiagnostic(link.source.hrefRange, msg, severity, link.source.pathText));
-							}
-						}
-					} else if (hrefDoc) {
-						// Validate each of the links to headers in the file
-						const fragmentLinks = links.filter(x => x.fragment);
-						if (fragmentLinks.length) {
-							const toc = await TableOfContents.create(this.engine, hrefDoc);
-							for (const link of fragmentLinks) {
-								if (!toc.lookup(link.fragment) && !this.isIgnoredLink(options, link.source.pathText) && !this.isIgnoredLink(options, link.source.text)) {
-									const msg = localize('invalidLinkToHeaderInOtherFile', 'Header does not exist in file: {0}', link.fragment);
-									diagnostics.push(new LinkDoesNotExistDiagnostic(link.source.hrefRange, msg, severity, link.source.text));
-								}
-							}
-						}
-					}
-				});
-			}));
-		return diagnostics;
-	}
-
-	private isIgnoredLink(options: DiagnosticOptions, link: string): boolean {
-		return options.ignoreLinks.some(glob => picomatch.isMatch(link, glob));
-	}
-}
 
 class AddToIgnoreLinksQuickFixProvider implements vscode.CodeActionProvider {
 
@@ -526,7 +33,7 @@ class AddToIgnoreLinksQuickFixProvider implements vscode.CodeActionProvider {
 		const commandReg = commandManager.register({
 			id: AddToIgnoreLinksQuickFixProvider._addToIgnoreLinksCommandId,
 			execute(resource: vscode.Uri, path: string) {
-				const settingId = 'experimental.validate.ignoreLinks';
+				const settingId = 'validate.ignoredLinks';
 				const config = vscode.workspace.getConfiguration('markdown', resource);
 				const paths = new Set(config.get(settingId, []));
 				paths.add(path);
@@ -540,17 +47,26 @@ class AddToIgnoreLinksQuickFixProvider implements vscode.CodeActionProvider {
 		const fixes: vscode.CodeAction[] = [];
 
 		for (const diagnostic of context.diagnostics) {
-			if (diagnostic instanceof LinkDoesNotExistDiagnostic) {
-				const fix = new vscode.CodeAction(
-					localize('ignoreLinksQuickFix.title', "Exclude '{0}' from link validation.", diagnostic.link),
-					vscode.CodeActionKind.QuickFix);
+			switch (diagnostic.code) {
+				case DiagnosticCode.link_noSuchReferences:
+				case DiagnosticCode.link_noSuchHeaderInOwnFile:
+				case DiagnosticCode.link_noSuchFile:
+				case DiagnosticCode.link_noSuchHeaderInFile: {
+					const hrefText = (diagnostic as any).data?.hrefText;
+					if (hrefText) {
+						const fix = new vscode.CodeAction(
+							localize('ignoreLinksQuickFix.title', "Exclude '{0}' from link validation.", hrefText),
+							vscode.CodeActionKind.QuickFix);
 
-				fix.command = {
-					command: AddToIgnoreLinksQuickFixProvider._addToIgnoreLinksCommandId,
-					title: '',
-					arguments: [document.uri, diagnostic.link]
-				};
-				fixes.push(fix);
+						fix.command = {
+							command: AddToIgnoreLinksQuickFixProvider._addToIgnoreLinksCommandId,
+							title: '',
+							arguments: [document.uri, hrefText],
+						};
+						fixes.push(fix);
+					}
+					break;
+				}
 			}
 		}
 
@@ -558,17 +74,10 @@ class AddToIgnoreLinksQuickFixProvider implements vscode.CodeActionProvider {
 	}
 }
 
-export function register(
+
+export function registerDiagnosticSupport(
 	selector: vscode.DocumentSelector,
-	engine: MarkdownEngine,
-	workspaceContents: MdWorkspaceContents,
-	linkProvider: MdLinkProvider,
 	commandManager: CommandManager,
 ): vscode.Disposable {
-	const configuration = new VSCodeDiagnosticConfiguration();
-	const manager = new DiagnosticManager(new DiagnosticComputer(engine, workspaceContents, linkProvider), configuration);
-	return vscode.Disposable.from(
-		configuration,
-		manager,
-		AddToIgnoreLinksQuickFixProvider.register(selector, commandManager));
+	return AddToIgnoreLinksQuickFixProvider.register(selector, commandManager);
 }
diff --git a/extensions/markdown-language-features/src/languageFeatures/documentLinkProvider.ts b/extensions/markdown-language-features/src/languageFeatures/documentLinkProvider.ts
deleted file mode 100644
index 156db7de13e..00000000000
--- a/extensions/markdown-language-features/src/languageFeatures/documentLinkProvider.ts
+++ /dev/null
@@ -1,455 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as vscode from 'vscode';
-import * as nls from 'vscode-nls';
-import * as uri from 'vscode-uri';
-import { OpenDocumentLinkCommand } from '../commands/openDocumentLink';
-import { MarkdownEngine } from '../markdownEngine';
-import { coalesce } from '../util/arrays';
-import { getUriForLinkWithKnownExternalScheme, isOfScheme, Schemes } from '../util/schemes';
-import { SkinnyTextDocument } from '../workspaceContents';
-
-const localize = nls.loadMessageBundle();
-
-export interface ExternalHref {
-	readonly kind: 'external';
-	readonly uri: vscode.Uri;
-}
-
-export interface InternalHref {
-	readonly kind: 'internal';
-	readonly path: vscode.Uri;
-	readonly fragment: string;
-}
-
-export interface ReferenceHref {
-	readonly kind: 'reference';
-	readonly ref: string;
-}
-
-export type LinkHref = ExternalHref | InternalHref | ReferenceHref;
-
-
-function parseLink(
-	document: SkinnyTextDocument,
-	link: string,
-): ExternalHref | InternalHref | undefined {
-	const cleanLink = stripAngleBrackets(link);
-	const externalSchemeUri = getUriForLinkWithKnownExternalScheme(cleanLink);
-	if (externalSchemeUri) {
-		// Normalize VS Code links to target currently running version
-		if (isOfScheme(Schemes.vscode, link) || isOfScheme(Schemes['vscode-insiders'], link)) {
-			return { kind: 'external', uri: vscode.Uri.parse(link).with({ scheme: vscode.env.uriScheme }) };
-		}
-		return { kind: 'external', uri: externalSchemeUri };
-	}
-
-	if (/^[a-z\-][a-z\-]+:/i.test(cleanLink)) {
-		// Looks like a uri
-		return { kind: 'external', uri: vscode.Uri.parse(cleanLink) };
-	}
-
-	// Assume it must be an relative or absolute file path
-	// Use a fake scheme to avoid parse warnings
-	const tempUri = vscode.Uri.parse(`vscode-resource:${link}`);
-
-	let resourceUri: vscode.Uri | undefined;
-	if (!tempUri.path) {
-		resourceUri = document.uri;
-	} else if (tempUri.path[0] === '/') {
-		const root = getWorkspaceFolder(document);
-		if (root) {
-			resourceUri = vscode.Uri.joinPath(root, tempUri.path);
-		}
-	} else {
-		if (document.uri.scheme === Schemes.untitled) {
-			const root = getWorkspaceFolder(document);
-			if (root) {
-				resourceUri = vscode.Uri.joinPath(root, tempUri.path);
-			}
-		} else {
-			const base = uri.Utils.dirname(document.uri);
-			resourceUri = vscode.Uri.joinPath(base, tempUri.path);
-		}
-	}
-
-	if (!resourceUri) {
-		return undefined;
-	}
-
-	return {
-		kind: 'internal',
-		path: resourceUri.with({ fragment: '' }),
-		fragment: tempUri.fragment,
-	};
-}
-
-function getWorkspaceFolder(document: SkinnyTextDocument) {
-	return vscode.workspace.getWorkspaceFolder(document.uri)?.uri
-		|| vscode.workspace.workspaceFolders?.[0]?.uri;
-}
-
-export interface MdLinkSource {
-	/**
-	 * The original text of the link destination in code.
-	 */
-	readonly text: string;
-
-	/**
-	 * The original text of just the link's path in code.
-	 */
-	readonly pathText: string;
-
-	readonly resource: vscode.Uri;
-	readonly hrefRange: vscode.Range;
-	readonly fragmentRange: vscode.Range | undefined;
-}
-
-export interface MdInlineLink {
-	readonly kind: 'link';
-	readonly source: MdLinkSource;
-	readonly href: LinkHref;
-}
-
-export interface MdLinkDefinition {
-	readonly kind: 'definition';
-	readonly source: MdLinkSource;
-	readonly ref: {
-		readonly range: vscode.Range;
-		readonly text: string;
-	};
-	readonly href: ExternalHref | InternalHref;
-}
-
-export type MdLink = MdInlineLink | MdLinkDefinition;
-
-function extractDocumentLink(
-	document: SkinnyTextDocument,
-	pre: number,
-	link: string,
-	matchIndex: number | undefined
-): MdLink | undefined {
-	const offset = (matchIndex || 0) + pre;
-	const linkStart = document.positionAt(offset);
-	const linkEnd = document.positionAt(offset + link.length);
-	try {
-		const linkTarget = parseLink(document, link);
-		if (!linkTarget) {
-			return undefined;
-		}
-		return {
-			kind: 'link',
-			href: linkTarget,
-			source: {
-				text: link,
-				resource: document.uri,
-				hrefRange: new vscode.Range(linkStart, linkEnd),
-				...getLinkSourceFragmentInfo(document, link, linkStart, linkEnd),
-			}
-		};
-	} catch {
-		return undefined;
-	}
-}
-
-function getFragmentRange(text: string, start: vscode.Position, end: vscode.Position): vscode.Range | undefined {
-	const index = text.indexOf('#');
-	if (index < 0) {
-		return undefined;
-	}
-	return new vscode.Range(start.translate({ characterDelta: index + 1 }), end);
-}
-
-function getLinkSourceFragmentInfo(document: SkinnyTextDocument, link: string, linkStart: vscode.Position, linkEnd: vscode.Position): { fragmentRange: vscode.Range | undefined; pathText: string } {
-	const fragmentRange = getFragmentRange(link, linkStart, linkEnd);
-	return {
-		pathText: document.getText(new vscode.Range(linkStart, fragmentRange ? fragmentRange.start.translate(0, -1) : linkEnd)),
-		fragmentRange,
-	};
-}
-
-const angleBracketLinkRe = /^<(.*)>$/;
-
-/**
- * Used to strip brackets from the markdown link
- *
- *  will be transformed to http://example.com
-*/
-function stripAngleBrackets(link: string) {
-	return link.replace(angleBracketLinkRe, '$1');
-}
-
-/**
- * Matches `[text](link)`
- */
-const linkPattern = /(\[((!\[[^\]]*?\]\(\s*)([^\s\(\)]+?)\s*\)\]|(?:\\\]|[^\]])*\])\(\s*)(([^\s\(\)]|\([^\s\(\)]*?\))+)\s*(".*?")?\)/g;
-
-/**
- * Matches `[text][ref]` or `[shorthand]`
- */
-const referenceLinkPattern = /(^|[^\]\\])(?:(?:(\[((?:\\\]|[^\]])+)\]\[\s*?)([^\s\]]*?)\]|\[\s*?([^\s\]]*?)\])(?![\:\(]))/gm;
-
-/**
- * Matches ``
- */
-const autoLinkPattern = /\<(\w+:[^\>\s]+)\>/g;
-
-/**
- * Matches `[text]: link`
- */
-const definitionPattern = /^([\t ]*\[(?!\^)((?:\\\]|[^\]])+)\]:\s*)([^<]\S*|<[^>]+>)/gm;
-
-const inlineCodePattern = /(?:^|[^`])(`+)(?:.+?|.*?(?:(?:\r?\n).+?)*?)(?:\r?\n)?\1(?:$|[^`])/gm;
-
-class NoLinkRanges {
-	public static async compute(document: SkinnyTextDocument, engine: MarkdownEngine): Promise {
-		const tokens = await engine.parse(document);
-		const multiline = tokens.filter(t => (t.type === 'code_block' || t.type === 'fence' || t.type === 'html_block') && !!t.map).map(t => t.map) as [number, number][];
-
-		const text = document.getText();
-		const inline = [...text.matchAll(inlineCodePattern)].map(match => {
-			const start = match.index || 0;
-			return new vscode.Range(document.positionAt(start), document.positionAt(start + match[0].length));
-		});
-
-		return new NoLinkRanges(multiline, inline);
-	}
-
-	private constructor(
-		/**
-		 * code blocks and fences each represented by [line_start,line_end).
-		 */
-		public readonly multiline: ReadonlyArray<[number, number]>,
-
-		/**
-		 * Inline code spans where links should not be detected
-		 */
-		public readonly inline: readonly vscode.Range[]
-	) { }
-
-	contains(range: vscode.Range): boolean {
-		return this.multiline.some(interval => range.start.line >= interval[0] && range.start.line < interval[1]) ||
-			this.inline.some(position => position.intersection(range));
-	}
-}
-
-
-export class MdLinkProvider implements vscode.DocumentLinkProvider {
-
-	constructor(
-		private readonly engine: MarkdownEngine
-	) { }
-
-	public async provideDocumentLinks(
-		document: SkinnyTextDocument,
-		token: vscode.CancellationToken
-	): Promise {
-		const allLinks = await this.getAllLinks(document, token);
-		if (token.isCancellationRequested) {
-			return [];
-		}
-
-		const definitionSet = new LinkDefinitionSet(allLinks);
-		return coalesce(allLinks
-			.map(data => this.toValidDocumentLink(data, definitionSet)));
-	}
-
-	private toValidDocumentLink(link: MdLink, definitionSet: LinkDefinitionSet): vscode.DocumentLink | undefined {
-		switch (link.href.kind) {
-			case 'external': {
-				return new vscode.DocumentLink(link.source.hrefRange, link.href.uri);
-			}
-			case 'internal': {
-				const uri = OpenDocumentLinkCommand.createCommandUri(link.source.resource, link.href.path, link.href.fragment);
-				const documentLink = new vscode.DocumentLink(link.source.hrefRange, uri);
-				documentLink.tooltip = localize('documentLink.tooltip', 'Follow link');
-				return documentLink;
-			}
-			case 'reference': {
-				const def = definitionSet.lookup(link.href.ref);
-				if (def) {
-					const documentLink = new vscode.DocumentLink(
-						link.source.hrefRange,
-						vscode.Uri.parse(`command:_markdown.moveCursorToPosition?${encodeURIComponent(JSON.stringify([def.source.hrefRange.start.line, def.source.hrefRange.start.character]))}`));
-					documentLink.tooltip = localize('documentLink.referenceTooltip', 'Go to link definition');
-					return documentLink;
-				} else {
-					return undefined;
-				}
-			}
-		}
-	}
-
-	public async getAllLinks(document: SkinnyTextDocument, token: vscode.CancellationToken): Promise {
-		const noLinkRanges = await NoLinkRanges.compute(document, this.engine);
-		if (token.isCancellationRequested) {
-			return [];
-		}
-
-		return Array.from([
-			...this.getInlineLinks(document, noLinkRanges),
-			...this.getReferenceLinks(document, noLinkRanges),
-			...this.getLinkDefinitions2(document, noLinkRanges),
-			...this.getAutoLinks(document, noLinkRanges),
-		]);
-	}
-
-	private *getInlineLinks(document: SkinnyTextDocument, noLinkRanges: NoLinkRanges): Iterable {
-		const text = document.getText();
-
-		for (const match of text.matchAll(linkPattern)) {
-			const matchImageData = match[4] && extractDocumentLink(document, match[3].length + 1, match[4], match.index);
-			if (matchImageData && !noLinkRanges.contains(matchImageData.source.hrefRange)) {
-				yield matchImageData;
-			}
-			const matchLinkData = extractDocumentLink(document, match[1].length, match[5], match.index);
-			if (matchLinkData && !noLinkRanges.contains(matchLinkData.source.hrefRange)) {
-				yield matchLinkData;
-			}
-		}
-	}
-
-	private *getAutoLinks(document: SkinnyTextDocument, noLinkRanges: NoLinkRanges): Iterable {
-		const text = document.getText();
-
-		for (const match of text.matchAll(autoLinkPattern)) {
-			const link = match[1];
-			const linkTarget = parseLink(document, link);
-			if (linkTarget) {
-				const offset = (match.index ?? 0) + 1;
-				const linkStart = document.positionAt(offset);
-				const linkEnd = document.positionAt(offset + link.length);
-				const hrefRange = new vscode.Range(linkStart, linkEnd);
-				if (noLinkRanges.contains(hrefRange)) {
-					continue;
-				}
-				yield {
-					kind: 'link',
-					href: linkTarget,
-					source: {
-						text: link,
-						resource: document.uri,
-						hrefRange: new vscode.Range(linkStart, linkEnd),
-						...getLinkSourceFragmentInfo(document, link, linkStart, linkEnd),
-					}
-				};
-			}
-		}
-	}
-
-	private *getReferenceLinks(document: SkinnyTextDocument, noLinkRanges: NoLinkRanges): Iterable {
-		const text = document.getText();
-		for (const match of text.matchAll(referenceLinkPattern)) {
-			let linkStart: vscode.Position;
-			let linkEnd: vscode.Position;
-			let reference = match[4];
-			if (reference) { // [text][ref]
-				const pre = match[2];
-				const offset = ((match.index ?? 0) + match[1].length) + pre.length;
-				linkStart = document.positionAt(offset);
-				linkEnd = document.positionAt(offset + reference.length);
-			} else if (match[5]) { // [ref][], [ref]
-				reference = match[5];
-				const offset = ((match.index ?? 0) + match[1].length) + 1;
-				linkStart = document.positionAt(offset);
-				const line = document.lineAt(linkStart.line);
-				// See if link looks like a checkbox
-				const checkboxMatch = line.text.match(/^\s*[\-\*]\s*\[x\]/i);
-				if (checkboxMatch && linkStart.character <= checkboxMatch[0].length) {
-					continue;
-				}
-				linkEnd = document.positionAt(offset + reference.length);
-			} else {
-				continue;
-			}
-
-			const hrefRange = new vscode.Range(linkStart, linkEnd);
-			if (noLinkRanges.contains(hrefRange)) {
-				continue;
-			}
-
-			yield {
-				kind: 'link',
-				source: {
-					text: reference,
-					pathText: reference,
-					resource: document.uri,
-					hrefRange,
-					fragmentRange: undefined,
-				},
-				href: {
-					kind: 'reference',
-					ref: reference,
-				}
-			};
-		}
-	}
-
-	public async getLinkDefinitions(document: SkinnyTextDocument): Promise> {
-		const noLinkRanges = await NoLinkRanges.compute(document, this.engine);
-		return this.getLinkDefinitions2(document, noLinkRanges);
-	}
-
-	private *getLinkDefinitions2(document: SkinnyTextDocument, noLinkRanges: NoLinkRanges): Iterable {
-		const text = document.getText();
-		for (const match of text.matchAll(definitionPattern)) {
-			const pre = match[1];
-			const reference = match[2];
-			const link = match[3].trim();
-			const offset = (match.index || 0) + pre.length;
-
-			const refStart = document.positionAt((match.index ?? 0) + 1);
-			const refRange = new vscode.Range(refStart, refStart.translate({ characterDelta: reference.length }));
-
-			let linkStart: vscode.Position;
-			let linkEnd: vscode.Position;
-			let text: string;
-			if (angleBracketLinkRe.test(link)) {
-				linkStart = document.positionAt(offset + 1);
-				linkEnd = document.positionAt(offset + link.length - 1);
-				text = link.substring(1, link.length - 1);
-			} else {
-				linkStart = document.positionAt(offset);
-				linkEnd = document.positionAt(offset + link.length);
-				text = link;
-			}
-			const hrefRange = new vscode.Range(linkStart, linkEnd);
-			if (noLinkRanges.contains(hrefRange)) {
-				continue;
-			}
-			const target = parseLink(document, text);
-			if (target) {
-				yield {
-					kind: 'definition',
-					source: {
-						text: link,
-						resource: document.uri,
-						hrefRange,
-						...getLinkSourceFragmentInfo(document, link, linkStart, linkEnd),
-					},
-					ref: { text: reference, range: refRange },
-					href: target,
-				};
-			}
-		}
-	}
-}
-
-export class LinkDefinitionSet {
-	private readonly _map = new Map();
-
-	constructor(links: Iterable) {
-		for (const link of links) {
-			if (link.kind === 'definition') {
-				this._map.set(link.ref.text, link);
-			}
-		}
-	}
-
-	public lookup(ref: string): MdLinkDefinition | undefined {
-		return this._map.get(ref);
-	}
-}
diff --git a/extensions/markdown-language-features/src/languageFeatures/documentSymbolProvider.ts b/extensions/markdown-language-features/src/languageFeatures/documentSymbolProvider.ts
deleted file mode 100644
index cdb1b8a79b8..00000000000
--- a/extensions/markdown-language-features/src/languageFeatures/documentSymbolProvider.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as vscode from 'vscode';
-import { MarkdownEngine } from '../markdownEngine';
-import { TableOfContents, TocEntry } from '../tableOfContents';
-import { SkinnyTextDocument } from '../workspaceContents';
-
-interface MarkdownSymbol {
-	readonly level: number;
-	readonly parent: MarkdownSymbol | undefined;
-	readonly children: vscode.DocumentSymbol[];
-}
-
-export class MdDocumentSymbolProvider implements vscode.DocumentSymbolProvider {
-
-	constructor(
-		private readonly engine: MarkdownEngine
-	) { }
-
-	public async provideDocumentSymbolInformation(document: SkinnyTextDocument): Promise {
-		const toc = await TableOfContents.create(this.engine, document);
-		return toc.entries.map(entry => this.toSymbolInformation(entry));
-	}
-
-	public async provideDocumentSymbols(document: SkinnyTextDocument): Promise {
-		const toc = await TableOfContents.create(this.engine, document);
-		const root: MarkdownSymbol = {
-			level: -Infinity,
-			children: [],
-			parent: undefined
-		};
-		this.buildTree(root, toc.entries);
-		return root.children;
-	}
-
-	private buildTree(parent: MarkdownSymbol, entries: readonly TocEntry[]) {
-		if (!entries.length) {
-			return;
-		}
-
-		const entry = entries[0];
-		const symbol = this.toDocumentSymbol(entry);
-		symbol.children = [];
-
-		while (parent && entry.level <= parent.level) {
-			parent = parent.parent!;
-		}
-		parent.children.push(symbol);
-		this.buildTree({ level: entry.level, children: symbol.children, parent }, entries.slice(1));
-	}
-
-
-	private toSymbolInformation(entry: TocEntry): vscode.SymbolInformation {
-		return new vscode.SymbolInformation(
-			this.getSymbolName(entry),
-			vscode.SymbolKind.String,
-			'',
-			entry.sectionLocation);
-	}
-
-	private toDocumentSymbol(entry: TocEntry) {
-		return new vscode.DocumentSymbol(
-			this.getSymbolName(entry),
-			'',
-			vscode.SymbolKind.String,
-			entry.sectionLocation.range,
-			entry.sectionLocation.range);
-	}
-
-	private getSymbolName(entry: TocEntry): string {
-		return '#'.repeat(entry.level) + ' ' + entry.text;
-	}
-}
diff --git a/extensions/markdown-language-features/src/languageFeatures/dropIntoEditor.ts b/extensions/markdown-language-features/src/languageFeatures/dropIntoEditor.ts
index 2ad71ec0516..e13905a316c 100644
--- a/extensions/markdown-language-features/src/languageFeatures/dropIntoEditor.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/dropIntoEditor.ts
@@ -6,38 +6,39 @@
 import * as path from 'path';
 import * as vscode from 'vscode';
 import * as URI from 'vscode-uri';
+import { Schemes } from '../util/schemes';
 
-const imageFileExtensions = new Set([
-	'.bmp',
-	'.gif',
-	'.ico',
-	'.jpe',
-	'.jpeg',
-	'.jpg',
-	'.png',
-	'.psd',
-	'.svg',
-	'.tga',
-	'.tif',
-	'.tiff',
-	'.webp',
+export const imageFileExtensions = new Set([
+	'bmp',
+	'gif',
+	'ico',
+	'jpe',
+	'jpeg',
+	'jpg',
+	'png',
+	'psd',
+	'svg',
+	'tga',
+	'tif',
+	'tiff',
+	'webp',
 ]);
 
-export function registerDropIntoEditor(selector: vscode.DocumentSelector) {
-	return vscode.languages.registerDocumentOnDropEditProvider(selector, new class implements vscode.DocumentOnDropEditProvider {
-		async provideDocumentOnDropEdits(document: vscode.TextDocument, position: vscode.Position, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Promise {
+export function registerDropIntoEditorSupport(selector: vscode.DocumentSelector) {
+	return vscode.languages.registerDocumentDropEditProvider(selector, new class implements vscode.DocumentDropEditProvider {
+		async provideDocumentDropEdits(document: vscode.TextDocument, _position: vscode.Position, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Promise {
 			const enabled = vscode.workspace.getConfiguration('markdown', document).get('editor.drop.enabled', true);
 			if (!enabled) {
-				return;
+				return undefined;
 			}
 
-			const replacementRange = new vscode.Range(position, position);
-			return tryInsertUriList(document, replacementRange, dataTransfer, token);
+			const snippet = await tryGetUriListSnippet(document, dataTransfer, token);
+			return snippet ? new vscode.DocumentDropEdit(snippet) : undefined;
 		}
 	});
 }
 
-export async function tryInsertUriList(document: vscode.TextDocument, replacementRange: vscode.Range, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Promise {
+export async function tryGetUriListSnippet(document: vscode.TextDocument, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Promise {
 	const urlList = await dataTransfer.get('text/uri-list')?.asString();
 	if (!urlList || token.isCancellationRequested) {
 		return undefined;
@@ -52,25 +53,73 @@ export async function tryInsertUriList(document: vscode.TextDocument, replacemen
 		}
 	}
 
+	return createUriListSnippet(document, uris);
+}
+
+interface UriListSnippetOptions {
+	readonly placeholderText?: string;
+
+	readonly placeholderStartIndex?: number;
+
+	/**
+	 * Should the snippet be for an image?
+	 *
+	 * If `undefined`, tries to infer this from the uri.
+	 */
+	readonly insertAsImage?: boolean;
+
+	readonly separator?: string;
+}
+
+export function createUriListSnippet(document: vscode.TextDocument, uris: readonly vscode.Uri[], options?: UriListSnippetOptions): vscode.SnippetString | undefined {
 	if (!uris.length) {
-		return;
+		return undefined;
 	}
 
+	const dir = getDocumentDir(document);
+
 	const snippet = new vscode.SnippetString();
 	uris.forEach((uri, i) => {
-		const mdPath = document.uri.scheme === uri.scheme
-			? encodeURI(path.relative(URI.Utils.dirname(document.uri).fsPath, uri.fsPath).replace(/\\/g, '/'))
+		const mdPath = dir && dir.scheme === uri.scheme && dir.authority === uri.authority
+			? encodeURI(path.relative(dir.fsPath, uri.fsPath).replace(/\\/g, '/'))
 			: uri.toString(false);
 
-		const ext = URI.Utils.extname(uri).toLowerCase();
-		snippet.appendText(imageFileExtensions.has(ext) ? '![' : '[');
-		snippet.appendTabstop();
+		const ext = URI.Utils.extname(uri).toLowerCase().replace('.', '');
+		const insertAsImage = typeof options?.insertAsImage === 'undefined' ? imageFileExtensions.has(ext) : !!options.insertAsImage;
+
+		snippet.appendText(insertAsImage ? '![' : '[');
+
+		const placeholderText = options?.placeholderText ?? (insertAsImage ? 'Alt text' : 'label');
+		const placeholderIndex = typeof options?.placeholderStartIndex !== 'undefined' ? options?.placeholderStartIndex + i : undefined;
+		snippet.appendPlaceholder(placeholderText, placeholderIndex);
+
 		snippet.appendText(`](${mdPath})`);
 
-		if (i <= uris.length - 1 && uris.length > 1) {
-			snippet.appendText(' ');
+		if (i < uris.length - 1 && uris.length > 1) {
+			snippet.appendText(options?.separator ?? ' ');
 		}
 	});
-
-	return new vscode.SnippetTextEdit(replacementRange, snippet);
+	return snippet;
+}
+
+function getDocumentDir(document: vscode.TextDocument): vscode.Uri | undefined {
+	const docUri = getParentDocumentUri(document);
+	if (docUri.scheme === Schemes.untitled) {
+		return vscode.workspace.workspaceFolders?.[0]?.uri;
+	}
+	return URI.Utils.dirname(docUri);
+}
+
+export function getParentDocumentUri(document: vscode.TextDocument): vscode.Uri {
+	if (document.uri.scheme === Schemes.notebookCell) {
+		for (const notebook of vscode.workspace.notebookDocuments) {
+			for (const cell of notebook.getCells()) {
+				if (cell.document === document) {
+					return notebook.uri;
+				}
+			}
+		}
+	}
+
+	return document.uri;
 }
diff --git a/extensions/markdown-language-features/src/languageFeatures/fileReferences.ts b/extensions/markdown-language-features/src/languageFeatures/fileReferences.ts
index b9f1321cf06..46ed49f3c4b 100644
--- a/extensions/markdown-language-features/src/languageFeatures/fileReferences.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/fileReferences.ts
@@ -4,9 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import type * as lsp from 'vscode-languageserver-types';
 import * as nls from 'vscode-nls';
+import { MdLanguageClient } from '../client/client';
 import { Command, CommandManager } from '../commandManager';
-import { MdReferencesProvider } from './references';
 
 const localize = nls.loadMessageBundle();
 
@@ -16,14 +17,11 @@ export class FindFileReferencesCommand implements Command {
 	public readonly id = 'markdown.findAllFileReferences';
 
 	constructor(
-		private readonly referencesProvider: MdReferencesProvider,
+		private readonly client: MdLanguageClient,
 	) { }
 
 	public async execute(resource?: vscode.Uri) {
-		if (!resource) {
-			resource = vscode.window.activeTextEditor?.document.uri;
-		}
-
+		resource ??= vscode.window.activeTextEditor?.document.uri;
 		if (!resource) {
 			vscode.window.showErrorMessage(localize('error.noResource', "Find file references failed. No resource provided."));
 			return;
@@ -33,8 +31,9 @@ export class FindFileReferencesCommand implements Command {
 			location: vscode.ProgressLocation.Window,
 			title: localize('progress.title', "Finding file references")
 		}, async (_progress, token) => {
-			const references = await this.referencesProvider.getAllReferencesToFile(resource!, token);
-			const locations = references.map(ref => ref.location);
+			const locations = (await this.client.getReferencesToFileInWorkspace(resource!, token)).map(loc => {
+				return new vscode.Location(vscode.Uri.parse(loc.uri), convertRange(loc.range));
+			});
 
 			const config = vscode.workspace.getConfiguration('references');
 			const existingSetting = config.inspect('preferredLocation');
@@ -49,6 +48,13 @@ export class FindFileReferencesCommand implements Command {
 	}
 }
 
-export function registerFindFileReferences(commandManager: CommandManager, referencesProvider: MdReferencesProvider): vscode.Disposable {
-	return commandManager.register(new FindFileReferencesCommand(referencesProvider));
+export function convertRange(range: lsp.Range): vscode.Range {
+	return new vscode.Range(range.start.line, range.start.character, range.end.line, range.end.character);
+}
+
+export function registerFindFileReferenceSupport(
+	commandManager: CommandManager,
+	client: MdLanguageClient,
+): vscode.Disposable {
+	return commandManager.register(new FindFileReferencesCommand(client));
 }
diff --git a/extensions/markdown-language-features/src/languageFeatures/foldingProvider.ts b/extensions/markdown-language-features/src/languageFeatures/foldingProvider.ts
deleted file mode 100644
index 243a2ee12fd..00000000000
--- a/extensions/markdown-language-features/src/languageFeatures/foldingProvider.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import Token = require('markdown-it/lib/token');
-import * as vscode from 'vscode';
-import { MarkdownEngine } from '../markdownEngine';
-import { TableOfContents } from '../tableOfContents';
-import { SkinnyTextDocument } from '../workspaceContents';
-
-const rangeLimit = 5000;
-
-interface MarkdownItTokenWithMap extends Token {
-	map: [number, number];
-}
-
-export class MdFoldingProvider implements vscode.FoldingRangeProvider {
-
-	constructor(
-		private readonly engine: MarkdownEngine
-	) { }
-
-	public async provideFoldingRanges(
-		document: SkinnyTextDocument,
-		_: vscode.FoldingContext,
-		_token: vscode.CancellationToken
-	): Promise {
-		const foldables = await Promise.all([
-			this.getRegions(document),
-			this.getHeaderFoldingRanges(document),
-			this.getBlockFoldingRanges(document)
-		]);
-		return foldables.flat().slice(0, rangeLimit);
-	}
-
-	private async getRegions(document: SkinnyTextDocument): Promise {
-		const tokens = await this.engine.parse(document);
-		const regionMarkers = tokens.filter(isRegionMarker)
-			.map(token => ({ line: token.map[0], isStart: isStartRegion(token.content) }));
-
-		const nestingStack: { line: number; isStart: boolean }[] = [];
-		return regionMarkers
-			.map(marker => {
-				if (marker.isStart) {
-					nestingStack.push(marker);
-				} else if (nestingStack.length && nestingStack[nestingStack.length - 1].isStart) {
-					return new vscode.FoldingRange(nestingStack.pop()!.line, marker.line, vscode.FoldingRangeKind.Region);
-				} else {
-					// noop: invalid nesting (i.e. [end, start] or [start, end, end])
-				}
-				return null;
-			})
-			.filter((region: vscode.FoldingRange | null): region is vscode.FoldingRange => !!region);
-	}
-
-	private async getHeaderFoldingRanges(document: SkinnyTextDocument) {
-		const toc = await TableOfContents.create(this.engine, document);
-		return toc.entries.map(entry => {
-			let endLine = entry.sectionLocation.range.end.line;
-			if (document.lineAt(endLine).isEmptyOrWhitespace && endLine >= entry.line + 1) {
-				endLine = endLine - 1;
-			}
-			return new vscode.FoldingRange(entry.line, endLine);
-		});
-	}
-
-	private async getBlockFoldingRanges(document: SkinnyTextDocument): Promise {
-		const tokens = await this.engine.parse(document);
-		const multiLineListItems = tokens.filter(isFoldableToken);
-		return multiLineListItems.map(listItem => {
-			const start = listItem.map[0];
-			let end = listItem.map[1] - 1;
-			if (document.lineAt(end).isEmptyOrWhitespace && end >= start + 1) {
-				end = end - 1;
-			}
-			return new vscode.FoldingRange(start, end, this.getFoldingRangeKind(listItem));
-		});
-	}
-
-	private getFoldingRangeKind(listItem: Token): vscode.FoldingRangeKind | undefined {
-		return listItem.type === 'html_block' && listItem.content.startsWith('/.test(t);
-const isEndRegion = (t: string) => /^\s*/.test(t);
-
-const isRegionMarker = (token: Token): token is MarkdownItTokenWithMap =>
-	!!token.map && token.type === 'html_block' && (isStartRegion(token.content) || isEndRegion(token.content));
-
-const isFoldableToken = (token: Token): token is MarkdownItTokenWithMap => {
-	if (!token.map) {
-		return false;
-	}
-
-	switch (token.type) {
-		case 'fence':
-		case 'list_item_open':
-			return token.map[1] > token.map[0];
-
-		case 'html_block':
-			if (isRegionMarker(token)) {
-				return false;
-			}
-			return token.map[1] > token.map[0] + 1;
-
-		default:
-			return false;
-	}
-};
diff --git a/extensions/markdown-language-features/src/languageFeatures/linkUpdater.ts b/extensions/markdown-language-features/src/languageFeatures/linkUpdater.ts
new file mode 100644
index 00000000000..39d083f1329
--- /dev/null
+++ b/extensions/markdown-language-features/src/languageFeatures/linkUpdater.ts
@@ -0,0 +1,232 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import * as picomatch from 'picomatch';
+import * as vscode from 'vscode';
+import { TextDocumentEdit } from 'vscode-languageclient';
+import * as nls from 'vscode-nls';
+import { MdLanguageClient } from '../client/client';
+import { Delayer } from '../util/async';
+import { noopToken } from '../util/cancellation';
+import { Disposable } from '../util/dispose';
+import { convertRange } from './fileReferences';
+
+const localize = nls.loadMessageBundle();
+
+const settingNames = Object.freeze({
+	enabled: 'updateLinksOnFileMove.enabled',
+	include: 'updateLinksOnFileMove.include',
+	enableForDirectories: 'updateLinksOnFileMove.enableForDirectories',
+});
+
+const enum UpdateLinksOnFileMoveSetting {
+	Prompt = 'prompt',
+	Always = 'always',
+	Never = 'never',
+}
+
+interface RenameAction {
+	readonly oldUri: vscode.Uri;
+	readonly newUri: vscode.Uri;
+}
+
+class UpdateLinksOnFileRenameHandler extends Disposable {
+
+	private readonly _delayer = new Delayer(50);
+	private readonly _pendingRenames = new Set();
+
+	public constructor(
+		private readonly client: MdLanguageClient,
+	) {
+		super();
+
+		this._register(vscode.workspace.onDidRenameFiles(async (e) => {
+			await Promise.all(e.files.map(async (rename) => {
+				if (await this.shouldParticipateInLinkUpdate(rename.newUri)) {
+					this._pendingRenames.add(rename);
+				}
+			}));
+
+			if (this._pendingRenames.size) {
+				this._delayer.trigger(() => {
+					vscode.window.withProgress({
+						location: vscode.ProgressLocation.Window,
+						title: localize('renameProgress.title', "Checking for Markdown links to update")
+					}, () => this.flushRenames());
+				});
+			}
+		}));
+	}
+
+	private async flushRenames(): Promise {
+		const renames = Array.from(this._pendingRenames);
+		this._pendingRenames.clear();
+
+		const result = await this.getEditsForFileRename(renames, noopToken);
+
+		if (result && result.edit.size) {
+			if (await this.confirmActionWithUser(result.resourcesBeingRenamed)) {
+				await vscode.workspace.applyEdit(result.edit);
+			}
+		}
+	}
+
+	private async confirmActionWithUser(newResources: readonly vscode.Uri[]): Promise {
+		if (!newResources.length) {
+			return false;
+		}
+
+		const config = vscode.workspace.getConfiguration('markdown', newResources[0]);
+		const setting = config.get(settingNames.enabled);
+		switch (setting) {
+			case UpdateLinksOnFileMoveSetting.Prompt:
+				return this.promptUser(newResources);
+			case UpdateLinksOnFileMoveSetting.Always:
+				return true;
+			case UpdateLinksOnFileMoveSetting.Never:
+			default:
+				return false;
+		}
+	}
+	private async shouldParticipateInLinkUpdate(newUri: vscode.Uri): Promise {
+		const config = vscode.workspace.getConfiguration('markdown', newUri);
+		const setting = config.get(settingNames.enabled);
+		if (setting === UpdateLinksOnFileMoveSetting.Never) {
+			return false;
+		}
+
+		const externalGlob = config.get(settingNames.include);
+		if (externalGlob) {
+			for (const glob of externalGlob) {
+				if (picomatch.isMatch(newUri.fsPath, glob)) {
+					return true;
+				}
+			}
+		}
+
+		const stat = await vscode.workspace.fs.stat(newUri);
+		if (stat.type === vscode.FileType.Directory) {
+			return config.get(settingNames.enableForDirectories, true);
+		}
+
+		return false;
+	}
+
+	private async promptUser(newResources: readonly vscode.Uri[]): Promise {
+		if (!newResources.length) {
+			return false;
+		}
+
+		const rejectItem: vscode.MessageItem = {
+			title: localize('reject.title', "No"),
+			isCloseAffordance: true,
+		};
+
+		const acceptItem: vscode.MessageItem = {
+			title: localize('accept.title', "Yes"),
+		};
+
+		const alwaysItem: vscode.MessageItem = {
+			title: localize('always.title', "Always"),
+		};
+
+		const neverItem: vscode.MessageItem = {
+			title: localize('never.title', "Never"),
+		};
+
+		const choice = await vscode.window.showInformationMessage(
+			newResources.length === 1
+				? localize('prompt', "Update Markdown links for '{0}'?", path.basename(newResources[0].fsPath))
+				: this.getConfirmMessage(localize('promptMoreThanOne', "Update Markdown links for the following {0} files?", newResources.length), newResources), {
+			modal: true,
+		}, rejectItem, acceptItem, alwaysItem, neverItem);
+
+		switch (choice) {
+			case acceptItem: {
+				return true;
+			}
+			case rejectItem: {
+				return false;
+			}
+			case alwaysItem: {
+				const config = vscode.workspace.getConfiguration('markdown', newResources[0]);
+				config.update(
+					settingNames.enabled,
+					UpdateLinksOnFileMoveSetting.Always,
+					this.getConfigTargetScope(config, settingNames.enabled));
+				return true;
+			}
+			case neverItem: {
+				const config = vscode.workspace.getConfiguration('markdown', newResources[0]);
+				config.update(
+					settingNames.enabled,
+					UpdateLinksOnFileMoveSetting.Never,
+					this.getConfigTargetScope(config, settingNames.enabled));
+				return false;
+			}
+			default: {
+				return false;
+			}
+		}
+	}
+
+	private async getEditsForFileRename(renames: readonly RenameAction[], token: vscode.CancellationToken): Promise<{ edit: vscode.WorkspaceEdit; resourcesBeingRenamed: vscode.Uri[] } | undefined> {
+		const result = await this.client.getEditForFileRenames(renames.map(rename => ({ oldUri: rename.oldUri.toString(), newUri: rename.newUri.toString() })), token);
+		if (!result?.edit.documentChanges?.length) {
+			return undefined;
+		}
+
+		const workspaceEdit = new vscode.WorkspaceEdit();
+
+		for (const change of result.edit.documentChanges as TextDocumentEdit[]) {
+			const uri = vscode.Uri.parse(change.textDocument.uri);
+			for (const edit of change.edits) {
+				workspaceEdit.replace(uri, convertRange(edit.range), edit.newText);
+			}
+		}
+
+		return {
+			edit: workspaceEdit,
+			resourcesBeingRenamed: result.participatingRenames.map(x => vscode.Uri.parse(x.newUri)),
+		};
+	}
+
+	private getConfirmMessage(start: string, resourcesToConfirm: readonly vscode.Uri[]): string {
+		const MAX_CONFIRM_FILES = 10;
+
+		const paths = [start];
+		paths.push('');
+		paths.push(...resourcesToConfirm.slice(0, MAX_CONFIRM_FILES).map(r => path.basename(r.fsPath)));
+
+		if (resourcesToConfirm.length > MAX_CONFIRM_FILES) {
+			if (resourcesToConfirm.length - MAX_CONFIRM_FILES === 1) {
+				paths.push(localize('moreFile', "...1 additional file not shown"));
+			} else {
+				paths.push(localize('moreFiles', "...{0} additional files not shown", resourcesToConfirm.length - MAX_CONFIRM_FILES));
+			}
+		}
+
+		paths.push('');
+		return paths.join('\n');
+	}
+
+	private getConfigTargetScope(config: vscode.WorkspaceConfiguration, settingsName: string): vscode.ConfigurationTarget {
+		const inspected = config.inspect(settingsName);
+		if (inspected?.workspaceFolderValue) {
+			return vscode.ConfigurationTarget.WorkspaceFolder;
+		}
+
+		if (inspected?.workspaceValue) {
+			return vscode.ConfigurationTarget.Workspace;
+		}
+
+		return vscode.ConfigurationTarget.Global;
+	}
+}
+
+export function registerUpdateLinksOnRename(client: MdLanguageClient): vscode.Disposable {
+	return new UpdateLinksOnFileRenameHandler(client);
+}
diff --git a/extensions/markdown-language-features/src/languageFeatures/pathCompletions.ts b/extensions/markdown-language-features/src/languageFeatures/pathCompletions.ts
deleted file mode 100644
index c4e3b5afe5a..00000000000
--- a/extensions/markdown-language-features/src/languageFeatures/pathCompletions.ts
+++ /dev/null
@@ -1,353 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { dirname, resolve } from 'path';
-import * as vscode from 'vscode';
-import { MarkdownEngine } from '../markdownEngine';
-import { TableOfContents } from '../tableOfContents';
-import { resolveUriToMarkdownFile } from '../util/openDocumentLink';
-import { SkinnyTextDocument } from '../workspaceContents';
-import { MdLinkProvider } from './documentLinkProvider';
-
-enum CompletionContextKind {
-	/** `[...](|)` */
-	Link,
-
-	/** `[...][|]` */
-	ReferenceLink,
-
-	/** `[]: |` */
-	LinkDefinition,
-}
-
-interface AnchorContext {
-	/**
-	 * Link text before the `#`.
-	 *
-	 * For `[text](xy#z|abc)` this is `xy`.
-	 */
-	readonly beforeAnchor: string;
-
-	/**
-	 * Text of the anchor before the current position.
-	 *
-	 * For `[text](xy#z|abc)` this is `z`.
-	 */
-	readonly anchorPrefix: string;
-}
-
-interface CompletionContext {
-	readonly kind: CompletionContextKind;
-
-	/**
-	 * Text of the link before the current position
-	 *
-	 * For `[text](xy#z|abc)` this is `xy#z`.
-	 */
-	readonly linkPrefix: string;
-
-	/**
-	 * Position of the start of the link.
-	 *
-	 * For `[text](xy#z|abc)` this is the position before `xy`.
-	 */
-	readonly linkTextStartPosition: vscode.Position;
-
-	/**
-	 * Text of the link after the current position.
-	 *
-	 * For `[text](xy#z|abc)` this is `abc`.
-	 */
-	readonly linkSuffix: string;
-
-	/**
-	 * Info if the link looks like it is for an anchor: `[](#header)`
-	 */
-	readonly anchorInfo?: AnchorContext;
-}
-
-function tryDecodeUriComponent(str: string): string {
-	try {
-		return decodeURIComponent(str);
-	} catch {
-		return str;
-	}
-}
-
-export class MdPathCompletionProvider implements vscode.CompletionItemProvider {
-
-	public static register(
-		selector: vscode.DocumentSelector,
-		engine: MarkdownEngine,
-		linkProvider: MdLinkProvider,
-	): vscode.Disposable {
-		return vscode.languages.registerCompletionItemProvider(selector, new MdPathCompletionProvider(engine, linkProvider), '.', '/', '#');
-	}
-
-	constructor(
-		private readonly engine: MarkdownEngine,
-		private readonly linkProvider: MdLinkProvider,
-	) { }
-
-	public async provideCompletionItems(document: SkinnyTextDocument, position: vscode.Position, _token: vscode.CancellationToken, _context: vscode.CompletionContext): Promise {
-		if (!this.arePathSuggestionEnabled(document)) {
-			return [];
-		}
-
-		const context = this.getPathCompletionContext(document, position);
-		if (!context) {
-			return [];
-		}
-
-		switch (context.kind) {
-			case CompletionContextKind.ReferenceLink: {
-				const items: vscode.CompletionItem[] = [];
-				for await (const item of this.provideReferenceSuggestions(document, position, context)) {
-					items.push(item);
-				}
-				return items;
-			}
-
-			case CompletionContextKind.LinkDefinition:
-			case CompletionContextKind.Link: {
-				const items: vscode.CompletionItem[] = [];
-
-				const isAnchorInCurrentDoc = context.anchorInfo && context.anchorInfo.beforeAnchor.length === 0;
-
-				// Add anchor #links in current doc
-				if (context.linkPrefix.length === 0 || isAnchorInCurrentDoc) {
-					const insertRange = new vscode.Range(context.linkTextStartPosition, position);
-					for await (const item of this.provideHeaderSuggestions(document, position, context, insertRange)) {
-						items.push(item);
-					}
-				}
-
-				if (!isAnchorInCurrentDoc) {
-					if (context.anchorInfo) { // Anchor to a different document
-						const rawUri = this.resolveReference(document, context.anchorInfo.beforeAnchor);
-						if (rawUri) {
-							const otherDoc = await resolveUriToMarkdownFile(rawUri);
-							if (otherDoc) {
-								const anchorStartPosition = position.translate({ characterDelta: -(context.anchorInfo.anchorPrefix.length + 1) });
-								const range = new vscode.Range(anchorStartPosition, position);
-								for await (const item of this.provideHeaderSuggestions(otherDoc, position, context, range)) {
-									items.push(item);
-								}
-							}
-						}
-					} else { // Normal path suggestions
-						for await (const item of this.providePathSuggestions(document, position, context)) {
-							items.push(item);
-						}
-					}
-				}
-
-				return items;
-			}
-		}
-	}
-
-	private arePathSuggestionEnabled(document: SkinnyTextDocument): boolean {
-		const config = vscode.workspace.getConfiguration('markdown', document.uri);
-		return config.get('suggest.paths.enabled', true);
-	}
-
-	/// [...](...|
-	private readonly linkStartPattern = /\[([^\]]*?)\]\(\s*([^\s\(\)]*)$/;
-
-	/// [...][...|
-	private readonly referenceLinkStartPattern = /\[([^\]]*?)\]\[\s*([^\s\(\)]*)$/;
-
-	/// [id]: |
-	private readonly definitionPattern = /^\s*\[[\w\-]+\]:\s*([^\s]*)$/m;
-
-	private getPathCompletionContext(document: SkinnyTextDocument, position: vscode.Position): CompletionContext | undefined {
-		const line = document.lineAt(position.line).text;
-
-		const linePrefixText = line.slice(0, position.character);
-		const lineSuffixText = line.slice(position.character);
-
-		const linkPrefixMatch = linePrefixText.match(this.linkStartPattern);
-		if (linkPrefixMatch) {
-			const prefix = linkPrefixMatch[2];
-			if (this.refLooksLikeUrl(prefix)) {
-				return undefined;
-			}
-
-			const suffix = lineSuffixText.match(/^[^\)\s]*/);
-			return {
-				kind: CompletionContextKind.Link,
-				linkPrefix: tryDecodeUriComponent(prefix),
-				linkTextStartPosition: position.translate({ characterDelta: -prefix.length }),
-				linkSuffix: suffix ? suffix[0] : '',
-				anchorInfo: this.getAnchorContext(prefix),
-			};
-		}
-
-		const definitionLinkPrefixMatch = linePrefixText.match(this.definitionPattern);
-		if (definitionLinkPrefixMatch) {
-			const prefix = definitionLinkPrefixMatch[1];
-			if (this.refLooksLikeUrl(prefix)) {
-				return undefined;
-			}
-
-			const suffix = lineSuffixText.match(/^[^\s]*/);
-			return {
-				kind: CompletionContextKind.LinkDefinition,
-				linkPrefix: tryDecodeUriComponent(prefix),
-				linkTextStartPosition: position.translate({ characterDelta: -prefix.length }),
-				linkSuffix: suffix ? suffix[0] : '',
-				anchorInfo: this.getAnchorContext(prefix),
-			};
-		}
-
-		const referenceLinkPrefixMatch = linePrefixText.match(this.referenceLinkStartPattern);
-		if (referenceLinkPrefixMatch) {
-			const prefix = referenceLinkPrefixMatch[2];
-			const suffix = lineSuffixText.match(/^[^\]\s]*/);
-			return {
-				kind: CompletionContextKind.ReferenceLink,
-				linkPrefix: prefix,
-				linkTextStartPosition: position.translate({ characterDelta: -prefix.length }),
-				linkSuffix: suffix ? suffix[0] : '',
-			};
-		}
-
-		return undefined;
-	}
-
-	/**
-	 * Check if {@param ref} looks like a 'http:' style url.
-	 */
-	private refLooksLikeUrl(prefix: string): boolean {
-		return /^\s*[\w\d\-]+:/.test(prefix);
-	}
-
-	private getAnchorContext(prefix: string): AnchorContext | undefined {
-		const anchorMatch = prefix.match(/^(.*)#([\w\d\-]*)$/);
-		if (!anchorMatch) {
-			return undefined;
-		}
-		return {
-			beforeAnchor: anchorMatch[1],
-			anchorPrefix: anchorMatch[2],
-		};
-	}
-
-	private async *provideReferenceSuggestions(document: SkinnyTextDocument, position: vscode.Position, context: CompletionContext): AsyncIterable {
-		const insertionRange = new vscode.Range(context.linkTextStartPosition, position);
-		const replacementRange = new vscode.Range(insertionRange.start, position.translate({ characterDelta: context.linkSuffix.length }));
-
-		const definitions = await this.linkProvider.getLinkDefinitions(document);
-		for (const def of definitions) {
-			yield {
-				kind: vscode.CompletionItemKind.Reference,
-				label: def.ref.text,
-				range: {
-					inserting: insertionRange,
-					replacing: replacementRange,
-				},
-			};
-		}
-	}
-
-	private async *provideHeaderSuggestions(document: SkinnyTextDocument, position: vscode.Position, context: CompletionContext, insertionRange: vscode.Range): AsyncIterable {
-		const toc = await TableOfContents.createForDocumentOrNotebook(this.engine, document);
-		for (const entry of toc.entries) {
-			const replacementRange = new vscode.Range(insertionRange.start, position.translate({ characterDelta: context.linkSuffix.length }));
-			yield {
-				kind: vscode.CompletionItemKind.Reference,
-				label: '#' + decodeURIComponent(entry.slug.value),
-				range: {
-					inserting: insertionRange,
-					replacing: replacementRange,
-				},
-			};
-		}
-	}
-
-	private async *providePathSuggestions(document: SkinnyTextDocument, position: vscode.Position, context: CompletionContext): AsyncIterable {
-		const valueBeforeLastSlash = context.linkPrefix.substring(0, context.linkPrefix.lastIndexOf('/') + 1); // keep the last slash
-
-		const parentDir = this.resolveReference(document, valueBeforeLastSlash || '.');
-		if (!parentDir) {
-			return;
-		}
-
-		const pathSegmentStart = position.translate({ characterDelta: valueBeforeLastSlash.length - context.linkPrefix.length });
-		const insertRange = new vscode.Range(pathSegmentStart, position);
-
-		const pathSegmentEnd = position.translate({ characterDelta: context.linkSuffix.length });
-		const replacementRange = new vscode.Range(pathSegmentStart, pathSegmentEnd);
-
-		let dirInfo: Array<[string, vscode.FileType]>;
-		try {
-			dirInfo = await vscode.workspace.fs.readDirectory(parentDir);
-		} catch {
-			return;
-		}
-
-		for (const [name, type] of dirInfo) {
-			// Exclude paths that start with `.`
-			if (name.startsWith('.')) {
-				continue;
-			}
-
-			const isDir = type === vscode.FileType.Directory;
-			yield {
-				label: isDir ? name + '/' : name,
-				insertText: isDir ? encodeURIComponent(name) + '/' : encodeURIComponent(name),
-				kind: isDir ? vscode.CompletionItemKind.Folder : vscode.CompletionItemKind.File,
-				range: {
-					inserting: insertRange,
-					replacing: replacementRange,
-				},
-				command: isDir ? { command: 'editor.action.triggerSuggest', title: '' } : undefined,
-			};
-		}
-	}
-
-	private resolveReference(document: SkinnyTextDocument, ref: string): vscode.Uri | undefined {
-		const docUri = this.getFileUriOfTextDocument(document);
-
-		if (ref.startsWith('/')) {
-			const workspaceFolder = vscode.workspace.getWorkspaceFolder(docUri);
-			if (workspaceFolder) {
-				return vscode.Uri.joinPath(workspaceFolder.uri, ref);
-			} else {
-				return this.resolvePath(docUri, ref.slice(1));
-			}
-		}
-
-		return this.resolvePath(docUri, ref);
-	}
-
-	private resolvePath(root: vscode.Uri, ref: string): vscode.Uri | undefined {
-		try {
-			if (root.scheme === 'file') {
-				return vscode.Uri.file(resolve(dirname(root.fsPath), ref));
-			} else {
-				return root.with({
-					path: resolve(dirname(root.path), ref),
-				});
-			}
-		} catch {
-			return undefined;
-		}
-	}
-
-	private getFileUriOfTextDocument(document: SkinnyTextDocument) {
-		if (document.uri.scheme === 'vscode-notebook-cell') {
-			const notebook = vscode.workspace.notebookDocuments
-				.find(notebook => notebook.getCells().some(cell => cell.document === document));
-
-			if (notebook) {
-				return notebook.uri;
-			}
-		}
-
-		return document.uri;
-	}
-}
diff --git a/extensions/markdown-language-features/src/languageFeatures/references.ts b/extensions/markdown-language-features/src/languageFeatures/references.ts
deleted file mode 100644
index 7695d5e4ba3..00000000000
--- a/extensions/markdown-language-features/src/languageFeatures/references.ts
+++ /dev/null
@@ -1,308 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-import * as vscode from 'vscode';
-import * as uri from 'vscode-uri';
-import { MarkdownEngine } from '../markdownEngine';
-import { Slugifier } from '../slugify';
-import { TableOfContents, TocEntry } from '../tableOfContents';
-import { noopToken } from '../util/cancellation';
-import { Disposable } from '../util/dispose';
-import { MdWorkspaceContents, SkinnyTextDocument } from '../workspaceContents';
-import { InternalHref, MdLink, MdLinkProvider } from './documentLinkProvider';
-import { MdWorkspaceCache } from './workspaceCache';
-
-
-/**
- * A link in a markdown file.
- */
-export interface MdLinkReference {
-	readonly kind: 'link';
-	readonly isTriggerLocation: boolean;
-	readonly isDefinition: boolean;
-	readonly location: vscode.Location;
-
-	readonly link: MdLink;
-}
-
-/**
- * A header in a markdown file.
- */
-export interface MdHeaderReference {
-	readonly kind: 'header';
-
-	readonly isTriggerLocation: boolean;
-	readonly isDefinition: boolean;
-
-	/**
-	 * The range of the header.
-	 *
-	 * In `# a b c #` this would be the range of `# a b c #`
-	 */
-	readonly location: vscode.Location;
-
-	/**
-	 * The text of the header.
-	 *
-	 * In `# a b c #` this would be `a b c`
-	 */
-	readonly headerText: string;
-
-	/**
-	 * The range of the header text itself.
-	 *
-	 * In `# a b c #` this would be the range of `a b c`
-	 */
-	readonly headerTextLocation: vscode.Location;
-}
-
-export type MdReference = MdLinkReference | MdHeaderReference;
-
-export class MdReferencesProvider extends Disposable implements vscode.ReferenceProvider {
-
-	private readonly _linkCache: MdWorkspaceCache;
-
-	public constructor(
-		private readonly linkProvider: MdLinkProvider,
-		private readonly workspaceContents: MdWorkspaceContents,
-		private readonly engine: MarkdownEngine,
-		private readonly slugifier: Slugifier,
-	) {
-		super();
-
-		this._linkCache = this._register(new MdWorkspaceCache(workspaceContents, doc => linkProvider.getAllLinks(doc, noopToken)));
-	}
-
-	async provideReferences(document: SkinnyTextDocument, position: vscode.Position, context: vscode.ReferenceContext, token: vscode.CancellationToken): Promise {
-		const allRefs = await this.getAllReferencesAtPosition(document, position, token);
-
-		return allRefs
-			.filter(ref => context.includeDeclaration || !ref.isDefinition)
-			.map(ref => ref.location);
-	}
-
-	public async getAllReferencesAtPosition(document: SkinnyTextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise {
-		const toc = await TableOfContents.create(this.engine, document);
-		if (token.isCancellationRequested) {
-			return [];
-		}
-
-		const header = toc.entries.find(entry => entry.line === position.line);
-		if (header) {
-			return this.getReferencesToHeader(document, header);
-		} else {
-			return this.getReferencesToLinkAtPosition(document, position, token);
-		}
-	}
-
-	private async getReferencesToHeader(document: SkinnyTextDocument, header: TocEntry): Promise {
-		const links = (await this._linkCache.getAll()).flat();
-
-		const references: MdReference[] = [];
-
-		references.push({
-			kind: 'header',
-			isTriggerLocation: true,
-			isDefinition: true,
-			location: header.headerLocation,
-			headerText: header.text,
-			headerTextLocation: header.headerTextLocation
-		});
-
-		for (const link of links) {
-			if (link.href.kind === 'internal'
-				&& this.looksLikeLinkToDoc(link.href, document.uri)
-				&& this.slugifier.fromHeading(link.href.fragment).value === header.slug.value
-			) {
-				references.push({
-					kind: 'link',
-					isTriggerLocation: false,
-					isDefinition: false,
-					link,
-					location: new vscode.Location(link.source.resource, link.source.hrefRange),
-				});
-			}
-		}
-
-		return references;
-	}
-
-	private async getReferencesToLinkAtPosition(document: SkinnyTextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise {
-		const docLinks = await this.linkProvider.getAllLinks(document, token);
-
-		for (const link of docLinks) {
-			if (link.kind === 'definition') {
-				// We could be in either the ref name or the definition
-				if (link.ref.range.contains(position)) {
-					return Array.from(this.getReferencesToLinkReference(docLinks, link.ref.text, { resource: document.uri, range: link.ref.range }));
-				} else if (link.source.hrefRange.contains(position)) {
-					return this.getReferencesToLink(link, position, token);
-				}
-			} else {
-				if (link.source.hrefRange.contains(position)) {
-					return this.getReferencesToLink(link, position, token);
-				}
-			}
-		}
-
-		return [];
-	}
-
-	private async getReferencesToLink(sourceLink: MdLink, triggerPosition: vscode.Position, token: vscode.CancellationToken): Promise {
-		const allLinksInWorkspace = (await this._linkCache.getAll()).flat();
-		if (token.isCancellationRequested) {
-			return [];
-		}
-
-		if (sourceLink.href.kind === 'reference') {
-			return Array.from(this.getReferencesToLinkReference(allLinksInWorkspace, sourceLink.href.ref, { resource: sourceLink.source.resource, range: sourceLink.source.hrefRange }));
-		}
-
-		if (sourceLink.href.kind === 'external') {
-			const references: MdReference[] = [];
-
-			for (const link of allLinksInWorkspace) {
-				if (link.href.kind === 'external' && link.href.uri.toString() === sourceLink.href.uri.toString()) {
-					const isTriggerLocation = sourceLink.source.resource.fsPath === link.source.resource.fsPath && sourceLink.source.hrefRange.isEqual(link.source.hrefRange);
-					references.push({
-						kind: 'link',
-						isTriggerLocation,
-						isDefinition: false,
-						link,
-						location: new vscode.Location(link.source.resource, link.source.hrefRange),
-					});
-				}
-			}
-			return references;
-		}
-
-		const targetDoc = await tryFindMdDocumentForLink(sourceLink.href, this.workspaceContents);
-		if (token.isCancellationRequested) {
-			return [];
-		}
-
-		const references: MdReference[] = [];
-
-		if (targetDoc && sourceLink.href.fragment && sourceLink.source.fragmentRange?.contains(triggerPosition)) {
-			const toc = await TableOfContents.create(this.engine, targetDoc);
-			const entry = toc.lookup(sourceLink.href.fragment);
-			if (entry) {
-				references.push({
-					kind: 'header',
-					isTriggerLocation: false,
-					isDefinition: true,
-					location: entry.headerLocation,
-					headerText: entry.text,
-					headerTextLocation: entry.headerTextLocation
-				});
-			}
-
-			for (const link of allLinksInWorkspace) {
-				if (link.href.kind !== 'internal' || !this.looksLikeLinkToDoc(link.href, targetDoc.uri)) {
-					continue;
-				}
-
-				if (this.slugifier.fromHeading(link.href.fragment).equals(this.slugifier.fromHeading(sourceLink.href.fragment))) {
-					const isTriggerLocation = sourceLink.source.resource.fsPath === link.source.resource.fsPath && sourceLink.source.hrefRange.isEqual(link.source.hrefRange);
-					references.push({
-						kind: 'link',
-						isTriggerLocation,
-						isDefinition: false,
-						link,
-						location: new vscode.Location(link.source.resource, link.source.hrefRange),
-					});
-				}
-			}
-		} else { // Triggered on a link without a fragment so we only require matching the file and ignore fragments
-			references.push(...this.findAllLinksToFile(targetDoc?.uri ?? sourceLink.href.path, allLinksInWorkspace, sourceLink));
-		}
-
-		return references;
-	}
-
-	private looksLikeLinkToDoc(href: InternalHref, targetDoc: vscode.Uri) {
-		return href.path.fsPath === targetDoc.fsPath
-			|| uri.Utils.extname(href.path) === '' && href.path.with({ path: href.path.path + '.md' }).fsPath === targetDoc.fsPath;
-	}
-
-	public async getAllReferencesToFile(resource: vscode.Uri, _token: vscode.CancellationToken): Promise {
-		const allLinksInWorkspace = (await this._linkCache.getAll()).flat();
-		return Array.from(this.findAllLinksToFile(resource, allLinksInWorkspace, undefined));
-	}
-
-	private * findAllLinksToFile(resource: vscode.Uri, allLinksInWorkspace: readonly MdLink[], sourceLink: MdLink | undefined): Iterable {
-		for (const link of allLinksInWorkspace) {
-			if (link.href.kind !== 'internal' || !this.looksLikeLinkToDoc(link.href, resource)) {
-				continue;
-			}
-
-			// Exclude cases where the file is implicitly referencing itself
-			if (link.source.text.startsWith('#') && link.source.resource.fsPath === resource.fsPath) {
-				continue;
-			}
-
-			const isTriggerLocation = !!sourceLink && sourceLink.source.resource.fsPath === link.source.resource.fsPath && sourceLink.source.hrefRange.isEqual(link.source.hrefRange);
-			const pathRange = this.getPathRange(link);
-			yield {
-				kind: 'link',
-				isTriggerLocation,
-				isDefinition: false,
-				link,
-				location: new vscode.Location(link.source.resource, pathRange),
-			};
-		}
-	}
-
-	private * getReferencesToLinkReference(allLinks: Iterable, refToFind: string, from: { resource: vscode.Uri; range: vscode.Range }): Iterable {
-		for (const link of allLinks) {
-			let ref: string;
-			if (link.kind === 'definition') {
-				ref = link.ref.text;
-			} else if (link.href.kind === 'reference') {
-				ref = link.href.ref;
-			} else {
-				continue;
-			}
-
-			if (ref === refToFind && link.source.resource.fsPath === from.resource.fsPath) {
-				const isTriggerLocation = from.resource.fsPath === link.source.resource.fsPath && (
-					(link.href.kind === 'reference' && from.range.isEqual(link.source.hrefRange)) || (link.kind === 'definition' && from.range.isEqual(link.ref.range)));
-
-				const pathRange = this.getPathRange(link);
-				yield {
-					kind: 'link',
-					isTriggerLocation,
-					isDefinition: link.kind === 'definition',
-					link,
-					location: new vscode.Location(from.resource, pathRange),
-				};
-			}
-		}
-	}
-
-	/**
-	 * Get just the range of the file path, dropping the fragment
-	 */
-	private getPathRange(link: MdLink): vscode.Range {
-		return link.source.fragmentRange
-			? link.source.hrefRange.with(undefined, link.source.fragmentRange.start.translate(0, -1))
-			: link.source.hrefRange;
-	}
-}
-
-export async function tryFindMdDocumentForLink(href: InternalHref, workspaceContents: MdWorkspaceContents): Promise {
-	const targetDoc = await workspaceContents.getMarkdownDocument(href.path);
-	if (targetDoc) {
-		return targetDoc;
-	}
-
-	// We don't think the file exists. If it doesn't already have an extension, try tacking on a `.md` and using that instead
-	if (uri.Utils.extname(href.path) === '') {
-		const dotMdResource = href.path.with({ path: href.path.path + '.md' });
-		return workspaceContents.getMarkdownDocument(dotMdResource);
-	}
-
-	return undefined;
-}
-
diff --git a/extensions/markdown-language-features/src/languageFeatures/rename.ts b/extensions/markdown-language-features/src/languageFeatures/rename.ts
deleted file mode 100644
index db06b7eeb9c..00000000000
--- a/extensions/markdown-language-features/src/languageFeatures/rename.ts
+++ /dev/null
@@ -1,272 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-import * as path from 'path';
-import * as vscode from 'vscode';
-import * as nls from 'vscode-nls';
-import * as URI from 'vscode-uri';
-import { Slugifier } from '../slugify';
-import { Disposable } from '../util/dispose';
-import { resolveDocumentLink } from '../util/openDocumentLink';
-import { MdWorkspaceContents, SkinnyTextDocument } from '../workspaceContents';
-import { InternalHref } from './documentLinkProvider';
-import { MdHeaderReference, MdLinkReference, MdReference, MdReferencesProvider, tryFindMdDocumentForLink } from './references';
-
-const localize = nls.loadMessageBundle();
-
-
-export interface MdReferencesResponse {
-	references: MdReference[];
-	triggerRef: MdReference;
-}
-
-interface MdFileRenameEdit {
-	readonly from: vscode.Uri;
-	readonly to: vscode.Uri;
-}
-
-/**
- * Type with additional metadata about the edits for testing
- *
- * This is needed since `vscode.WorkspaceEdit` does not expose info on file renames.
- */
-export interface MdWorkspaceEdit {
-	readonly edit: vscode.WorkspaceEdit;
-
-	readonly fileRenames?: ReadonlyArray;
-}
-
-function tryDecodeUri(str: string): string {
-	try {
-		return decodeURI(str);
-	} catch {
-		return str;
-	}
-}
-
-export class MdRenameProvider extends Disposable implements vscode.RenameProvider {
-
-	private cachedRefs?: {
-		readonly resource: vscode.Uri;
-		readonly version: number;
-		readonly position: vscode.Position;
-		readonly triggerRef: MdReference;
-		readonly references: MdReference[];
-	} | undefined;
-
-	private readonly renameNotSupportedText = localize('invalidRenameLocation', "Rename not supported at location");
-
-	public constructor(
-		private readonly referencesProvider: MdReferencesProvider,
-		private readonly workspaceContents: MdWorkspaceContents,
-		private readonly slugifier: Slugifier,
-	) {
-		super();
-	}
-
-	public async prepareRename(document: SkinnyTextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise {
-		const allRefsInfo = await this.getAllReferences(document, position, token);
-		if (token.isCancellationRequested) {
-			return undefined;
-		}
-
-		if (!allRefsInfo || !allRefsInfo.references.length) {
-			throw new Error(this.renameNotSupportedText);
-		}
-
-		const triggerRef = allRefsInfo.triggerRef;
-		switch (triggerRef.kind) {
-			case 'header': {
-				return { range: triggerRef.headerTextLocation.range, placeholder: triggerRef.headerText };
-			}
-			case 'link': {
-				if (triggerRef.link.kind === 'definition') {
-					// We may have been triggered on the ref or the definition itself
-					if (triggerRef.link.ref.range.contains(position)) {
-						return { range: triggerRef.link.ref.range, placeholder: triggerRef.link.ref.text };
-					}
-				}
-
-				if (triggerRef.link.href.kind === 'external') {
-					return { range: triggerRef.link.source.hrefRange, placeholder: document.getText(triggerRef.link.source.hrefRange) };
-				}
-
-				// See if we are renaming the fragment or the path
-				const { fragmentRange } = triggerRef.link.source;
-				if (fragmentRange?.contains(position)) {
-					const declaration = this.findHeaderDeclaration(allRefsInfo.references);
-					if (declaration) {
-						return { range: fragmentRange, placeholder: declaration.headerText };
-					}
-					return { range: fragmentRange, placeholder: document.getText(fragmentRange) };
-				}
-
-				const range = this.getFilePathRange(triggerRef);
-				if (!range) {
-					throw new Error(this.renameNotSupportedText);
-				}
-				return { range, placeholder: tryDecodeUri(document.getText(range)) };
-			}
-		}
-	}
-
-	private getFilePathRange(ref: MdLinkReference): vscode.Range {
-		if (ref.link.source.fragmentRange) {
-			return ref.link.source.hrefRange.with(undefined, ref.link.source.fragmentRange.start.translate(0, -1));
-		}
-		return ref.link.source.hrefRange;
-	}
-
-	private findHeaderDeclaration(references: readonly MdReference[]): MdHeaderReference | undefined {
-		return references.find(ref => ref.isDefinition && ref.kind === 'header') as MdHeaderReference | undefined;
-	}
-
-	public async provideRenameEdits(document: SkinnyTextDocument, position: vscode.Position, newName: string, token: vscode.CancellationToken): Promise {
-		return (await this.provideRenameEditsImpl(document, position, newName, token))?.edit;
-	}
-
-	public async provideRenameEditsImpl(document: SkinnyTextDocument, position: vscode.Position, newName: string, token: vscode.CancellationToken): Promise {
-		const allRefsInfo = await this.getAllReferences(document, position, token);
-		if (token.isCancellationRequested || !allRefsInfo || !allRefsInfo.references.length) {
-			return undefined;
-		}
-
-		const triggerRef = allRefsInfo.triggerRef;
-
-		if (triggerRef.kind === 'link' && (
-			(triggerRef.link.kind === 'definition' && triggerRef.link.ref.range.contains(position)) || triggerRef.link.href.kind === 'reference'
-		)) {
-			return this.renameReferenceLinks(allRefsInfo, newName);
-		} else if (triggerRef.kind === 'link' && triggerRef.link.href.kind === 'external') {
-			return this.renameExternalLink(allRefsInfo, newName);
-		} else if (triggerRef.kind === 'header' || (triggerRef.kind === 'link' && triggerRef.link.source.fragmentRange?.contains(position) && (triggerRef.link.kind === 'definition' || triggerRef.link.kind === 'link' && triggerRef.link.href.kind === 'internal'))) {
-			return this.renameFragment(allRefsInfo, newName);
-		} else if (triggerRef.kind === 'link' && !triggerRef.link.source.fragmentRange?.contains(position) && triggerRef.link.kind === 'link' && triggerRef.link.href.kind === 'internal') {
-			return this.renameFilePath(triggerRef.link.source.resource, triggerRef.link.href, allRefsInfo, newName);
-		}
-
-		return undefined;
-	}
-
-	private async renameFilePath(triggerDocument: vscode.Uri, triggerHref: InternalHref, allRefsInfo: MdReferencesResponse, newName: string): Promise {
-		const edit = new vscode.WorkspaceEdit();
-		const fileRenames: MdFileRenameEdit[] = [];
-
-		const targetDoc = await tryFindMdDocumentForLink(triggerHref, this.workspaceContents);
-		const targetUri = targetDoc?.uri ?? triggerHref.path;
-
-		const rawNewFilePath = resolveDocumentLink(newName, triggerDocument);
-		let resolvedNewFilePath = rawNewFilePath;
-		if (!URI.Utils.extname(resolvedNewFilePath)) {
-			// If the newly entered path doesn't have a file extension but the original file did
-			// tack on a .md file extension
-			if (URI.Utils.extname(targetUri)) {
-				resolvedNewFilePath = resolvedNewFilePath.with({
-					path: resolvedNewFilePath.path + '.md'
-				});
-			}
-		}
-
-		// First rename the file
-		if (await this.workspaceContents.pathExists(targetUri)) {
-			fileRenames.push({ from: targetUri, to: resolvedNewFilePath });
-			edit.renameFile(targetUri, resolvedNewFilePath);
-		}
-
-		// Then update all refs to it
-		for (const ref of allRefsInfo.references) {
-			if (ref.kind === 'link') {
-				// Try to preserve style of existing links
-				let newPath: string;
-				if (ref.link.source.text.startsWith('/')) {
-					const root = resolveDocumentLink('/', ref.link.source.resource);
-					newPath = '/' + path.relative(root.toString(true), rawNewFilePath.toString(true));
-				} else {
-					const rootDir = URI.Utils.dirname(ref.link.source.resource);
-					if (rootDir.scheme === rawNewFilePath.scheme && rootDir.scheme !== 'untitled') {
-						newPath = path.relative(rootDir.toString(true), rawNewFilePath.toString(true));
-						if (newName.startsWith('./') && !newPath.startsWith('../') || newName.startsWith('.\\') && !newPath.startsWith('..\\')) {
-							newPath = './' + newPath;
-						}
-					} else {
-						newPath = newName;
-					}
-				}
-				edit.replace(ref.link.source.resource, this.getFilePathRange(ref), encodeURI(newPath.replace(/\\/g, '/')));
-			}
-		}
-
-		return { edit, fileRenames };
-	}
-
-	private renameFragment(allRefsInfo: MdReferencesResponse, newName: string): MdWorkspaceEdit {
-		const slug = this.slugifier.fromHeading(newName).value;
-
-		const edit = new vscode.WorkspaceEdit();
-		for (const ref of allRefsInfo.references) {
-			switch (ref.kind) {
-				case 'header':
-					edit.replace(ref.location.uri, ref.headerTextLocation.range, newName);
-					break;
-
-				case 'link':
-					edit.replace(ref.link.source.resource, ref.link.source.fragmentRange ?? ref.location.range, !ref.link.source.fragmentRange || ref.link.href.kind === 'external' ? newName : slug);
-					break;
-			}
-		}
-		return { edit };
-	}
-
-	private renameExternalLink(allRefsInfo: MdReferencesResponse, newName: string): MdWorkspaceEdit {
-		const edit = new vscode.WorkspaceEdit();
-		for (const ref of allRefsInfo.references) {
-			if (ref.kind === 'link') {
-				edit.replace(ref.link.source.resource, ref.location.range, newName);
-			}
-		}
-		return { edit };
-	}
-
-	private renameReferenceLinks(allRefsInfo: MdReferencesResponse, newName: string): MdWorkspaceEdit {
-		const edit = new vscode.WorkspaceEdit();
-		for (const ref of allRefsInfo.references) {
-			if (ref.kind === 'link') {
-				if (ref.link.kind === 'definition') {
-					edit.replace(ref.link.source.resource, ref.link.ref.range, newName);
-				} else {
-					edit.replace(ref.link.source.resource, ref.link.source.fragmentRange ?? ref.location.range, newName);
-				}
-			}
-		}
-		return { edit };
-	}
-
-	private async getAllReferences(document: SkinnyTextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise {
-		const version = document.version;
-
-		if (this.cachedRefs
-			&& this.cachedRefs.resource.fsPath === document.uri.fsPath
-			&& this.cachedRefs.version === document.version
-			&& this.cachedRefs.position.isEqual(position)
-		) {
-			return this.cachedRefs;
-		}
-
-		const references = await this.referencesProvider.getAllReferencesAtPosition(document, position, token);
-		const triggerRef = references.find(ref => ref.isTriggerLocation);
-		if (!triggerRef) {
-			return undefined;
-		}
-
-		this.cachedRefs = {
-			resource: document.uri,
-			version,
-			position,
-			references,
-			triggerRef
-		};
-		return this.cachedRefs;
-	}
-}
-
diff --git a/extensions/markdown-language-features/src/languageFeatures/smartSelect.ts b/extensions/markdown-language-features/src/languageFeatures/smartSelect.ts
deleted file mode 100644
index 74b1d8e1b98..00000000000
--- a/extensions/markdown-language-features/src/languageFeatures/smartSelect.ts
+++ /dev/null
@@ -1,251 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-import Token = require('markdown-it/lib/token');
-import * as vscode from 'vscode';
-import { MarkdownEngine } from '../markdownEngine';
-import { TableOfContents, TocEntry } from '../tableOfContents';
-import { SkinnyTextDocument } from '../workspaceContents';
-
-interface MarkdownItTokenWithMap extends Token {
-	map: [number, number];
-}
-
-export class MdSmartSelect implements vscode.SelectionRangeProvider {
-
-	constructor(
-		private readonly engine: MarkdownEngine
-	) { }
-
-	public async provideSelectionRanges(document: SkinnyTextDocument, positions: vscode.Position[], _token: vscode.CancellationToken): Promise {
-		const promises = await Promise.all(positions.map((position) => {
-			return this.provideSelectionRange(document, position, _token);
-		}));
-		return promises.filter(item => item !== undefined) as vscode.SelectionRange[];
-	}
-
-	private async provideSelectionRange(document: SkinnyTextDocument, position: vscode.Position, _token: vscode.CancellationToken): Promise {
-		const headerRange = await this.getHeaderSelectionRange(document, position);
-		const blockRange = await this.getBlockSelectionRange(document, position, headerRange);
-		const inlineRange = await this.getInlineSelectionRange(document, position, blockRange);
-		return inlineRange || blockRange || headerRange;
-	}
-	private async getInlineSelectionRange(document: SkinnyTextDocument, position: vscode.Position, blockRange?: vscode.SelectionRange): Promise {
-		return createInlineRange(document, position, blockRange);
-	}
-
-	private async getBlockSelectionRange(document: SkinnyTextDocument, position: vscode.Position, headerRange?: vscode.SelectionRange): Promise {
-
-		const tokens = await this.engine.parse(document);
-
-		const blockTokens = getBlockTokensForPosition(tokens, position, headerRange);
-
-		if (blockTokens.length === 0) {
-			return undefined;
-		}
-
-		let currentRange: vscode.SelectionRange | undefined = headerRange ? headerRange : createBlockRange(blockTokens.shift()!, document, position.line);
-
-		for (let i = 0; i < blockTokens.length; i++) {
-			currentRange = createBlockRange(blockTokens[i], document, position.line, currentRange);
-		}
-		return currentRange;
-	}
-
-	private async getHeaderSelectionRange(document: SkinnyTextDocument, position: vscode.Position): Promise {
-		const toc = await TableOfContents.create(this.engine, document);
-
-		const headerInfo = getHeadersForPosition(toc.entries, position);
-
-		const headers = headerInfo.headers;
-
-		let currentRange: vscode.SelectionRange | undefined;
-
-		for (let i = 0; i < headers.length; i++) {
-			currentRange = createHeaderRange(headers[i], i === headers.length - 1, headerInfo.headerOnThisLine, currentRange, getFirstChildHeader(document, headers[i], toc.entries));
-		}
-		return currentRange;
-	}
-}
-
-function getHeadersForPosition(toc: readonly TocEntry[], position: vscode.Position): { headers: TocEntry[]; headerOnThisLine: boolean } {
-	const enclosingHeaders = toc.filter(header => header.sectionLocation.range.start.line <= position.line && header.sectionLocation.range.end.line >= position.line);
-	const sortedHeaders = enclosingHeaders.sort((header1, header2) => (header1.line - position.line) - (header2.line - position.line));
-	const onThisLine = toc.find(header => header.line === position.line) !== undefined;
-	return {
-		headers: sortedHeaders,
-		headerOnThisLine: onThisLine
-	};
-}
-
-function createHeaderRange(header: TocEntry, isClosestHeaderToPosition: boolean, onHeaderLine: boolean, parent?: vscode.SelectionRange, startOfChildRange?: vscode.Position): vscode.SelectionRange | undefined {
-	const range = header.sectionLocation.range;
-	const contentRange = new vscode.Range(range.start.translate(1), range.end);
-	if (onHeaderLine && isClosestHeaderToPosition && startOfChildRange) {
-		// selection was made on this header line, so select header and its content until the start of its first child
-		// then all of its content
-		return new vscode.SelectionRange(range.with(undefined, startOfChildRange), new vscode.SelectionRange(range, parent));
-	} else if (onHeaderLine && isClosestHeaderToPosition) {
-		// selection was made on this header line and no children so expand to all of its content
-		return new vscode.SelectionRange(range, parent);
-	} else if (isClosestHeaderToPosition && startOfChildRange) {
-		// selection was made within content and has child so select content
-		// of this header then all content then header
-		return new vscode.SelectionRange(contentRange.with(undefined, startOfChildRange), new vscode.SelectionRange(contentRange, (new vscode.SelectionRange(range, parent))));
-	} else {
-		// not on this header line so select content then header
-		return new vscode.SelectionRange(contentRange, new vscode.SelectionRange(range, parent));
-	}
-}
-
-function getBlockTokensForPosition(tokens: Token[], position: vscode.Position, parent?: vscode.SelectionRange): MarkdownItTokenWithMap[] {
-	const enclosingTokens = tokens.filter((token): token is MarkdownItTokenWithMap => !!token.map && (token.map[0] <= position.line && token.map[1] > position.line) && (!parent || (token.map[0] >= parent.range.start.line && token.map[1] <= parent.range.end.line + 1)) && isBlockElement(token));
-	if (enclosingTokens.length === 0) {
-		return [];
-	}
-	const sortedTokens = enclosingTokens.sort((token1, token2) => (token2.map[1] - token2.map[0]) - (token1.map[1] - token1.map[0]));
-	return sortedTokens;
-}
-
-function createBlockRange(block: MarkdownItTokenWithMap, document: SkinnyTextDocument, cursorLine: number, parent?: vscode.SelectionRange): vscode.SelectionRange | undefined {
-	if (block.type === 'fence') {
-		return createFencedRange(block, cursorLine, document, parent);
-	} else {
-		let startLine = document.lineAt(block.map[0]).isEmptyOrWhitespace ? block.map[0] + 1 : block.map[0];
-		let endLine = startLine === block.map[1] ? block.map[1] : block.map[1] - 1;
-		if (block.type === 'paragraph_open' && block.map[1] - block.map[0] === 2) {
-			startLine = endLine = cursorLine;
-		} else if (isList(block) && document.lineAt(endLine).isEmptyOrWhitespace) {
-			endLine = endLine - 1;
-		}
-		const range = new vscode.Range(startLine, 0, endLine, document.lineAt(endLine).text?.length ?? 0);
-		if (parent?.range.contains(range) && !parent.range.isEqual(range)) {
-			return new vscode.SelectionRange(range, parent);
-		} else if (parent?.range.isEqual(range)) {
-			return parent;
-		} else {
-			return new vscode.SelectionRange(range);
-		}
-	}
-}
-
-function createInlineRange(document: SkinnyTextDocument, cursorPosition: vscode.Position, parent?: vscode.SelectionRange): vscode.SelectionRange | undefined {
-	const lineText = document.lineAt(cursorPosition.line).text;
-	const boldSelection = createBoldRange(lineText, cursorPosition.character, cursorPosition.line, parent);
-	const italicSelection = createOtherInlineRange(lineText, cursorPosition.character, cursorPosition.line, true, parent);
-	let comboSelection: vscode.SelectionRange | undefined;
-	if (boldSelection && italicSelection && !boldSelection.range.isEqual(italicSelection.range)) {
-		if (boldSelection.range.contains(italicSelection.range)) {
-			comboSelection = createOtherInlineRange(lineText, cursorPosition.character, cursorPosition.line, true, boldSelection);
-		} else if (italicSelection.range.contains(boldSelection.range)) {
-			comboSelection = createBoldRange(lineText, cursorPosition.character, cursorPosition.line, italicSelection);
-		}
-	}
-	const linkSelection = createLinkRange(lineText, cursorPosition.character, cursorPosition.line, comboSelection || boldSelection || italicSelection || parent);
-	const inlineCodeBlockSelection = createOtherInlineRange(lineText, cursorPosition.character, cursorPosition.line, false, linkSelection || parent);
-	return inlineCodeBlockSelection || linkSelection || comboSelection || boldSelection || italicSelection;
-}
-
-function createFencedRange(token: MarkdownItTokenWithMap, cursorLine: number, document: SkinnyTextDocument, parent?: vscode.SelectionRange): vscode.SelectionRange {
-	const startLine = token.map[0];
-	const endLine = token.map[1] - 1;
-	const onFenceLine = cursorLine === startLine || cursorLine === endLine;
-	const fenceRange = new vscode.Range(startLine, 0, endLine, document.lineAt(endLine).text.length);
-	const contentRange = endLine - startLine > 2 && !onFenceLine ? new vscode.Range(startLine + 1, 0, endLine - 1, document.lineAt(endLine - 1).text.length) : undefined;
-	if (contentRange) {
-		return new vscode.SelectionRange(contentRange, new vscode.SelectionRange(fenceRange, parent));
-	} else {
-		if (parent?.range.isEqual(fenceRange)) {
-			return parent;
-		} else {
-			return new vscode.SelectionRange(fenceRange, parent);
-		}
-	}
-}
-
-function createBoldRange(lineText: string, cursorChar: number, cursorLine: number, parent?: vscode.SelectionRange): vscode.SelectionRange | undefined {
-	const regex = /\*\*([^*]+\*?[^*]+\*?[^*]+)\*\*/gim;
-	const matches = [...lineText.matchAll(regex)].filter(match => lineText.indexOf(match[0]) <= cursorChar && lineText.indexOf(match[0]) + match[0].length >= cursorChar);
-	if (matches.length) {
-		// should only be one match, so select first and index 0 contains the entire match
-		const bold = matches[0][0];
-		const startIndex = lineText.indexOf(bold);
-		const cursorOnStars = cursorChar === startIndex || cursorChar === startIndex + 1 || cursorChar === startIndex + bold.length || cursorChar === startIndex + bold.length - 1;
-		const contentAndStars = new vscode.SelectionRange(new vscode.Range(cursorLine, startIndex, cursorLine, startIndex + bold.length), parent);
-		const content = new vscode.SelectionRange(new vscode.Range(cursorLine, startIndex + 2, cursorLine, startIndex + bold.length - 2), contentAndStars);
-		return cursorOnStars ? contentAndStars : content;
-	}
-	return undefined;
-}
-
-function createOtherInlineRange(lineText: string, cursorChar: number, cursorLine: number, isItalic: boolean, parent?: vscode.SelectionRange): vscode.SelectionRange | undefined {
-	const italicRegexes = [/(?:[^*]+)(\*([^*]+)(?:\*\*[^*]*\*\*)*([^*]+)\*)(?:[^*]+)/g, /^(?:[^*]*)(\*([^*]+)(?:\*\*[^*]*\*\*)*([^*]+)\*)(?:[^*]*)$/g];
-	let matches = [];
-	if (isItalic) {
-		matches = [...lineText.matchAll(italicRegexes[0])].filter(match => lineText.indexOf(match[0]) <= cursorChar && lineText.indexOf(match[0]) + match[0].length >= cursorChar);
-		if (!matches.length) {
-			matches = [...lineText.matchAll(italicRegexes[1])].filter(match => lineText.indexOf(match[0]) <= cursorChar && lineText.indexOf(match[0]) + match[0].length >= cursorChar);
-		}
-	} else {
-		matches = [...lineText.matchAll(/\`[^\`]*\`/g)].filter(match => lineText.indexOf(match[0]) <= cursorChar && lineText.indexOf(match[0]) + match[0].length >= cursorChar);
-	}
-	if (matches.length) {
-		// should only be one match, so select first and select group 1 for italics because that contains just the italic section
-		// doesn't include the leading and trailing characters which are guaranteed to not be * so as not to be confused with bold
-		const match = isItalic ? matches[0][1] : matches[0][0];
-		const startIndex = lineText.indexOf(match);
-		const cursorOnType = cursorChar === startIndex || cursorChar === startIndex + match.length;
-		const contentAndType = new vscode.SelectionRange(new vscode.Range(cursorLine, startIndex, cursorLine, startIndex + match.length), parent);
-		const content = new vscode.SelectionRange(new vscode.Range(cursorLine, startIndex + 1, cursorLine, startIndex + match.length - 1), contentAndType);
-		return cursorOnType ? contentAndType : content;
-	}
-	return undefined;
-}
-
-function createLinkRange(lineText: string, cursorChar: number, cursorLine: number, parent?: vscode.SelectionRange): vscode.SelectionRange | undefined {
-	const regex = /(\[[^\(\)]*\])(\([^\[\]]*\))/g;
-	const matches = [...lineText.matchAll(regex)].filter(match => lineText.indexOf(match[0]) <= cursorChar && lineText.indexOf(match[0]) + match[0].length > cursorChar);
-
-	if (matches.length) {
-		// should only be one match, so select first and index 0 contains the entire match, so match = [text](url)
-		const link = matches[0][0];
-		const linkRange = new vscode.SelectionRange(new vscode.Range(cursorLine, lineText.indexOf(link), cursorLine, lineText.indexOf(link) + link.length), parent);
-
-		const linkText = matches[0][1];
-		const url = matches[0][2];
-
-		// determine if cursor is within [text] or (url) in order to know which should be selected
-		const nearestType = cursorChar >= lineText.indexOf(linkText) && cursorChar < lineText.indexOf(linkText) + linkText.length ? linkText : url;
-
-		const indexOfType = lineText.indexOf(nearestType);
-		// determine if cursor is on a bracket or paren and if so, return the [content] or (content), skipping over the content range
-		const cursorOnType = cursorChar === indexOfType || cursorChar === indexOfType + nearestType.length;
-
-		const contentAndNearestType = new vscode.SelectionRange(new vscode.Range(cursorLine, indexOfType, cursorLine, indexOfType + nearestType.length), linkRange);
-		const content = new vscode.SelectionRange(new vscode.Range(cursorLine, indexOfType + 1, cursorLine, indexOfType + nearestType.length - 1), contentAndNearestType);
-		return cursorOnType ? contentAndNearestType : content;
-	}
-	return undefined;
-}
-
-function isList(token: Token): boolean {
-	return token.type ? ['ordered_list_open', 'list_item_open', 'bullet_list_open'].includes(token.type) : false;
-}
-
-function isBlockElement(token: Token): boolean {
-	return !['list_item_close', 'paragraph_close', 'bullet_list_close', 'inline', 'heading_close', 'heading_open'].includes(token.type);
-}
-
-function getFirstChildHeader(document: SkinnyTextDocument, header?: TocEntry, toc?: readonly TocEntry[]): vscode.Position | undefined {
-	let childRange: vscode.Position | undefined;
-	if (header && toc) {
-		let children = toc.filter(t => header.sectionLocation.range.contains(t.sectionLocation.range) && t.sectionLocation.range.start.line > header.sectionLocation.range.start.line).sort((t1, t2) => t1.line - t2.line);
-		if (children.length > 0) {
-			childRange = children[0].sectionLocation.range.start;
-			const lineText = document.lineAt(childRange.line - 1).text;
-			return childRange ? childRange.translate(-1, lineText.length) : undefined;
-		}
-	}
-	return undefined;
-}
diff --git a/extensions/markdown-language-features/src/languageFeatures/workspaceCache.ts b/extensions/markdown-language-features/src/languageFeatures/workspaceCache.ts
deleted file mode 100644
index e4039810c30..00000000000
--- a/extensions/markdown-language-features/src/languageFeatures/workspaceCache.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as vscode from 'vscode';
-import { Disposable } from '../util/dispose';
-import { Lazy, lazy } from '../util/lazy';
-import { MdWorkspaceContents, SkinnyTextDocument } from '../workspaceContents';
-
-/**
- * Cache of information for markdown files in the workspace.
- */
-export class MdWorkspaceCache extends Disposable {
-
-	private readonly _cache = new Map>>();
-	private _hasPopulatedCache = false;
-
-	public constructor(
-		private readonly workspaceContents: MdWorkspaceContents,
-		private readonly getValue: (document: SkinnyTextDocument) => Promise,
-	) {
-		super();
-	}
-
-	public async getAll(): Promise {
-		if (!this._hasPopulatedCache) {
-			await this.populateCache();
-			this._hasPopulatedCache = true;
-
-			this.workspaceContents.onDidChangeMarkdownDocument(this.onDidChangeDocument, this, this._disposables);
-			this.workspaceContents.onDidCreateMarkdownDocument(this.onDidChangeDocument, this, this._disposables);
-			this.workspaceContents.onDidDeleteMarkdownDocument(this.onDidDeleteDocument, this, this._disposables);
-		}
-
-		return Promise.all(Array.from(this._cache.values(), x => x.value));
-	}
-
-	private async populateCache(): Promise {
-		const markdownDocumentUris = await this.workspaceContents.getAllMarkdownDocuments();
-		for (const document of markdownDocumentUris) {
-			this.update(document);
-		}
-	}
-
-	private key(resource: vscode.Uri): string {
-		return resource.toString();
-	}
-
-	private update(document: SkinnyTextDocument): void {
-		this._cache.set(this.key(document.uri), lazy(() => this.getValue(document)));
-	}
-
-	private onDidChangeDocument(document: SkinnyTextDocument) {
-		this.update(document);
-	}
-
-	private onDidDeleteDocument(resource: vscode.Uri) {
-		this._cache.delete(this.key(resource));
-	}
-}
diff --git a/extensions/markdown-language-features/src/languageFeatures/workspaceSymbolProvider.ts b/extensions/markdown-language-features/src/languageFeatures/workspaceSymbolProvider.ts
deleted file mode 100644
index f7b1dcbfd3d..00000000000
--- a/extensions/markdown-language-features/src/languageFeatures/workspaceSymbolProvider.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as vscode from 'vscode';
-import { Disposable } from '../util/dispose';
-import { MdWorkspaceContents } from '../workspaceContents';
-import { MdDocumentSymbolProvider } from './documentSymbolProvider';
-import { MdWorkspaceCache } from './workspaceCache';
-
-export class MdWorkspaceSymbolProvider extends Disposable implements vscode.WorkspaceSymbolProvider {
-
-	private readonly _cache: MdWorkspaceCache;
-
-	public constructor(
-		symbolProvider: MdDocumentSymbolProvider,
-		workspaceContents: MdWorkspaceContents,
-	) {
-		super();
-
-		this._cache = this._register(new MdWorkspaceCache(workspaceContents, doc => symbolProvider.provideDocumentSymbolInformation(doc)));
-	}
-
-	public async provideWorkspaceSymbols(query: string): Promise {
-		const allSymbols = (await this._cache.getAll()).flat();
-		return allSymbols.filter(symbolInformation => symbolInformation.name.toLowerCase().indexOf(query.toLowerCase()) !== -1);
-	}
-}
diff --git a/extensions/markdown-language-features/src/logger.ts b/extensions/markdown-language-features/src/logging.ts
similarity index 56%
rename from extensions/markdown-language-features/src/logger.ts
rename to extensions/markdown-language-features/src/logging.ts
index 6f4d87b7a4a..d296fed655d 100644
--- a/extensions/markdown-language-features/src/logger.ts
+++ b/extensions/markdown-language-features/src/logging.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { lazy } from './util/lazy';
+import { Disposable } from './util/dispose';
 
 enum Trace {
 	Off,
@@ -25,57 +25,66 @@ namespace Trace {
 	}
 }
 
-
-function isString(value: any): value is string {
-	return Object.prototype.toString.call(value) === '[object String]';
+export interface ILogger {
+	verbose(title: string, message: string, data?: any): void;
 }
 
-export class Logger {
+export class VsCodeOutputLogger extends Disposable implements ILogger {
 	private trace?: Trace;
 
-	private readonly outputChannel = lazy(() => vscode.window.createOutputChannel('Markdown'));
+	private _outputChannel?: vscode.OutputChannel;
+
+	private get outputChannel() {
+		this._outputChannel ??= this._register(vscode.window.createOutputChannel('Markdown'));
+		return this._outputChannel;
+	}
 
 	constructor() {
+		super();
+
+		this._register(vscode.workspace.onDidChangeConfiguration(() => {
+			this.updateConfiguration();
+		}));
+
 		this.updateConfiguration();
 	}
 
-	public log(message: string, data?: any): void {
+	public verbose(title: string, message: string, data?: any): void {
 		if (this.trace === Trace.Verbose) {
-			this.appendLine(`[Log - ${this.now()}] ${message}`);
+			this.appendLine(`[Verbose ${this.now()}] ${title}: ${message}`);
 			if (data) {
-				this.appendLine(Logger.data2String(data));
+				this.appendLine(VsCodeOutputLogger.data2String(data));
 			}
 		}
 	}
 
-
 	private now(): string {
 		const now = new Date();
 		return String(now.getUTCHours()).padStart(2, '0')
 			+ ':' + String(now.getMinutes()).padStart(2, '0')
-			+ ':' + String(now.getUTCSeconds()).padStart(2, '0') + '.' + now.getMilliseconds();
+			+ ':' + String(now.getUTCSeconds()).padStart(2, '0') + '.' + String(now.getMilliseconds()).padStart(3, '0');
 	}
 
-	public updateConfiguration() {
+	private updateConfiguration(): void {
 		this.trace = this.readTrace();
 	}
 
-	private appendLine(value: string) {
-		return this.outputChannel.value.appendLine(value);
+	private appendLine(value: string): void {
+		this.outputChannel.appendLine(value);
 	}
 
 	private readTrace(): Trace {
-		return Trace.fromString(vscode.workspace.getConfiguration().get('markdown.trace', 'off'));
+		return Trace.fromString(vscode.workspace.getConfiguration().get('markdown.trace.extension', 'off'));
 	}
 
 	private static data2String(data: any): string {
 		if (data instanceof Error) {
-			if (isString(data.stack)) {
+			if (typeof data.stack === 'string') {
 				return data.stack;
 			}
-			return (data as Error).message;
+			return data.message;
 		}
-		if (isString(data)) {
+		if (typeof data === 'string') {
 			return data;
 		}
 		return JSON.stringify(data, undefined, 2);
diff --git a/extensions/markdown-language-features/src/markdownEngine.ts b/extensions/markdown-language-features/src/markdownEngine.ts
index 3f32880d22f..de06df4ffeb 100644
--- a/extensions/markdown-language-features/src/markdownEngine.ts
+++ b/extensions/markdown-language-features/src/markdownEngine.ts
@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import MarkdownIt = require('markdown-it');
-import Token = require('markdown-it/lib/token');
+import type MarkdownIt = require('markdown-it');
+import type Token = require('markdown-it/lib/token');
 import * as vscode from 'vscode';
+import { ILogger } from './logging';
 import { MarkdownContributionProvider } from './markdownExtensions';
 import { Slugifier } from './slugify';
-import { stringHash } from './util/hash';
+import { ITextDocument } from './types/textDocument';
 import { WebviewResourceProvider } from './util/resources';
 import { isOfScheme, Schemes } from './util/schemes';
-import { SkinnyTextDocument } from './workspaceContents';
 
 const UNICODE_NEWLINE_REGEX = /\u2028|\u2029/g;
 
@@ -53,7 +53,7 @@ class TokenCache {
 	};
 	private tokens?: Token[];
 
-	public tryGetCached(document: SkinnyTextDocument, config: MarkdownItConfig): Token[] | undefined {
+	public tryGetCached(document: ITextDocument, config: MarkdownItConfig): Token[] | undefined {
 		if (this.cachedDocument
 			&& this.cachedDocument.uri.toString() === document.uri.toString()
 			&& this.cachedDocument.version === document.version
@@ -65,7 +65,7 @@ class TokenCache {
 		return undefined;
 	}
 
-	public update(document: SkinnyTextDocument, config: MarkdownItConfig, tokens: Token[]) {
+	public update(document: ITextDocument, config: MarkdownItConfig, tokens: Token[]) {
 		this.cachedDocument = {
 			uri: document.uri,
 			version: document.version,
@@ -82,26 +82,37 @@ class TokenCache {
 
 export interface RenderOutput {
 	html: string;
-	containingImages: { src: string }[];
+	containingImages: Set;
 }
 
 interface RenderEnv {
-	containingImages: { src: string }[];
+	containingImages: Set;
 	currentDocument: vscode.Uri | undefined;
 	resourceProvider: WebviewResourceProvider | undefined;
 }
 
-export class MarkdownEngine {
+export interface IMdParser {
+	readonly slugifier: Slugifier;
+
+	tokenize(document: ITextDocument): Promise;
+}
+
+export class MarkdownItEngine implements IMdParser {
 
 	private md?: Promise;
 
 	private _slugCount = new Map();
 	private _tokenCache = new TokenCache();
 
+	public readonly slugifier: Slugifier;
+
 	public constructor(
 		private readonly contributionProvider: MarkdownContributionProvider,
-		private readonly slugifier: Slugifier,
+		slugifier: Slugifier,
+		private readonly logger: ILogger,
 	) {
+		this.slugifier = slugifier;
+
 		contributionProvider.onContributionsChanged(() => {
 			// Markdown plugin contributions may have changed
 			this.md = undefined;
@@ -159,7 +170,7 @@ export class MarkdownEngine {
 	}
 
 	private tokenizeDocument(
-		document: SkinnyTextDocument,
+		document: ITextDocument,
 		config: MarkdownItConfig,
 		engine: MarkdownIt
 	): Token[] {
@@ -169,6 +180,7 @@ export class MarkdownEngine {
 			return cached;
 		}
 
+		this.logger.verbose('MarkdownItEngine', `tokenizeDocument - ${document.uri}`);
 		const tokens = this.tokenizeString(document.getText(), engine);
 		this._tokenCache.update(document, config, tokens);
 		return tokens;
@@ -184,7 +196,7 @@ export class MarkdownEngine {
 		this._slugCount = new Map();
 	}
 
-	public async render(input: SkinnyTextDocument | string, resourceProvider?: WebviewResourceProvider): Promise {
+	public async render(input: ITextDocument | string, resourceProvider?: WebviewResourceProvider): Promise {
 		const config = this.getConfig(typeof input === 'string' ? undefined : input.uri);
 		const engine = await this.getEngine(config);
 
@@ -193,7 +205,7 @@ export class MarkdownEngine {
 			: this.tokenizeDocument(input, config, engine);
 
 		const env: RenderEnv = {
-			containingImages: [],
+			containingImages: new Set(),
 			currentDocument: typeof input === 'string' ? undefined : input.uri,
 			resourceProvider,
 		};
@@ -209,7 +221,7 @@ export class MarkdownEngine {
 		};
 	}
 
-	public async parse(document: SkinnyTextDocument): Promise {
+	public async tokenize(document: ITextDocument): Promise {
 		const config = this.getConfig(document.uri);
 		const engine = await this.getEngine(config);
 		return this.tokenizeDocument(document, config, engine);
@@ -232,13 +244,9 @@ export class MarkdownEngine {
 		const original = md.renderer.rules.image;
 		md.renderer.rules.image = (tokens: Token[], idx: number, options, env: RenderEnv, self) => {
 			const token = tokens[idx];
-			token.attrJoin('class', 'loading');
-
 			const src = token.attrGet('src');
 			if (src) {
-				env.containingImages?.push({ src });
-				const imgHash = stringHash(src);
-				token.attrSet('id', `image-hash-${imgHash}`);
+				env.containingImages?.add(src);
 
 				if (!token.attrGet('data-src')) {
 					token.attrSet('src', this.toResourceUri(src, env.currentDocument, env.resourceProvider));
diff --git a/extensions/markdown-language-features/src/markdownExtensions.ts b/extensions/markdown-language-features/src/markdownExtensions.ts
index cd6dfeb4260..0c768d0d48e 100644
--- a/extensions/markdown-language-features/src/markdownExtensions.ts
+++ b/extensions/markdown-language-features/src/markdownExtensions.ts
@@ -144,9 +144,7 @@ class VSCodeExtensionMarkdownContributionProvider extends Disposable implements
 	public readonly onContributionsChanged = this._onContributionsChanged.event;
 
 	public get contributions(): MarkdownContributions {
-		if (!this._contributions) {
-			this._contributions = this.getCurrentContributions();
-		}
+		this._contributions ??= this.getCurrentContributions();
 		return this._contributions;
 	}
 
diff --git a/extensions/markdown-language-features/src/preview/previewContentProvider.ts b/extensions/markdown-language-features/src/preview/documentRenderer.ts
similarity index 90%
rename from extensions/markdown-language-features/src/preview/previewContentProvider.ts
rename to extensions/markdown-language-features/src/preview/documentRenderer.ts
index 8437017dc4f..029aab1132c 100644
--- a/extensions/markdown-language-features/src/preview/previewContentProvider.ts
+++ b/extensions/markdown-language-features/src/preview/documentRenderer.ts
@@ -6,9 +6,10 @@
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 import * as uri from 'vscode-uri';
-import { Logger } from '../logger';
-import { MarkdownEngine } from '../markdownEngine';
+import { ILogger } from '../logging';
+import { MarkdownItEngine } from '../markdownEngine';
 import { MarkdownContributionProvider } from '../markdownExtensions';
+import { escapeAttribute, getNonce } from '../util/dom';
 import { WebviewResourceProvider } from '../util/resources';
 import { MarkdownPreviewConfiguration, MarkdownPreviewConfigurationManager } from './previewConfig';
 import { ContentSecurityPolicyArbiter, MarkdownPreviewSecurityLevel } from './security';
@@ -35,23 +36,19 @@ const previewStrings = {
 		'Content Disabled Security Warning')
 };
 
-function escapeAttribute(value: string | vscode.Uri): string {
-	return value.toString().replace(/"/g, '"');
-}
-
 export interface MarkdownContentProviderOutput {
 	html: string;
-	containingImages: { src: string }[];
+	containingImages: Set;
 }
 
 
-export class MarkdownContentProvider {
+export class MdDocumentRenderer {
 	constructor(
-		private readonly engine: MarkdownEngine,
+		private readonly engine: MarkdownItEngine,
 		private readonly context: vscode.ExtensionContext,
 		private readonly cspArbiter: ContentSecurityPolicyArbiter,
 		private readonly contributionProvider: MarkdownContributionProvider,
-		private readonly logger: Logger
+		private readonly logger: ILogger
 	) {
 		this.iconPath = {
 			dark: vscode.Uri.joinPath(this.context.extensionUri, 'media', 'preview-dark.svg'),
@@ -61,11 +58,12 @@ export class MarkdownContentProvider {
 
 	public readonly iconPath: { light: vscode.Uri; dark: vscode.Uri };
 
-	public async provideTextDocumentContent(
+	public async renderDocument(
 		markdownDocument: vscode.TextDocument,
 		resourceProvider: WebviewResourceProvider,
 		previewConfigurations: MarkdownPreviewConfigurationManager,
-		initialLine: number | undefined = undefined,
+		initialLine: number | undefined,
+		selectedLine: number | undefined,
 		state: any | undefined,
 		token: vscode.CancellationToken
 	): Promise {
@@ -75,7 +73,7 @@ export class MarkdownContentProvider {
 			source: sourceUri.toString(),
 			fragment: state?.fragment || markdownDocument.uri.fragment || undefined,
 			line: initialLine,
-			lineCount: markdownDocument.lineCount,
+			selectedLine,
 			scrollPreviewWithEditor: config.scrollPreviewWithEditor,
 			scrollEditorWithPreview: config.scrollEditorWithPreview,
 			doubleClickToSwitchToEditor: config.doubleClickToSwitchToEditor,
@@ -83,15 +81,15 @@ export class MarkdownContentProvider {
 			webviewResourceRoot: resourceProvider.asWebviewUri(markdownDocument.uri).toString(),
 		};
 
-		this.logger.log('provideTextDocumentContent', initialData);
+		this.logger.verbose('DocumentRenderer', `provideTextDocumentContent - ${markdownDocument.uri}`, initialData);
 
 		// Content Security Policy
 		const nonce = getNonce();
 		const csp = this.getCsp(resourceProvider, sourceUri, nonce);
 
-		const body = await this.markdownBody(markdownDocument, resourceProvider);
+		const body = await this.renderBody(markdownDocument, resourceProvider);
 		if (token.isCancellationRequested) {
-			return { html: '', containingImages: [] };
+			return { html: '', containingImages: new Set() };
 		}
 
 		const html = `
@@ -118,7 +116,7 @@ export class MarkdownContentProvider {
 		};
 	}
 
-	public async markdownBody(
+	public async renderBody(
 		markdownDocument: vscode.TextDocument,
 		resourceProvider: WebviewResourceProvider,
 	): Promise {
@@ -130,9 +128,7 @@ export class MarkdownContentProvider {
 		};
 	}
 
-	public provideFileNotFoundContent(
-		resource: vscode.Uri,
-	): string {
+	public renderFileNotFoundDocument(resource: vscode.Uri): string {
 		const resourcePath = uri.Utils.basename(resource);
 		const body = localize('preview.notFound', '{0} cannot be found', resourcePath);
 		return `
@@ -251,12 +247,3 @@ export class MarkdownContentProvider {
 		}
 	}
 }
-
-function getNonce() {
-	let text = '';
-	const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-	for (let i = 0; i < 64; i++) {
-		text += possible.charAt(Math.floor(Math.random() * possible.length));
-	}
-	return text;
-}
diff --git a/extensions/markdown-language-features/src/preview/preview.ts b/extensions/markdown-language-features/src/preview/preview.ts
index dd3c310a194..ccb219e5c2f 100644
--- a/extensions/markdown-language-features/src/preview/preview.ts
+++ b/extensions/markdown-language-features/src/preview/preview.ts
@@ -6,16 +6,15 @@
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 import * as uri from 'vscode-uri';
-import { Logger } from '../logger';
-import { MarkdownEngine } from '../markdownEngine';
+import { ILogger } from '../logging';
 import { MarkdownContributionProvider } from '../markdownExtensions';
 import { Disposable } from '../util/dispose';
 import { isMarkdownFile } from '../util/file';
-import { openDocumentLink, resolveDocumentLink, resolveUriToMarkdownFile } from '../util/openDocumentLink';
+import { MdLinkOpener } from '../util/openDocumentLink';
 import { WebviewResourceProvider } from '../util/resources';
 import { urlToUri } from '../util/url';
+import { MdDocumentRenderer } from './documentRenderer';
 import { MarkdownPreviewConfigurationManager } from './previewConfig';
-import { MarkdownContentProvider } from './previewContentProvider';
 import { scrollEditorToLine, StartingScrollFragment, StartingScrollLine, StartingScrollLocation } from './scrolling';
 import { getVisibleLine, LastScrollLocation, TopmostLineMonitor } from './topmostLineMonitor';
 
@@ -116,11 +115,11 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 		resource: vscode.Uri,
 		startingScroll: StartingScrollLocation | undefined,
 		private readonly delegate: MarkdownPreviewDelegate,
-		private readonly engine: MarkdownEngine,
-		private readonly _contentProvider: MarkdownContentProvider,
+		private readonly _contentProvider: MdDocumentRenderer,
 		private readonly _previewConfigurations: MarkdownPreviewConfigurationManager,
-		private readonly _logger: Logger,
+		private readonly _logger: ILogger,
 		private readonly _contributionProvider: MarkdownContributionProvider,
+		private readonly _opener: MdLinkOpener,
 	) {
 		super();
 
@@ -159,7 +158,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 		this._register(watcher.onDidChange(uri => {
 			if (this.isPreviewOf(uri)) {
 				// Only use the file system event when VS Code does not already know about the file
-				if (!vscode.workspace.textDocuments.some(doc => doc.uri.toString() !== uri.toString())) {
+				if (!vscode.workspace.textDocuments.some(doc => doc.uri.toString() === uri.toString())) {
 					this.refresh();
 				}
 			}
@@ -200,7 +199,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 			}
 		}));
 
-		this.updatePreview();
+		this.refresh();
 	}
 
 	override dispose() {
@@ -269,7 +268,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 			return;
 		}
 
-		this._logger.log('updateForView', { markdownFile: this._resource });
+		this._logger.verbose('MarkdownPreview', 'updateForView', { markdownFile: this._resource });
 		this.line = topLine;
 		this.postMessage({
 			type: 'updateView',
@@ -311,9 +310,17 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 		const shouldReloadPage = forceUpdate || !this.currentVersion || this.currentVersion.resource.toString() !== pendingVersion.resource.toString() || !this._webviewPanel.visible;
 		this.currentVersion = pendingVersion;
 
+		let selectedLine: number | undefined = undefined;
+		for (const editor of vscode.window.visibleTextEditors) {
+			if (this.isPreviewOf(editor.document.uri)) {
+				selectedLine = editor.selection.active.line;
+				break;
+			}
+		}
+
 		const content = await (shouldReloadPage
-			? this._contentProvider.provideTextDocumentContent(document, this, this._previewConfigurations, this.line, this.state, this._disposeCts.token)
-			: this._contentProvider.markdownBody(document, this));
+			? this._contentProvider.renderDocument(document, this, this._previewConfigurations, this.line, selectedLine, this.state, this._disposeCts.token)
+			: this._contentProvider.renderBody(document, this));
 
 		// Another call to `doUpdate` may have happened.
 		// Make sure we are still updating for the correct document
@@ -370,7 +377,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 	}
 
 	private async showFileNotFoundError() {
-		this._webviewPanel.webview.html = this._contentProvider.provideFileNotFoundContent(this._resource);
+		this._webviewPanel.webview.html = this._contentProvider.renderFileNotFoundDocument(this._resource);
 	}
 
 	private updateWebviewContent(html: string, reloadPage: boolean): void {
@@ -394,9 +401,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 		}
 	}
 
-	private updateImageWatchers(containingImages: { src: string }[]) {
-		const srcs = new Set(containingImages.map(img => img.src));
-
+	private updateImageWatchers(srcs: Set) {
 		// Delete stale file watchers.
 		for (const [src, watcher] of this._fileWatchersBySrc) {
 			if (!srcs.has(src)) {
@@ -444,19 +449,23 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 	}
 
 	private async onDidClickPreviewLink(href: string) {
-		const targetResource = resolveDocumentLink(href, this.resource);
-
 		const config = vscode.workspace.getConfiguration('markdown', this.resource);
 		const openLinks = config.get('preview.openMarkdownLinks', 'inPreview');
 		if (openLinks === 'inPreview') {
-			const linkedDoc = await resolveUriToMarkdownFile(targetResource);
-			if (linkedDoc) {
-				this.delegate.openPreviewLinkToMarkdownFile(linkedDoc.uri, targetResource.fragment);
-				return;
+			const resolved = await this._opener.resolveDocumentLink(href, this.resource);
+			if (resolved.kind === 'file') {
+				try {
+					const doc = await vscode.workspace.openTextDocument(vscode.Uri.from(resolved.uri));
+					if (isMarkdownFile(doc)) {
+						return this.delegate.openPreviewLinkToMarkdownFile(doc.uri, resolved.fragment ?? '');
+					}
+				} catch {
+					// Noop
+				}
 			}
 		}
 
-		return openDocumentLink(this.engine, targetResource, this.resource);
+		return this._opener.openDocumentLink(href, this.resource);
 	}
 
 	//#region WebviewResourceProvider
@@ -472,7 +481,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 	//#endregion
 }
 
-export interface ManagedMarkdownPreview {
+export interface IManagedMarkdownPreview {
 
 	readonly resource: vscode.Uri;
 	readonly resourceColumn: vscode.ViewColumn;
@@ -492,22 +501,22 @@ export interface ManagedMarkdownPreview {
 	): boolean;
 }
 
-export class StaticMarkdownPreview extends Disposable implements ManagedMarkdownPreview {
+export class StaticMarkdownPreview extends Disposable implements IManagedMarkdownPreview {
 
 	public static readonly customEditorViewType = 'vscode.markdown.preview.editor';
 
 	public static revive(
 		resource: vscode.Uri,
 		webview: vscode.WebviewPanel,
-		contentProvider: MarkdownContentProvider,
+		contentProvider: MdDocumentRenderer,
 		previewConfigurations: MarkdownPreviewConfigurationManager,
 		topmostLineMonitor: TopmostLineMonitor,
-		logger: Logger,
+		logger: ILogger,
 		contributionProvider: MarkdownContributionProvider,
-		engine: MarkdownEngine,
+		opener: MdLinkOpener,
 		scrollLine?: number,
 	): StaticMarkdownPreview {
-		return new StaticMarkdownPreview(webview, resource, contentProvider, previewConfigurations, topmostLineMonitor, logger, contributionProvider, engine, scrollLine);
+		return new StaticMarkdownPreview(webview, resource, contentProvider, previewConfigurations, topmostLineMonitor, logger, contributionProvider, opener, scrollLine);
 	}
 
 	private readonly preview: MarkdownPreview;
@@ -515,12 +524,12 @@ export class StaticMarkdownPreview extends Disposable implements ManagedMarkdown
 	private constructor(
 		private readonly _webviewPanel: vscode.WebviewPanel,
 		resource: vscode.Uri,
-		contentProvider: MarkdownContentProvider,
+		contentProvider: MdDocumentRenderer,
 		private readonly _previewConfigurations: MarkdownPreviewConfigurationManager,
 		topmostLineMonitor: TopmostLineMonitor,
-		logger: Logger,
+		logger: ILogger,
 		contributionProvider: MarkdownContributionProvider,
-		engine: MarkdownEngine,
+		opener: MdLinkOpener,
 		scrollLine?: number,
 	) {
 		super();
@@ -532,7 +541,7 @@ export class StaticMarkdownPreview extends Disposable implements ManagedMarkdown
 					fragment
 				}), StaticMarkdownPreview.customEditorViewType, this._webviewPanel.viewColumn);
 			}
-		}, engine, contentProvider, _previewConfigurations, logger, contributionProvider));
+		}, contentProvider, _previewConfigurations, logger, contributionProvider, opener));
 
 		this._register(this._webviewPanel.onDidDispose(() => {
 			this.dispose();
@@ -598,7 +607,7 @@ interface DynamicPreviewInput {
 	readonly line?: number;
 }
 
-export class DynamicMarkdownPreview extends Disposable implements ManagedMarkdownPreview {
+export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdownPreview {
 
 	public static readonly viewType = 'markdown.preview';
 
@@ -611,28 +620,28 @@ export class DynamicMarkdownPreview extends Disposable implements ManagedMarkdow
 	public static revive(
 		input: DynamicPreviewInput,
 		webview: vscode.WebviewPanel,
-		contentProvider: MarkdownContentProvider,
+		contentProvider: MdDocumentRenderer,
 		previewConfigurations: MarkdownPreviewConfigurationManager,
-		logger: Logger,
+		logger: ILogger,
 		topmostLineMonitor: TopmostLineMonitor,
 		contributionProvider: MarkdownContributionProvider,
-		engine: MarkdownEngine,
+		opener: MdLinkOpener,
 	): DynamicMarkdownPreview {
 		webview.iconPath = contentProvider.iconPath;
 
 		return new DynamicMarkdownPreview(webview, input,
-			contentProvider, previewConfigurations, logger, topmostLineMonitor, contributionProvider, engine);
+			contentProvider, previewConfigurations, logger, topmostLineMonitor, contributionProvider, opener);
 	}
 
 	public static create(
 		input: DynamicPreviewInput,
 		previewColumn: vscode.ViewColumn,
-		contentProvider: MarkdownContentProvider,
+		contentProvider: MdDocumentRenderer,
 		previewConfigurations: MarkdownPreviewConfigurationManager,
-		logger: Logger,
+		logger: ILogger,
 		topmostLineMonitor: TopmostLineMonitor,
 		contributionProvider: MarkdownContributionProvider,
-		engine: MarkdownEngine,
+		opener: MdLinkOpener,
 	): DynamicMarkdownPreview {
 		const webview = vscode.window.createWebviewPanel(
 			DynamicMarkdownPreview.viewType,
@@ -642,18 +651,18 @@ export class DynamicMarkdownPreview extends Disposable implements ManagedMarkdow
 		webview.iconPath = contentProvider.iconPath;
 
 		return new DynamicMarkdownPreview(webview, input,
-			contentProvider, previewConfigurations, logger, topmostLineMonitor, contributionProvider, engine);
+			contentProvider, previewConfigurations, logger, topmostLineMonitor, contributionProvider, opener);
 	}
 
 	private constructor(
 		webview: vscode.WebviewPanel,
 		input: DynamicPreviewInput,
-		private readonly _contentProvider: MarkdownContentProvider,
+		private readonly _contentProvider: MdDocumentRenderer,
 		private readonly _previewConfigurations: MarkdownPreviewConfigurationManager,
-		private readonly _logger: Logger,
+		private readonly _logger: ILogger,
 		private readonly _topmostLineMonitor: TopmostLineMonitor,
 		private readonly _contributionProvider: MarkdownContributionProvider,
-		private readonly _engine: MarkdownEngine,
+		private readonly _opener: MdLinkOpener,
 	) {
 		super();
 
@@ -805,10 +814,10 @@ export class DynamicMarkdownPreview extends Disposable implements ManagedMarkdow
 				this.update(link, fragment ? new StartingScrollFragment(fragment) : undefined);
 			}
 		},
-			this._engine,
 			this._contentProvider,
 			this._previewConfigurations,
 			this._logger,
-			this._contributionProvider);
+			this._contributionProvider,
+			this._opener);
 	}
 }
diff --git a/extensions/markdown-language-features/src/preview/previewManager.ts b/extensions/markdown-language-features/src/preview/previewManager.ts
index a0f837c2425..9e32e954c92 100644
--- a/extensions/markdown-language-features/src/preview/previewManager.ts
+++ b/extensions/markdown-language-features/src/preview/previewManager.ts
@@ -4,24 +4,28 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { Logger } from '../logger';
-import { MarkdownEngine } from '../markdownEngine';
+import * as nls from 'vscode-nls';
+import { ILogger } from '../logging';
 import { MarkdownContributionProvider } from '../markdownExtensions';
 import { Disposable, disposeAll } from '../util/dispose';
 import { isMarkdownFile } from '../util/file';
-import { DynamicMarkdownPreview, ManagedMarkdownPreview, StaticMarkdownPreview } from './preview';
+import { MdLinkOpener } from '../util/openDocumentLink';
+import { MdDocumentRenderer } from './documentRenderer';
+import { DynamicMarkdownPreview, IManagedMarkdownPreview, StaticMarkdownPreview } from './preview';
 import { MarkdownPreviewConfigurationManager } from './previewConfig';
-import { MarkdownContentProvider } from './previewContentProvider';
 import { scrollEditorToLine, StartingScrollFragment } from './scrolling';
 import { TopmostLineMonitor } from './topmostLineMonitor';
 
+const localize = nls.loadMessageBundle();
+
+
 export interface DynamicPreviewSettings {
 	readonly resourceColumn: vscode.ViewColumn;
 	readonly previewColumn: vscode.ViewColumn;
 	readonly locked: boolean;
 }
 
-class PreviewStore extends Disposable {
+class PreviewStore extends Disposable {
 
 	private readonly _previews = new Set();
 
@@ -38,8 +42,9 @@ class PreviewStore extends Disposable {
 	}
 
 	public get(resource: vscode.Uri, previewSettings: DynamicPreviewSettings): T | undefined {
+		const previewColumn = this.resolvePreviewColumn(previewSettings);
 		for (const preview of this._previews) {
-			if (preview.matchesResource(resource, previewSettings.previewColumn, previewSettings.locked)) {
+			if (preview.matchesResource(resource, previewColumn, previewSettings.locked)) {
 				return preview;
 			}
 		}
@@ -53,25 +58,35 @@ class PreviewStore extends Disposable {
 	public delete(preview: T) {
 		this._previews.delete(preview);
 	}
+
+	private resolvePreviewColumn(previewSettings: DynamicPreviewSettings): vscode.ViewColumn | undefined {
+		if (previewSettings.previewColumn === vscode.ViewColumn.Active) {
+			return vscode.window.tabGroups.activeTabGroup.viewColumn;
+		}
+
+		if (previewSettings.previewColumn === vscode.ViewColumn.Beside) {
+			return vscode.window.tabGroups.activeTabGroup.viewColumn + 1;
+		}
+
+		return previewSettings.previewColumn;
+	}
 }
 
 export class MarkdownPreviewManager extends Disposable implements vscode.WebviewPanelSerializer, vscode.CustomTextEditorProvider {
 
-	private static readonly markdownPreviewActiveContextKey = 'markdownPreviewFocus';
-
 	private readonly _topmostLineMonitor = new TopmostLineMonitor();
 	private readonly _previewConfigurations = new MarkdownPreviewConfigurationManager();
 
 	private readonly _dynamicPreviews = this._register(new PreviewStore());
 	private readonly _staticPreviews = this._register(new PreviewStore());
 
-	private _activePreview: ManagedMarkdownPreview | undefined = undefined;
+	private _activePreview: IManagedMarkdownPreview | undefined = undefined;
 
 	public constructor(
-		private readonly _contentProvider: MarkdownContentProvider,
-		private readonly _logger: Logger,
+		private readonly _contentProvider: MdDocumentRenderer,
+		private readonly _logger: ILogger,
 		private readonly _contributions: MarkdownContributionProvider,
-		private readonly _engine: MarkdownEngine,
+		private readonly _opener: MdLinkOpener,
 	) {
 		super();
 
@@ -153,22 +168,58 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 		webview: vscode.WebviewPanel,
 		state: any
 	): Promise {
-		const resource = vscode.Uri.parse(state.resource);
-		const locked = state.locked;
-		const line = state.line;
-		const resourceColumn = state.resourceColumn;
+		try {
+			const resource = vscode.Uri.parse(state.resource);
+			const locked = state.locked;
+			const line = state.line;
+			const resourceColumn = state.resourceColumn;
 
-		const preview = await DynamicMarkdownPreview.revive(
-			{ resource, locked, line, resourceColumn },
-			webview,
-			this._contentProvider,
-			this._previewConfigurations,
-			this._logger,
-			this._topmostLineMonitor,
-			this._contributions,
-			this._engine);
+			const preview = DynamicMarkdownPreview.revive(
+				{ resource, locked, line, resourceColumn },
+				webview,
+				this._contentProvider,
+				this._previewConfigurations,
+				this._logger,
+				this._topmostLineMonitor,
+				this._contributions,
+				this._opener);
 
-		this.registerDynamicPreview(preview);
+			this.registerDynamicPreview(preview);
+		} catch (e) {
+			console.error(e);
+
+			webview.webview.html = /* html */`
+			
+			
+				
+
+				
+				
+
+				Markdown Preview
+
+				
+
+				
+			
+			
+				
        ${localize('preview.restoreError', "An unexpected error occurred while restoring the Markdown preview.")}
        
+			
+			`;
+		}
 	}
 
 	public async resolveCustomTextEditor(
@@ -184,7 +235,7 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 			this._topmostLineMonitor,
 			this._logger,
 			this._contributions,
-			this._engine,
+			this._opener,
 			lineNumber
 		);
 		this.registerStaticPreview(preview);
@@ -209,9 +260,8 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 			this._logger,
 			this._topmostLineMonitor,
 			this._contributions,
-			this._engine);
+			this._opener);
 
-		this.setPreviewActiveContext(true);
 		this._activePreview = preview;
 		return this.registerDynamicPreview(preview);
 	}
@@ -243,21 +293,16 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 		return preview;
 	}
 
-	private trackActive(preview: ManagedMarkdownPreview): void {
+	private trackActive(preview: IManagedMarkdownPreview): void {
 		preview.onDidChangeViewState(({ webviewPanel }) => {
-			this.setPreviewActiveContext(webviewPanel.active);
 			this._activePreview = webviewPanel.active ? preview : undefined;
 		});
 
 		preview.onDispose(() => {
 			if (this._activePreview === preview) {
-				this.setPreviewActiveContext(false);
 				this._activePreview = undefined;
 			}
 		});
 	}
 
-	private setPreviewActiveContext(value: boolean) {
-		vscode.commands.executeCommand('setContext', MarkdownPreviewManager.markdownPreviewActiveContextKey, value);
-	}
 }
diff --git a/extensions/markdown-language-features/src/preview/scrolling.ts b/extensions/markdown-language-features/src/preview/scrolling.ts
index 2ce734a274d..cb807893266 100644
--- a/extensions/markdown-language-features/src/preview/scrolling.ts
+++ b/extensions/markdown-language-features/src/preview/scrolling.ts
@@ -11,13 +11,20 @@ export function scrollEditorToLine(
 	line: number,
 	editor: vscode.TextEditor
 ) {
+	const revealRange = toRevealRange(line, editor);
+	editor.revealRange(revealRange, vscode.TextEditorRevealType.AtTop);
+}
+
+function toRevealRange(line: number, editor: vscode.TextEditor): vscode.Range {
 	const sourceLine = Math.floor(line);
+	if (sourceLine >= editor.document.lineCount) {
+		return new vscode.Range(editor.document.lineCount - 1, 0, editor.document.lineCount - 1, 0);
+	}
+
 	const fraction = line - sourceLine;
 	const text = editor.document.lineAt(sourceLine).text;
 	const start = Math.floor(fraction * text.length);
-	editor.revealRange(
-		new vscode.Range(sourceLine, start, sourceLine + 1, 0),
-		vscode.TextEditorRevealType.AtTop);
+	return new vscode.Range(sourceLine, start, sourceLine + 1, 0);
 }
 
 export class StartingScrollFragment {
diff --git a/extensions/markdown-language-features/src/preview/topmostLineMonitor.ts b/extensions/markdown-language-features/src/preview/topmostLineMonitor.ts
index bc8364c8971..0f659f9e924 100644
--- a/extensions/markdown-language-features/src/preview/topmostLineMonitor.ts
+++ b/extensions/markdown-language-features/src/preview/topmostLineMonitor.ts
@@ -6,6 +6,7 @@
 import * as vscode from 'vscode';
 import { Disposable } from '../util/dispose';
 import { isMarkdownFile } from '../util/file';
+import { ResourceMap } from '../util/resourceMap';
 
 export interface LastScrollLocation {
 	readonly line: number;
@@ -14,10 +15,10 @@ export interface LastScrollLocation {
 
 export class TopmostLineMonitor extends Disposable {
 
-	private readonly pendingUpdates = new Map();
+	private readonly pendingUpdates = new ResourceMap();
 	private readonly throttle = 50;
-	private previousTextEditorInfo = new Map();
-	private previousStaticEditorInfo = new Map();
+	private previousTextEditorInfo = new ResourceMap();
+	private previousStaticEditorInfo = new ResourceMap();
 
 	constructor() {
 		super();
@@ -42,28 +43,28 @@ export class TopmostLineMonitor extends Disposable {
 	public readonly onDidChanged = this._onChanged.event;
 
 	public setPreviousStaticEditorLine(scrollLocation: LastScrollLocation): void {
-		this.previousStaticEditorInfo.set(scrollLocation.uri.toString(), scrollLocation);
+		this.previousStaticEditorInfo.set(scrollLocation.uri, scrollLocation);
 	}
 
 	public getPreviousStaticEditorLineByUri(resource: vscode.Uri): number | undefined {
-		const scrollLoc = this.previousStaticEditorInfo.get(resource.toString());
-		this.previousStaticEditorInfo.delete(resource.toString());
+		const scrollLoc = this.previousStaticEditorInfo.get(resource);
+		this.previousStaticEditorInfo.delete(resource);
 		return scrollLoc?.line;
 	}
 
 
 	public setPreviousTextEditorLine(scrollLocation: LastScrollLocation): void {
-		this.previousTextEditorInfo.set(scrollLocation.uri.toString(), scrollLocation);
+		this.previousTextEditorInfo.set(scrollLocation.uri, scrollLocation);
 	}
 
 	public getPreviousTextEditorLineByUri(resource: vscode.Uri): number | undefined {
-		const scrollLoc = this.previousTextEditorInfo.get(resource.toString());
-		this.previousTextEditorInfo.delete(resource.toString());
+		const scrollLoc = this.previousTextEditorInfo.get(resource);
+		this.previousTextEditorInfo.delete(resource);
 		return scrollLoc?.line;
 	}
 
 	public getPreviousStaticTextEditorLineByUri(resource: vscode.Uri): number | undefined {
-		const state = this.previousStaticEditorInfo.get(resource.toString());
+		const state = this.previousStaticEditorInfo.get(resource);
 		return state?.line;
 	}
 
@@ -71,21 +72,20 @@ export class TopmostLineMonitor extends Disposable {
 		resource: vscode.Uri,
 		line: number
 	) {
-		const key = resource.toString();
-		if (!this.pendingUpdates.has(key)) {
+		if (!this.pendingUpdates.has(resource)) {
 			// schedule update
 			setTimeout(() => {
-				if (this.pendingUpdates.has(key)) {
+				if (this.pendingUpdates.has(resource)) {
 					this._onChanged.fire({
 						resource,
-						line: this.pendingUpdates.get(key) as number
+						line: this.pendingUpdates.get(resource) as number
 					});
-					this.pendingUpdates.delete(key);
+					this.pendingUpdates.delete(resource);
 				}
 			}, this.throttle);
 		}
 
-		this.pendingUpdates.set(key, line);
+		this.pendingUpdates.set(resource, line);
 	}
 }
 
diff --git a/extensions/markdown-language-features/src/slugify.ts b/extensions/markdown-language-features/src/slugify.ts
index fff44756814..0d4b1896d8c 100644
--- a/extensions/markdown-language-features/src/slugify.ts
+++ b/extensions/markdown-language-features/src/slugify.ts
@@ -24,7 +24,7 @@ export const githubSlugifier: Slugifier = new class implements Slugifier {
 				.toLowerCase()
 				.replace(/\s+/g, '-') // Replace whitespace with -
 				// allow-any-unicode-next-line
-				.replace(/[\]\[\!\/\'\"\#\$\%\&\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\_\{\|\}\~\`。īŧŒã€īŧ›īŧšīŧŸīŧâ€Ļâ€”ÂˇË‰Â¨â€˜â€™â€œâ€ã€…īŊžâ€–âˆļīŧ‚īŧ‡īŊ€īŊœã€ƒã€”〕〈〉《》「」『』īŧŽã€–〗【】īŧˆīŧ‰īŧģīŧŊīŊ›īŊ]/g, '') // Remove known punctuators
+				.replace(/[\]\[\!\/\'\"\#\$\%\&\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\{\|\}\~\`。īŧŒã€īŧ›īŧšīŧŸīŧâ€Ļâ€”ÂˇË‰Â¨â€˜â€™â€œâ€ã€…īŊžâ€–âˆļīŧ‚īŧ‡īŊ€īŊœã€ƒã€”〕〈〉《》「」『』īŧŽã€–〗【】īŧˆīŧ‰īŧģīŧŊīŊ›īŊ]/g, '') // Remove known punctuators
 				.replace(/^\-+/, '') // Remove leading -
 				.replace(/\-+$/, '') // Remove trailing -
 		);
diff --git a/extensions/markdown-language-features/src/tableOfContents.ts b/extensions/markdown-language-features/src/tableOfContents.ts
deleted file mode 100644
index 33a65d997b5..00000000000
--- a/extensions/markdown-language-features/src/tableOfContents.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as vscode from 'vscode';
-import { MarkdownEngine } from './markdownEngine';
-import { githubSlugifier, Slug } from './slugify';
-import { isMarkdownFile } from './util/file';
-import { SkinnyTextDocument } from './workspaceContents';
-
-export interface TocEntry {
-	readonly slug: Slug;
-	readonly text: string;
-	readonly level: number;
-	readonly line: number;
-
-	/**
-	 * The entire range of the header section.
-	 *
-	* For the doc:
-	 *
-	 * ```md
-	 * # Head #
-	 * text
-	 * # Next head #
-	 * ```
-	 *
-	 * This is the range from `# Head #` to `# Next head #`
-	 */
-	readonly sectionLocation: vscode.Location;
-
-	/**
-	 * The range of the header declaration.
-	 *
-	 * For the doc:
-	 *
-	 * ```md
-	 * # Head #
-	 * text
-	 * ```
-	 *
-	 * This is the range of `# Head #`
-	 */
-	readonly headerLocation: vscode.Location;
-
-	/**
-	 * The range of the header text.
-	 *
-	 * For the doc:
-	 *
-	 * ```md
-	 * # Head #
-	 * text
-	 * ```
-	 *
-	 * This is the range of `Head`
-	 */
-	readonly headerTextLocation: vscode.Location;
-}
-
-export class TableOfContents {
-
-	public static async create(engine: MarkdownEngine, document: SkinnyTextDocument,): Promise {
-		const entries = await this.buildToc(engine, document);
-		return new TableOfContents(entries);
-	}
-
-	public static async createForDocumentOrNotebook(engine: MarkdownEngine, document: SkinnyTextDocument): Promise {
-		if (document.uri.scheme === 'vscode-notebook-cell') {
-			const notebook = vscode.workspace.notebookDocuments
-				.find(notebook => notebook.getCells().some(cell => cell.document === document));
-
-			if (notebook) {
-				const entries: TocEntry[] = [];
-
-				for (const cell of notebook.getCells()) {
-					if (cell.kind === vscode.NotebookCellKind.Markup && isMarkdownFile(cell.document)) {
-						entries.push(...(await this.buildToc(engine, cell.document)));
-					}
-				}
-
-				return new TableOfContents(entries);
-			}
-		}
-
-		return this.create(engine, document);
-	}
-
-	private static async buildToc(engine: MarkdownEngine, document: SkinnyTextDocument): Promise {
-		const toc: TocEntry[] = [];
-		const tokens = await engine.parse(document);
-
-		const existingSlugEntries = new Map();
-
-		for (const heading of tokens.filter(token => token.type === 'heading_open')) {
-			if (!heading.map) {
-				continue;
-			}
-
-			const lineNumber = heading.map[0];
-			const line = document.lineAt(lineNumber);
-
-			let slug = githubSlugifier.fromHeading(line.text);
-			const existingSlugEntry = existingSlugEntries.get(slug.value);
-			if (existingSlugEntry) {
-				++existingSlugEntry.count;
-				slug = githubSlugifier.fromHeading(slug.value + '-' + existingSlugEntry.count);
-			} else {
-				existingSlugEntries.set(slug.value, { count: 0 });
-			}
-
-			const headerLocation = new vscode.Location(document.uri,
-				new vscode.Range(lineNumber, 0, lineNumber, line.text.length));
-
-			const headerTextLocation = new vscode.Location(document.uri,
-				new vscode.Range(lineNumber, line.text.match(/^#+\s*/)?.[0].length ?? 0, lineNumber, line.text.length - (line.text.match(/\s*#*$/)?.[0].length ?? 0)));
-
-			toc.push({
-				slug,
-				text: TableOfContents.getHeaderText(line.text),
-				level: TableOfContents.getHeaderLevel(heading.markup),
-				line: lineNumber,
-				sectionLocation: headerLocation, // Populated in next steps
-				headerLocation,
-				headerTextLocation
-			});
-		}
-
-		// Get full range of section
-		return toc.map((entry, startIndex): TocEntry => {
-			let end: number | undefined = undefined;
-			for (let i = startIndex + 1; i < toc.length; ++i) {
-				if (toc[i].level <= entry.level) {
-					end = toc[i].line - 1;
-					break;
-				}
-			}
-			const endLine = end ?? document.lineCount - 1;
-			return {
-				...entry,
-				sectionLocation: new vscode.Location(document.uri,
-					new vscode.Range(
-						entry.sectionLocation.range.start,
-						new vscode.Position(endLine, document.lineAt(endLine).text.length)))
-			};
-		});
-	}
-
-	private static getHeaderLevel(markup: string): number {
-		if (markup === '=') {
-			return 1;
-		} else if (markup === '-') {
-			return 2;
-		} else { // '#', '##', ...
-			return markup.length;
-		}
-	}
-
-	private static getHeaderText(header: string): string {
-		return header.replace(/^\s*#+\s*(.*?)(\s+#+)?$/, (_, word) => word.trim());
-	}
-
-	private constructor(
-		public readonly entries: readonly TocEntry[],
-	) { }
-
-	public lookup(fragment: string): TocEntry | undefined {
-		const slug = githubSlugifier.fromHeading(fragment);
-		return this.entries.find(entry => entry.slug.equals(slug));
-	}
-}
diff --git a/extensions/markdown-language-features/src/test/definitionProvider.test.ts b/extensions/markdown-language-features/src/test/definitionProvider.test.ts
deleted file mode 100644
index 23379965264..00000000000
--- a/extensions/markdown-language-features/src/test/definitionProvider.test.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import 'mocha';
-import * as vscode from 'vscode';
-import { MdDefinitionProvider } from '../languageFeatures/definitionProvider';
-import { MdLinkProvider } from '../languageFeatures/documentLinkProvider';
-import { MdReferencesProvider } from '../languageFeatures/references';
-import { githubSlugifier } from '../slugify';
-import { noopToken } from '../util/cancellation';
-import { InMemoryDocument } from '../util/inMemoryDocument';
-import { MdWorkspaceContents } from '../workspaceContents';
-import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
-import { joinLines, workspacePath } from './util';
-
-
-function getDefinition(doc: InMemoryDocument, pos: vscode.Position, workspaceContents: MdWorkspaceContents) {
-	const engine = createNewMarkdownEngine();
-	const linkProvider = new MdLinkProvider(engine);
-	const referencesProvider = new MdReferencesProvider(linkProvider, workspaceContents, engine, githubSlugifier);
-	const provider = new MdDefinitionProvider(referencesProvider);
-	return provider.provideDefinition(doc, pos, noopToken);
-}
-
-function assertDefinitionsEqual(actualDef: vscode.Definition, ...expectedDefs: { uri: vscode.Uri; line: number; startCharacter?: number; endCharacter?: number }[]) {
-	const actualDefsArr = Array.isArray(actualDef) ? actualDef : [actualDef];
-
-	assert.strictEqual(actualDefsArr.length, expectedDefs.length, `Definition counts should match`);
-
-	for (let i = 0; i < actualDefsArr.length; ++i) {
-		const actual = actualDefsArr[i];
-		const expected = expectedDefs[i];
-		assert.strictEqual(actual.uri.toString(), expected.uri.toString(), `Definition '${i}' has expected document`);
-		assert.strictEqual(actual.range.start.line, expected.line, `Definition '${i}' has expected start line`);
-		assert.strictEqual(actual.range.end.line, expected.line, `Definition '${i}' has expected end line`);
-		if (typeof expected.startCharacter !== 'undefined') {
-			assert.strictEqual(actual.range.start.character, expected.startCharacter, `Definition '${i}' has expected start character`);
-		}
-		if (typeof expected.endCharacter !== 'undefined') {
-			assert.strictEqual(actual.range.end.character, expected.endCharacter, `Definition '${i}' has expected end character`);
-		}
-	}
-}
-
-suite('markdown: Go to definition', () => {
-	test('Should not return definition when on link text', async () => {
-		const doc = new InMemoryDocument(workspacePath('doc.md'), joinLines(
-			`[ref](#abc)`,
-			`[ref]: http://example.com`,
-		));
-
-		const defs = await getDefinition(doc, new vscode.Position(0, 1), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assert.deepStrictEqual(defs, undefined);
-	});
-
-	test('Should find definition links within file from link', async () => {
-		const docUri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(docUri, joinLines(
-			`[link 1][abc]`, // trigger here
-			``,
-			`[abc]: https://example.com`,
-		));
-
-		const defs = await getDefinition(doc, new vscode.Position(0, 12), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertDefinitionsEqual(defs!,
-			{ uri: docUri, line: 2 },
-		);
-	});
-
-	test('Should find definition links using shorthand', async () => {
-		const docUri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(docUri, joinLines(
-			`[ref]`, // trigger 1
-			``,
-			`[yes][ref]`, // trigger 2
-			``,
-			`[ref]: /Hello.md` // trigger 3
-		));
-
-		{
-			const defs = await getDefinition(doc, new vscode.Position(0, 2), new InMemoryWorkspaceMarkdownDocuments([doc]));
-			assertDefinitionsEqual(defs!,
-				{ uri: docUri, line: 4 },
-			);
-		}
-		{
-			const defs = await getDefinition(doc, new vscode.Position(2, 7), new InMemoryWorkspaceMarkdownDocuments([doc]));
-			assertDefinitionsEqual(defs!,
-				{ uri: docUri, line: 4 },
-			);
-		}
-		{
-			const defs = await getDefinition(doc, new vscode.Position(4, 2), new InMemoryWorkspaceMarkdownDocuments([doc]));
-			assertDefinitionsEqual(defs!,
-				{ uri: docUri, line: 4 },
-			);
-		}
-	});
-
-	test('Should find definition links within file from definition', async () => {
-		const docUri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(docUri, joinLines(
-			`[link 1][abc]`,
-			``,
-			`[abc]: https://example.com`, // trigger here
-		));
-
-		const defs = await getDefinition(doc, new vscode.Position(2, 3), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertDefinitionsEqual(defs!,
-			{ uri: docUri, line: 2 },
-		);
-	});
-
-	test('Should not find definition links across files', async () => {
-		const docUri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(docUri, joinLines(
-			`[link 1][abc]`,
-			``,
-			`[abc]: https://example.com`,
-		));
-
-		const defs = await getDefinition(doc, new vscode.Position(0, 12), new InMemoryWorkspaceMarkdownDocuments([
-			doc,
-			new InMemoryDocument(workspacePath('other.md'), joinLines(
-				`[link 1][abc]`,
-				``,
-				`[abc]: https://example.com?bad`,
-			))
-		]));
-		assertDefinitionsEqual(defs!,
-			{ uri: docUri, line: 2 },
-		);
-	});
-});
diff --git a/extensions/markdown-language-features/src/test/diagnostic.test.ts b/extensions/markdown-language-features/src/test/diagnostic.test.ts
deleted file mode 100644
index 1c6ae3dd6e8..00000000000
--- a/extensions/markdown-language-features/src/test/diagnostic.test.ts
+++ /dev/null
@@ -1,284 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import 'mocha';
-import * as vscode from 'vscode';
-import { DiagnosticComputer, DiagnosticConfiguration, DiagnosticLevel, DiagnosticManager, DiagnosticOptions } from '../languageFeatures/diagnostics';
-import { MdLinkProvider } from '../languageFeatures/documentLinkProvider';
-import { noopToken } from '../util/cancellation';
-import { InMemoryDocument } from '../util/inMemoryDocument';
-import { MdWorkspaceContents } from '../workspaceContents';
-import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
-import { assertRangeEqual, joinLines, workspacePath } from './util';
-
-
-async function getComputedDiagnostics(doc: InMemoryDocument, workspaceContents: MdWorkspaceContents): Promise {
-	const engine = createNewMarkdownEngine();
-	const linkProvider = new MdLinkProvider(engine);
-	const computer = new DiagnosticComputer(engine, workspaceContents, linkProvider);
-	return (
-		await computer.getDiagnostics(doc, {
-			enabled: true,
-			validateFilePaths: DiagnosticLevel.warning,
-			validateOwnHeaders: DiagnosticLevel.warning,
-			validateReferences: DiagnosticLevel.warning,
-			ignoreLinks: [],
-		}, noopToken)
-	).diagnostics;
-}
-
-function createDiagnosticsManager(workspaceContents: MdWorkspaceContents, configuration = new MemoryDiagnosticConfiguration()) {
-	const engine = createNewMarkdownEngine();
-	const linkProvider = new MdLinkProvider(engine);
-	return new DiagnosticManager(new DiagnosticComputer(engine, workspaceContents, linkProvider), configuration);
-}
-
-class MemoryDiagnosticConfiguration implements DiagnosticConfiguration {
-
-	private readonly _onDidChange = new vscode.EventEmitter();
-	public readonly onDidChange = this._onDidChange.event;
-
-	constructor(
-		private readonly enabled: boolean = true,
-		private readonly ignoreLinks: string[] = [],
-	) { }
-
-	getOptions(_resource: vscode.Uri): DiagnosticOptions {
-		if (!this.enabled) {
-			return {
-				enabled: false,
-				validateFilePaths: DiagnosticLevel.ignore,
-				validateOwnHeaders: DiagnosticLevel.ignore,
-				validateReferences: DiagnosticLevel.ignore,
-				ignoreLinks: this.ignoreLinks,
-			};
-		}
-		return {
-			enabled: true,
-			validateFilePaths: DiagnosticLevel.warning,
-			validateOwnHeaders: DiagnosticLevel.warning,
-			validateReferences: DiagnosticLevel.warning,
-			ignoreLinks: this.ignoreLinks,
-		};
-	}
-}
-
-
-suite('markdown: Diagnostics', () => {
-	test('Should not return any diagnostics for empty document', async () => {
-		const doc = new InMemoryDocument(workspacePath('doc.md'), joinLines(
-			`text`,
-		));
-
-		const diagnostics = await getComputedDiagnostics(doc, new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assert.deepStrictEqual(diagnostics, []);
-	});
-
-	test('Should generate diagnostic for link to file that does not exist', async () => {
-		const doc = new InMemoryDocument(workspacePath('doc.md'), joinLines(
-			`[bad](/no/such/file.md)`,
-			`[good](/doc.md)`,
-			`[good-ref]: /doc.md`,
-			`[bad-ref]: /no/such/file.md`,
-		));
-
-		const diagnostics = await getComputedDiagnostics(doc, new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assert.deepStrictEqual(diagnostics.length, 2);
-		assertRangeEqual(new vscode.Range(0, 6, 0, 22), diagnostics[0].range);
-		assertRangeEqual(new vscode.Range(3, 11, 3, 27), diagnostics[1].range);
-	});
-
-	test('Should generate diagnostics for links to header that does not exist in current file', async () => {
-		const doc = new InMemoryDocument(workspacePath('doc.md'), joinLines(
-			`[good](#good-header)`,
-			`# Good Header`,
-			`[bad](#no-such-header)`,
-			`[good](#good-header)`,
-			`[good-ref]: #good-header`,
-			`[bad-ref]: #no-such-header`,
-		));
-
-		const diagnostics = await getComputedDiagnostics(doc, new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assert.deepStrictEqual(diagnostics.length, 2);
-		assertRangeEqual(new vscode.Range(2, 6, 2, 21), diagnostics[0].range);
-		assertRangeEqual(new vscode.Range(5, 11, 5, 26), diagnostics[1].range);
-	});
-
-	test('Should generate diagnostics for links to non-existent headers in other files', async () => {
-		const doc1 = new InMemoryDocument(workspacePath('doc1.md'), joinLines(
-			`# My header`,
-			`[good](#my-header)`,
-			`[good](/doc1.md#my-header)`,
-			`[good](doc1.md#my-header)`,
-			`[good](/doc2.md#other-header)`,
-			`[bad](/doc2.md#no-such-other-header)`,
-		));
-
-		const doc2 = new InMemoryDocument(workspacePath('doc2.md'), joinLines(
-			`# Other header`,
-		));
-
-		const diagnostics = await getComputedDiagnostics(doc1, new InMemoryWorkspaceMarkdownDocuments([doc1, doc2]));
-		assert.deepStrictEqual(diagnostics.length, 1);
-		assertRangeEqual(new vscode.Range(5, 6, 5, 35), diagnostics[0].range);
-	});
-
-	test('Should support links both with and without .md file extension', async () => {
-		const doc = new InMemoryDocument(workspacePath('doc.md'), joinLines(
-			`# My header`,
-			`[good](#my-header)`,
-			`[good](/doc.md#my-header)`,
-			`[good](doc.md#my-header)`,
-			`[good](/doc#my-header)`,
-			`[good](doc#my-header)`,
-		));
-
-		const diagnostics = await getComputedDiagnostics(doc, new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assert.deepStrictEqual(diagnostics.length, 0);
-	});
-
-	test('Should generate diagnostics for non-existent link reference', async () => {
-		const doc = new InMemoryDocument(workspacePath('doc.md'), joinLines(
-			`[good link][good]`,
-			`[bad link][no-such]`,
-			``,
-			`[good]: http://example.com`,
-		));
-
-		const diagnostics = await getComputedDiagnostics(doc, new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assert.deepStrictEqual(diagnostics.length, 1);
-		assertRangeEqual(new vscode.Range(1, 11, 1, 18), diagnostics[0].range);
-	});
-
-	test('Should not generate diagnostics when validate is disabled', async () => {
-		const doc1 = new InMemoryDocument(workspacePath('doc1.md'), joinLines(
-			`[text](#no-such-header)`,
-			`[text][no-such-ref]`,
-		));
-
-		const manager = createDiagnosticsManager(new InMemoryWorkspaceMarkdownDocuments([doc1]), new MemoryDiagnosticConfiguration(false));
-		const { diagnostics } = await manager.recomputeDiagnosticState(doc1, noopToken);
-		assert.deepStrictEqual(diagnostics.length, 0);
-	});
-
-	test('Should not generate diagnostics for email autolink', async () => {
-		const doc1 = new InMemoryDocument(workspacePath('doc1.md'), joinLines(
-			`a  c`,
-		));
-
-		const diagnostics = await getComputedDiagnostics(doc1, new InMemoryWorkspaceMarkdownDocuments([doc1]));
-		assert.deepStrictEqual(diagnostics.length, 0);
-	});
-
-	test('Should not generate diagnostics for html tag that looks like an autolink', async () => {
-		const doc1 = new InMemoryDocument(workspacePath('doc1.md'), joinLines(
-			`a b c`,
-			`a b c`,
-		));
-
-		const diagnostics = await getComputedDiagnostics(doc1, new InMemoryWorkspaceMarkdownDocuments([doc1]));
-		assert.deepStrictEqual(diagnostics.length, 0);
-	});
-
-	test('Should allow ignoring invalid file link using glob', async () => {
-		const doc1 = new InMemoryDocument(workspacePath('doc1.md'), joinLines(
-			`[text](/no-such-file)`,
-			`![img](/no-such-file)`,
-			`[text]: /no-such-file`,
-		));
-
-		const manager = createDiagnosticsManager(new InMemoryWorkspaceMarkdownDocuments([doc1]), new MemoryDiagnosticConfiguration(true, ['/no-such-file']));
-		const { diagnostics } = await manager.recomputeDiagnosticState(doc1, noopToken);
-		assert.deepStrictEqual(diagnostics.length, 0);
-	});
-
-	test('ignoreLinks should allow skipping link to non-existent file', async () => {
-		const doc1 = new InMemoryDocument(workspacePath('doc1.md'), joinLines(
-			`[text](/no-such-file#header)`,
-		));
-
-		const manager = createDiagnosticsManager(new InMemoryWorkspaceMarkdownDocuments([doc1]), new MemoryDiagnosticConfiguration(true, ['/no-such-file']));
-		const { diagnostics } = await manager.recomputeDiagnosticState(doc1, noopToken);
-		assert.deepStrictEqual(diagnostics.length, 0);
-	});
-
-	test('ignoreLinks should not consider link fragment', async () => {
-		const doc1 = new InMemoryDocument(workspacePath('doc1.md'), joinLines(
-			`[text](/no-such-file#header)`,
-		));
-
-		const manager = createDiagnosticsManager(new InMemoryWorkspaceMarkdownDocuments([doc1]), new MemoryDiagnosticConfiguration(true, ['/no-such-file']));
-		const { diagnostics } = await manager.recomputeDiagnosticState(doc1, noopToken);
-		assert.deepStrictEqual(diagnostics.length, 0);
-	});
-
-	test('ignoreLinks should support globs', async () => {
-		const doc1 = new InMemoryDocument(workspacePath('doc1.md'), joinLines(
-			`![i](/images/aaa.png)`,
-			`![i](/images/sub/bbb.png)`,
-			`![i](/images/sub/sub2/ccc.png)`,
-		));
-
-		const manager = createDiagnosticsManager(new InMemoryWorkspaceMarkdownDocuments([doc1]), new MemoryDiagnosticConfiguration(true, ['/images/**/*.png']));
-		const { diagnostics } = await manager.recomputeDiagnosticState(doc1, noopToken);
-		assert.deepStrictEqual(diagnostics.length, 0);
-	});
-
-	test('ignoreLinks should support ignoring header', async () => {
-		const doc1 = new InMemoryDocument(workspacePath('doc1.md'), joinLines(
-			`![i](#no-such)`,
-		));
-
-		const manager = createDiagnosticsManager(new InMemoryWorkspaceMarkdownDocuments([doc1]), new MemoryDiagnosticConfiguration(true, ['#no-such']));
-		const { diagnostics } = await manager.recomputeDiagnosticState(doc1, noopToken);
-		assert.deepStrictEqual(diagnostics.length, 0);
-	});
-
-	test('ignoreLinks should support ignoring header in file', async () => {
-		const doc1 = new InMemoryDocument(workspacePath('doc1.md'), joinLines(
-			`![i](/doc2.md#no-such)`,
-		));
-		const doc2 = new InMemoryDocument(workspacePath('doc2.md'), joinLines(''));
-
-		const contents = new InMemoryWorkspaceMarkdownDocuments([doc1, doc2]);
-		{
-			const manager = createDiagnosticsManager(contents, new MemoryDiagnosticConfiguration(true, ['/doc2.md#no-such']));
-			const { diagnostics } = await manager.recomputeDiagnosticState(doc1, noopToken);
-			assert.deepStrictEqual(diagnostics.length, 0);
-		}
-		{
-			const manager = createDiagnosticsManager(contents, new MemoryDiagnosticConfiguration(true, ['/doc2.md#*']));
-			const { diagnostics } = await manager.recomputeDiagnosticState(doc1, noopToken);
-			assert.deepStrictEqual(diagnostics.length, 0);
-		}
-	});
-
-	test('ignoreLinks should support ignore header links if file is ignored', async () => {
-		const doc1 = new InMemoryDocument(workspacePath('doc1.md'), joinLines(
-			`![i](/doc2.md#no-such)`,
-		));
-		const doc2 = new InMemoryDocument(workspacePath('doc2.md'), joinLines(''));
-
-		const contents = new InMemoryWorkspaceMarkdownDocuments([doc1, doc2]);
-		const manager = createDiagnosticsManager(contents, new MemoryDiagnosticConfiguration(true, ['/doc2.md']));
-		const { diagnostics } = await manager.recomputeDiagnosticState(doc1, noopToken);
-		assert.deepStrictEqual(diagnostics.length, 0);
-	});
-
-	test('Should not detect checkboxes as invalid links', async () => {
-		const doc1 = new InMemoryDocument(workspacePath('doc1.md'), joinLines(
-			`- [x]`,
-			`- [X]`,
-			`- [ ]`,
-		));
-
-		const contents = new InMemoryWorkspaceMarkdownDocuments([doc1]);
-		const manager = createDiagnosticsManager(contents, new MemoryDiagnosticConfiguration(true, ['/doc2.md']));
-		const { diagnostics } = await manager.recomputeDiagnosticState(doc1, noopToken);
-		assert.deepStrictEqual(diagnostics.length, 0);
-	});
-});
diff --git a/extensions/markdown-language-features/src/test/documentLink.test.ts b/extensions/markdown-language-features/src/test/documentLink.test.ts
index 7c280a82bdf..0000069a660 100644
--- a/extensions/markdown-language-features/src/test/documentLink.test.ts
+++ b/extensions/markdown-language-features/src/test/documentLink.test.ts
@@ -24,7 +24,7 @@ function workspaceFile(...segments: string[]) {
 
 async function getLinksForFile(file: vscode.Uri): Promise {
 	debugLog('getting links', file.toString(), Date.now());
-	const r = (await vscode.commands.executeCommand('vscode.executeLinkProvider', file))!;
+	const r = (await vscode.commands.executeCommand('vscode.executeLinkProvider', file, /*linkResolveCount*/ 100))!;
 	debugLog('got links', file.toString(), Date.now());
 	return r;
 }
@@ -134,7 +134,7 @@ async function getLinksForFile(file: vscode.Uri): Promise
 		}
 	});
 
-	test('Should navigate to fragment within current untitled file', async () => {
+	test.skip('Should navigate to fragment within current untitled file', async () => { // TODO: skip for now for ls migration
 		const testFile = workspaceFile('x.md').with({ scheme: 'untitled' });
 		await withFileContents(testFile, joinLines(
 			'[](#second)',
@@ -169,9 +169,8 @@ async function withFileContents(file: vscode.Uri, contents: string): Promise {
-	test('Should not return anything for empty document', async () => {
-		const links = await getLinksForFile('');
-		assert.strictEqual(links.length, 0);
-	});
-
-	test('Should not return anything for simple document without links', async () => {
-		const links = await getLinksForFile(joinLines(
-			'# a',
-			'fdasfdfsafsa',
-		));
-		assert.strictEqual(links.length, 0);
-	});
-
-	test('Should detect basic http links', async () => {
-		const links = await getLinksForFile('a [b](https://example.com) c');
-		assert.strictEqual(links.length, 1);
-		const [link] = links;
-		assertRangeEqual(link.range, new vscode.Range(0, 6, 0, 25));
-	});
-
-	test('Should detect basic workspace links', async () => {
-		{
-			const links = await getLinksForFile('a [b](./file) c');
-			assert.strictEqual(links.length, 1);
-			const [link] = links;
-			assertRangeEqual(link.range, new vscode.Range(0, 6, 0, 12));
-		}
-		{
-			const links = await getLinksForFile('a [b](file.png) c');
-			assert.strictEqual(links.length, 1);
-			const [link] = links;
-			assertRangeEqual(link.range, new vscode.Range(0, 6, 0, 14));
-		}
-	});
-
-	test('Should detect links with title', async () => {
-		const links = await getLinksForFile('a [b](https://example.com "abc") c');
-		assert.strictEqual(links.length, 1);
-		const [link] = links;
-		assertRangeEqual(link.range, new vscode.Range(0, 6, 0, 25));
-	});
-
-	test('Should handle links with escaped characters in name (#35245)', async () => {
-		const links = await getLinksForFile('a [b\\]](./file)');
-		assert.strictEqual(links.length, 1);
-		const [link] = links;
-		assertRangeEqual(link.range, new vscode.Range(0, 8, 0, 14));
-	});
-
-	test('Should handle links with balanced parens', async () => {
-		{
-			const links = await getLinksForFile('a [b](https://example.com/a()c) c');
-			assert.strictEqual(links.length, 1);
-			const [link] = links;
-			assertRangeEqual(link.range, new vscode.Range(0, 6, 0, 30));
-		}
-		{
-			const links = await getLinksForFile('a [b](https://example.com/a(b)c) c');
-			assert.strictEqual(links.length, 1);
-			const [link] = links;
-			assertRangeEqual(link.range, new vscode.Range(0, 6, 0, 31));
-
-		}
-		{
-			// #49011
-			const links = await getLinksForFile('[A link](http://ThisUrlhasParens/A_link(in_parens))');
-			assert.strictEqual(links.length, 1);
-			const [link] = links;
-			assertRangeEqual(link.range, new vscode.Range(0, 9, 0, 50));
-		}
-	});
-
-	test('Should handle two links without space', async () => {
-		const links = await getLinksForFile('a ([test](test)[test2](test2)) c');
-		assert.strictEqual(links.length, 2);
-		const [link1, link2] = links;
-		assertRangeEqual(link1.range, new vscode.Range(0, 10, 0, 14));
-		assertRangeEqual(link2.range, new vscode.Range(0, 23, 0, 28));
-	});
-
-	test('should handle hyperlinked images (#49238)', async () => {
-		{
-			const links = await getLinksForFile('[![alt text](image.jpg)](https://example.com)');
-			assert.strictEqual(links.length, 2);
-			const [link1, link2] = links;
-			assertRangeEqual(link1.range, new vscode.Range(0, 13, 0, 22));
-			assertRangeEqual(link2.range, new vscode.Range(0, 25, 0, 44));
-		}
-		{
-			const links = await getLinksForFile('[![a]( whitespace.jpg )]( https://whitespace.com )');
-			assert.strictEqual(links.length, 2);
-			const [link1, link2] = links;
-			assertRangeEqual(link1.range, new vscode.Range(0, 7, 0, 21));
-			assertRangeEqual(link2.range, new vscode.Range(0, 26, 0, 48));
-		}
-		{
-			const links = await getLinksForFile('[![a](img1.jpg)](file1.txt) text [![a](img2.jpg)](file2.txt)');
-			assert.strictEqual(links.length, 4);
-			const [link1, link2, link3, link4] = links;
-			assertRangeEqual(link1.range, new vscode.Range(0, 6, 0, 14));
-			assertRangeEqual(link2.range, new vscode.Range(0, 17, 0, 26));
-			assertRangeEqual(link3.range, new vscode.Range(0, 39, 0, 47));
-			assertRangeEqual(link4.range, new vscode.Range(0, 50, 0, 59));
-		}
-	});
-
-	test('Should not consider link references starting with ^ character valid (#107471)', async () => {
-		const links = await getLinksForFile('[^reference]: https://example.com');
-		assert.strictEqual(links.length, 0);
-	});
-
-	test('Should find definitions links with spaces in angle brackets (#136073)', async () => {
-		const links = await getLinksForFile(joinLines(
-			'[a]: ',
-			'[b]: ',
-		));
-		assert.strictEqual(links.length, 2);
-
-		const [link1, link2] = links;
-		assertRangeEqual(link1.range, new vscode.Range(0, 6, 0, 9));
-		assertRangeEqual(link2.range, new vscode.Range(1, 6, 1, 8));
-	});
-
-	test('Should only find one link for reference sources [a]: source (#141285)', async () => {
-		const links = await getLinksForFile(joinLines(
-			'[Works]: https://example.com',
-		));
-
-		assert.strictEqual(links.length, 1);
-	});
-
-	test('Should find reference link shorthand (#141285)', async () => {
-		let links = await getLinksForFile(joinLines(
-			'[ref]',
-			'[ref]: https://example.com',
-		));
-		assert.strictEqual(links.length, 2);
-
-		links = await getLinksForFile(joinLines(
-			'[Does Not Work]',
-			'[def]: https://example.com',
-		));
-		assert.strictEqual(links.length, 1);
-	});
-
-	test('Should not include reference link shorthand when source does not exist (#141285)', async () => {
-		const links = await getLinksForFile('[Works]');
-		assert.strictEqual(links.length, 0);
-	});
-
-	test('Should not include reference links with escaped leading brackets', async () => {
-		const links = await getLinksForFile(joinLines(
-			`\\[bad link][good]`,
-			`\\[good]`,
-			`[good]: http://example.com`,
-		));
-		assert.strictEqual(links.length, 1);
-		assertRangeEqual(links[0].range, new vscode.Range(2, 8, 2, 26)); // Should only find the definition
-	});
-
-	test('Should not consider links in code fenced with backticks', async () => {
-		const links = await getLinksForFile(joinLines(
-			'```',
-			'[b](https://example.com)',
-			'```'));
-		assert.strictEqual(links.length, 0);
-	});
-
-	test('Should not consider links in code fenced with tilde', async () => {
-		const links = await getLinksForFile(joinLines(
-			'~~~',
-			'[b](https://example.com)',
-			'~~~'));
-		assert.strictEqual(links.length, 0);
-	});
-
-	test('Should not consider links in indented code', async () => {
-		const links = await getLinksForFile('    [b](https://example.com)');
-		assert.strictEqual(links.length, 0);
-	});
-
-	test('Should not consider links in inline code span', async () => {
-		const links = await getLinksForFile('`[b](https://example.com)`');
-		assert.strictEqual(links.length, 0);
-	});
-
-	test('Should not consider links with code span inside', async () => {
-		const links = await getLinksForFile('[li`nk](https://example.com`)');
-		assert.strictEqual(links.length, 0);
-	});
-
-	test('Should not consider links in multiline inline code span', async () => {
-		const links = await getLinksForFile(joinLines(
-			'`` ',
-			'[b](https://example.com)',
-			'``'));
-		assert.strictEqual(links.length, 0);
-	});
-
-	test('Should not consider link references in code fenced with backticks (#146714)', async () => {
-		const links = await getLinksForFile(joinLines(
-			'```',
-			'[a] [bb]',
-			'```'));
-		assert.strictEqual(links.length, 0);
-	});
-
-	test('Should not consider reference sources in code fenced with backticks (#146714)', async () => {
-		const links = await getLinksForFile(joinLines(
-			'```',
-			'[a]: http://example.com;',
-			'[b]: ;',
-			'[c]: (http://example.com);',
-			'```'));
-		assert.strictEqual(links.length, 0);
-	});
-
-	test('Should not consider links in multiline inline code span between between text', async () => {
-		const links = await getLinksForFile(joinLines(
-			'[b](https://1.com) `[b](https://2.com)',
-			'` [b](https://3.com)'));
-		assert.deepStrictEqual(links.map(l => l.target?.authority), ['1.com', '3.com']);
-	});
-
-	test('Should not consider links in multiline inline code span with new line after the first backtick', async () => {
-		const links = await getLinksForFile(joinLines(
-			'`',
-			'[b](https://example.com)`'));
-		assert.strictEqual(links.length, 0);
-	});
-
-	test('Should not miss links in invalid multiline inline code span', async () => {
-		const links = await getLinksForFile(joinLines(
-			'`` ',
-			'',
-			'[b](https://example.com)',
-			'',
-			'``'));
-		assert.strictEqual(links.length, 1);
-	});
-
-	test('Should find autolinks', async () => {
-		const links = await getLinksForFile('pre  post');
-		assert.strictEqual(links.length, 1);
-
-		const link = links[0];
-		assertRangeEqual(link.range, new vscode.Range(0, 5, 0, 23));
-	});
-
-	test('Should not detect links inside html comment blocks', async () => {
-		const links = await getLinksForFile(joinLines(
-			``,
-			``,
-			``,
-			``,
-			``,
-			``,
-			``,
-			``,
-			``,
-		));
-		assert.strictEqual(links.length, 0);
-	});
-
-	test.skip('Should not detect links inside inline html comments', async () => {
-		// See #149678
-		const links = await getLinksForFile(joinLines(
-			`text  text`,
-			`text  text`,
-			`text  text`,
-			``,
-			`text  text`,
-			``,
-			`text  text`,
-			``,
-			`text  text`,
-		));
-		assert.strictEqual(links.length, 0);
-	});
-
-	test('Should not mark checkboxes as links', async () => {
-		const links = await getLinksForFile(joinLines(
-			'- [x]',
-			'- [X]',
-			'- [ ]',
-			'* [x]',
-			'* [X]',
-			'* [ ]',
-			``,
-			`[x]: http://example.com`
-		));
-		assert.strictEqual(links.length, 1);
-		assertRangeEqual(links[0].range, new vscode.Range(7, 5, 7, 23));
-
-	});
-
-	test('Should still find links on line with checkbox', async () => {
-		const links = await getLinksForFile(joinLines(
-			'- [x] [x]',
-			'- [X] [x]',
-			'- [] [x]',
-			``,
-			`[x]: http://example.com`
-		));
-		assert.strictEqual(links.length, 4);
-
-		assertRangeEqual(links[0].range, new vscode.Range(0, 7, 0, 8));
-		assertRangeEqual(links[1].range, new vscode.Range(1, 7, 1, 8));
-		assertRangeEqual(links[2].range, new vscode.Range(2, 6, 2, 7));
-		assertRangeEqual(links[3].range, new vscode.Range(4, 5, 4, 23));
-	});
-});
diff --git a/extensions/markdown-language-features/src/test/documentSymbolProvider.test.ts b/extensions/markdown-language-features/src/test/documentSymbolProvider.test.ts
deleted file mode 100644
index e29c7399e7a..00000000000
--- a/extensions/markdown-language-features/src/test/documentSymbolProvider.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import 'mocha';
-import * as vscode from 'vscode';
-import { MdDocumentSymbolProvider } from '../languageFeatures/documentSymbolProvider';
-import { createNewMarkdownEngine } from './engine';
-import { InMemoryDocument } from '../util/inMemoryDocument';
-
-
-const testFileName = vscode.Uri.file('test.md');
-
-
-function getSymbolsForFile(fileContents: string) {
-	const doc = new InMemoryDocument(testFileName, fileContents);
-	const provider = new MdDocumentSymbolProvider(createNewMarkdownEngine());
-	return provider.provideDocumentSymbols(doc);
-}
-
-
-suite('markdown.DocumentSymbolProvider', () => {
-	test('Should not return anything for empty document', async () => {
-		const symbols = await getSymbolsForFile('');
-		assert.strictEqual(symbols.length, 0);
-	});
-
-	test('Should not return anything for document with no headers', async () => {
-		const symbols = await getSymbolsForFile('a\na');
-		assert.strictEqual(symbols.length, 0);
-	});
-
-	test('Should not return anything for document with # but no real headers', async () => {
-		const symbols = await getSymbolsForFile('a#a\na#');
-		assert.strictEqual(symbols.length, 0);
-	});
-
-	test('Should return single symbol for single header', async () => {
-		const symbols = await getSymbolsForFile('# h');
-		assert.strictEqual(symbols.length, 1);
-		assert.strictEqual(symbols[0].name, '# h');
-	});
-
-	test('Should not care about symbol level for single header', async () => {
-		const symbols = await getSymbolsForFile('### h');
-		assert.strictEqual(symbols.length, 1);
-		assert.strictEqual(symbols[0].name, '### h');
-	});
-
-	test('Should put symbols of same level in flat list', async () => {
-		const symbols = await getSymbolsForFile('## h\n## h2');
-		assert.strictEqual(symbols.length, 2);
-		assert.strictEqual(symbols[0].name, '## h');
-		assert.strictEqual(symbols[1].name, '## h2');
-	});
-
-	test('Should nest symbol of level - 1 under parent', async () => {
-
-		const symbols = await getSymbolsForFile('# h\n## h2\n## h3');
-		assert.strictEqual(symbols.length, 1);
-		assert.strictEqual(symbols[0].name, '# h');
-		assert.strictEqual(symbols[0].children.length, 2);
-		assert.strictEqual(symbols[0].children[0].name, '## h2');
-		assert.strictEqual(symbols[0].children[1].name, '## h3');
-	});
-
-	test('Should nest symbol of level - n under parent', async () => {
-		const symbols = await getSymbolsForFile('# h\n#### h2');
-		assert.strictEqual(symbols.length, 1);
-		assert.strictEqual(symbols[0].name, '# h');
-		assert.strictEqual(symbols[0].children.length, 1);
-		assert.strictEqual(symbols[0].children[0].name, '#### h2');
-	});
-
-	test('Should flatten children where lower level occurs first', async () => {
-		const symbols = await getSymbolsForFile('# h\n### h2\n## h3');
-		assert.strictEqual(symbols.length, 1);
-		assert.strictEqual(symbols[0].name, '# h');
-		assert.strictEqual(symbols[0].children.length, 2);
-		assert.strictEqual(symbols[0].children[0].name, '### h2');
-		assert.strictEqual(symbols[0].children[1].name, '## h3');
-	});
-
-	test('Should handle line separator in file. Issue #63749', async () => {
-		const symbols = await getSymbolsForFile(`# A
-- foo
-
-# B
-- bar`);
-		assert.strictEqual(symbols.length, 2);
-		assert.strictEqual(symbols[0].name, '# A');
-		assert.strictEqual(symbols[1].name, '# B');
-	});
-});
-
diff --git a/extensions/markdown-language-features/src/test/engine.test.ts b/extensions/markdown-language-features/src/test/engine.test.ts
index c314e24d748..cd3322f704a 100644
--- a/extensions/markdown-language-features/src/test/engine.test.ts
+++ b/extensions/markdown-language-features/src/test/engine.test.ts
@@ -6,8 +6,8 @@
 import * as assert from 'assert';
 import 'mocha';
 import * as vscode from 'vscode';
+import { InMemoryDocument } from '../client/inMemoryDocument';
 import { createNewMarkdownEngine } from './engine';
-import { InMemoryDocument } from '../util/inMemoryDocument';
 
 
 const testFileName = vscode.Uri.file('test.md');
@@ -35,17 +35,18 @@ suite('markdown.engine', () => {
 
 		test('Extracts all images', async () => {
 			const engine = createNewMarkdownEngine();
-			assert.deepStrictEqual((await engine.render(input)), {
-				html: '
        '
-					+ ' '
-					+ ' '
-					+ ' '
-					+ ' '
-					+ ''
-					+ '
        \n'
-				,
-				containingImages: [{ src: 'img.png' }, { src: 'http://example.org/img.png' }, { src: 'img.png' }, { src: './img2.png' }],
-			});
+			const result = await engine.render(input);
+			assert.deepStrictEqual(result.html,
+				'
        '
+				+ ' '
+				+ ' '
+				+ ' '
+				+ ' '
+				+ ''
+				+ '
        \n'
+			);
+
+			assert.deepStrictEqual([...result.containingImages], ['img.png', 'http://example.org/img.png', './img2.png']);
 		});
 	});
 });
diff --git a/extensions/markdown-language-features/src/test/engine.ts b/extensions/markdown-language-features/src/test/engine.ts
index e75be4abac5..46fdc02ee78 100644
--- a/extensions/markdown-language-features/src/test/engine.ts
+++ b/extensions/markdown-language-features/src/test/engine.ts
@@ -4,10 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { MarkdownEngine } from '../markdownEngine';
+import { MarkdownItEngine } from '../markdownEngine';
 import { MarkdownContributionProvider, MarkdownContributions } from '../markdownExtensions';
 import { githubSlugifier } from '../slugify';
 import { Disposable } from '../util/dispose';
+import { nulLogger } from './nulLogging';
 
 const emptyContributions = new class extends Disposable implements MarkdownContributionProvider {
 	readonly extensionUri = vscode.Uri.file('/');
@@ -15,6 +16,6 @@ const emptyContributions = new class extends Disposable implements MarkdownContr
 	readonly onContributionsChanged = this._register(new vscode.EventEmitter()).event;
 };
 
-export function createNewMarkdownEngine(): MarkdownEngine {
-	return new MarkdownEngine(emptyContributions, githubSlugifier);
+export function createNewMarkdownEngine(): MarkdownItEngine {
+	return new MarkdownItEngine(emptyContributions, githubSlugifier, nulLogger);
 }
diff --git a/extensions/markdown-language-features/src/test/fileReferences.test.ts b/extensions/markdown-language-features/src/test/fileReferences.test.ts
deleted file mode 100644
index 7857f7364f9..00000000000
--- a/extensions/markdown-language-features/src/test/fileReferences.test.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import 'mocha';
-import * as vscode from 'vscode';
-import { MdLinkProvider } from '../languageFeatures/documentLinkProvider';
-import { MdReference, MdReferencesProvider } from '../languageFeatures/references';
-import { githubSlugifier } from '../slugify';
-import { noopToken } from '../util/cancellation';
-import { InMemoryDocument } from '../util/inMemoryDocument';
-import { MdWorkspaceContents } from '../workspaceContents';
-import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
-import { joinLines, workspacePath } from './util';
-
-
-function getFileReferences(resource: vscode.Uri, workspaceContents: MdWorkspaceContents) {
-	const engine = createNewMarkdownEngine();
-	const linkProvider = new MdLinkProvider(engine);
-	const provider = new MdReferencesProvider(linkProvider, workspaceContents, engine, githubSlugifier);
-	return provider.getAllReferencesToFile(resource, noopToken);
-}
-
-function assertReferencesEqual(actualRefs: readonly MdReference[], ...expectedRefs: { uri: vscode.Uri; line: number }[]) {
-	assert.strictEqual(actualRefs.length, expectedRefs.length, `Reference counts should match`);
-
-	for (let i = 0; i < actualRefs.length; ++i) {
-		const actual = actualRefs[i].location;
-		const expected = expectedRefs[i];
-		assert.strictEqual(actual.uri.toString(), expected.uri.toString(), `Ref '${i}' has expected document`);
-		assert.strictEqual(actual.range.start.line, expected.line, `Ref '${i}' has expected start line`);
-		assert.strictEqual(actual.range.end.line, expected.line, `Ref '${i}' has expected end line`);
-	}
-}
-
-suite('markdown: find file references', () => {
-
-	test('Should find basic references', async () => {
-		const docUri = workspacePath('doc.md');
-		const otherUri = workspacePath('other.md');
-
-		const refs = await getFileReferences(otherUri, new InMemoryWorkspaceMarkdownDocuments([
-			new InMemoryDocument(docUri, joinLines(
-				`# header`,
-				`[link 1](./other.md)`,
-				`[link 2](./other.md)`,
-			)),
-			new InMemoryDocument(otherUri, joinLines(
-				`# header`,
-				`pre`,
-				`[link 3](./other.md)`,
-				`post`,
-			)),
-		]));
-
-		assertReferencesEqual(refs!,
-			{ uri: docUri, line: 1 },
-			{ uri: docUri, line: 2 },
-			{ uri: otherUri, line: 2 },
-		);
-	});
-
-	test('Should find references with and without file extensions', async () => {
-		const docUri = workspacePath('doc.md');
-		const otherUri = workspacePath('other.md');
-
-		const refs = await getFileReferences(otherUri, new InMemoryWorkspaceMarkdownDocuments([
-			new InMemoryDocument(docUri, joinLines(
-				`# header`,
-				`[link 1](./other.md)`,
-				`[link 2](./other)`,
-			)),
-			new InMemoryDocument(otherUri, joinLines(
-				`# header`,
-				`pre`,
-				`[link 3](./other.md)`,
-				`[link 4](./other)`,
-				`post`,
-			)),
-		]));
-
-		assertReferencesEqual(refs!,
-			{ uri: docUri, line: 1 },
-			{ uri: docUri, line: 2 },
-			{ uri: otherUri, line: 2 },
-			{ uri: otherUri, line: 3 },
-		);
-	});
-
-	test('Should find references with headers on links', async () => {
-		const docUri = workspacePath('doc.md');
-		const otherUri = workspacePath('other.md');
-
-		const refs = await getFileReferences(otherUri, new InMemoryWorkspaceMarkdownDocuments([
-			new InMemoryDocument(docUri, joinLines(
-				`# header`,
-				`[link 1](./other.md#sub-bla)`,
-				`[link 2](./other#sub-bla)`,
-			)),
-			new InMemoryDocument(otherUri, joinLines(
-				`# header`,
-				`pre`,
-				`[link 3](./other.md#sub-bla)`,
-				`[link 4](./other#sub-bla)`,
-				`post`,
-			)),
-		]));
-
-		assertReferencesEqual(refs!,
-			{ uri: docUri, line: 1 },
-			{ uri: docUri, line: 2 },
-			{ uri: otherUri, line: 2 },
-			{ uri: otherUri, line: 3 },
-		);
-	});
-});
diff --git a/extensions/markdown-language-features/src/test/foldingProvider.test.ts b/extensions/markdown-language-features/src/test/foldingProvider.test.ts
deleted file mode 100644
index bfb78f8a77b..00000000000
--- a/extensions/markdown-language-features/src/test/foldingProvider.test.ts
+++ /dev/null
@@ -1,223 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import 'mocha';
-import * as vscode from 'vscode';
-import { MdFoldingProvider } from '../languageFeatures/foldingProvider';
-import { InMemoryDocument } from '../util/inMemoryDocument';
-import { createNewMarkdownEngine } from './engine';
-import { joinLines } from './util';
-
-const testFileName = vscode.Uri.file('test.md');
-
-suite('markdown.FoldingProvider', () => {
-	test('Should not return anything for empty document', async () => {
-		const folds = await getFoldsForDocument(``);
-		assert.strictEqual(folds.length, 0);
-	});
-
-	test('Should not return anything for document without headers', async () => {
-		const folds = await getFoldsForDocument(joinLines(
-			`a`,
-			`**b** afas`,
-			`a#b`,
-			`a`,
-		));
-		assert.strictEqual(folds.length, 0);
-	});
-
-	test('Should fold from header to end of document', async () => {
-		const folds = await getFoldsForDocument(joinLines(
-			`a`,
-			`# b`,
-			`c`,
-			`d`,
-		));
-		assert.strictEqual(folds.length, 1);
-		const firstFold = folds[0];
-		assert.strictEqual(firstFold.start, 1);
-		assert.strictEqual(firstFold.end, 3);
-	});
-
-	test('Should leave single newline before next header', async () => {
-		const folds = await getFoldsForDocument(joinLines(
-			``,
-			`# a`,
-			`x`,
-			``,
-			`# b`,
-			`y`,
-		));
-		assert.strictEqual(folds.length, 2);
-		const firstFold = folds[0];
-		assert.strictEqual(firstFold.start, 1);
-		assert.strictEqual(firstFold.end, 2);
-	});
-
-	test('Should collapse multiple newlines to single newline before next header', async () => {
-		const folds = await getFoldsForDocument(joinLines(
-			``,
-			`# a`,
-			`x`,
-			``,
-			``,
-			``,
-			`# b`,
-			`y`
-		));
-		assert.strictEqual(folds.length, 2);
-		const firstFold = folds[0];
-		assert.strictEqual(firstFold.start, 1);
-		assert.strictEqual(firstFold.end, 4);
-	});
-
-	test('Should not collapse if there is no newline before next header', async () => {
-		const folds = await getFoldsForDocument(joinLines(
-			``,
-			`# a`,
-			`x`,
-			`# b`,
-			`y`,
-		));
-		assert.strictEqual(folds.length, 2);
-		const firstFold = folds[0];
-		assert.strictEqual(firstFold.start, 1);
-		assert.strictEqual(firstFold.end, 2);
-	});
-
-	test('Should fold nested  markers', async () => {
-		const folds = await getFoldsForDocument(joinLines(
-			`a`,
-			``,
-			`b`,
-			``,
-			`b.a`,
-			``,
-			`b`,
-			``,
-			`b.b`,
-			``,
-			`b`,
-			``,
-			`a`,
-		));
-		assert.strictEqual(folds.length, 3);
-		const [outer, first, second] = folds.sort((a, b) => a.start - b.start);
-
-		assert.strictEqual(outer.start, 1);
-		assert.strictEqual(outer.end, 11);
-		assert.strictEqual(first.start, 3);
-		assert.strictEqual(first.end, 5);
-		assert.strictEqual(second.start, 7);
-		assert.strictEqual(second.end, 9);
-	});
-
-	test('Should fold from list to end of document', async () => {
-		const folds = await getFoldsForDocument(joinLines(
-			`a`,
-			`- b`,
-			`c`,
-			`d`,
-		));
-		assert.strictEqual(folds.length, 1);
-		const firstFold = folds[0];
-		assert.strictEqual(firstFold.start, 1);
-		assert.strictEqual(firstFold.end, 3);
-	});
-
-	test('lists folds should span multiple lines of content', async () => {
-		const folds = await getFoldsForDocument(joinLines(
-			`a`,
-			`- This list item\n  spans multiple\n  lines.`,
-		));
-		assert.strictEqual(folds.length, 1);
-		const firstFold = folds[0];
-		assert.strictEqual(firstFold.start, 1);
-		assert.strictEqual(firstFold.end, 3);
-	});
-
-	test('List should leave single blankline before new element', async () => {
-		const folds = await getFoldsForDocument(joinLines(
-			`- a`,
-			`a`,
-			``,
-			``,
-			`b`
-		));
-		assert.strictEqual(folds.length, 1);
-		const firstFold = folds[0];
-		assert.strictEqual(firstFold.start, 0);
-		assert.strictEqual(firstFold.end, 2);
-	});
-
-	test('Should fold fenced code blocks', async () => {
-		const folds = await getFoldsForDocument(joinLines(
-			`~~~ts`,
-			`a`,
-			`~~~`,
-			`b`,
-		));
-		assert.strictEqual(folds.length, 1);
-		const firstFold = folds[0];
-		assert.strictEqual(firstFold.start, 0);
-		assert.strictEqual(firstFold.end, 2);
-	});
-
-	test('Should fold fenced code blocks with yaml front matter', async () => {
-		const folds = await getFoldsForDocument(joinLines(
-			`---`,
-			`title: bla`,
-			`---`,
-			``,
-			`~~~ts`,
-			`a`,
-			`~~~`,
-			``,
-			`a`,
-			`a`,
-			`b`,
-			`a`,
-		));
-		assert.strictEqual(folds.length, 1);
-		const firstFold = folds[0];
-		assert.strictEqual(firstFold.start, 4);
-		assert.strictEqual(firstFold.end, 6);
-	});
-
-	test('Should fold html blocks', async () => {
-		const folds = await getFoldsForDocument(joinLines(
-			`x`,
-			`
        `,
-			`	fa`,
-			`
        `,
-		));
-		assert.strictEqual(folds.length, 1);
-		const firstFold = folds[0];
-		assert.strictEqual(firstFold.start, 1);
-		assert.strictEqual(firstFold.end, 3);
-	});
-
-	test('Should fold html block comments', async () => {
-		const folds = await getFoldsForDocument(joinLines(
-			`x`,
-			``
-		));
-		assert.strictEqual(folds.length, 1);
-		const firstFold = folds[0];
-		assert.strictEqual(firstFold.start, 1);
-		assert.strictEqual(firstFold.end, 3);
-		assert.strictEqual(firstFold.kind, vscode.FoldingRangeKind.Comment);
-	});
-});
-
-
-async function getFoldsForDocument(contents: string) {
-	const doc = new InMemoryDocument(testFileName, contents);
-	const provider = new MdFoldingProvider(createNewMarkdownEngine());
-	return await provider.provideFoldingRanges(doc, {}, new vscode.CancellationTokenSource().token);
-}
diff --git a/extensions/markdown-language-features/src/test/inMemoryWorkspace.ts b/extensions/markdown-language-features/src/test/inMemoryWorkspace.ts
deleted file mode 100644
index 4924578701d..00000000000
--- a/extensions/markdown-language-features/src/test/inMemoryWorkspace.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import * as vscode from 'vscode';
-import { MdWorkspaceContents, SkinnyTextDocument } from '../workspaceContents';
-
-
-export class InMemoryWorkspaceMarkdownDocuments implements MdWorkspaceContents {
-	private readonly _documents = new Map();
-
-	constructor(documents: SkinnyTextDocument[]) {
-		for (const doc of documents) {
-			this._documents.set(this.getKey(doc.uri), doc);
-		}
-	}
-
-	public async getAllMarkdownDocuments() {
-		return Array.from(this._documents.values());
-	}
-
-	public async getMarkdownDocument(resource: vscode.Uri): Promise {
-		return this._documents.get(this.getKey(resource));
-	}
-
-	public async pathExists(resource: vscode.Uri): Promise {
-		return this._documents.has(this.getKey(resource));
-	}
-
-	private readonly _onDidChangeMarkdownDocumentEmitter = new vscode.EventEmitter();
-	public onDidChangeMarkdownDocument = this._onDidChangeMarkdownDocumentEmitter.event;
-
-	private readonly _onDidCreateMarkdownDocumentEmitter = new vscode.EventEmitter();
-	public onDidCreateMarkdownDocument = this._onDidCreateMarkdownDocumentEmitter.event;
-
-	private readonly _onDidDeleteMarkdownDocumentEmitter = new vscode.EventEmitter();
-	public onDidDeleteMarkdownDocument = this._onDidDeleteMarkdownDocumentEmitter.event;
-
-	public updateDocument(document: SkinnyTextDocument) {
-		this._documents.set(this.getKey(document.uri), document);
-		this._onDidChangeMarkdownDocumentEmitter.fire(document);
-	}
-
-	public createDocument(document: SkinnyTextDocument) {
-		assert.ok(!this._documents.has(this.getKey(document.uri)));
-
-		this._documents.set(this.getKey(document.uri), document);
-		this._onDidCreateMarkdownDocumentEmitter.fire(document);
-	}
-
-	public deleteDocument(resource: vscode.Uri) {
-		this._documents.delete(this.getKey(resource));
-		this._onDidDeleteMarkdownDocumentEmitter.fire(resource);
-	}
-
-	private getKey(resource: vscode.Uri): string {
-		return resource.fsPath;
-	}
-}
diff --git a/extensions/markdown-language-features/src/test/nulLogging.ts b/extensions/markdown-language-features/src/test/nulLogging.ts
new file mode 100644
index 00000000000..a786ab83b4f
--- /dev/null
+++ b/extensions/markdown-language-features/src/test/nulLogging.ts
@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ILogger } from '../logging';
+
+export const nulLogger = new class implements ILogger {
+	verbose(): void {
+		// noop
+	}
+};
diff --git a/extensions/markdown-language-features/src/test/pathCompletion.test.ts b/extensions/markdown-language-features/src/test/pathCompletion.test.ts
deleted file mode 100644
index c5889627167..00000000000
--- a/extensions/markdown-language-features/src/test/pathCompletion.test.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import 'mocha';
-import * as vscode from 'vscode';
-import { MdLinkProvider } from '../languageFeatures/documentLinkProvider';
-import { MdPathCompletionProvider } from '../languageFeatures/pathCompletions';
-import { noopToken } from '../util/cancellation';
-import { InMemoryDocument } from '../util/inMemoryDocument';
-import { createNewMarkdownEngine } from './engine';
-import { CURSOR, getCursorPositions, joinLines, workspacePath } from './util';
-
-
-function getCompletionsAtCursor(resource: vscode.Uri, fileContents: string) {
-	const doc = new InMemoryDocument(resource, fileContents);
-	const engine = createNewMarkdownEngine();
-	const linkProvider = new MdLinkProvider(engine);
-	const provider = new MdPathCompletionProvider(engine, linkProvider);
-	const cursorPositions = getCursorPositions(fileContents, doc);
-	return provider.provideCompletionItems(doc, cursorPositions[0], noopToken, {
-		triggerCharacter: undefined,
-		triggerKind: vscode.CompletionTriggerKind.Invoke,
-	});
-}
-
-suite('Markdown path completion provider', () => {
-
-	setup(async () => {
-		// These tests assume that the markdown completion provider is already registered
-		await vscode.extensions.getExtension('vscode.markdown-language-features')!.activate();
-	});
-
-	test('Should not return anything when triggered in empty doc', async () => {
-		const completions = await getCompletionsAtCursor(workspacePath('new.md'), `${CURSOR}`);
-		assert.strictEqual(completions.length, 0);
-	});
-
-	test('Should return anchor completions', async () => {
-		const completions = await getCompletionsAtCursor(workspacePath('new.md'), joinLines(
-			`[](#${CURSOR}`,
-			``,
-			`# A b C`,
-			`# x y Z`,
-		));
-
-		assert.strictEqual(completions.length, 2);
-		assert.ok(completions.some(x => x.label === '#a-b-c'), 'Has a-b-c anchor completion');
-		assert.ok(completions.some(x => x.label === '#x-y-z'), 'Has x-y-z anchor completion');
-	});
-
-	test('Should not return suggestions for http links', async () => {
-		const completions = await getCompletionsAtCursor(workspacePath('new.md'), joinLines(
-			`[](http:${CURSOR}`,
-			``,
-			`# http`,
-			`# http:`,
-			`# https:`,
-		));
-
-		assert.strictEqual(completions.length, 0);
-	});
-
-	test('Should return relative path suggestions', async () => {
-		const completions = await getCompletionsAtCursor(workspacePath('new.md'), joinLines(
-			`[](${CURSOR}`,
-			``,
-			`# A b C`,
-		));
-
-		assert.ok(completions.some(x => x.label === 'a.md'), 'Has a.md file completion');
-		assert.ok(completions.some(x => x.label === 'b.md'), 'Has b.md file completion');
-		assert.ok(completions.some(x => x.label === 'sub/'), 'Has sub folder completion');
-	});
-
-	test('Should return relative path suggestions using ./', async () => {
-		const completions = await getCompletionsAtCursor(workspacePath('new.md'), joinLines(
-			`[](./${CURSOR}`,
-			``,
-			`# A b C`,
-		));
-
-		assert.ok(completions.some(x => x.label === 'a.md'), 'Has a.md file completion');
-		assert.ok(completions.some(x => x.label === 'b.md'), 'Has b.md file completion');
-		assert.ok(completions.some(x => x.label === 'sub/'), 'Has sub folder completion');
-	});
-
-	test('Should return absolute path suggestions using /', async () => {
-		const completions = await getCompletionsAtCursor(workspacePath('sub', 'new.md'), joinLines(
-			`[](/${CURSOR}`,
-			``,
-			`# A b C`,
-		));
-
-		assert.ok(completions.some(x => x.label === 'a.md'), 'Has a.md file completion');
-		assert.ok(completions.some(x => x.label === 'b.md'), 'Has b.md file completion');
-		assert.ok(completions.some(x => x.label === 'sub/'), 'Has sub folder completion');
-		assert.ok(!completions.some(x => x.label === 'c.md'), 'Should not have c.md from sub folder');
-	});
-
-	test('Should return anchor suggestions in other file', async () => {
-		const completions = await getCompletionsAtCursor(workspacePath('sub', 'new.md'), joinLines(
-			`[](/b.md#${CURSOR}`,
-		));
-
-		assert.ok(completions.some(x => x.label === '#b'), 'Has #b header completion');
-		assert.ok(completions.some(x => x.label === '#header1'), 'Has #header1 header completion');
-	});
-
-	test('Should reference links for current file', async () => {
-		const completions = await getCompletionsAtCursor(workspacePath('sub', 'new.md'), joinLines(
-			`[][${CURSOR}`,
-			``,
-			`[ref-1]: bla`,
-			`[ref-2]: bla`,
-		));
-
-		assert.strictEqual(completions.length, 2);
-		assert.ok(completions.some(x => x.label === 'ref-1'), 'Has ref-1 reference completion');
-		assert.ok(completions.some(x => x.label === 'ref-2'), 'Has ref-2 reference completion');
-	});
-
-	test('Should complete headers in link definitions', async () => {
-		const completions = await getCompletionsAtCursor(workspacePath('sub', 'new.md'), joinLines(
-			`# a B c`,
-			`# x y    Z`,
-			`[ref-1]: ${CURSOR}`,
-		));
-
-		assert.ok(completions.some(x => x.label === '#a-b-c'), 'Has #a-b-c header completion');
-		assert.ok(completions.some(x => x.label === '#x-y-z'), 'Has #x-y-z header completion');
-	});
-
-	test('Should complete relative paths in link definitions', async () => {
-		const completions = await getCompletionsAtCursor(workspacePath('new.md'), joinLines(
-			`# a B c`,
-			`[ref-1]: ${CURSOR}`,
-		));
-
-		assert.ok(completions.some(x => x.label === 'a.md'), 'Has a.md file completion');
-		assert.ok(completions.some(x => x.label === 'b.md'), 'Has b.md file completion');
-		assert.ok(completions.some(x => x.label === 'sub/'), 'Has sub folder completion');
-	});
-
-	test('Should escape spaces in path names', async () => {
-		const completions = await getCompletionsAtCursor(workspacePath('new.md'), joinLines(
-			`[](./sub/${CURSOR})`
-		));
-
-		assert.ok(completions.some(x => x.insertText === 'file%20with%20space.md'), 'Has encoded path completion');
-	});
-
-	test('Should complete paths for path with encoded spaces', async () => {
-		const completions = await getCompletionsAtCursor(workspacePath('new.md'), joinLines(
-			`[](./sub%20with%20space/${CURSOR})`
-		));
-
-		assert.ok(completions.some(x => x.insertText === 'file.md'), 'Has file from space');
-	});
-
-	test('Should complete definition path for path with encoded spaces', async () => {
-		const completions = await getCompletionsAtCursor(workspacePath('new.md'), joinLines(
-			`[def]: ./sub%20with%20space/${CURSOR}`
-		));
-
-		assert.ok(completions.some(x => x.insertText === 'file.md'), 'Has file from space');
-	});
-});
diff --git a/extensions/markdown-language-features/src/test/references.test.ts b/extensions/markdown-language-features/src/test/references.test.ts
deleted file mode 100644
index 5280a72e308..00000000000
--- a/extensions/markdown-language-features/src/test/references.test.ts
+++ /dev/null
@@ -1,595 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import 'mocha';
-import * as vscode from 'vscode';
-import { MdLinkProvider } from '../languageFeatures/documentLinkProvider';
-import { MdReferencesProvider } from '../languageFeatures/references';
-import { githubSlugifier } from '../slugify';
-import { noopToken } from '../util/cancellation';
-import { InMemoryDocument } from '../util/inMemoryDocument';
-import { MdWorkspaceContents } from '../workspaceContents';
-import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
-import { joinLines, workspacePath } from './util';
-
-
-function getReferences(doc: InMemoryDocument, pos: vscode.Position, workspaceContents: MdWorkspaceContents) {
-	const engine = createNewMarkdownEngine();
-	const linkProvider = new MdLinkProvider(engine);
-	const provider = new MdReferencesProvider(linkProvider, workspaceContents, engine, githubSlugifier);
-	return provider.provideReferences(doc, pos, { includeDeclaration: true }, noopToken);
-}
-
-function assertReferencesEqual(actualRefs: readonly vscode.Location[], ...expectedRefs: { uri: vscode.Uri; line: number; startCharacter?: number; endCharacter?: number }[]) {
-	assert.strictEqual(actualRefs.length, expectedRefs.length, `Reference counts should match`);
-
-	for (let i = 0; i < actualRefs.length; ++i) {
-		const actual = actualRefs[i];
-		const expected = expectedRefs[i];
-		assert.strictEqual(actual.uri.toString(), expected.uri.toString(), `Ref '${i}' has expected document`);
-		assert.strictEqual(actual.range.start.line, expected.line, `Ref '${i}' has expected start line`);
-		assert.strictEqual(actual.range.end.line, expected.line, `Ref '${i}' has expected end line`);
-		if (typeof expected.startCharacter !== 'undefined') {
-			assert.strictEqual(actual.range.start.character, expected.startCharacter, `Ref '${i}' has expected start character`);
-		}
-		if (typeof expected.endCharacter !== 'undefined') {
-			assert.strictEqual(actual.range.end.character, expected.endCharacter, `Ref '${i}' has expected end character`);
-		}
-	}
-}
-
-suite('markdown: find all references', () => {
-	test('Should not return references when not on header or link', async () => {
-		const doc = new InMemoryDocument(workspacePath('doc.md'), joinLines(
-			`# abc`,
-			``,
-			`[link 1](#abc)`,
-			`text`,
-		));
-
-		{
-			const refs = await getReferences(doc, new vscode.Position(1, 0), new InMemoryWorkspaceMarkdownDocuments([doc]));
-			assert.deepStrictEqual(refs, []);
-		}
-		{
-			const refs = await getReferences(doc, new vscode.Position(3, 2), new InMemoryWorkspaceMarkdownDocuments([doc]));
-			assert.deepStrictEqual(refs, []);
-		}
-	});
-
-	test('Should find references from header within same file', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`# abc`,
-			``,
-			`[link 1](#abc)`,
-			`[not link](#noabc)`,
-			`[link 2](#abc)`,
-		));
-		const refs = await getReferences(doc, new vscode.Position(0, 3), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertReferencesEqual(refs!,
-			{ uri, line: 0 },
-			{ uri, line: 2 },
-			{ uri, line: 4 },
-		);
-	});
-
-	test('Should not return references when on link text', async () => {
-		const doc = new InMemoryDocument(workspacePath('doc.md'), joinLines(
-			`[ref](#abc)`,
-			`[ref]: http://example.com`,
-		));
-
-		const refs = await getReferences(doc, new vscode.Position(0, 1), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assert.deepStrictEqual(refs, []);
-	});
-
-	test('Should find references using normalized slug', async () => {
-		const doc = new InMemoryDocument(workspacePath('doc.md'), joinLines(
-			`# a B c`,
-			`[simple](#a-b-c)`,
-			`[start underscore](#_a-b-c)`,
-			`[different case](#a-B-C)`,
-		));
-
-		{
-			// Trigger header
-			const refs = await getReferences(doc, new vscode.Position(0, 0), new InMemoryWorkspaceMarkdownDocuments([doc]));
-			assert.deepStrictEqual(refs!.length, 4);
-		}
-		{
-			// Trigger on line 1
-			const refs = await getReferences(doc, new vscode.Position(1, 12), new InMemoryWorkspaceMarkdownDocuments([doc]));
-			assert.deepStrictEqual(refs!.length, 4);
-		}
-		{
-			// Trigger on line 2
-			const refs = await getReferences(doc, new vscode.Position(2, 24), new InMemoryWorkspaceMarkdownDocuments([doc]));
-			assert.deepStrictEqual(refs!.length, 4);
-		}
-		{
-			// Trigger on line 3
-			const refs = await getReferences(doc, new vscode.Position(3, 20), new InMemoryWorkspaceMarkdownDocuments([doc]));
-			assert.deepStrictEqual(refs!.length, 4);
-		}
-	});
-
-	test('Should find references from header across files', async () => {
-		const docUri = workspacePath('doc.md');
-		const other1Uri = workspacePath('sub', 'other.md');
-		const other2Uri = workspacePath('other2.md');
-
-		const doc = new InMemoryDocument(docUri, joinLines(
-			`# abc`,
-			``,
-			`[link 1](#abc)`,
-		));
-		const refs = await getReferences(doc, new vscode.Position(0, 3), new InMemoryWorkspaceMarkdownDocuments([
-			doc,
-			new InMemoryDocument(other1Uri, joinLines(
-				`[not link](#abc)`,
-				`[not link](/doc.md#abz)`,
-				`[link](/doc.md#abc)`,
-			)),
-			new InMemoryDocument(other2Uri, joinLines(
-				`[not link](#abc)`,
-				`[not link](./doc.md#abz)`,
-				`[link](./doc.md#abc)`,
-			))
-		]));
-
-		assertReferencesEqual(refs!,
-			{ uri: docUri, line: 0 }, // Header definition
-			{ uri: docUri, line: 2 },
-			{ uri: other1Uri, line: 2 },
-			{ uri: other2Uri, line: 2 },
-		);
-	});
-
-	test('Should find references from header to link definitions ', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`# abc`,
-			``,
-			`[bla]: #abc`
-		));
-
-		const refs = await getReferences(doc, new vscode.Position(0, 3), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertReferencesEqual(refs!,
-			{ uri, line: 0 }, // Header definition
-			{ uri, line: 2 },
-		);
-	});
-
-	test('Should find header references from link definition', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`# A b C`,
-			`[text][bla]`,
-			`[bla]: #a-b-c`, // trigger here
-		));
-
-		const refs = await getReferences(doc, new vscode.Position(2, 9), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertReferencesEqual(refs!,
-			{ uri, line: 0 }, // Header definition
-			{ uri, line: 2 },
-		);
-	});
-
-	test('Should find references from link within same file', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`# abc`,
-			``,
-			`[link 1](#abc)`,
-			`[not link](#noabc)`,
-			`[link 2](#abc)`,
-		));
-
-		const refs = await getReferences(doc, new vscode.Position(2, 10), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertReferencesEqual(refs!,
-			{ uri, line: 0 }, // Header definition
-			{ uri, line: 2 },
-			{ uri, line: 4 },
-		);
-	});
-
-	test('Should find references from link across files', async () => {
-		const docUri = workspacePath('doc.md');
-		const other1Uri = workspacePath('sub', 'other.md');
-		const other2Uri = workspacePath('other2.md');
-
-		const doc = new InMemoryDocument(docUri, joinLines(
-			`# abc`,
-			``,
-			`[link 1](#abc)`,
-		));
-		const refs = await getReferences(doc, new vscode.Position(2, 10), new InMemoryWorkspaceMarkdownDocuments([
-			doc,
-			new InMemoryDocument(other1Uri, joinLines(
-				`[not link](#abc)`,
-				`[not link](/doc.md#abz)`,
-				`[with ext](/doc.md#abc)`,
-				`[without ext](/doc#abc)`,
-			)),
-			new InMemoryDocument(other2Uri, joinLines(
-				`[not link](#abc)`,
-				`[not link](./doc.md#abz)`,
-				`[link](./doc.md#abc)`,
-			))
-		]));
-
-		assertReferencesEqual(refs!,
-			{ uri: docUri, line: 0 }, // Header definition
-			{ uri: docUri, line: 2 },
-			{ uri: other1Uri, line: 2 }, // Other with ext
-			{ uri: other1Uri, line: 3 }, // Other without ext
-			{ uri: other2Uri, line: 2 }, // Other2
-		);
-	});
-
-	test('Should find references without requiring file extensions', async () => {
-		const docUri = workspacePath('doc.md');
-		const other1Uri = workspacePath('other.md');
-
-		const doc = new InMemoryDocument(docUri, joinLines(
-			`# a B c`,
-			``,
-			`[link 1](#a-b-c)`,
-		));
-		const refs = await getReferences(doc, new vscode.Position(2, 10), new InMemoryWorkspaceMarkdownDocuments([
-			doc,
-			new InMemoryDocument(other1Uri, joinLines(
-				`[not link](#a-b-c)`,
-				`[not link](/doc.md#a-b-z)`,
-				`[with ext](/doc.md#a-b-c)`,
-				`[without ext](/doc#a-b-c)`,
-				`[rel with ext](./doc.md#a-b-c)`,
-				`[rel without ext](./doc#a-b-c)`,
-			)),
-		]));
-
-		assertReferencesEqual(refs!,
-			{ uri: docUri, line: 0 }, // Header definition
-			{ uri: docUri, line: 2 },
-			{ uri: other1Uri, line: 2 }, // Other with ext
-			{ uri: other1Uri, line: 3 }, // Other without ext
-			{ uri: other1Uri, line: 4 }, // Other relative link with ext
-			{ uri: other1Uri, line: 5 }, // Other relative link without ext
-		);
-	});
-
-	test('Should find references from link across files when triggered on link without file extension', async () => {
-		const docUri = workspacePath('doc.md');
-		const other1Uri = workspacePath('sub', 'other.md');
-
-		const doc = new InMemoryDocument(docUri, joinLines(
-			`[with ext](./sub/other#header)`,
-			`[without ext](./sub/other.md#header)`,
-		));
-
-		const refs = await getReferences(doc, new vscode.Position(0, 23), new InMemoryWorkspaceMarkdownDocuments([
-			doc,
-			new InMemoryDocument(other1Uri, joinLines(
-				`pre`,
-				`# header`,
-				`post`,
-			)),
-		]));
-
-		assertReferencesEqual(refs!,
-			{ uri: other1Uri, line: 1 }, // Header definition
-			{ uri: docUri, line: 0 },
-			{ uri: docUri, line: 1 },
-		);
-	});
-
-	test('Should include header references when triggered on file link', async () => {
-		const docUri = workspacePath('doc.md');
-		const otherUri = workspacePath('sub', 'other.md');
-
-		const doc = new InMemoryDocument(docUri, joinLines(
-			`[with ext](./sub/other)`,
-			`[with ext](./sub/other#header)`,
-			`[without ext](./sub/other.md#no-such-header)`,
-		));
-
-		const refs = await getReferences(doc, new vscode.Position(0, 15), new InMemoryWorkspaceMarkdownDocuments([
-			doc,
-			new InMemoryDocument(otherUri, joinLines(
-				`pre`,
-				`# header`, // Definition should not be included since we triggered on a file link
-				`post`,
-			)),
-		]));
-
-		assertReferencesEqual(refs!,
-			{ uri: docUri, line: 0 },
-			{ uri: docUri, line: 1 },
-			{ uri: docUri, line: 2 },
-		);
-	});
-
-	test('Should not include refs from other file to own header', async () => {
-		const docUri = workspacePath('doc.md');
-		const otherUri = workspacePath('sub', 'other.md');
-
-		const doc = new InMemoryDocument(docUri, joinLines(
-			`[other](./sub/other)`, // trigger here
-		));
-
-		const refs = await getReferences(doc, new vscode.Position(0, 15), new InMemoryWorkspaceMarkdownDocuments([
-			doc,
-			new InMemoryDocument(otherUri, joinLines(
-				`# header`, // Definition should not be included since we triggered on a file link
-				`[text](#header)`, // Ref should not be included since it is to own file
-			)),
-		]));
-
-		assertReferencesEqual(refs!,
-			{ uri: docUri, line: 0 },
-		);
-	});
-
-	test('Should find explicit references to own file ', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`[bare](doc.md)`, // trigger here
-			`[rel](./doc.md)`,
-			`[abs](/doc.md)`,
-		));
-
-		const refs = await getReferences(doc, new vscode.Position(0, 12), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertReferencesEqual(refs!,
-			{ uri, line: 0 },
-			{ uri, line: 1 },
-			{ uri, line: 2 },
-		);
-	});
-
-	test('Should support finding references to http uri', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`[1](http://example.com)`,
-			`[no](https://example.com)`,
-			`[2](http://example.com)`,
-			`[3]: http://example.com`,
-		));
-
-		const refs = await getReferences(doc, new vscode.Position(0, 13), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertReferencesEqual(refs!,
-			{ uri, line: 0 },
-			{ uri, line: 2 },
-			{ uri, line: 3 },
-		);
-	});
-
-	test('Should consider authority, scheme and paths when finding references to http uri', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`[1](http://example.com/cat)`,
-			`[2](http://example.com)`,
-			`[3](http://example.com/dog)`,
-			`[4](http://example.com/cat/looong)`,
-			`[5](http://example.com/cat)`,
-			`[6](http://other.com/cat)`,
-			`[7](https://example.com/cat)`,
-		));
-
-		const refs = await getReferences(doc, new vscode.Position(0, 13), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertReferencesEqual(refs!,
-			{ uri, line: 0 },
-			{ uri, line: 4 },
-		);
-	});
-
-	test('Should support finding references to http uri across files', async () => {
-		const uri1 = workspacePath('doc.md');
-		const uri2 = workspacePath('doc2.md');
-		const doc = new InMemoryDocument(uri1, joinLines(
-			`[1](http://example.com)`,
-			`[3]: http://example.com`,
-		));
-
-		const refs = await getReferences(doc, new vscode.Position(0, 13), new InMemoryWorkspaceMarkdownDocuments([
-			doc,
-			new InMemoryDocument(uri2, joinLines(
-				`[other](http://example.com)`,
-			))
-		]));
-		assertReferencesEqual(refs!,
-			{ uri: uri1, line: 0 },
-			{ uri: uri1, line: 1 },
-			{ uri: uri2, line: 0 },
-		);
-	});
-
-	test('Should support finding references to autolinked http links', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`[1](http://example.com)`,
-			``,
-		));
-
-		const refs = await getReferences(doc, new vscode.Position(0, 13), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertReferencesEqual(refs!,
-			{ uri, line: 0 },
-			{ uri, line: 1 },
-		);
-	});
-
-	test('Should distinguish between references to file and to header within file', async () => {
-		const docUri = workspacePath('doc.md');
-		const other1Uri = workspacePath('sub', 'other.md');
-
-		const doc = new InMemoryDocument(docUri, joinLines(
-			`# abc`,
-			``,
-			`[link 1](#abc)`,
-		));
-		const otherDoc = new InMemoryDocument(other1Uri, joinLines(
-			`[link](/doc.md#abc)`,
-			`[link no text](/doc#abc)`,
-		));
-		const workspaceContents = new InMemoryWorkspaceMarkdownDocuments([
-			doc,
-			otherDoc,
-		]);
-		{
-			// Check refs to header fragment
-			const headerRefs = await getReferences(otherDoc, new vscode.Position(0, 16), workspaceContents);
-			assertReferencesEqual(headerRefs!,
-				{ uri: docUri, line: 0 }, // Header definition
-				{ uri: docUri, line: 2 },
-				{ uri: other1Uri, line: 0 },
-				{ uri: other1Uri, line: 1 },
-			);
-		}
-		{
-			// Check refs to file itself from link with ext
-			const fileRefs = await getReferences(otherDoc, new vscode.Position(0, 9), workspaceContents);
-			assertReferencesEqual(fileRefs!,
-				{ uri: other1Uri, line: 0, endCharacter: 14 },
-				{ uri: other1Uri, line: 1, endCharacter: 19 },
-			);
-		}
-		{
-			// Check refs to file itself from link without ext
-			const fileRefs = await getReferences(otherDoc, new vscode.Position(1, 17), workspaceContents);
-			assertReferencesEqual(fileRefs!,
-				{ uri: other1Uri, line: 0 },
-				{ uri: other1Uri, line: 1 },
-			);
-		}
-	});
-
-	test('Should support finding references to unknown file', async () => {
-		const uri1 = workspacePath('doc1.md');
-		const doc1 = new InMemoryDocument(uri1, joinLines(
-			`![img](/images/more/image.png)`,
-			``,
-			`[ref]: /images/more/image.png`,
-		));
-
-		const uri2 = workspacePath('sub', 'doc2.md');
-		const doc2 = new InMemoryDocument(uri2, joinLines(
-			`![img](/images/more/image.png)`,
-		));
-
-
-		const refs = await getReferences(doc1, new vscode.Position(0, 10), new InMemoryWorkspaceMarkdownDocuments([doc1, doc2]));
-		assertReferencesEqual(refs!,
-			{ uri: uri1, line: 0 },
-			{ uri: uri1, line: 2 },
-			{ uri: uri2, line: 0 },
-		);
-	});
-
-	suite('Reference links', () => {
-		test('Should find reference links within file from link', async () => {
-			const docUri = workspacePath('doc.md');
-			const doc = new InMemoryDocument(docUri, joinLines(
-				`[link 1][abc]`, // trigger here
-				``,
-				`[abc]: https://example.com`,
-			));
-
-			const refs = await getReferences(doc, new vscode.Position(0, 12), new InMemoryWorkspaceMarkdownDocuments([doc]));
-			assertReferencesEqual(refs!,
-				{ uri: docUri, line: 0 },
-				{ uri: docUri, line: 2 },
-			);
-		});
-
-		test('Should find reference links using shorthand', async () => {
-			const docUri = workspacePath('doc.md');
-			const doc = new InMemoryDocument(docUri, joinLines(
-				`[ref]`, // trigger 1
-				``,
-				`[yes][ref]`, // trigger 2
-				``,
-				`[ref]: /Hello.md` // trigger 3
-			));
-
-			{
-				const refs = await getReferences(doc, new vscode.Position(0, 2), new InMemoryWorkspaceMarkdownDocuments([doc]));
-				assertReferencesEqual(refs!,
-					{ uri: docUri, line: 0 },
-					{ uri: docUri, line: 2 },
-					{ uri: docUri, line: 4 },
-				);
-			}
-			{
-				const refs = await getReferences(doc, new vscode.Position(2, 7), new InMemoryWorkspaceMarkdownDocuments([doc]));
-				assertReferencesEqual(refs!,
-					{ uri: docUri, line: 0 },
-					{ uri: docUri, line: 2 },
-					{ uri: docUri, line: 4 },
-				);
-			}
-			{
-				const refs = await getReferences(doc, new vscode.Position(4, 2), new InMemoryWorkspaceMarkdownDocuments([doc]));
-				assertReferencesEqual(refs!,
-					{ uri: docUri, line: 0 },
-					{ uri: docUri, line: 2 },
-					{ uri: docUri, line: 4 },
-				);
-			}
-		});
-
-		test('Should find reference links within file from definition', async () => {
-			const docUri = workspacePath('doc.md');
-			const doc = new InMemoryDocument(docUri, joinLines(
-				`[link 1][abc]`,
-				``,
-				`[abc]: https://example.com`, // trigger here
-			));
-
-			const refs = await getReferences(doc, new vscode.Position(2, 3), new InMemoryWorkspaceMarkdownDocuments([doc]));
-			assertReferencesEqual(refs!,
-				{ uri: docUri, line: 0 },
-				{ uri: docUri, line: 2 },
-			);
-		});
-
-		test('Should not find reference links across files', async () => {
-			const docUri = workspacePath('doc.md');
-			const doc = new InMemoryDocument(docUri, joinLines(
-				`[link 1][abc]`,
-				``,
-				`[abc]: https://example.com`,
-			));
-
-			const refs = await getReferences(doc, new vscode.Position(0, 12), new InMemoryWorkspaceMarkdownDocuments([
-				doc,
-				new InMemoryDocument(workspacePath('other.md'), joinLines(
-					`[link 1][abc]`,
-					``,
-					`[abc]: https://example.com?bad`,
-				))
-			]));
-			assertReferencesEqual(refs!,
-				{ uri: docUri, line: 0 },
-				{ uri: docUri, line: 2 },
-			);
-		});
-
-		test('Should not consider checkboxes as reference links', async () => {
-			const docUri = workspacePath('doc.md');
-			const doc = new InMemoryDocument(docUri, joinLines(
-				`- [x]`,
-				`- [X]`,
-				`- [ ]`,
-				``,
-				`[x]: https://example.com`
-			));
-
-			const refs = await getReferences(doc, new vscode.Position(0, 4), new InMemoryWorkspaceMarkdownDocuments([doc]));
-			assert.strictEqual(refs?.length!, 0);
-		});
-	});
-});
diff --git a/extensions/markdown-language-features/src/test/rename.test.ts b/extensions/markdown-language-features/src/test/rename.test.ts
deleted file mode 100644
index 53839071ea4..00000000000
--- a/extensions/markdown-language-features/src/test/rename.test.ts
+++ /dev/null
@@ -1,617 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import 'mocha';
-import * as vscode from 'vscode';
-import { MdLinkProvider } from '../languageFeatures/documentLinkProvider';
-import { MdReferencesProvider } from '../languageFeatures/references';
-import { MdRenameProvider, MdWorkspaceEdit } from '../languageFeatures/rename';
-import { githubSlugifier } from '../slugify';
-import { noopToken } from '../util/cancellation';
-import { InMemoryDocument } from '../util/inMemoryDocument';
-import { MdWorkspaceContents } from '../workspaceContents';
-import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
-import { assertRangeEqual, joinLines, workspacePath } from './util';
-
-
-/**
- * Get prepare rename info.
- */
-function prepareRename(doc: InMemoryDocument, pos: vscode.Position, workspaceContents: MdWorkspaceContents): Promise {
-	const engine = createNewMarkdownEngine();
-	const linkProvider = new MdLinkProvider(engine);
-	const referencesProvider = new MdReferencesProvider(linkProvider, workspaceContents, engine, githubSlugifier);
-	const renameProvider = new MdRenameProvider(referencesProvider, workspaceContents, githubSlugifier);
-	return renameProvider.prepareRename(doc, pos, noopToken);
-}
-
-/**
- * Get all the edits for the rename.
- */
-function getRenameEdits(doc: InMemoryDocument, pos: vscode.Position, newName: string, workspaceContents: MdWorkspaceContents): Promise {
-	const engine = createNewMarkdownEngine();
-	const linkProvider = new MdLinkProvider(engine);
-	const referencesProvider = new MdReferencesProvider(linkProvider, workspaceContents, engine, githubSlugifier);
-	const renameProvider = new MdRenameProvider(referencesProvider, workspaceContents, githubSlugifier);
-	return renameProvider.provideRenameEditsImpl(doc, pos, newName, noopToken);
-}
-
-interface ExpectedTextEdit {
-	readonly uri: vscode.Uri;
-	readonly edits: readonly vscode.TextEdit[];
-}
-
-interface ExpectedFileRename {
-	readonly originalUri: vscode.Uri;
-	readonly newUri: vscode.Uri;
-}
-
-function assertEditsEqual(actualEdit: MdWorkspaceEdit, ...expectedEdits: ReadonlyArray) {
-	// Check file renames
-	const expectedFileRenames = expectedEdits.filter(expected => 'originalUri' in expected) as ExpectedFileRename[];
-	const actualFileRenames = actualEdit.fileRenames ?? [];
-	assert.strictEqual(actualFileRenames.length, expectedFileRenames.length, `File rename count should match`);
-	for (let i = 0; i < actualFileRenames.length; ++i) {
-		const expected = expectedFileRenames[i];
-		const actual = actualFileRenames[i];
-		assert.strictEqual(actual.from.toString(), expected.originalUri.toString(), `File rename '${i}' should have expected 'from' resource`);
-		assert.strictEqual(actual.to.toString(), expected.newUri.toString(), `File rename '${i}' should have expected 'to' resource`);
-	}
-
-	// Check text edits
-	const actualTextEdits = actualEdit.edit.entries();
-	const expectedTextEdits = expectedEdits.filter(expected => 'edits' in expected) as ExpectedTextEdit[];
-	assert.strictEqual(actualTextEdits.length, expectedTextEdits.length, `Reference counts should match`);
-	for (let i = 0; i < actualTextEdits.length; ++i) {
-		const expected = expectedTextEdits[i];
-		const actual = actualTextEdits[i];
-
-		if ('edits' in expected) {
-			assert.strictEqual(actual[0].toString(), expected.uri.toString(), `Ref '${i}' has expected document`);
-
-			const actualEditForDoc = actual[1];
-			const expectedEditsForDoc = expected.edits;
-			assert.strictEqual(actualEditForDoc.length, expectedEditsForDoc.length, `Edit counts for '${actual[0]}' should match`);
-
-			for (let g = 0; g < actualEditForDoc.length; ++g) {
-				assertRangeEqual(actualEditForDoc[g].range, expectedEditsForDoc[g].range, `Edit '${g}' of '${actual[0]}' has expected expected range. Expected range: ${JSON.stringify(actualEditForDoc[g].range)}. Actual range: ${JSON.stringify(expectedEditsForDoc[g].range)}`);
-				assert.strictEqual(actualEditForDoc[g].newText, expectedEditsForDoc[g].newText, `Edit '${g}' of '${actual[0]}' has expected edits`);
-			}
-		}
-	}
-}
-
-suite('markdown: rename', () => {
-
-	setup(async () => {
-		// the tests make the assumption that link providers are already registered
-		await vscode.extensions.getExtension('vscode.markdown-language-features')!.activate();
-	});
-
-	test('Rename on header should not include leading #', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`# abc`
-		));
-
-		const info = await prepareRename(doc, new vscode.Position(0, 0), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertRangeEqual(info!.range, new vscode.Range(0, 2, 0, 5));
-
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 0), "New Header", new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertEditsEqual(edit!, {
-			uri, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 2, 0, 5), 'New Header')
-			]
-		});
-	});
-
-	test('Rename on header should include leading or trailing #s', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`### abc ###`
-		));
-
-		const info = await prepareRename(doc, new vscode.Position(0, 0), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertRangeEqual(info!.range, new vscode.Range(0, 4, 0, 7));
-
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 0), "New Header", new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertEditsEqual(edit!, {
-			uri, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 4, 0, 7), 'New Header')
-			]
-		});
-	});
-
-	test('Rename on header should pick up links in doc', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`### A b C`, // rename here
-			`[text](#a-b-c)`,
-		));
-
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 0), "New Header", new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertEditsEqual(edit!, {
-			uri, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 4, 0, 9), 'New Header'),
-				new vscode.TextEdit(new vscode.Range(1, 8, 1, 13), 'new-header'),
-			]
-		});
-	});
-
-	test('Rename on link should use slug for link', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`### A b C`,
-			`[text](#a-b-c)`, // rename here
-		));
-
-		const edit = await getRenameEdits(doc, new vscode.Position(1, 10), "New Header", new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertEditsEqual(edit!, {
-			uri, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 4, 0, 9), 'New Header'),
-				new vscode.TextEdit(new vscode.Range(1, 8, 1, 13), 'new-header'),
-			]
-		});
-	});
-
-	test('Rename on link definition should work', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`### A b C`,
-			`[text](#a-b-c)`,
-			`[ref]: #a-b-c`// rename here
-		));
-
-		const edit = await getRenameEdits(doc, new vscode.Position(2, 10), "New Header", new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertEditsEqual(edit!, {
-			uri, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 4, 0, 9), 'New Header'),
-				new vscode.TextEdit(new vscode.Range(1, 8, 1, 13), 'new-header'),
-				new vscode.TextEdit(new vscode.Range(2, 8, 2, 13), 'new-header'),
-			]
-		});
-	});
-
-	test('Rename on header should pick up links across files', async () => {
-		const uri = workspacePath('doc.md');
-		const otherUri = workspacePath('other.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`### A b C`, // rename here
-			`[text](#a-b-c)`,
-		));
-
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 0), "New Header", new InMemoryWorkspaceMarkdownDocuments([
-			doc,
-			new InMemoryDocument(otherUri, joinLines(
-				`[text](#a-b-c)`, // Should not find this
-				`[text](./doc.md#a-b-c)`, // But should find this
-				`[text](./doc#a-b-c)`, // And this
-			))
-		]));
-		assertEditsEqual(edit!, {
-			uri: uri, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 4, 0, 9), 'New Header'),
-				new vscode.TextEdit(new vscode.Range(1, 8, 1, 13), 'new-header'),
-			]
-		}, {
-			uri: otherUri, edits: [
-				new vscode.TextEdit(new vscode.Range(1, 16, 1, 21), 'new-header'),
-				new vscode.TextEdit(new vscode.Range(2, 13, 2, 18), 'new-header'),
-			]
-		});
-	});
-
-	test('Rename on link should pick up links across files', async () => {
-		const uri = workspacePath('doc.md');
-		const otherUri = workspacePath('other.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`### A b C`,
-			`[text](#a-b-c)`,  // rename here
-		));
-
-		const edit = await getRenameEdits(doc, new vscode.Position(1, 10), "New Header", new InMemoryWorkspaceMarkdownDocuments([
-			doc,
-			new InMemoryDocument(otherUri, joinLines(
-				`[text](#a-b-c)`, // Should not find this
-				`[text](./doc.md#a-b-c)`, // But should find this
-				`[text](./doc#a-b-c)`, // And this
-			))
-		]));
-		assertEditsEqual(edit!, {
-			uri: uri, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 4, 0, 9), 'New Header'),
-				new vscode.TextEdit(new vscode.Range(1, 8, 1, 13), 'new-header'),
-			]
-		}, {
-			uri: otherUri, edits: [
-				new vscode.TextEdit(new vscode.Range(1, 16, 1, 21), 'new-header'),
-				new vscode.TextEdit(new vscode.Range(2, 13, 2, 18), 'new-header'),
-			]
-		});
-	});
-
-	test('Rename on link in other file should pick up all refs', async () => {
-		const uri = workspacePath('doc.md');
-		const otherUri = workspacePath('other.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`### A b C`,
-			`[text](#a-b-c)`,
-		));
-
-		const otherDoc = new InMemoryDocument(otherUri, joinLines(
-			`[text](#a-b-c)`,
-			`[text](./doc.md#a-b-c)`,
-			`[text](./doc#a-b-c)`
-		));
-
-		const expectedEdits = [
-			{
-				uri: uri, edits: [
-					new vscode.TextEdit(new vscode.Range(0, 4, 0, 9), 'New Header'),
-					new vscode.TextEdit(new vscode.Range(1, 8, 1, 13), 'new-header'),
-				]
-			}, {
-				uri: otherUri, edits: [
-					new vscode.TextEdit(new vscode.Range(1, 16, 1, 21), 'new-header'),
-					new vscode.TextEdit(new vscode.Range(2, 13, 2, 18), 'new-header'),
-				]
-			}
-		];
-
-		{
-			// Rename on header with file extension
-			const edit = await getRenameEdits(otherDoc, new vscode.Position(1, 17), "New Header", new InMemoryWorkspaceMarkdownDocuments([
-				doc,
-				otherDoc
-			]));
-			assertEditsEqual(edit!, ...expectedEdits);
-		}
-		{
-			// Rename on header without extension
-			const edit = await getRenameEdits(otherDoc, new vscode.Position(2, 15), "New Header", new InMemoryWorkspaceMarkdownDocuments([
-				doc,
-				otherDoc
-			]));
-			assertEditsEqual(edit!, ...expectedEdits);
-		}
-	});
-
-	test('Rename on reference should rename references and definition', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`[text][ref]`, // rename here
-			`[other][ref]`,
-			``,
-			`[ref]: https://example.com`,
-		));
-
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 8), "new ref", new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertEditsEqual(edit!, {
-			uri, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 7, 0, 10), 'new ref'),
-				new vscode.TextEdit(new vscode.Range(1, 8, 1, 11), 'new ref'),
-				new vscode.TextEdit(new vscode.Range(3, 1, 3, 4), 'new ref'),
-			]
-		});
-	});
-
-	test('Rename on definition should rename references and definitions', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`[text][ref]`,
-			`[other][ref]`,
-			``,
-			`[ref]: https://example.com`, // rename here
-		));
-
-		const edit = await getRenameEdits(doc, new vscode.Position(3, 3), "new ref", new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertEditsEqual(edit!, {
-			uri, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 7, 0, 10), 'new ref'),
-				new vscode.TextEdit(new vscode.Range(1, 8, 1, 11), 'new ref'),
-				new vscode.TextEdit(new vscode.Range(3, 1, 3, 4), 'new ref'),
-			]
-		});
-	});
-
-	test('Rename on definition entry should rename header and references', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`# a B c`,
-			`[ref text][ref]`,
-			`[direct](#a-b-c)`,
-			`[ref]: #a-b-c`, // rename here
-		));
-
-		const preparedInfo = await prepareRename(doc, new vscode.Position(3, 10), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assert.strictEqual(preparedInfo!.placeholder, 'a B c');
-		assertRangeEqual(preparedInfo!.range, new vscode.Range(3, 8, 3, 13));
-
-		const edit = await getRenameEdits(doc, new vscode.Position(3, 10), "x Y z", new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertEditsEqual(edit!, {
-			uri, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 2, 0, 7), 'x Y z'),
-				new vscode.TextEdit(new vscode.Range(2, 10, 2, 15), 'x-y-z'),
-				new vscode.TextEdit(new vscode.Range(3, 8, 3, 13), 'x-y-z'),
-			]
-		});
-	});
-
-	test('Rename should not be supported on link text', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`# Header`,
-			`[text](#header)`,
-		));
-
-		await assert.rejects(prepareRename(doc, new vscode.Position(1, 2), new InMemoryWorkspaceMarkdownDocuments([doc])));
-	});
-
-	test('Path rename should use file path as range', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`[text](./doc.md)`,
-			`[ref]: ./doc.md`,
-		));
-
-		const info = await prepareRename(doc, new vscode.Position(0, 10), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assert.strictEqual(info!.placeholder, './doc.md');
-		assertRangeEqual(info!.range, new vscode.Range(0, 7, 0, 15));
-	});
-
-	test('Path rename\'s range should excludes fragment', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`[text](./doc.md#some-header)`,
-			`[ref]: ./doc.md#some-header`,
-		));
-
-		const info = await prepareRename(doc, new vscode.Position(0, 10), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assert.strictEqual(info!.placeholder, './doc.md');
-		assertRangeEqual(info!.range, new vscode.Range(0, 7, 0, 15));
-	});
-
-	test('Path rename should update file and all refs', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`[text](./doc.md)`,
-			`[ref]: ./doc.md`,
-		));
-
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 10), './sub/newDoc.md', new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertEditsEqual(edit!, {
-			originalUri: uri,
-			newUri: workspacePath('sub', 'newDoc.md'),
-		}, {
-			uri: uri, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 7, 0, 15), './sub/newDoc.md'),
-				new vscode.TextEdit(new vscode.Range(1, 7, 1, 15), './sub/newDoc.md'),
-			]
-		});
-	});
-
-	test('Path rename using absolute file path should anchor to workspace root', async () => {
-		const uri = workspacePath('sub', 'doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`[text](/sub/doc.md)`,
-			`[ref]: /sub/doc.md`,
-		));
-
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 10), '/newSub/newDoc.md', new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertEditsEqual(edit!, {
-			originalUri: uri,
-			newUri: workspacePath('newSub', 'newDoc.md'),
-		}, {
-			uri: uri, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 7, 0, 18), '/newSub/newDoc.md'),
-				new vscode.TextEdit(new vscode.Range(1, 7, 1, 18), '/newSub/newDoc.md'),
-			]
-		});
-	});
-
-	test('Path rename should use un-encoded paths as placeholder', async () => {
-		const uri = workspacePath('sub', 'doc with spaces.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`[text](/sub/doc%20with%20spaces.md)`,
-		));
-
-		const info = await prepareRename(doc, new vscode.Position(0, 10), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assert.strictEqual(info!.placeholder, '/sub/doc with spaces.md');
-	});
-
-	test('Path rename should encode paths', async () => {
-		const uri = workspacePath('sub', 'doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`[text](/sub/doc.md)`,
-			`[ref]: /sub/doc.md`,
-		));
-
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 10), '/NEW sub/new DOC.md', new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertEditsEqual(edit!, {
-			originalUri: uri,
-			newUri: workspacePath('NEW sub', 'new DOC.md'),
-		}, {
-			uri: uri, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 7, 0, 18), '/NEW%20sub/new%20DOC.md'),
-				new vscode.TextEdit(new vscode.Range(1, 7, 1, 18), '/NEW%20sub/new%20DOC.md'),
-			]
-		});
-	});
-
-	test('Path rename should work with unknown files', async () => {
-		const uri1 = workspacePath('doc1.md');
-		const doc1 = new InMemoryDocument(uri1, joinLines(
-			`![img](/images/more/image.png)`,
-			``,
-			`[ref]: /images/more/image.png`,
-		));
-
-		const uri2 = workspacePath('sub', 'doc2.md');
-		const doc2 = new InMemoryDocument(uri2, joinLines(
-			`![img](/images/more/image.png)`,
-		));
-
-		const edit = await getRenameEdits(doc1, new vscode.Position(0, 10), '/img/test/new.png', new InMemoryWorkspaceMarkdownDocuments([
-			doc1,
-			doc2
-		]));
-		assertEditsEqual(edit!,
-			// Should not have file edits since the files don't exist here
-			{
-				uri: uri1, edits: [
-					new vscode.TextEdit(new vscode.Range(0, 7, 0, 29), '/img/test/new.png'),
-					new vscode.TextEdit(new vscode.Range(2, 7, 2, 29), '/img/test/new.png'),
-				]
-			},
-			{
-				uri: uri2, edits: [
-					new vscode.TextEdit(new vscode.Range(0, 7, 0, 29), '/img/test/new.png'),
-				]
-			});
-	});
-
-	test('Path rename should use .md extension on extension-less link', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`[text](/doc#header)`,
-			`[ref]: /doc#other`,
-		));
-
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 10), '/new File', new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assertEditsEqual(edit!, {
-			originalUri: uri,
-			newUri: workspacePath('new File.md'), // Rename on disk should use file extension
-		}, {
-			uri: uri, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 7, 0, 11), '/new%20File'), // Links should continue to use extension-less paths
-				new vscode.TextEdit(new vscode.Range(1, 7, 1, 11), '/new%20File'),
-			]
-		});
-	});
-
-	// TODO: fails on windows
-	test.skip('Path rename should use correctly resolved paths across files', async () => {
-		const uri1 = workspacePath('sub', 'doc.md');
-		const doc1 = new InMemoryDocument(uri1, joinLines(
-			`[text](./doc.md)`,
-			`[ref]: ./doc.md`,
-		));
-
-		const uri2 = workspacePath('doc2.md');
-		const doc2 = new InMemoryDocument(uri2, joinLines(
-			`[text](./sub/doc.md)`,
-			`[ref]: ./sub/doc.md`,
-		));
-
-		const uri3 = workspacePath('sub2', 'doc3.md');
-		const doc3 = new InMemoryDocument(uri3, joinLines(
-			`[text](../sub/doc.md)`,
-			`[ref]: ../sub/doc.md`,
-		));
-
-		const uri4 = workspacePath('sub2', 'doc4.md');
-		const doc4 = new InMemoryDocument(uri4, joinLines(
-			`[text](/sub/doc.md)`,
-			`[ref]: /sub/doc.md`,
-		));
-
-		const edit = await getRenameEdits(doc1, new vscode.Position(0, 10), './new/new-doc.md', new InMemoryWorkspaceMarkdownDocuments([
-			doc1, doc2, doc3, doc4,
-		]));
-		assertEditsEqual(edit!, {
-			originalUri: uri1,
-			newUri: workspacePath('sub', 'new', 'new-doc.md'),
-		}, {
-			uri: uri1, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 7, 0, 15), './new/new-doc.md'),
-				new vscode.TextEdit(new vscode.Range(1, 7, 1, 15), './new/new-doc.md'),
-			]
-		}, {
-			uri: uri2, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 7, 0, 19), './sub/new/new-doc.md'),
-				new vscode.TextEdit(new vscode.Range(1, 7, 1, 19), './sub/new/new-doc.md'),
-			]
-		}, {
-			uri: uri3, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 7, 0, 20), '../sub/new/new-doc.md'),
-				new vscode.TextEdit(new vscode.Range(1, 7, 1, 20), '../sub/new/new-doc.md'),
-			]
-		}, {
-			uri: uri4, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 7, 0, 18), '/sub/new/new-doc.md'),
-				new vscode.TextEdit(new vscode.Range(1, 7, 1, 18), '/sub/new/new-doc.md'),
-			]
-		});
-	});
-
-	test('Path rename should resolve on links without prefix', async () => {
-		const uri1 = workspacePath('sub', 'doc.md');
-		const doc1 = new InMemoryDocument(uri1, joinLines(
-			`![text](sub2/doc3.md)`,
-		));
-
-		const uri2 = workspacePath('doc2.md');
-		const doc2 = new InMemoryDocument(uri2, joinLines(
-			`![text](sub/sub2/doc3.md)`,
-		));
-
-		const uri3 = workspacePath('sub', 'sub2', 'doc3.md');
-		const doc3 = new InMemoryDocument(uri3, joinLines());
-
-		const edit = await getRenameEdits(doc1, new vscode.Position(0, 10), 'sub2/cat.md', new InMemoryWorkspaceMarkdownDocuments([
-			doc1, doc2, doc3
-		]));
-		assertEditsEqual(edit!, {
-			originalUri: workspacePath('sub', 'sub2', 'doc3.md'),
-			newUri: workspacePath('sub', 'sub2', 'cat.md'),
-		}, {
-			uri: uri1, edits: [new vscode.TextEdit(new vscode.Range(0, 8, 0, 20), 'sub2/cat.md')]
-		}, {
-			uri: uri2, edits: [new vscode.TextEdit(new vscode.Range(0, 8, 0, 24), 'sub/sub2/cat.md')]
-		});
-	});
-
-	test('Rename on link should use header text as placeholder', async () => {
-		const uri = workspacePath('doc.md');
-		const doc = new InMemoryDocument(uri, joinLines(
-			`### a B c ###`,
-			`[text](#a-b-c)`,
-		));
-
-		const info = await prepareRename(doc, new vscode.Position(1, 10), new InMemoryWorkspaceMarkdownDocuments([doc]));
-		assert.strictEqual(info!.placeholder, 'a B c');
-		assertRangeEqual(info!.range, new vscode.Range(1, 8, 1, 13));
-	});
-
-	test('Rename on http uri should work', async () => {
-		const uri1 = workspacePath('doc.md');
-		const uri2 = workspacePath('doc2.md');
-		const doc = new InMemoryDocument(uri1, joinLines(
-			`[1](http://example.com)`,
-			`[2]: http://example.com`,
-			``,
-		));
-
-		const edit = await getRenameEdits(doc, new vscode.Position(1, 10), "https://example.com/sub", new InMemoryWorkspaceMarkdownDocuments([
-			doc,
-			new InMemoryDocument(uri2, joinLines(
-				`[4](http://example.com)`,
-			))
-		]));
-		assertEditsEqual(edit!, {
-			uri: uri1, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 4, 0, 22), 'https://example.com/sub'),
-				new vscode.TextEdit(new vscode.Range(1, 5, 1, 23), 'https://example.com/sub'),
-				new vscode.TextEdit(new vscode.Range(2, 1, 2, 19), 'https://example.com/sub'),
-			]
-		}, {
-			uri: uri2, edits: [
-				new vscode.TextEdit(new vscode.Range(0, 4, 0, 22), 'https://example.com/sub'),
-			]
-		});
-	});
-});
diff --git a/extensions/markdown-language-features/src/test/smartSelect.test.ts b/extensions/markdown-language-features/src/test/smartSelect.test.ts
deleted file mode 100644
index 9d7f60bf481..00000000000
--- a/extensions/markdown-language-features/src/test/smartSelect.test.ts
+++ /dev/null
@@ -1,726 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import * as vscode from 'vscode';
-import { MdSmartSelect } from '../languageFeatures/smartSelect';
-import { createNewMarkdownEngine } from './engine';
-import { InMemoryDocument } from '../util/inMemoryDocument';
-import { CURSOR, getCursorPositions, joinLines } from './util';
-
-const testFileName = vscode.Uri.file('test.md');
-
-suite('markdown.SmartSelect', () => {
-	test('Smart select single word', async () => {
-		const ranges = await getSelectionRangesForDocument(`Hel${CURSOR}lo`);
-		assertNestedLineNumbersEqual(ranges![0], [0, 0]);
-	});
-
-	test('Smart select multi-line paragraph', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`Many of the core components and extensions to ${CURSOR}VS Code live in their own repositories on GitHub. `,
-				`For example, the[node debug adapter](https://github.com/microsoft/vscode-node-debug) and the [mono debug adapter]`,
-				`(https://github.com/microsoft/vscode-mono-debug) have their own repositories. For a complete list, please visit the [Related Projects](https://github.com/microsoft/vscode/wiki/Related-Projects) page on our [wiki](https://github.com/microsoft/vscode/wiki).`
-			));
-		assertNestedLineNumbersEqual(ranges![0], [0, 2]);
-	});
-
-	test('Smart select paragraph', async () => {
-		const ranges = await getSelectionRangesForDocument(`Many of the core components and extensions to ${CURSOR}VS Code live in their own repositories on GitHub. For example, the [node debug adapter](https://github.com/microsoft/vscode-node-debug) and the [mono debug adapter](https://github.com/microsoft/vscode-mono-debug) have their own repositories. For a complete list, please visit the [Related Projects](https://github.com/microsoft/vscode/wiki/Related-Projects) page on our [wiki](https://github.com/microsoft/vscode/wiki).`);
-
-		assertNestedLineNumbersEqual(ranges![0], [0, 0]);
-	});
-
-	test('Smart select html block', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`
        `,
-				`${CURSOR}VS Code in action`,
-				`
        `));
-
-		assertNestedLineNumbersEqual(ranges![0], [0, 2]);
-	});
-
-	test('Smart select header on header line', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# Header${CURSOR}`,
-				`Hello`));
-
-		assertNestedLineNumbersEqual(ranges![0], [0, 1]);
-
-	});
-
-	test('Smart select single word w grandparent header on text line', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`## ParentHeader`,
-				`# Header`,
-				`${CURSOR}Hello`
-			));
-
-		assertNestedLineNumbersEqual(ranges![0], [2, 2], [1, 2]);
-	});
-
-	test('Smart select html block w parent header', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# Header`,
-				`${CURSOR}
        `,
-				`VS Code in action`,
-				`
        `));
-
-		assertNestedLineNumbersEqual(ranges![0], [1, 1], [1, 3], [0, 3]);
-	});
-
-	test('Smart select fenced code block', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`~~~`,
-				`a${CURSOR}`,
-				`~~~`));
-
-		assertNestedLineNumbersEqual(ranges![0], [0, 2]);
-	});
-
-	test('Smart select list', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`- item 1`,
-				`- ${CURSOR}item 2`,
-				`- item 3`,
-				`- item 4`));
-		assertNestedLineNumbersEqual(ranges![0], [1, 1], [0, 3]);
-	});
-
-	test('Smart select list with fenced code block', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`- item 1`,
-				`- ~~~`,
-				`  ${CURSOR}a`,
-				`  ~~~`,
-				`- item 3`,
-				`- item 4`));
-
-		assertNestedLineNumbersEqual(ranges![0], [1, 3], [0, 5]);
-	});
-
-	test('Smart select multi cursor', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`- ${CURSOR}item 1`,
-				`- ~~~`,
-				`  a`,
-				`  ~~~`,
-				`- ${CURSOR}item 3`,
-				`- item 4`));
-
-		assertNestedLineNumbersEqual(ranges![0], [0, 0], [0, 5]);
-		assertNestedLineNumbersEqual(ranges![1], [4, 4], [0, 5]);
-	});
-
-	test('Smart select nested block quotes', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`> item 1`,
-				`> item 2`,
-				`>> ${CURSOR}item 3`,
-				`>> item 4`));
-		assertNestedLineNumbersEqual(ranges![0], [2, 2], [2, 3], [0, 3]);
-	});
-
-	test('Smart select multi nested block quotes', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`> item 1`,
-				`>> item 2`,
-				`>>> ${CURSOR}item 3`,
-				`>>>> item 4`));
-		assertNestedLineNumbersEqual(ranges![0], [2, 2], [2, 3], [1, 3], [0, 3]);
-	});
-
-	test('Smart select subheader content', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# main header 1`,
-				`content 1`,
-				`## sub header 1`,
-				`${CURSOR}content 2`,
-				`# main header 2`));
-
-		assertNestedLineNumbersEqual(ranges![0], [3, 3], [2, 3], [1, 3], [0, 3]);
-	});
-
-	test('Smart select subheader line', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# main header 1`,
-				`content 1`,
-				`## sub header 1${CURSOR}`,
-				`content 2`,
-				`# main header 2`));
-
-		assertNestedLineNumbersEqual(ranges![0], [2, 3], [1, 3], [0, 3]);
-	});
-
-	test('Smart select blank line', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# main header 1`,
-				`content 1`,
-				`${CURSOR}             `,
-				`content 2`,
-				`# main header 2`));
-
-		assertNestedLineNumbersEqual(ranges![0], [1, 3], [0, 3]);
-	});
-
-	test('Smart select line between paragraphs', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`paragraph 1`,
-				`${CURSOR}`,
-				`paragraph 2`));
-
-		assertNestedLineNumbersEqual(ranges![0], [0, 2]);
-	});
-
-	test('Smart select empty document', async () => {
-		const ranges = await getSelectionRangesForDocument(``, [new vscode.Position(0, 0)]);
-		assert.strictEqual(ranges!.length, 0);
-	});
-
-	test('Smart select fenced code block then list then subheader content then subheader then header content then header', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				/* 00 */ `# main header 1`,
-				/* 01 */ `content 1`,
-				/* 02 */ `## sub header 1`,
-				/* 03 */ `- item 1`,
-				/* 04 */ `- ~~~`,
-				/* 05 */ `  ${CURSOR}a`,
-				/* 06 */ `  ~~~`,
-				/* 07 */ `- item 3`,
-				/* 08 */ `- item 4`,
-				/* 09 */ ``,
-				/* 10 */ `more content`,
-				/* 11 */ `# main header 2`));
-
-		assertNestedLineNumbersEqual(ranges![0], [4, 6], [3, 8], [3, 10], [2, 10], [1, 10], [0, 10]);
-	});
-
-	test('Smart select list with one element without selecting child subheader', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				/* 00 */ `# main header 1`,
-				/* 01 */ ``,
-				/* 02 */ `- list ${CURSOR}`,
-				/* 03 */ ``,
-				/* 04 */ `## sub header`,
-				/* 05 */ ``,
-				/* 06 */ `content 2`,
-				/* 07 */ `# main header 2`));
-
-		assertNestedLineNumbersEqual(ranges![0], [2, 2], [1, 3], [1, 6], [0, 6]);
-	});
-
-	test('Smart select content under header then subheaders and their content', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# main ${CURSOR}header 1`,
-				``,
-				`- list`,
-				`paragraph`,
-				`## sub header`,
-				``,
-				`content 2`,
-				`# main header 2`));
-
-		assertNestedLineNumbersEqual(ranges![0], [0, 3], [0, 6]);
-	});
-
-	test('Smart select last blockquote element under header then subheaders and their content', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# main header 1`,
-				``,
-				`> block`,
-				`> block`,
-				`>> block`,
-				`>> ${CURSOR}block`,
-				``,
-				`paragraph`,
-				`## sub header`,
-				``,
-				`content 2`,
-				`# main header 2`));
-
-		assertNestedLineNumbersEqual(ranges![0], [5, 5], [4, 5], [2, 5], [1, 7], [1, 10], [0, 10]);
-	});
-
-	test('Smart select content of subheader then subheader then content of main header then main header', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# main header 1`,
-				``,
-				`> block`,
-				`> block`,
-				`>> block`,
-				`>> block`,
-				``,
-				`paragraph`,
-				`## sub header`,
-				``,
-				``,
-				`${CURSOR}`,
-				``,
-				`### main header 2`,
-				`- content 2`,
-				`- content 2`,
-				`- content 2`,
-				`content 2`));
-
-		assertNestedLineNumbersEqual(ranges![0], [11, 11], [9, 12], [9, 17], [8, 17], [1, 17], [0, 17]);
-	});
-
-	test('Smart select last line content of subheader then subheader then content of main header then main header', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# main header 1`,
-				``,
-				`> block`,
-				`> block`,
-				`>> block`,
-				`>> block`,
-				``,
-				`paragraph`,
-				`## sub header`,
-				``,
-				``,
-				``,
-				``,
-				`### main header 2`,
-				`- content 2`,
-				`- content 2`,
-				`- content 2`,
-				`- ${CURSOR}content 2`));
-
-		assertNestedLineNumbersEqual(ranges![0], [17, 17], [14, 17], [13, 17], [9, 17], [8, 17], [1, 17], [0, 17]);
-	});
-
-	test('Smart select last line content after content of subheader then subheader then content of main header then main header', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# main header 1`,
-				``,
-				`> block`,
-				`> block`,
-				`>> block`,
-				`>> block`,
-				``,
-				`paragraph`,
-				`## sub header`,
-				``,
-				``,
-				``,
-				``,
-				`### main header 2`,
-				`- content 2`,
-				`- content 2`,
-				`- content 2`,
-				`- content 2${CURSOR}`));
-
-		assertNestedLineNumbersEqual(ranges![0], [17, 17], [14, 17], [13, 17], [9, 17], [8, 17], [1, 17], [0, 17]);
-	});
-
-	test('Smart select fenced code block then list then rest of content', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# main header 1`,
-				``,
-				`> block`,
-				`> block`,
-				`>> block`,
-				`>> block`,
-				``,
-				`- paragraph`,
-				`- ~~~`,
-				`  my`,
-				`  ${CURSOR}code`,
-				`  goes here`,
-				`  ~~~`,
-				`- content`,
-				`- content 2`,
-				`- content 2`,
-				`- content 2`,
-				`- content 2`));
-
-		assertNestedLineNumbersEqual(ranges![0], [9, 11], [8, 12], [8, 12], [7, 17], [1, 17], [0, 17]);
-	});
-
-	test('Smart select fenced code block then list then rest of content on fenced line', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# main header 1`,
-				``,
-				`> block`,
-				`> block`,
-				`>> block`,
-				`>> block`,
-				``,
-				`- paragraph`,
-				`- ~~~${CURSOR}`,
-				`  my`,
-				`  code`,
-				`  goes here`,
-				`  ~~~`,
-				`- content`,
-				`- content 2`,
-				`- content 2`,
-				`- content 2`,
-				`- content 2`));
-
-		assertNestedLineNumbersEqual(ranges![0], [8, 12], [7, 17], [1, 17], [0, 17]);
-	});
-
-	test('Smart select without multiple ranges', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# main header 1`,
-				``,
-				``,
-				`- ${CURSOR}paragraph`,
-				`- content`));
-
-		assertNestedLineNumbersEqual(ranges![0], [3, 3], [3, 4], [1, 4], [0, 4]);
-	});
-
-	test('Smart select on second level of a list', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`* level 0`,
-				`   * level 1`,
-				`   * level 1`,
-				`       * level 2`,
-				`   * level 1`,
-				`   * level ${CURSOR}1`,
-				`* level 0`));
-
-		assertNestedLineNumbersEqual(ranges![0], [5, 5], [1, 5], [0, 5], [0, 6]);
-	});
-
-	test('Smart select on third level of a list', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`* level 0`,
-				`   * level 1`,
-				`   * level 1`,
-				`       * level ${CURSOR}2`,
-				`       * level 2`,
-				`   * level 1`,
-				`   * level 1`,
-				`* level 0`));
-		assertNestedLineNumbersEqual(ranges![0], [3, 3], [3, 4], [2, 4], [1, 6], [0, 6], [0, 7]);
-	});
-
-	test('Smart select level 2 then level 1', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`* level 1`,
-				`   * level ${CURSOR}2`,
-				`   * level 2`,
-				`* level 1`));
-		assertNestedLineNumbersEqual(ranges![0], [1, 1], [1, 2], [0, 2], [0, 3]);
-	});
-
-	test('Smart select last list item', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`- level 1`,
-				`- level 2`,
-				`- level 2`,
-				`- level ${CURSOR}1`));
-		assertNestedLineNumbersEqual(ranges![0], [3, 3], [0, 3]);
-	});
-
-	test('Smart select without multiple ranges', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# main header 1`,
-				``,
-				``,
-				`- ${CURSOR}paragraph`,
-				`- content`));
-
-		assertNestedLineNumbersEqual(ranges![0], [3, 3], [3, 4], [1, 4], [0, 4]);
-	});
-
-	test('Smart select on second level of a list', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`* level 0`,
-				`	* level 1`,
-				`	* level 1`,
-				`		* level 2`,
-				`	* level 1`,
-				`	* level ${CURSOR}1`,
-				`* level 0`));
-
-		assertNestedLineNumbersEqual(ranges![0], [5, 5], [1, 5], [0, 5], [0, 6]);
-	});
-
-	test('Smart select on third level of a list', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`* level 0`,
-				`	* level 1`,
-				`	* level 1`,
-				`		* level ${CURSOR}2`,
-				`		* level 2`,
-				`	* level 1`,
-				`	* level 1`,
-				`* level 0`));
-		assertNestedLineNumbersEqual(ranges![0], [3, 3], [3, 4], [2, 4], [1, 6], [0, 6], [0, 7]);
-	});
-
-	test('Smart select level 2 then level 1', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`* level 1`,
-				`	* level ${CURSOR}2`,
-				`	* level 2`,
-				`* level 1`));
-		assertNestedLineNumbersEqual(ranges![0], [1, 1], [1, 2], [0, 2], [0, 3]);
-	});
-
-	test('Smart select bold', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`stuff here **new${CURSOR}item** and here`
-			));
-		assertNestedRangesEqual(ranges![0], [0, 13, 0, 30], [0, 11, 0, 32], [0, 0, 0, 41]);
-	});
-
-	test('Smart select link', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`stuff here [text](https${CURSOR}://google.com) and here`
-			));
-		assertNestedRangesEqual(ranges![0], [0, 18, 0, 46], [0, 17, 0, 47], [0, 11, 0, 47], [0, 0, 0, 56]);
-	});
-
-	test('Smart select brackets', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`stuff here [te${CURSOR}xt](https://google.com) and here`
-			));
-		assertNestedRangesEqual(ranges![0], [0, 12, 0, 26], [0, 11, 0, 27], [0, 11, 0, 47], [0, 0, 0, 56]);
-	});
-
-	test('Smart select brackets under header in list', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# main header 1`,
-				``,
-				`- list`,
-				`paragraph`,
-				`## sub header`,
-				`- list`,
-				`- stuff here [te${CURSOR}xt](https://google.com) and here`,
-				`- list`
-			));
-		assertNestedRangesEqual(ranges![0], [6, 14, 6, 28], [6, 13, 6, 29], [6, 13, 6, 49], [6, 0, 6, 58], [5, 0, 7, 6], [4, 0, 7, 6], [1, 0, 7, 6], [0, 0, 7, 6]);
-	});
-
-	test('Smart select link under header in list', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# main header 1`,
-				``,
-				`- list`,
-				`paragraph`,
-				`## sub header`,
-				`- list`,
-				`- stuff here [text](${CURSOR}https://google.com) and here`,
-				`- list`
-			));
-		assertNestedRangesEqual(ranges![0], [6, 20, 6, 48], [6, 19, 6, 49], [6, 13, 6, 49], [6, 0, 6, 58], [5, 0, 7, 6], [4, 0, 7, 6], [1, 0, 7, 6], [0, 0, 7, 6]);
-	});
-
-	test('Smart select bold within list where multiple bold elements exists', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`# main header 1`,
-				``,
-				`- list`,
-				`paragraph`,
-				`## sub header`,
-				`- list`,
-				`- stuff here [text] **${CURSOR}items in here** and **here**`,
-				`- list`
-			));
-		assertNestedRangesEqual(ranges![0], [6, 22, 6, 45], [6, 20, 6, 47], [6, 0, 6, 60], [5, 0, 7, 6], [4, 0, 7, 6], [1, 0, 7, 6], [0, 0, 7, 6]);
-	});
-
-	test('Smart select link in paragraph with multiple links', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`This[extension](https://marketplace.visualstudio.com/items?itemName=meganrogge.template-string-converter)  addresses this [requ${CURSOR}est](https://github.com/microsoft/vscode/issues/56704) to convert Javascript/Typescript quotes to backticks when has been entered within a string.`
-			));
-		assertNestedRangesEqual(ranges![0], [0, 123, 0, 140], [0, 122, 0, 141], [0, 122, 0, 191], [0, 0, 0, 283]);
-	});
-
-	test('Smart select bold link', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`**[extens${CURSOR}ion](https://google.com)**`
-			));
-		assertNestedRangesEqual(ranges![0], [0, 3, 0, 22], [0, 2, 0, 23], [0, 2, 0, 43], [0, 2, 0, 43], [0, 0, 0, 45], [0, 0, 0, 45]);
-	});
-
-	test('Smart select inline code block', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`[\`code ${CURSOR} link\`]`
-			));
-		assertNestedRangesEqual(ranges![0], [0, 2, 0, 22], [0, 1, 0, 23], [0, 0, 0, 24]);
-	});
-
-	test('Smart select link with inline code block text', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`[\`code ${CURSOR} link\`](http://example.com)`
-			));
-		assertNestedRangesEqual(ranges![0], [0, 2, 0, 22], [0, 1, 0, 23], [0, 1, 0, 23], [0, 0, 0, 24], [0, 0, 0, 44], [0, 0, 0, 44]);
-	});
-
-	test('Smart select italic', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`*some nice ${CURSOR}text*`
-			));
-		assertNestedRangesEqual(ranges![0], [0, 1, 0, 25], [0, 0, 0, 26], [0, 0, 0, 26]);
-	});
-
-	test('Smart select italic link', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`*[extens${CURSOR}ion](https://google.com)*`
-			));
-		assertNestedRangesEqual(ranges![0], [0, 2, 0, 21], [0, 1, 0, 22], [0, 1, 0, 42], [0, 1, 0, 42], [0, 0, 0, 43], [0, 0, 0, 43]);
-	});
-
-	test('Smart select italic on end', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`*word1 word2 word3${CURSOR}*`
-			));
-		assertNestedRangesEqual(ranges![0], [0, 1, 0, 28], [0, 0, 0, 29], [0, 0, 0, 29]);
-	});
-
-	test('Smart select italic then bold', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`outer text **bold words *italic ${CURSOR} words* bold words** outer text`
-			));
-		assertNestedRangesEqual(ranges![0], [0, 25, 0, 48], [0, 24, 0, 49], [0, 13, 0, 60], [0, 11, 0, 62], [0, 0, 0, 73]);
-	});
-
-	test('Smart select bold then italic', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`outer text *italic words **bold ${CURSOR} words** italic words* outer text`
-			));
-		assertNestedRangesEqual(ranges![0], [0, 27, 0, 48], [0, 25, 0, 50], [0, 12, 0, 63], [0, 11, 0, 64], [0, 0, 0, 75]);
-	});
-
-	test('Third level header from release notes', async () => {
-		const ranges = await getSelectionRangesForDocument(
-			joinLines(
-				`---`,
-				`Order: 60`,
-				`TOCTitle: October 2020`,
-				`PageTitle: Visual Studio Code October 2020`,
-				`MetaDescription: Learn what is new in the Visual Studio Code October 2020 Release (1.51)`,
-				`MetaSocialImage: 1_51/release-highlights.png`,
-				`Date: 2020-11-6`,
-				`DownloadVersion: 1.51.1`,
-				`---`,
-				`# October 2020 (version 1.51)`,
-				``,
-				`**Update 1.51.1**: The update addresses these [issues](https://github.com/microsoft/vscode/issues?q=is%3Aissue+milestone%3A%22October+2020+Recovery%22+is%3Aclosed+).`,
-				``,
-				``,
-				``,
-				`---`,
-				``,
-				`Welcome to the October 2020 release of Visual Studio Code. As announced in the [October iteration plan](https://github.com/microsoft/vscode/issues/108473), we focused on housekeeping GitHub issues and pull requests as documented in our issue grooming guide.`,
-				``,
-				`We also worked with our partners at GitHub on GitHub Codespaces, which ended up being more involved than originally anticipated. To that end, we'll continue working on housekeeping for part of the November iteration.`,
-				``,
-				`During this housekeeping milestone, we also addressed several feature requests and community [pull requests](#thank-you). Read on to learn about new features and settings.`,
-				``,
-				`## Workbench`,
-				``,
-				`### More prominent pinned tabs`,
-				``,
-				`${CURSOR}Pinned tabs will now always show their pin icon, even while inactive, to make them easier to identify. If an editor is both pinned and contains unsaved changes, the icon reflects both states.`,
-				``,
-				`![Inactive pinned tabs showing pin icons](images/1_51/pinned-tabs.png)`
-			)
-		);
-		assertNestedRangesEqual(ranges![0], [27, 0, 27, 201], [26, 0, 29, 70], [25, 0, 29, 70], [24, 0, 29, 70], [23, 0, 29, 70], [10, 0, 29, 70], [9, 0, 29, 70]);
-	});
-
-});
-
-
-function assertNestedLineNumbersEqual(range: vscode.SelectionRange, ...expectedRanges: [number, number][]) {
-	const lineage = getLineage(range);
-	assert.strictEqual(lineage.length, expectedRanges.length, `expected depth: ${expectedRanges.length}, but was ${lineage.length} ${getValues(lineage)}`);
-	for (let i = 0; i < lineage.length; i++) {
-		assertLineNumbersEqual(lineage[i], expectedRanges[i][0], expectedRanges[i][1], `parent at a depth of ${i}`);
-	}
-}
-
-function assertNestedRangesEqual(range: vscode.SelectionRange, ...expectedRanges: [number, number, number, number][]) {
-	const lineage = getLineage(range);
-	assert.strictEqual(lineage.length, expectedRanges.length, `expected depth: ${expectedRanges.length}, but was ${lineage.length} ${getValues(lineage)}`);
-	for (let i = 0; i < lineage.length; i++) {
-		assertLineNumbersEqual(lineage[i], expectedRanges[i][0], expectedRanges[i][2], `parent at a depth of ${i}`);
-		assert(lineage[i].range.start.character === expectedRanges[i][1], `parent at a depth of ${i} on start char`);
-		assert(lineage[i].range.end.character === expectedRanges[i][3], `parent at a depth of ${i} on end char`);
-	}
-}
-
-function getLineage(range: vscode.SelectionRange): vscode.SelectionRange[] {
-	const result: vscode.SelectionRange[] = [];
-	let currentRange: vscode.SelectionRange | undefined = range;
-	while (currentRange) {
-		result.push(currentRange);
-		currentRange = currentRange.parent;
-	}
-	return result;
-}
-
-function getValues(ranges: vscode.SelectionRange[]): string[] {
-	return ranges.map(range => {
-		return range.range.start.line + ' ' + range.range.start.character + ' ' + range.range.end.line + ' ' + range.range.end.character;
-	});
-}
-
-function assertLineNumbersEqual(selectionRange: vscode.SelectionRange, startLine: number, endLine: number, message: string) {
-	assert.strictEqual(selectionRange.range.start.line, startLine, `failed on start line ${message}`);
-	assert.strictEqual(selectionRange.range.end.line, endLine, `failed on end line ${message}`);
-}
-
-function getSelectionRangesForDocument(contents: string, pos?: vscode.Position[]): Promise {
-	const doc = new InMemoryDocument(testFileName, contents);
-	const provider = new MdSmartSelect(createNewMarkdownEngine());
-	const positions = pos ? pos : getCursorPositions(contents, doc);
-	return provider.provideSelectionRanges(doc, positions, new vscode.CancellationTokenSource().token);
-}
diff --git a/extensions/markdown-language-features/src/test/tableOfContentsProvider.test.ts b/extensions/markdown-language-features/src/test/tableOfContentsProvider.test.ts
deleted file mode 100644
index 6efb482ad8f..00000000000
--- a/extensions/markdown-language-features/src/test/tableOfContentsProvider.test.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import 'mocha';
-import * as vscode from 'vscode';
-import { TableOfContents } from '../tableOfContents';
-import { createNewMarkdownEngine } from './engine';
-import { InMemoryDocument } from '../util/inMemoryDocument';
-
-
-const testFileName = vscode.Uri.file('test.md');
-
-suite('markdown.TableOfContentsProvider', () => {
-	test('Lookup should not return anything for empty document', async () => {
-		const doc = new InMemoryDocument(testFileName, '');
-		const provider = await TableOfContents.create(createNewMarkdownEngine(), doc);
-
-		assert.strictEqual(provider.lookup(''), undefined);
-		assert.strictEqual(provider.lookup('foo'), undefined);
-	});
-
-	test('Lookup should not return anything for document with no headers', async () => {
-		const doc = new InMemoryDocument(testFileName, 'a *b*\nc');
-		const provider = await TableOfContents.create(createNewMarkdownEngine(), doc);
-
-		assert.strictEqual(provider.lookup(''), undefined);
-		assert.strictEqual(provider.lookup('foo'), undefined);
-		assert.strictEqual(provider.lookup('a'), undefined);
-		assert.strictEqual(provider.lookup('b'), undefined);
-	});
-
-	test('Lookup should return basic #header', async () => {
-		const doc = new InMemoryDocument(testFileName, `# a\nx\n# c`);
-		const provider = await TableOfContents.create(createNewMarkdownEngine(), doc);
-
-		{
-			const entry = provider.lookup('a');
-			assert.ok(entry);
-			assert.strictEqual(entry!.line, 0);
-		}
-		{
-			assert.strictEqual(provider.lookup('x'), undefined);
-		}
-		{
-			const entry = provider.lookup('c');
-			assert.ok(entry);
-			assert.strictEqual(entry!.line, 2);
-		}
-	});
-
-	test('Lookups should be case in-sensitive', async () => {
-		const doc = new InMemoryDocument(testFileName, `# fOo\n`);
-		const provider = await TableOfContents.create(createNewMarkdownEngine(), doc);
-
-		assert.strictEqual((provider.lookup('fOo'))!.line, 0);
-		assert.strictEqual((provider.lookup('foo'))!.line, 0);
-		assert.strictEqual((provider.lookup('FOO'))!.line, 0);
-	});
-
-	test('Lookups should ignore leading and trailing white-space, and collapse internal whitespace', async () => {
-		const doc = new InMemoryDocument(testFileName, `#      f o  o    \n`);
-		const provider = await TableOfContents.create(createNewMarkdownEngine(), doc);
-
-		assert.strictEqual((provider.lookup('f o  o'))!.line, 0);
-		assert.strictEqual((provider.lookup('  f o  o'))!.line, 0);
-		assert.strictEqual((provider.lookup('  f o  o  '))!.line, 0);
-		assert.strictEqual((provider.lookup('f o o'))!.line, 0);
-		assert.strictEqual((provider.lookup('f o       o'))!.line, 0);
-
-		assert.strictEqual(provider.lookup('f'), undefined);
-		assert.strictEqual(provider.lookup('foo'), undefined);
-		assert.strictEqual(provider.lookup('fo o'), undefined);
-	});
-
-	test('should handle special characters #44779', async () => {
-		const doc = new InMemoryDocument(testFileName, `# IndentaçÃŖo\n`);
-		const provider = await TableOfContents.create(createNewMarkdownEngine(), doc);
-
-		assert.strictEqual((provider.lookup('indentaçÃŖo'))!.line, 0);
-	});
-
-	test('should handle special characters 2, #48482', async () => {
-		const doc = new InMemoryDocument(testFileName, `# ИĐŊŅŅ‚Ņ€ŅƒĐēŅ†Đ¸Ņ - ДĐĩĐģĐ°Đš РаС, ДĐĩĐģĐ°Đš Два\n`);
-		const provider = await TableOfContents.create(createNewMarkdownEngine(), doc);
-
-		assert.strictEqual((provider.lookup('иĐŊŅŅ‚Ņ€ŅƒĐēŅ†Đ¸Ņ---Đ´ĐĩĐģĐ°Đš-Ņ€Đ°Đˇ-Đ´ĐĩĐģĐ°Đš-два'))!.line, 0);
-	});
-
-	test('should handle special characters 3, #37079', async () => {
-		const doc = new InMemoryDocument(testFileName, `## Header 2
-### Header 3
-## ЗаĐŗĐžĐģОвОĐē 2
-### ЗаĐŗĐžĐģОвОĐē 3
-### ЗаĐŗĐžĐģОвОĐē Header 3
-## ЗаĐŗĐžĐģОвОĐē`);
-
-		const provider = await TableOfContents.create(createNewMarkdownEngine(), doc);
-
-		assert.strictEqual((provider.lookup('header-2'))!.line, 0);
-		assert.strictEqual((provider.lookup('header-3'))!.line, 1);
-		assert.strictEqual((provider.lookup('ЗаĐŗĐžĐģОвОĐē-2'))!.line, 2);
-		assert.strictEqual((provider.lookup('ЗаĐŗĐžĐģОвОĐē-3'))!.line, 3);
-		assert.strictEqual((provider.lookup('ЗаĐŗĐžĐģОвОĐē-header-3'))!.line, 4);
-		assert.strictEqual((provider.lookup('ЗаĐŗĐžĐģОвОĐē'))!.line, 5);
-	});
-
-	test('Lookup should support suffixes for repeated headers', async () => {
-		const doc = new InMemoryDocument(testFileName, `# a\n# a\n## a`);
-		const provider = await TableOfContents.create(createNewMarkdownEngine(), doc);
-
-		{
-			const entry = provider.lookup('a');
-			assert.ok(entry);
-			assert.strictEqual(entry!.line, 0);
-		}
-		{
-			const entry = provider.lookup('a-1');
-			assert.ok(entry);
-			assert.strictEqual(entry!.line, 1);
-		}
-		{
-			const entry = provider.lookup('a-2');
-			assert.ok(entry);
-			assert.strictEqual(entry!.line, 2);
-		}
-	});
-});
diff --git a/extensions/markdown-language-features/src/test/util.ts b/extensions/markdown-language-features/src/test/util.ts
index d2b4760e9d7..d50e9ca5db2 100644
--- a/extensions/markdown-language-features/src/test/util.ts
+++ b/extensions/markdown-language-features/src/test/util.ts
@@ -2,38 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as assert from 'assert';
 import * as os from 'os';
-import * as vscode from 'vscode';
-import { InMemoryDocument } from '../util/inMemoryDocument';
 
 export const joinLines = (...args: string[]) =>
 	args.join(os.platform() === 'win32' ? '\r\n' : '\n');
-
-
-export const CURSOR = '$$CURSOR$$';
-
-export function getCursorPositions(contents: string, doc: InMemoryDocument): vscode.Position[] {
-	let positions: vscode.Position[] = [];
-	let index = 0;
-	let wordLength = 0;
-	while (index !== -1) {
-		index = contents.indexOf(CURSOR, index + wordLength);
-		if (index !== -1) {
-			positions.push(doc.positionAt(index));
-		}
-		wordLength = CURSOR.length;
-	}
-	return positions;
-}
-
-export function workspacePath(...segments: string[]): vscode.Uri {
-	return vscode.Uri.joinPath(vscode.workspace.workspaceFolders![0].uri, ...segments);
-}
-
-export function assertRangeEqual(expected: vscode.Range, actual: vscode.Range, message?: string) {
-	assert.strictEqual(expected.start.line, actual.start.line, message);
-	assert.strictEqual(expected.start.character, actual.start.character, message);
-	assert.strictEqual(expected.end.line, actual.end.line, message);
-	assert.strictEqual(expected.end.character, actual.end.character, message);
-}
diff --git a/extensions/markdown-language-features/src/test/workspaceSymbolProvider.test.ts b/extensions/markdown-language-features/src/test/workspaceSymbolProvider.test.ts
deleted file mode 100644
index a059159f613..00000000000
--- a/extensions/markdown-language-features/src/test/workspaceSymbolProvider.test.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import 'mocha';
-import * as vscode from 'vscode';
-import { MdDocumentSymbolProvider } from '../languageFeatures/documentSymbolProvider';
-import { MdWorkspaceSymbolProvider } from '../languageFeatures/workspaceSymbolProvider';
-import { SkinnyTextDocument } from '../workspaceContents';
-import { createNewMarkdownEngine } from './engine';
-import { InMemoryDocument } from '../util/inMemoryDocument';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
-
-
-const symbolProvider = new MdDocumentSymbolProvider(createNewMarkdownEngine());
-
-suite('markdown.WorkspaceSymbolProvider', () => {
-	test('Should not return anything for empty workspace', async () => {
-		const provider = new MdWorkspaceSymbolProvider(symbolProvider, new InMemoryWorkspaceMarkdownDocuments([]));
-
-		assert.deepStrictEqual(await provider.provideWorkspaceSymbols(''), []);
-	});
-
-	test('Should return symbols from workspace with one markdown file', async () => {
-		const testFileName = vscode.Uri.file('test.md');
-
-		const provider = new MdWorkspaceSymbolProvider(symbolProvider, new InMemoryWorkspaceMarkdownDocuments([
-			new InMemoryDocument(testFileName, `# header1\nabc\n## header2`)
-		]));
-
-		const symbols = await provider.provideWorkspaceSymbols('');
-		assert.strictEqual(symbols.length, 2);
-		assert.strictEqual(symbols[0].name, '# header1');
-		assert.strictEqual(symbols[1].name, '## header2');
-	});
-
-	test('Should return all content  basic workspace', async () => {
-		const fileNameCount = 10;
-		const files: SkinnyTextDocument[] = [];
-		for (let i = 0; i < fileNameCount; ++i) {
-			const testFileName = vscode.Uri.file(`test${i}.md`);
-			files.push(new InMemoryDocument(testFileName, `# common\nabc\n## header${i}`));
-		}
-
-		const provider = new MdWorkspaceSymbolProvider(symbolProvider, new InMemoryWorkspaceMarkdownDocuments(files));
-
-		const symbols = await provider.provideWorkspaceSymbols('');
-		assert.strictEqual(symbols.length, fileNameCount * 2);
-	});
-
-	test('Should update results when markdown file changes symbols', async () => {
-		const testFileName = vscode.Uri.file('test.md');
-
-		const workspaceFileProvider = new InMemoryWorkspaceMarkdownDocuments([
-			new InMemoryDocument(testFileName, `# header1`, 1 /* version */)
-		]);
-
-		const provider = new MdWorkspaceSymbolProvider(symbolProvider, workspaceFileProvider);
-
-		assert.strictEqual((await provider.provideWorkspaceSymbols('')).length, 1);
-
-		// Update file
-		workspaceFileProvider.updateDocument(new InMemoryDocument(testFileName, `# new header\nabc\n## header2`, 2 /* version */));
-		const newSymbols = await provider.provideWorkspaceSymbols('');
-		assert.strictEqual(newSymbols.length, 2);
-		assert.strictEqual(newSymbols[0].name, '# new header');
-		assert.strictEqual(newSymbols[1].name, '## header2');
-	});
-
-	test('Should remove results when file is deleted', async () => {
-		const testFileName = vscode.Uri.file('test.md');
-
-		const workspaceFileProvider = new InMemoryWorkspaceMarkdownDocuments([
-			new InMemoryDocument(testFileName, `# header1`)
-		]);
-
-		const provider = new MdWorkspaceSymbolProvider(symbolProvider, workspaceFileProvider);
-		assert.strictEqual((await provider.provideWorkspaceSymbols('')).length, 1);
-
-		// delete file
-		workspaceFileProvider.deleteDocument(testFileName);
-		const newSymbols = await provider.provideWorkspaceSymbols('');
-		assert.strictEqual(newSymbols.length, 0);
-	});
-
-	test('Should update results when markdown file is created', async () => {
-		const testFileName = vscode.Uri.file('test.md');
-
-		const workspaceFileProvider = new InMemoryWorkspaceMarkdownDocuments([
-			new InMemoryDocument(testFileName, `# header1`)
-		]);
-
-		const provider = new MdWorkspaceSymbolProvider(symbolProvider, workspaceFileProvider);
-		assert.strictEqual((await provider.provideWorkspaceSymbols('')).length, 1);
-
-		// Creat file
-		workspaceFileProvider.createDocument(new InMemoryDocument(vscode.Uri.file('test2.md'), `# new header\nabc\n## header2`));
-		const newSymbols = await provider.provideWorkspaceSymbols('');
-		assert.strictEqual(newSymbols.length, 3);
-	});
-});
diff --git a/extensions/vscode-custom-editor-tests/src/extension.ts b/extensions/markdown-language-features/src/types/textDocument.ts
similarity index 66%
rename from extensions/vscode-custom-editor-tests/src/extension.ts
rename to extensions/markdown-language-features/src/types/textDocument.ts
index 0a83f97fce2..a960e54d220 100644
--- a/extensions/vscode-custom-editor-tests/src/extension.ts
+++ b/extensions/markdown-language-features/src/types/textDocument.ts
@@ -4,8 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { AbcTextEditorProvider } from './customTextEditor';
 
-export function activate(context: vscode.ExtensionContext) {
-	context.subscriptions.push(new AbcTextEditorProvider(context).register());
+/**
+ * Minimal version of {@link vscode.TextDocument}.
+ */
+export interface ITextDocument {
+	readonly uri: vscode.Uri;
+	readonly version: number;
+
+	getText(): string;
 }
+
diff --git a/extensions/markdown-language-features/src/util/arrays.ts b/extensions/markdown-language-features/src/util/arrays.ts
index 9e65508178e..8163fee0c73 100644
--- a/extensions/markdown-language-features/src/util/arrays.ts
+++ b/extensions/markdown-language-features/src/util/arrays.ts
@@ -2,6 +2,12 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+/**
+ * @returns New array with all falsy values removed. The original array IS NOT modified.
+ */
+export function coalesce(array: ReadonlyArray): T[] {
+	return array.filter(e => !!e);
+}
 
 export function equals(one: ReadonlyArray, other: ReadonlyArray, itemEquals: (a: T, b: T) => boolean = (a, b) => a === b): boolean {
 	if (one.length !== other.length) {
@@ -16,10 +22,3 @@ export function equals(one: ReadonlyArray, other: ReadonlyArray, itemEq
 
 	return true;
 }
-
-/**
- * @returns New array with all falsy values removed. The original array IS NOT modified.
- */
-export function coalesce(array: ReadonlyArray): T[] {
-	return array.filter(e => !!e);
-}
diff --git a/extensions/markdown-language-features/src/util/async.ts b/extensions/markdown-language-features/src/util/async.ts
index a3bca46d63c..e0de21edca6 100644
--- a/extensions/markdown-language-features/src/util/async.ts
+++ b/extensions/markdown-language-features/src/util/async.ts
@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vscode';
-
 export interface ITask {
 	(): T;
 }
@@ -64,13 +62,3 @@ export class Delayer {
 		}
 	}
 }
-
-export function setImmediate(callback: (...args: any[]) => void, ...args: any[]): Disposable {
-	if (global.setImmediate) {
-		const handle = global.setImmediate(callback, ...args);
-		return { dispose: () => global.clearImmediate(handle) };
-	} else {
-		const handle = setTimeout(callback, 0, ...args);
-		return { dispose: () => clearTimeout(handle) };
-	}
-}
diff --git a/extensions/markdown-language-features/src/util/dispose.ts b/extensions/markdown-language-features/src/util/dispose.ts
index 175acf7b367..f222642908e 100644
--- a/extensions/markdown-language-features/src/util/dispose.ts
+++ b/extensions/markdown-language-features/src/util/dispose.ts
@@ -5,11 +5,26 @@
 
 import * as vscode from 'vscode';
 
-export function disposeAll(disposables: vscode.Disposable[]) {
-	while (disposables.length) {
-		const item = disposables.pop();
-		item?.dispose();
+export function disposeAll(disposables: Iterable) {
+	const errors: any[] = [];
+
+	for (const disposable of disposables) {
+		try {
+			disposable.dispose();
+		} catch (e) {
+			errors.push(e);
+		}
 	}
+
+	if (errors.length === 1) {
+		throw errors[0];
+	} else if (errors.length > 1) {
+		throw new AggregateError(errors, 'Encountered errors while disposing of store');
+	}
+}
+
+export interface IDisposable {
+	dispose(): void;
 }
 
 export abstract class Disposable {
@@ -25,7 +40,7 @@ export abstract class Disposable {
 		disposeAll(this._disposables);
 	}
 
-	protected _register(value: T): T {
+	protected _register(value: T): T {
 		if (this._isDisposed) {
 			value.dispose();
 		} else {
diff --git a/extensions/markdown-language-features/src/util/dom.ts b/extensions/markdown-language-features/src/util/dom.ts
new file mode 100644
index 00000000000..0f6c00da9da
--- /dev/null
+++ b/extensions/markdown-language-features/src/util/dom.ts
@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as vscode from 'vscode';
+
+export function escapeAttribute(value: string | vscode.Uri): string {
+	return value.toString().replace(/"/g, '"');
+}
+
+export function getNonce() {
+	let text = '';
+	const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+	for (let i = 0; i < 64; i++) {
+		text += possible.charAt(Math.floor(Math.random() * possible.length));
+	}
+	return text;
+}
diff --git a/extensions/markdown-language-features/src/util/file.ts b/extensions/markdown-language-features/src/util/file.ts
index d61029aaf99..9a4990a0585 100644
--- a/extensions/markdown-language-features/src/util/file.ts
+++ b/extensions/markdown-language-features/src/util/file.ts
@@ -4,7 +4,41 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import * as URI from 'vscode-uri';
+import { Schemes } from './schemes';
+
+export const markdownFileExtensions = Object.freeze([
+	'md',
+	'mkd',
+	'mdwn',
+	'mdown',
+	'markdown',
+	'markdn',
+	'mdtxt',
+	'mdtext',
+	'workbook',
+]);
 
 export function isMarkdownFile(document: vscode.TextDocument) {
 	return document.languageId === 'markdown';
-}
\ No newline at end of file
+}
+
+export function looksLikeMarkdownPath(resolvedHrefPath: vscode.Uri): boolean {
+	const doc = vscode.workspace.textDocuments.find(doc => doc.uri.toString() === resolvedHrefPath.toString());
+	if (doc) {
+		return isMarkdownFile(doc);
+	}
+
+	if (resolvedHrefPath.scheme === Schemes.notebookCell) {
+		for (const notebook of vscode.workspace.notebookDocuments) {
+			for (const cell of notebook.getCells()) {
+				if (cell.kind === vscode.NotebookCellKind.Markup && isMarkdownFile(cell.document)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	return markdownFileExtensions.includes(URI.Utils.extname(resolvedHrefPath).toLowerCase().replace('.', ''));
+}
diff --git a/extensions/markdown-language-features/src/util/hash.ts b/extensions/markdown-language-features/src/util/hash.ts
deleted file mode 100644
index 36365f18fd6..00000000000
--- a/extensions/markdown-language-features/src/util/hash.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-function numberHash(val: number, initialHashVal: number): number {
-	return (((initialHashVal << 5) - initialHashVal) + val) | 0;  // hashVal * 31 + ch, keep as int32
-}
-
-export function stringHash(s: string) {
-	let hashVal = numberHash(149417, 0);
-	for (let i = 0, length = s.length; i < length; i++) {
-		hashVal = numberHash(s.charCodeAt(i), hashVal);
-	}
-	return hashVal;
-}
diff --git a/extensions/markdown-language-features/src/util/inMemoryDocument.ts b/extensions/markdown-language-features/src/util/inMemoryDocument.ts
deleted file mode 100644
index 164099d4e10..00000000000
--- a/extensions/markdown-language-features/src/util/inMemoryDocument.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as vscode from 'vscode';
-import { TextDocument } from 'vscode-languageserver-textdocument';
-import { SkinnyTextDocument, SkinnyTextLine } from '../workspaceContents';
-
-export class InMemoryDocument implements SkinnyTextDocument {
-
-	private readonly _doc: TextDocument;
-
-	private lines: SkinnyTextLine[] | undefined;
-
-	constructor(
-		public readonly uri: vscode.Uri, contents: string,
-		public readonly version = 0,
-	) {
-
-		this._doc = TextDocument.create(uri.toString(), 'markdown', version, contents);
-	}
-
-	get lineCount(): number {
-		return this._doc.lineCount;
-	}
-
-	lineAt(index: any): SkinnyTextLine {
-		if (!this.lines) {
-			this.lines = this._doc.getText().split(/\r?\n/).map(text => ({
-				text,
-				get isEmptyOrWhitespace() { return /^\s*$/.test(text); }
-			}));
-		}
-		return this.lines[index];
-	}
-
-	positionAt(offset: number): vscode.Position {
-		const pos = this._doc.positionAt(offset);
-		return new vscode.Position(pos.line, pos.character);
-	}
-
-	getText(range?: vscode.Range): string {
-		return this._doc.getText(range);
-	}
-}
diff --git a/extensions/markdown-language-features/src/util/lazy.ts b/extensions/markdown-language-features/src/util/lazy.ts
deleted file mode 100644
index aa5effd3d31..00000000000
--- a/extensions/markdown-language-features/src/util/lazy.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-export interface Lazy {
-	readonly value: T;
-	readonly hasValue: boolean;
-	map(f: (x: T) => R): Lazy;
-}
-
-class LazyValue implements Lazy {
-	private _hasValue: boolean = false;
-	private _value?: T;
-
-	constructor(
-		private readonly _getValue: () => T
-	) { }
-
-	get value(): T {
-		if (!this._hasValue) {
-			this._hasValue = true;
-			this._value = this._getValue();
-		}
-		return this._value!;
-	}
-
-	get hasValue(): boolean {
-		return this._hasValue;
-	}
-
-	public map(f: (x: T) => R): Lazy {
-		return new LazyValue(() => f(this.value));
-	}
-}
-
-export function lazy(getValue: () => T): Lazy {
-	return new LazyValue(getValue);
-}
\ No newline at end of file
diff --git a/extensions/markdown-language-features/src/util/openDocumentLink.ts b/extensions/markdown-language-features/src/util/openDocumentLink.ts
index 18b8e5f4c79..7799f080043 100644
--- a/extensions/markdown-language-features/src/util/openDocumentLink.ts
+++ b/extensions/markdown-language-features/src/util/openDocumentLink.ts
@@ -3,92 +3,47 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as path from 'path';
 import * as vscode from 'vscode';
-import * as uri from 'vscode-uri';
-import { MarkdownEngine } from '../markdownEngine';
-import { TableOfContents } from '../tableOfContents';
-import { isMarkdownFile } from './file';
-
-export interface OpenDocumentLinkArgs {
-	readonly parts: vscode.Uri;
-	readonly fragment: string;
-	readonly fromResource: vscode.Uri;
-}
+import { MdLanguageClient } from '../client/client';
+import * as proto from '../client/protocol';
 
 enum OpenMarkdownLinks {
 	beside = 'beside',
 	currentGroup = 'currentGroup',
 }
 
-export function resolveDocumentLink(href: string, markdownFile: vscode.Uri): vscode.Uri {
-	let [hrefPath, fragment] = href.split('#').map(c => decodeURIComponent(c));
+export class MdLinkOpener {
 
-	if (hrefPath[0] === '/') {
-		// Absolute path. Try to resolve relative to the workspace
-		const workspace = vscode.workspace.getWorkspaceFolder(markdownFile);
-		if (workspace) {
-			return vscode.Uri.joinPath(workspace.uri, hrefPath.slice(1)).with({ fragment });
+	constructor(
+		private readonly client: MdLanguageClient,
+	) { }
+
+	public async resolveDocumentLink(linkText: string, fromResource: vscode.Uri): Promise {
+		return this.client.resolveLinkTarget(linkText, fromResource);
+	}
+
+	public async openDocumentLink(linkText: string, fromResource: vscode.Uri, viewColumn?: vscode.ViewColumn): Promise {
+		const resolved = await this.client.resolveLinkTarget(linkText, fromResource);
+		if (!resolved) {
+			return;
 		}
-	}
 
-	// Relative path. Resolve relative to the md file
-	const dirnameUri = markdownFile.with({ path: path.dirname(markdownFile.path) });
-	return vscode.Uri.joinPath(dirnameUri, hrefPath).with({ fragment });
-}
+		const uri = vscode.Uri.from(resolved.uri);
+		switch (resolved.kind) {
+			case 'external':
+				return vscode.commands.executeCommand('vscode.open', uri);
 
-export async function openDocumentLink(engine: MarkdownEngine, targetResource: vscode.Uri, fromResource: vscode.Uri): Promise {
-	const column = getViewColumn(fromResource);
+			case 'folder':
+				return vscode.commands.executeCommand('revealInExplorer', uri);
 
-	if (await tryNavigateToFragmentInActiveEditor(engine, targetResource)) {
-		return;
-	}
-
-	let targetResourceStat: vscode.FileStat | undefined;
-	try {
-		targetResourceStat = await vscode.workspace.fs.stat(targetResource);
-	} catch {
-		// noop
-	}
-
-	if (typeof targetResourceStat === 'undefined') {
-		// We don't think the file exists. If it doesn't already have an extension, try tacking on a `.md` and using that instead
-		if (uri.Utils.extname(targetResource) === '') {
-			const dotMdResource = targetResource.with({ path: targetResource.path + '.md' });
-			try {
-				const stat = await vscode.workspace.fs.stat(dotMdResource);
-				if (stat.type === vscode.FileType.File) {
-					await tryOpenMdFile(engine, dotMdResource, column);
-					return;
-				}
-			} catch {
-				// noop
+			case 'file': {
+				return vscode.commands.executeCommand('vscode.open', uri, {
+					selection: resolved.position ? new vscode.Range(resolved.position.line, resolved.position.character, resolved.position.line, resolved.position.character) : undefined,
+					viewColumn: viewColumn ?? getViewColumn(fromResource),
+				});
 			}
 		}
-	} else if (targetResourceStat.type === vscode.FileType.Directory) {
-		return vscode.commands.executeCommand('revealInExplorer', targetResource);
 	}
-
-	await tryOpenMdFile(engine, targetResource, column);
-}
-
-async function tryOpenMdFile(engine: MarkdownEngine, resource: vscode.Uri, column: vscode.ViewColumn): Promise {
-	await vscode.commands.executeCommand('vscode.open', resource.with({ fragment: '' }), column);
-	return tryNavigateToFragmentInActiveEditor(engine, resource);
-}
-
-async function tryNavigateToFragmentInActiveEditor(engine: MarkdownEngine, resource: vscode.Uri): Promise {
-	const activeEditor = vscode.window.activeTextEditor;
-	if (activeEditor?.document.uri.fsPath === resource.fsPath) {
-		if (isMarkdownFile(activeEditor.document)) {
-			if (await tryRevealLineUsingTocFragment(engine, activeEditor, resource.fragment)) {
-				return true;
-			}
-		}
-		tryRevealLineUsingLineFragment(activeEditor, resource.fragment);
-		return true;
-	}
-	return false;
 }
 
 function getViewColumn(resource: vscode.Uri): vscode.ViewColumn {
@@ -103,59 +58,3 @@ function getViewColumn(resource: vscode.Uri): vscode.ViewColumn {
 	}
 }
 
-async function tryRevealLineUsingTocFragment(engine: MarkdownEngine, editor: vscode.TextEditor, fragment: string): Promise {
-	const toc = await TableOfContents.create(engine, editor.document);
-	const entry = toc.lookup(fragment);
-	if (entry) {
-		const lineStart = new vscode.Range(entry.line, 0, entry.line, 0);
-		editor.selection = new vscode.Selection(lineStart.start, lineStart.end);
-		editor.revealRange(lineStart, vscode.TextEditorRevealType.AtTop);
-		return true;
-	}
-	return false;
-}
-
-function tryRevealLineUsingLineFragment(editor: vscode.TextEditor, fragment: string): boolean {
-	const lineNumberFragment = fragment.match(/^L(\d+)$/i);
-	if (lineNumberFragment) {
-		const line = +lineNumberFragment[1] - 1;
-		if (!isNaN(line)) {
-			const lineStart = new vscode.Range(line, 0, line, 0);
-			editor.selection = new vscode.Selection(lineStart.start, lineStart.end);
-			editor.revealRange(lineStart, vscode.TextEditorRevealType.AtTop);
-			return true;
-		}
-	}
-	return false;
-}
-
-export async function resolveUriToMarkdownFile(resource: vscode.Uri): Promise {
-	try {
-		const doc = await tryResolveUriToMarkdownFile(resource);
-		if (doc) {
-			return doc;
-		}
-	} catch {
-		// Noop
-	}
-
-	// If no extension, try with `.md` extension
-	if (uri.Utils.extname(resource) === '') {
-		return tryResolveUriToMarkdownFile(resource.with({ path: resource.path + '.md' }));
-	}
-
-	return undefined;
-}
-
-async function tryResolveUriToMarkdownFile(resource: vscode.Uri): Promise {
-	let document: vscode.TextDocument;
-	try {
-		document = await vscode.workspace.openTextDocument(resource);
-	} catch {
-		return undefined;
-	}
-	if (isMarkdownFile(document)) {
-		return document;
-	}
-	return undefined;
-}
diff --git a/extensions/markdown-language-features/src/util/resourceMap.ts b/extensions/markdown-language-features/src/util/resourceMap.ts
new file mode 100644
index 00000000000..7fe1f801bc6
--- /dev/null
+++ b/extensions/markdown-language-features/src/util/resourceMap.ts
@@ -0,0 +1,68 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+
+type ResourceToKey = (uri: vscode.Uri) => string;
+
+const defaultResourceToKey = (resource: vscode.Uri): string => resource.toString();
+
+export class ResourceMap {
+
+	private readonly map = new Map();
+
+	private readonly toKey: ResourceToKey;
+
+	constructor(toKey: ResourceToKey = defaultResourceToKey) {
+		this.toKey = toKey;
+	}
+
+	public set(uri: vscode.Uri, value: T): this {
+		this.map.set(this.toKey(uri), { uri, value });
+		return this;
+	}
+
+	public get(resource: vscode.Uri): T | undefined {
+		return this.map.get(this.toKey(resource))?.value;
+	}
+
+	public has(resource: vscode.Uri): boolean {
+		return this.map.has(this.toKey(resource));
+	}
+
+	public get size(): number {
+		return this.map.size;
+	}
+
+	public clear(): void {
+		this.map.clear();
+	}
+
+	public delete(resource: vscode.Uri): boolean {
+		return this.map.delete(this.toKey(resource));
+	}
+
+	public *values(): IterableIterator {
+		for (const entry of this.map.values()) {
+			yield entry.value;
+		}
+	}
+
+	public *keys(): IterableIterator {
+		for (const entry of this.map.values()) {
+			yield entry.uri;
+		}
+	}
+
+	public *entries(): IterableIterator<[vscode.Uri, T]> {
+		for (const entry of this.map.values()) {
+			yield [entry.uri, entry.value];
+		}
+	}
+
+	public [Symbol.iterator](): IterableIterator<[vscode.Uri, T]> {
+		return this.entries();
+	}
+}
diff --git a/extensions/markdown-language-features/src/util/schemes.ts b/extensions/markdown-language-features/src/util/schemes.ts
index 02e5aba6590..3eae0754ad2 100644
--- a/extensions/markdown-language-features/src/util/schemes.ts
+++ b/extensions/markdown-language-features/src/util/schemes.ts
@@ -3,44 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
-
-export const Schemes = {
-	http: 'http:',
-	https: 'https:',
-	file: 'file:',
+export const Schemes = Object.freeze({
+	file: 'file',
 	untitled: 'untitled',
-	mailto: 'mailto:',
-	data: 'data:',
-	vscode: 'vscode:',
-	'vscode-insiders': 'vscode-insiders:',
-};
-
-const knownSchemes = [
-	...Object.values(Schemes),
-	`${vscode.env.uriScheme}:`
-];
-
-export function getUriForLinkWithKnownExternalScheme(link: string): vscode.Uri | undefined {
-	if (knownSchemes.some(knownScheme => isOfScheme(knownScheme, link))) {
-		return vscode.Uri.parse(link);
-	}
-
-	return undefined;
-}
+	mailto: 'mailto',
+	vscode: 'vscode',
+	'vscode-insiders': 'vscode-insiders',
+	notebookCell: 'vscode-notebook-cell',
+});
 
 export function isOfScheme(scheme: string, link: string): boolean {
-	return link.toLowerCase().startsWith(scheme);
+	return link.toLowerCase().startsWith(scheme + ':');
 }
-
-export const MarkdownFileExtensions: readonly string[] = [
-	'.md',
-	'.mkd',
-	'.mdwn',
-	'.mdown',
-	'.markdown',
-	'.markdn',
-	'.mdtxt',
-	'.mdtext',
-	'.workbook',
-];
diff --git a/extensions/markdown-language-features/src/workspaceContents.ts b/extensions/markdown-language-features/src/workspaceContents.ts
deleted file mode 100644
index 02477c8c9d7..00000000000
--- a/extensions/markdown-language-features/src/workspaceContents.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as vscode from 'vscode';
-import { coalesce } from './util/arrays';
-import { Disposable } from './util/dispose';
-import { isMarkdownFile } from './util/file';
-import { InMemoryDocument } from './util/inMemoryDocument';
-import { Limiter } from './util/limiter';
-
-/**
- * Minimal version of {@link vscode.TextLine}. Used for mocking out in testing.
- */
-export interface SkinnyTextLine {
-	readonly text: string;
-	readonly isEmptyOrWhitespace: boolean;
-}
-
-/**
- * Minimal version of {@link vscode.TextDocument}. Used for mocking out in testing.
- */
-export interface SkinnyTextDocument {
-	readonly uri: vscode.Uri;
-	readonly version: number;
-	readonly lineCount: number;
-
-	getText(range?: vscode.Range): string;
-	lineAt(line: number): SkinnyTextLine;
-	positionAt(offset: number): vscode.Position;
-}
-
-/**
- * Provides set of markdown files in the current workspace.
- */
-export interface MdWorkspaceContents {
-	/**
-	 * Get list of all known markdown files.
-	 */
-	getAllMarkdownDocuments(): Promise>;
-
-	getMarkdownDocument(resource: vscode.Uri): Promise;
-
-	pathExists(resource: vscode.Uri): Promise;
-
-	readonly onDidChangeMarkdownDocument: vscode.Event;
-	readonly onDidCreateMarkdownDocument: vscode.Event;
-	readonly onDidDeleteMarkdownDocument: vscode.Event;
-}
-
-/**
- * Provides set of markdown files known to VS Code.
- *
- * This includes both opened text documents and markdown files in the workspace.
- */
-export class VsCodeMdWorkspaceContents extends Disposable implements MdWorkspaceContents {
-
-	private readonly _onDidChangeMarkdownDocumentEmitter = this._register(new vscode.EventEmitter());
-	private readonly _onDidCreateMarkdownDocumentEmitter = this._register(new vscode.EventEmitter());
-	private readonly _onDidDeleteMarkdownDocumentEmitter = this._register(new vscode.EventEmitter());
-
-	private _watcher: vscode.FileSystemWatcher | undefined;
-
-	private readonly utf8Decoder = new TextDecoder('utf-8');
-
-	/**
-	 * Reads and parses all .md documents in the workspace.
-	 * Files are processed in batches, to keep the number of open files small.
-	 *
-	 * @returns Array of processed .md files.
-	 */
-	async getAllMarkdownDocuments(): Promise {
-		const maxConcurrent = 20;
-
-		const foundFiles = new Set();
-		const limiter = new Limiter(maxConcurrent);
-
-		// Add files on disk
-		const resources = await vscode.workspace.findFiles('**/*.md', '**/node_modules/**');
-		const onDiskResults = await Promise.all(resources.map(resource => {
-			return limiter.queue(async () => {
-				const doc = await this.getMarkdownDocument(resource);
-				if (doc) {
-					foundFiles.add(doc.uri.toString());
-				}
-				return doc;
-			});
-		}));
-
-		// Add opened files (such as untitled files)
-		const openTextDocumentResults = await Promise.all(vscode.workspace.textDocuments
-			.filter(doc => !foundFiles.has(doc.uri.toString()) && this.isRelevantMarkdownDocument(doc)));
-
-		return coalesce([...onDiskResults, ...openTextDocumentResults]);
-	}
-
-	public get onDidChangeMarkdownDocument() {
-		this.ensureWatcher();
-		return this._onDidChangeMarkdownDocumentEmitter.event;
-	}
-
-	public get onDidCreateMarkdownDocument() {
-		this.ensureWatcher();
-		return this._onDidCreateMarkdownDocumentEmitter.event;
-	}
-
-	public get onDidDeleteMarkdownDocument() {
-		this.ensureWatcher();
-		return this._onDidDeleteMarkdownDocumentEmitter.event;
-	}
-
-	private ensureWatcher(): void {
-		if (this._watcher) {
-			return;
-		}
-
-		this._watcher = this._register(vscode.workspace.createFileSystemWatcher('**/*.md'));
-
-		this._register(this._watcher.onDidChange(async resource => {
-			const document = await this.getMarkdownDocument(resource);
-			if (document) {
-				this._onDidChangeMarkdownDocumentEmitter.fire(document);
-			}
-		}));
-
-		this._register(this._watcher.onDidCreate(async resource => {
-			const document = await this.getMarkdownDocument(resource);
-			if (document) {
-				this._onDidCreateMarkdownDocumentEmitter.fire(document);
-			}
-		}));
-
-		this._register(this._watcher.onDidDelete(resource => {
-			this._onDidDeleteMarkdownDocumentEmitter.fire(resource);
-		}));
-
-		this._register(vscode.workspace.onDidChangeTextDocument(e => {
-			if (this.isRelevantMarkdownDocument(e.document)) {
-				this._onDidChangeMarkdownDocumentEmitter.fire(e.document);
-			}
-		}));
-	}
-
-	private isRelevantMarkdownDocument(doc: vscode.TextDocument) {
-		return isMarkdownFile(doc) && doc.uri.scheme !== 'vscode-bulkeditpreview';
-	}
-
-	public async getMarkdownDocument(resource: vscode.Uri): Promise {
-		const matchingDocument = vscode.workspace.textDocuments.find((doc) => this.isRelevantMarkdownDocument(doc) && doc.uri.toString() === resource.toString());
-		if (matchingDocument) {
-			return matchingDocument;
-		}
-
-		try {
-			const bytes = await vscode.workspace.fs.readFile(resource);
-
-			// We assume that markdown is in UTF-8
-			const text = this.utf8Decoder.decode(bytes);
-			return new InMemoryDocument(resource, text, 0);
-		} catch {
-			return undefined;
-		}
-	}
-
-	public async pathExists(target: vscode.Uri): Promise {
-		let targetResourceStat: vscode.FileStat | undefined;
-		try {
-			targetResourceStat = await vscode.workspace.fs.stat(target);
-		} catch {
-			return false;
-		}
-		return targetResourceStat.type === vscode.FileType.File || targetResourceStat.type === vscode.FileType.Directory;
-	}
-}
diff --git a/extensions/markdown-language-features/tsconfig.json b/extensions/markdown-language-features/tsconfig.json
index 7c1d4a7fca8..75edc8fdacf 100644
--- a/extensions/markdown-language-features/tsconfig.json
+++ b/extensions/markdown-language-features/tsconfig.json
@@ -6,8 +6,6 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.textEditorDrop.d.ts",
-		"../../src/vscode-dts/vscode.proposed.dataTransferFiles.d.ts",
 		"../../src/vscode-dts/vscode.proposed.documentPaste.d.ts"
 	]
 }
diff --git a/extensions/markdown-language-features/yarn.lock b/extensions/markdown-language-features/yarn.lock
index eaa76d9abbf..6bd778ed899 100644
--- a/extensions/markdown-language-features/yarn.lock
+++ b/extensions/markdown-language-features/yarn.lock
@@ -2,6 +2,42 @@
 # yarn lockfile v1
 
 
+"@microsoft/1ds-core-js@3.2.3", "@microsoft/1ds-core-js@^3.2.3":
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.3.tgz#2217d92ec8b073caa4577a13f40ea3a5c4c4d4e7"
+  integrity sha512-796A8fd90oUKDRO7UXUT9BwZ3G+a9XzJj5v012FcCN/2qRhEsIV3x/0wkx2S08T4FiQEUPkB2uoYHpEjEneM7g==
+  dependencies:
+    "@microsoft/applicationinsights-core-js" "2.8.4"
+    "@microsoft/applicationinsights-shims" "^2.0.1"
+    "@microsoft/dynamicproto-js" "^1.1.6"
+
+"@microsoft/1ds-post-js@^3.2.3":
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.3.tgz#1fa7d51615a44f289632ae8c588007ba943db216"
+  integrity sha512-tcGJQXXr2LYoBbIXPoUVe1KCF3OtBsuKDFL7BXfmNtuSGtWF0yejm6H83DrR8/cUIGMRMUP9lqNlqFGwDYiwAQ==
+  dependencies:
+    "@microsoft/1ds-core-js" "3.2.3"
+    "@microsoft/applicationinsights-shims" "^2.0.1"
+    "@microsoft/dynamicproto-js" "^1.1.6"
+
+"@microsoft/applicationinsights-core-js@2.8.4":
+  version "2.8.4"
+  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.4.tgz#607e531bb241a8920d43960f68a7c76a6f9af596"
+  integrity sha512-FoA0FNOsFbJnLyTyQlYs6+HR7HMEa6nAOE6WOm9WVejBHMHQ/Bdb+hfVFi6slxwCimr/ner90jchi4/sIYdnyQ==
+  dependencies:
+    "@microsoft/applicationinsights-shims" "2.0.1"
+    "@microsoft/dynamicproto-js" "^1.1.6"
+
+"@microsoft/applicationinsights-shims@2.0.1", "@microsoft/applicationinsights-shims@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.1.tgz#5d72fb7aaf4056c4fda54f9d7c93ccf8ca9bcbfd"
+  integrity sha512-G0MXf6R6HndRbDy9BbEj0zrLeuhwt2nsXk2zKtF0TnYo39KgYqhYC2ayIzKPTm2KAE+xzD7rgyLdZnrcRvt9WQ==
+
+"@microsoft/dynamicproto-js@^1.1.6":
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc"
+  integrity sha512-D1Oivw1A4bIXhzBIy3/BBPn3p2On+kpO2NiYt9shICDK7L/w+cR6FFBUsBZ05l6iqzTeL+Jm8lAYn0g6G7DmDg==
+
 "@types/dompurify@^2.3.1":
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.3.1.tgz#2934adcd31c4e6b02676f9c22f9756e5091c04dd"
@@ -59,16 +95,37 @@
   resolved "https://registry.yarnpkg.com/@types/vscode-webview/-/vscode-webview-1.57.0.tgz#bad5194d45ae8d03afc1c0f67f71ff5e7a243bbf"
   integrity sha512-x3Cb/SMa1IwRHfSvKaZDZOTh4cNoG505c3NjTqGlMC082m++x/ETUmtYniDsw6SSmYzZXO8KBNhYxR0+VqymqA==
 
-"@vscode/extension-telemetry@0.4.10":
-  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.4.10.tgz#be960c05bdcbea0933866346cf244acad6cac910"
-  integrity sha512-XgyUoWWRQExTmd9DynIIUQo1NPex/zIeetdUAXeBjVuW9ioojM1TcDaSqOa/5QLC7lx+oEXwSU1r0XSBgzyz6w==
+"@vscode/extension-telemetry@0.6.2":
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.6.2.tgz#b86814ee680615730da94220c2b03ea9c3c14a8e"
+  integrity sha512-yb/wxLuaaCRcBAZtDCjNYSisAXz3FWsSqAha5nhHcYxx2ZPdQdWuZqVXGKq0ZpHVndBWWtK6XqtpCN2/HB4S1w==
+  dependencies:
+    "@microsoft/1ds-core-js" "^3.2.3"
+    "@microsoft/1ds-post-js" "^3.2.3"
 
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+
 dompurify@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.3.tgz#c1af3eb88be47324432964d8abc75cf4b98d634c"
@@ -96,6 +153,13 @@ lodash.throttle@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
   integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 markdown-it-front-matter@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/markdown-it-front-matter/-/markdown-it-front-matter-0.2.1.tgz#dca49a827bb3cebb0528452c1d87dff276eb28dc"
@@ -117,6 +181,13 @@ mdurl@^1.0.1:
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
+minimatch@^3.0.4:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 morphdom@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/morphdom/-/morphdom-2.6.1.tgz#e868e24f989fa3183004b159aed643e628b4306e"
@@ -127,22 +198,77 @@ picomatch@^2.3.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+semver@^7.3.5:
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+  dependencies:
+    lru-cache "^6.0.0"
+
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
-vscode-languageserver-textdocument@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz#3cd56dd14cec1d09e86c4bb04b09a246cb3df157"
-  integrity sha512-/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ==
+vscode-jsonrpc@8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz#f239ed2cd6004021b6550af9fd9d3e47eee3cac9"
+  integrity sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ==
 
-vscode-nls@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840"
-  integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==
+vscode-languageclient@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.0.2.tgz#f1f23ce8c8484aa11e4b7dfb24437d3e59bb61c6"
+  integrity sha512-lHlthJtphG9gibGb/y72CKqQUxwPsMXijJVpHEC2bvbFqxmkj9LwQ3aGU9dwjBLqsX1S4KjShYppLvg1UJDF/Q==
+  dependencies:
+    minimatch "^3.0.4"
+    semver "^7.3.5"
+    vscode-languageserver-protocol "3.17.2"
+
+vscode-languageserver-protocol@3.17.2:
+  version "3.17.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz#beaa46aea06ed061576586c5e11368a9afc1d378"
+  integrity sha512-8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg==
+  dependencies:
+    vscode-jsonrpc "8.0.2"
+    vscode-languageserver-types "3.17.2"
+
+vscode-languageserver-textdocument@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.5.tgz#838769940ece626176ec5d5a2aa2d0aa69f5095c"
+  integrity sha512-1ah7zyQjKBudnMiHbZmxz5bYNM9KKZYz+5VQLj+yr8l+9w3g+WAhCkUkWbhMEdC5u0ub4Ndiye/fDyS8ghIKQg==
+
+vscode-languageserver-types@3.17.2, vscode-languageserver-types@^3.17.1, vscode-languageserver-types@^3.17.2:
+  version "3.17.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2"
+  integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==
+
+vscode-markdown-languageservice@^0.0.0-alpha.10:
+  version "0.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.0.0-alpha.10.tgz#53b69c981eed7fd5efa155ab8c0f169995568681"
+  integrity sha512-rJ85nJ+d45yCz9lBhipavoWXz/vW5FknqqUpLqhe3/2xkrhxt8zcekhSoDepgkKFcTORAFV6g1SnnqxbVhX+uA==
+  dependencies:
+    picomatch "^2.3.1"
+    vscode-languageserver-textdocument "^1.0.5"
+    vscode-languageserver-types "^3.17.1"
+    vscode-nls "^5.0.1"
+    vscode-uri "^3.0.3"
+
+vscode-nls@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.1.tgz#ba23fc4d4420d25e7f886c8e83cbdcec47aa48b2"
+  integrity sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A==
+
+vscode-nls@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
+  integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==
 
 vscode-uri@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84"
   integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
diff --git a/extensions/markdown-math/.gitignore b/extensions/markdown-math/.gitignore
index 67c177886fb..93d9e664eae 100644
--- a/extensions/markdown-math/.gitignore
+++ b/extensions/markdown-math/.gitignore
@@ -1 +1,2 @@
 notebook-out
+languageService
diff --git a/extensions/markdown-math/notebook/katex.ts b/extensions/markdown-math/notebook/katex.ts
index ee68b15d61b..299ab9373de 100644
--- a/extensions/markdown-math/notebook/katex.ts
+++ b/extensions/markdown-math/notebook/katex.ts
@@ -8,9 +8,9 @@ import type { RendererContext } from 'vscode-notebook-renderer';
 const styleHref = import.meta.url.replace(/katex.js$/, 'katex.min.css');
 
 export async function activate(ctx: RendererContext) {
-	const markdownItRenderer = (await ctx.getRenderer('markdownItRenderer')) as undefined | any;
+	const markdownItRenderer = (await ctx.getRenderer('vscode.markdown-it-renderer')) as undefined | any;
 	if (!markdownItRenderer) {
-		throw new Error('Could not load markdownItRenderer');
+		throw new Error(`Could not load 'vscode.markdown-it-renderer'`);
 	}
 
 	// Add katex styles to be copied to shadow dom
diff --git a/extensions/markdown-math/package.json b/extensions/markdown-math/package.json
index d3bb21a553a..045da771eb9 100644
--- a/extensions/markdown-math/package.json
+++ b/extensions/markdown-math/package.json
@@ -6,7 +6,7 @@
   "icon": "icon.png",
   "publisher": "vscode",
   "license": "MIT",
-  "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
+  "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
   "engines": {
     "vscode": "^1.54.0"
   },
@@ -58,10 +58,10 @@
     ],
     "notebookRenderer": [
       {
-        "id": "markdownItRenderer-katex",
+        "id": "vscode.markdown-it-katex-extension",
         "displayName": "Markdown it KaTeX renderer",
         "entrypoint": {
-          "extends": "markdownItRenderer",
+          "extends": "vscode.markdown-it-renderer",
           "path": "./notebook-out/katex.js"
         }
       }
diff --git a/extensions/markdown-math/yarn.lock b/extensions/markdown-math/yarn.lock
index 2b979935781..7609023fa3c 100644
--- a/extensions/markdown-math/yarn.lock
+++ b/extensions/markdown-math/yarn.lock
@@ -3,29 +3,29 @@
 
 
 "@iktakahiro/markdown-it-katex@mjbvz/markdown-it-katex":
-  version "4.0.1"
-  resolved "https://codeload.github.com/mjbvz/markdown-it-katex/tar.gz/1e0d09f9174b3ee1537de2586ce8d8a460284ce4"
+  version "4.0.2"
+  resolved "https://codeload.github.com/mjbvz/markdown-it-katex/tar.gz/19f98f10f7d57f6e09049ddaced0da89b73423c5"
   dependencies:
-    katex "^0.13.0"
+    katex "^0.16.2"
 
 "@types/markdown-it@^0.0.0":
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-0.0.0.tgz#8f6acaa5e3245e275f684e95deb3e518d1c6ab16"
-  integrity sha1-j2rKpeMkXidfaE6V3rPlGNHGqxY=
+  integrity sha512-rLEOTm6Wi9M8GFnIK7VczXSEThIN/eVoevpTYVk+FD/DPX3N15Sj9b3vkjjDY63U0Zw1yawf13CI92CCHpC5kw==
 
 "@types/vscode-notebook-renderer@^1.60.0":
-  version "1.60.0"
-  resolved "https://registry.yarnpkg.com/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.60.0.tgz#8a67d561f48ddf46a95dfa9f712a79c72c7b8f7a"
-  integrity sha512-u7TD2uuEZTVuitx0iijOJdKI0JLiQP6PsSBSRy2XmHXUOXcp5p1S56NrjOEDoF+PIHd3NL3eO6KTRSf5nukDqQ==
+  version "1.72.0"
+  resolved "https://registry.yarnpkg.com/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.72.0.tgz#8943dc3cef0ced2dfb1e04c0a933bd289e7d5199"
+  integrity sha512-5iTjb39DpLn03ULUwrDR3L2Dy59RV4blSUHy0oLdQuIY11PhgWO4mXIcoFS0VxY1GZQ4IcjSf3ooT2Jrrcahnw==
 
 commander@^8.0.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
-katex@^0.13.0:
-  version "0.13.24"
-  resolved "https://registry.yarnpkg.com/katex/-/katex-0.13.24.tgz#fe55455eb455698cb24b911a353d16a3c855d905"
-  integrity sha512-jZxYuKCma3VS5UuxOx/rFV1QyGSl3Uy/i0kTJF3HgQ5xMinCQVF8Zd4bMY/9aI9b9A2pjIBOsjSSm68ykTAr8w==
+katex@^0.16.2:
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.2.tgz#9d3dc2a7e65fb8aa31101b1f86888ec40eed7b24"
+  integrity sha512-70DJdQAyh9EMsthw3AaQlDyFf54X7nWEUIa5W+rq8XOpEk//w5Th7/8SqFqpvi/KZ2t6MHUj4f9wLmztBmAYQA==
   dependencies:
     commander "^8.0.0"
diff --git a/extensions/image-preview/.vscodeignore b/extensions/media-preview/.vscodeignore
similarity index 100%
rename from extensions/image-preview/.vscodeignore
rename to extensions/media-preview/.vscodeignore
diff --git a/extensions/media-preview/README.md b/extensions/media-preview/README.md
new file mode 100644
index 00000000000..30bb44b87a1
--- /dev/null
+++ b/extensions/media-preview/README.md
@@ -0,0 +1,29 @@
+# Media Preview
+
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
+
+## Features
+
+This extension provides basic preview for images, audio and video files.
+
+### Supported image file extensions
+
+- `.jpg`, `.jpe`, `.jpeg`
+- `.png`
+- `.bmp`
+- `.gif`
+- `.ico`
+- `.webp`
+- `.avif`
+
+
+### Supported audio formats
+
+- `.mp3`
+- `.wav`
+- `.ogg`
+
+### Supported video formats
+
+- `.mp4` (does not support `aac` audio track)
+- `.webm` (vp8 only)
diff --git a/extensions/image-preview/extension-browser.webpack.config.js b/extensions/media-preview/extension-browser.webpack.config.js
similarity index 100%
rename from extensions/image-preview/extension-browser.webpack.config.js
rename to extensions/media-preview/extension-browser.webpack.config.js
diff --git a/extensions/image-preview/extension.webpack.config.js b/extensions/media-preview/extension.webpack.config.js
similarity index 100%
rename from extensions/image-preview/extension.webpack.config.js
rename to extensions/media-preview/extension.webpack.config.js
diff --git a/extensions/image-preview/icon.png b/extensions/media-preview/icon.png
similarity index 100%
rename from extensions/image-preview/icon.png
rename to extensions/media-preview/icon.png
diff --git a/extensions/media-preview/media/audioPreview.css b/extensions/media-preview/media/audioPreview.css
new file mode 100644
index 00000000000..0f72113bea8
--- /dev/null
+++ b/extensions/media-preview/media/audioPreview.css
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+html, body {
+	width: 100%;
+	height: 100%;
+	text-align: center;
+}
+
+body {
+	padding: 5px 10px;
+	box-sizing: border-box;
+	-webkit-user-select: none;
+	user-select: none;
+}
+
+.audio-container {
+	height: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.container.loading,
+.container.error {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.loading-indicator {
+	width: 30px;
+	height: 30px;
+	background-image: url('./loading.svg');
+	background-size: cover;
+}
+
+.loading-indicator,
+.loading-error {
+	display: none;
+}
+
+.loading .loading-indicator,
+.error .loading-error {
+	display: block;
+}
+
+.loading-error {
+	margin: 1em;
+}
+
+.vscode-dark .loading-indicator {
+	background-image: url('./loading-dark.svg');
+}
+
+.vscode-high-contrast .loading-indicator {
+	background-image: url('./loading-hc.svg');
+}
diff --git a/extensions/media-preview/media/audioPreview.js b/extensions/media-preview/media/audioPreview.js
new file mode 100644
index 00000000000..ea5d6f64ea4
--- /dev/null
+++ b/extensions/media-preview/media/audioPreview.js
@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// @ts-check
+"use strict";
+
+(function () {
+	const vscode = acquireVsCodeApi();
+
+	function getSettings() {
+		const element = document.getElementById('settings');
+		if (element) {
+			const data = element.getAttribute('data-settings');
+			if (data) {
+				return JSON.parse(data);
+			}
+		}
+
+		throw new Error(`Could not load settings`);
+	}
+
+	const settings = getSettings();
+
+	// State
+	let hasLoadedMedia = false;
+
+	// Elements
+	const container = document.createElement('div');
+	container.className = 'audio-container';
+	document.body.appendChild(container);
+
+	const audio = new Audio(settings.src === null ? undefined : settings.src);
+	audio.controls = true;
+
+	function onLoaded() {
+		if (hasLoadedMedia) {
+			return;
+		}
+		hasLoadedMedia = true;
+
+		document.body.classList.remove('loading');
+		document.body.classList.add('ready');
+		container.append(audio);
+	}
+
+	audio.addEventListener('error', e => {
+		if (hasLoadedMedia) {
+			return;
+		}
+
+		hasLoadedMedia = true;
+		document.body.classList.add('error');
+		document.body.classList.remove('loading');
+	});
+
+	if (settings.src === null) {
+		onLoaded();
+	} else {
+		audio.addEventListener('canplaythrough', () => {
+			onLoaded();
+		});
+	}
+
+	document.querySelector('.open-file-link').addEventListener('click', () => {
+		vscode.postMessage({
+			type: 'reopen-as-text',
+		});
+	});
+}());
diff --git a/extensions/image-preview/media/main.css b/extensions/media-preview/media/imagePreview.css
similarity index 100%
rename from extensions/image-preview/media/main.css
rename to extensions/media-preview/media/imagePreview.css
diff --git a/extensions/image-preview/media/main.js b/extensions/media-preview/media/imagePreview.js
similarity index 99%
rename from extensions/image-preview/media/main.js
rename to extensions/media-preview/media/imagePreview.js
index 984e586c0f6..fffdb7f6971 100644
--- a/extensions/image-preview/media/main.js
+++ b/extensions/media-preview/media/imagePreview.js
@@ -259,7 +259,7 @@
 			firstZoom();
 		}
 
-		let delta = e.deltaY > 0 ? 1 : -1;
+		const delta = e.deltaY > 0 ? 1 : -1;
 		updateScale(scale * (1 - delta * SCALE_PINCH_FACTOR));
 	}, { passive: false });
 
diff --git a/extensions/image-preview/media/loading-dark.svg b/extensions/media-preview/media/loading-dark.svg
similarity index 100%
rename from extensions/image-preview/media/loading-dark.svg
rename to extensions/media-preview/media/loading-dark.svg
diff --git a/extensions/image-preview/media/loading-hc.svg b/extensions/media-preview/media/loading-hc.svg
similarity index 100%
rename from extensions/image-preview/media/loading-hc.svg
rename to extensions/media-preview/media/loading-hc.svg
diff --git a/extensions/image-preview/media/loading.svg b/extensions/media-preview/media/loading.svg
similarity index 100%
rename from extensions/image-preview/media/loading.svg
rename to extensions/media-preview/media/loading.svg
diff --git a/extensions/media-preview/media/videoPreview.css b/extensions/media-preview/media/videoPreview.css
new file mode 100644
index 00000000000..4f1aa1d7014
--- /dev/null
+++ b/extensions/media-preview/media/videoPreview.css
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+html {
+	width: 100%;
+	height: 100%;
+	text-align: center;
+}
+
+body {
+	padding: 5px 10px;
+	width: calc(100% - 20px);
+	height: calc(100% - 10px);
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	-webkit-user-select: none;
+	user-select: none;
+}
+
+.loading-indicator {
+	width: 30px;
+	height: 30px;
+	background-image: url('./loading.svg');
+	background-size: cover;
+}
+
+.loading-indicator,
+.loading-error {
+	display: none;
+}
+
+.loading .loading-indicator,
+.error .loading-error {
+	display: block;
+}
+
+.loading-error {
+	margin: 1em;
+}
+
+.vscode-dark .loading-indicator {
+	background-image: url('./loading-dark.svg');
+}
+
+.vscode-high-contrast .loading-indicator {
+	background-image: url('./loading-hc.svg');
+}
diff --git a/extensions/media-preview/media/videoPreview.js b/extensions/media-preview/media/videoPreview.js
new file mode 100644
index 00000000000..54aa60ad86f
--- /dev/null
+++ b/extensions/media-preview/media/videoPreview.js
@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// @ts-check
+"use strict";
+
+(function () {
+	const vscode = acquireVsCodeApi();
+
+	function getSettings() {
+		const element = document.getElementById('settings');
+		if (element) {
+			const data = element.getAttribute('data-settings');
+			if (data) {
+				return JSON.parse(data);
+			}
+		}
+
+		throw new Error(`Could not load settings`);
+	}
+
+	const settings = getSettings();
+
+	// State
+	let hasLoadedMedia = false;
+
+	// Elements
+	const video = document.createElement('video');
+	if (settings.src !== null) {
+		video.src = settings.src;
+	}
+	video.playsInline = true;
+	video.controls = true;
+
+	function onLoaded() {
+		if (hasLoadedMedia) {
+			return;
+		}
+		hasLoadedMedia = true;
+
+		document.body.classList.remove('loading');
+		document.body.classList.add('ready');
+		document.body.append(video);
+	}
+
+	video.addEventListener('error', e => {
+		if (hasLoadedMedia) {
+			return;
+		}
+
+		hasLoadedMedia = true;
+		document.body.classList.add('error');
+		document.body.classList.remove('loading');
+	});
+
+	if (settings.src === null) {
+		onLoaded();
+	} else {
+		video.addEventListener('canplaythrough', () => {
+			onLoaded();
+		});
+	}
+
+	document.querySelector('.open-file-link').addEventListener('click', () => {
+		vscode.postMessage({
+			type: 'reopen-as-text',
+		});
+	});
+}());
diff --git a/extensions/image-preview/package.json b/extensions/media-preview/package.json
similarity index 64%
rename from extensions/image-preview/package.json
rename to extensions/media-preview/package.json
index 57bbb338210..384ab75f58b 100644
--- a/extensions/image-preview/package.json
+++ b/extensions/media-preview/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "image-preview",
+  "name": "media-preview",
   "displayName": "%displayName%",
   "description": "%description%",
   "extensionKind": [
@@ -10,9 +10,9 @@
   "publisher": "vscode",
   "icon": "icon.png",
   "license": "MIT",
-  "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
+  "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
   "engines": {
-    "vscode": "^1.39.0"
+    "vscode": "^1.70.0"
   },
   "main": "./out/extension",
   "browser": "./dist/browser/extension.js",
@@ -22,7 +22,9 @@
   "activationEvents": [
     "onCustomEditor:imagePreview.previewEditor",
     "onCommand:imagePreview.zoomIn",
-    "onCommand:imagePreview.zoomOut"
+    "onCommand:imagePreview.zoomOut",
+    "onCustomEditor:vscode.audioPreview",
+    "onCustomEditor:vscode.videoPreview"
   ],
   "capabilities": {
     "virtualWorkspaces": true,
@@ -34,13 +36,33 @@
     "customEditors": [
       {
         "viewType": "imagePreview.previewEditor",
-        "displayName": "%customEditors.displayName%",
+        "displayName": "%customEditor.imagePreview.displayName%",
         "priority": "builtin",
         "selector": [
           {
             "filenamePattern": "*.{jpg,jpe,jpeg,png,bmp,gif,ico,webp,avif}"
           }
         ]
+      },
+      {
+        "viewType": "vscode.audioPreview",
+        "displayName": "%customEditor.audioPreview.displayName%",
+        "priority": "builtin",
+        "selector": [
+          {
+            "filenamePattern": "*.{mp3,wav,ogg}"
+          }
+        ]
+      },
+      {
+        "viewType": "vscode.videoPreview",
+        "displayName": "%customEditor.videoPreview.displayName%",
+        "priority": "builtin",
+        "selector": [
+          {
+            "filenamePattern": "*.{mp4,webm}"
+          }
+        ]
       }
     ],
     "commands": [
@@ -71,16 +93,16 @@
     }
   },
   "scripts": {
-    "compile": "gulp compile-extension:image-preview",
-    "watch": "npm run build-preview && gulp watch-extension:image-preview",
+    "compile": "gulp compile-extension:media-preview",
+    "watch": "npm run build-preview && gulp watch-extension:media-preview",
     "vscode:prepublish": "npm run build-ext",
-    "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:image-preview ./tsconfig.json",
+    "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:media-preview ./tsconfig.json",
     "compile-web": "npx webpack-cli --config extension-browser.webpack.config --mode none",
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "0.4.10",
-    "vscode-nls": "^5.0.0"
+    "@vscode/extension-telemetry": "0.6.2",
+    "vscode-nls": "^5.2.0"
   },
   "repository": {
     "type": "git",
diff --git a/extensions/media-preview/package.nls.json b/extensions/media-preview/package.nls.json
new file mode 100644
index 00000000000..3e45e4d0d2e
--- /dev/null
+++ b/extensions/media-preview/package.nls.json
@@ -0,0 +1,9 @@
+{
+	"displayName": "Media Preview",
+	"description": "Provides VS Code's built-in previews for images, audio, and video",
+	"customEditor.audioPreview.displayName": "Audio Preview",
+	"customEditor.imagePreview.displayName": "Image Preview",
+	"customEditor.videoPreview.displayName": "Video Preview",
+	"command.zoomIn": "Zoom in",
+	"command.zoomOut": "Zoom out"
+}
diff --git a/extensions/media-preview/src/audioPreview.ts b/extensions/media-preview/src/audioPreview.ts
new file mode 100644
index 00000000000..2769ae3cbfb
--- /dev/null
+++ b/extensions/media-preview/src/audioPreview.ts
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as nls from 'vscode-nls';
+import { BinarySizeStatusBarEntry } from './binarySizeStatusBarEntry';
+import { MediaPreview, reopenAsText } from './mediaPreview';
+import { escapeAttribute, getNonce } from './util/dom';
+
+const localize = nls.loadMessageBundle();
+
+class AudioPreviewProvider implements vscode.CustomReadonlyEditorProvider {
+
+	public static readonly viewType = 'vscode.audioPreview';
+
+	constructor(
+		private readonly extensionRoot: vscode.Uri,
+		private readonly binarySizeStatusBarEntry: BinarySizeStatusBarEntry,
+	) { }
+
+	public async openCustomDocument(uri: vscode.Uri) {
+		return { uri, dispose: () => { } };
+	}
+
+	public async resolveCustomEditor(document: vscode.CustomDocument, webviewEditor: vscode.WebviewPanel): Promise {
+		new AudioPreview(this.extensionRoot, document.uri, webviewEditor, this.binarySizeStatusBarEntry);
+	}
+}
+
+
+class AudioPreview extends MediaPreview {
+
+	constructor(
+		private readonly extensionRoot: vscode.Uri,
+		resource: vscode.Uri,
+		webviewEditor: vscode.WebviewPanel,
+		binarySizeStatusBarEntry: BinarySizeStatusBarEntry,
+	) {
+		super(extensionRoot, resource, webviewEditor, binarySizeStatusBarEntry);
+
+		this._register(webviewEditor.webview.onDidReceiveMessage(message => {
+			switch (message.type) {
+				case 'reopen-as-text': {
+					reopenAsText(resource, webviewEditor.viewColumn);
+					break;
+				}
+			}
+		}));
+
+		this.updateBinarySize();
+		this.render();
+		this.updateState();
+	}
+
+	protected async getWebviewContents(): Promise {
+		const version = Date.now().toString();
+		const settings = {
+			src: await this.getResourcePath(this.webviewEditor, this.resource, version),
+		};
+
+		const nonce = getNonce();
+
+		const cspSource = this.webviewEditor.webview.cspSource;
+		return /* html */`
+
+
+	
+
+	
+	
+
+	Audio Preview
+
+	
+
+	
+	
+
+
+	
        
+	
        
+		
        ${localize('preview.audioLoadError', "An error occurred while loading the audio file.")}
        
+		${localize('preview.audioLoadErrorLink', "Open file using VS Code's standard text/binary editor?")}
+	
        
+	
+
+`;
+	}
+
+	private async getResourcePath(webviewEditor: vscode.WebviewPanel, resource: vscode.Uri, version: string): Promise {
+		if (resource.scheme === 'git') {
+			const stat = await vscode.workspace.fs.stat(resource);
+			if (stat.size === 0) {
+				// The file is stored on git lfs
+				return null;
+			}
+		}
+
+		// Avoid adding cache busting if there is already a query string
+		if (resource.query) {
+			return webviewEditor.webview.asWebviewUri(resource).toString();
+		}
+		return webviewEditor.webview.asWebviewUri(resource).with({ query: `version=${version}` }).toString();
+	}
+
+	private extensionResource(...parts: string[]) {
+		return this.webviewEditor.webview.asWebviewUri(vscode.Uri.joinPath(this.extensionRoot, ...parts));
+	}
+}
+
+export function registerAudioPreviewSupport(context: vscode.ExtensionContext, binarySizeStatusBarEntry: BinarySizeStatusBarEntry): vscode.Disposable {
+	const provider = new AudioPreviewProvider(context.extensionUri, binarySizeStatusBarEntry);
+	return vscode.window.registerCustomEditorProvider(AudioPreviewProvider.viewType, provider, {
+		supportsMultipleEditorsPerDocument: true,
+		webviewOptions: {
+			retainContextWhenHidden: true,
+		}
+	});
+}
diff --git a/extensions/image-preview/src/binarySizeStatusBarEntry.ts b/extensions/media-preview/src/binarySizeStatusBarEntry.ts
similarity index 96%
rename from extensions/image-preview/src/binarySizeStatusBarEntry.ts
rename to extensions/media-preview/src/binarySizeStatusBarEntry.ts
index ce375fc19b8..da41ccfe5e5 100644
--- a/extensions/image-preview/src/binarySizeStatusBarEntry.ts
+++ b/extensions/media-preview/src/binarySizeStatusBarEntry.ts
@@ -42,7 +42,7 @@ export class BinarySizeStatusBarEntry extends PreviewStatusBarEntry {
 		super('status.imagePreview.binarySize', localize('sizeStatusBar.name', "Image Binary Size"), vscode.StatusBarAlignment.Right, 100);
 	}
 
-	public show(owner: string, size: number | undefined) {
+	public show(owner: unknown, size: number | undefined) {
 		if (typeof size === 'number') {
 			super.showItem(owner, BinarySize.formatSize(size));
 		} else {
diff --git a/extensions/media-preview/src/extension.ts b/extensions/media-preview/src/extension.ts
new file mode 100644
index 00000000000..31370d48fc6
--- /dev/null
+++ b/extensions/media-preview/src/extension.ts
@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { registerAudioPreviewSupport } from './audioPreview';
+import { BinarySizeStatusBarEntry } from './binarySizeStatusBarEntry';
+import { registerImagePreviewSupport } from './imagePreview';
+import { registerVideoPreviewSupport } from './videoPreview';
+
+export function activate(context: vscode.ExtensionContext) {
+	const binarySizeStatusBarEntry = new BinarySizeStatusBarEntry();
+	context.subscriptions.push(binarySizeStatusBarEntry);
+
+	context.subscriptions.push(registerImagePreviewSupport(context, binarySizeStatusBarEntry));
+	context.subscriptions.push(registerAudioPreviewSupport(context, binarySizeStatusBarEntry));
+	context.subscriptions.push(registerVideoPreviewSupport(context, binarySizeStatusBarEntry));
+}
diff --git a/extensions/image-preview/src/preview.ts b/extensions/media-preview/src/imagePreview/index.ts
similarity index 54%
rename from extensions/image-preview/src/preview.ts
rename to extensions/media-preview/src/imagePreview/index.ts
index 94521f1f8e1..5c0d56933ba 100644
--- a/extensions/image-preview/src/preview.ts
+++ b/extensions/media-preview/src/imagePreview/index.ts
@@ -5,10 +5,11 @@
 
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
-import { Disposable } from './dispose';
+import { BinarySizeStatusBarEntry } from '../binarySizeStatusBarEntry';
+import { MediaPreview, PreviewState, reopenAsText } from '../mediaPreview';
+import { escapeAttribute, getNonce } from '../util/dom';
 import { SizeStatusBarEntry } from './sizeStatusBarEntry';
 import { Scale, ZoomStatusBarEntry } from './zoomStatusBarEntry';
-import { BinarySizeStatusBarEntry } from './binarySizeStatusBarEntry';
 
 const localize = nls.loadMessageBundle();
 
@@ -16,8 +17,8 @@ export class PreviewManager implements vscode.CustomReadonlyEditorProvider {
 
 	public static readonly viewType = 'imagePreview.previewEditor';
 
-	private readonly _previews = new Set();
-	private _activePreview: Preview | undefined;
+	private readonly _previews = new Set();
+	private _activePreview: ImagePreview | undefined;
 
 	constructor(
 		private readonly extensionRoot: vscode.Uri,
@@ -34,7 +35,7 @@ export class PreviewManager implements vscode.CustomReadonlyEditorProvider {
 		document: vscode.CustomDocument,
 		webviewEditor: vscode.WebviewPanel,
 	): Promise {
-		const preview = new Preview(this.extensionRoot, document.uri, webviewEditor, this.sizeStatusBarEntry, this.binarySizeStatusBarEntry, this.zoomStatusBarEntry);
+		const preview = new ImagePreview(this.extensionRoot, document.uri, webviewEditor, this.sizeStatusBarEntry, this.binarySizeStatusBarEntry, this.zoomStatusBarEntry);
 		this._previews.add(preview);
 		this.setActivePreview(preview);
 
@@ -51,159 +52,108 @@ export class PreviewManager implements vscode.CustomReadonlyEditorProvider {
 
 	public get activePreview() { return this._activePreview; }
 
-	private setActivePreview(value: Preview | undefined): void {
+	private setActivePreview(value: ImagePreview | undefined): void {
 		this._activePreview = value;
-		this.setPreviewActiveContext(!!value);
-	}
-
-	private setPreviewActiveContext(value: boolean) {
-		vscode.commands.executeCommand('setContext', 'imagePreviewFocus', value);
 	}
 }
 
-const enum PreviewState {
-	Disposed,
-	Visible,
-	Active,
-}
 
-class Preview extends Disposable {
+class ImagePreview extends MediaPreview {
 
-	private readonly id: string = `${Date.now()}-${Math.random().toString()}`;
-
-	private _previewState = PreviewState.Visible;
 	private _imageSize: string | undefined;
-	private _imageBinarySize: number | undefined;
 	private _imageZoom: Scale | undefined;
 
 	private readonly emptyPngDataUri = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAEElEQVR42gEFAPr/AP///wAI/AL+Sr4t6gAAAABJRU5ErkJggg==';
 
 	constructor(
 		private readonly extensionRoot: vscode.Uri,
-		private readonly resource: vscode.Uri,
-		private readonly webviewEditor: vscode.WebviewPanel,
+		resource: vscode.Uri,
+		webviewEditor: vscode.WebviewPanel,
 		private readonly sizeStatusBarEntry: SizeStatusBarEntry,
-		private readonly binarySizeStatusBarEntry: BinarySizeStatusBarEntry,
+		binarySizeStatusBarEntry: BinarySizeStatusBarEntry,
 		private readonly zoomStatusBarEntry: ZoomStatusBarEntry,
 	) {
-		super();
-		const resourceRoot = resource.with({
-			path: resource.path.replace(/\/[^\/]+?\.\w+$/, '/'),
-		});
-
-		webviewEditor.webview.options = {
-			enableScripts: true,
-			enableForms: false,
-			localResourceRoots: [
-				resourceRoot,
-				extensionRoot,
-			]
-		};
+		super(extensionRoot, resource, webviewEditor, binarySizeStatusBarEntry);
 
 		this._register(webviewEditor.webview.onDidReceiveMessage(message => {
 			switch (message.type) {
-				case 'size':
-					{
-						this._imageSize = message.value;
-						this.update();
-						break;
-					}
-				case 'zoom':
-					{
-						this._imageZoom = message.value;
-						this.update();
-						break;
-					}
-
-				case 'reopen-as-text':
-					{
-						vscode.commands.executeCommand('vscode.openWith', resource, 'default', webviewEditor.viewColumn);
-						break;
-					}
+				case 'size': {
+					this._imageSize = message.value;
+					this.updateState();
+					break;
+				}
+				case 'zoom': {
+					this._imageZoom = message.value;
+					this.updateState();
+					break;
+				}
+				case 'reopen-as-text': {
+					reopenAsText(resource, webviewEditor.viewColumn);
+					break;
+				}
 			}
 		}));
 
 		this._register(zoomStatusBarEntry.onDidChangeScale(e => {
-			if (this._previewState === PreviewState.Active) {
+			if (this.previewState === PreviewState.Active) {
 				this.webviewEditor.webview.postMessage({ type: 'setScale', scale: e.scale });
 			}
 		}));
 
 		this._register(webviewEditor.onDidChangeViewState(() => {
-			this.update();
 			this.webviewEditor.webview.postMessage({ type: 'setActive', value: this.webviewEditor.active });
 		}));
 
 		this._register(webviewEditor.onDidDispose(() => {
-			if (this._previewState === PreviewState.Active) {
-				this.sizeStatusBarEntry.hide(this.id);
-				this.binarySizeStatusBarEntry.hide(this.id);
-				this.zoomStatusBarEntry.hide(this.id);
+			if (this.previewState === PreviewState.Active) {
+				this.sizeStatusBarEntry.hide(this);
+				this.zoomStatusBarEntry.hide(this);
 			}
-			this._previewState = PreviewState.Disposed;
+			this.previewState = PreviewState.Disposed;
 		}));
 
-		const watcher = this._register(vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(resource, '*')));
-		this._register(watcher.onDidChange(e => {
-			if (e.toString() === this.resource.toString()) {
-				this.render();
-			}
-		}));
-		this._register(watcher.onDidDelete(e => {
-			if (e.toString() === this.resource.toString()) {
-				this.webviewEditor.dispose();
-			}
-		}));
-
-		vscode.workspace.fs.stat(resource).then(({ size }) => {
-			this._imageBinarySize = size;
-			this.update();
-		});
-
+		this.updateBinarySize();
 		this.render();
-		this.update();
+		this.updateState();
+
 		this.webviewEditor.webview.postMessage({ type: 'setActive', value: this.webviewEditor.active });
 	}
 
+	public override dispose(): void {
+		super.dispose();
+		this.sizeStatusBarEntry.hide(this);
+		this.zoomStatusBarEntry.hide(this);
+	}
+
 	public zoomIn() {
-		if (this._previewState === PreviewState.Active) {
+		if (this.previewState === PreviewState.Active) {
 			this.webviewEditor.webview.postMessage({ type: 'zoomIn' });
 		}
 	}
 
 	public zoomOut() {
-		if (this._previewState === PreviewState.Active) {
+		if (this.previewState === PreviewState.Active) {
 			this.webviewEditor.webview.postMessage({ type: 'zoomOut' });
 		}
 	}
 
-	private async render() {
-		if (this._previewState !== PreviewState.Disposed) {
-			this.webviewEditor.webview.html = await this.getWebviewContents();
-		}
-	}
+	protected override updateState() {
+		super.updateState();
 
-	private update() {
-		if (this._previewState === PreviewState.Disposed) {
+		if (this.previewState === PreviewState.Disposed) {
 			return;
 		}
 
 		if (this.webviewEditor.active) {
-			this._previewState = PreviewState.Active;
-			this.sizeStatusBarEntry.show(this.id, this._imageSize || '');
-			this.binarySizeStatusBarEntry.show(this.id, this._imageBinarySize);
-			this.zoomStatusBarEntry.show(this.id, this._imageZoom || 'fit');
+			this.sizeStatusBarEntry.show(this, this._imageSize || '');
+			this.zoomStatusBarEntry.show(this, this._imageZoom || 'fit');
 		} else {
-			if (this._previewState === PreviewState.Active) {
-				this.sizeStatusBarEntry.hide(this.id);
-				this.binarySizeStatusBarEntry.hide(this.id);
-				this.zoomStatusBarEntry.hide(this.id);
-			}
-			this._previewState = PreviewState.Visible;
+			this.sizeStatusBarEntry.hide(this);
+			this.zoomStatusBarEntry.hide(this);
 		}
 	}
 
-	private async getWebviewContents(): Promise {
+	protected override async getWebviewContents(): Promise {
 		const version = Date.now().toString();
 		const settings = {
 			src: await this.getResourcePath(this.webviewEditor, this.resource, version),
@@ -223,7 +173,7 @@ class Preview extends Disposable {
 
 	Image Preview
 
-	
+	
 
 	
 	
@@ -234,7 +184,7 @@ class Preview extends Disposable {
 		
        ${localize('preview.imageLoadError', "An error occurred while loading the image.")}
        
 		${localize('preview.imageLoadErrorLink', "Open file using VS Code's standard text/binary editor?")}
        - + `; } @@ -254,22 +204,34 @@ class Preview extends Disposable { return webviewEditor.webview.asWebviewUri(resource).with({ query: `version=${version}` }).toString(); } - private extensionResource(path: string) { - return this.webviewEditor.webview.asWebviewUri(this.extensionRoot.with({ - path: this.extensionRoot.path + path - })); + private extensionResource(...parts: string[]) { + return this.webviewEditor.webview.asWebviewUri(vscode.Uri.joinPath(this.extensionRoot, ...parts)); } } -function escapeAttribute(value: string | vscode.Uri): string { - return value.toString().replace(/"/g, '"'); -} -function getNonce() { - let text = ''; - const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - for (let i = 0; i < 64; i++) { - text += possible.charAt(Math.floor(Math.random() * possible.length)); - } - return text; +export function registerImagePreviewSupport(context: vscode.ExtensionContext, binarySizeStatusBarEntry: BinarySizeStatusBarEntry): vscode.Disposable { + const disposables: vscode.Disposable[] = []; + + const sizeStatusBarEntry = new SizeStatusBarEntry(); + disposables.push(sizeStatusBarEntry); + + const zoomStatusBarEntry = new ZoomStatusBarEntry(); + disposables.push(zoomStatusBarEntry); + + const previewManager = new PreviewManager(context.extensionUri, sizeStatusBarEntry, binarySizeStatusBarEntry, zoomStatusBarEntry); + + disposables.push(vscode.window.registerCustomEditorProvider(PreviewManager.viewType, previewManager, { + supportsMultipleEditorsPerDocument: true, + })); + + disposables.push(vscode.commands.registerCommand('imagePreview.zoomIn', () => { + previewManager.activePreview?.zoomIn(); + })); + + disposables.push(vscode.commands.registerCommand('imagePreview.zoomOut', () => { + previewManager.activePreview?.zoomOut(); + })); + + return vscode.Disposable.from(...disposables); } diff --git a/extensions/image-preview/src/sizeStatusBarEntry.ts b/extensions/media-preview/src/imagePreview/sizeStatusBarEntry.ts similarity index 87% rename from extensions/image-preview/src/sizeStatusBarEntry.ts rename to extensions/media-preview/src/imagePreview/sizeStatusBarEntry.ts index 68e5c34d232..397a2ffd97a 100644 --- a/extensions/image-preview/src/sizeStatusBarEntry.ts +++ b/extensions/media-preview/src/imagePreview/sizeStatusBarEntry.ts @@ -5,7 +5,7 @@ import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; -import { PreviewStatusBarEntry } from './ownedStatusBarEntry'; +import { PreviewStatusBarEntry } from '../ownedStatusBarEntry'; const localize = nls.loadMessageBundle(); @@ -15,7 +15,7 @@ export class SizeStatusBarEntry extends PreviewStatusBarEntry { super('status.imagePreview.size', localize('sizeStatusBar.name', "Image Size"), vscode.StatusBarAlignment.Right, 101 /* to the left of editor status (100) */); } - public show(owner: string, text: string) { + public show(owner: unknown, text: string) { this.showItem(owner, text); } } diff --git a/extensions/image-preview/src/zoomStatusBarEntry.ts b/extensions/media-preview/src/imagePreview/zoomStatusBarEntry.ts similarity index 93% rename from extensions/image-preview/src/zoomStatusBarEntry.ts rename to extensions/media-preview/src/imagePreview/zoomStatusBarEntry.ts index a4fcdc2b604..de0729bebf1 100644 --- a/extensions/image-preview/src/zoomStatusBarEntry.ts +++ b/extensions/media-preview/src/imagePreview/zoomStatusBarEntry.ts @@ -5,7 +5,7 @@ import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; -import { PreviewStatusBarEntry as OwnedStatusBarEntry } from './ownedStatusBarEntry'; +import { PreviewStatusBarEntry as OwnedStatusBarEntry } from '../ownedStatusBarEntry'; const localize = nls.loadMessageBundle(); @@ -41,7 +41,7 @@ export class ZoomStatusBarEntry extends OwnedStatusBarEntry { this.entry.command = selectZoomLevelCommandId; } - public show(owner: string, scale: Scale) { + public show(owner: unknown, scale: Scale) { this.showItem(owner, this.zoomLabel(scale)); } diff --git a/extensions/media-preview/src/mediaPreview.ts b/extensions/media-preview/src/mediaPreview.ts new file mode 100644 index 00000000000..424f197cc34 --- /dev/null +++ b/extensions/media-preview/src/mediaPreview.ts @@ -0,0 +1,110 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as vscode from 'vscode'; +import { BinarySizeStatusBarEntry } from './binarySizeStatusBarEntry'; +import { Disposable } from './util/dispose'; + +export function reopenAsText(resource: vscode.Uri, viewColumn: vscode.ViewColumn | undefined) { + vscode.commands.executeCommand('vscode.openWith', resource, 'default', viewColumn); +} + +export const enum PreviewState { + Disposed, + Visible, + Active, +} + +export abstract class MediaPreview extends Disposable { + + protected previewState = PreviewState.Visible; + private _binarySize: number | undefined; + + constructor( + extensionRoot: vscode.Uri, + protected readonly resource: vscode.Uri, + protected readonly webviewEditor: vscode.WebviewPanel, + private readonly binarySizeStatusBarEntry: BinarySizeStatusBarEntry, + ) { + super(); + + const resourceRoot = resource.with({ + path: resource.path.replace(/\/[^\/]+?\.\w+$/, '/'), + }); + + webviewEditor.webview.options = { + enableScripts: true, + enableForms: false, + localResourceRoots: [ + resourceRoot, + extensionRoot, + ] + }; + + this._register(webviewEditor.onDidChangeViewState(() => { + this.updateState(); + })); + + this._register(webviewEditor.onDidDispose(() => { + this.previewState = PreviewState.Disposed; + this.dispose(); + })); + + const watcher = this._register(vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(resource, '*'))); + this._register(watcher.onDidChange(e => { + if (e.toString() === this.resource.toString()) { + this.updateBinarySize(); + this.render(); + } + })); + + this._register(watcher.onDidDelete(e => { + if (e.toString() === this.resource.toString()) { + this.webviewEditor.dispose(); + } + })); + } + + public override dispose() { + super.dispose(); + this.binarySizeStatusBarEntry.hide(this); + } + + protected updateBinarySize() { + vscode.workspace.fs.stat(this.resource).then(({ size }) => { + this._binarySize = size; + this.updateState(); + }); + } + + protected async render() { + if (this.previewState === PreviewState.Disposed) { + return; + } + + const content = await this.getWebviewContents(); + if (this.previewState as PreviewState === PreviewState.Disposed) { + return; + } + + this.webviewEditor.webview.html = content; + } + + protected abstract getWebviewContents(): Promise; + + protected updateState() { + if (this.previewState === PreviewState.Disposed) { + return; + } + + if (this.webviewEditor.active) { + this.previewState = PreviewState.Active; + this.binarySizeStatusBarEntry.show(this, this._binarySize); + } else { + this.binarySizeStatusBarEntry.hide(this); + this.previewState = PreviewState.Visible; + } + } +} diff --git a/extensions/image-preview/src/ownedStatusBarEntry.ts b/extensions/media-preview/src/ownedStatusBarEntry.ts similarity index 84% rename from extensions/image-preview/src/ownedStatusBarEntry.ts rename to extensions/media-preview/src/ownedStatusBarEntry.ts index 31165f67d69..fff43b572ba 100644 --- a/extensions/image-preview/src/ownedStatusBarEntry.ts +++ b/extensions/media-preview/src/ownedStatusBarEntry.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import { Disposable } from './dispose'; +import { Disposable } from './util/dispose'; export abstract class PreviewStatusBarEntry extends Disposable { - private _showOwner: string | undefined; + private _showOwner: unknown | undefined; protected readonly entry: vscode.StatusBarItem; @@ -17,13 +17,13 @@ export abstract class PreviewStatusBarEntry extends Disposable { this.entry.name = name; } - protected showItem(owner: string, text: string) { + protected showItem(owner: unknown, text: string) { this._showOwner = owner; this.entry.text = text; this.entry.show(); } - public hide(owner: string) { + public hide(owner: unknown) { if (owner === this._showOwner) { this.entry.hide(); this._showOwner = undefined; diff --git a/extensions/image-preview/src/dispose.ts b/extensions/media-preview/src/util/dispose.ts similarity index 100% rename from extensions/image-preview/src/dispose.ts rename to extensions/media-preview/src/util/dispose.ts diff --git a/extensions/media-preview/src/util/dom.ts b/extensions/media-preview/src/util/dom.ts new file mode 100644 index 00000000000..0f6c00da9da --- /dev/null +++ b/extensions/media-preview/src/util/dom.ts @@ -0,0 +1,18 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +import * as vscode from 'vscode'; + +export function escapeAttribute(value: string | vscode.Uri): string { + return value.toString().replace(/"/g, '"'); +} + +export function getNonce() { + let text = ''; + const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + for (let i = 0; i < 64; i++) { + text += possible.charAt(Math.floor(Math.random() * possible.length)); + } + return text; +} diff --git a/extensions/media-preview/src/videoPreview.ts b/extensions/media-preview/src/videoPreview.ts new file mode 100644 index 00000000000..8dae5ec7b67 --- /dev/null +++ b/extensions/media-preview/src/videoPreview.ts @@ -0,0 +1,122 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as vscode from 'vscode'; +import * as nls from 'vscode-nls'; +import { BinarySizeStatusBarEntry } from './binarySizeStatusBarEntry'; +import { MediaPreview, reopenAsText } from './mediaPreview'; +import { escapeAttribute, getNonce } from './util/dom'; + +const localize = nls.loadMessageBundle(); + +class VideoPreviewProvider implements vscode.CustomReadonlyEditorProvider { + + public static readonly viewType = 'vscode.videoPreview'; + + constructor( + private readonly extensionRoot: vscode.Uri, + private readonly binarySizeStatusBarEntry: BinarySizeStatusBarEntry, + ) { } + + public async openCustomDocument(uri: vscode.Uri) { + return { uri, dispose: () => { } }; + } + + public async resolveCustomEditor(document: vscode.CustomDocument, webviewEditor: vscode.WebviewPanel): Promise { + new VideoPreview(this.extensionRoot, document.uri, webviewEditor, this.binarySizeStatusBarEntry); + } +} + + +class VideoPreview extends MediaPreview { + + constructor( + private readonly extensionRoot: vscode.Uri, + resource: vscode.Uri, + webviewEditor: vscode.WebviewPanel, + binarySizeStatusBarEntry: BinarySizeStatusBarEntry, + ) { + super(extensionRoot, resource, webviewEditor, binarySizeStatusBarEntry); + + this._register(webviewEditor.webview.onDidReceiveMessage(message => { + switch (message.type) { + case 'reopen-as-text': { + reopenAsText(resource, webviewEditor.viewColumn); + break; + } + } + })); + + this.updateBinarySize(); + this.render(); + this.updateState(); + } + + protected async getWebviewContents(): Promise { + const version = Date.now().toString(); + const settings = { + src: await this.getResourcePath(this.webviewEditor, this.resource, version), + }; + + const nonce = getNonce(); + + const cspSource = this.webviewEditor.webview.cspSource; + return /* html */` + + + + + + + + Video Preview + + + + + + + +
        +
        +

        ${localize('preview.videoLoadError', "An error occurred while loading the video file.")}

        + ${localize('preview.videoLoadErrorLink', "Open file using VS Code's standard text/binary editor?")} +
        + + +`; + } + + private async getResourcePath(webviewEditor: vscode.WebviewPanel, resource: vscode.Uri, version: string): Promise { + if (resource.scheme === 'git') { + const stat = await vscode.workspace.fs.stat(resource); + if (stat.size === 0) { + // The file is stored on git lfs + return null; + } + } + + // Avoid adding cache busting if there is already a query string + if (resource.query) { + return webviewEditor.webview.asWebviewUri(resource).toString(); + } + return webviewEditor.webview.asWebviewUri(resource).with({ query: `version=${version}` }).toString(); + } + + private extensionResource(...parts: string[]) { + return this.webviewEditor.webview.asWebviewUri(vscode.Uri.joinPath(this.extensionRoot, ...parts)); + } +} + +export function registerVideoPreviewSupport(context: vscode.ExtensionContext, binarySizeStatusBarEntry: BinarySizeStatusBarEntry): vscode.Disposable { + const provider = new VideoPreviewProvider(context.extensionUri, binarySizeStatusBarEntry); + return vscode.window.registerCustomEditorProvider(VideoPreviewProvider.viewType, provider, { + supportsMultipleEditorsPerDocument: true, + webviewOptions: { + retainContextWhenHidden: true, + } + }); +} diff --git a/extensions/image-preview/tsconfig.json b/extensions/media-preview/tsconfig.json similarity index 100% rename from extensions/image-preview/tsconfig.json rename to extensions/media-preview/tsconfig.json diff --git a/extensions/media-preview/yarn.lock b/extensions/media-preview/yarn.lock new file mode 100644 index 00000000000..a9af1f07de4 --- /dev/null +++ b/extensions/media-preview/yarn.lock @@ -0,0 +1,52 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@microsoft/1ds-core-js@3.2.3", "@microsoft/1ds-core-js@^3.2.3": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.3.tgz#2217d92ec8b073caa4577a13f40ea3a5c4c4d4e7" + integrity sha512-796A8fd90oUKDRO7UXUT9BwZ3G+a9XzJj5v012FcCN/2qRhEsIV3x/0wkx2S08T4FiQEUPkB2uoYHpEjEneM7g== + dependencies: + "@microsoft/applicationinsights-core-js" "2.8.4" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/1ds-post-js@^3.2.3": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.3.tgz#1fa7d51615a44f289632ae8c588007ba943db216" + integrity sha512-tcGJQXXr2LYoBbIXPoUVe1KCF3OtBsuKDFL7BXfmNtuSGtWF0yejm6H83DrR8/cUIGMRMUP9lqNlqFGwDYiwAQ== + dependencies: + "@microsoft/1ds-core-js" "3.2.3" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/applicationinsights-core-js@2.8.4": + version "2.8.4" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.4.tgz#607e531bb241a8920d43960f68a7c76a6f9af596" + integrity sha512-FoA0FNOsFbJnLyTyQlYs6+HR7HMEa6nAOE6WOm9WVejBHMHQ/Bdb+hfVFi6slxwCimr/ner90jchi4/sIYdnyQ== + dependencies: + "@microsoft/applicationinsights-shims" "2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/applicationinsights-shims@2.0.1", "@microsoft/applicationinsights-shims@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.1.tgz#5d72fb7aaf4056c4fda54f9d7c93ccf8ca9bcbfd" + integrity sha512-G0MXf6R6HndRbDy9BbEj0zrLeuhwt2nsXk2zKtF0TnYo39KgYqhYC2ayIzKPTm2KAE+xzD7rgyLdZnrcRvt9WQ== + +"@microsoft/dynamicproto-js@^1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc" + integrity sha512-D1Oivw1A4bIXhzBIy3/BBPn3p2On+kpO2NiYt9shICDK7L/w+cR6FFBUsBZ05l6iqzTeL+Jm8lAYn0g6G7DmDg== + +"@vscode/extension-telemetry@0.6.2": + version "0.6.2" + resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.6.2.tgz#b86814ee680615730da94220c2b03ea9c3c14a8e" + integrity sha512-yb/wxLuaaCRcBAZtDCjNYSisAXz3FWsSqAha5nhHcYxx2ZPdQdWuZqVXGKq0ZpHVndBWWtK6XqtpCN2/HB4S1w== + dependencies: + "@microsoft/1ds-core-js" "^3.2.3" + "@microsoft/1ds-post-js" "^3.2.3" + +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json index 128538a8ad9..caba136ce52 100644 --- a/extensions/merge-conflict/package.json +++ b/extensions/merge-conflict/package.json @@ -6,7 +6,7 @@ "icon": "media/icon.png", "version": "1.0.0", "license": "MIT", - "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", + "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255", "engines": { "vscode": "^1.5.0" }, @@ -34,49 +34,57 @@ "category": "%command.category%", "title": "%command.accept.all-current%", "original": "Accept All Current", - "command": "merge-conflict.accept.all-current" + "command": "merge-conflict.accept.all-current", + "enablement": "!isMergeEditor" }, { "category": "%command.category%", "title": "%command.accept.all-incoming%", "original": "Accept All Incoming", - "command": "merge-conflict.accept.all-incoming" + "command": "merge-conflict.accept.all-incoming", + "enablement": "!isMergeEditor" }, { "category": "%command.category%", "title": "%command.accept.all-both%", "original": "Accept All Both", - "command": "merge-conflict.accept.all-both" + "command": "merge-conflict.accept.all-both", + "enablement": "!isMergeEditor" }, { "category": "%command.category%", "title": "%command.accept.current%", "original": "Accept Current", - "command": "merge-conflict.accept.current" + "command": "merge-conflict.accept.current", + "enablement": "!isMergeEditor" }, { "category": "%command.category%", "title": "%command.accept.incoming%", "original": "Accept Incoming", - "command": "merge-conflict.accept.incoming" + "command": "merge-conflict.accept.incoming", + "enablement": "!isMergeEditor" }, { "category": "%command.category%", "title": "%command.accept.selection%", "original": "Accept Selection", - "command": "merge-conflict.accept.selection" + "command": "merge-conflict.accept.selection", + "enablement": "!isMergeEditor" }, { "category": "%command.category%", "title": "%command.accept.both%", "original": "Accept Both", - "command": "merge-conflict.accept.both" + "command": "merge-conflict.accept.both", + "enablement": "!isMergeEditor" }, { "category": "%command.category%", "title": "%command.next%", "original": "Next Conflict", "command": "merge-conflict.next", + "enablement": "!isMergeEditor", "icon": "$(arrow-down)" }, { @@ -84,13 +92,15 @@ "title": "%command.previous%", "original": "Previous Conflict", "command": "merge-conflict.previous", + "enablement": "!isMergeEditor", "icon": "$(arrow-up)" }, { "category": "%command.category%", "title": "%command.compare%", "original": "Compare Current Conflict", - "command": "merge-conflict.compare" + "command": "merge-conflict.compare", + "enablement": "!isMergeEditor" } ], "menus": { @@ -110,12 +120,12 @@ { "command": "merge-conflict.previous", "group": "navigation@1", - "when": "mergeConflictsCount && mergeConflictsCount != 0" + "when": "!isMergeEditor && mergeConflictsCount && mergeConflictsCount != 0" }, { "command": "merge-conflict.next", "group": "navigation@2", - "when": "mergeConflictsCount && mergeConflictsCount != 0" + "when": "!isMergeEditor && mergeConflictsCount && mergeConflictsCount != 0" } ] }, @@ -156,7 +166,7 @@ } }, "dependencies": { - "vscode-nls": "^5.0.0" + "vscode-nls": "^5.2.0" }, "devDependencies": { "@types/node": "16.x" diff --git a/extensions/merge-conflict/src/codelensProvider.ts b/extensions/merge-conflict/src/codelensProvider.ts index bd5242b8e00..da82a57ac80 100644 --- a/extensions/merge-conflict/src/codelensProvider.ts +++ b/extensions/merge-conflict/src/codelensProvider.ts @@ -52,7 +52,7 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro return null; } - let conflicts = await this.tracker.getConflicts(document); + const conflicts = await this.tracker.getConflicts(document); const conflictsCount = conflicts?.length ?? 0; vscode.commands.executeCommand('setContext', 'mergeConflictsCount', conflictsCount); @@ -60,28 +60,28 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro return null; } - let items: vscode.CodeLens[] = []; + const items: vscode.CodeLens[] = []; conflicts.forEach(conflict => { - let acceptCurrentCommand: vscode.Command = { + const acceptCurrentCommand: vscode.Command = { command: 'merge-conflict.accept.current', title: localize('acceptCurrentChange', 'Accept Current Change'), arguments: ['known-conflict', conflict] }; - let acceptIncomingCommand: vscode.Command = { + const acceptIncomingCommand: vscode.Command = { command: 'merge-conflict.accept.incoming', title: localize('acceptIncomingChange', 'Accept Incoming Change'), arguments: ['known-conflict', conflict] }; - let acceptBothCommand: vscode.Command = { + const acceptBothCommand: vscode.Command = { command: 'merge-conflict.accept.both', title: localize('acceptBothChanges', 'Accept Both Changes'), arguments: ['known-conflict', conflict] }; - let diffCommand: vscode.Command = { + const diffCommand: vscode.Command = { command: 'merge-conflict.compare', title: localize('compareChanges', 'Compare Changes'), arguments: [conflict] diff --git a/extensions/merge-conflict/src/commandHandler.ts b/extensions/merge-conflict/src/commandHandler.ts index e20660bd74a..920875ed6ac 100644 --- a/extensions/merge-conflict/src/commandHandler.ts +++ b/extensions/merge-conflict/src/commandHandler.ts @@ -107,8 +107,8 @@ export default class CommandHandler implements vscode.Disposable { const scheme = editor.document.uri.scheme; let range = conflict.current.content; - let leftRanges = conflicts.map(conflict => [conflict.current.content, conflict.range]); - let rightRanges = conflicts.map(conflict => [conflict.incoming.content, conflict.range]); + const leftRanges = conflicts.map(conflict => [conflict.current.content, conflict.range]); + const rightRanges = conflicts.map(conflict => [conflict.incoming.content, conflict.range]); const leftUri = editor.document.uri.with({ scheme: ContentProvider.scheme, @@ -120,7 +120,7 @@ export default class CommandHandler implements vscode.Disposable { const rightUri = leftUri.with({ query: JSON.stringify({ scheme, ranges: rightRanges }) }); let mergeConflictLineOffsets = 0; - for (let nextconflict of conflicts) { + for (const nextconflict of conflicts) { if (nextconflict.range.isEqual(conflict.range)) { break; } else { @@ -158,7 +158,7 @@ export default class CommandHandler implements vscode.Disposable { } async acceptSelection(editor: vscode.TextEditor): Promise { - let conflict = await this.findConflictContainingSelection(editor); + const conflict = await this.findConflictContainingSelection(editor); if (!conflict) { vscode.window.showWarningMessage(localize('cursorNotInConflict', 'Editor cursor is not within a merge conflict')); @@ -202,7 +202,7 @@ export default class CommandHandler implements vscode.Disposable { } private async navigate(editor: vscode.TextEditor, direction: NavigationDirection): Promise { - let navigationResult = await this.findConflictForNavigation(editor, direction); + const navigationResult = await this.findConflictForNavigation(editor, direction); if (!navigationResult) { // Check for autoNavigateNextConflict, if it's enabled(which indicating no conflict remain), then do not show warning @@ -258,7 +258,7 @@ export default class CommandHandler implements vscode.Disposable { } private async acceptAll(type: interfaces.CommitType, editor: vscode.TextEditor): Promise { - let conflicts = await this.tracker.getConflicts(editor.document); + const conflicts = await this.tracker.getConflicts(editor.document); if (!conflicts || conflicts.length === 0) { vscode.window.showWarningMessage(localize('noConflicts', 'No merge conflicts found in this file')); @@ -323,7 +323,7 @@ export default class CommandHandler implements vscode.Disposable { return null; } - let selection = editor.selection.active; + const selection = editor.selection.active; if (conflicts.length === 1) { if (conflicts[0].range.contains(selection)) { return { diff --git a/extensions/merge-conflict/src/contentProvider.ts b/extensions/merge-conflict/src/contentProvider.ts index 5c24854b00e..155bac08d40 100644 --- a/extensions/merge-conflict/src/contentProvider.ts +++ b/extensions/merge-conflict/src/contentProvider.ts @@ -32,7 +32,7 @@ export default class MergeConflictContentProvider implements vscode.TextDocument let lastPosition = new vscode.Position(0, 0); ranges.forEach(rangeObj => { - let [conflictRange, fullRange] = rangeObj; + const [conflictRange, fullRange] = rangeObj; const [start, end] = conflictRange; const [fullStart, fullEnd] = fullRange; @@ -41,7 +41,7 @@ export default class MergeConflictContentProvider implements vscode.TextDocument lastPosition = new vscode.Position(fullEnd.line, fullEnd.character); }); - let documentEnd = document.lineAt(document.lineCount - 1).range.end; + const documentEnd = document.lineAt(document.lineCount - 1).range.end; text += document.getText(new vscode.Range(lastPosition.line, lastPosition.character, documentEnd.line, documentEnd.character)); return text; diff --git a/extensions/merge-conflict/src/delayer.ts b/extensions/merge-conflict/src/delayer.ts index e4ef18e09c9..8609ff6abe4 100644 --- a/extensions/merge-conflict/src/delayer.ts +++ b/extensions/merge-conflict/src/delayer.ts @@ -35,7 +35,7 @@ export class Delayer { }).then(() => { this.completionPromise = null; this.onSuccess = null; - let result = this.task!(); + const result = this.task!(); this.task = null; return result; }); @@ -56,7 +56,7 @@ export class Delayer { return null; } this.cancelTimeout(); - let result = this.completionPromise; + const result = this.completionPromise; this.onSuccess!(undefined); return result; } diff --git a/extensions/merge-conflict/src/documentMergeConflict.ts b/extensions/merge-conflict/src/documentMergeConflict.ts index 3e8b44ba87d..4448c25356b 100644 --- a/extensions/merge-conflict/src/documentMergeConflict.ts +++ b/extensions/merge-conflict/src/documentMergeConflict.ts @@ -45,11 +45,11 @@ export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict // ] if (type === interfaces.CommitType.Current) { // Replace [ Conflict Range ] with [ Current Content ] - let content = document.getText(this.current.content); + const content = document.getText(this.current.content); this.replaceRangeWithContent(content, edit); } else if (type === interfaces.CommitType.Incoming) { - let content = document.getText(this.incoming.content); + const content = document.getText(this.incoming.content); this.replaceRangeWithContent(content, edit); } else if (type === interfaces.CommitType.Both) { diff --git a/extensions/merge-conflict/src/documentTracker.ts b/extensions/merge-conflict/src/documentTracker.ts index 7d2f57be3cb..f52644ab9df 100644 --- a/extensions/merge-conflict/src/documentTracker.ts +++ b/extensions/merge-conflict/src/documentTracker.ts @@ -50,7 +50,7 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable, getConflicts(document: vscode.TextDocument, origin: string): PromiseLike { // Attempt from cache - let key = this.getCacheKey(document); + const key = this.getCacheKey(document); if (!key) { // Document doesn't have a uri, can't cache it, so return @@ -67,11 +67,9 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable, } return cacheItem.delayTask.trigger(() => { - let conflicts = this.getConflictsOrEmpty(document, Array.from(cacheItem!.origins)); + const conflicts = this.getConflictsOrEmpty(document, Array.from(cacheItem!.origins)); - if (this.cache) { - this.cache.delete(key!); - } + this.cache?.delete(key!); return conflicts; }); @@ -82,7 +80,7 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable, return false; } - let key = this.getCacheKey(document); + const key = this.getCacheKey(document); if (!key) { return false; } @@ -100,7 +98,7 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable, } forget(document: vscode.TextDocument) { - let key = this.getCacheKey(document); + const key = this.getCacheKey(document); if (key) { this.cache.delete(key); diff --git a/extensions/merge-conflict/src/mergeConflictParser.ts b/extensions/merge-conflict/src/mergeConflictParser.ts index 06e4237fea7..cb925f82301 100644 --- a/extensions/merge-conflict/src/mergeConflictParser.ts +++ b/extensions/merge-conflict/src/mergeConflictParser.ts @@ -67,7 +67,7 @@ export class MergeConflictParser { // Create a full descriptor from the lines that we matched. This can return // null if the descriptor could not be completed. - let completeDescriptor = MergeConflictParser.scanItemTolMergeConflictDescriptor(document, currentConflict); + const completeDescriptor = MergeConflictParser.scanItemTolMergeConflictDescriptor(document, currentConflict); if (completeDescriptor !== null) { conflictDescriptors.push(completeDescriptor); @@ -90,7 +90,7 @@ export class MergeConflictParser { return null; } - let tokenAfterCurrentBlock: vscode.TextLine = scanned.commonAncestors[0] || scanned.splitter; + const tokenAfterCurrentBlock: vscode.TextLine = scanned.commonAncestors[0] || scanned.splitter; // Assume that descriptor.current.header, descriptor.incoming.header and descriptor.splitter // have valid ranges, fill in content and total ranges from these parts. @@ -110,7 +110,7 @@ export class MergeConflictParser { name: scanned.startHeader.text.substring(startHeaderMarker.length + 1) }, commonAncestors: scanned.commonAncestors.map((currentTokenLine, index, commonAncestors) => { - let nextTokenLine = commonAncestors[index + 1] || scanned.splitter; + const nextTokenLine = commonAncestors[index + 1] || scanned.splitter; return { header: currentTokenLine.range, decoratorContent: new vscode.Range( @@ -146,7 +146,7 @@ export class MergeConflictParser { return false; } - let text = document.getText(); + const text = document.getText(); return text.includes(startHeaderMarker) && text.includes(endFooterMarker); } diff --git a/extensions/merge-conflict/src/mergeDecorator.ts b/extensions/merge-conflict/src/mergeDecorator.ts index b3d24bed81d..769ac0b8214 100644 --- a/extensions/merge-conflict/src/mergeDecorator.ts +++ b/extensions/merge-conflict/src/mergeDecorator.ts @@ -137,7 +137,7 @@ export default class MergeDecorator implements vscode.Disposable { private generateBlockRenderOptions(backgroundColor: string, overviewRulerColor: string, config: interfaces.IExtensionConfiguration): vscode.DecorationRenderOptions { - let renderOptions: vscode.DecorationRenderOptions = {}; + const renderOptions: vscode.DecorationRenderOptions = {}; if (config.enableDecorations) { renderOptions.backgroundColor = new vscode.ThemeColor(backgroundColor); @@ -176,7 +176,7 @@ export default class MergeDecorator implements vscode.Disposable { try { this.updating.set(editor, true); - let conflicts = await this.tracker.getConflicts(editor.document); + const conflicts = await this.tracker.getConflicts(editor.document); if (vscode.window.visibleTextEditors.indexOf(editor) === -1) { return; } @@ -188,9 +188,9 @@ export default class MergeDecorator implements vscode.Disposable { // Store decorations keyed by the type of decoration, set decoration wants a "style" // to go with it, which will match this key (see constructor); - let matchDecorations: { [key: string]: vscode.Range[] } = {}; + const matchDecorations: { [key: string]: vscode.Range[] } = {}; - let pushDecoration = (key: string, d: vscode.Range) => { + const pushDecoration = (key: string, d: vscode.Range) => { matchDecorations[key] = matchDecorations[key] || []; matchDecorations[key].push(d); }; @@ -224,7 +224,7 @@ export default class MergeDecorator implements vscode.Disposable { // For each match we've generated, apply the generated decoration with the matching decoration type to the // editor instance. Keys in both matches and decorations should match. Object.keys(matchDecorations).forEach(decorationKey => { - let decorationType = this.decorations[decorationKey]; + const decorationType = this.decorations[decorationKey]; if (decorationType) { editor.setDecorations(decorationType, matchDecorations[decorationKey]); @@ -242,7 +242,7 @@ export default class MergeDecorator implements vscode.Disposable { // Race condition, while editing the settings, it's possible to // generate regions before the configuration has been refreshed - let decorationType = this.decorations[decorationKey]; + const decorationType = this.decorations[decorationKey]; if (decorationType) { editor.setDecorations(decorationType, []); diff --git a/extensions/merge-conflict/src/services.ts b/extensions/merge-conflict/src/services.ts index 30fb478c6f8..9f58daad6f4 100644 --- a/extensions/merge-conflict/src/services.ts +++ b/extensions/merge-conflict/src/services.ts @@ -21,7 +21,7 @@ export default class ServiceWrapper implements vscode.Disposable { begin() { - let configuration = this.createExtensionConfiguration(); + const configuration = this.createExtensionConfiguration(); const documentTracker = new DocumentTracker(); this.services.push( @@ -64,4 +64,3 @@ export default class ServiceWrapper implements vscode.Disposable { this.services = []; } } - diff --git a/extensions/merge-conflict/yarn.lock b/extensions/merge-conflict/yarn.lock index 699f1238a9b..8b8c7a6c15b 100644 --- a/extensions/merge-conflict/yarn.lock +++ b/extensions/merge-conflict/yarn.lock @@ -7,7 +7,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== -vscode-nls@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840" - integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA== +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json index 58118fefe5d..1fb6e7d83a5 100644 --- a/extensions/microsoft-authentication/package.json +++ b/extensions/microsoft-authentication/package.json @@ -16,7 +16,8 @@ "onAuthenticationRequest:microsoft" ], "enabledApiProposals": [ - "idToken" + "idToken", + "extensionLog" ], "capabilities": { "virtualWorkspaces": true, @@ -36,7 +37,7 @@ } ] }, - "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", + "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255", "main": "./out/extension.js", "browser": "./dist/browser/extension.js", "scripts": { @@ -60,8 +61,7 @@ "sha.js": "2.4.11", "stream": "0.0.2", "uuid": "^8.2.0", - "@vscode/extension-telemetry": "0.4.10", - "vscode-nls": "^5.0.0" + "@vscode/extension-telemetry": "0.6.2" }, "repository": { "type": "git", diff --git a/extensions/microsoft-authentication/src/AADHelper.ts b/extensions/microsoft-authentication/src/AADHelper.ts index 6d02e2472b7..3a7307a47c0 100644 --- a/extensions/microsoft-authentication/src/AADHelper.ts +++ b/extensions/microsoft-authentication/src/AADHelper.ts @@ -7,18 +7,15 @@ import * as randomBytes from 'randombytes'; import * as querystring from 'querystring'; import { Buffer } from 'buffer'; import * as vscode from 'vscode'; -import * as nls from 'vscode-nls'; import { v4 as uuid } from 'uuid'; import fetch, { Response } from 'node-fetch'; import Logger from './logger'; -import { toBase64UrlEncoding } from './utils'; +import { isSupportedEnvironment, toBase64UrlEncoding } from './utils'; import { sha256 } from './env/node/sha256'; import { BetterTokenStorage, IDidChangeInOtherWindowEvent } from './betterSecretStorage'; import { LoopbackAuthServer } from './authServer'; import path = require('path'); -const localize = nls.loadMessageBundle(); - const redirectUrl = 'https://vscode.dev/redirect'; const loginEndpointUrl = 'https://login.microsoftonline.com/'; const DEFAULT_CLIENT_ID = 'aebc6443-996d-45c2-90f0-388ff96faa56'; @@ -109,7 +106,7 @@ export class AzureActiveDirectoryService { public async initialize(): Promise { Logger.info('Reading sessions from secret storage...'); - let sessions = await this._tokenStorage.getAll(); + const sessions = await this._tokenStorage.getAll(); Logger.info(`Got ${sessions.length} stored sessions`); const refreshes = sessions.map(async session => { @@ -139,7 +136,7 @@ export class AzureActiveDirectoryService { sessionId: session.id }); } else { - vscode.window.showErrorMessage(localize('signOut', "You have been signed out because reading stored authentication information failed.")); + vscode.window.showErrorMessage(vscode.l10n.t('You have been signed out because reading stored authentication information failed.')); Logger.error(e); await this.removeSessionByIToken({ accessToken: undefined, @@ -184,6 +181,9 @@ export class AzureActiveDirectoryService { if (!modifiedScopes.includes('profile')) { modifiedScopes.push('profile'); } + if (!modifiedScopes.includes('offline_access')) { + modifiedScopes.push('offline_access'); + } modifiedScopes = modifiedScopes.sort(); let modifiedScopesStr = modifiedScopes.join(' '); @@ -256,6 +256,9 @@ export class AzureActiveDirectoryService { if (!scopes.includes('profile')) { scopes.push('profile'); } + if (!scopes.includes('offline_access')) { + scopes.push('offline_access'); + } scopes = scopes.sort(); const scopeData: IScopeData = { scopes, @@ -319,13 +322,7 @@ export class AzureActiveDirectoryService { }, 5000); } - const token = await this.exchangeCodeForToken(codeToExchange, codeVerifier, scopeData); - if (token.expiresIn) { - this.setSessionTimeout(token.sessionId, token.refreshToken, scopeData, token.expiresIn * AzureActiveDirectoryService.REFRESH_TIMEOUT_MODIFIER); - } - await this.setToken(token, scopeData); - Logger.info(`Login successful for scopes: ${scopeData.scopeStr}`); - const session = await this.convertToSession(token); + const session = await this.exchangeCodeForSession(codeToExchange, codeVerifier, scopeData); return session; } @@ -352,12 +349,14 @@ export class AzureActiveDirectoryService { code_challenge_method: 'S256', code_challenge: codeChallenge, }); - let uri = vscode.Uri.parse(`${signInUrl}?${oauthStartQuery.toString()}`); + const uri = vscode.Uri.parse(`${signInUrl}?${oauthStartQuery.toString()}`); vscode.env.openExternal(uri); + let inputBox: vscode.InputBox | undefined; const timeoutPromise = new Promise((_: (value: vscode.AuthenticationSession) => void, reject) => { const wait = setTimeout(() => { clearTimeout(wait); + inputBox?.dispose(); reject('Login timed out.'); }, 1000 * 60 * 5); }); @@ -369,7 +368,12 @@ export class AzureActiveDirectoryService { // before completing it. let existingPromise = this._codeExchangePromises.get(scopeData.scopeStr); if (!existingPromise) { - existingPromise = this.handleCodeResponse(scopeData); + if (isSupportedEnvironment(callbackUri)) { + existingPromise = this.handleCodeResponse(scopeData); + } else { + inputBox = vscode.window.createInputBox(); + existingPromise = this.handleCodeInputBox(inputBox, codeVerifier, scopeData); + } this._codeExchangePromises.set(scopeData.scopeStr, existingPromise); } @@ -439,7 +443,7 @@ export class AzureActiveDirectoryService { onDidChangeSessions.fire({ added: [], removed: [], changed: [this.convertToSessionSync(refreshedToken)] }); } catch (e) { if (e.message !== REFRESH_NETWORK_FAILURE) { - vscode.window.showErrorMessage(localize('signOut', "You have been signed out because reading stored authentication information failed.")); + vscode.window.showErrorMessage(vscode.l10n.t('You have been signed out because reading stored authentication information failed.')); await this.removeSessionById(sessionId); } } @@ -659,13 +663,7 @@ export class AzureActiveDirectoryService { throw new Error('No available code verifier'); } - const token = await this.exchangeCodeForToken(code, verifier, scopeData); - if (token.expiresIn) { - this.setSessionTimeout(token.sessionId, token.refreshToken, scopeData, token.expiresIn * AzureActiveDirectoryService.REFRESH_TIMEOUT_MODIFIER); - } - await this.setToken(token, scopeData); - - const session = await this.convertToSession(token); + const session = await this.exchangeCodeForSession(code, verifier, scopeData); resolve(session); } catch (err) { reject(err); @@ -680,8 +678,33 @@ export class AzureActiveDirectoryService { }); } - private async exchangeCodeForToken(code: string, codeVerifier: string, scopeData: IScopeData): Promise { + private async handleCodeInputBox(inputBox: vscode.InputBox, verifier: string, scopeData: IScopeData): Promise { + inputBox.ignoreFocusOut = true; + inputBox.title = vscode.l10n.t('Microsoft Authentication'); + inputBox.prompt = vscode.l10n.t('Provide the authorization code to complete the sign in flow.'); + inputBox.placeholder = vscode.l10n.t('Paste authorization code here...'); + return new Promise((resolve: (value: vscode.AuthenticationSession) => void, reject) => { + inputBox.show(); + inputBox.onDidAccept(async () => { + const code = inputBox.value; + if (code) { + inputBox.dispose(); + const session = await this.exchangeCodeForSession(code, verifier, scopeData); + resolve(session); + } + }); + inputBox.onDidHide(() => { + if (!inputBox.value) { + inputBox.dispose(); + reject('Cancelled'); + } + }); + }); + } + + private async exchangeCodeForSession(code: string, codeVerifier: string, scopeData: IScopeData): Promise { Logger.info(`Exchanging login code for token for scopes: ${scopeData.scopeStr}`); + let token: IToken | undefined; try { const postData = querystring.stringify({ grant_type: 'authorization_code', @@ -698,11 +721,18 @@ export class AzureActiveDirectoryService { const json = await this.fetchTokenResponse(endpoint, postData, scopeData); Logger.info(`Exchanging login code for token (for scopes: ${scopeData.scopeStr}) succeeded!`); - return this.convertToTokenSync(json, scopeData); + token = this.convertToTokenSync(json, scopeData); } catch (e) { Logger.error(`Error exchanging code for token (for scopes ${scopeData.scopeStr}): ${e}`); throw e; } + + if (token.expiresIn) { + this.setSessionTimeout(token.sessionId, token.refreshToken, scopeData, token.expiresIn * AzureActiveDirectoryService.REFRESH_TIMEOUT_MODIFIER); + } + await this.setToken(token, scopeData); + Logger.info(`Login successful for scopes: ${scopeData.scopeStr}`); + return await this.convertToSession(token); } private async fetchTokenResponse(endpoint: string, postData: string, scopeData: IScopeData): Promise { @@ -796,7 +826,7 @@ export class AzureActiveDirectoryService { } catch (e) { // Network failures will automatically retry on next poll. if (e.message !== REFRESH_NETWORK_FAILURE) { - vscode.window.showErrorMessage(localize('signOut', "You have been signed out because reading stored authentication information failed.")); + vscode.window.showErrorMessage(vscode.l10n.t('You have been signed out because reading stored authentication information failed.')); await this.removeSessionById(session.id); } return; diff --git a/extensions/microsoft-authentication/src/logger.ts b/extensions/microsoft-authentication/src/logger.ts index db142875255..38ae6c732d6 100644 --- a/extensions/microsoft-authentication/src/logger.ts +++ b/extensions/microsoft-authentication/src/logger.ts @@ -5,55 +5,5 @@ import * as vscode from 'vscode'; -type LogLevel = 'Trace' | 'Info' | 'Error'; - -class Log { - private output: vscode.OutputChannel; - - constructor() { - this.output = vscode.window.createOutputChannel('Microsoft Authentication'); - } - - private data2String(data: any): string { - if (data instanceof Error) { - return data.stack || data.message; - } - if (data.success === false && data.message) { - return data.message; - } - return data.toString(); - } - - public trace(message: string, data?: any): void { - this.logLevel('Trace', message, data); - } - - public info(message: string, data?: any): void { - this.logLevel('Info', message, data); - } - - public error(message: string, data?: any): void { - this.logLevel('Error', message, data); - } - - public logLevel(level: LogLevel, message: string, data?: any): void { - this.output.appendLine(`[${level} - ${this.now()}] ${message}`); - if (data) { - this.output.appendLine(this.data2String(data)); - } - } - - private now(): string { - const now = new Date(); - return padLeft(now.getUTCHours() + '', 2, '0') - + ':' + padLeft(now.getMinutes() + '', 2, '0') - + ':' + padLeft(now.getUTCSeconds() + '', 2, '0') + '.' + now.getMilliseconds(); - } -} - -function padLeft(s: string, n: number, pad = ' ') { - return pad.repeat(Math.max(0, n - s.length)) + s; -} - -const Logger = new Log(); +const Logger = vscode.window.createOutputChannel(vscode.l10n.t('Microsoft Authentication'), { log: true }); export default Logger; diff --git a/extensions/microsoft-authentication/src/utils.ts b/extensions/microsoft-authentication/src/utils.ts index 164f2236221..443bb2dc048 100644 --- a/extensions/microsoft-authentication/src/utils.ts +++ b/extensions/microsoft-authentication/src/utils.ts @@ -2,7 +2,40 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { env, UIKind, Uri } from 'vscode'; export function toBase64UrlEncoding(base64string: string) { return base64string.replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_'); // Need to use base64url encoding } + +const LOCALHOST_ADDRESSES = ['localhost', '127.0.0.1', '0:0:0:0:0:0:0:1', '::1']; +function isLocalhost(uri: Uri): boolean { + if (!/^https?$/i.test(uri.scheme)) { + return false; + } + const host = uri.authority.split(':')[0]; + return LOCALHOST_ADDRESSES.indexOf(host) >= 0; +} + +export function isSupportedEnvironment(uri: Uri): boolean { + if (env.uiKind === UIKind.Desktop) { + return true; + } + // local development (localhost:* or 127.0.0.1:*) + if (isLocalhost(uri)) { + return true; + } + // At this point we should only ever see https + if (uri.scheme !== 'https') { + return false; + } + + return ( + // vscode.dev & insiders.vscode.dev + /(?:^|\.)vscode\.dev$/.test(uri.authority) || + // github.dev & codespaces + /(?:^|\.)github\.dev$/.test(uri.authority) || + // github.dev/codespaces local setup (github.localhost) + /(?:^|\.)github\.localhost$/.test(uri.authority) + ); +} diff --git a/extensions/microsoft-authentication/tsconfig.json b/extensions/microsoft-authentication/tsconfig.json index 4b9d06d1847..7f930878523 100644 --- a/extensions/microsoft-authentication/tsconfig.json +++ b/extensions/microsoft-authentication/tsconfig.json @@ -22,6 +22,7 @@ "include": [ "src/**/*", "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.idToken.d.ts" + "../../src/vscode-dts/vscode.proposed.idToken.d.ts", + "../../src/vscode-dts/vscode.proposed.extensionLog.d.ts" ] } diff --git a/extensions/microsoft-authentication/yarn.lock b/extensions/microsoft-authentication/yarn.lock index b3ad2657f88..d66929ff7f6 100644 --- a/extensions/microsoft-authentication/yarn.lock +++ b/extensions/microsoft-authentication/yarn.lock @@ -2,6 +2,42 @@ # yarn lockfile v1 +"@microsoft/1ds-core-js@3.2.3", "@microsoft/1ds-core-js@^3.2.3": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.3.tgz#2217d92ec8b073caa4577a13f40ea3a5c4c4d4e7" + integrity sha512-796A8fd90oUKDRO7UXUT9BwZ3G+a9XzJj5v012FcCN/2qRhEsIV3x/0wkx2S08T4FiQEUPkB2uoYHpEjEneM7g== + dependencies: + "@microsoft/applicationinsights-core-js" "2.8.4" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/1ds-post-js@^3.2.3": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.3.tgz#1fa7d51615a44f289632ae8c588007ba943db216" + integrity sha512-tcGJQXXr2LYoBbIXPoUVe1KCF3OtBsuKDFL7BXfmNtuSGtWF0yejm6H83DrR8/cUIGMRMUP9lqNlqFGwDYiwAQ== + dependencies: + "@microsoft/1ds-core-js" "3.2.3" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/applicationinsights-core-js@2.8.4": + version "2.8.4" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.4.tgz#607e531bb241a8920d43960f68a7c76a6f9af596" + integrity sha512-FoA0FNOsFbJnLyTyQlYs6+HR7HMEa6nAOE6WOm9WVejBHMHQ/Bdb+hfVFi6slxwCimr/ner90jchi4/sIYdnyQ== + dependencies: + "@microsoft/applicationinsights-shims" "2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/applicationinsights-shims@2.0.1", "@microsoft/applicationinsights-shims@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.1.tgz#5d72fb7aaf4056c4fda54f9d7c93ccf8ca9bcbfd" + integrity sha512-G0MXf6R6HndRbDy9BbEj0zrLeuhwt2nsXk2zKtF0TnYo39KgYqhYC2ayIzKPTm2KAE+xzD7rgyLdZnrcRvt9WQ== + +"@microsoft/dynamicproto-js@^1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc" + integrity sha512-D1Oivw1A4bIXhzBIy3/BBPn3p2On+kpO2NiYt9shICDK7L/w+cR6FFBUsBZ05l6iqzTeL+Jm8lAYn0g6G7DmDg== + "@types/node-fetch@^2.5.7": version "2.5.7" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c" @@ -39,10 +75,13 @@ resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.0.0.tgz#165aae4819ad2174a17476dbe66feebd549556c0" integrity sha512-xSQfNcvOiE5f9dyd4Kzxbof1aTrLobL278pGLKOZI6esGfZ7ts9Ka16CzIN6Y8hFHE1C7jIBZokULhK1bOgjRw== -"@vscode/extension-telemetry@0.4.10": - version "0.4.10" - resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.4.10.tgz#be960c05bdcbea0933866346cf244acad6cac910" - integrity sha512-XgyUoWWRQExTmd9DynIIUQo1NPex/zIeetdUAXeBjVuW9ioojM1TcDaSqOa/5QLC7lx+oEXwSU1r0XSBgzyz6w== +"@vscode/extension-telemetry@0.6.2": + version "0.6.2" + resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.6.2.tgz#b86814ee680615730da94220c2b03ea9c3c14a8e" + integrity sha512-yb/wxLuaaCRcBAZtDCjNYSisAXz3FWsSqAha5nhHcYxx2ZPdQdWuZqVXGKq0ZpHVndBWWtK6XqtpCN2/HB4S1w== + dependencies: + "@microsoft/1ds-core-js" "^3.2.3" + "@microsoft/1ds-post-js" "^3.2.3" asynckit@^0.4.0: version "0.4.0" @@ -159,11 +198,6 @@ uuid@^8.2.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.2.0.tgz#cb10dd6b118e2dada7d0cd9730ba7417c93d920e" integrity sha512-CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q== -vscode-nls@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840" - integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA== - webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" diff --git a/extensions/notebook-renderers/package.json b/extensions/notebook-renderers/package.json index 15b6751e209..f78839bbeeb 100644 --- a/extensions/notebook-renderers/package.json +++ b/extensions/notebook-renderers/package.json @@ -17,7 +17,7 @@ "contributes": { "notebookRenderer": [ { - "id": "vscode-builtin-notebook-renderer", + "id": "vscode.builtin-renderer", "entrypoint": "./renderer-out/index.js", "displayName": "VS Code Builtin Notebook Output Renderer", "requiresMessaging": "never", diff --git a/extensions/notebook-renderers/src/ansi.ts b/extensions/notebook-renderers/src/ansi.ts index 185dd27276b..2a89d8d4b29 100644 --- a/extensions/notebook-renderers/src/ansi.ts +++ b/extensions/notebook-renderers/src/ansi.ts @@ -9,7 +9,7 @@ import { linkify } from './linkify'; export function handleANSIOutput(text: string): HTMLSpanElement { - let workspaceFolder = undefined; + const workspaceFolder = undefined; const root: HTMLSpanElement = document.createElement('span'); const textLength: number = text.length; diff --git a/extensions/notebook-renderers/src/color.ts b/extensions/notebook-renderers/src/color.ts index 2c01cae1071..9ad281d35c4 100644 --- a/extensions/notebook-renderers/src/color.ts +++ b/extensions/notebook-renderers/src/color.ts @@ -866,9 +866,7 @@ export class Color { private _toString?: string; toString(): string { - if (!this._toString) { - this._toString = Color.Format.CSS.format(this); - } + this._toString ??= Color.Format.CSS.format(this); return this._toString; } diff --git a/extensions/notebook-renderers/src/index.ts b/extensions/notebook-renderers/src/index.ts index 1d6d75aa4f7..61098afe4f3 100644 --- a/extensions/notebook-renderers/src/index.ts +++ b/extensions/notebook-renderers/src/index.ts @@ -10,13 +10,30 @@ interface IDisposable { dispose(): void; } +interface HtmlRenderingHook { + /** + * Invoked after the output item has been rendered but before it has been appended to the document. + * + * @return A new `HTMLElement` or `undefined` to continue using the provided element. + */ + postRender(outputItem: OutputItem, element: HTMLElement, signal: AbortSignal): HTMLElement | undefined | Promise; +} + +interface JavaScriptRenderingHook { + /** + * Invoked before the script is evaluated. + * + * @return A new string of JavaScript or `undefined` to continue using the provided string. + */ + preEvaluate(outputItem: OutputItem, element: HTMLElement, script: string, signal: AbortSignal): string | undefined | Promise; +} + function clearContainer(container: HTMLElement) { while (container.firstChild) { container.removeChild(container.firstChild); } } - function renderImage(outputInfo: OutputItem, element: HTMLElement): IDisposable { const blob = new Blob([outputInfo.data()], { type: outputInfo.mime }); const src = URL.createObjectURL(blob); @@ -64,21 +81,40 @@ const domEval = (container: Element) => { } }; -function renderHTML(outputInfo: OutputItem, container: HTMLElement): void { +async function renderHTML(outputInfo: OutputItem, container: HTMLElement, signal: AbortSignal, hooks: Iterable): Promise { clearContainer(container); + let element: HTMLElement = document.createElement('div'); const htmlContent = outputInfo.text(); - const element = document.createElement('div'); const trustedHtml = ttPolicy?.createHTML(htmlContent) ?? htmlContent; element.innerHTML = trustedHtml as string; + + for (const hook of hooks) { + element = (await hook.postRender(outputInfo, element, signal)) ?? element; + if (signal.aborted) { + return; + } + } + container.appendChild(element); domEval(element); } -function renderJavascript(outputInfo: OutputItem, container: HTMLElement): void { - const str = outputInfo.text(); - const scriptVal = ``; +async function renderJavascript(outputInfo: OutputItem, container: HTMLElement, signal: AbortSignal, hooks: Iterable): Promise { + let scriptText = outputInfo.text(); + + for (const hook of hooks) { + scriptText = (await hook.preEvaluate(outputInfo, container, scriptText, signal)) ?? scriptText; + if (signal.aborted) { + return; + } + } + + const script = document.createElement('script'); + script.type = 'module'; + script.textContent = scriptText; + const element = document.createElement('div'); - const trustedHtml = ttPolicy?.createHTML(scriptVal) ?? scriptVal; + const trustedHtml = ttPolicy?.createHTML(script.outerHTML) ?? script.outerHTML; element.innerHTML = trustedHtml as string; container.appendChild(element); domEval(element); @@ -162,11 +198,13 @@ function renderText(outputInfo: OutputItem, container: HTMLElement, ctx: Rendere const text = outputInfo.text(); truncatedArrayOfString(outputInfo.id, [text], ctx.settings.lineLimit, contentNode); container.appendChild(contentNode); - } export const activate: ActivationFunction = (ctx) => { const disposables = new Map(); + const htmlHooks = new Set(); + const jsHooks = new Set(); + const latestContext = ctx as (RendererContext & { readonly settings: { readonly lineLimit: number } }); const style = document.createElement('style'); @@ -210,28 +248,27 @@ export const activate: ActivationFunction = (ctx) => { } `; document.body.appendChild(style); + return { - renderOutputItem: (outputInfo, element) => { + renderOutputItem: async (outputInfo, element, signal?: AbortSignal) => { switch (outputInfo.mime) { case 'text/html': - case 'image/svg+xml': - { - if (!ctx.workspace.isTrusted) { - return; - } - - renderHTML(outputInfo, element); + case 'image/svg+xml': { + if (!ctx.workspace.isTrusted) { + return; } - break; - case 'application/javascript': - { - if (!ctx.workspace.isTrusted) { - return; - } - renderJavascript(outputInfo, element); - } + await renderHTML(outputInfo, element, signal!, htmlHooks); break; + } + case 'application/javascript': { + if (!ctx.workspace.isTrusted) { + return; + } + + renderJavascript(outputInfo, element, signal!, jsHooks); + break; + } case 'image/gif': case 'image/png': case 'image/jpeg': @@ -267,8 +304,6 @@ export const activate: ActivationFunction = (ctx) => { default: break; } - - }, disposeOutputItem: (id: string | undefined) => { if (id) { @@ -276,6 +311,22 @@ export const activate: ActivationFunction = (ctx) => { } else { disposables.forEach(d => d.dispose()); } + }, + experimental_registerHtmlRenderingHook: (hook: HtmlRenderingHook): IDisposable => { + htmlHooks.add(hook); + return { + dispose: () => { + htmlHooks.delete(hook); + } + }; + }, + experimental_registerJavaScriptRenderingHook: (hook: JavaScriptRenderingHook): IDisposable => { + jsHooks.add(hook); + return { + dispose: () => { + jsHooks.delete(hook); + } + }; } }; }; diff --git a/extensions/notebook-renderers/src/textHelper.ts b/extensions/notebook-renderers/src/textHelper.ts index 9daafb721f8..36edb961f1f 100644 --- a/extensions/notebook-renderers/src/textHelper.ts +++ b/extensions/notebook-renderers/src/textHelper.ts @@ -11,7 +11,7 @@ function generateViewMoreElement(outputId: string) { first.textContent = 'Output exceeds the '; const second = document.createElement('a'); second.textContent = 'size limit'; - second.href = `command:workbench.action.openSettings?["notebook.output.textLineLimit"]`; + second.href = `command:workbench.action.openSettings?%5B%22notebook.output.textLineLimit%22%5D`; const third = document.createElement('span'); third.textContent = '. Open the full output data'; const forth = document.createElement('a'); @@ -25,8 +25,8 @@ function generateViewMoreElement(outputId: string) { } export function truncatedArrayOfString(id: string, outputs: string[], linesLimit: number, container: HTMLElement) { - let buffer = outputs.join('\n').split(/\r\n|\r|\n/g); - let lineCount = buffer.length; + const buffer = outputs.join('\n').split(/\r\n|\r|\n/g); + const lineCount = buffer.length; if (lineCount < linesLimit) { const spanElement = handleANSIOutput(buffer.slice(0, linesLimit).join('\n')); diff --git a/extensions/notebook-renderers/tsconfig.json b/extensions/notebook-renderers/tsconfig.json index 23609811f3a..3472d5bbaa7 100644 --- a/extensions/notebook-renderers/tsconfig.json +++ b/extensions/notebook-renderers/tsconfig.json @@ -8,7 +8,6 @@ }, "include": [ "src/**/*", - "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.notebookEditorEdit.d.ts", + "../../src/vscode-dts/vscode.d.ts" ] } diff --git a/extensions/npm/package.json b/extensions/npm/package.json index 6df1a4835e7..cae1fd7eab1 100644 --- a/extensions/npm/package.json +++ b/extensions/npm/package.json @@ -22,7 +22,7 @@ "jsonc-parser": "^2.2.1", "minimatch": "^3.0.4", "request-light": "^0.5.7", - "vscode-nls": "^5.0.0", + "vscode-nls": "^5.2.0", "which": "^2.0.2", "which-pm": "^2.0.0" }, @@ -298,6 +298,12 @@ "tags": [ "usesOnlineServices" ] + }, + "npm.scriptHover": { + "type": "boolean", + "description": "%config.npm.scriptHover%", + "default": true, + "scope": "window" } } }, diff --git a/extensions/npm/package.nls.json b/extensions/npm/package.nls.json index b0a4f06c01f..44f1d00f0f4 100644 --- a/extensions/npm/package.nls.json +++ b/extensions/npm/package.nls.json @@ -15,6 +15,7 @@ "config.npm.scriptExplorerExclude": "An array of regular expressions that indicate which scripts should be excluded from the NPM Scripts view.", "config.npm.enableRunFromFolder": "Enable running npm scripts contained in a folder from the Explorer context menu.", "config.npm.fetchOnlinePackageInfo": "Fetch data from https://registry.npmjs.org and https://registry.bower.io to provide auto-completion and information on hover features on npm dependencies.", + "config.npm.scriptHover": "Display hover with 'Run' and 'Debug' commands for scripts.", "npm.parseError": "Npm task detection: failed to parse the file {0}", "taskdef.script": "The npm script to customize.", "taskdef.path": "The path to the folder of the package.json file that provides the script. Can be omitted.", diff --git a/extensions/npm/src/commands.ts b/extensions/npm/src/commands.ts index 6847f322631..e2489a7a58a 100644 --- a/extensions/npm/src/commands.ts +++ b/extensions/npm/src/commands.ts @@ -10,23 +10,23 @@ import { detectNpmScriptsForFolder, findScriptAtPosition, runScript, - FolderTaskItem + IFolderTaskItem } from './tasks'; const localize = nls.loadMessageBundle(); export function runSelectedScript(context: vscode.ExtensionContext) { - let editor = vscode.window.activeTextEditor; + const editor = vscode.window.activeTextEditor; if (!editor) { return; } - let document = editor.document; - let contents = document.getText(); - let script = findScriptAtPosition(editor.document, contents, editor.selection.anchor); + const document = editor.document; + const contents = document.getText(); + const script = findScriptAtPosition(editor.document, contents, editor.selection.anchor); if (script) { runScript(context, script, document); } else { - let message = localize('noScriptFound', 'Could not find a valid npm script at the selection.'); + const message = localize('noScriptFound', 'Could not find a valid npm script at the selection.'); vscode.window.showErrorMessage(message); } } @@ -37,17 +37,17 @@ export async function selectAndRunScriptFromFolder(context: vscode.ExtensionCont } const selectedFolder = selectedFolders[0]; - let taskList: FolderTaskItem[] = await detectNpmScriptsForFolder(context, selectedFolder); + const taskList: IFolderTaskItem[] = await detectNpmScriptsForFolder(context, selectedFolder); if (taskList && taskList.length > 0) { - const quickPick = vscode.window.createQuickPick(); + const quickPick = vscode.window.createQuickPick(); quickPick.title = 'Run NPM script in Folder'; quickPick.placeholder = 'Select an npm script'; quickPick.items = taskList; const toDispose: vscode.Disposable[] = []; - let pickPromise = new Promise((c) => { + const pickPromise = new Promise((c) => { toDispose.push(quickPick.onDidAccept(() => { toDispose.forEach(d => d.dispose()); c(quickPick.selectedItems[0]); @@ -58,7 +58,7 @@ export async function selectAndRunScriptFromFolder(context: vscode.ExtensionCont })); }); quickPick.show(); - let result = await pickPromise; + const result = await pickPromise; quickPick.dispose(); if (result) { vscode.tasks.executeTask(result.task); diff --git a/extensions/npm/src/features/packageJSONContribution.ts b/extensions/npm/src/features/packageJSONContribution.ts index ad638d7d4c2..093fea678bc 100644 --- a/extensions/npm/src/features/packageJSONContribution.ts +++ b/extensions/npm/src/features/packageJSONContribution.ts @@ -78,7 +78,7 @@ export class PackageJSONContribution implements IJSONContribution { if (currentWord.indexOf('/') !== -1) { return this.collectScopedPackages(currentWord, addValue, isLast, collector); } - for (let scope of this.knownScopes) { + for (const scope of this.knownScopes) { const proposal = new CompletionItem(scope); proposal.kind = CompletionItemKind.Property; proposal.insertText = new SnippetString().appendText(`"${scope}/`).appendTabstop().appendText('"'); @@ -146,14 +146,14 @@ export class PackageJSONContribution implements IJSONContribution { } private collectScopedPackages(currentWord: string, addValue: boolean, isLast: boolean, collector: ISuggestionsCollector): Thenable { - let segments = currentWord.split('/'); + const segments = currentWord.split('/'); if (segments.length === 2 && segments[0].length > 1) { - let scope = segments[0].substr(1); + const scope = segments[0].substr(1); let name = segments[1]; if (name.length < 4) { name = ''; } - let queryUrl = `https://registry.npmjs.com/-/v1/search?text=scope:${scope}%20${name}&size=250`; + const queryUrl = `https://registry.npmjs.com/-/v1/search?text=scope:${scope}%20${name}&size=250`; return this.xhr({ url: queryUrl, headers: { agent: USER_AGENT } @@ -163,7 +163,7 @@ export class PackageJSONContribution implements IJSONContribution { const obj = JSON.parse(success.responseText); if (obj && Array.isArray(obj.objects)) { const objects = <{ package: SearchPackageInfo }[]>obj.objects; - for (let object of objects) { + for (const object of objects) { this.processPackage(object.package, addValue, isLast, collector); } } @@ -286,7 +286,7 @@ export class PackageJSONContribution implements IJSONContribution { private npmView(npmCommandPath: string, pack: string, resource: Uri | undefined): Promise { return new Promise((resolve, _reject) => { const args = ['view', '--json', pack, 'description', 'dist-tags.latest', 'homepage', 'version']; - let cwd = resource && resource.scheme === 'file' ? dirname(resource.fsPath) : undefined; + const cwd = resource && resource.scheme === 'file' ? dirname(resource.fsPath) : undefined; cp.execFile(npmCommandPath, args, { cwd }, (error, stdout) => { if (!error) { try { @@ -314,9 +314,10 @@ export class PackageJSONContribution implements IJSONContribution { headers: { agent: USER_AGENT } }); const obj = JSON.parse(success.responseText); + const version = obj['dist-tags']?.latest || Object.keys(obj.versions).pop() || ''; return { description: obj.description || '', - version: Object.keys(obj.versions).pop(), + version, homepage: obj.homepage || '' }; } diff --git a/extensions/npm/src/npmMain.ts b/extensions/npm/src/npmMain.ts index 3788c94ea45..a8289599917 100644 --- a/extensions/npm/src/npmMain.ts +++ b/extensions/npm/src/npmMain.ts @@ -93,17 +93,17 @@ function canRunNpmInCurrentWorkspace() { let taskProvider: NpmTaskProvider; function registerTaskProvider(context: vscode.ExtensionContext): vscode.Disposable | undefined { if (vscode.workspace.workspaceFolders) { - let watcher = vscode.workspace.createFileSystemWatcher('**/package.json'); + const watcher = vscode.workspace.createFileSystemWatcher('**/package.json'); watcher.onDidChange((_e) => invalidateScriptCaches()); watcher.onDidDelete((_e) => invalidateScriptCaches()); watcher.onDidCreate((_e) => invalidateScriptCaches()); context.subscriptions.push(watcher); - let workspaceWatcher = vscode.workspace.onDidChangeWorkspaceFolders((_e) => invalidateScriptCaches()); + const workspaceWatcher = vscode.workspace.onDidChangeWorkspaceFolders((_e) => invalidateScriptCaches()); context.subscriptions.push(workspaceWatcher); taskProvider = new NpmTaskProvider(context); - let disposable = vscode.tasks.registerTaskProvider('npm', taskProvider); + const disposable = vscode.tasks.registerTaskProvider('npm', taskProvider); context.subscriptions.push(disposable); return disposable; } @@ -112,7 +112,7 @@ function registerTaskProvider(context: vscode.ExtensionContext): vscode.Disposab function registerExplorer(context: vscode.ExtensionContext): NpmScriptsTreeDataProvider | undefined { if (vscode.workspace.workspaceFolders) { - let treeDataProvider = new NpmScriptsTreeDataProvider(context, taskProvider!); + const treeDataProvider = new NpmScriptsTreeDataProvider(context, taskProvider!); const view = vscode.window.createTreeView('npm', { treeDataProvider: treeDataProvider, showCollapseAll: true }); context.subscriptions.push(view); return treeDataProvider; @@ -122,12 +122,12 @@ function registerExplorer(context: vscode.ExtensionContext): NpmScriptsTreeDataP function registerHoverProvider(context: vscode.ExtensionContext): NpmScriptHoverProvider | undefined { if (vscode.workspace.workspaceFolders) { - let npmSelector: vscode.DocumentSelector = { + const npmSelector: vscode.DocumentSelector = { language: 'json', scheme: 'file', pattern: '**/package.json' }; - let provider = new NpmScriptHoverProvider(context); + const provider = new NpmScriptHoverProvider(context); context.subscriptions.push(vscode.languages.registerHoverProvider(npmSelector, provider)); return provider; } diff --git a/extensions/npm/src/npmScriptLens.ts b/extensions/npm/src/npmScriptLens.ts index 067209da334..2834d3e7639 100644 --- a/extensions/npm/src/npmScriptLens.ts +++ b/extensions/npm/src/npmScriptLens.ts @@ -71,7 +71,7 @@ export class NpmScriptLensProvider implements CodeLensProvider, Disposable { return []; } - const title = localize('codelens.debug', '{0} Debug', '$(debug-start)'); + const title = '$(debug-start) ' + localize('codelens.debug', 'Debug'); const cwd = path.dirname(document.uri.fsPath); if (this.lensLocation === 'top') { return [ diff --git a/extensions/npm/src/npmView.ts b/extensions/npm/src/npmView.ts index 41e28e9bdf5..3ed572a06f9 100644 --- a/extensions/npm/src/npmView.ts +++ b/extensions/npm/src/npmView.ts @@ -14,10 +14,10 @@ import { import * as nls from 'vscode-nls'; import { readScripts } from './readScripts'; import { - createTask, getPackageManager, getTaskName, isAutoDetectionEnabled, isWorkspaceFolder, NpmTaskDefinition, + createTask, getPackageManager, getTaskName, isAutoDetectionEnabled, isWorkspaceFolder, INpmTaskDefinition, NpmTaskProvider, startDebugging, - TaskWithLocation + ITaskWithLocation } from './tasks'; const localize = nls.loadMessageBundle(); @@ -78,7 +78,7 @@ class NpmScript extends TreeItem { package: PackageJSON; taskLocation?: Location; - constructor(_context: ExtensionContext, packageJson: PackageJSON, task: TaskWithLocation) { + constructor(_context: ExtensionContext, packageJson: PackageJSON, task: ITaskWithLocation) { const name = packageJson.path.length > 0 ? task.task.name.substring(0, task.task.name.length - packageJson.path.length - 2) : task.task.name; @@ -180,7 +180,7 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider { if (!uri) { return; } - let task = await createTask(await getPackageManager(this.context, selection.folder.workspaceFolder.uri, true), 'install', ['install'], selection.folder.workspaceFolder, uri, undefined, []); + const task = await createTask(await getPackageManager(this.context, selection.folder.workspaceFolder.uri, true), 'install', ['install'], selection.folder.workspaceFolder, uri, undefined, []); tasks.executeTask(task); } @@ -194,8 +194,8 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider { if (!uri) { return; } - let document: TextDocument = await workspace.openTextDocument(uri); - let position = this.findScriptPosition(document, selection instanceof NpmScript ? selection : undefined) || new Position(0, 0); + const document: TextDocument = await workspace.openTextDocument(uri); + const position = this.findScriptPosition(document, selection instanceof NpmScript ? selection : undefined) || new Position(0, 0); await window.showTextDocument(document, { preserveFocus: true, selection: new Selection(position, position) }); } @@ -260,7 +260,7 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider { } private isInstallTask(task: Task): boolean { - let fullName = getTaskName('install', task.definition.path); + const fullName = getTaskName('install', task.definition.path); return fullName === task.name; } @@ -284,9 +284,9 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider { }); } - private buildTaskTree(tasks: TaskWithLocation[]): TaskTree { - let folders: Map = new Map(); - let packages: Map = new Map(); + private buildTaskTree(tasks: ITaskWithLocation[]): TaskTree { + const folders: Map = new Map(); + const packages: Map = new Map(); let folder = null; let packageJson = null; @@ -301,7 +301,7 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider { } const regularExpressions = (location && excludeConfig.has(location.uri.toString())) ? excludeConfig.get(location.uri.toString()) : undefined; - if (regularExpressions && regularExpressions.some((regularExpression) => (each.task.definition).script.match(regularExpression))) { + if (regularExpressions && regularExpressions.some((regularExpression) => (each.task.definition).script.match(regularExpression))) { return; } @@ -311,16 +311,16 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider { folder = new Folder(each.task.scope); folders.set(each.task.scope.name, folder); } - let definition: NpmTaskDefinition = each.task.definition; - let relativePath = definition.path ? definition.path : ''; - let fullPath = path.join(each.task.scope.name, relativePath); + const definition: INpmTaskDefinition = each.task.definition; + const relativePath = definition.path ? definition.path : ''; + const fullPath = path.join(each.task.scope.name, relativePath); packageJson = packages.get(fullPath); if (!packageJson) { packageJson = new PackageJSON(folder, relativePath); folder.addPackage(packageJson); packages.set(fullPath, packageJson); } - let script = new NpmScript(this.extensionContext, packageJson, each); + const script = new NpmScript(this.extensionContext, packageJson, each); packageJson.addScript(script); } }); diff --git a/extensions/npm/src/scriptHover.ts b/extensions/npm/src/scriptHover.ts index 02a2d4d5781..c96f3330d39 100644 --- a/extensions/npm/src/scriptHover.ts +++ b/extensions/npm/src/scriptHover.ts @@ -33,6 +33,7 @@ export function invalidateHoverScriptsCache(document?: TextDocument) { } export class NpmScriptHoverProvider implements HoverProvider { + private enabled: boolean; constructor(private context: ExtensionContext) { context.subscriptions.push(commands.registerCommand('npm.runScriptFromHover', this.runScriptFromHover, this)); @@ -40,9 +41,21 @@ export class NpmScriptHoverProvider implements HoverProvider { context.subscriptions.push(workspace.onDidChangeTextDocument((e) => { invalidateHoverScriptsCache(e.document); })); + + const isEnabled = () => workspace.getConfiguration('npm').get('scriptHover', true); + this.enabled = isEnabled(); + context.subscriptions.push(workspace.onDidChangeConfiguration((e) => { + if (e.affectsConfiguration('npm.scriptHover')) { + this.enabled = isEnabled(); + } + })); } public provideHover(document: TextDocument, position: Position, _token: CancellationToken): ProviderResult { + if (!this.enabled) { + return; + } + let hover: Hover | undefined = undefined; if (!cachedDocument || cachedDocument.fsPath !== document.uri.fsPath) { @@ -52,7 +65,7 @@ export class NpmScriptHoverProvider implements HoverProvider { cachedScripts?.scripts.forEach(({ name, nameRange }) => { if (nameRange.contains(position)) { - let contents: MarkdownString = new MarkdownString(); + const contents: MarkdownString = new MarkdownString(); contents.isTrusted = true; contents.appendMarkdown(this.createRunScriptMarkdown(name, document.uri)); contents.appendMarkdown(this.createDebugScriptMarkdown(name, document.uri)); @@ -63,7 +76,7 @@ export class NpmScriptHoverProvider implements HoverProvider { } private createRunScriptMarkdown(script: string, documentUri: Uri): string { - let args = { + const args = { documentUri: documentUri, script: script, }; @@ -90,7 +103,7 @@ export class NpmScriptHoverProvider implements HoverProvider { } private createMarkdownLink(label: string, cmd: string, args: any, tooltip: string, separator?: string): string { - let encodedArgs = encodeURIComponent(JSON.stringify(args)); + const encodedArgs = encodeURIComponent(JSON.stringify(args)); let prefix = ''; if (separator) { prefix = ` ${separator} `; @@ -99,19 +112,19 @@ export class NpmScriptHoverProvider implements HoverProvider { } public async runScriptFromHover(args: any) { - let script = args.script; - let documentUri = args.documentUri; - let folder = workspace.getWorkspaceFolder(documentUri); + const script = args.script; + const documentUri = args.documentUri; + const folder = workspace.getWorkspaceFolder(documentUri); if (folder) { - let task = await createTask(await getPackageManager(this.context, folder.uri), script, ['run', script], folder, documentUri); + const task = await createTask(await getPackageManager(this.context, folder.uri), script, ['run', script], folder, documentUri); await tasks.executeTask(task); } } public debugScriptFromHover(args: { script: string; documentUri: Uri }) { - let script = args.script; - let documentUri = args.documentUri; - let folder = workspace.getWorkspaceFolder(documentUri); + const script = args.script; + const documentUri = args.documentUri; + const folder = workspace.getWorkspaceFolder(documentUri); if (folder) { startDebugging(this.context, script, dirname(documentUri.fsPath), folder); } diff --git a/extensions/npm/src/tasks.ts b/extensions/npm/src/tasks.ts index d05b7bbc8bf..9eba265236a 100644 --- a/extensions/npm/src/tasks.ts +++ b/extensions/npm/src/tasks.ts @@ -12,33 +12,35 @@ import * as path from 'path'; import * as fs from 'fs'; import * as minimatch from 'minimatch'; import * as nls from 'vscode-nls'; +import { Utils } from 'vscode-uri'; import { findPreferredPM } from './preferred-pm'; import { readScripts } from './readScripts'; const localize = nls.loadMessageBundle(); +const excludeRegex = new RegExp('^(node_modules|.vscode-test)$', 'i'); -export interface NpmTaskDefinition extends TaskDefinition { +export interface INpmTaskDefinition extends TaskDefinition { script: string; path?: string; } -export interface FolderTaskItem extends QuickPickItem { +export interface IFolderTaskItem extends QuickPickItem { label: string; task: Task; } type AutoDetect = 'on' | 'off'; -let cachedTasks: TaskWithLocation[] | undefined = undefined; +let cachedTasks: ITaskWithLocation[] | undefined = undefined; const INSTALL_SCRIPT = 'install'; -export interface TaskLocation { +export interface ITaskLocation { document: Uri; line: Position; } -export interface TaskWithLocation { +export interface ITaskWithLocation { task: Task; location?: Location; } @@ -48,7 +50,7 @@ export class NpmTaskProvider implements TaskProvider { constructor(private context: ExtensionContext) { } - get tasksWithLocation(): Promise { + get tasksWithLocation(): Promise { return provideNpmScripts(this.context, false); } @@ -60,7 +62,7 @@ export class NpmTaskProvider implements TaskProvider { public async resolveTask(_task: Task): Promise { const npmTask = (_task.definition).script; if (npmTask) { - const kind: NpmTaskDefinition = (_task.definition); + const kind: INpmTaskDefinition = (_task.definition); let packageJsonUri: Uri; if (_task.scope === undefined || _task.scope === TaskScope.Global || _task.scope === TaskScope.Workspace) { // scope is required to be a WorkspaceFolder for resolveTask @@ -87,7 +89,7 @@ export function invalidateTasksCache() { const buildNames: string[] = ['build', 'compile', 'watch']; function isBuildTask(name: string): boolean { - for (let buildName of buildNames) { + for (const buildName of buildNames) { if (name.indexOf(buildName) !== -1) { return true; } @@ -97,7 +99,7 @@ function isBuildTask(name: string): boolean { const testNames: string[] = ['test']; function isTestTask(name: string): boolean { - for (let testName of testNames) { + for (const testName of testNames) { if (name === testName) { return true; } @@ -150,15 +152,15 @@ export async function getPackageManager(extensionContext: ExtensionContext, fold } export async function hasNpmScripts(): Promise { - let folders = workspace.workspaceFolders; + const folders = workspace.workspaceFolders; if (!folders) { return false; } try { for (const folder of folders) { - if (isAutoDetectionEnabled(folder)) { - let relativePattern = new RelativePattern(folder, '**/package.json'); - let paths = await workspace.findFiles(relativePattern, '**/node_modules/**'); + if (isAutoDetectionEnabled(folder) && !excludeRegex.test(Utils.basename(folder.uri))) { + const relativePattern = new RelativePattern(folder, '**/package.json'); + const paths = await workspace.findFiles(relativePattern, '**/node_modules/**'); if (paths.length > 0) { return true; } @@ -170,24 +172,24 @@ export async function hasNpmScripts(): Promise { } } -async function detectNpmScripts(context: ExtensionContext, showWarning: boolean): Promise { +async function detectNpmScripts(context: ExtensionContext, showWarning: boolean): Promise { - let emptyTasks: TaskWithLocation[] = []; - let allTasks: TaskWithLocation[] = []; - let visitedPackageJsonFiles: Set = new Set(); + const emptyTasks: ITaskWithLocation[] = []; + const allTasks: ITaskWithLocation[] = []; + const visitedPackageJsonFiles: Set = new Set(); - let folders = workspace.workspaceFolders; + const folders = workspace.workspaceFolders; if (!folders) { return emptyTasks; } try { for (const folder of folders) { - if (isAutoDetectionEnabled(folder)) { - let relativePattern = new RelativePattern(folder, '**/package.json'); - let paths = await workspace.findFiles(relativePattern, '**/{node_modules,.vscode-test}/**'); + if (isAutoDetectionEnabled(folder) && !excludeRegex.test(Utils.basename(folder.uri))) { + const relativePattern = new RelativePattern(folder, '**/package.json'); + const paths = await workspace.findFiles(relativePattern, '**/{node_modules,.vscode-test}/**'); for (const path of paths) { if (!isExcluded(folder, path) && !visitedPackageJsonFiles.has(path.fsPath)) { - let tasks = await provideNpmScriptsForFolder(context, path, showWarning); + const tasks = await provideNpmScriptsForFolder(context, path, showWarning); visitedPackageJsonFiles.add(path.fsPath); allTasks.push(...tasks); } @@ -201,18 +203,21 @@ async function detectNpmScripts(context: ExtensionContext, showWarning: boolean) } -export async function detectNpmScriptsForFolder(context: ExtensionContext, folder: Uri): Promise { +export async function detectNpmScriptsForFolder(context: ExtensionContext, folder: Uri): Promise { - let folderTasks: FolderTaskItem[] = []; + const folderTasks: IFolderTaskItem[] = []; try { - let relativePattern = new RelativePattern(folder.fsPath, '**/package.json'); - let paths = await workspace.findFiles(relativePattern, '**/node_modules/**'); + if (excludeRegex.test(Utils.basename(folder))) { + return folderTasks; + } + const relativePattern = new RelativePattern(folder.fsPath, '**/package.json'); + const paths = await workspace.findFiles(relativePattern, '**/node_modules/**'); - let visitedPackageJsonFiles: Set = new Set(); + const visitedPackageJsonFiles: Set = new Set(); for (const path of paths) { if (!visitedPackageJsonFiles.has(path.fsPath)) { - let tasks = await provideNpmScriptsForFolder(context, path, true); + const tasks = await provideNpmScriptsForFolder(context, path, true); visitedPackageJsonFiles.add(path.fsPath); folderTasks.push(...tasks.map(t => ({ label: t.task.name, task: t.task }))); } @@ -223,7 +228,7 @@ export async function detectNpmScriptsForFolder(context: ExtensionContext, folde } } -export async function provideNpmScripts(context: ExtensionContext, showWarning: boolean): Promise { +export async function provideNpmScripts(context: ExtensionContext, showWarning: boolean): Promise { if (!cachedTasks) { cachedTasks = await detectNpmScripts(context, showWarning); } @@ -239,12 +244,12 @@ function isExcluded(folder: WorkspaceFolder, packageJsonUri: Uri) { return minimatch(path, pattern, { dot: true }); } - let exclude = workspace.getConfiguration('npm', folder.uri).get('exclude'); - let packageJsonFolder = path.dirname(packageJsonUri.fsPath); + const exclude = workspace.getConfiguration('npm', folder.uri).get('exclude'); + const packageJsonFolder = path.dirname(packageJsonUri.fsPath); if (exclude) { if (Array.isArray(exclude)) { - for (let pattern of exclude) { + for (const pattern of exclude) { if (testForExclusionPattern(packageJsonFolder, pattern)) { return true; } @@ -257,23 +262,23 @@ function isExcluded(folder: WorkspaceFolder, packageJsonUri: Uri) { } function isDebugScript(script: string): boolean { - let match = script.match(/--(inspect|debug)(-brk)?(=((\[[0-9a-fA-F:]*\]|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z0-9\.]*):)?(\d+))?/); + const match = script.match(/--(inspect|debug)(-brk)?(=((\[[0-9a-fA-F:]*\]|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z0-9\.]*):)?(\d+))?/); return match !== null; } -async function provideNpmScriptsForFolder(context: ExtensionContext, packageJsonUri: Uri, showWarning: boolean): Promise { - let emptyTasks: TaskWithLocation[] = []; +async function provideNpmScriptsForFolder(context: ExtensionContext, packageJsonUri: Uri, showWarning: boolean): Promise { + const emptyTasks: ITaskWithLocation[] = []; - let folder = workspace.getWorkspaceFolder(packageJsonUri); + const folder = workspace.getWorkspaceFolder(packageJsonUri); if (!folder) { return emptyTasks; } - let scripts = await getScripts(packageJsonUri); + const scripts = await getScripts(packageJsonUri); if (!scripts) { return emptyTasks; } - const result: TaskWithLocation[] = []; + const result: ITaskWithLocation[] = []; const packageManager = await getPackageManager(context, folder.uri, showWarning); @@ -282,8 +287,9 @@ async function provideNpmScriptsForFolder(context: ExtensionContext, packageJson result.push({ task, location: new Location(packageJsonUri, nameRange) }); } - // always add npm install (without a problem matcher) - result.push({ task: await createTask(packageManager, INSTALL_SCRIPT, [INSTALL_SCRIPT], folder, packageJsonUri, 'install dependencies from package', []) }); + if (!workspace.getConfiguration('npm', folder).get('scriptExplorerExclude', []).find(e => e.includes(INSTALL_SCRIPT))) { + result.push({ task: await createTask(packageManager, INSTALL_SCRIPT, [INSTALL_SCRIPT], folder, packageJsonUri, 'install dependencies from package', []) }); + } return result; } @@ -294,8 +300,8 @@ export function getTaskName(script: string, relativePath: string | undefined) { return script; } -export async function createTask(packageManager: string, script: NpmTaskDefinition | string, cmd: string[], folder: WorkspaceFolder, packageJsonUri: Uri, scriptValue?: string, matcher?: any): Promise { - let kind: NpmTaskDefinition; +export async function createTask(packageManager: string, script: INpmTaskDefinition | string, cmd: string[], folder: WorkspaceFolder, packageJsonUri: Uri, scriptValue?: string, matcher?: any): Promise { + let kind: INpmTaskDefinition; if (typeof script === 'string') { kind = { type: 'npm', script: script }; } else { @@ -318,17 +324,17 @@ export async function createTask(packageManager: string, script: NpmTaskDefiniti } function getRelativePath(packageJsonUri: Uri): string { - let rootUri = folder.uri; - let absolutePath = packageJsonUri.path.substring(0, packageJsonUri.path.length - 'package.json'.length); + const rootUri = folder.uri; + const absolutePath = packageJsonUri.path.substring(0, packageJsonUri.path.length - 'package.json'.length); return absolutePath.substring(rootUri.path.length + 1); } - let relativePackageJson = getRelativePath(packageJsonUri); + const relativePackageJson = getRelativePath(packageJsonUri); if (relativePackageJson.length && !kind.path) { kind.path = relativePackageJson.substring(0, relativePackageJson.length - 1); } - let taskName = getTaskName(kind.script, relativePackageJson); - let cwd = path.dirname(packageJsonUri.fsPath); + const taskName = getTaskName(kind.script, relativePackageJson); + const cwd = path.dirname(packageJsonUri.fsPath); const task = new Task(kind, folder, taskName, 'npm', new ShellExecution(packageManager, getCommandLine(cmd), { cwd: cwd }), matcher); task.detail = scriptValue; @@ -368,13 +374,13 @@ export async function hasPackageJson(): Promise { } async function hasRootPackageJson(): Promise { - let folders = workspace.workspaceFolders; + const folders = workspace.workspaceFolders; if (!folders) { return false; } for (const folder of folders) { if (folder.uri.scheme === 'file') { - let packageJson = path.join(folder.uri.fsPath, 'package.json'); + const packageJson = path.join(folder.uri.fsPath, 'package.json'); if (await exists(packageJson)) { return true; } @@ -392,8 +398,8 @@ async function exists(file: string): Promise { } export async function runScript(context: ExtensionContext, script: string, document: TextDocument) { - let uri = document.uri; - let folder = workspace.getWorkspaceFolder(uri); + const uri = document.uri; + const folder = workspace.getWorkspaceFolder(uri); if (folder) { const task = await createTask(await getPackageManager(context, folder.uri), script, ['run', script], folder, uri); tasks.executeTask(task); @@ -432,7 +438,7 @@ export async function getScripts(packageJsonUri: Uri) { return undefined; } - let packageJson = packageJsonUri.fsPath; + const packageJson = packageJsonUri.fsPath; if (!await exists(packageJson)) { return undefined; } @@ -441,7 +447,7 @@ export async function getScripts(packageJsonUri: Uri) { const document: TextDocument = await workspace.openTextDocument(packageJsonUri); return readScripts(document); } catch (e) { - let localizedParseError = localize('npm.parseError', 'Npm task detection: failed to parse the file {0}', packageJsonUri.fsPath); + const localizedParseError = localize('npm.parseError', 'Npm task detection: failed to parse the file {0}', packageJsonUri.fsPath); throw new Error(localizedParseError); } } diff --git a/extensions/npm/yarn.lock b/extensions/npm/yarn.lock index bba9ffdbf39..bfd3b4b3de1 100644 --- a/extensions/npm/yarn.lock +++ b/extensions/npm/yarn.lock @@ -192,10 +192,10 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -vscode-nls@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840" - integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA== +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== which-pm@^2.0.0: version "2.0.0" diff --git a/extensions/objective-c/build/update-grammars.js b/extensions/objective-c/build/update-grammars.js index f4713494fe4..45d2490532d 100644 --- a/extensions/objective-c/build/update-grammars.js +++ b/extensions/objective-c/build/update-grammars.js @@ -6,6 +6,9 @@ var updateGrammar = require('vscode-grammar-updater'); -updateGrammar.update('jeff-hykin/cpp-textmate-grammar', 'syntaxes/objc.tmLanguage.json', './syntaxes/objective-c.tmLanguage.json', undefined, 'master', 'source/languages/cpp'); -updateGrammar.update('jeff-hykin/cpp-textmate-grammar', 'syntaxes/objcpp.tmLanguage.json', './syntaxes/objective-c++.tmLanguage.json', undefined, 'master', 'source/languages/cpp'); +async function updateGrammars() { + await updateGrammar.update('jeff-hykin/better-objcpp-syntax', 'autogenerated/objcpp.tmLanguage.json', './syntaxes/objective-c++.tmLanguage.json', undefined, 'master'); + await updateGrammar.update('jeff-hykin/better-objc-syntax', 'autogenerated/objc.tmLanguage.json', './syntaxes/objective-c.tmLanguage.json', undefined, 'master'); +} +updateGrammars(); diff --git a/extensions/objective-c/cgmanifest.json b/extensions/objective-c/cgmanifest.json index b46a4519f3f..597202cd818 100644 --- a/extensions/objective-c/cgmanifest.json +++ b/extensions/objective-c/cgmanifest.json @@ -4,13 +4,26 @@ "component": { "type": "git", "git": { - "name": "jeff-hykin/cpp-textmate-grammar", - "repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar", - "commitHash": "0ef79f098ed80ce5a86be4ed40f99ebcdbac4895" + "name": "jeff-hykin/better-objcpp-syntax", + "repositoryUrl": "https://github.com/jeff-hykin/better-objcpp-syntax", + "commitHash": "5a7eb15eee382dd5aa388bc04fdb60a0d2128e14" } }, "license": "MIT", - "version": "1.12.11", + "version": "0.1.0", + "description": "The files syntaxes/objective-c.tmLanguage.json and syntaxes/objective-c++.tmLanguage.json were derived from the language package https://github.com/jeff-hykin/cpp-textmate-grammar." + }, + { + "component": { + "type": "git", + "git": { + "name": "jeff-hykin/better-objc-syntax", + "repositoryUrl": "https://github.com/jeff-hykin/better-objc-syntax", + "commitHash": "119b75fb1f4d3e8726fa62588e3b935e0b719294" + } + }, + "license": "MIT", + "version": "0.2.0", "description": "The files syntaxes/objective-c.tmLanguage.json and syntaxes/objective-c++.tmLanguage.json were derived from the language package https://github.com/jeff-hykin/cpp-textmate-grammar." } ], diff --git a/extensions/objective-c/syntaxes/objective-c++.tmLanguage.json b/extensions/objective-c/syntaxes/objective-c++.tmLanguage.json index da1ebc1eb0e..cca48e01e68 100644 --- a/extensions/objective-c/syntaxes/objective-c++.tmLanguage.json +++ b/extensions/objective-c/syntaxes/objective-c++.tmLanguage.json @@ -1,10 +1,10 @@ { "information_for_contributors": [ - "This file has been converted from https://github.com/jeff-hykin/cpp-textmate-grammar/blob/master/syntaxes/objcpp.tmLanguage.json", + "This file has been converted from https://github.com/jeff-hykin/better-objcpp-syntax/blob/master/autogenerated/objcpp.tmLanguage.json", "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/0ef79f098ed80ce5a86be4ed40f99ebcdbac4895", + "version": "https://github.com/jeff-hykin/better-objcpp-syntax/commit/5a7eb15eee382dd5aa388bc04fdb60a0d2128e14", "name": "Objective-C++", "scopeName": "source.objcpp", "patterns": [ @@ -12,6 +12,104 @@ "include": "#cpp_lang" }, { + "include": "#anonymous_pattern_1" + }, + { + "include": "#anonymous_pattern_2" + }, + { + "include": "#anonymous_pattern_3" + }, + { + "include": "#anonymous_pattern_4" + }, + { + "include": "#anonymous_pattern_5" + }, + { + "include": "#apple_foundation_functional_macros" + }, + { + "include": "#anonymous_pattern_7" + }, + { + "include": "#anonymous_pattern_8" + }, + { + "include": "#anonymous_pattern_9" + }, + { + "include": "#anonymous_pattern_10" + }, + { + "include": "#anonymous_pattern_11" + }, + { + "include": "#anonymous_pattern_12" + }, + { + "include": "#anonymous_pattern_13" + }, + { + "include": "#anonymous_pattern_14" + }, + { + "include": "#anonymous_pattern_15" + }, + { + "include": "#anonymous_pattern_16" + }, + { + "include": "#anonymous_pattern_17" + }, + { + "include": "#anonymous_pattern_18" + }, + { + "include": "#anonymous_pattern_19" + }, + { + "include": "#anonymous_pattern_20" + }, + { + "include": "#anonymous_pattern_21" + }, + { + "include": "#anonymous_pattern_22" + }, + { + "include": "#anonymous_pattern_23" + }, + { + "include": "#anonymous_pattern_24" + }, + { + "include": "#anonymous_pattern_25" + }, + { + "include": "#anonymous_pattern_26" + }, + { + "include": "#anonymous_pattern_27" + }, + { + "include": "#anonymous_pattern_28" + }, + { + "include": "#anonymous_pattern_29" + }, + { + "include": "#anonymous_pattern_30" + }, + { + "include": "#bracketed_content" + }, + { + "include": "#c_lang" + } + ], + "repository": { + "anonymous_pattern_1": { "begin": "((@)(interface|protocol))(?!.+;)\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*((:)(?:\\s*)([A-Za-z][A-Za-z0-9]*))?(\\s|\\n)?", "captures": { "1": { @@ -45,105 +143,7 @@ } ] }, - { - "begin": "((@)(implementation))\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*(?::\\s*([A-Za-z][A-Za-z0-9]*))?", - "captures": { - "1": { - "name": "storage.type.objcpp" - }, - "2": { - "name": "punctuation.definition.storage.type.objcpp" - }, - "4": { - "name": "entity.name.type.objcpp" - }, - "5": { - "name": "entity.other.inherited-class.objcpp" - } - }, - "contentName": "meta.scope.implementation.objcpp", - "end": "((@)end)\\b", - "name": "meta.implementation.objcpp", - "patterns": [ - { - "include": "#implementation_innards" - } - ] - }, - { - "begin": "@\"", - "beginCaptures": { - "0": { - "name": "punctuation.definition.string.begin.objcpp" - } - }, - "end": "\"", - "endCaptures": { - "0": { - "name": "punctuation.definition.string.end.objcpp" - } - }, - "name": "string.quoted.double.objcpp", - "patterns": [ - { - "include": "#string_escaped_char" - }, - { - "match": "(?x)%\n\t\t\t\t\t\t(\\d+\\$)? # field (argument #)\n\t\t\t\t\t\t[#0\\- +']* # flags\n\t\t\t\t\t\t((-?\\d+)|\\*(-?\\d+\\$)?)? # minimum field width\n\t\t\t\t\t\t(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)? # precision\n\t\t\t\t\t\t[@] # conversion type\n\t\t\t\t\t", - "name": "constant.other.placeholder.objcpp" - }, - { - "include": "#string_placeholder" - } - ] - }, - { - "begin": "\\b(id)\\s*(?=<)", - "beginCaptures": { - "1": { - "name": "storage.type.objcpp" - } - }, - "end": "(?<=>)", - "name": "meta.id-with-protocol.objcpp", - "patterns": [ - { - "include": "#protocol_list" - } - ] - }, - { - "match": "\\b(NS_DURING|NS_HANDLER|NS_ENDHANDLER)\\b", - "name": "keyword.control.macro.objcpp" - }, - { - "captures": { - "1": { - "name": "punctuation.definition.keyword.objcpp" - } - }, - "match": "(@)(try|catch|finally|throw)\\b", - "name": "keyword.control.exception.objcpp" - }, - { - "captures": { - "1": { - "name": "punctuation.definition.keyword.objcpp" - } - }, - "match": "(@)(synchronized)\\b", - "name": "keyword.control.synchronize.objcpp" - }, - { - "captures": { - "1": { - "name": "punctuation.definition.keyword.objcpp" - } - }, - "match": "(@)(required|optional)\\b", - "name": "keyword.control.protocol-specification.objcpp" - }, - { + "anonymous_pattern_10": { "captures": { "1": { "name": "punctuation.definition.keyword.objcpp" @@ -152,15 +152,15 @@ "match": "(@)(defs|encode)\\b", "name": "keyword.other.objcpp" }, - { + "anonymous_pattern_11": { "match": "\\bid\\b", "name": "storage.type.id.objcpp" }, - { + "anonymous_pattern_12": { "match": "\\b(IBOutlet|IBAction|BOOL|SEL|id|unichar|IMP|Class|instancetype)\\b", "name": "storage.type.objcpp" }, - { + "anonymous_pattern_13": { "captures": { "1": { "name": "punctuation.definition.storage.type.objcpp" @@ -169,7 +169,7 @@ "match": "(@)(class|protocol)\\b", "name": "storage.type.objcpp" }, - { + "anonymous_pattern_14": { "begin": "((@)selector)\\s*(\\()", "beginCaptures": { "1": { @@ -202,7 +202,7 @@ } ] }, - { + "anonymous_pattern_15": { "captures": { "1": { "name": "punctuation.definition.storage.modifier.objcpp" @@ -211,15 +211,15 @@ "match": "(@)(synchronized|public|package|private|protected)\\b", "name": "storage.modifier.objcpp" }, - { + "anonymous_pattern_16": { "match": "\\b(YES|NO|Nil|nil)\\b", "name": "constant.language.objcpp" }, - { + "anonymous_pattern_17": { "match": "\\bNSApp\\b", "name": "support.variable.foundation.objcpp" }, - { + "anonymous_pattern_18": { "captures": { "1": { "name": "punctuation.whitespace.support.function.cocoa.leopard.objcpp" @@ -230,7 +230,7 @@ }, "match": "(\\s*)\\b(NS(Rect(ToCGRect|FromCGRect)|MakeCollectable|S(tringFromProtocol|ize(ToCGSize|FromCGSize))|Draw(NinePartImage|ThreePartImage)|P(oint(ToCGPoint|FromCGPoint)|rotocolFromString)|EventMaskFromType|Value))\\b" }, - { + "anonymous_pattern_19": { "captures": { "1": { "name": "punctuation.whitespace.support.function.leading.cocoa.objcpp" @@ -241,58 +241,171 @@ }, "match": "(\\s*)\\b(NS(R(ound(DownToMultipleOfPageSize|UpToMultipleOfPageSize)|un(CriticalAlertPanel(RelativeToWindow)?|InformationalAlertPanel(RelativeToWindow)?|AlertPanel(RelativeToWindow)?)|e(set(MapTable|HashTable)|c(ycleZone|t(Clip(List)?|F(ill(UsingOperation|List(UsingOperation|With(Grays|Colors(UsingOperation)?))?)?|romString))|ordAllocationEvent)|turnAddress|leaseAlertPanel|a(dPixel|l(MemoryAvailable|locateCollectable))|gisterServicesProvider)|angeFromString)|Get(SizeAndAlignment|CriticalAlertPanel|InformationalAlertPanel|UncaughtExceptionHandler|FileType(s)?|WindowServerMemory|AlertPanel)|M(i(n(X|Y)|d(X|Y))|ouseInRect|a(p(Remove|Get|Member|Insert(IfAbsent|KnownAbsent)?)|ke(R(ect|ange)|Size|Point)|x(Range|X|Y)))|B(itsPer(SampleFromDepth|PixelFromDepth)|e(stDepth|ep|gin(CriticalAlertSheet|InformationalAlertSheet|AlertSheet)))|S(ho(uldRetainWithZone|w(sServicesMenuItem|AnimationEffect))|tringFrom(R(ect|ange)|MapTable|S(ize|elector)|HashTable|Class|Point)|izeFromString|e(t(ShowsServicesMenuItem|ZoneName|UncaughtExceptionHandler|FocusRingStyle)|lectorFromString|archPathForDirectoriesInDomains)|wap(Big(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|Short|Host(ShortTo(Big|Little)|IntTo(Big|Little)|DoubleTo(Big|Little)|FloatTo(Big|Little)|Long(To(Big|Little)|LongTo(Big|Little)))|Int|Double|Float|L(ittle(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|ong(Long)?)))|H(ighlightRect|o(stByteOrder|meDirectory(ForUser)?)|eight|ash(Remove|Get|Insert(IfAbsent|KnownAbsent)?)|FSType(CodeFromFileType|OfFile))|N(umberOfColorComponents|ext(MapEnumeratorPair|HashEnumeratorItem))|C(o(n(tainsRect|vert(GlyphsToPackedGlyphs|Swapped(DoubleToHost|FloatToHost)|Host(DoubleToSwapped|FloatToSwapped)))|unt(MapTable|HashTable|Frames|Windows(ForContext)?)|py(M(emoryPages|apTableWithZone)|Bits|HashTableWithZone|Object)|lorSpaceFromDepth|mpare(MapTables|HashTables))|lassFromString|reate(MapTable(WithZone)?|HashTable(WithZone)?|Zone|File(namePboardType|ContentsPboardType)))|TemporaryDirectory|I(s(ControllerMarker|EmptyRect|FreedObject)|n(setRect|crementExtraRefCount|te(r(sect(sRect|ionR(ect|ange))|faceStyleForKey)|gralRect)))|Zone(Realloc|Malloc|Name|Calloc|Fr(omPointer|ee))|O(penStepRootDirectory|ffsetRect)|D(i(sableScreenUpdates|videRect)|ottedFrameRect|e(c(imal(Round|Multiply|S(tring|ubtract)|Normalize|Co(py|mpa(ct|re))|IsNotANumber|Divide|Power|Add)|rementExtraRefCountWasZero)|faultMallocZone|allocate(MemoryPages|Object))|raw(Gr(oove|ayBezel)|B(itmap|utton)|ColorTiledRects|TiledRects|DarkBezel|W(hiteBezel|indowBackground)|LightBezel))|U(serName|n(ionR(ect|ange)|registerServicesProvider)|pdateDynamicServices)|Java(Bundle(Setup|Cleanup)|Setup(VirtualMachine)?|Needs(ToLoadClasses|VirtualMachine)|ClassesF(orBundle|romPath)|ObjectNamedInPath|ProvidesClasses)|P(oint(InRect|FromString)|erformService|lanarFromDepth|ageSize)|E(n(d(MapTableEnumeration|HashTableEnumeration)|umerate(MapTable|HashTable)|ableScreenUpdates)|qual(R(ects|anges)|Sizes|Points)|raseRect|xtraRefCount)|F(ileTypeForHFSTypeCode|ullUserName|r(ee(MapTable|HashTable)|ame(Rect(WithWidth(UsingOperation)?)?|Address)))|Wi(ndowList(ForContext)?|dth)|Lo(cationInRange|g(v|PageSize)?)|A(ccessibility(R(oleDescription(ForUIElement)?|aiseBadArgumentException)|Unignored(Children(ForOnlyChild)?|Descendant|Ancestor)|PostNotification|ActionDescription)|pplication(Main|Load)|vailableWindowDepths|ll(MapTable(Values|Keys)|HashTableObjects|ocate(MemoryPages|Collectable|Object)))))\\b" }, - { + "anonymous_pattern_2": { + "begin": "((@)(implementation))\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*(?::\\s*([A-Za-z][A-Za-z0-9]*))?", + "captures": { + "1": { + "name": "storage.type.objcpp" + }, + "2": { + "name": "punctuation.definition.storage.type.objcpp" + }, + "4": { + "name": "entity.name.type.objcpp" + }, + "5": { + "name": "entity.other.inherited-class.objcpp" + } + }, + "contentName": "meta.scope.implementation.objcpp", + "end": "((@)end)\\b", + "name": "meta.implementation.objcpp", + "patterns": [ + { + "include": "#implementation_innards" + } + ] + }, + "anonymous_pattern_20": { "match": "\\bNS(RuleEditor|G(arbageCollector|radient)|MapTable|HashTable|Co(ndition|llectionView(Item)?)|T(oolbarItemGroup|extInputClient|r(eeNode|ackingArea))|InvocationOperation|Operation(Queue)?|D(ictionaryController|ockTile)|P(ointer(Functions|Array)|athC(o(ntrol(Delegate)?|mponentCell)|ell(Delegate)?)|r(intPanelAccessorizing|edicateEditor(RowTemplate)?))|ViewController|FastEnumeration|Animat(ionContext|ablePropertyContainer))\\b", "name": "support.class.cocoa.leopard.objcpp" }, - { + "anonymous_pattern_21": { "match": "\\bNS(R(u(nLoop|ler(Marker|View))|e(sponder|cursiveLock|lativeSpecifier)|an(domSpecifier|geSpecifier))|G(etCommand|lyph(Generator|Storage|Info)|raphicsContext)|XML(Node|D(ocument|TD(Node)?)|Parser|Element)|M(iddleSpecifier|ov(ie(View)?|eCommand)|utable(S(tring|et)|C(haracterSet|opying)|IndexSet|D(ictionary|ata)|URLRequest|ParagraphStyle|A(ttributedString|rray))|e(ssagePort(NameServer)?|nu(Item(Cell)?|View)?|t(hodSignature|adata(Item|Query(ResultGroup|AttributeValueTuple)?)))|a(ch(BootstrapServer|Port)|trix))|B(itmapImageRep|ox|u(ndle|tton(Cell)?)|ezierPath|rowser(Cell)?)|S(hadow|c(anner|r(ipt(SuiteRegistry|C(o(ercionHandler|mmand(Description)?)|lassDescription)|ObjectSpecifier|ExecutionContext|WhoseTest)|oll(er|View)|een))|t(epper(Cell)?|atus(Bar|Item)|r(ing|eam))|imple(HorizontalTypesetter|CString)|o(cketPort(NameServer)?|und|rtDescriptor)|p(e(cifierTest|ech(Recognizer|Synthesizer)|ll(Server|Checker))|litView)|e(cureTextField(Cell)?|t(Command)?|archField(Cell)?|rializer|gmentedC(ontrol|ell))|lider(Cell)?|avePanel)|H(ost|TTP(Cookie(Storage)?|URLResponse)|elpManager)|N(ib(Con(nector|trolConnector)|OutletConnector)?|otification(Center|Queue)?|u(ll|mber(Formatter)?)|etService(Browser)?|ameSpecifier)|C(ha(ngeSpelling|racterSet)|o(n(stantString|nection|trol(ler)?|ditionLock)|d(ing|er)|unt(Command|edSet)|pying|lor(Space|P(ick(ing(Custom|Default)|er)|anel)|Well|List)?|m(p(oundPredicate|arisonPredicate)|boBox(Cell)?))|u(stomImageRep|rsor)|IImageRep|ell|l(ipView|o(seCommand|neCommand)|assDescription)|a(ched(ImageRep|URLResponse)|lendar(Date)?)|reateCommand)|T(hread|ypesetter|ime(Zone|r)|o(olbar(Item(Validations)?)?|kenField(Cell)?)|ext(Block|Storage|Container|Tab(le(Block)?)?|Input|View|Field(Cell)?|List|Attachment(Cell)?)?|a(sk|b(le(Header(Cell|View)|Column|View)|View(Item)?))|reeController)|I(n(dex(S(pecifier|et)|Path)|put(Manager|S(tream|erv(iceProvider|er(MouseTracker)?)))|vocation)|gnoreMisspelledWords|mage(Rep|Cell|View)?)|O(ut(putStream|lineView)|pen(GL(Context|Pixel(Buffer|Format)|View)|Panel)|bj(CTypeSerializationCallBack|ect(Controller)?))|D(i(st(antObject(Request)?|ributed(NotificationCenter|Lock))|ctionary|rectoryEnumerator)|ocument(Controller)?|e(serializer|cimalNumber(Behaviors|Handler)?|leteCommand)|at(e(Components|Picker(Cell)?|Formatter)?|a)|ra(wer|ggingInfo))|U(ser(InterfaceValidations|Defaults(Controller)?)|RL(Re(sponse|quest)|Handle(Client)?|C(onnection|ache|redential(Storage)?)|Download(Delegate)?|Prot(ocol(Client)?|ectionSpace)|AuthenticationChallenge(Sender)?)?|n(iqueIDSpecifier|doManager|archiver))|P(ipe|o(sitionalSpecifier|pUpButton(Cell)?|rt(Message|NameServer|Coder)?)|ICTImageRep|ersistentDocument|DFImageRep|a(steboard|nel|ragraphStyle|geLayout)|r(int(Info|er|Operation|Panel)|o(cessInfo|tocolChecker|perty(Specifier|ListSerialization)|gressIndicator|xy)|edicate))|E(numerator|vent|PSImageRep|rror|x(ception|istsCommand|pression))|V(iew(Animation)?|al(idated(ToobarItem|UserInterfaceItem)|ue(Transformer)?))|Keyed(Unarchiver|Archiver)|Qui(ckDrawView|tCommand)|F(ile(Manager|Handle|Wrapper)|o(nt(Manager|Descriptor|Panel)?|rm(Cell|atter)))|W(hoseSpecifier|indow(Controller)?|orkspace)|L(o(c(k(ing)?|ale)|gicalTest)|evelIndicator(Cell)?|ayoutManager)|A(ssertionHandler|nimation|ctionCell|ttributedString|utoreleasePool|TSTypesetter|ppl(ication|e(Script|Event(Manager|Descriptor)))|ffineTransform|lert|r(chiver|ray(Controller)?)))\\b", "name": "support.class.cocoa.objcpp" }, - { + "anonymous_pattern_22": { "match": "\\bNS(R(oundingMode|ule(Editor(RowType|NestingMode)|rOrientation)|e(questUserAttentionType|lativePosition))|G(lyphInscription|radientDrawingOptions)|XML(NodeKind|D(ocumentContentKind|TDNodeKind)|ParserError)|M(ultibyteGlyphPacking|apTableOptions)|B(itmapFormat|oxType|ezierPathElement|ackgroundStyle|rowserDropOperation)|S(tr(ing(CompareOptions|DrawingOptions|EncodingConversionOptions)|eam(Status|Event))|p(eechBoundary|litViewDividerStyle)|e(archPathD(irectory|omainMask)|gmentS(tyle|witchTracking))|liderType|aveOptions)|H(TTPCookieAcceptPolicy|ashTableOptions)|N(otification(SuspensionBehavior|Coalescing)|umberFormatter(RoundingMode|Behavior|Style|PadPosition)|etService(sError|Options))|C(haracterCollection|o(lor(RenderingIntent|SpaceModel|PanelMode)|mp(oundPredicateType|arisonPredicateModifier))|ellStateValue|al(culationError|endarUnit))|T(ypesetterControlCharacterAction|imeZoneNameStyle|e(stComparisonOperation|xt(Block(Dimension|V(erticalAlignment|alueType)|Layer)|TableLayoutAlgorithm|FieldBezelStyle))|ableView(SelectionHighlightStyle|ColumnAutoresizingStyle)|rackingAreaOptions)|I(n(sertionPosition|te(rfaceStyle|ger))|mage(RepLoadStatus|Scaling|CacheMode|FrameStyle|LoadStatus|Alignment))|Ope(nGLPixelFormatAttribute|rationQueuePriority)|Date(Picker(Mode|Style)|Formatter(Behavior|Style))|U(RL(RequestCachePolicy|HandleStatus|C(acheStoragePolicy|redentialPersistence))|Integer)|P(o(stingStyle|int(ingDeviceType|erFunctionsOptions)|pUpArrowPosition)|athStyle|r(int(ing(Orientation|PaginationMode)|erTableStatus|PanelOptions)|opertyList(MutabilityOptions|Format)|edicateOperatorType))|ExpressionType|KeyValue(SetMutationKind|Change)|QTMovieLoopMode|F(indPanel(SubstringMatchType|Action)|o(nt(RenderingMode|FamilyClass)|cusRingPlacement))|W(hoseSubelementIdentifier|ind(ingRule|ow(B(utton|ackingLocation)|SharingType|CollectionBehavior)))|L(ine(MovementDirection|SweepDirection|CapStyle|JoinStyle)|evelIndicatorStyle)|Animation(BlockingMode|Curve))\\b", "name": "support.type.cocoa.leopard.objcpp" }, - { + "anonymous_pattern_23": { "match": "\\bC(I(Sampler|Co(ntext|lor)|Image(Accumulator)?|PlugIn(Registration)?|Vector|Kernel|Filter(Generator|Shape)?)|A(Renderer|MediaTiming(Function)?|BasicAnimation|ScrollLayer|Constraint(LayoutManager)?|T(iledLayer|extLayer|rans(ition|action))|OpenGLLayer|PropertyAnimation|KeyframeAnimation|Layer|A(nimation(Group)?|ction)))\\b", "name": "support.class.quartz.objcpp" }, - { + "anonymous_pattern_24": { "match": "\\bC(G(Float|Point|Size|Rect)|IFormat|AConstraintAttribute)\\b", "name": "support.type.quartz.objcpp" }, - { + "anonymous_pattern_25": { "match": "\\bNS(R(ect(Edge)?|ange)|G(lyph(Relation|LayoutMode)?|radientType)|M(odalSession|a(trixMode|p(Table|Enumerator)))|B(itmapImageFileType|orderType|uttonType|ezelStyle|ackingStoreType|rowserColumnResizingType)|S(cr(oll(er(Part|Arrow)|ArrowPosition)|eenAuxiliaryOpaque)|tringEncoding|ize|ocketNativeHandle|election(Granularity|Direction|Affinity)|wapped(Double|Float)|aveOperationType)|Ha(sh(Table|Enumerator)|ndler(2)?)|C(o(ntrol(Size|Tint)|mp(ositingOperation|arisonResult))|ell(State|Type|ImagePosition|Attribute))|T(hreadPrivate|ypesetterGlyphInfo|i(ckMarkPosition|tlePosition|meInterval)|o(ol(TipTag|bar(SizeMode|DisplayMode))|kenStyle)|IFFCompression|ext(TabType|Alignment)|ab(State|leViewDropOperation|ViewType)|rackingRectTag)|ImageInterpolation|Zone|OpenGL(ContextAuxiliary|PixelFormatAuxiliary)|D(ocumentChangeType|atePickerElementFlags|ra(werState|gOperation))|UsableScrollerParts|P(oint|r(intingPageOrder|ogressIndicator(Style|Th(ickness|readInfo))))|EventType|KeyValueObservingOptions|Fo(nt(SymbolicTraits|TraitMask|Action)|cusRingType)|W(indow(OrderingMode|Depth)|orkspace(IconCreationOptions|LaunchOptions)|ritingDirection)|L(ineBreakMode|ayout(Status|Direction))|A(nimation(Progress|Effect)|ppl(ication(TerminateReply|DelegateReply|PrintReply)|eEventManagerSuspensionID)|ffineTransformStruct|lertStyle))\\b", "name": "support.type.cocoa.objcpp" }, - { + "anonymous_pattern_26": { "match": "\\bNS(NotFound|Ordered(Ascending|Descending|Same))\\b", "name": "support.constant.cocoa.objcpp" }, - { + "anonymous_pattern_27": { "match": "\\bNS(MenuDidBeginTracking|ViewDidUpdateTrackingAreas)?Notification\\b", "name": "support.constant.notification.cocoa.leopard.objcpp" }, - { + "anonymous_pattern_28": { "match": "\\bNS(Menu(Did(RemoveItem|SendAction|ChangeItem|EndTracking|AddItem)|WillSendAction)|S(ystemColorsDidChange|plitView(DidResizeSubviews|WillResizeSubviews))|C(o(nt(extHelpModeDid(Deactivate|Activate)|rolT(intDidChange|extDid(BeginEditing|Change|EndEditing)))|lor(PanelColorDidChange|ListDidChange)|mboBox(Selection(IsChanging|DidChange)|Will(Dismiss|PopUp)))|lassDescriptionNeededForClass)|T(oolbar(DidRemoveItem|WillAddItem)|ext(Storage(DidProcessEditing|WillProcessEditing)|Did(BeginEditing|Change|EndEditing)|View(DidChange(Selection|TypingAttributes)|WillChangeNotifyingTextView))|ableView(Selection(IsChanging|DidChange)|ColumnDid(Resize|Move)))|ImageRepRegistryDidChange|OutlineView(Selection(IsChanging|DidChange)|ColumnDid(Resize|Move)|Item(Did(Collapse|Expand)|Will(Collapse|Expand)))|Drawer(Did(Close|Open)|Will(Close|Open))|PopUpButton(CellWillPopUp|WillPopUp)|View(GlobalFrameDidChange|BoundsDidChange|F(ocusDidChange|rameDidChange))|FontSetChanged|W(indow(Did(Resi(ze|gn(Main|Key))|M(iniaturize|ove)|Become(Main|Key)|ChangeScreen(|Profile)|Deminiaturize|Update|E(ndSheet|xpose))|Will(M(iniaturize|ove)|BeginSheet|Close))|orkspace(SessionDid(ResignActive|BecomeActive)|Did(Mount|TerminateApplication|Unmount|PerformFileOperation|Wake|LaunchApplication)|Will(Sleep|Unmount|PowerOff|LaunchApplication)))|A(ntialiasThresholdChanged|ppl(ication(Did(ResignActive|BecomeActive|Hide|ChangeScreenParameters|U(nhide|pdate)|FinishLaunching)|Will(ResignActive|BecomeActive|Hide|Terminate|U(nhide|pdate)|FinishLaunching))|eEventManagerWillProcessFirstEvent)))Notification\\b", "name": "support.constant.notification.cocoa.objcpp" }, - { + "anonymous_pattern_29": { "match": "\\bNS(RuleEditor(RowType(Simple|Compound)|NestingMode(Si(ngle|mple)|Compound|List))|GradientDraws(BeforeStartingLocation|AfterEndingLocation)|M(inusSetExpressionType|a(chPortDeallocate(ReceiveRight|SendRight|None)|pTable(StrongMemory|CopyIn|ZeroingWeakMemory|ObjectPointerPersonality)))|B(oxCustom|undleExecutableArchitecture(X86|I386|PPC(64)?)|etweenPredicateOperatorType|ackgroundStyle(Raised|Dark|L(ight|owered)))|S(tring(DrawingTruncatesLastVisibleLine|EncodingConversion(ExternalRepresentation|AllowLossy))|ubqueryExpressionType|p(e(ech(SentenceBoundary|ImmediateBoundary|WordBoundary)|llingState(GrammarFlag|SpellingFlag))|litViewDividerStyleThi(n|ck))|e(rvice(RequestTimedOutError|M(iscellaneousError|alformedServiceDictionaryError)|InvalidPasteboardDataError|ErrorM(inimum|aximum)|Application(NotFoundError|LaunchFailedError))|gmentStyle(Round(Rect|ed)|SmallSquare|Capsule|Textured(Rounded|Square)|Automatic)))|H(UDWindowMask|ashTable(StrongMemory|CopyIn|ZeroingWeakMemory|ObjectPointerPersonality))|N(oModeColorPanel|etServiceNoAutoRename)|C(hangeRedone|o(ntainsPredicateOperatorType|l(orRenderingIntent(RelativeColorimetric|Saturation|Default|Perceptual|AbsoluteColorimetric)|lectorDisabledOption))|ellHit(None|ContentArea|TrackableArea|EditableTextArea))|T(imeZoneNameStyle(S(hort(Standard|DaylightSaving)|tandard)|DaylightSaving)|extFieldDatePickerStyle|ableViewSelectionHighlightStyle(Regular|SourceList)|racking(Mouse(Moved|EnteredAndExited)|CursorUpdate|InVisibleRect|EnabledDuringMouseDrag|A(ssumeInside|ctive(In(KeyWindow|ActiveApp)|WhenFirstResponder|Always))))|I(n(tersectSetExpressionType|dexedColorSpaceModel)|mageScale(None|Proportionally(Down|UpOrDown)|AxesIndependently))|Ope(nGLPFAAllowOfflineRenderers|rationQueue(DefaultMaxConcurrentOperationCount|Priority(High|Normal|Very(High|Low)|Low)))|D(iacriticInsensitiveSearch|ownloadsDirectory)|U(nionSetExpressionType|TF(16(BigEndianStringEncoding|StringEncoding|LittleEndianStringEncoding)|32(BigEndianStringEncoding|StringEncoding|LittleEndianStringEncoding)))|P(ointerFunctions(Ma(chVirtualMemory|llocMemory)|Str(ongMemory|uctPersonality)|C(StringPersonality|opyIn)|IntegerPersonality|ZeroingWeakMemory|O(paque(Memory|Personality)|bjectP(ointerPersonality|ersonality)))|at(hStyle(Standard|NavigationBar|PopUp)|ternColorSpaceModel)|rintPanelShows(Scaling|Copies|Orientation|P(a(perSize|ge(Range|SetupAccessory))|review)))|Executable(RuntimeMismatchError|NotLoadableError|ErrorM(inimum|aximum)|L(inkError|oadError)|ArchitectureMismatchError)|KeyValueObservingOption(Initial|Prior)|F(i(ndPanelSubstringMatchType(StartsWith|Contains|EndsWith|FullWord)|leRead(TooLargeError|UnknownStringEncodingError))|orcedOrderingSearch)|Wi(ndow(BackingLocation(MainMemory|Default|VideoMemory)|Sharing(Read(Only|Write)|None)|CollectionBehavior(MoveToActiveSpace|CanJoinAllSpaces|Default))|dthInsensitiveSearch)|AggregateExpressionType)\\b", "name": "support.constant.cocoa.leopard.objcpp" }, - { + "anonymous_pattern_3": { + "begin": "@\"", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.begin.objcpp" + } + }, + "end": "\"", + "endCaptures": { + "0": { + "name": "punctuation.definition.string.end.objcpp" + } + }, + "name": "string.quoted.double.objcpp", + "patterns": [ + { + "include": "#string_escaped_char" + }, + { + "match": "(?x)%\n\t\t\t\t\t\t(\\d+\\$)? # field (argument #)\n\t\t\t\t\t\t[#0\\- +']* # flags\n\t\t\t\t\t\t((-?\\d+)|\\*(-?\\d+\\$)?)? # minimum field width\n\t\t\t\t\t\t(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)? # precision\n\t\t\t\t\t\t[@] # conversion type\n\t\t\t\t\t", + "name": "constant.other.placeholder.objcpp" + }, + { + "include": "#string_placeholder" + } + ] + }, + "anonymous_pattern_30": { "match": "\\bNS(R(GB(ModeColorPanel|ColorSpaceModel)|ight(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey)|ound(RectBezelStyle|Bankers|ed(BezelStyle|TokenStyle|DisclosureBezelStyle)|Down|Up|Plain|Line(CapStyle|JoinStyle))|un(StoppedResponse|ContinuesResponse|AbortedResponse)|e(s(izableWindowMask|et(CursorRectsRunLoopOrdering|FunctionKey))|ce(ssedBezelStyle|iver(sCantHandleCommandScriptError|EvaluationScriptError))|turnTextMovement|doFunctionKey|quiredArgumentsMissingScriptError|l(evancyLevelIndicatorStyle|ative(Before|After))|gular(SquareBezelStyle|ControlSize)|moveTraitFontAction)|a(n(domSubelement|geDateMode)|tingLevelIndicatorStyle|dio(ModeMatrix|Button)))|G(IFFileType|lyph(Below|Inscribe(B(elow|ase)|Over(strike|Below)|Above)|Layout(WithPrevious|A(tAPoint|gainstAPoint))|A(ttribute(BidiLevel|Soft|Inscribe|Elastic)|bove))|r(ooveBorder|eaterThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|a(y(ModeColorPanel|ColorSpaceModel)|dient(None|Con(cave(Strong|Weak)|vex(Strong|Weak)))|phiteControlTint)))|XML(N(o(tationDeclarationKind|de(CompactEmptyElement|IsCDATA|OptionsNone|Use(SingleQuotes|DoubleQuotes)|Pre(serve(NamespaceOrder|C(haracterReferences|DATA)|DTD|Prefixes|E(ntities|mptyElements)|Quotes|Whitespace|A(ttributeOrder|ll))|ttyPrint)|ExpandEmptyElement))|amespaceKind)|CommentKind|TextKind|InvalidKind|D(ocument(X(MLKind|HTMLKind|Include)|HTMLKind|T(idy(XML|HTML)|extKind)|IncludeContentTypeDeclaration|Validate|Kind)|TDKind)|P(arser(GTRequiredError|XMLDeclNot(StartedError|FinishedError)|Mi(splaced(XMLDeclarationError|CDATAEndStringError)|xedContentDeclNot(StartedError|FinishedError))|S(t(andaloneValueError|ringNot(StartedError|ClosedError))|paceRequiredError|eparatorRequiredError)|N(MTOKENRequiredError|o(t(ationNot(StartedError|FinishedError)|WellBalancedError)|DTDError)|amespaceDeclarationError|AMERequiredError)|C(haracterRef(In(DTDError|PrologError|EpilogError)|AtEOFError)|o(nditionalSectionNot(StartedError|FinishedError)|mment(NotFinishedError|ContainsDoubleHyphenError))|DATANotFinishedError)|TagNameMismatchError|In(ternalError|valid(HexCharacterRefError|C(haracter(RefError|InEntityError|Error)|onditionalSectionError)|DecimalCharacterRefError|URIError|Encoding(NameError|Error)))|OutOfMemoryError|D(ocumentStartError|elegateAbortedParseError|OCTYPEDeclNotFinishedError)|U(RI(RequiredError|FragmentError)|n(declaredEntityError|parsedEntityError|knownEncodingError|finishedTagError))|P(CDATARequiredError|ublicIdentifierRequiredError|arsedEntityRef(MissingSemiError|NoNameError|In(Internal(SubsetError|Error)|PrologError|EpilogError)|AtEOFError)|r(ocessingInstructionNot(StartedError|FinishedError)|ematureDocumentEndError))|E(n(codingNotSupportedError|tity(Ref(In(DTDError|PrologError|EpilogError)|erence(MissingSemiError|WithoutNameError)|LoopError|AtEOFError)|BoundaryError|Not(StartedError|FinishedError)|Is(ParameterError|ExternalError)|ValueRequiredError))|qualExpectedError|lementContentDeclNot(StartedError|FinishedError)|xt(ernalS(tandaloneEntityError|ubsetNotFinishedError)|raContentError)|mptyDocumentError)|L(iteralNot(StartedError|FinishedError)|T(RequiredError|SlashRequiredError)|essThanSymbolInAttributeError)|Attribute(RedefinedError|HasNoValueError|Not(StartedError|FinishedError)|ListNot(StartedError|FinishedError)))|rocessingInstructionKind)|E(ntity(GeneralKind|DeclarationKind|UnparsedKind|P(ar(sedKind|ameterKind)|redefined))|lement(Declaration(MixedKind|UndefinedKind|E(lementKind|mptyKind)|Kind|AnyKind)|Kind))|Attribute(N(MToken(sKind|Kind)|otationKind)|CDATAKind|ID(Ref(sKind|Kind)|Kind)|DeclarationKind|En(tit(yKind|iesKind)|umerationKind)|Kind))|M(i(n(XEdge|iaturizableWindowMask|YEdge|uteCalendarUnit)|terLineJoinStyle|ddleSubelement|xedState)|o(nthCalendarUnit|deSwitchFunctionKey|use(Moved(Mask)?|E(ntered(Mask)?|ventSubtype|xited(Mask)?))|veToBezierPathElement|mentary(ChangeButton|Push(Button|InButton)|Light(Button)?))|enuFunctionKey|a(c(intoshInterfaceStyle|OSRomanStringEncoding)|tchesPredicateOperatorType|ppedRead|x(XEdge|YEdge))|ACHOperatingSystem)|B(MPFileType|o(ttomTabsBezelBorder|ldFontMask|rderlessWindowMask|x(Se(condary|parator)|OldStyle|Primary))|uttLineCapStyle|e(zelBorder|velLineJoinStyle|low(Bottom|Top)|gin(sWith(Comparison|PredicateOperatorType)|FunctionKey))|lueControlTint|ack(spaceCharacter|tabTextMovement|ingStore(Retained|Buffered|Nonretained)|TabCharacter|wardsSearch|groundTab)|r(owser(NoColumnResizing|UserColumnResizing|AutoColumnResizing)|eakFunctionKey))|S(h(ift(JISStringEncoding|KeyMask)|ow(ControlGlyphs|InvisibleGlyphs)|adowlessSquareBezelStyle)|y(s(ReqFunctionKey|tem(D(omainMask|efined(Mask)?)|FunctionKey))|mbolStringEncoding)|c(a(nnedOption|le(None|ToFit|Proportionally))|r(oll(er(NoPart|Increment(Page|Line|Arrow)|Decrement(Page|Line|Arrow)|Knob(Slot)?|Arrows(M(inEnd|axEnd)|None|DefaultSetting))|Wheel(Mask)?|LockFunctionKey)|eenChangedEventType))|t(opFunctionKey|r(ingDrawing(OneShot|DisableScreenFontSubstitution|Uses(DeviceMetrics|FontLeading|LineFragmentOrigin))|eam(Status(Reading|NotOpen|Closed|Open(ing)?|Error|Writing|AtEnd)|Event(Has(BytesAvailable|SpaceAvailable)|None|OpenCompleted|E(ndEncountered|rrorOccurred)))))|i(ngle(DateMode|UnderlineStyle)|ze(DownFontAction|UpFontAction))|olarisOperatingSystem|unOSOperatingSystem|pecialPageOrder|e(condCalendarUnit|lect(By(Character|Paragraph|Word)|i(ng(Next|Previous)|onAffinity(Downstream|Upstream))|edTab|FunctionKey)|gmentSwitchTracking(Momentary|Select(One|Any)))|quareLineCapStyle|witchButton|ave(ToOperation|Op(tions(Yes|No|Ask)|eration)|AsOperation)|mall(SquareBezelStyle|C(ontrolSize|apsFontMask)|IconButtonBezelStyle))|H(ighlightModeMatrix|SBModeColorPanel|o(ur(Minute(SecondDatePickerElementFlag|DatePickerElementFlag)|CalendarUnit)|rizontalRuler|meFunctionKey)|TTPCookieAcceptPolicy(Never|OnlyFromMainDocumentDomain|Always)|e(lp(ButtonBezelStyle|KeyMask|FunctionKey)|avierFontAction)|PUXOperatingSystem)|Year(MonthDa(yDatePickerElementFlag|tePickerElementFlag)|CalendarUnit)|N(o(n(StandardCharacterSetFontMask|ZeroWindingRule|activatingPanelMask|LossyASCIIStringEncoding)|Border|t(ification(SuspensionBehavior(Hold|Coalesce|D(eliverImmediately|rop))|NoCoalescing|CoalescingOn(Sender|Name)|DeliverImmediately|PostToAllSessions)|PredicateType|EqualToPredicateOperatorType)|S(cr(iptError|ollerParts)|ubelement|pecifierError)|CellMask|T(itle|opLevelContainersSpecifierError|abs(BezelBorder|NoBorder|LineBorder))|I(nterfaceStyle|mage)|UnderlineStyle|FontChangeAction)|u(ll(Glyph|CellType)|m(eric(Search|PadKeyMask)|berFormatter(Round(Half(Down|Up|Even)|Ceiling|Down|Up|Floor)|Behavior(10|Default)|S(cientificStyle|pellOutStyle)|NoStyle|CurrencyStyle|DecimalStyle|P(ercentStyle|ad(Before(Suffix|Prefix)|After(Suffix|Prefix))))))|e(t(Services(BadArgumentError|NotFoundError|C(ollisionError|ancelledError)|TimeoutError|InvalidError|UnknownError|ActivityInProgress)|workDomainMask)|wlineCharacter|xt(StepInterfaceStyle|FunctionKey))|EXTSTEPStringEncoding|a(t(iveShortGlyphPacking|uralTextAlignment)|rrowFontMask))|C(hange(ReadOtherContents|GrayCell(Mask)?|BackgroundCell(Mask)?|Cleared|Done|Undone|Autosaved)|MYK(ModeColorPanel|ColorSpaceModel)|ircular(BezelStyle|Slider)|o(n(stantValueExpressionType|t(inuousCapacityLevelIndicatorStyle|entsCellMask|ain(sComparison|erSpecifierError)|rol(Glyph|KeyMask))|densedFontMask)|lor(Panel(RGBModeMask|GrayModeMask|HSBModeMask|C(MYKModeMask|olorListModeMask|ustomPaletteModeMask|rayonModeMask)|WheelModeMask|AllModesMask)|ListModeColorPanel)|reServiceDirectory|m(p(osite(XOR|Source(In|O(ut|ver)|Atop)|Highlight|C(opy|lear)|Destination(In|O(ut|ver)|Atop)|Plus(Darker|Lighter))|ressedFontMask)|mandKeyMask))|u(stom(SelectorPredicateOperatorType|PaletteModeColorPanel)|r(sor(Update(Mask)?|PointingDevice)|veToBezierPathElement))|e(nterT(extAlignment|abStopType)|ll(State|H(ighlighted|as(Image(Horizontal|OnLeftOrBottom)|OverlappingImage))|ChangesContents|Is(Bordered|InsetButton)|Disabled|Editable|LightsBy(Gray|Background|Contents)|AllowsMixedState))|l(ipPagination|o(s(ePathBezierPathElement|ableWindowMask)|ckAndCalendarDatePickerStyle)|ear(ControlTint|DisplayFunctionKey|LineFunctionKey))|a(seInsensitive(Search|PredicateOption)|n(notCreateScriptCommandError|cel(Button|TextMovement))|chesDirectory|lculation(NoError|Overflow|DivideByZero|Underflow|LossOfPrecision)|rriageReturnCharacter)|r(itical(Request|AlertStyle)|ayonModeColorPanel))|T(hick(SquareBezelStyle|erSquareBezelStyle)|ypesetter(Behavior|HorizontalTabAction|ContainerBreakAction|ZeroAdvancementAction|OriginalBehavior|ParagraphBreakAction|WhitespaceAction|L(ineBreakAction|atestBehavior))|i(ckMark(Right|Below|Left|Above)|tledWindowMask|meZoneDatePickerElementFlag)|o(olbarItemVisibilityPriority(Standard|High|User|Low)|pTabsBezelBorder|ggleButton)|IFF(Compression(N(one|EXT)|CCITTFAX(3|4)|OldJPEG|JPEG|PackBits|LZW)|FileType)|e(rminate(Now|Cancel|Later)|xt(Read(InapplicableDocumentTypeError|WriteErrorM(inimum|aximum))|Block(M(i(nimum(Height|Width)|ddleAlignment)|a(rgin|ximum(Height|Width)))|B(o(ttomAlignment|rder)|aselineAlignment)|Height|TopAlignment|P(ercentageValueType|adding)|Width|AbsoluteValueType)|StorageEdited(Characters|Attributes)|CellType|ured(RoundedBezelStyle|BackgroundWindowMask|SquareBezelStyle)|Table(FixedLayoutAlgorithm|AutomaticLayoutAlgorithm)|Field(RoundedBezel|SquareBezel|AndStepperDatePickerStyle)|WriteInapplicableDocumentTypeError|ListPrependEnclosingMarker))|woByteGlyphPacking|ab(Character|TextMovement|le(tP(oint(Mask|EventSubtype)?|roximity(Mask|EventSubtype)?)|Column(NoResizing|UserResizingMask|AutoresizingMask)|View(ReverseSequentialColumnAutoresizingStyle|GridNone|S(olid(HorizontalGridLineMask|VerticalGridLineMask)|equentialColumnAutoresizingStyle)|NoColumnAutoresizing|UniformColumnAutoresizingStyle|FirstColumnOnlyAutoresizingStyle|LastColumnOnlyAutoresizingStyle)))|rackModeMatrix)|I(n(sert(CharFunctionKey|FunctionKey|LineFunctionKey)|t(Type|ernalS(criptError|pecifierError))|dexSubelement|validIndexSpecifierError|formational(Request|AlertStyle)|PredicateOperatorType)|talicFontMask|SO(2022JPStringEncoding|Latin(1StringEncoding|2StringEncoding))|dentityMappingCharacterCollection|llegalTextMovement|mage(R(ight|ep(MatchesDevice|LoadStatus(ReadingHeader|Completed|InvalidData|Un(expectedEOF|knownType)|WillNeedAllData)))|Below|C(ellType|ache(BySize|Never|Default|Always))|Interpolation(High|None|Default|Low)|O(nly|verlaps)|Frame(Gr(oove|ayBezel)|Button|None|Photo)|L(oadStatus(ReadError|C(ompleted|ancelled)|InvalidData|UnexpectedEOF)|eft)|A(lign(Right|Bottom(Right|Left)?|Center|Top(Right|Left)?|Left)|bove)))|O(n(State|eByteGlyphPacking|OffButton|lyScrollerArrows)|ther(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|TextMovement)|SF1OperatingSystem|pe(n(GL(GO(Re(setLibrary|tainRenderers)|ClearFormatCache|FormatCacheSize)|PFA(R(obust|endererID)|M(inimumPolicy|ulti(sample|Screen)|PSafe|aximumPolicy)|BackingStore|S(creenMask|te(ncilSize|reo)|ingleRenderer|upersample|ample(s|Buffers|Alpha))|NoRecovery|C(o(lor(Size|Float)|mpliant)|losestPolicy)|OffScreen|D(oubleBuffer|epthSize)|PixelBuffer|VirtualScreenCount|FullScreen|Window|A(cc(umSize|elerated)|ux(Buffers|DepthStencil)|l(phaSize|lRenderers))))|StepUnicodeReservedBase)|rationNotSupportedForKeyS(criptError|pecifierError))|ffState|KButton|rPredicateType|bjC(B(itfield|oolType)|S(hortType|tr(ingType|uctType)|electorType)|NoType|CharType|ObjectType|DoubleType|UnionType|PointerType|VoidType|FloatType|Long(Type|longType)|ArrayType))|D(i(s(c(losureBezelStyle|reteCapacityLevelIndicatorStyle)|playWindowRunLoopOrdering)|acriticInsensitivePredicateOption|rect(Selection|PredicateModifier))|o(c(ModalWindowMask|ument(Directory|ationDirectory))|ubleType|wn(TextMovement|ArrowFunctionKey))|e(s(cendingPageOrder|ktopDirectory)|cimalTabStopType|v(ice(NColorSpaceModel|IndependentModifierFlagsMask)|eloper(Directory|ApplicationDirectory))|fault(ControlTint|TokenStyle)|lete(Char(acter|FunctionKey)|FunctionKey|LineFunctionKey)|moApplicationDirectory)|a(yCalendarUnit|teFormatter(MediumStyle|Behavior(10|Default)|ShortStyle|NoStyle|FullStyle|LongStyle))|ra(wer(Clos(ingState|edState)|Open(ingState|State))|gOperation(Generic|Move|None|Copy|Delete|Private|Every|Link|All)))|U(ser(CancelledError|D(irectory|omainMask)|FunctionKey)|RL(Handle(NotLoaded|Load(Succeeded|InProgress|Failed))|CredentialPersistence(None|Permanent|ForSession))|n(scaledWindowMask|cachedRead|i(codeStringEncoding|talicFontMask|fiedTitleAndToolbarWindowMask)|d(o(CloseGroupingRunLoopOrdering|FunctionKey)|e(finedDateComponent|rline(Style(Single|None|Thick|Double)|Pattern(Solid|D(ot|ash(Dot(Dot)?)?)))))|known(ColorSpaceModel|P(ointingDevice|ageOrder)|KeyS(criptError|pecifierError))|boldFontMask)|tilityWindowMask|TF8StringEncoding|p(dateWindowsRunLoopOrdering|TextMovement|ArrowFunctionKey))|J(ustifiedTextAlignment|PEG(2000FileType|FileType)|apaneseEUC(GlyphPacking|StringEncoding))|P(o(s(t(Now|erFontMask|WhenIdle|ASAP)|iti(on(Replace|Be(fore|ginning)|End|After)|ve(IntType|DoubleType|FloatType)))|pUp(NoArrow|ArrowAt(Bottom|Center))|werOffEventType|rtraitOrientation)|NGFileType|ush(InCell(Mask)?|OnPushOffButton)|e(n(TipMask|UpperSideMask|PointingDevice|LowerSideMask)|riodic(Mask)?)|P(S(caleField|tatus(Title|Field)|aveButton)|N(ote(Title|Field)|ame(Title|Field))|CopiesField|TitleField|ImageButton|OptionsButton|P(a(perFeedButton|ge(Range(To|From)|ChoiceMatrix))|reviewButton)|LayoutButton)|lainTextTokenStyle|a(useFunctionKey|ragraphSeparatorCharacter|ge(DownFunctionKey|UpFunctionKey))|r(int(ing(ReplyLater|Success|Cancelled|Failure)|ScreenFunctionKey|erTable(NotFound|OK|Error)|FunctionKey)|o(p(ertyList(XMLFormat|MutableContainers(AndLeaves)?|BinaryFormat|Immutable|OpenStepFormat)|rietaryStringEncoding)|gressIndicator(BarStyle|SpinningStyle|Preferred(SmallThickness|Thickness|LargeThickness|AquaThickness)))|e(ssedTab|vFunctionKey))|L(HeightForm|CancelButton|TitleField|ImageButton|O(KButton|rientationMatrix)|UnitsButton|PaperNameButton|WidthForm))|E(n(terCharacter|d(sWith(Comparison|PredicateOperatorType)|FunctionKey))|v(e(nOddWindingRule|rySubelement)|aluatedObjectExpressionType)|qualTo(Comparison|PredicateOperatorType)|ra(serPointingDevice|CalendarUnit|DatePickerElementFlag)|x(clude(10|QuickDrawElementsIconCreationOption)|pandedFontMask|ecuteFunctionKey))|V(i(ew(M(in(XMargin|YMargin)|ax(XMargin|YMargin))|HeightSizable|NotSizable|WidthSizable)|aPanelFontAction)|erticalRuler|a(lidationErrorM(inimum|aximum)|riableExpressionType))|Key(SpecifierEvaluationScriptError|Down(Mask)?|Up(Mask)?|PathExpressionType|Value(MinusSetMutation|SetSetMutation|Change(Re(placement|moval)|Setting|Insertion)|IntersectSetMutation|ObservingOption(New|Old)|UnionSetMutation|ValidationError))|QTMovie(NormalPlayback|Looping(BackAndForthPlayback|Playback))|F(1(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|7FunctionKey|i(nd(PanelAction(Replace(A(ndFind|ll(InSelection)?))?|S(howFindPanel|e(tFindString|lectAll(InSelection)?))|Next|Previous)|FunctionKey)|tPagination|le(Read(No(SuchFileError|PermissionError)|CorruptFileError|In(validFileNameError|applicableStringEncodingError)|Un(supportedSchemeError|knownError))|HandlingPanel(CancelButton|OKButton)|NoSuchFileError|ErrorM(inimum|aximum)|Write(NoPermissionError|In(validFileNameError|applicableStringEncodingError)|OutOfSpaceError|Un(supportedSchemeError|knownError))|LockingError)|xedPitchFontMask)|2(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|o(nt(Mo(noSpaceTrait|dernSerifsClass)|BoldTrait|S(ymbolicClass|criptsClass|labSerifsClass|ansSerifClass)|C(o(ndensedTrait|llectionApplicationOnlyMask)|larendonSerifsClass)|TransitionalSerifsClass|I(ntegerAdvancementsRenderingMode|talicTrait)|O(ldStyleSerifsClass|rnamentalsClass)|DefaultRenderingMode|U(nknownClass|IOptimizedTrait)|Panel(S(hadowEffectModeMask|t(andardModesMask|rikethroughEffectModeMask)|izeModeMask)|CollectionModeMask|TextColorEffectModeMask|DocumentColorEffectModeMask|UnderlineEffectModeMask|FaceModeMask|All(ModesMask|EffectsModeMask))|ExpandedTrait|VerticalTrait|F(amilyClassMask|reeformSerifsClass)|Antialiased(RenderingMode|IntegerAdvancementsRenderingMode))|cusRing(Below|Type(None|Default|Exterior)|Only|Above)|urByteGlyphPacking|rm(attingError(M(inimum|aximum))?|FeedCharacter))|8FunctionKey|unction(ExpressionType|KeyMask)|3(1FunctionKey|2FunctionKey|3FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey)|9FunctionKey|4FunctionKey|P(RevertButton|S(ize(Title|Field)|etButton)|CurrentField|Preview(Button|Field))|l(oat(ingPointSamplesBitmapFormat|Type)|agsChanged(Mask)?)|axButton|5FunctionKey|6FunctionKey)|W(heelModeColorPanel|indow(s(NTOperatingSystem|CP125(1StringEncoding|2StringEncoding|3StringEncoding|4StringEncoding|0StringEncoding)|95(InterfaceStyle|OperatingSystem))|M(iniaturizeButton|ovedEventType)|Below|CloseButton|ToolbarButton|ZoomButton|Out|DocumentIconButton|ExposedEventType|Above)|orkspaceLaunch(NewInstance|InhibitingBackgroundOnly|Default|PreferringClassic|WithoutA(ctivation|ddingToRecents)|A(sync|nd(Hide(Others)?|Print)|llowingClassicStartup))|eek(day(CalendarUnit|OrdinalCalendarUnit)|CalendarUnit)|a(ntsBidiLevels|rningAlertStyle)|r(itingDirection(RightToLeft|Natural|LeftToRight)|apCalendarComponents))|L(i(stModeMatrix|ne(Moves(Right|Down|Up|Left)|B(order|reakBy(C(harWrapping|lipping)|Truncating(Middle|Head|Tail)|WordWrapping))|S(eparatorCharacter|weep(Right|Down|Up|Left))|ToBezierPathElement|DoesntMove|arSlider)|teralSearch|kePredicateOperatorType|ghterFontAction|braryDirectory)|ocalDomainMask|e(ssThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|ft(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey))|a(yout(RightToLeft|NotDone|CantFit|OutOfGlyphs|Done|LeftToRight)|ndscapeOrientation)|ABColorSpaceModel)|A(sc(iiWithDoubleByteEUCGlyphPacking|endingPageOrder)|n(y(Type|PredicateModifier|EventMask)|choredSearch|imation(Blocking|Nonblocking(Threaded)?|E(ffect(DisappearingItemDefault|Poof)|ase(In(Out)?|Out))|Linear)|dPredicateType)|t(Bottom|tachmentCharacter|omicWrite|Top)|SCIIStringEncoding|d(obe(GB1CharacterCollection|CNS1CharacterCollection|Japan(1CharacterCollection|2CharacterCollection)|Korea1CharacterCollection)|dTraitFontAction|minApplicationDirectory)|uto(saveOperation|Pagination)|pp(lication(SupportDirectory|D(irectory|e(fined(Mask)?|legateReply(Success|Cancel|Failure)|activatedEventType))|ActivatedEventType)|KitDefined(Mask)?)|l(ternateKeyMask|pha(ShiftKeyMask|NonpremultipliedBitmapFormat|FirstBitmapFormat)|ert(SecondButtonReturn|ThirdButtonReturn|OtherReturn|DefaultReturn|ErrorReturn|FirstButtonReturn|AlternateReturn)|l(ScrollerParts|DomainsMask|PredicateModifier|LibrariesDirectory|ApplicationsDirectory))|rgument(sWrongScriptError|EvaluationScriptError)|bove(Bottom|Top)|WTEventType))\\b", "name": "support.constant.cocoa.objcpp" }, - { - "include": "#bracketed_content" + "anonymous_pattern_4": { + "begin": "\\b(id)\\s*(?=<)", + "beginCaptures": { + "1": { + "name": "storage.type.objcpp" + } + }, + "end": "(?<=>)", + "name": "meta.id-with-protocol.objcpp", + "patterns": [ + { + "include": "#protocol_list" + } + ] + }, + "anonymous_pattern_5": { + "match": "\\b(NS_DURING|NS_HANDLER|NS_ENDHANDLER)\\b", + "name": "keyword.control.macro.objcpp" + }, + "anonymous_pattern_7": { + "captures": { + "1": { + "name": "punctuation.definition.keyword.objcpp" + } + }, + "match": "(@)(try|catch|finally|throw)\\b", + "name": "keyword.control.exception.objcpp" + }, + "anonymous_pattern_8": { + "captures": { + "1": { + "name": "punctuation.definition.keyword.objcpp" + } + }, + "match": "(@)(synchronized)\\b", + "name": "keyword.control.synchronize.objcpp" + }, + "anonymous_pattern_9": { + "captures": { + "1": { + "name": "punctuation.definition.keyword.objcpp" + } + }, + "match": "(@)(required|optional)\\b", + "name": "keyword.control.protocol-specification.objcpp" + }, + "apple_foundation_functional_macros": { + "begin": "(\\b(?:API_AVAILABLE|API_DEPRECATED|API_UNAVAILABLE|NS_AVAILABLE|NS_AVAILABLE_MAC|NS_AVAILABLE_IOS|NS_DEPRECATED|NS_DEPRECATED_MAC|NS_DEPRECATED_IOS|NS_SWIFT_NAME))(?:(?:\\s)+)?(\\()", + "end": "\\)", + "beginCaptures": { + "1": { + "name": "entity.name.function.preprocessor.apple-foundation.objcpp" + }, + "2": { + "name": "punctuation.section.macro.arguments.begin.bracket.round.apple-foundation.objcpp" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.section.macro.arguments.end.bracket.round.apple-foundation.objcpp" + } + }, + "name": "meta.preprocessor.macro.callable.apple-foundation.objcpp", + "patterns": [ + { + "include": "#c_lang" + } + ] }, - { - "include": "#c_lang" - } - ], - "repository": { "bracketed_content": { "begin": "\\[", "beginCaptures": { @@ -2724,7 +2837,15 @@ "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*(\\b(?!(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool|_Complex|_Imaginary|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t))[a-zA-Z_]\\w*\\b(?!\\())", "captures": { "1": { - "name": "variable.other.object.access.objcpp" + "patterns": [ + { + "include": "#special_variables" + }, + { + "name": "variable.other.object.access.objcpp", + "match": "(.+)" + } + ] }, "2": { "name": "punctuation.separator.dot-access.objcpp" @@ -2744,7 +2865,15 @@ "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))", "captures": { "1": { - "name": "variable.other.object.access.objcpp" + "patterns": [ + { + "include": "#special_variables" + }, + { + "name": "variable.other.object.access.objcpp", + "match": "(.+)" + } + ] }, "2": { "name": "punctuation.separator.dot-access.objcpp" @@ -2766,7 +2895,15 @@ "begin": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()", "beginCaptures": { "1": { - "name": "variable.other.object.access.objcpp" + "patterns": [ + { + "include": "#special_variables" + }, + { + "name": "variable.other.object.access.objcpp", + "match": "(.+)" + } + ] }, "2": { "name": "punctuation.separator.dot-access.objcpp" @@ -2786,7 +2923,15 @@ "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))", "captures": { "1": { - "name": "variable.other.object.access.objcpp" + "patterns": [ + { + "include": "#special_variables" + }, + { + "name": "variable.other.object.access.objcpp", + "match": "(.+)" + } + ] }, "2": { "name": "punctuation.separator.dot-access.objcpp" diff --git a/extensions/objective-c/syntaxes/objective-c.tmLanguage.json b/extensions/objective-c/syntaxes/objective-c.tmLanguage.json index 27901fd2bcd..594c0ebfd78 100644 --- a/extensions/objective-c/syntaxes/objective-c.tmLanguage.json +++ b/extensions/objective-c/syntaxes/objective-c.tmLanguage.json @@ -1,14 +1,112 @@ { "information_for_contributors": [ - "This file has been converted from https://github.com/jeff-hykin/cpp-textmate-grammar/blob/master/syntaxes/objc.tmLanguage.json", + "This file has been converted from https://github.com/jeff-hykin/better-objc-syntax/blob/master/autogenerated/objc.tmLanguage.json", "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/0ef79f098ed80ce5a86be4ed40f99ebcdbac4895", + "version": "https://github.com/jeff-hykin/better-objc-syntax/commit/119b75fb1f4d3e8726fa62588e3b935e0b719294", "name": "Objective-C", "scopeName": "source.objc", "patterns": [ { + "include": "#anonymous_pattern_1" + }, + { + "include": "#anonymous_pattern_2" + }, + { + "include": "#anonymous_pattern_3" + }, + { + "include": "#anonymous_pattern_4" + }, + { + "include": "#anonymous_pattern_5" + }, + { + "include": "#apple_foundation_functional_macros" + }, + { + "include": "#anonymous_pattern_7" + }, + { + "include": "#anonymous_pattern_8" + }, + { + "include": "#anonymous_pattern_9" + }, + { + "include": "#anonymous_pattern_10" + }, + { + "include": "#anonymous_pattern_11" + }, + { + "include": "#anonymous_pattern_12" + }, + { + "include": "#anonymous_pattern_13" + }, + { + "include": "#anonymous_pattern_14" + }, + { + "include": "#anonymous_pattern_15" + }, + { + "include": "#anonymous_pattern_16" + }, + { + "include": "#anonymous_pattern_17" + }, + { + "include": "#anonymous_pattern_18" + }, + { + "include": "#anonymous_pattern_19" + }, + { + "include": "#anonymous_pattern_20" + }, + { + "include": "#anonymous_pattern_21" + }, + { + "include": "#anonymous_pattern_22" + }, + { + "include": "#anonymous_pattern_23" + }, + { + "include": "#anonymous_pattern_24" + }, + { + "include": "#anonymous_pattern_25" + }, + { + "include": "#anonymous_pattern_26" + }, + { + "include": "#anonymous_pattern_27" + }, + { + "include": "#anonymous_pattern_28" + }, + { + "include": "#anonymous_pattern_29" + }, + { + "include": "#anonymous_pattern_30" + }, + { + "include": "#bracketed_content" + }, + { + "include": "#c_lang" + } + ], + "repository": { + "anonymous_pattern_1": { "begin": "((@)(interface|protocol))(?!.+;)\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*((:)(?:\\s*)([A-Za-z][A-Za-z0-9]*))?(\\s|\\n)?", "captures": { "1": { @@ -42,105 +140,7 @@ } ] }, - { - "begin": "((@)(implementation))\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*(?::\\s*([A-Za-z][A-Za-z0-9]*))?", - "captures": { - "1": { - "name": "storage.type.objc" - }, - "2": { - "name": "punctuation.definition.storage.type.objc" - }, - "4": { - "name": "entity.name.type.objc" - }, - "5": { - "name": "entity.other.inherited-class.objc" - } - }, - "contentName": "meta.scope.implementation.objc", - "end": "((@)end)\\b", - "name": "meta.implementation.objc", - "patterns": [ - { - "include": "#implementation_innards" - } - ] - }, - { - "begin": "@\"", - "beginCaptures": { - "0": { - "name": "punctuation.definition.string.begin.objc" - } - }, - "end": "\"", - "endCaptures": { - "0": { - "name": "punctuation.definition.string.end.objc" - } - }, - "name": "string.quoted.double.objc", - "patterns": [ - { - "include": "#string_escaped_char" - }, - { - "match": "(?x)%\n\t\t\t\t\t\t(\\d+\\$)? # field (argument #)\n\t\t\t\t\t\t[#0\\- +']* # flags\n\t\t\t\t\t\t((-?\\d+)|\\*(-?\\d+\\$)?)? # minimum field width\n\t\t\t\t\t\t(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)? # precision\n\t\t\t\t\t\t[@] # conversion type\n\t\t\t\t\t", - "name": "constant.other.placeholder.objc" - }, - { - "include": "#string_placeholder" - } - ] - }, - { - "begin": "\\b(id)\\s*(?=<)", - "beginCaptures": { - "1": { - "name": "storage.type.objc" - } - }, - "end": "(?<=>)", - "name": "meta.id-with-protocol.objc", - "patterns": [ - { - "include": "#protocol_list" - } - ] - }, - { - "match": "\\b(NS_DURING|NS_HANDLER|NS_ENDHANDLER)\\b", - "name": "keyword.control.macro.objc" - }, - { - "captures": { - "1": { - "name": "punctuation.definition.keyword.objc" - } - }, - "match": "(@)(try|catch|finally|throw)\\b", - "name": "keyword.control.exception.objc" - }, - { - "captures": { - "1": { - "name": "punctuation.definition.keyword.objc" - } - }, - "match": "(@)(synchronized)\\b", - "name": "keyword.control.synchronize.objc" - }, - { - "captures": { - "1": { - "name": "punctuation.definition.keyword.objc" - } - }, - "match": "(@)(required|optional)\\b", - "name": "keyword.control.protocol-specification.objc" - }, - { + "anonymous_pattern_10": { "captures": { "1": { "name": "punctuation.definition.keyword.objc" @@ -149,15 +149,15 @@ "match": "(@)(defs|encode)\\b", "name": "keyword.other.objc" }, - { + "anonymous_pattern_11": { "match": "\\bid\\b", "name": "storage.type.id.objc" }, - { + "anonymous_pattern_12": { "match": "\\b(IBOutlet|IBAction|BOOL|SEL|id|unichar|IMP|Class|instancetype)\\b", "name": "storage.type.objc" }, - { + "anonymous_pattern_13": { "captures": { "1": { "name": "punctuation.definition.storage.type.objc" @@ -166,7 +166,7 @@ "match": "(@)(class|protocol)\\b", "name": "storage.type.objc" }, - { + "anonymous_pattern_14": { "begin": "((@)selector)\\s*(\\()", "beginCaptures": { "1": { @@ -199,7 +199,7 @@ } ] }, - { + "anonymous_pattern_15": { "captures": { "1": { "name": "punctuation.definition.storage.modifier.objc" @@ -208,15 +208,15 @@ "match": "(@)(synchronized|public|package|private|protected)\\b", "name": "storage.modifier.objc" }, - { + "anonymous_pattern_16": { "match": "\\b(YES|NO|Nil|nil)\\b", "name": "constant.language.objc" }, - { + "anonymous_pattern_17": { "match": "\\bNSApp\\b", "name": "support.variable.foundation.objc" }, - { + "anonymous_pattern_18": { "captures": { "1": { "name": "punctuation.whitespace.support.function.cocoa.leopard.objc" @@ -227,7 +227,7 @@ }, "match": "(\\s*)\\b(NS(Rect(ToCGRect|FromCGRect)|MakeCollectable|S(tringFromProtocol|ize(ToCGSize|FromCGSize))|Draw(NinePartImage|ThreePartImage)|P(oint(ToCGPoint|FromCGPoint)|rotocolFromString)|EventMaskFromType|Value))\\b" }, - { + "anonymous_pattern_19": { "captures": { "1": { "name": "punctuation.whitespace.support.function.leading.cocoa.objc" @@ -238,58 +238,171 @@ }, "match": "(\\s*)\\b(NS(R(ound(DownToMultipleOfPageSize|UpToMultipleOfPageSize)|un(CriticalAlertPanel(RelativeToWindow)?|InformationalAlertPanel(RelativeToWindow)?|AlertPanel(RelativeToWindow)?)|e(set(MapTable|HashTable)|c(ycleZone|t(Clip(List)?|F(ill(UsingOperation|List(UsingOperation|With(Grays|Colors(UsingOperation)?))?)?|romString))|ordAllocationEvent)|turnAddress|leaseAlertPanel|a(dPixel|l(MemoryAvailable|locateCollectable))|gisterServicesProvider)|angeFromString)|Get(SizeAndAlignment|CriticalAlertPanel|InformationalAlertPanel|UncaughtExceptionHandler|FileType(s)?|WindowServerMemory|AlertPanel)|M(i(n(X|Y)|d(X|Y))|ouseInRect|a(p(Remove|Get|Member|Insert(IfAbsent|KnownAbsent)?)|ke(R(ect|ange)|Size|Point)|x(Range|X|Y)))|B(itsPer(SampleFromDepth|PixelFromDepth)|e(stDepth|ep|gin(CriticalAlertSheet|InformationalAlertSheet|AlertSheet)))|S(ho(uldRetainWithZone|w(sServicesMenuItem|AnimationEffect))|tringFrom(R(ect|ange)|MapTable|S(ize|elector)|HashTable|Class|Point)|izeFromString|e(t(ShowsServicesMenuItem|ZoneName|UncaughtExceptionHandler|FocusRingStyle)|lectorFromString|archPathForDirectoriesInDomains)|wap(Big(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|Short|Host(ShortTo(Big|Little)|IntTo(Big|Little)|DoubleTo(Big|Little)|FloatTo(Big|Little)|Long(To(Big|Little)|LongTo(Big|Little)))|Int|Double|Float|L(ittle(ShortToHost|IntToHost|DoubleToHost|FloatToHost|Long(ToHost|LongToHost))|ong(Long)?)))|H(ighlightRect|o(stByteOrder|meDirectory(ForUser)?)|eight|ash(Remove|Get|Insert(IfAbsent|KnownAbsent)?)|FSType(CodeFromFileType|OfFile))|N(umberOfColorComponents|ext(MapEnumeratorPair|HashEnumeratorItem))|C(o(n(tainsRect|vert(GlyphsToPackedGlyphs|Swapped(DoubleToHost|FloatToHost)|Host(DoubleToSwapped|FloatToSwapped)))|unt(MapTable|HashTable|Frames|Windows(ForContext)?)|py(M(emoryPages|apTableWithZone)|Bits|HashTableWithZone|Object)|lorSpaceFromDepth|mpare(MapTables|HashTables))|lassFromString|reate(MapTable(WithZone)?|HashTable(WithZone)?|Zone|File(namePboardType|ContentsPboardType)))|TemporaryDirectory|I(s(ControllerMarker|EmptyRect|FreedObject)|n(setRect|crementExtraRefCount|te(r(sect(sRect|ionR(ect|ange))|faceStyleForKey)|gralRect)))|Zone(Realloc|Malloc|Name|Calloc|Fr(omPointer|ee))|O(penStepRootDirectory|ffsetRect)|D(i(sableScreenUpdates|videRect)|ottedFrameRect|e(c(imal(Round|Multiply|S(tring|ubtract)|Normalize|Co(py|mpa(ct|re))|IsNotANumber|Divide|Power|Add)|rementExtraRefCountWasZero)|faultMallocZone|allocate(MemoryPages|Object))|raw(Gr(oove|ayBezel)|B(itmap|utton)|ColorTiledRects|TiledRects|DarkBezel|W(hiteBezel|indowBackground)|LightBezel))|U(serName|n(ionR(ect|ange)|registerServicesProvider)|pdateDynamicServices)|Java(Bundle(Setup|Cleanup)|Setup(VirtualMachine)?|Needs(ToLoadClasses|VirtualMachine)|ClassesF(orBundle|romPath)|ObjectNamedInPath|ProvidesClasses)|P(oint(InRect|FromString)|erformService|lanarFromDepth|ageSize)|E(n(d(MapTableEnumeration|HashTableEnumeration)|umerate(MapTable|HashTable)|ableScreenUpdates)|qual(R(ects|anges)|Sizes|Points)|raseRect|xtraRefCount)|F(ileTypeForHFSTypeCode|ullUserName|r(ee(MapTable|HashTable)|ame(Rect(WithWidth(UsingOperation)?)?|Address)))|Wi(ndowList(ForContext)?|dth)|Lo(cationInRange|g(v|PageSize)?)|A(ccessibility(R(oleDescription(ForUIElement)?|aiseBadArgumentException)|Unignored(Children(ForOnlyChild)?|Descendant|Ancestor)|PostNotification|ActionDescription)|pplication(Main|Load)|vailableWindowDepths|ll(MapTable(Values|Keys)|HashTableObjects|ocate(MemoryPages|Collectable|Object)))))\\b" }, - { + "anonymous_pattern_2": { + "begin": "((@)(implementation))\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*(?::\\s*([A-Za-z][A-Za-z0-9]*))?", + "captures": { + "1": { + "name": "storage.type.objc" + }, + "2": { + "name": "punctuation.definition.storage.type.objc" + }, + "4": { + "name": "entity.name.type.objc" + }, + "5": { + "name": "entity.other.inherited-class.objc" + } + }, + "contentName": "meta.scope.implementation.objc", + "end": "((@)end)\\b", + "name": "meta.implementation.objc", + "patterns": [ + { + "include": "#implementation_innards" + } + ] + }, + "anonymous_pattern_20": { "match": "\\bNS(RuleEditor|G(arbageCollector|radient)|MapTable|HashTable|Co(ndition|llectionView(Item)?)|T(oolbarItemGroup|extInputClient|r(eeNode|ackingArea))|InvocationOperation|Operation(Queue)?|D(ictionaryController|ockTile)|P(ointer(Functions|Array)|athC(o(ntrol(Delegate)?|mponentCell)|ell(Delegate)?)|r(intPanelAccessorizing|edicateEditor(RowTemplate)?))|ViewController|FastEnumeration|Animat(ionContext|ablePropertyContainer))\\b", "name": "support.class.cocoa.leopard.objc" }, - { + "anonymous_pattern_21": { "match": "\\bNS(R(u(nLoop|ler(Marker|View))|e(sponder|cursiveLock|lativeSpecifier)|an(domSpecifier|geSpecifier))|G(etCommand|lyph(Generator|Storage|Info)|raphicsContext)|XML(Node|D(ocument|TD(Node)?)|Parser|Element)|M(iddleSpecifier|ov(ie(View)?|eCommand)|utable(S(tring|et)|C(haracterSet|opying)|IndexSet|D(ictionary|ata)|URLRequest|ParagraphStyle|A(ttributedString|rray))|e(ssagePort(NameServer)?|nu(Item(Cell)?|View)?|t(hodSignature|adata(Item|Query(ResultGroup|AttributeValueTuple)?)))|a(ch(BootstrapServer|Port)|trix))|B(itmapImageRep|ox|u(ndle|tton(Cell)?)|ezierPath|rowser(Cell)?)|S(hadow|c(anner|r(ipt(SuiteRegistry|C(o(ercionHandler|mmand(Description)?)|lassDescription)|ObjectSpecifier|ExecutionContext|WhoseTest)|oll(er|View)|een))|t(epper(Cell)?|atus(Bar|Item)|r(ing|eam))|imple(HorizontalTypesetter|CString)|o(cketPort(NameServer)?|und|rtDescriptor)|p(e(cifierTest|ech(Recognizer|Synthesizer)|ll(Server|Checker))|litView)|e(cureTextField(Cell)?|t(Command)?|archField(Cell)?|rializer|gmentedC(ontrol|ell))|lider(Cell)?|avePanel)|H(ost|TTP(Cookie(Storage)?|URLResponse)|elpManager)|N(ib(Con(nector|trolConnector)|OutletConnector)?|otification(Center|Queue)?|u(ll|mber(Formatter)?)|etService(Browser)?|ameSpecifier)|C(ha(ngeSpelling|racterSet)|o(n(stantString|nection|trol(ler)?|ditionLock)|d(ing|er)|unt(Command|edSet)|pying|lor(Space|P(ick(ing(Custom|Default)|er)|anel)|Well|List)?|m(p(oundPredicate|arisonPredicate)|boBox(Cell)?))|u(stomImageRep|rsor)|IImageRep|ell|l(ipView|o(seCommand|neCommand)|assDescription)|a(ched(ImageRep|URLResponse)|lendar(Date)?)|reateCommand)|T(hread|ypesetter|ime(Zone|r)|o(olbar(Item(Validations)?)?|kenField(Cell)?)|ext(Block|Storage|Container|Tab(le(Block)?)?|Input|View|Field(Cell)?|List|Attachment(Cell)?)?|a(sk|b(le(Header(Cell|View)|Column|View)|View(Item)?))|reeController)|I(n(dex(S(pecifier|et)|Path)|put(Manager|S(tream|erv(iceProvider|er(MouseTracker)?)))|vocation)|gnoreMisspelledWords|mage(Rep|Cell|View)?)|O(ut(putStream|lineView)|pen(GL(Context|Pixel(Buffer|Format)|View)|Panel)|bj(CTypeSerializationCallBack|ect(Controller)?))|D(i(st(antObject(Request)?|ributed(NotificationCenter|Lock))|ctionary|rectoryEnumerator)|ocument(Controller)?|e(serializer|cimalNumber(Behaviors|Handler)?|leteCommand)|at(e(Components|Picker(Cell)?|Formatter)?|a)|ra(wer|ggingInfo))|U(ser(InterfaceValidations|Defaults(Controller)?)|RL(Re(sponse|quest)|Handle(Client)?|C(onnection|ache|redential(Storage)?)|Download(Delegate)?|Prot(ocol(Client)?|ectionSpace)|AuthenticationChallenge(Sender)?)?|n(iqueIDSpecifier|doManager|archiver))|P(ipe|o(sitionalSpecifier|pUpButton(Cell)?|rt(Message|NameServer|Coder)?)|ICTImageRep|ersistentDocument|DFImageRep|a(steboard|nel|ragraphStyle|geLayout)|r(int(Info|er|Operation|Panel)|o(cessInfo|tocolChecker|perty(Specifier|ListSerialization)|gressIndicator|xy)|edicate))|E(numerator|vent|PSImageRep|rror|x(ception|istsCommand|pression))|V(iew(Animation)?|al(idated(ToobarItem|UserInterfaceItem)|ue(Transformer)?))|Keyed(Unarchiver|Archiver)|Qui(ckDrawView|tCommand)|F(ile(Manager|Handle|Wrapper)|o(nt(Manager|Descriptor|Panel)?|rm(Cell|atter)))|W(hoseSpecifier|indow(Controller)?|orkspace)|L(o(c(k(ing)?|ale)|gicalTest)|evelIndicator(Cell)?|ayoutManager)|A(ssertionHandler|nimation|ctionCell|ttributedString|utoreleasePool|TSTypesetter|ppl(ication|e(Script|Event(Manager|Descriptor)))|ffineTransform|lert|r(chiver|ray(Controller)?)))\\b", "name": "support.class.cocoa.objc" }, - { + "anonymous_pattern_22": { "match": "\\bNS(R(oundingMode|ule(Editor(RowType|NestingMode)|rOrientation)|e(questUserAttentionType|lativePosition))|G(lyphInscription|radientDrawingOptions)|XML(NodeKind|D(ocumentContentKind|TDNodeKind)|ParserError)|M(ultibyteGlyphPacking|apTableOptions)|B(itmapFormat|oxType|ezierPathElement|ackgroundStyle|rowserDropOperation)|S(tr(ing(CompareOptions|DrawingOptions|EncodingConversionOptions)|eam(Status|Event))|p(eechBoundary|litViewDividerStyle)|e(archPathD(irectory|omainMask)|gmentS(tyle|witchTracking))|liderType|aveOptions)|H(TTPCookieAcceptPolicy|ashTableOptions)|N(otification(SuspensionBehavior|Coalescing)|umberFormatter(RoundingMode|Behavior|Style|PadPosition)|etService(sError|Options))|C(haracterCollection|o(lor(RenderingIntent|SpaceModel|PanelMode)|mp(oundPredicateType|arisonPredicateModifier))|ellStateValue|al(culationError|endarUnit))|T(ypesetterControlCharacterAction|imeZoneNameStyle|e(stComparisonOperation|xt(Block(Dimension|V(erticalAlignment|alueType)|Layer)|TableLayoutAlgorithm|FieldBezelStyle))|ableView(SelectionHighlightStyle|ColumnAutoresizingStyle)|rackingAreaOptions)|I(n(sertionPosition|te(rfaceStyle|ger))|mage(RepLoadStatus|Scaling|CacheMode|FrameStyle|LoadStatus|Alignment))|Ope(nGLPixelFormatAttribute|rationQueuePriority)|Date(Picker(Mode|Style)|Formatter(Behavior|Style))|U(RL(RequestCachePolicy|HandleStatus|C(acheStoragePolicy|redentialPersistence))|Integer)|P(o(stingStyle|int(ingDeviceType|erFunctionsOptions)|pUpArrowPosition)|athStyle|r(int(ing(Orientation|PaginationMode)|erTableStatus|PanelOptions)|opertyList(MutabilityOptions|Format)|edicateOperatorType))|ExpressionType|KeyValue(SetMutationKind|Change)|QTMovieLoopMode|F(indPanel(SubstringMatchType|Action)|o(nt(RenderingMode|FamilyClass)|cusRingPlacement))|W(hoseSubelementIdentifier|ind(ingRule|ow(B(utton|ackingLocation)|SharingType|CollectionBehavior)))|L(ine(MovementDirection|SweepDirection|CapStyle|JoinStyle)|evelIndicatorStyle)|Animation(BlockingMode|Curve))\\b", "name": "support.type.cocoa.leopard.objc" }, - { + "anonymous_pattern_23": { "match": "\\bC(I(Sampler|Co(ntext|lor)|Image(Accumulator)?|PlugIn(Registration)?|Vector|Kernel|Filter(Generator|Shape)?)|A(Renderer|MediaTiming(Function)?|BasicAnimation|ScrollLayer|Constraint(LayoutManager)?|T(iledLayer|extLayer|rans(ition|action))|OpenGLLayer|PropertyAnimation|KeyframeAnimation|Layer|A(nimation(Group)?|ction)))\\b", "name": "support.class.quartz.objc" }, - { + "anonymous_pattern_24": { "match": "\\bC(G(Float|Point|Size|Rect)|IFormat|AConstraintAttribute)\\b", "name": "support.type.quartz.objc" }, - { + "anonymous_pattern_25": { "match": "\\bNS(R(ect(Edge)?|ange)|G(lyph(Relation|LayoutMode)?|radientType)|M(odalSession|a(trixMode|p(Table|Enumerator)))|B(itmapImageFileType|orderType|uttonType|ezelStyle|ackingStoreType|rowserColumnResizingType)|S(cr(oll(er(Part|Arrow)|ArrowPosition)|eenAuxiliaryOpaque)|tringEncoding|ize|ocketNativeHandle|election(Granularity|Direction|Affinity)|wapped(Double|Float)|aveOperationType)|Ha(sh(Table|Enumerator)|ndler(2)?)|C(o(ntrol(Size|Tint)|mp(ositingOperation|arisonResult))|ell(State|Type|ImagePosition|Attribute))|T(hreadPrivate|ypesetterGlyphInfo|i(ckMarkPosition|tlePosition|meInterval)|o(ol(TipTag|bar(SizeMode|DisplayMode))|kenStyle)|IFFCompression|ext(TabType|Alignment)|ab(State|leViewDropOperation|ViewType)|rackingRectTag)|ImageInterpolation|Zone|OpenGL(ContextAuxiliary|PixelFormatAuxiliary)|D(ocumentChangeType|atePickerElementFlags|ra(werState|gOperation))|UsableScrollerParts|P(oint|r(intingPageOrder|ogressIndicator(Style|Th(ickness|readInfo))))|EventType|KeyValueObservingOptions|Fo(nt(SymbolicTraits|TraitMask|Action)|cusRingType)|W(indow(OrderingMode|Depth)|orkspace(IconCreationOptions|LaunchOptions)|ritingDirection)|L(ineBreakMode|ayout(Status|Direction))|A(nimation(Progress|Effect)|ppl(ication(TerminateReply|DelegateReply|PrintReply)|eEventManagerSuspensionID)|ffineTransformStruct|lertStyle))\\b", "name": "support.type.cocoa.objc" }, - { + "anonymous_pattern_26": { "match": "\\bNS(NotFound|Ordered(Ascending|Descending|Same))\\b", "name": "support.constant.cocoa.objc" }, - { + "anonymous_pattern_27": { "match": "\\bNS(MenuDidBeginTracking|ViewDidUpdateTrackingAreas)?Notification\\b", "name": "support.constant.notification.cocoa.leopard.objc" }, - { + "anonymous_pattern_28": { "match": "\\bNS(Menu(Did(RemoveItem|SendAction|ChangeItem|EndTracking|AddItem)|WillSendAction)|S(ystemColorsDidChange|plitView(DidResizeSubviews|WillResizeSubviews))|C(o(nt(extHelpModeDid(Deactivate|Activate)|rolT(intDidChange|extDid(BeginEditing|Change|EndEditing)))|lor(PanelColorDidChange|ListDidChange)|mboBox(Selection(IsChanging|DidChange)|Will(Dismiss|PopUp)))|lassDescriptionNeededForClass)|T(oolbar(DidRemoveItem|WillAddItem)|ext(Storage(DidProcessEditing|WillProcessEditing)|Did(BeginEditing|Change|EndEditing)|View(DidChange(Selection|TypingAttributes)|WillChangeNotifyingTextView))|ableView(Selection(IsChanging|DidChange)|ColumnDid(Resize|Move)))|ImageRepRegistryDidChange|OutlineView(Selection(IsChanging|DidChange)|ColumnDid(Resize|Move)|Item(Did(Collapse|Expand)|Will(Collapse|Expand)))|Drawer(Did(Close|Open)|Will(Close|Open))|PopUpButton(CellWillPopUp|WillPopUp)|View(GlobalFrameDidChange|BoundsDidChange|F(ocusDidChange|rameDidChange))|FontSetChanged|W(indow(Did(Resi(ze|gn(Main|Key))|M(iniaturize|ove)|Become(Main|Key)|ChangeScreen(|Profile)|Deminiaturize|Update|E(ndSheet|xpose))|Will(M(iniaturize|ove)|BeginSheet|Close))|orkspace(SessionDid(ResignActive|BecomeActive)|Did(Mount|TerminateApplication|Unmount|PerformFileOperation|Wake|LaunchApplication)|Will(Sleep|Unmount|PowerOff|LaunchApplication)))|A(ntialiasThresholdChanged|ppl(ication(Did(ResignActive|BecomeActive|Hide|ChangeScreenParameters|U(nhide|pdate)|FinishLaunching)|Will(ResignActive|BecomeActive|Hide|Terminate|U(nhide|pdate)|FinishLaunching))|eEventManagerWillProcessFirstEvent)))Notification\\b", "name": "support.constant.notification.cocoa.objc" }, - { + "anonymous_pattern_29": { "match": "\\bNS(RuleEditor(RowType(Simple|Compound)|NestingMode(Si(ngle|mple)|Compound|List))|GradientDraws(BeforeStartingLocation|AfterEndingLocation)|M(inusSetExpressionType|a(chPortDeallocate(ReceiveRight|SendRight|None)|pTable(StrongMemory|CopyIn|ZeroingWeakMemory|ObjectPointerPersonality)))|B(oxCustom|undleExecutableArchitecture(X86|I386|PPC(64)?)|etweenPredicateOperatorType|ackgroundStyle(Raised|Dark|L(ight|owered)))|S(tring(DrawingTruncatesLastVisibleLine|EncodingConversion(ExternalRepresentation|AllowLossy))|ubqueryExpressionType|p(e(ech(SentenceBoundary|ImmediateBoundary|WordBoundary)|llingState(GrammarFlag|SpellingFlag))|litViewDividerStyleThi(n|ck))|e(rvice(RequestTimedOutError|M(iscellaneousError|alformedServiceDictionaryError)|InvalidPasteboardDataError|ErrorM(inimum|aximum)|Application(NotFoundError|LaunchFailedError))|gmentStyle(Round(Rect|ed)|SmallSquare|Capsule|Textured(Rounded|Square)|Automatic)))|H(UDWindowMask|ashTable(StrongMemory|CopyIn|ZeroingWeakMemory|ObjectPointerPersonality))|N(oModeColorPanel|etServiceNoAutoRename)|C(hangeRedone|o(ntainsPredicateOperatorType|l(orRenderingIntent(RelativeColorimetric|Saturation|Default|Perceptual|AbsoluteColorimetric)|lectorDisabledOption))|ellHit(None|ContentArea|TrackableArea|EditableTextArea))|T(imeZoneNameStyle(S(hort(Standard|DaylightSaving)|tandard)|DaylightSaving)|extFieldDatePickerStyle|ableViewSelectionHighlightStyle(Regular|SourceList)|racking(Mouse(Moved|EnteredAndExited)|CursorUpdate|InVisibleRect|EnabledDuringMouseDrag|A(ssumeInside|ctive(In(KeyWindow|ActiveApp)|WhenFirstResponder|Always))))|I(n(tersectSetExpressionType|dexedColorSpaceModel)|mageScale(None|Proportionally(Down|UpOrDown)|AxesIndependently))|Ope(nGLPFAAllowOfflineRenderers|rationQueue(DefaultMaxConcurrentOperationCount|Priority(High|Normal|Very(High|Low)|Low)))|D(iacriticInsensitiveSearch|ownloadsDirectory)|U(nionSetExpressionType|TF(16(BigEndianStringEncoding|StringEncoding|LittleEndianStringEncoding)|32(BigEndianStringEncoding|StringEncoding|LittleEndianStringEncoding)))|P(ointerFunctions(Ma(chVirtualMemory|llocMemory)|Str(ongMemory|uctPersonality)|C(StringPersonality|opyIn)|IntegerPersonality|ZeroingWeakMemory|O(paque(Memory|Personality)|bjectP(ointerPersonality|ersonality)))|at(hStyle(Standard|NavigationBar|PopUp)|ternColorSpaceModel)|rintPanelShows(Scaling|Copies|Orientation|P(a(perSize|ge(Range|SetupAccessory))|review)))|Executable(RuntimeMismatchError|NotLoadableError|ErrorM(inimum|aximum)|L(inkError|oadError)|ArchitectureMismatchError)|KeyValueObservingOption(Initial|Prior)|F(i(ndPanelSubstringMatchType(StartsWith|Contains|EndsWith|FullWord)|leRead(TooLargeError|UnknownStringEncodingError))|orcedOrderingSearch)|Wi(ndow(BackingLocation(MainMemory|Default|VideoMemory)|Sharing(Read(Only|Write)|None)|CollectionBehavior(MoveToActiveSpace|CanJoinAllSpaces|Default))|dthInsensitiveSearch)|AggregateExpressionType)\\b", "name": "support.constant.cocoa.leopard.objc" }, - { + "anonymous_pattern_3": { + "begin": "@\"", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.begin.objc" + } + }, + "end": "\"", + "endCaptures": { + "0": { + "name": "punctuation.definition.string.end.objc" + } + }, + "name": "string.quoted.double.objc", + "patterns": [ + { + "include": "#string_escaped_char" + }, + { + "match": "(?x)%\n\t\t\t\t\t\t(\\d+\\$)? # field (argument #)\n\t\t\t\t\t\t[#0\\- +']* # flags\n\t\t\t\t\t\t((-?\\d+)|\\*(-?\\d+\\$)?)? # minimum field width\n\t\t\t\t\t\t(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)? # precision\n\t\t\t\t\t\t[@] # conversion type\n\t\t\t\t\t", + "name": "constant.other.placeholder.objc" + }, + { + "include": "#string_placeholder" + } + ] + }, + "anonymous_pattern_30": { "match": "\\bNS(R(GB(ModeColorPanel|ColorSpaceModel)|ight(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey)|ound(RectBezelStyle|Bankers|ed(BezelStyle|TokenStyle|DisclosureBezelStyle)|Down|Up|Plain|Line(CapStyle|JoinStyle))|un(StoppedResponse|ContinuesResponse|AbortedResponse)|e(s(izableWindowMask|et(CursorRectsRunLoopOrdering|FunctionKey))|ce(ssedBezelStyle|iver(sCantHandleCommandScriptError|EvaluationScriptError))|turnTextMovement|doFunctionKey|quiredArgumentsMissingScriptError|l(evancyLevelIndicatorStyle|ative(Before|After))|gular(SquareBezelStyle|ControlSize)|moveTraitFontAction)|a(n(domSubelement|geDateMode)|tingLevelIndicatorStyle|dio(ModeMatrix|Button)))|G(IFFileType|lyph(Below|Inscribe(B(elow|ase)|Over(strike|Below)|Above)|Layout(WithPrevious|A(tAPoint|gainstAPoint))|A(ttribute(BidiLevel|Soft|Inscribe|Elastic)|bove))|r(ooveBorder|eaterThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|a(y(ModeColorPanel|ColorSpaceModel)|dient(None|Con(cave(Strong|Weak)|vex(Strong|Weak)))|phiteControlTint)))|XML(N(o(tationDeclarationKind|de(CompactEmptyElement|IsCDATA|OptionsNone|Use(SingleQuotes|DoubleQuotes)|Pre(serve(NamespaceOrder|C(haracterReferences|DATA)|DTD|Prefixes|E(ntities|mptyElements)|Quotes|Whitespace|A(ttributeOrder|ll))|ttyPrint)|ExpandEmptyElement))|amespaceKind)|CommentKind|TextKind|InvalidKind|D(ocument(X(MLKind|HTMLKind|Include)|HTMLKind|T(idy(XML|HTML)|extKind)|IncludeContentTypeDeclaration|Validate|Kind)|TDKind)|P(arser(GTRequiredError|XMLDeclNot(StartedError|FinishedError)|Mi(splaced(XMLDeclarationError|CDATAEndStringError)|xedContentDeclNot(StartedError|FinishedError))|S(t(andaloneValueError|ringNot(StartedError|ClosedError))|paceRequiredError|eparatorRequiredError)|N(MTOKENRequiredError|o(t(ationNot(StartedError|FinishedError)|WellBalancedError)|DTDError)|amespaceDeclarationError|AMERequiredError)|C(haracterRef(In(DTDError|PrologError|EpilogError)|AtEOFError)|o(nditionalSectionNot(StartedError|FinishedError)|mment(NotFinishedError|ContainsDoubleHyphenError))|DATANotFinishedError)|TagNameMismatchError|In(ternalError|valid(HexCharacterRefError|C(haracter(RefError|InEntityError|Error)|onditionalSectionError)|DecimalCharacterRefError|URIError|Encoding(NameError|Error)))|OutOfMemoryError|D(ocumentStartError|elegateAbortedParseError|OCTYPEDeclNotFinishedError)|U(RI(RequiredError|FragmentError)|n(declaredEntityError|parsedEntityError|knownEncodingError|finishedTagError))|P(CDATARequiredError|ublicIdentifierRequiredError|arsedEntityRef(MissingSemiError|NoNameError|In(Internal(SubsetError|Error)|PrologError|EpilogError)|AtEOFError)|r(ocessingInstructionNot(StartedError|FinishedError)|ematureDocumentEndError))|E(n(codingNotSupportedError|tity(Ref(In(DTDError|PrologError|EpilogError)|erence(MissingSemiError|WithoutNameError)|LoopError|AtEOFError)|BoundaryError|Not(StartedError|FinishedError)|Is(ParameterError|ExternalError)|ValueRequiredError))|qualExpectedError|lementContentDeclNot(StartedError|FinishedError)|xt(ernalS(tandaloneEntityError|ubsetNotFinishedError)|raContentError)|mptyDocumentError)|L(iteralNot(StartedError|FinishedError)|T(RequiredError|SlashRequiredError)|essThanSymbolInAttributeError)|Attribute(RedefinedError|HasNoValueError|Not(StartedError|FinishedError)|ListNot(StartedError|FinishedError)))|rocessingInstructionKind)|E(ntity(GeneralKind|DeclarationKind|UnparsedKind|P(ar(sedKind|ameterKind)|redefined))|lement(Declaration(MixedKind|UndefinedKind|E(lementKind|mptyKind)|Kind|AnyKind)|Kind))|Attribute(N(MToken(sKind|Kind)|otationKind)|CDATAKind|ID(Ref(sKind|Kind)|Kind)|DeclarationKind|En(tit(yKind|iesKind)|umerationKind)|Kind))|M(i(n(XEdge|iaturizableWindowMask|YEdge|uteCalendarUnit)|terLineJoinStyle|ddleSubelement|xedState)|o(nthCalendarUnit|deSwitchFunctionKey|use(Moved(Mask)?|E(ntered(Mask)?|ventSubtype|xited(Mask)?))|veToBezierPathElement|mentary(ChangeButton|Push(Button|InButton)|Light(Button)?))|enuFunctionKey|a(c(intoshInterfaceStyle|OSRomanStringEncoding)|tchesPredicateOperatorType|ppedRead|x(XEdge|YEdge))|ACHOperatingSystem)|B(MPFileType|o(ttomTabsBezelBorder|ldFontMask|rderlessWindowMask|x(Se(condary|parator)|OldStyle|Primary))|uttLineCapStyle|e(zelBorder|velLineJoinStyle|low(Bottom|Top)|gin(sWith(Comparison|PredicateOperatorType)|FunctionKey))|lueControlTint|ack(spaceCharacter|tabTextMovement|ingStore(Retained|Buffered|Nonretained)|TabCharacter|wardsSearch|groundTab)|r(owser(NoColumnResizing|UserColumnResizing|AutoColumnResizing)|eakFunctionKey))|S(h(ift(JISStringEncoding|KeyMask)|ow(ControlGlyphs|InvisibleGlyphs)|adowlessSquareBezelStyle)|y(s(ReqFunctionKey|tem(D(omainMask|efined(Mask)?)|FunctionKey))|mbolStringEncoding)|c(a(nnedOption|le(None|ToFit|Proportionally))|r(oll(er(NoPart|Increment(Page|Line|Arrow)|Decrement(Page|Line|Arrow)|Knob(Slot)?|Arrows(M(inEnd|axEnd)|None|DefaultSetting))|Wheel(Mask)?|LockFunctionKey)|eenChangedEventType))|t(opFunctionKey|r(ingDrawing(OneShot|DisableScreenFontSubstitution|Uses(DeviceMetrics|FontLeading|LineFragmentOrigin))|eam(Status(Reading|NotOpen|Closed|Open(ing)?|Error|Writing|AtEnd)|Event(Has(BytesAvailable|SpaceAvailable)|None|OpenCompleted|E(ndEncountered|rrorOccurred)))))|i(ngle(DateMode|UnderlineStyle)|ze(DownFontAction|UpFontAction))|olarisOperatingSystem|unOSOperatingSystem|pecialPageOrder|e(condCalendarUnit|lect(By(Character|Paragraph|Word)|i(ng(Next|Previous)|onAffinity(Downstream|Upstream))|edTab|FunctionKey)|gmentSwitchTracking(Momentary|Select(One|Any)))|quareLineCapStyle|witchButton|ave(ToOperation|Op(tions(Yes|No|Ask)|eration)|AsOperation)|mall(SquareBezelStyle|C(ontrolSize|apsFontMask)|IconButtonBezelStyle))|H(ighlightModeMatrix|SBModeColorPanel|o(ur(Minute(SecondDatePickerElementFlag|DatePickerElementFlag)|CalendarUnit)|rizontalRuler|meFunctionKey)|TTPCookieAcceptPolicy(Never|OnlyFromMainDocumentDomain|Always)|e(lp(ButtonBezelStyle|KeyMask|FunctionKey)|avierFontAction)|PUXOperatingSystem)|Year(MonthDa(yDatePickerElementFlag|tePickerElementFlag)|CalendarUnit)|N(o(n(StandardCharacterSetFontMask|ZeroWindingRule|activatingPanelMask|LossyASCIIStringEncoding)|Border|t(ification(SuspensionBehavior(Hold|Coalesce|D(eliverImmediately|rop))|NoCoalescing|CoalescingOn(Sender|Name)|DeliverImmediately|PostToAllSessions)|PredicateType|EqualToPredicateOperatorType)|S(cr(iptError|ollerParts)|ubelement|pecifierError)|CellMask|T(itle|opLevelContainersSpecifierError|abs(BezelBorder|NoBorder|LineBorder))|I(nterfaceStyle|mage)|UnderlineStyle|FontChangeAction)|u(ll(Glyph|CellType)|m(eric(Search|PadKeyMask)|berFormatter(Round(Half(Down|Up|Even)|Ceiling|Down|Up|Floor)|Behavior(10|Default)|S(cientificStyle|pellOutStyle)|NoStyle|CurrencyStyle|DecimalStyle|P(ercentStyle|ad(Before(Suffix|Prefix)|After(Suffix|Prefix))))))|e(t(Services(BadArgumentError|NotFoundError|C(ollisionError|ancelledError)|TimeoutError|InvalidError|UnknownError|ActivityInProgress)|workDomainMask)|wlineCharacter|xt(StepInterfaceStyle|FunctionKey))|EXTSTEPStringEncoding|a(t(iveShortGlyphPacking|uralTextAlignment)|rrowFontMask))|C(hange(ReadOtherContents|GrayCell(Mask)?|BackgroundCell(Mask)?|Cleared|Done|Undone|Autosaved)|MYK(ModeColorPanel|ColorSpaceModel)|ircular(BezelStyle|Slider)|o(n(stantValueExpressionType|t(inuousCapacityLevelIndicatorStyle|entsCellMask|ain(sComparison|erSpecifierError)|rol(Glyph|KeyMask))|densedFontMask)|lor(Panel(RGBModeMask|GrayModeMask|HSBModeMask|C(MYKModeMask|olorListModeMask|ustomPaletteModeMask|rayonModeMask)|WheelModeMask|AllModesMask)|ListModeColorPanel)|reServiceDirectory|m(p(osite(XOR|Source(In|O(ut|ver)|Atop)|Highlight|C(opy|lear)|Destination(In|O(ut|ver)|Atop)|Plus(Darker|Lighter))|ressedFontMask)|mandKeyMask))|u(stom(SelectorPredicateOperatorType|PaletteModeColorPanel)|r(sor(Update(Mask)?|PointingDevice)|veToBezierPathElement))|e(nterT(extAlignment|abStopType)|ll(State|H(ighlighted|as(Image(Horizontal|OnLeftOrBottom)|OverlappingImage))|ChangesContents|Is(Bordered|InsetButton)|Disabled|Editable|LightsBy(Gray|Background|Contents)|AllowsMixedState))|l(ipPagination|o(s(ePathBezierPathElement|ableWindowMask)|ckAndCalendarDatePickerStyle)|ear(ControlTint|DisplayFunctionKey|LineFunctionKey))|a(seInsensitive(Search|PredicateOption)|n(notCreateScriptCommandError|cel(Button|TextMovement))|chesDirectory|lculation(NoError|Overflow|DivideByZero|Underflow|LossOfPrecision)|rriageReturnCharacter)|r(itical(Request|AlertStyle)|ayonModeColorPanel))|T(hick(SquareBezelStyle|erSquareBezelStyle)|ypesetter(Behavior|HorizontalTabAction|ContainerBreakAction|ZeroAdvancementAction|OriginalBehavior|ParagraphBreakAction|WhitespaceAction|L(ineBreakAction|atestBehavior))|i(ckMark(Right|Below|Left|Above)|tledWindowMask|meZoneDatePickerElementFlag)|o(olbarItemVisibilityPriority(Standard|High|User|Low)|pTabsBezelBorder|ggleButton)|IFF(Compression(N(one|EXT)|CCITTFAX(3|4)|OldJPEG|JPEG|PackBits|LZW)|FileType)|e(rminate(Now|Cancel|Later)|xt(Read(InapplicableDocumentTypeError|WriteErrorM(inimum|aximum))|Block(M(i(nimum(Height|Width)|ddleAlignment)|a(rgin|ximum(Height|Width)))|B(o(ttomAlignment|rder)|aselineAlignment)|Height|TopAlignment|P(ercentageValueType|adding)|Width|AbsoluteValueType)|StorageEdited(Characters|Attributes)|CellType|ured(RoundedBezelStyle|BackgroundWindowMask|SquareBezelStyle)|Table(FixedLayoutAlgorithm|AutomaticLayoutAlgorithm)|Field(RoundedBezel|SquareBezel|AndStepperDatePickerStyle)|WriteInapplicableDocumentTypeError|ListPrependEnclosingMarker))|woByteGlyphPacking|ab(Character|TextMovement|le(tP(oint(Mask|EventSubtype)?|roximity(Mask|EventSubtype)?)|Column(NoResizing|UserResizingMask|AutoresizingMask)|View(ReverseSequentialColumnAutoresizingStyle|GridNone|S(olid(HorizontalGridLineMask|VerticalGridLineMask)|equentialColumnAutoresizingStyle)|NoColumnAutoresizing|UniformColumnAutoresizingStyle|FirstColumnOnlyAutoresizingStyle|LastColumnOnlyAutoresizingStyle)))|rackModeMatrix)|I(n(sert(CharFunctionKey|FunctionKey|LineFunctionKey)|t(Type|ernalS(criptError|pecifierError))|dexSubelement|validIndexSpecifierError|formational(Request|AlertStyle)|PredicateOperatorType)|talicFontMask|SO(2022JPStringEncoding|Latin(1StringEncoding|2StringEncoding))|dentityMappingCharacterCollection|llegalTextMovement|mage(R(ight|ep(MatchesDevice|LoadStatus(ReadingHeader|Completed|InvalidData|Un(expectedEOF|knownType)|WillNeedAllData)))|Below|C(ellType|ache(BySize|Never|Default|Always))|Interpolation(High|None|Default|Low)|O(nly|verlaps)|Frame(Gr(oove|ayBezel)|Button|None|Photo)|L(oadStatus(ReadError|C(ompleted|ancelled)|InvalidData|UnexpectedEOF)|eft)|A(lign(Right|Bottom(Right|Left)?|Center|Top(Right|Left)?|Left)|bove)))|O(n(State|eByteGlyphPacking|OffButton|lyScrollerArrows)|ther(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|TextMovement)|SF1OperatingSystem|pe(n(GL(GO(Re(setLibrary|tainRenderers)|ClearFormatCache|FormatCacheSize)|PFA(R(obust|endererID)|M(inimumPolicy|ulti(sample|Screen)|PSafe|aximumPolicy)|BackingStore|S(creenMask|te(ncilSize|reo)|ingleRenderer|upersample|ample(s|Buffers|Alpha))|NoRecovery|C(o(lor(Size|Float)|mpliant)|losestPolicy)|OffScreen|D(oubleBuffer|epthSize)|PixelBuffer|VirtualScreenCount|FullScreen|Window|A(cc(umSize|elerated)|ux(Buffers|DepthStencil)|l(phaSize|lRenderers))))|StepUnicodeReservedBase)|rationNotSupportedForKeyS(criptError|pecifierError))|ffState|KButton|rPredicateType|bjC(B(itfield|oolType)|S(hortType|tr(ingType|uctType)|electorType)|NoType|CharType|ObjectType|DoubleType|UnionType|PointerType|VoidType|FloatType|Long(Type|longType)|ArrayType))|D(i(s(c(losureBezelStyle|reteCapacityLevelIndicatorStyle)|playWindowRunLoopOrdering)|acriticInsensitivePredicateOption|rect(Selection|PredicateModifier))|o(c(ModalWindowMask|ument(Directory|ationDirectory))|ubleType|wn(TextMovement|ArrowFunctionKey))|e(s(cendingPageOrder|ktopDirectory)|cimalTabStopType|v(ice(NColorSpaceModel|IndependentModifierFlagsMask)|eloper(Directory|ApplicationDirectory))|fault(ControlTint|TokenStyle)|lete(Char(acter|FunctionKey)|FunctionKey|LineFunctionKey)|moApplicationDirectory)|a(yCalendarUnit|teFormatter(MediumStyle|Behavior(10|Default)|ShortStyle|NoStyle|FullStyle|LongStyle))|ra(wer(Clos(ingState|edState)|Open(ingState|State))|gOperation(Generic|Move|None|Copy|Delete|Private|Every|Link|All)))|U(ser(CancelledError|D(irectory|omainMask)|FunctionKey)|RL(Handle(NotLoaded|Load(Succeeded|InProgress|Failed))|CredentialPersistence(None|Permanent|ForSession))|n(scaledWindowMask|cachedRead|i(codeStringEncoding|talicFontMask|fiedTitleAndToolbarWindowMask)|d(o(CloseGroupingRunLoopOrdering|FunctionKey)|e(finedDateComponent|rline(Style(Single|None|Thick|Double)|Pattern(Solid|D(ot|ash(Dot(Dot)?)?)))))|known(ColorSpaceModel|P(ointingDevice|ageOrder)|KeyS(criptError|pecifierError))|boldFontMask)|tilityWindowMask|TF8StringEncoding|p(dateWindowsRunLoopOrdering|TextMovement|ArrowFunctionKey))|J(ustifiedTextAlignment|PEG(2000FileType|FileType)|apaneseEUC(GlyphPacking|StringEncoding))|P(o(s(t(Now|erFontMask|WhenIdle|ASAP)|iti(on(Replace|Be(fore|ginning)|End|After)|ve(IntType|DoubleType|FloatType)))|pUp(NoArrow|ArrowAt(Bottom|Center))|werOffEventType|rtraitOrientation)|NGFileType|ush(InCell(Mask)?|OnPushOffButton)|e(n(TipMask|UpperSideMask|PointingDevice|LowerSideMask)|riodic(Mask)?)|P(S(caleField|tatus(Title|Field)|aveButton)|N(ote(Title|Field)|ame(Title|Field))|CopiesField|TitleField|ImageButton|OptionsButton|P(a(perFeedButton|ge(Range(To|From)|ChoiceMatrix))|reviewButton)|LayoutButton)|lainTextTokenStyle|a(useFunctionKey|ragraphSeparatorCharacter|ge(DownFunctionKey|UpFunctionKey))|r(int(ing(ReplyLater|Success|Cancelled|Failure)|ScreenFunctionKey|erTable(NotFound|OK|Error)|FunctionKey)|o(p(ertyList(XMLFormat|MutableContainers(AndLeaves)?|BinaryFormat|Immutable|OpenStepFormat)|rietaryStringEncoding)|gressIndicator(BarStyle|SpinningStyle|Preferred(SmallThickness|Thickness|LargeThickness|AquaThickness)))|e(ssedTab|vFunctionKey))|L(HeightForm|CancelButton|TitleField|ImageButton|O(KButton|rientationMatrix)|UnitsButton|PaperNameButton|WidthForm))|E(n(terCharacter|d(sWith(Comparison|PredicateOperatorType)|FunctionKey))|v(e(nOddWindingRule|rySubelement)|aluatedObjectExpressionType)|qualTo(Comparison|PredicateOperatorType)|ra(serPointingDevice|CalendarUnit|DatePickerElementFlag)|x(clude(10|QuickDrawElementsIconCreationOption)|pandedFontMask|ecuteFunctionKey))|V(i(ew(M(in(XMargin|YMargin)|ax(XMargin|YMargin))|HeightSizable|NotSizable|WidthSizable)|aPanelFontAction)|erticalRuler|a(lidationErrorM(inimum|aximum)|riableExpressionType))|Key(SpecifierEvaluationScriptError|Down(Mask)?|Up(Mask)?|PathExpressionType|Value(MinusSetMutation|SetSetMutation|Change(Re(placement|moval)|Setting|Insertion)|IntersectSetMutation|ObservingOption(New|Old)|UnionSetMutation|ValidationError))|QTMovie(NormalPlayback|Looping(BackAndForthPlayback|Playback))|F(1(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|7FunctionKey|i(nd(PanelAction(Replace(A(ndFind|ll(InSelection)?))?|S(howFindPanel|e(tFindString|lectAll(InSelection)?))|Next|Previous)|FunctionKey)|tPagination|le(Read(No(SuchFileError|PermissionError)|CorruptFileError|In(validFileNameError|applicableStringEncodingError)|Un(supportedSchemeError|knownError))|HandlingPanel(CancelButton|OKButton)|NoSuchFileError|ErrorM(inimum|aximum)|Write(NoPermissionError|In(validFileNameError|applicableStringEncodingError)|OutOfSpaceError|Un(supportedSchemeError|knownError))|LockingError)|xedPitchFontMask)|2(1FunctionKey|7FunctionKey|2FunctionKey|8FunctionKey|3FunctionKey|9FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey|6FunctionKey)|o(nt(Mo(noSpaceTrait|dernSerifsClass)|BoldTrait|S(ymbolicClass|criptsClass|labSerifsClass|ansSerifClass)|C(o(ndensedTrait|llectionApplicationOnlyMask)|larendonSerifsClass)|TransitionalSerifsClass|I(ntegerAdvancementsRenderingMode|talicTrait)|O(ldStyleSerifsClass|rnamentalsClass)|DefaultRenderingMode|U(nknownClass|IOptimizedTrait)|Panel(S(hadowEffectModeMask|t(andardModesMask|rikethroughEffectModeMask)|izeModeMask)|CollectionModeMask|TextColorEffectModeMask|DocumentColorEffectModeMask|UnderlineEffectModeMask|FaceModeMask|All(ModesMask|EffectsModeMask))|ExpandedTrait|VerticalTrait|F(amilyClassMask|reeformSerifsClass)|Antialiased(RenderingMode|IntegerAdvancementsRenderingMode))|cusRing(Below|Type(None|Default|Exterior)|Only|Above)|urByteGlyphPacking|rm(attingError(M(inimum|aximum))?|FeedCharacter))|8FunctionKey|unction(ExpressionType|KeyMask)|3(1FunctionKey|2FunctionKey|3FunctionKey|4FunctionKey|5FunctionKey|FunctionKey|0FunctionKey)|9FunctionKey|4FunctionKey|P(RevertButton|S(ize(Title|Field)|etButton)|CurrentField|Preview(Button|Field))|l(oat(ingPointSamplesBitmapFormat|Type)|agsChanged(Mask)?)|axButton|5FunctionKey|6FunctionKey)|W(heelModeColorPanel|indow(s(NTOperatingSystem|CP125(1StringEncoding|2StringEncoding|3StringEncoding|4StringEncoding|0StringEncoding)|95(InterfaceStyle|OperatingSystem))|M(iniaturizeButton|ovedEventType)|Below|CloseButton|ToolbarButton|ZoomButton|Out|DocumentIconButton|ExposedEventType|Above)|orkspaceLaunch(NewInstance|InhibitingBackgroundOnly|Default|PreferringClassic|WithoutA(ctivation|ddingToRecents)|A(sync|nd(Hide(Others)?|Print)|llowingClassicStartup))|eek(day(CalendarUnit|OrdinalCalendarUnit)|CalendarUnit)|a(ntsBidiLevels|rningAlertStyle)|r(itingDirection(RightToLeft|Natural|LeftToRight)|apCalendarComponents))|L(i(stModeMatrix|ne(Moves(Right|Down|Up|Left)|B(order|reakBy(C(harWrapping|lipping)|Truncating(Middle|Head|Tail)|WordWrapping))|S(eparatorCharacter|weep(Right|Down|Up|Left))|ToBezierPathElement|DoesntMove|arSlider)|teralSearch|kePredicateOperatorType|ghterFontAction|braryDirectory)|ocalDomainMask|e(ssThan(Comparison|OrEqualTo(Comparison|PredicateOperatorType)|PredicateOperatorType)|ft(Mouse(D(own(Mask)?|ragged(Mask)?)|Up(Mask)?)|T(ext(Movement|Alignment)|ab(sBezelBorder|StopType))|ArrowFunctionKey))|a(yout(RightToLeft|NotDone|CantFit|OutOfGlyphs|Done|LeftToRight)|ndscapeOrientation)|ABColorSpaceModel)|A(sc(iiWithDoubleByteEUCGlyphPacking|endingPageOrder)|n(y(Type|PredicateModifier|EventMask)|choredSearch|imation(Blocking|Nonblocking(Threaded)?|E(ffect(DisappearingItemDefault|Poof)|ase(In(Out)?|Out))|Linear)|dPredicateType)|t(Bottom|tachmentCharacter|omicWrite|Top)|SCIIStringEncoding|d(obe(GB1CharacterCollection|CNS1CharacterCollection|Japan(1CharacterCollection|2CharacterCollection)|Korea1CharacterCollection)|dTraitFontAction|minApplicationDirectory)|uto(saveOperation|Pagination)|pp(lication(SupportDirectory|D(irectory|e(fined(Mask)?|legateReply(Success|Cancel|Failure)|activatedEventType))|ActivatedEventType)|KitDefined(Mask)?)|l(ternateKeyMask|pha(ShiftKeyMask|NonpremultipliedBitmapFormat|FirstBitmapFormat)|ert(SecondButtonReturn|ThirdButtonReturn|OtherReturn|DefaultReturn|ErrorReturn|FirstButtonReturn|AlternateReturn)|l(ScrollerParts|DomainsMask|PredicateModifier|LibrariesDirectory|ApplicationsDirectory))|rgument(sWrongScriptError|EvaluationScriptError)|bove(Bottom|Top)|WTEventType))\\b", "name": "support.constant.cocoa.objc" }, - { - "include": "#bracketed_content" + "anonymous_pattern_4": { + "begin": "\\b(id)\\s*(?=<)", + "beginCaptures": { + "1": { + "name": "storage.type.objc" + } + }, + "end": "(?<=>)", + "name": "meta.id-with-protocol.objc", + "patterns": [ + { + "include": "#protocol_list" + } + ] + }, + "anonymous_pattern_5": { + "match": "\\b(NS_DURING|NS_HANDLER|NS_ENDHANDLER)\\b", + "name": "keyword.control.macro.objc" + }, + "anonymous_pattern_7": { + "captures": { + "1": { + "name": "punctuation.definition.keyword.objc" + } + }, + "match": "(@)(try|catch|finally|throw)\\b", + "name": "keyword.control.exception.objc" + }, + "anonymous_pattern_8": { + "captures": { + "1": { + "name": "punctuation.definition.keyword.objc" + } + }, + "match": "(@)(synchronized)\\b", + "name": "keyword.control.synchronize.objc" + }, + "anonymous_pattern_9": { + "captures": { + "1": { + "name": "punctuation.definition.keyword.objc" + } + }, + "match": "(@)(required|optional)\\b", + "name": "keyword.control.protocol-specification.objc" + }, + "apple_foundation_functional_macros": { + "begin": "(\\b(?:API_AVAILABLE|API_DEPRECATED|API_UNAVAILABLE|NS_AVAILABLE|NS_AVAILABLE_MAC|NS_AVAILABLE_IOS|NS_DEPRECATED|NS_DEPRECATED_MAC|NS_DEPRECATED_IOS|NS_SWIFT_NAME))(?:(?:\\s)+)?(\\()", + "end": "\\)", + "beginCaptures": { + "1": { + "name": "entity.name.function.preprocessor.apple-foundation.objc" + }, + "2": { + "name": "punctuation.section.macro.arguments.begin.bracket.round.apple-foundation.objc" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.section.macro.arguments.end.bracket.round.apple-foundation.objc" + } + }, + "name": "meta.preprocessor.macro.callable.apple-foundation.objc", + "patterns": [ + { + "include": "#c_lang" + } + ] }, - { - "include": "#c_lang" - } - ], - "repository": { "bracketed_content": { "begin": "\\[", "beginCaptures": { @@ -2721,7 +2834,15 @@ "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*(\\b(?!(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool|_Complex|_Imaginary|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t))[a-zA-Z_]\\w*\\b(?!\\())", "captures": { "1": { - "name": "variable.other.object.access.objc" + "patterns": [ + { + "include": "#special_variables" + }, + { + "name": "variable.other.object.access.objc", + "match": "(.+)" + } + ] }, "2": { "name": "punctuation.separator.dot-access.objc" @@ -2741,7 +2862,15 @@ "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))", "captures": { "1": { - "name": "variable.other.object.access.objc" + "patterns": [ + { + "include": "#special_variables" + }, + { + "name": "variable.other.object.access.objc", + "match": "(.+)" + } + ] }, "2": { "name": "punctuation.separator.dot-access.objc" @@ -2763,7 +2892,15 @@ "begin": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()", "beginCaptures": { "1": { - "name": "variable.other.object.access.objc" + "patterns": [ + { + "include": "#special_variables" + }, + { + "name": "variable.other.object.access.objc", + "match": "(.+)" + } + ] }, "2": { "name": "punctuation.separator.dot-access.objc" @@ -2783,7 +2920,15 @@ "match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))", "captures": { "1": { - "name": "variable.other.object.access.objc" + "patterns": [ + { + "include": "#special_variables" + }, + { + "name": "variable.other.object.access.objc", + "match": "(.+)" + } + ] }, "2": { "name": "punctuation.separator.dot-access.objc" diff --git a/extensions/package.json b/extensions/package.json index 2c89538c8a2..e12225cc76f 100644 --- a/extensions/package.json +++ b/extensions/package.json @@ -4,7 +4,7 @@ "license": "MIT", "description": "Dependencies shared by all extensions", "dependencies": { - "typescript": "4.7.3" + "typescript": "4.8.4" }, "scripts": { "postinstall": "node ./postinstall.mjs" diff --git a/extensions/php-language-features/package.json b/extensions/php-language-features/package.json index 8c0d484535b..dd7f6445d1a 100644 --- a/extensions/php-language-features/package.json +++ b/extensions/php-language-features/package.json @@ -74,7 +74,7 @@ "watch": "npx gulp watch-extension:php-language-features" }, "dependencies": { - "vscode-nls": "^4.0.0", + "vscode-nls": "^5.2.0", "which": "^2.0.2" }, "devDependencies": { diff --git a/extensions/php-language-features/src/features/completionItemProvider.ts b/extensions/php-language-features/src/features/completionItemProvider.ts index c57085c3fc8..205c59d77b8 100644 --- a/extensions/php-language-features/src/features/completionItemProvider.ts +++ b/extensions/php-language-features/src/features/completionItemProvider.ts @@ -10,15 +10,15 @@ import phpGlobalFunctions = require('./phpGlobalFunctions'); export default class PHPCompletionItemProvider implements CompletionItemProvider { public provideCompletionItems(document: TextDocument, position: Position, _token: CancellationToken, context: CompletionContext): Promise { - let result: CompletionItem[] = []; + const result: CompletionItem[] = []; - let shouldProvideCompletionItems = workspace.getConfiguration('php').get('suggest.basic', true); + const shouldProvideCompletionItems = workspace.getConfiguration('php').get('suggest.basic', true); if (!shouldProvideCompletionItems) { return Promise.resolve(result); } let range = document.getWordRangeAtPosition(position); - let prefix = range ? document.getText(range) : ''; + const prefix = range ? document.getText(range) : ''; if (!range) { range = new Range(position, position); } @@ -31,9 +31,9 @@ export default class PHPCompletionItemProvider implements CompletionItemProvider } } - let added: any = {}; - let createNewProposal = function (kind: CompletionItemKind, name: string, entry: phpGlobals.IEntry | null): CompletionItem { - let proposal: CompletionItem = new CompletionItem(name); + const added: any = {}; + const createNewProposal = function (kind: CompletionItemKind, name: string, entry: phpGlobals.IEntry | null): CompletionItem { + const proposal: CompletionItem = new CompletionItem(name); proposal.kind = kind; if (entry) { if (entry.description) { @@ -46,63 +46,63 @@ export default class PHPCompletionItemProvider implements CompletionItemProvider return proposal; }; - let matches = (name: string) => { + const matches = (name: string) => { return prefix.length === 0 || name.length >= prefix.length && name.substr(0, prefix.length) === prefix; }; if (matches('php') && range.start.character >= 2) { - let twoBeforePosition = new Position(range.start.line, range.start.character - 2); - let beforeWord = document.getText(new Range(twoBeforePosition, range.start)); + const twoBeforePosition = new Position(range.start.line, range.start.character - 2); + const beforeWord = document.getText(new Range(twoBeforePosition, range.start)); if (beforeWord === '('suggest.basic', true); + const enable = workspace.getConfiguration('php').get('suggest.basic', true); if (!enable) { return undefined; } - let wordRange = document.getWordRangeAtPosition(position); + const wordRange = document.getWordRangeAtPosition(position); if (!wordRange) { return undefined; } - let name = document.getText(wordRange); + const name = document.getText(wordRange); - let entry = phpGlobalFunctions.globalfunctions[name] || phpGlobals.compiletimeconstants[name] || phpGlobals.globalvariables[name] || phpGlobals.keywords[name]; + const entry = phpGlobalFunctions.globalfunctions[name] || phpGlobals.compiletimeconstants[name] || phpGlobals.globalvariables[name] || phpGlobals.keywords[name]; if (entry && entry.description) { - let signature = name + (entry.signature || ''); - let contents: MarkedString[] = [textToMarkedString(entry.description), { language: 'php', value: signature }]; + const signature = name + (entry.signature || ''); + const contents: MarkedString[] = [textToMarkedString(entry.description), { language: 'php', value: signature }]; return new Hover(contents, wordRange); } diff --git a/extensions/php-language-features/src/features/signatureHelpProvider.ts b/extensions/php-language-features/src/features/signatureHelpProvider.ts index 09db65929da..bf56516caf0 100644 --- a/extensions/php-language-features/src/features/signatureHelpProvider.ts +++ b/extensions/php-language-features/src/features/signatureHelpProvider.ts @@ -58,7 +58,7 @@ class BackwardIterator { this.lineNumber = -1; return BOF; } - let ch = this.line.charCodeAt(this.offset); + const ch = this.line.charCodeAt(this.offset); this.offset--; return ch; } @@ -69,36 +69,36 @@ class BackwardIterator { export default class PHPSignatureHelpProvider implements SignatureHelpProvider { public provideSignatureHelp(document: TextDocument, position: Position, _token: CancellationToken): Promise | null { - let enable = workspace.getConfiguration('php').get('suggest.basic', true); + const enable = workspace.getConfiguration('php').get('suggest.basic', true); if (!enable) { return null; } - let iterator = new BackwardIterator(document, position.character - 1, position.line); + const iterator = new BackwardIterator(document, position.character - 1, position.line); - let paramCount = this.readArguments(iterator); + const paramCount = this.readArguments(iterator); if (paramCount < 0) { return null; } - let ident = this.readIdent(iterator); + const ident = this.readIdent(iterator); if (!ident) { return null; } - let entry = phpGlobalFunctions.globalfunctions[ident] || phpGlobals.keywords[ident]; + const entry = phpGlobalFunctions.globalfunctions[ident] || phpGlobals.keywords[ident]; if (!entry || !entry.signature) { return null; } - let paramsString = entry.signature.substring(0, entry.signature.lastIndexOf(')') + 1); - let signatureInfo = new SignatureInformation(ident + paramsString, entry.description); + const paramsString = entry.signature.substring(0, entry.signature.lastIndexOf(')') + 1); + const signatureInfo = new SignatureInformation(ident + paramsString, entry.description); - let re = /\w*\s+\&?\$[\w_\.]+|void/g; + const re = /\w*\s+\&?\$[\w_\.]+|void/g; let match: RegExpExecArray | null = null; while ((match = re.exec(paramsString)) !== null) { signatureInfo.parameters.push({ label: match[0], documentation: '' }); } - let ret = new SignatureHelp(); + const ret = new SignatureHelp(); ret.signatures.push(signatureInfo); ret.activeSignature = 0; ret.activeParameter = Math.min(paramCount, signatureInfo.parameters.length - 1); @@ -111,7 +111,7 @@ export default class PHPSignatureHelpProvider implements SignatureHelpProvider { let curlyNesting = 0; let paramCount = 0; while (iterator.hasNext()) { - let ch = iterator.next(); + const ch = iterator.next(); switch (ch) { case _LParent: parentNesting--; @@ -156,7 +156,7 @@ export default class PHPSignatureHelpProvider implements SignatureHelpProvider { let identStarted = false; let ident = ''; while (iterator.hasNext()) { - let ch = iterator.next(); + const ch = iterator.next(); if (!identStarted && (ch === _WSB || ch === _TAB || ch === _NL)) { continue; } diff --git a/extensions/php-language-features/src/features/utils/async.ts b/extensions/php-language-features/src/features/utils/async.ts index 7364553e081..84a54c4fcd1 100644 --- a/extensions/php-language-features/src/features/utils/async.ts +++ b/extensions/php-language-features/src/features/utils/async.ts @@ -44,10 +44,10 @@ export class Throttler { this.queuedPromiseFactory = promiseFactory; if (!this.queuedPromise) { - let onComplete = () => { + const onComplete = () => { this.queuedPromise = null; - let result = this.queue(this.queuedPromiseFactory!); + const result = this.queue(this.queuedPromiseFactory!); this.queuedPromiseFactory = null; return result; @@ -127,7 +127,7 @@ export class Delayer { this.completionPromise = null; this.onResolve = null; - let result = this.task!(); + const result = this.task!(); this.task = null; return result; diff --git a/extensions/php-language-features/src/features/validationProvider.ts b/extensions/php-language-features/src/features/validationProvider.ts index 6a494b3231a..b50e2e8e779 100644 --- a/extensions/php-language-features/src/features/validationProvider.ts +++ b/extensions/php-language-features/src/features/validationProvider.ts @@ -10,7 +10,7 @@ import * as path from 'path'; import * as vscode from 'vscode'; import { ThrottledDelayer } from './utils/async'; import * as nls from 'vscode-nls'; -let localize = nls.loadMessageBundle(); +const localize = nls.loadMessageBundle(); const enum Setting { Run = 'php.validate.run', @@ -28,8 +28,8 @@ export class LineDecoder { } public write(buffer: Buffer): string[] { - let result: string[] = []; - let value = this.remaining + const result: string[] = []; + const value = this.remaining ? this.remaining + this.stringDecoder.write(buffer) : this.stringDecoder.write(buffer); @@ -70,11 +70,11 @@ enum RunTrigger { } namespace RunTrigger { - export let strings = { + export const strings = { onSave: 'onSave', onType: 'onType' }; - export let from = function (value: string): RunTrigger { + export const from = function (value: string): RunTrigger { if (value === 'onType') { return RunTrigger.onType; } else { @@ -165,7 +165,7 @@ export default class PHPValidationProvider { } if (vscode.workspace.isTrusted) { - let key = textDocument.uri.toString(); + const key = textDocument.uri.toString(); let delayer = this.delayers![key]; if (!delayer) { delayer = new ThrottledDelayer(this.config?.trigger === RunTrigger.onType ? 250 : 0); @@ -191,14 +191,14 @@ export default class PHPValidationProvider { return; } - let decoder = new LineDecoder(); - let diagnostics: vscode.Diagnostic[] = []; - let processLine = (line: string) => { - let matches = line.match(PHPValidationProvider.MatchExpression); + const decoder = new LineDecoder(); + const diagnostics: vscode.Diagnostic[] = []; + const processLine = (line: string) => { + const matches = line.match(PHPValidationProvider.MatchExpression); if (matches) { - let message = matches[1]; - let line = parseInt(matches[3]) - 1; - let diagnostic: vscode.Diagnostic = new vscode.Diagnostic( + const message = matches[1]; + const line = parseInt(matches[3]) - 1; + const diagnostic: vscode.Diagnostic = new vscode.Diagnostic( new vscode.Range(line, 0, line, Number.MAX_VALUE), message ); @@ -206,7 +206,7 @@ export default class PHPValidationProvider { } }; - let options = (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders[0]) ? { cwd: vscode.workspace.workspaceFolders[0].uri.fsPath } : undefined; + const options = (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders[0]) ? { cwd: vscode.workspace.workspaceFolders[0].uri.fsPath } : undefined; let args: string[]; if (this.config!.trigger === RunTrigger.onSave) { args = PHPValidationProvider.FileArgs.slice(0); @@ -215,7 +215,7 @@ export default class PHPValidationProvider { args = PHPValidationProvider.BufferArgs; } try { - let childProcess = cp.spawn(executable, args, options); + const childProcess = cp.spawn(executable, args, options); childProcess.on('error', (error: Error) => { if (this.pauseValidation) { resolve(); @@ -234,7 +234,7 @@ export default class PHPValidationProvider { decoder.write(data).forEach(processLine); }); childProcess.stdout.on('end', () => { - let line = decoder.end(); + const line = decoder.end(); if (line) { processLine(line); } diff --git a/extensions/php-language-features/src/phpMain.ts b/extensions/php-language-features/src/phpMain.ts index 554b2f6613b..b35d523b350 100644 --- a/extensions/php-language-features/src/phpMain.ts +++ b/extensions/php-language-features/src/phpMain.ts @@ -12,7 +12,7 @@ import PHPValidationProvider from './features/validationProvider'; export function activate(context: vscode.ExtensionContext): any { - let validator = new PHPValidationProvider(); + const validator = new PHPValidationProvider(); validator.activate(context.subscriptions); // add providers diff --git a/extensions/php-language-features/yarn.lock b/extensions/php-language-features/yarn.lock index 8dec3aadc63..baafbeb7ca3 100644 --- a/extensions/php-language-features/yarn.lock +++ b/extensions/php-language-features/yarn.lock @@ -17,10 +17,10 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -vscode-nls@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" - integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw== +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== which@^2.0.2: version "2.0.2" diff --git a/extensions/php/snippets/php.code-snippets b/extensions/php/snippets/php.code-snippets index 9c061291647..3c213765b4b 100644 --- a/extensions/php/snippets/php.code-snippets +++ b/extensions/php/snippets/php.code-snippets @@ -12,6 +12,7 @@ }, "PHPDoc class â€Ļ": { "prefix": "doc_class", + "isFileTemplate": true, "body": [ "/**", " * ${6:undocumented class}", @@ -42,6 +43,7 @@ }, "PHPDoc function â€Ļ": { "prefix": "doc_f", + "isFileTemplate": true, "body": [ "/**", " * ${1:undocumented function summary}", diff --git a/extensions/pug/cgmanifest.json b/extensions/pug/cgmanifest.json index e7bd7bccc09..341ab356db2 100644 --- a/extensions/pug/cgmanifest.json +++ b/extensions/pug/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "davidrios/pug-tmbundle", "repositoryUrl": "https://github.com/davidrios/pug-tmbundle", - "commitHash": "e67e895f6fb64932aa122e471000fa55d826bff6" + "commitHash": "8d7e93262a949afca023ee67ca8bb01a3b43e607" } }, "license": "MIT", diff --git a/extensions/pug/syntaxes/pug.tmLanguage.json b/extensions/pug/syntaxes/pug.tmLanguage.json index 108fc1ed1c6..4c1869c3258 100644 --- a/extensions/pug/syntaxes/pug.tmLanguage.json +++ b/extensions/pug/syntaxes/pug.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/davidrios/pug-tmbundle/commit/e67e895f6fb64932aa122e471000fa55d826bff6", + "version": "https://github.com/davidrios/pug-tmbundle/commit/8d7e93262a949afca023ee67ca8bb01a3b43e607", "name": "Pug", "scopeName": "text.pug", "patterns": [ @@ -656,7 +656,7 @@ }, { "begin": "=\\s*", - "end": "$|(?=,|(?:\\s+[^!%&*-+~|<>:?/])|\\))", + "end": "$|(?=,|(?:\\s+[^!%&*\\-+~|<>:?/])|\\))", "name": "attribute_value", "patterns": [ { @@ -677,8 +677,8 @@ ] }, { - "begin": "(?<=[%&*-+~|<>:?/])\\s+", - "end": "$|(?=,|(?:\\s+[^!%&*-+~|<>:?/])|\\))", + "begin": "(?<=[%&*\\-+~|<>:?/])\\s+", + "end": "$|(?=,|(?:\\s+[^!%&*\\-+~|<>:?/])|\\))", "name": "attribute_value2", "patterns": [ { diff --git a/extensions/python/cgmanifest.json b/extensions/python/cgmanifest.json index 37a21b2de54..ace7056c995 100644 --- a/extensions/python/cgmanifest.json +++ b/extensions/python/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "MagicStack/MagicPython", "repositoryUrl": "https://github.com/MagicStack/MagicPython", - "commitHash": "c9b3409deb69acec31bbf7913830e93a046b30cc" + "commitHash": "7d0f2b22a5ad8fccbd7341bc7b7a715169283044" } }, "license": "MIT", diff --git a/extensions/python/package.json b/extensions/python/package.json index 6134d05a215..17cbe7787e1 100644 --- a/extensions/python/package.json +++ b/extensions/python/package.json @@ -28,7 +28,6 @@ "py" ], "filenames": [ - "Snakefile", "SConstruct", "SConscript" ], diff --git a/extensions/python/syntaxes/MagicPython.tmLanguage.json b/extensions/python/syntaxes/MagicPython.tmLanguage.json index 0df9076dfc9..91a2c8e756b 100644 --- a/extensions/python/syntaxes/MagicPython.tmLanguage.json +++ b/extensions/python/syntaxes/MagicPython.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/MagicStack/MagicPython/commit/b2b4f4ae7b4e6284e80bda8080106b93bd588f9e", + "version": "https://github.com/MagicStack/MagicPython/commit/7d0f2b22a5ad8fccbd7341bc7b7a715169283044", "name": "MagicPython", "scopeName": "source.python", "patterns": [ @@ -270,6 +270,14 @@ { "name": "storage.type.class.python", "match": "\\b(?>= | //= | \\*\\*=\n | \\+= | -= | /= | @=\n | \\*= | %= | ~= | \\^= | &= | \\|=\n | =(?!=)\n" }, "operator": { - "match": "(?x)\n \\b(?> | & | \\| | \\^ | ~) (?# 3)\n\n | (\\*\\* | \\* | \\+ | - | % | // | / | @) (?# 4)\n\n | (!= | == | >= | <= | < | >) (?# 5)\n", + "match": "(?x)\n \\b(?> | & | \\| | \\^ | ~) (?# 3)\n\n | (\\*\\* | \\* | \\+ | - | % | // | / | @) (?# 4)\n\n | (!= | == | >= | <= | < | >) (?# 5)\n\n | (:=) (?# 6)\n", "captures": { "1": { "name": "keyword.operator.logical.python" @@ -563,6 +571,9 @@ }, "5": { "name": "keyword.operator.comparison.python" + }, + "6": { + "name": "keyword.operator.assignment.python" } } }, @@ -687,18 +698,6 @@ }, { "include": "#regexp-double-one-line" - }, - { - "include": "#fregexp-single-three-line" - }, - { - "include": "#fregexp-double-three-line" - }, - { - "include": "#fregexp-single-one-line" - }, - { - "include": "#fregexp-double-one-line" } ] }, @@ -1151,6 +1150,10 @@ }, "contentName": "meta.function.lambda.parameters.python", "patterns": [ + { + "name": "keyword.operator.positional.parameter.python", + "match": "/" + }, { "name": "keyword.operator.unpacking.parameter.python", "match": "(\\*\\*|\\*)" @@ -1305,6 +1308,10 @@ } }, "patterns": [ + { + "name": "keyword.operator.positional.parameter.python", + "match": "/" + }, { "name": "keyword.operator.unpacking.parameter.python", "match": "(\\*\\*|\\*)" @@ -1702,7 +1709,7 @@ "patterns": [ { "name": "support.function.builtin.python", - "match": "(?x)\n (?)\n", - "end": "(\\)|(?=\\'))|((?=(?)\n", - "end": "(\\)|(?=\\'\\'\\'))", - "beginCaptures": { - "1": { - "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp" - }, - "2": { - "name": "entity.name.tag.named.group.regexp" - } - }, - "endCaptures": { - "1": { - "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp" - }, - "2": { - "name": "invalid.illegal.newline.python" - } - }, - "patterns": [ - { - "include": "#single-three-fregexp-expression" - }, - { - "include": "#comments-string-single-three" - } - ] - }, - "single-three-fregexp-lookahead": { - "begin": "(\\()\\?=", - "end": "(\\)|(?=\\'\\'\\'))", - "beginCaptures": { - "0": { - "name": "keyword.operator.lookahead.regexp" - }, - "1": { - "name": "punctuation.parenthesis.lookahead.begin.regexp" - } - }, - "endCaptures": { - "1": { - "name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp" - }, - "2": { - "name": "invalid.illegal.newline.python" - } - }, - "patterns": [ - { - "include": "#single-three-fregexp-expression" - }, - { - "include": "#comments-string-single-three" - } - ] - }, - "single-three-fregexp-lookahead-negative": { - "begin": "(\\()\\?!", - "end": "(\\)|(?=\\'\\'\\'))", - "beginCaptures": { - "0": { - "name": "keyword.operator.lookahead.negative.regexp" - }, - "1": { - "name": "punctuation.parenthesis.lookahead.begin.regexp" - } - }, - "endCaptures": { - "1": { - "name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp" - }, - "2": { - "name": "invalid.illegal.newline.python" - } - }, - "patterns": [ - { - "include": "#single-three-fregexp-expression" - }, - { - "include": "#comments-string-single-three" - } - ] - }, - "single-three-fregexp-lookbehind": { - "begin": "(\\()\\?<=", - "end": "(\\)|(?=\\'\\'\\'))", - "beginCaptures": { - "0": { - "name": "keyword.operator.lookbehind.regexp" - }, - "1": { - "name": "punctuation.parenthesis.lookbehind.begin.regexp" - } - }, - "endCaptures": { - "1": { - "name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp" - }, - "2": { - "name": "invalid.illegal.newline.python" - } - }, - "patterns": [ - { - "include": "#single-three-fregexp-expression" - }, - { - "include": "#comments-string-single-three" - } - ] - }, - "single-three-fregexp-lookbehind-negative": { - "begin": "(\\()\\?)\n", - "end": "(\\)|(?=\"))|((?=(?)\n", - "end": "(\\)|(?=\"\"\"))", - "beginCaptures": { - "1": { - "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp" - }, - "2": { - "name": "entity.name.tag.named.group.regexp" - } - }, - "endCaptures": { - "1": { - "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp" - }, - "2": { - "name": "invalid.illegal.newline.python" - } - }, - "patterns": [ - { - "include": "#double-three-fregexp-expression" - }, - { - "include": "#comments-string-double-three" - } - ] - }, - "double-three-fregexp-lookahead": { - "begin": "(\\()\\?=", - "end": "(\\)|(?=\"\"\"))", - "beginCaptures": { - "0": { - "name": "keyword.operator.lookahead.regexp" - }, - "1": { - "name": "punctuation.parenthesis.lookahead.begin.regexp" - } - }, - "endCaptures": { - "1": { - "name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp" - }, - "2": { - "name": "invalid.illegal.newline.python" - } - }, - "patterns": [ - { - "include": "#double-three-fregexp-expression" - }, - { - "include": "#comments-string-double-three" - } - ] - }, - "double-three-fregexp-lookahead-negative": { - "begin": "(\\()\\?!", - "end": "(\\)|(?=\"\"\"))", - "beginCaptures": { - "0": { - "name": "keyword.operator.lookahead.negative.regexp" - }, - "1": { - "name": "punctuation.parenthesis.lookahead.begin.regexp" - } - }, - "endCaptures": { - "1": { - "name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp" - }, - "2": { - "name": "invalid.illegal.newline.python" - } - }, - "patterns": [ - { - "include": "#double-three-fregexp-expression" - }, - { - "include": "#comments-string-double-three" - } - ] - }, - "double-three-fregexp-lookbehind": { - "begin": "(\\()\\?<=", - "end": "(\\)|(?=\"\"\"))", - "beginCaptures": { - "0": { - "name": "keyword.operator.lookbehind.regexp" - }, - "1": { - "name": "punctuation.parenthesis.lookbehind.begin.regexp" - } - }, - "endCaptures": { - "1": { - "name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp" - }, - "2": { - "name": "invalid.illegal.newline.python" - } - }, - "patterns": [ - { - "include": "#double-three-fregexp-expression" - }, - { - "include": "#comments-string-double-three" - } - ] - }, - "double-three-fregexp-lookbehind-negative": { - "begin": "(\\()\\?=^]? [-+ ]? \\#?\n \\d* ,? (\\.\\d+)? [bcdeEfFgGnosxX%]? )(?=})\n", + "name": "storage.type.format.python", + "match": "(=?![rsa])(?=})" + }, + { + "match": "(?x)\n ( (?: =?) (?: ![rsa])? )\n ( : \\w? [<>=^]? [-+ ]? \\#?\n \\d* ,? (\\.\\d+)? [bcdeEfFgGnosxX%]? )(?=})\n", "captures": { "1": { "name": "storage.type.format.python" @@ -5061,7 +3938,7 @@ ] }, "fstring-terminator-single-tail": { - "begin": "(![rsa])?(:)(?=.*?{)", + "begin": "((?:=?)(?:![rsa])?)(:)(?=.*?{)", "end": "(?=})|(?=\\n)", "beginCaptures": { "1": { @@ -5190,7 +4067,7 @@ }, "fstring-raw-quoted-multi-line": { "name": "meta.fstring.python", - "begin": "(\\b(?:[R][fF]|[fF][R]))('''|\"\"\")", + "begin": "(\\b(?:[rR][fF]|[fF][rR]))('''|\"\"\")", "end": "(\\2)", "beginCaptures": { "1": { @@ -5258,10 +4135,14 @@ "patterns": [ { "name": "storage.type.format.python", - "match": "(![rsa])(?=})" + "match": "(=(![rsa])?)(?=})" }, { - "match": "(?x)\n (![rsa])?\n ( : \\w? [<>=^]? [-+ ]? \\#?\n \\d* ,? (\\.\\d+)? [bcdeEfFgGnosxX%]? )(?=})\n", + "name": "storage.type.format.python", + "match": "(=?![rsa])(?=})" + }, + { + "match": "(?x)\n ( (?: =?) (?: ![rsa])? )\n ( : \\w? [<>=^]? [-+ ]? \\#?\n \\d* ,? (\\.\\d+)? [bcdeEfFgGnosxX%]? )(?=})\n", "captures": { "1": { "name": "storage.type.format.python" @@ -5277,7 +4158,7 @@ ] }, "fstring-terminator-multi-tail": { - "begin": "(![rsa])?(:)(?=.*?{)", + "begin": "((?:=?)(?:![rsa])?)(:)(?=.*?{)", "end": "(?=})", "beginCaptures": { "1": { diff --git a/extensions/python/test/colorize-fixtures/test.py b/extensions/python/test/colorize-fixtures/test.py index c92f2c70a8b..c32f12e4f8b 100644 --- a/extensions/python/test/colorize-fixtures/test.py +++ b/extensions/python/test/colorize-fixtures/test.py @@ -19,13 +19,10 @@ class Monkey: }=42): pass -if 1900 < year < 2100 and 1 <= month <= 12 \ - and 1 <= day <= 31 and 0 <= hour < 24 \ - and 0 <= minute < 60 and 0 <= second < 60: # Looks like a valid date - return 1 +pass def firstn(g, n): - for i in range(n): + for _ in range(n): yield g.next() reduce(lambda x,y: x+y, [47,11,42,13]) @@ -37,15 +34,14 @@ mydictionary = { } def steuern(einkommen): - """Berechnung der zu zahlenden Steuern fuer ein zu versteuerndes Einkommen von x""" - if einkommen <= 8004: - steuer = 0 - elif einkommen <= 13469: - y = (einkommen -8004.0)/10000.0 - steuer = (912.17 * y + 1400)*y - else: - steuer = einkommen * 0.44 - 15694 - return steuer + """Berechnung der zu zahlenden Steuern fuer ein zu versteuerndes Einkommen von x""" + if einkommen <= 8004: + return 0 + elif einkommen <= 13469: + y = (einkommen -8004.0)/10000.0 + return (912.17 * y + 1400)*y + else: + return einkommen * 0.44 - 15694 def beliebig(x, y, *mehr): print "x=", x, ", x=", y diff --git a/extensions/r/language-configuration.json b/extensions/r/language-configuration.json index dd691e2a6d4..3a2e2f34f5f 100644 --- a/extensions/r/language-configuration.json +++ b/extensions/r/language-configuration.json @@ -11,13 +11,16 @@ ["{", "}"], ["[", "]"], ["(", ")"], + ["`", "`"], { "open": "\"", "close": "\"", "notIn": ["string"] }, - { "open": "'", "close": "'", "notIn": ["string"] } + { "open": "'", "close": "'", "notIn": ["string", "comment"] }, + { "open": "%", "close": "%", "notIn": ["string", "comment"] } ], "surroundingPairs": [ ["{", "}"], ["[", "]"], ["(", ")"], + ["`", "`"], ["\"", "\""], ["'", "'"] ] diff --git a/extensions/razor/build/update-grammar.mjs b/extensions/razor/build/update-grammar.mjs new file mode 100644 index 00000000000..b5c300816ce --- /dev/null +++ b/extensions/razor/build/update-grammar.mjs @@ -0,0 +1,18 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// @ts-check + +import * as vscodeGrammarUpdater from 'vscode-grammar-updater'; + +function patchGrammar(grammar) { + grammar.scopeName = 'text.html.cshtml'; + return grammar; +} + +const razorGrammarRepo = 'dotnet/razor-tooling'; +const grammarPath = 'src/Razor/src/Microsoft.AspNetCore.Razor.VSCode.Extension/syntaxes/aspnetcorerazor.tmLanguage.json'; +vscodeGrammarUpdater.update(razorGrammarRepo, grammarPath, './syntaxes/cshtml.tmLanguage.json', grammar => patchGrammar(grammar), 'main'); + + diff --git a/extensions/razor/cgmanifest.json b/extensions/razor/cgmanifest.json index 2ad1d82c1ea..77736bd5dba 100644 --- a/extensions/razor/cgmanifest.json +++ b/extensions/razor/cgmanifest.json @@ -4,13 +4,37 @@ "component": { "type": "git", "git": { - "name": "demyte/language-cshtml", - "repositoryUrl": "https://github.com/demyte/language-cshtml", - "commitHash": "e6e54d5a86a28cc1e44609a32aaa10a244cd3f81" + "name": "dotnet/razor-tooling", + "repositoryUrl": "https://github.com/dotnet/razor-tooling", + "commitHash": "558b502fbef5ecdf386ccd6d47b0b40b5f8800a7" } }, "license": "MIT", - "version": "0.3.0" + "version": "1.0.0", + "licenseDetail": [ + "MIT License", + "", + "Copyright (c) .NET Foundation and Contributors", + "All Rights Reserved", + "", + "Permission is hereby granted, free of charge, to any person obtaining a copy", + "of this software and associated documentation files (the \"Software\"), to deal", + "in the Software without restriction, including without limitation the rights", + "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell", + "copies of the Software, and to permit persons to whom the Software is", + "furnished to do so, subject to the following conditions:", + "", + "The above copyright notice and this permission notice shall be included in all", + "copies or substantial portions of the Software.", + "", + "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR", + "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,", + "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE", + "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER", + "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,", + "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE", + "SOFTWARE." + ] } ], "version": 1 diff --git a/extensions/razor/package.json b/extensions/razor/package.json index 13eb84206c4..2312ce86c48 100644 --- a/extensions/razor/package.json +++ b/extensions/razor/package.json @@ -9,7 +9,7 @@ "vscode": "0.10.x" }, "scripts": { - "update-grammar": "node ../node_modules/vscode-grammar-updater/bin demyte/language-cshtml grammars/cshtml.json ./syntaxes/cshtml.tmLanguage.json" + "update-grammar": "node ./build/update-grammar.mjs" }, "contributes": { "languages": [ diff --git a/extensions/razor/syntaxes/cshtml.tmLanguage.json b/extensions/razor/syntaxes/cshtml.tmLanguage.json index c662cee2fa3..eea9de72dcc 100644 --- a/extensions/razor/syntaxes/cshtml.tmLanguage.json +++ b/extensions/razor/syntaxes/cshtml.tmLanguage.json @@ -1,57 +1,480 @@ { "information_for_contributors": [ - "This file has been converted from https://github.com/demyte/language-cshtml/blob/master/grammars/cshtml.json", + "This file has been converted from https://github.com/dotnet/razor-tooling/blob/master/src/Razor/src/Microsoft.AspNetCore.Razor.VSCode.Extension/syntaxes/aspnetcorerazor.tmLanguage.json", "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/demyte/language-cshtml/commit/e6e54d5a86a28cc1e44609a32aaa10a244cd3f81", + "version": "https://github.com/dotnet/razor-tooling/commit/558b502fbef5ecdf386ccd6d47b0b40b5f8800a7", "name": "ASP.NET Razor", "scopeName": "text.html.cshtml", "patterns": [ { - "include": "#razor-directives" - }, - { - "include": "#razor-code-block" - }, - { - "include": "#razor-else-if" - }, - { - "include": "#razor-if" - }, - { - "include": "#razor-else" - }, - { - "include": "#razor-foreach" - }, - { - "include": "#explicit-razor-expression" - }, - { - "include": "#implicit-razor-expression" + "include": "#razor-control-structures" }, { "include": "text.html.basic" } ], "repository": { - "comments": { - "begin": "@\\*", - "captures": { - "0": { - "name": "punctuation.definition.comment.source.cshtml" - } - }, - "end": "\\*@", - "name": "comment.block.cshtml" - }, - "razor-directives": { - "name": "meta.directive.cshtml", + "razor-control-structures": { "patterns": [ { - "include": "#using-directive" + "include": "#razor-comment" + }, + { + "include": "#razor-codeblock" + }, + { + "include": "#explicit-razor-expression" + }, + { + "include": "#escaped-transition" + }, + { + "include": "#directives" + }, + { + "include": "#transitioned-csharp-control-structures" + }, + { + "include": "#implicit-expression" + } + ] + }, + "escaped-transition": { + "name": "constant.character.escape.razor.transition", + "match": "@@" + }, + "transition": { + "match": "@", + "name": "keyword.control.cshtml.transition" + }, + "razor-codeblock": { + "name": "meta.structure.razor.codeblock", + "begin": "(@)(\\{)", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.razor.directive.codeblock.open" + } + }, + "contentName": "source.cs", + "patterns": [ + { + "include": "#razor-codeblock-body" + } + ], + "end": "(\\})", + "endCaptures": { + "1": { + "name": "keyword.control.razor.directive.codeblock.close" + } + } + }, + "razor-codeblock-body": { + "patterns": [ + { + "include": "#text-tag" + }, + { + "include": "#wellformed-html" + }, + { + "include": "#razor-single-line-markup" + }, + { + "include": "#razor-control-structures" + }, + { + "include": "source.cs" + } + ] + }, + "razor-single-line-markup": { + "match": "(\\@\\:)([^$]*)$", + "captures": { + "1": { + "name": "keyword.control.razor.singleLineMarkup" + }, + "2": { + "patterns": [ + { + "include": "#razor-control-structures" + }, + { + "include": "text.html.basic" + } + ] + } + } + }, + "text-tag": { + "begin": "()", + "beginCaptures": { + "1": { + "name": "keyword.control.cshtml.transition.textTag.open" + } + }, + "patterns": [ + { + "include": "#wellformed-html" + }, + { + "include": "$self" + } + ], + "end": "()", + "endCaptures": { + "1": { + "name": "keyword.control.cshtml.transition.textTag.close" + } + } + }, + "razor-comment": { + "name": "meta.comment.razor", + "begin": "(@)(\\*)", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.razor.comment.star" + } + }, + "contentName": "comment.block.razor", + "end": "(\\*)(@)", + "endCaptures": { + "1": { + "name": "keyword.control.razor.comment.star" + }, + "2": { + "patterns": [ + { + "include": "#transition" + } + ] + } + } + }, + "wellformed-html": { + "patterns": [ + { + "include": "#void-tag" + }, + { + "include": "#non-void-tag" + } + ] + }, + "void-tag": { + "name": "meta.tag.structure.$3.void.html", + "begin": "(?i)(<)(!)?(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)(?=\\s|/?>)", + "beginCaptures": { + "1": { + "name": "punctuation.definition.tag.begin.html" + }, + "2": { + "name": "constant.character.escape.razor.tagHelperOptOut" + }, + "3": { + "name": "entity.name.tag.html" + } + }, + "patterns": [ + { + "include": "text.html.basic#attribute" + } + ], + "end": "/?>", + "endCaptures": { + "0": { + "name": "punctuation.definition.tag.end.html" + } + } + }, + "non-void-tag": { + "begin": "(?=<(!)?([^/\\s>]+)(\\s|/?>))", + "end": "()|(/>)", + "endCaptures": { + "1": { + "name": "punctuation.definition.tag.begin.html" + }, + "2": { + "name": "entity.name.tag.html" + }, + "3": { + "name": "punctuation.definition.tag.end.html" + }, + "4": { + "name": "punctuation.definition.tag.end.html" + } + }, + "patterns": [ + { + "begin": "(<)(!)?([^/\\s>]+)(?=\\s|/?>)", + "beginCaptures": { + "1": { + "name": "punctuation.definition.tag.begin.html" + }, + "2": { + "name": "constant.character.escape.razor.tagHelperOptOut" + }, + "3": { + "name": "entity.name.tag.html" + } + }, + "end": "(?=/?>)", + "patterns": [ + { + "include": "#razor-control-structures" + }, + { + "include": "text.html.basic#attribute" + } + ] + }, + { + "begin": ">", + "beginCaptures": { + "0": { + "name": "punctuation.definition.tag.end.html" + } + }, + "end": "(?=\\{\\}\\)\\]'\"])" + }, + "implicit-expression-body": { + "patterns": [ + { + "include": "#implicit-expression-invocation-start" + }, + { + "include": "#implicit-expression-accessor-start" + } + ], + "end": "(?=[\\s<>\\{\\}\\)\\]'\"])" + }, + "implicit-expression-invocation-start": { + "begin": "([_[:alpha:]][_[:alnum:]]*)(?=\\()", + "beginCaptures": { + "1": { + "name": "entity.name.function.cs" + } + }, + "patterns": [ + { + "include": "#implicit-expression-continuation" + } + ], + "end": "(?=[\\s<>\\{\\}\\)\\]'\"])" + }, + "implicit-expression-accessor-start": { + "begin": "([_[:alpha:]][_[:alnum:]]*)", + "beginCaptures": { + "1": { + "name": "variable.other.object.cs" + } + }, + "patterns": [ + { + "include": "#implicit-expression-continuation" + } + ], + "end": "(?=[\\s<>\\{\\}\\)\\]'\"])" + }, + "implicit-expression-continuation": { + "patterns": [ + { + "include": "#balanced-parenthesis-csharp" + }, + { + "include": "#balanced-brackets-csharp" + }, + { + "include": "#implicit-expression-invocation" + }, + { + "include": "#implicit-expression-accessor" + }, + { + "include": "#implicit-expression-extension" + } + ], + "end": "(?=[\\s<>\\{\\}\\)\\]'\"])" + }, + "implicit-expression-accessor": { + "match": "(?<=\\.)[_[:alpha:]][_[:alnum:]]*", + "name": "variable.other.object.property.cs" + }, + "implicit-expression-invocation": { + "match": "(?<=\\.)[_[:alpha:]][_[:alnum:]]*(?=\\()", + "name": "entity.name.function.cs" + }, + "implicit-expression-operator": { + "patterns": [ + { + "include": "#implicit-expression-dot-operator" + }, + { + "include": "#implicit-expression-null-conditional-operator" + }, + { + "include": "#implicit-expression-null-forgiveness-operator" + } + ] + }, + "implicit-expression-dot-operator": { + "match": "(\\.)(?=[_[:alpha:]][_[:alnum:]]*)", + "captures": { + "1": { + "name": "punctuation.accessor.cs" + } + } + }, + "implicit-expression-null-conditional-operator": { + "match": "(\\?)(?=[.\\[])", + "captures": { + "1": { + "name": "keyword.operator.null-conditional.cs" + } + } + }, + "implicit-expression-null-forgiveness-operator": { + "match": "(\\!)(?=(?:\\.[_[:alpha:]][_[:alnum:]]*)|\\?|[\\[\\(])", + "captures": { + "1": { + "name": "keyword.operator.logical.cs" + } + } + }, + "balanced-parenthesis-csharp": { + "begin": "(\\()", + "beginCaptures": { + "1": { + "name": "punctuation.parenthesis.open.cs" + } + }, + "name": "razor.test.balanced.parenthesis", + "patterns": [ + { + "include": "source.cs" + } + ], + "end": "(\\))", + "endCaptures": { + "1": { + "name": "punctuation.parenthesis.close.cs" + } + } + }, + "balanced-brackets-csharp": { + "begin": "(\\[)", + "beginCaptures": { + "1": { + "name": "punctuation.squarebracket.open.cs" + } + }, + "name": "razor.test.balanced.brackets", + "patterns": [ + { + "include": "source.cs" + } + ], + "end": "(\\])", + "endCaptures": { + "1": { + "name": "punctuation.squarebracket.close.cs" + } + } + }, + "directives": { + "patterns": [ + { + "include": "#code-directive" + }, + { + "include": "#functions-directive" + }, + { + "include": "#page-directive" + }, + { + "include": "#addTagHelper-directive" + }, + { + "include": "#removeTagHelper-directive" + }, + { + "include": "#tagHelperPrefix-directive" }, { "include": "#model-directive" @@ -59,283 +482,1030 @@ { "include": "#inherits-directive" }, + { + "include": "#implements-directive" + }, + { + "include": "#namespace-directive" + }, { "include": "#inject-directive" }, { - "include": "#implements-directive" + "include": "#attribute-directive" + }, + { + "include": "#section-directive" }, { "include": "#layout-directive" }, { - "include": "#page-directive" - }, - { - "include": "#functions-directive" + "include": "#using-directive" } ] }, - "explicit-razor-expression": { - "name": "meta.expression.explicit.cshtml", - "begin": "(@)\\(", - "captures": { - "0": { - "name": "keyword.control.cshtml" + "code-directive": { + "begin": "(@)(code)\\s*", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.razor.directive.code" } }, "patterns": [ { - "include": "source.cs" + "include": "#directive-codeblock" } ], - "end": "\\)" - }, - "implicit-razor-expression": { - "name": "meta.expression.implicit.cshtml", - "begin": "(@)([a-zA-Z0-9\\.\\_\\(\\)]+)", - "captures": { - "0": { - "name": "keyword.control.cshtml" - } - }, - "end": "$" - }, - "using-directive": { - "name": "meta.directive.using.cshtml", - "begin": "(@using)\\s+", - "captures": { - "0": { - "name": "keyword.control.cshtml" - } - }, - "patterns": [ - { - "include": "#csharp-namespace-identifier" - } - ], - "end": "$" - }, - "model-directive": { - "name": "meta.directive.model.cshtml", - "begin": "(@model)\\s+", - "captures": { - "0": { - "name": "keyword.control.cshtml" - } - }, - "patterns": [ - { - "include": "#csharp-type-name" - } - ], - "end": "$" - }, - "inherits-directive": { - "name": "meta.directive.inherits.cshtml", - "begin": "(@inherits)\\s+", - "captures": { - "0": { - "name": "keyword.control.cshtml" - } - }, - "patterns": [ - { - "include": "#csharp-type-name" - } - ], - "end": "$" - }, - "inject-directive": { - "name": "meta.directive.inject.cshtml", - "begin": "(@inject)\\s+", - "captures": { - "0": { - "name": "keyword.control.cshtml" - } - }, - "patterns": [ - { - "include": "#csharp-type-name" - } - ], - "end": "$" - }, - "implements-directive": { - "name": "meta.directive.implements.cshtml", - "begin": "(@implements)\\s+", - "captures": { - "0": { - "name": "keyword.control.cshtml" - } - }, - "patterns": [ - { - "include": "#csharp-type-name" - } - ], - "end": "$" - }, - "layout-directive": { - "name": "meta.directive.layout.cshtml", - "begin": "(@layout)\\s+", - "captures": { - "0": { - "name": "keyword.control.cshtml" - } - }, - "patterns": [ - { - "include": "#csharp-type-name" - } - ], - "end": "$" - }, - "page-directive": { - "name": "meta.directive.page.cshtml", - "begin": "(@page)\\s+", - "captures": { - "0": { - "name": "keyword.control.cshtml" - } - }, - "patterns": [ - { - "include": "source.cs" - } - ], - "end": "$" + "end": "(?<=})|\\s" }, "functions-directive": { - "name": "meta.directive.functions.cshtml", - "match": "(@functions)", - "captures": { - "0": { - "name": "keyword.control.cshtml" + "begin": "(@)(functions)\\s*", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.razor.directive.functions" + } + }, + "patterns": [ + { + "include": "#directive-codeblock" + } + ], + "end": "(?<=})|\\s" + }, + "directive-codeblock": { + "begin": "(\\{)", + "beginCaptures": { + "1": { + "name": "keyword.control.razor.directive.codeblock.open" + } + }, + "name": "meta.structure.razor.directive.codeblock", + "contentName": "source.cs", + "patterns": [ + { + "include": "source.cs" + } + ], + "end": "(\\})", + "endCaptures": { + "1": { + "name": "keyword.control.razor.directive.codeblock.close" } } }, - "razor-if": { - "begin": "(@if)", + "page-directive": { + "name": "meta.directive", + "match": "(@)(page)\\s+([^$]+)?", "captures": { - "0": { - "name": "keyword.control.cshtml" + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.razor.directive.page" + }, + "3": { + "patterns": [ + { + "include": "source.cs#string-literal" + } + ] } - }, - "patterns": [ - { - "include": "source.cs" - } - ], - "end": "$" + } }, - "razor-else": { - "begin": "(else)", + "addTagHelper-directive": { + "name": "meta.directive", + "match": "(@)(addTagHelper)\\s+([^$]+)?", "captures": { - "0": { - "name": "keyword.control.cshtml" + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.razor.directive.addTagHelper" + }, + "3": { + "patterns": [ + { + "include": "#tagHelper-directive-argument" + } + ] } - }, - "patterns": [ - { - "include": "source.cs" - } - ], - "end": "$" + } }, - "razor-else-if": { - "begin": "(else\\s+if)", + "removeTagHelper-directive": { + "name": "meta.directive", + "match": "(@)(removeTagHelper)\\s+([^$]+)?", "captures": { - "0": { - "name": "keyword.control.cshtml" + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.razor.directive.removeTagHelper" + }, + "3": { + "patterns": [ + { + "include": "#tagHelper-directive-argument" + } + ] } - }, - "patterns": [ - { - "include": "source.cs" - } - ], - "end": "$" + } }, - "razor-foreach": { - "begin": "(@foreach)\\s+\\(", + "tagHelperPrefix-directive": { + "name": "meta.directive", + "match": "(@)(tagHelperPrefix)\\s+([^$]+)?", "captures": { - "0": { - "name": "keyword.control.cshtml" + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.razor.directive.tagHelperPrefix" + }, + "3": { + "patterns": [ + { + "include": "#tagHelper-directive-argument" + } + ] } - }, - "patterns": [ - { - "include": "source.cs" - } - ], - "end": "\\)" + } }, - "razor-code-block": { - "begin": "@?\\{", - "captures": { - "0": { - "name": "keyword.control.cshtml" - } - }, + "tagHelper-directive-argument": { "patterns": [ { - "include": "text.html.cshtml" + "include": "source.cs#string-literal" }, { - "include": "source.cs" - } - ], - "end": "\\}" - }, - "csharp-namespace-identifier": { - "patterns": [ - { - "name": "entity.name.type.namespace.cs", - "match": "[_[:alpha:]][_[:alnum:]]*" + "include": "#unquoted-string-argument" } ] }, - "csharp-type-name": { + "unquoted-string-argument": { + "name": "string.quoted.double.cs", + "match": "[^$]+" + }, + "model-directive": { + "name": "meta.directive", + "match": "(@)(model)\\s+([^$]+)?", + "captures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.razor.directive.model" + }, + "3": { + "patterns": [ + { + "include": "source.cs#type" + } + ] + } + } + }, + "inherits-directive": { + "name": "meta.directive", + "match": "(@)(inherits)\\s+([^$]+)?", + "captures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.razor.directive.inherits" + }, + "3": { + "patterns": [ + { + "include": "source.cs#type" + } + ] + } + } + }, + "implements-directive": { + "name": "meta.directive", + "match": "(@)(implements)\\s+([^$]+)?", + "captures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.razor.directive.implements" + }, + "3": { + "patterns": [ + { + "include": "source.cs#type" + } + ] + } + } + }, + "layout-directive": { + "name": "meta.directive", + "match": "(@)(layout)\\s+([^$]+)?", + "captures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.razor.directive.layout" + }, + "3": { + "patterns": [ + { + "include": "source.cs#type" + } + ] + } + } + }, + "namespace-directive": { + "name": "meta.directive", + "match": "(@)(namespace)\\s+([^\\s]+)?", + "captures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.razor.directive.namespace" + }, + "3": { + "patterns": [ + { + "include": "#namespace-directive-argument" + } + ] + } + } + }, + "namespace-directive-argument": { + "match": "([_[:alpha:]][_[:alnum:]]*)(\\.)?", + "captures": { + "1": { + "name": "entity.name.type.namespace.cs" + }, + "2": { + "name": "punctuation.accessor.cs" + } + } + }, + "inject-directive": { + "name": "meta.directive", + "match": "(@)(inject)\\s*([\\S\\s]+?)?\\s*([_[:alpha:]][_[:alnum:]]*)?\\s*(?=$)", + "captures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.razor.directive.inject" + }, + "3": { + "patterns": [ + { + "include": "source.cs#type" + } + ] + }, + "4": { + "name": "entity.name.variable.property.cs" + } + } + }, + "attribute-directive": { + "name": "meta.directive", + "begin": "(@)(attribute)\\b\\s+", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.razor.directive.attribute" + } + }, "patterns": [ { - "match": "([_[:alpha:]][_[:alnum:]]*)\\s*(\\:\\:)", - "captures": { - "1": { - "name": "entity.name.type.alias.cs" - }, - "2": { - "name": "punctuation.separator.coloncolon.cs" + "include": "source.cs#attribute-section" + } + ], + "end": "(?<=\\])|$" + }, + "section-directive": { + "name": "meta.directive.block", + "begin": "(@)(section)\\b\\s+([_[:alpha:]][_[:alnum:]]*)?", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#transition" } - } + ] + }, + "2": { + "name": "keyword.control.razor.directive.section" + }, + "3": { + "name": "variable.other.razor.directive.sectionName" + } + }, + "patterns": [ + { + "include": "#directive-markupblock" + } + ], + "end": "(?<=})" + }, + "directive-markupblock": { + "name": "meta.structure.razor.directive.markblock", + "begin": "(\\{)", + "beginCaptures": { + "1": { + "name": "keyword.control.razor.directive.codeblock.open" + } + }, + "patterns": [ + { + "include": "$self" + } + ], + "end": "(\\})", + "endCaptures": { + "1": { + "name": "keyword.control.razor.directive.codeblock.close" + } + } + }, + "using-directive": { + "name": "meta.directive", + "match": "(@)(using)\\b\\s+(?!\\(|\\s)(.+?)?(;)?$", + "captures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.other.using.cs" + }, + "3": { + "patterns": [ + { + "include": "#using-static-directive" + }, + { + "include": "#using-alias-directive" + }, + { + "include": "#using-standard-directive" + } + ] + }, + "4": { + "name": "keyword.control.razor.optionalSemicolon" + } + } + }, + "using-static-directive": { + "match": "(static)\\b\\s+(.+)", + "captures": { + "1": { + "name": "keyword.other.static.cs" + }, + "2": { + "patterns": [ + { + "include": "source.cs#type" + } + ] + } + } + }, + "using-alias-directive": { + "match": "([_[:alpha:]][_[:alnum:]]*)\\b\\s*(=)\\s*(.+)\\s*", + "captures": { + "1": { + "name": "entity.name.type.alias.cs" + }, + "2": { + "name": "keyword.operator.assignment.cs" + }, + "3": { + "patterns": [ + { + "include": "source.cs#type" + } + ] + } + } + }, + "using-standard-directive": { + "match": "([_[:alpha:]][_[:alnum:]]*)\\s*", + "captures": { + "1": { + "name": "entity.name.type.namespace.cs" + } + } + }, + "transitioned-csharp-control-structures": { + "patterns": [ + { + "include": "#using-statement" }, { - "match": "([_[:alpha:]][_[:alnum:]]*)\\s*(\\.)", - "captures": { - "1": { - "name": "storage.type.cs" - }, - "2": { - "name": "punctuation.accessor.cs" - } - } + "include": "#if-statement" }, { - "match": "(\\.)\\s*([_[:alpha:]][_[:alnum:]]*)", - "captures": { - "1": { - "name": "punctuation.accessor.cs" - }, - "2": { - "name": "storage.type.cs" - } - } + "include": "#else-part" }, { - "name": "storage.type.cs", - "match": "[_[:alpha:]][_[:alnum:]]*" + "include": "#foreach-statement" + }, + { + "include": "#for-statement" + }, + { + "include": "#while-statement" + }, + { + "include": "#switch-statement" + }, + { + "include": "#lock-statement" + }, + { + "include": "#do-statement" + }, + { + "include": "#try-statement" } ] + }, + "using-statement": { + "name": "meta.statement.using.razor", + "begin": "(?:^\\s*|(@))(using)\\b\\s*(?=\\()", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.other.using.cs" + } + }, + "patterns": [ + { + "include": "#csharp-condition" + }, + { + "include": "#csharp-code-block" + }, + { + "include": "#razor-codeblock-body" + } + ], + "end": "(?<=})" + }, + "if-statement": { + "name": "meta.statement.if.razor", + "begin": "(?:^\\s*|(@))(if)\\b\\s*(?=\\()", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.conditional.if.cs" + } + }, + "patterns": [ + { + "include": "#csharp-condition" + }, + { + "include": "#csharp-code-block" + }, + { + "include": "#razor-codeblock-body" + } + ], + "end": "(?<=})" + }, + "else-part": { + "name": "meta.statement.else.razor", + "begin": "(?:^|(?<=}))\\s*(else)\\b\\s*?(?: (if))?\\s*?(?=[\\n\\(\\{])", + "beginCaptures": { + "1": { + "name": "keyword.control.conditional.else.cs" + }, + "2": { + "name": "keyword.control.conditional.if.cs" + } + }, + "patterns": [ + { + "include": "#csharp-condition" + }, + { + "include": "#csharp-code-block" + }, + { + "include": "#razor-codeblock-body" + } + ], + "end": "(?<=})" + }, + "for-statement": { + "name": "meta.statement.for.razor", + "begin": "(?:^\\s*|(@))(for)\\b\\s*(?=\\()", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.loop.for.cs" + } + }, + "patterns": [ + { + "include": "#csharp-condition" + }, + { + "include": "#csharp-code-block" + }, + { + "include": "#razor-codeblock-body" + } + ], + "end": "(?<=})" + }, + "foreach-statement": { + "name": "meta.statement.foreach.razor", + "begin": "(?:^\\s*|(@)(await\\s+)?)(foreach)\\b\\s*(?=\\()", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "patterns": [ + { + "include": "#await-prefix" + } + ] + }, + "3": { + "name": "keyword.control.loop.foreach.cs" + } + }, + "patterns": [ + { + "include": "#foreach-condition" + }, + { + "include": "#csharp-code-block" + }, + { + "include": "#razor-codeblock-body" + } + ], + "end": "(?<=})" + }, + "foreach-condition": { + "begin": "\\(", + "beginCaptures": { + "0": { + "name": "punctuation.parenthesis.open.cs" + } + }, + "end": "\\)", + "endCaptures": { + "0": { + "name": "punctuation.parenthesis.close.cs" + } + }, + "patterns": [ + { + "match": "(?x)\n(?:\n (\\bvar\\b)|\n (?\n (?:\n (?:\n (?:(?@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (? # identifier + type arguments (if any)\n \\g\\s*\n (?\\s*<(?:[^<>]|\\g)+>\\s*)?\n )\n (?:\\s*\\.\\s*\\g)* | # Are there any more names being dotted into?\n (?\\s*\\((?:[^\\(\\)]|\\g)+\\))\n )\n (?:\\s*\\?\\s*)? # nullable suffix?\n (?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?\n )\n )\n)\\s+\n(\\g)\\s+\n\\b(in)\\b", + "captures": { + "1": { + "name": "keyword.other.var.cs" + }, + "2": { + "patterns": [ + { + "include": "source.cs#type" + } + ] + }, + "7": { + "name": "entity.name.variable.local.cs" + }, + "8": { + "name": "keyword.control.loop.in.cs" + } + } + }, + { + "match": "(?x) # match foreach (var (x, y) in ...)\n(?:\\b(var)\\b\\s*)?\n(?\\((?:[^\\(\\)]|\\g)+\\))\\s+\n\\b(in)\\b", + "captures": { + "1": { + "name": "keyword.other.var.cs" + }, + "2": { + "patterns": [ + { + "include": "source.cs#tuple-declaration-deconstruction-element-list" + } + ] + }, + "3": { + "name": "keyword.control.loop.in.cs" + } + } + }, + { + "include": "source.cs#expression" + } + ] + }, + "do-statement": { + "name": "meta.statement.do.razor", + "begin": "(?:^\\s*|(@))(do)\\b\\s*", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.loop.do.cs" + } + }, + "patterns": [ + { + "include": "#csharp-condition" + }, + { + "include": "#csharp-code-block" + }, + { + "include": "#razor-codeblock-body" + } + ], + "end": "(?<=})" + }, + "while-statement": { + "name": "meta.statement.while.razor", + "begin": "(?:(@)|^\\s*|(?<=})\\s*)(while)\\b\\s*(?=\\()", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.loop.while.cs" + } + }, + "patterns": [ + { + "include": "#csharp-condition" + }, + { + "include": "#csharp-code-block" + }, + { + "include": "#razor-codeblock-body" + } + ], + "end": "(?<=})|(;)", + "endCaptures": { + "1": { + "name": "punctuation.terminator.statement.cs" + } + } + }, + "switch-statement": { + "name": "meta.statement.switch.razor", + "begin": "(?:^\\s*|(@))(switch)\\b\\s*(?=\\()", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.switch.cs" + } + }, + "patterns": [ + { + "include": "#csharp-condition" + }, + { + "include": "#switch-code-block" + }, + { + "include": "#razor-codeblock-body" + } + ], + "end": "(?<=})" + }, + "switch-code-block": { + "name": "meta.structure.razor.csharp.codeblock.switch", + "begin": "(\\{)", + "beginCaptures": { + "1": { + "name": "punctuation.curlybrace.open.cs" + } + }, + "patterns": [ + { + "include": "source.cs#switch-label" + }, + { + "include": "#razor-codeblock-body" + } + ], + "end": "(\\})", + "endCaptures": { + "1": { + "name": "punctuation.curlybrace.close.cs" + } + } + }, + "lock-statement": { + "name": "meta.statement.lock.razor", + "begin": "(?:^\\s*|(@))(lock)\\b\\s*(?=\\()", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.other.lock.cs" + } + }, + "patterns": [ + { + "include": "#csharp-condition" + }, + { + "include": "#csharp-code-block" + }, + { + "include": "#razor-codeblock-body" + } + ], + "end": "(?<=})" + }, + "try-statement": { + "patterns": [ + { + "include": "#try-block" + }, + { + "include": "#catch-clause" + }, + { + "include": "#finally-clause" + } + ] + }, + "try-block": { + "name": "meta.statement.try.razor", + "begin": "(?:^\\s*|(@))(try)\\b\\s*", + "beginCaptures": { + "1": { + "patterns": [ + { + "include": "#transition" + } + ] + }, + "2": { + "name": "keyword.control.try.cs" + } + }, + "patterns": [ + { + "include": "#csharp-condition" + }, + { + "include": "#csharp-code-block" + }, + { + "include": "#razor-codeblock-body" + } + ], + "end": "(?<=})" + }, + "catch-clause": { + "name": "meta.statement.catch.razor", + "begin": "(?:^|(?<=}))\\s*(catch)\\b\\s*?(?=[\\n\\(\\{])", + "beginCaptures": { + "1": { + "name": "keyword.control.try.catch.cs" + } + }, + "patterns": [ + { + "include": "#catch-condition" + }, + { + "include": "source.cs#when-clause" + }, + { + "include": "#csharp-code-block" + }, + { + "include": "#razor-codeblock-body" + } + ], + "end": "(?<=})" + }, + "catch-condition": { + "begin": "\\(", + "beginCaptures": { + "0": { + "name": "punctuation.parenthesis.open.cs" + } + }, + "end": "\\)", + "endCaptures": { + "0": { + "name": "punctuation.parenthesis.close.cs" + } + }, + "patterns": [ + { + "match": "(?x)\n(?\n (?:\n (?:\n (?:(?@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (? # identifier + type arguments (if any)\n \\g\\s*\n (?\\s*<(?:[^<>]|\\g)+>\\s*)?\n )\n (?:\\s*\\.\\s*\\g)* | # Are there any more names being dotted into?\n (?\\s*\\((?:[^\\(\\)]|\\g)+\\))\n )\n (?:\\s*\\?\\s*)? # nullable suffix?\n (?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?\n )\n)\\s*\n(?:(\\g)\\b)?", + "captures": { + "1": { + "patterns": [ + { + "include": "source.cs#type" + } + ] + }, + "6": { + "name": "entity.name.variable.local.cs" + } + } + } + ] + }, + "finally-clause": { + "name": "meta.statement.finally.razor", + "begin": "(?:^|(?<=}))\\s*(finally)\\b\\s*?(?=[\\n\\{])", + "beginCaptures": { + "1": { + "name": "keyword.control.try.finally.cs" + } + }, + "patterns": [ + { + "include": "#csharp-code-block" + }, + { + "include": "#razor-codeblock-body" + } + ], + "end": "(?<=})" + }, + "await-prefix": { + "name": "keyword.other.await.cs", + "match": "(await)\\s+" + }, + "csharp-code-block": { + "name": "meta.structure.razor.csharp.codeblock", + "begin": "(\\{)", + "beginCaptures": { + "1": { + "name": "punctuation.curlybrace.open.cs" + } + }, + "patterns": [ + { + "include": "#razor-codeblock-body" + } + ], + "end": "(\\})", + "endCaptures": { + "1": { + "name": "punctuation.curlybrace.close.cs" + } + } + }, + "csharp-condition": { + "begin": "(\\()", + "beginCaptures": { + "1": { + "name": "punctuation.parenthesis.open.cs" + } + }, + "patterns": [ + { + "include": "source.cs#local-variable-declaration" + }, + { + "include": "source.cs#expression" + }, + { + "include": "source.cs#punctuation-comma" + }, + { + "include": "source.cs#punctuation-semicolon" + } + ], + "end": "(\\))", + "endCaptures": { + "1": { + "name": "punctuation.parenthesis.close.cs" + } + } } } } \ No newline at end of file diff --git a/extensions/references-view/package.json b/extensions/references-view/package.json index 50d084e2751..d3fcadcbffd 100644 --- a/extensions/references-view/package.json +++ b/extensions/references-view/package.json @@ -4,7 +4,7 @@ "description": "%description%", "icon": "media/icon.png", "version": "1.0.0", - "publisher": "ms-vscode", + "publisher": "vscode", "license": "MIT", "engines": { "vscode": "^1.67.0" @@ -407,7 +407,7 @@ "watch": "npx gulp watch-extension:references-view" }, "dependencies": { - "vscode-nls": "^5.0.0" + "vscode-nls": "^5.2.0" }, "devDependencies": { "@types/node": "16.x" diff --git a/extensions/references-view/src/extension.ts b/extensions/references-view/src/extension.ts index 94c258cd73c..4cd47866fe2 100644 --- a/extensions/references-view/src/extension.ts +++ b/extensions/references-view/src/extension.ts @@ -22,5 +22,9 @@ export function activate(context: vscode.ExtensionContext): SymbolTree { tree.setInput(input); } - return { setInput }; + function getInput(): SymbolTreeInput | undefined { + return tree.getInput(); + } + + return { setInput, getInput }; } diff --git a/extensions/references-view/src/references-view.d.ts b/extensions/references-view/src/references-view.d.ts index 70fd932a19f..cafe77f9cb4 100644 --- a/extensions/references-view/src/references-view.d.ts +++ b/extensions/references-view/src/references-view.d.ts @@ -6,32 +6,41 @@ import * as vscode from 'vscode'; /** - * This interface describes the shape for the references viewlet API. It consists - * of a single `setInput` function which must be called with a full implementation - * of the `SymbolTreeInput`-interface. To acquire this API use the default mechanics, e.g: - * + * This interface describes the shape for the references viewlet API. It includes + * a single `setInput` function which must be called with a full implementation + * of the `SymbolTreeInput`-interface. You can also use `getInput` function to + * get the current `SymbolTreeInput`. To acquire this API use the default mechanics, e.g: + * * ```ts * // get references viewlet API - * const api = await vscode.extensions.getExtension('ms-vscode.references-view').activate(); - * + * const api = await vscode.extensions.getExtension('vscode.references-view').activate(); + * * // instantiate and set input which updates the view * const myInput: SymbolTreeInput = ... - * api.setInput(myInput) + * api.setInput(myInput); + * const currentInput = api.getInput(); * ``` */ export interface SymbolTree { /** - * Set the contents of the references viewlet. - * + * Set the contents of the references viewlet. + * * @param input A symbol tree input object */ setInput(input: SymbolTreeInput): void; + + /** + * Get the contents of the references viewlet. + * + * @returns The current symbol tree input object + */ + getInput(): SymbolTreeInput | undefined; } /** * A symbol tree input is the entry point for populating the references viewlet. - * Inputs must be anchored at a code location, they must have a title, and they + * Inputs must be anchored at a code location, they must have a title, and they * must resolve to a model. */ export interface SymbolTreeInput { @@ -54,17 +63,17 @@ export interface SymbolTreeInput { readonly location: vscode.Location; /** - * Resolve this input to a model that contains the actual data. When there are no result + * Resolve this input to a model that contains the actual data. When there are no result * than `undefined` or `null` should be returned. */ resolve(): vscode.ProviderResult>; /** * This function is called when re-running from history. The symbols tree has tracked - * the original location of this input and that is now passed to this input. The + * the original location of this input and that is now passed to this input. The * implementation of this function should return a clone where the `location`-property * uses the provided `location` - * + * * @param location The location at which the new input should be anchored. * @returns A new input which location is anchored at the position. */ @@ -94,7 +103,7 @@ export interface SymbolTreeModel { navigation?: SymbolItemNavigation; /** - * Optional support for editor highlights. WHen implemented, the editor will highlight + * Optional support for editor highlights. WHen implemented, the editor will highlight * symbol ranges in the source code. */ highlights?: SymbolItemEditorHighlights; diff --git a/extensions/references-view/src/references/model.ts b/extensions/references-view/src/references/model.ts index 9814f3ec32f..d9716d72dd6 100644 --- a/extensions/references-view/src/references/model.ts +++ b/extensions/references-view/src/references/model.ts @@ -78,8 +78,8 @@ export class ReferencesModel implements SymbolItemNavigation bStr) { @@ -89,16 +89,16 @@ export class ReferencesModel implements SymbolItemNavigation bUri.toString()) { return 1; } - let aRange = a instanceof vscode.Location ? a.range : a.targetRange; - let bRange = b instanceof vscode.Location ? b.range : b.targetRange; + const aRange = a instanceof vscode.Location ? a.range : a.targetRange; + const bRange = b instanceof vscode.Location ? b.range : b.targetRange; if (aRange.start.isBefore(bRange.start)) { return -1; } else if (aRange.start.isAfter(bRange.start)) { @@ -163,10 +163,10 @@ export class ReferencesModel implements SymbolItemNavigation bestValue) { best = i; } @@ -340,7 +340,7 @@ export class FileItem { async asCopyText() { let result = `${vscode.workspace.asRelativePath(this.uri)}\n`; - for (let ref of this.references) { + for (const ref of this.references) { result += ` ${await ref.asCopyText()}\n`; } return result; @@ -379,8 +379,8 @@ export class ReferenceItem { } async asCopyText() { - let doc = await this.getDocument(); - let chunks = getPreviewChunks(doc, this.location.range, 21, false); + const doc = await this.getDocument(); + const chunks = getPreviewChunks(doc, this.location.range, 21, false); return `${this.location.range.start.line + 1}, ${this.location.range.start.character + 1}: ${chunks.before + chunks.inside + chunks.after}`; } } diff --git a/extensions/references-view/src/tree.ts b/extensions/references-view/src/tree.ts index 8eb533cc5da..b46db07c9ba 100644 --- a/extensions/references-view/src/tree.ts +++ b/extensions/references-view/src/tree.ts @@ -206,14 +206,14 @@ class TreeDndDelegate implements vscode.TreeDragAndDropController { handleDrag(source: undefined[], data: vscode.DataTransfer) { if (this._delegate) { const urls: string[] = []; - for (let item of source) { + for (const item of source) { const uri = this._delegate.getDragUri(item); if (uri) { urls.push(uri.toString()); } } if (urls.length > 0) { - data.set('text/uri-list', new vscode.DataTransferItem(urls.join('\n'))); + data.set('text/uri-list', new vscode.DataTransferItem(urls.join('\r\n'))); } } } diff --git a/extensions/references-view/src/types/index.ts b/extensions/references-view/src/types/index.ts index ed2e4b872f6..5d1fc2f3318 100644 --- a/extensions/references-view/src/types/index.ts +++ b/extensions/references-view/src/types/index.ts @@ -19,13 +19,15 @@ export function register(tree: SymbolsTree, context: vscode.ExtensionContext): v } } - function setTypeHierarchyDirection(value: TypeHierarchyDirection, anchor: TypeItem | unknown) { + function setTypeHierarchyDirection(value: TypeHierarchyDirection, anchor: TypeItem | vscode.Location | unknown) { direction.value = value; let newInput: TypesTreeInput | undefined; const oldInput = tree.getInput(); if (anchor instanceof TypeItem) { newInput = new TypesTreeInput(new vscode.Location(anchor.item.uri, anchor.item.selectionRange.start), direction.value); + } else if (anchor instanceof vscode.Location) { + newInput = new TypesTreeInput(anchor, direction.value); } else if (oldInput instanceof TypesTreeInput) { newInput = new TypesTreeInput(oldInput.location, direction.value); } @@ -36,8 +38,8 @@ export function register(tree: SymbolsTree, context: vscode.ExtensionContext): v context.subscriptions.push( vscode.commands.registerCommand('references-view.showTypeHierarchy', showTypeHierarchy), - vscode.commands.registerCommand('references-view.showSupertypes', (item: TypeItem | unknown) => setTypeHierarchyDirection(TypeHierarchyDirection.Supertypes, item)), - vscode.commands.registerCommand('references-view.showSubtypes', (item: TypeItem | unknown) => setTypeHierarchyDirection(TypeHierarchyDirection.Subtypes, item)), + vscode.commands.registerCommand('references-view.showSupertypes', (item: TypeItem | vscode.Location | unknown) => setTypeHierarchyDirection(TypeHierarchyDirection.Supertypes, item)), + vscode.commands.registerCommand('references-view.showSubtypes', (item: TypeItem | vscode.Location | unknown) => setTypeHierarchyDirection(TypeHierarchyDirection.Subtypes, item)), vscode.commands.registerCommand('references-view.removeTypeItem', removeTypeItem) ); } diff --git a/extensions/references-view/src/utils.ts b/extensions/references-view/src/utils.ts index 2948aab0bc4..cd25e549e17 100644 --- a/extensions/references-view/src/utils.ts +++ b/extensions/references-view/src/utils.ts @@ -30,11 +30,11 @@ export async function isValidRequestPosition(uri: vscode.Uri, position: vscode.P } export function getPreviewChunks(doc: vscode.TextDocument, range: vscode.Range, beforeLen: number = 8, trim: boolean = true) { - let previewStart = range.start.with({ character: Math.max(0, range.start.character - beforeLen) }); - let wordRange = doc.getWordRangeAtPosition(previewStart); + const previewStart = range.start.with({ character: Math.max(0, range.start.character - beforeLen) }); + const wordRange = doc.getWordRangeAtPosition(previewStart); let before = doc.getText(new vscode.Range(wordRange ? wordRange.start : previewStart, range.start)); - let inside = doc.getText(range); - let previewEnd = range.end.translate(0, 331); + const inside = doc.getText(range); + const previewEnd = range.end.translate(0, 331); let after = doc.getText(new vscode.Range(range.end, previewEnd)); if (trim) { before = before.replace(/^\s*/g, ''); @@ -99,7 +99,7 @@ export class WordAnchor { line = startLine + i; if (line < this._doc.lineCount) { checked = true; - let ch = this._doc.lineAt(line).text.indexOf(this._word); + const ch = this._doc.lineAt(line).text.indexOf(this._word); if (ch >= 0) { return new vscode.Position(line, ch); } @@ -109,7 +109,7 @@ export class WordAnchor { line = startLine - i; if (line >= 0) { checked = true; - let ch = this._doc.lineAt(line).text.indexOf(this._word); + const ch = this._doc.lineAt(line).text.indexOf(this._word); if (ch >= 0) { return new vscode.Position(line, ch); } @@ -131,6 +131,6 @@ const _themeIconIds = [ ]; export function getThemeIcon(kind: vscode.SymbolKind): vscode.ThemeIcon | undefined { - let id = _themeIconIds[kind]; + const id = _themeIconIds[kind]; return id ? new vscode.ThemeIcon(id) : undefined; } diff --git a/extensions/references-view/yarn.lock b/extensions/references-view/yarn.lock index 0f041514ffc..1661be7c5d2 100644 --- a/extensions/references-view/yarn.lock +++ b/extensions/references-view/yarn.lock @@ -7,7 +7,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.33.tgz#566713b1b626f781c5c58fe3531307283e00720c" integrity sha512-0PJ0vg+JyU0MIan58IOIFRtSvsb7Ri+7Wltx2qAg94eMOrpg4+uuP3aUHCpxXc1i0jCXiC+zIamSZh3l9AbcQA== -vscode-nls@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.1.tgz#ba23fc4d4420d25e7f886c8e83cbdcec47aa48b2" - integrity sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A== +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== diff --git a/extensions/search-result/src/extension.ts b/extensions/search-result/src/extension.ts index 3c397453d04..90443f16771 100644 --- a/extensions/search-result/src/extension.ts +++ b/extensions/search-result/src/extension.ts @@ -225,7 +225,7 @@ function parseSearchResults(document: vscode.TextDocument, token?: vscode.Cancel const metadataOffset = (indentation + _lineNumber + separator).length; const targetRange = new vscode.Range(Math.max(lineNumber - 3, 0), 0, lineNumber + 3, line.length); - let locations: Required[] = []; + const locations: Required[] = []; let lastEnd = metadataOffset; let offset = 0; @@ -256,7 +256,7 @@ function parseSearchResults(document: vscode.TextDocument, token?: vscode.Cancel } // Allow line number, indentation, etc to take you to definition as well. - let convenienceLocation: Required = { + const convenienceLocation: Required = { targetRange, targetSelectionRange: new vscode.Range(lineNumber, 0, lineNumber, 1), targetUri: currentTarget, diff --git a/extensions/shared.webpack.config.js b/extensions/shared.webpack.config.js index 3ebb9c62b52..8be35296ddf 100644 --- a/extensions/shared.webpack.config.js +++ b/extensions/shared.webpack.config.js @@ -13,11 +13,11 @@ const fs = require('fs'); const merge = require('merge-options'); const CopyWebpackPlugin = require('copy-webpack-plugin'); const { NLSBundlePlugin } = require('vscode-nls-dev/lib/webpack-bundler'); -const { DefinePlugin } = require('webpack'); +const { DefinePlugin, optimize } = require('webpack'); function withNodeDefaults(/**@type WebpackConfig*/extConfig) { /** @type WebpackConfig */ - let defaultConfig = { + const defaultConfig = { mode: 'none', // this leaves the source code as close as possible to the original (when packaging we set this to 'production') target: 'node', // extensions run in a node context node: { @@ -70,6 +70,10 @@ function withNodeDefaults(/**@type WebpackConfig*/extConfig) { return merge(defaultConfig, extConfig); } +/** + * + * @param {string} context + */ function nodePlugins(context) { // Need to find the top-most `package.json` file const folderName = path.relative(__dirname, context).split(/[\\\/]/)[0]; @@ -93,7 +97,7 @@ function nodePlugins(context) { function withBrowserDefaults(/**@type WebpackConfig*/extConfig, /** @type AdditionalBrowserConfig */ additionalOptions = {}) { /** @type WebpackConfig */ - let defaultConfig = { + const defaultConfig = { mode: 'none', // this leaves the source code as close as possible to the original (when packaging we set this to 'production') target: 'webworker', // extensions run in a webworker context resolve: { @@ -108,17 +112,18 @@ function withBrowserDefaults(/**@type WebpackConfig*/extConfig, /** @type Additi rules: [{ test: /\.ts$/, exclude: /node_modules/, - use: [{ - // configure TypeScript loader: - // * enable sources maps for end-to-end source maps - loader: 'ts-loader', - options: { - compilerOptions: { - 'sourceMap': true, - }, - ...(additionalOptions ? {} : { configFile: additionalOptions.configFile }) - } - }] + use: [ + { + // configure TypeScript loader: + // * enable sources maps for end-to-end source maps + loader: 'ts-loader', + options: { + compilerOptions: { + 'sourceMap': true, + }, + ...(additionalOptions ? {} : { configFile: additionalOptions.configFile }) + } + }] }] }, externals: { @@ -138,27 +143,40 @@ function withBrowserDefaults(/**@type WebpackConfig*/extConfig, /** @type Additi }, // yes, really source maps devtool: 'source-map', - plugins: browserPlugins + plugins: browserPlugins(extConfig.context) }; return merge(defaultConfig, extConfig); } -const browserPlugins = [ - new CopyWebpackPlugin({ - patterns: [ - { from: 'src', to: '.', globOptions: { ignore: ['**/test/**', '**/*.ts'] }, noErrorOnMissing: true } - ] - }), - new DefinePlugin({ - 'process.platform': JSON.stringify('web'), - 'process.env': JSON.stringify({}), - 'process.env.BROWSER_ENV': JSON.stringify('true') - }) -]; - - - +/** + * + * @param {string} context + */ +function browserPlugins(context) { + // Need to find the top-most `package.json` file + // const folderName = path.relative(__dirname, context).split(/[\\\/]/)[0]; + // const pkgPath = path.join(__dirname, folderName, 'package.json'); + // const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8')); + // const id = `${pkg.publisher}.${pkg.name}`; + return [ + new optimize.LimitChunkCountPlugin({ + maxChunks: 1 + }), + new CopyWebpackPlugin({ + patterns: [ + { from: 'src', to: '.', globOptions: { ignore: ['**/test/**', '**/*.ts'] }, noErrorOnMissing: true } + ] + }), + new DefinePlugin({ + 'process.platform': JSON.stringify('web'), + 'process.env': JSON.stringify({}), + 'process.env.BROWSER_ENV': JSON.stringify('true') + }), + // TODO: bring this back once vscode-nls-dev supports browser + // new NLSBundlePlugin(id) + ]; +} module.exports = withNodeDefaults; module.exports.node = withNodeDefaults; diff --git a/extensions/shellscript/package.json b/extensions/shellscript/package.json index 6bb0131dd30..7fa55ea680c 100644 --- a/extensions/shellscript/package.json +++ b/extensions/shellscript/package.json @@ -19,6 +19,7 @@ "Shell Script", "shellscript", "bash", + "fish", "sh", "zsh", "ksh", @@ -45,6 +46,7 @@ ".zlogout", ".zshenv", ".zsh-theme", + ".fish", ".ksh", ".csh", ".cshrc", @@ -65,7 +67,7 @@ "bashrc_Apple_Terminal", "zshrc_Apple_Terminal" ], - "firstLine": "^#!.*\\b(bash|zsh|sh|ksh|dtksh|pdksh|mksh|ash|dash|yash|sh|csh|jcsh|tcsh|itcsh).*|^#\\s*-\\*-[^*]*mode:\\s*shell-script[^*]*-\\*-", + "firstLine": "^#!.*\\b(bash|fish|zsh|sh|ksh|dtksh|pdksh|mksh|ash|dash|yash|sh|csh|jcsh|tcsh|itcsh).*|^#\\s*-\\*-[^*]*mode:\\s*shell-script[^*]*-\\*-", "configuration": "./language-configuration.json", "mimetypes": [ "text/x-shellscript" diff --git a/extensions/simple-browser/.vscodeignore b/extensions/simple-browser/.vscodeignore index ec298ce1768..d1006b25b79 100644 --- a/extensions/simple-browser/.vscodeignore +++ b/extensions/simple-browser/.vscodeignore @@ -11,3 +11,4 @@ cgmanifest.json yarn.lock preview-src/** webpack.config.js +esbuild-preview.js diff --git a/extensions/simple-browser/package.json b/extensions/simple-browser/package.json index 711ffbd81e3..bcd83d483d3 100644 --- a/extensions/simple-browser/package.json +++ b/extensions/simple-browser/package.json @@ -9,9 +9,9 @@ "icon": "media/icon.png", "publisher": "vscode", "license": "MIT", - "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", + "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255", "engines": { - "vscode": "^1.53.0" + "vscode": "^1.70.0" }, "main": "./out/extension", "browser": "./dist/browser/extension", @@ -67,8 +67,8 @@ "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose" }, "dependencies": { - "@vscode/extension-telemetry": "0.4.10", - "vscode-nls": "^5.0.0" + "@vscode/extension-telemetry": "0.6.2", + "vscode-nls": "^5.2.0" }, "devDependencies": { "@types/vscode-webview": "^1.57.0", diff --git a/extensions/simple-browser/src/extension.ts b/extensions/simple-browser/src/extension.ts index ff3649c7baf..6d3ded5131b 100644 --- a/extensions/simple-browser/src/extension.ts +++ b/extensions/simple-browser/src/extension.ts @@ -23,13 +23,13 @@ const enabledHosts = new Set([ // localhost IPv4 '127.0.0.1', // localhost IPv6 - '0:0:0:0:0:0:0:1', - '::1', + '[0:0:0:0:0:0:0:1]', + '[::1]', // all interfaces IPv4 '0.0.0.0', // all interfaces IPv6 - '0:0:0:0:0:0:0:0', - '::' + '[0:0:0:0:0:0:0:0]', + '[::]' ]); const openerId = 'simpleBrowser.open'; @@ -62,12 +62,13 @@ export function activate(context: vscode.ExtensionContext) { preserveFocus?: boolean; viewColumn: vscode.ViewColumn; }) => { - manager.show(url.toString(), showOptions); + manager.show(url, showOptions); })); context.subscriptions.push(vscode.window.registerExternalUriOpener(openerId, { canOpenExternalUri(uri: vscode.Uri) { - const originalUri = new URL(uri.toString()); + // We have to replace the IPv6 hosts with IPv4 because URL can't handle IPv6. + const originalUri = new URL(uri.toString(true)); if (enabledHosts.has(originalUri.hostname)) { return isWeb() ? vscode.ExternalUriOpenerPriority.Default @@ -77,7 +78,7 @@ export function activate(context: vscode.ExtensionContext) { return vscode.ExternalUriOpenerPriority.None; }, openExternalUri(resolveUri: vscode.Uri) { - return manager.show(resolveUri.toString(), { + return manager.show(resolveUri, { viewColumn: vscode.window.activeTextEditor ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active }); } diff --git a/extensions/simple-browser/src/simpleBrowserManager.ts b/extensions/simple-browser/src/simpleBrowserManager.ts index 9d59c1816ab..ef485916411 100644 --- a/extensions/simple-browser/src/simpleBrowserManager.ts +++ b/extensions/simple-browser/src/simpleBrowserManager.ts @@ -19,7 +19,8 @@ export class SimpleBrowserManager { this._activeView = undefined; } - public show(url: string, options?: ShowOptions): void { + public show(inputUri: string | vscode.Uri, options?: ShowOptions): void { + const url = typeof inputUri === 'string' ? inputUri : inputUri.toString(true); if (this._activeView) { this._activeView.show(url, options); } else { @@ -34,7 +35,7 @@ export class SimpleBrowserManager { const url = state?.url ?? ''; const view = SimpleBrowserView.restore(this.extensionUri, url, panel); this.registerWebviewListeners(view); - return; + this._activeView ??= view; } private registerWebviewListeners(view: SimpleBrowserView) { @@ -46,4 +47,3 @@ export class SimpleBrowserManager { } } - diff --git a/extensions/simple-browser/yarn.lock b/extensions/simple-browser/yarn.lock index af6b2add33e..97902582dea 100644 --- a/extensions/simple-browser/yarn.lock +++ b/extensions/simple-browser/yarn.lock @@ -2,22 +2,61 @@ # yarn lockfile v1 +"@microsoft/1ds-core-js@3.2.3", "@microsoft/1ds-core-js@^3.2.3": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.3.tgz#2217d92ec8b073caa4577a13f40ea3a5c4c4d4e7" + integrity sha512-796A8fd90oUKDRO7UXUT9BwZ3G+a9XzJj5v012FcCN/2qRhEsIV3x/0wkx2S08T4FiQEUPkB2uoYHpEjEneM7g== + dependencies: + "@microsoft/applicationinsights-core-js" "2.8.4" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/1ds-post-js@^3.2.3": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.3.tgz#1fa7d51615a44f289632ae8c588007ba943db216" + integrity sha512-tcGJQXXr2LYoBbIXPoUVe1KCF3OtBsuKDFL7BXfmNtuSGtWF0yejm6H83DrR8/cUIGMRMUP9lqNlqFGwDYiwAQ== + dependencies: + "@microsoft/1ds-core-js" "3.2.3" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/applicationinsights-core-js@2.8.4": + version "2.8.4" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.4.tgz#607e531bb241a8920d43960f68a7c76a6f9af596" + integrity sha512-FoA0FNOsFbJnLyTyQlYs6+HR7HMEa6nAOE6WOm9WVejBHMHQ/Bdb+hfVFi6slxwCimr/ner90jchi4/sIYdnyQ== + dependencies: + "@microsoft/applicationinsights-shims" "2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/applicationinsights-shims@2.0.1", "@microsoft/applicationinsights-shims@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.1.tgz#5d72fb7aaf4056c4fda54f9d7c93ccf8ca9bcbfd" + integrity sha512-G0MXf6R6HndRbDy9BbEj0zrLeuhwt2nsXk2zKtF0TnYo39KgYqhYC2ayIzKPTm2KAE+xzD7rgyLdZnrcRvt9WQ== + +"@microsoft/dynamicproto-js@^1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc" + integrity sha512-D1Oivw1A4bIXhzBIy3/BBPn3p2On+kpO2NiYt9shICDK7L/w+cR6FFBUsBZ05l6iqzTeL+Jm8lAYn0g6G7DmDg== + "@types/vscode-webview@^1.57.0": version "1.57.0" resolved "https://registry.yarnpkg.com/@types/vscode-webview/-/vscode-webview-1.57.0.tgz#bad5194d45ae8d03afc1c0f67f71ff5e7a243bbf" integrity sha512-x3Cb/SMa1IwRHfSvKaZDZOTh4cNoG505c3NjTqGlMC082m++x/ETUmtYniDsw6SSmYzZXO8KBNhYxR0+VqymqA== -"@vscode/extension-telemetry@0.4.10": - version "0.4.10" - resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.4.10.tgz#be960c05bdcbea0933866346cf244acad6cac910" - integrity sha512-XgyUoWWRQExTmd9DynIIUQo1NPex/zIeetdUAXeBjVuW9ioojM1TcDaSqOa/5QLC7lx+oEXwSU1r0XSBgzyz6w== +"@vscode/extension-telemetry@0.6.2": + version "0.6.2" + resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.6.2.tgz#b86814ee680615730da94220c2b03ea9c3c14a8e" + integrity sha512-yb/wxLuaaCRcBAZtDCjNYSisAXz3FWsSqAha5nhHcYxx2ZPdQdWuZqVXGKq0ZpHVndBWWtK6XqtpCN2/HB4S1w== + dependencies: + "@microsoft/1ds-core-js" "^3.2.3" + "@microsoft/1ds-post-js" "^3.2.3" vscode-codicons@^0.0.14: version "0.0.14" resolved "https://registry.yarnpkg.com/vscode-codicons/-/vscode-codicons-0.0.14.tgz#e0d05418e2e195564ff6f6a2199d70415911c18f" integrity sha512-6CEH5KT9ct5WMw7n5dlX7rB8ya4CUI2FSq1Wk36XaW+c5RglFtAanUV0T+gvZVVFhl/WxfjTvFHq06Hz9c1SLA== -vscode-nls@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840" - integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA== +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== diff --git a/extensions/sql/cgmanifest.json b/extensions/sql/cgmanifest.json index f1d6e04e5ad..b40cb39a6e3 100644 --- a/extensions/sql/cgmanifest.json +++ b/extensions/sql/cgmanifest.json @@ -6,11 +6,11 @@ "git": { "name": "microsoft/vscode-mssql", "repositoryUrl": "https://github.com/microsoft/vscode-mssql", - "commitHash": "c98518dd7418ddfb6f35676e14cf12791b0a235d" + "commitHash": "b8b58864526c048002b7c3964bdac8aac3713bd9" } }, "license": "MIT", - "version": "1.10.1" + "version": "1.16.0" } ], "version": 1 diff --git a/extensions/sql/syntaxes/sql.tmLanguage.json b/extensions/sql/syntaxes/sql.tmLanguage.json index ec0e461d9f8..26575ff4549 100644 --- a/extensions/sql/syntaxes/sql.tmLanguage.json +++ b/extensions/sql/syntaxes/sql.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/microsoft/vscode-mssql/commit/c98518dd7418ddfb6f35676e14cf12791b0a235d", + "version": "https://github.com/microsoft/vscode-mssql/commit/b8b58864526c048002b7c3964bdac8aac3713bd9", "name": "SQL", "scopeName": "source.sql", "patterns": [ @@ -191,7 +191,7 @@ "name": "keyword.operator.concatenator.sql" }, { - "match": "(?i)\\b(avg|checksum_agg|count|count_big|grouping|grouping_id|max|min|sum|stdev|stdevp|var|varp)\\b", + "match": "(?i)\\b(aggregate|approx_count_distinct|avg|checksum_agg|count|count_big|grouping|grouping_id|max|min|sum|stdev|stdevp|var|varp)\\b", "name": "support.function.aggregate.sql" }, { @@ -202,14 +202,26 @@ "match": "(?i)\\b(cast|convert|parse|try_cast|try_convert|try_parse)\\b", "name": "support.function.conversion.sql" }, + { + "match": "(?i)\\b(collationproperty|tertiary_weights)\\b", + "name": "support.function.collation.sql" + }, + { + "match": "(?i)\\b(asymkey_id|asymkeyproperty|certproperty|cert_id|crypt_gen_random|decryptbyasymkey|decryptbycert|decryptbykey|decryptbykeyautoasymkey|decryptbykeyautocert|decryptbypassphrase|encryptbyasymkey|encryptbycert|encryptbykey|encryptbypassphrase|hashbytes|is_objectsigned|key_guid|key_id|key_name|signbyasymkey|signbycert|symkeyproperty|verifysignedbycert|verifysignedbyasymkey)\\b", + "name": "support.function.cryptographic.sql" + }, { "match": "(?i)\\b(cursor_status)\\b", "name": "support.function.cursor.sql" }, { - "match": "(?i)\\b(sysdatetime|sysdatetimeoffset|sysutcdatetime|current_time(stamp)?|getdate|getutcdate|datename|datepart|day|month|year|datefromparts|datetime2fromparts|datetimefromparts|datetimeoffsetfromparts|smalldatetimefromparts|timefromparts|datediff|dateadd|eomonth|switchoffset|todatetimeoffset|isdate)\\b", + "match": "(?i)\\b(sysdatetime|sysdatetimeoffset|sysutcdatetime|current_time(stamp)?|getdate|getutcdate|datename|datepart|day|month|year|datefromparts|datetime2fromparts|datetimefromparts|datetimeoffsetfromparts|smalldatetimefromparts|timefromparts|datediff|dateadd|eomonth|switchoffset|todatetimeoffset|isdate|date_bucket)\\b", "name": "support.function.datetime.sql" }, + { + "match": "(?i)\\b(datalength|ident_current|ident_incr|ident_seed|identity|sql_variant_property)\\b", + "name": "support.function.datatype.sql" + }, { "match": "(?i)\\b(coalesce|nullif)\\b", "name": "support.function.expression.sql" @@ -219,7 +231,11 @@ "name": "support.function.globalvar.sql" }, { - "match": "(?i)\\b(choose|iif)\\b", + "match": "(?i)\\b(json|isjson|json_object|json_array|json_value|json_query|json_modify|json_path_exists)\\b", + "name": "support.function.json.sql" + }, + { + "match": "(?i)\\b(choose|iif|greatest|least)\\b", "name": "support.function.logical.sql" }, { @@ -235,7 +251,7 @@ "name": "support.function.ranking.sql" }, { - "match": "(?i)\\b(opendatasource|openrowset|openquery|openxml)\\b", + "match": "(?i)\\b(generate_series|opendatasource|openjson|openrowset|openquery|openxml|predict|string_split)\\b", "name": "support.function.rowset.sql" }, { diff --git a/extensions/theme-abyss/themes/abyss-color-theme.json b/extensions/theme-abyss/themes/abyss-color-theme.json index aa48d9724fe..7ce14d2de22 100644 --- a/extensions/theme-abyss/themes/abyss-color-theme.json +++ b/extensions/theme-abyss/themes/abyss-color-theme.json @@ -7,7 +7,11 @@ } }, { - "scope": ["meta.embedded", "source.groovy.embedded"], + "scope": [ + "meta.embedded", + "source.groovy.embedded", + "string meta.image.inline.markdown" + ], "settings": { "foreground": "#6688cc" } @@ -405,6 +409,7 @@ // "activityBar.foreground": "", // "activityBarBadge.background": "", // "activityBarBadge.foreground": "", + "activityBarItem.settingsProfilesBackground": "#082877", // Workbench: Panel // "panel.background": "", diff --git a/extensions/theme-defaults/themes/dark_vs.json b/extensions/theme-defaults/themes/dark_vs.json index 8072b0bdd6e..7b3c8d5e6fd 100644 --- a/extensions/theme-defaults/themes/dark_vs.json +++ b/extensions/theme-defaults/themes/dark_vs.json @@ -20,13 +20,15 @@ "sideBarSectionHeader.background": "#0000", "sideBarSectionHeader.border": "#ccc3", "tab.lastPinnedBorder": "#ccc3", - "list.activeSelectionIconForeground": "#FFF" + "list.activeSelectionIconForeground": "#FFF", + "terminal.inactiveSelectionBackground": "#3A3D41", }, "tokenColors": [ { "scope": [ "meta.embedded", - "source.groovy.embedded" + "source.groovy.embedded", + "string meta.image.inline.markdown", ], "settings": { "foreground": "#D4D4D4" diff --git a/extensions/theme-defaults/themes/hc_black.json b/extensions/theme-defaults/themes/hc_black.json index 7a257515d8c..b8eda7974b7 100644 --- a/extensions/theme-defaults/themes/hc_black.json +++ b/extensions/theme-defaults/themes/hc_black.json @@ -17,7 +17,8 @@ { "scope": [ "meta.embedded", - "source.groovy.embedded" + "source.groovy.embedded", + "string meta.image.inline.markdown" ], "settings": { "foreground": "#FFFFFF" diff --git a/extensions/theme-defaults/themes/light_vs.json b/extensions/theme-defaults/themes/light_vs.json index d2349f31249..9a5092043d9 100644 --- a/extensions/theme-defaults/themes/light_vs.json +++ b/extensions/theme-defaults/themes/light_vs.json @@ -2,6 +2,7 @@ "$schema": "vscode://schemas/color-theme", "name": "Light (Visual Studio)", "colors": { + "activityBarItem.settingsProfilesBackground": "#4d4d4d", "editor.background": "#FFFFFF", "editor.foreground": "#000000", "editor.inactiveSelectionBackground": "#E5EBF1", @@ -25,13 +26,16 @@ "notebook.cellBorderColor": "#E8E8E8", "notebook.selectedCellBackground": "#c8ddf150", "statusBarItem.errorBackground": "#c72e0f", - "list.activeSelectionIconForeground": "#FFF" + "list.activeSelectionIconForeground": "#FFF", + "list.focusAndSelectionOutline": "#90C2F9", + "terminal.inactiveSelectionBackground": "#E5EBF1", }, "tokenColors": [ { "scope": [ "meta.embedded", - "source.groovy.embedded" + "source.groovy.embedded", + "string meta.image.inline.markdown" ], "settings": { "foreground": "#000000ff" @@ -100,7 +104,7 @@ { "scope": "entity.other.attribute-name", "settings": { - "foreground": "#ff0000" + "foreground": "#e50000" } }, { @@ -325,7 +329,7 @@ "source.coffee.embedded" ], "settings": { - "foreground": "#ff0000" + "foreground": "#e50000" } }, { diff --git a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json index bc56665a86c..8208d90f102 100644 --- a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json +++ b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json @@ -32,6 +32,7 @@ "ports.iconRunningProcessForeground": "#369432", "activityBar.background": "#221a0f", "activityBar.foreground": "#d3af86", + "activityBarItem.settingsProfilesBackground": "#47351d", "sideBar.background": "#362712", "menu.background": "#362712", "menu.foreground": "#CCCCCC", @@ -60,7 +61,11 @@ } }, { - "scope": ["meta.embedded", "source.groovy.embedded"], + "scope": [ + "meta.embedded", + "source.groovy.embedded", + "string meta.image.inline.markdown" + ], "settings": { "foreground": "#d3af86" } diff --git a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json index 27b9277f724..ea84bededd5 100644 --- a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json +++ b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json @@ -59,7 +59,8 @@ "terminal.ansiBrightBlue": "#819aff", // hue shifted #AE81FF "terminal.ansiBrightMagenta": "#AE81FF", "terminal.ansiBrightCyan": "#66D9EF", - "terminal.ansiBrightWhite": "#f8f8f2" + "terminal.ansiBrightWhite": "#f8f8f2", + "terminal.inactiveSelectionBackground": "#676b7140" }, "tokenColors": [ { diff --git a/extensions/theme-monokai/themes/monokai-color-theme.json b/extensions/theme-monokai/themes/monokai-color-theme.json index 11e7caa3c3e..fccdf7cd600 100644 --- a/extensions/theme-monokai/themes/monokai-color-theme.json +++ b/extensions/theme-monokai/themes/monokai-color-theme.json @@ -110,7 +110,8 @@ { "scope": [ "meta.embedded", - "source.groovy.embedded" + "source.groovy.embedded", + "string meta.image.inline.markdown" ], "settings": { "foreground": "#F8F8F2" diff --git a/extensions/theme-quietlight/themes/quietlight-color-theme.json b/extensions/theme-quietlight/themes/quietlight-color-theme.json index 753116e27d1..30615a91f03 100644 --- a/extensions/theme-quietlight/themes/quietlight-color-theme.json +++ b/extensions/theme-quietlight/themes/quietlight-color-theme.json @@ -9,7 +9,8 @@ { "scope": [ "meta.embedded", - "source.groovy.embedded" + "source.groovy.embedded", + "string meta.image.inline.markdown" ], "settings": { "foreground": "#333333" diff --git a/extensions/theme-red/themes/Red-color-theme.json b/extensions/theme-red/themes/Red-color-theme.json index f5bd596d10d..c139400dc56 100644 --- a/extensions/theme-red/themes/Red-color-theme.json +++ b/extensions/theme-red/themes/Red-color-theme.json @@ -69,7 +69,8 @@ { "scope": [ "meta.embedded", - "source.groovy.embedded" + "source.groovy.embedded", + "string meta.image.inline.markdown" ], "settings": { "foreground": "#F8F8F8" diff --git a/extensions/theme-seti/build/update-icon-theme.js b/extensions/theme-seti/build/update-icon-theme.js index 66e11c16c5e..ab2a1c81e81 100644 --- a/extensions/theme-seti/build/update-icon-theme.js +++ b/extensions/theme-seti/build/update-icon-theme.js @@ -45,8 +45,13 @@ const nonBuiltInLanguages = { // { fileNames, extensions } const inheritIconFromLanguage = { "jsonc": 'json', "postcss": 'css', - "django-html": 'html' -} + "django-html": 'html', + "blade": 'php' +}; + +const ignoreExtAssociation = { + "properties": true +}; const FROM_DISK = true; // set to true to take content from a repo checked out next to the vscode repo @@ -398,7 +403,7 @@ exports.update = function () { if (!nonBuiltInLanguages[lang] && !inheritIconFromLanguage[lang]) { for (let i2 = 0; i2 < exts.length; i2++) { // remove the extension association, unless it is different from the preferred - if (ext2Def[exts[i2]] === preferredDef) { + if (ext2Def[exts[i2]] === preferredDef || ignoreExtAssociation[exts[i2]]) { delete ext2Def[exts[i2]]; } } diff --git a/extensions/theme-seti/cgmanifest.json b/extensions/theme-seti/cgmanifest.json index 00e2991fb96..b2b36944416 100644 --- a/extensions/theme-seti/cgmanifest.json +++ b/extensions/theme-seti/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "seti-ui", "repositoryUrl": "https://github.com/jesseweed/seti-ui", - "commitHash": "8dba1bc311dad1b9bc23c4779149f3bf9baa8cb0" + "commitHash": "fd20793e5a75b350eab8d489165fb9b420df3f62" } }, "version": "0.1.0" diff --git a/extensions/theme-seti/icons/seti.woff b/extensions/theme-seti/icons/seti.woff index aeb87b845af..88cb75699ed 100644 Binary files a/extensions/theme-seti/icons/seti.woff and b/extensions/theme-seti/icons/seti.woff differ diff --git a/extensions/theme-seti/icons/vs-seti-icon-theme.json b/extensions/theme-seti/icons/vs-seti-icon-theme.json index 41d2556aaa9..f5b78299680 100644 --- a/extensions/theme-seti/icons/vs-seti-icon-theme.json +++ b/extensions/theme-seti/icons/vs-seti-icon-theme.json @@ -750,6 +750,14 @@ "fontCharacter": "\\E050", "fontColor": "#cc3e44" }, + "_java_1_light": { + "fontCharacter": "\\E050", + "fontColor": "#498ba7" + }, + "_java_1": { + "fontCharacter": "\\E050", + "fontColor": "#519aba" + }, "_javascript_light": { "fontCharacter": "\\E051", "fontColor": "#b7b73b" @@ -1567,8 +1575,6 @@ "cfm": "_coldfusion", "litcoffee": "_coffee", "config": "_config", - "cfg": "_config", - "conf": "_config", "cr": "_crystal", "ecr": "_crystal_embedded", "slang": "_crystal_embedded", @@ -1614,7 +1620,7 @@ "hxp": "_haxe_2", "hxml": "_haxe_3", "jade": "_jade", - "class": "_java", + "class": "_java_1", "classpath": "_java", "js.map": "_javascript", "spec.js": "_javascript_1", @@ -1686,6 +1692,7 @@ "tf": "_terraform", "tf.json": "_terraform", "tfvars": "_terraform", + "tfvars.json": "_terraform", "dtx": "_tex_2", "ins": "_tex_3", "toml": "_config", @@ -1722,7 +1729,6 @@ "webp": "_image", "sublime-project": "_sublime", "sublime-workspace": "_sublime", - "fish": "_shell", "mov": "_video", "ogv": "_video", "webm": "_video", @@ -1765,7 +1771,6 @@ "direnv": "_config", "env": "_config", "static": "_config", - "editorconfig": "_config", "slugignore": "_config", "tmp": "_clock_1", "htaccess": "_config", @@ -1826,14 +1831,19 @@ "yarn.lock": "_yarn", "webpack.config.js": "_webpack", "webpack.config.cjs": "_webpack", + "webpack.config.ts": "_webpack", "webpack.config.build.js": "_webpack", "webpack.config.build.cjs": "_webpack", + "webpack.config.build.ts": "_webpack", "webpack.common.js": "_webpack", "webpack.common.cjs": "_webpack", + "webpack.common.ts": "_webpack", "webpack.dev.js": "_webpack", "webpack.dev.cjs": "_webpack", + "webpack.dev.ts": "_webpack", "webpack.prod.js": "_webpack", "webpack.prod.cjs": "_webpack", + "webpack.prod.ts": "_webpack", "license": "_license", "licence": "_license", "license.txt": "_license", @@ -1863,6 +1873,7 @@ "clojure": "_clojure", "coffeescript": "_coffee", "jsonc": "_json", + "json": "_json", "c": "_c", "cpp": "_cpp", "cuda-cpp": "_cu", @@ -1872,15 +1883,15 @@ "dockerfile": "_docker", "ignore": "_git", "fsharp": "_f-sharp", + "git-commit": "_git", "go": "_go2", "groovy": "_grails", "handlebars": "_mustache", "html": "_html_3", - "properties": "_java", + "properties": "_config", "java": "_java", "javascriptreact": "_react", "javascript": "_javascript", - "json": "_json", "julia": "_julia", "tex": "_tex_1", "latex": "_tex", @@ -1933,7 +1944,8 @@ "vala": "_vala", "vue": "_vue", "postcss": "_css", - "django-html": "_html_3" + "django-html": "_html_3", + "blade": "_php" }, "light": { "file": "_default_light", @@ -1965,8 +1977,6 @@ "cfm": "_coldfusion_light", "litcoffee": "_coffee_light", "config": "_config_light", - "cfg": "_config_light", - "conf": "_config_light", "cr": "_crystal_light", "ecr": "_crystal_embedded_light", "slang": "_crystal_embedded_light", @@ -2012,7 +2022,7 @@ "hxp": "_haxe_2_light", "hxml": "_haxe_3_light", "jade": "_jade_light", - "class": "_java_light", + "class": "_java_1_light", "classpath": "_java_light", "js.map": "_javascript_light", "spec.js": "_javascript_1_light", @@ -2084,6 +2094,7 @@ "tf": "_terraform_light", "tf.json": "_terraform_light", "tfvars": "_terraform_light", + "tfvars.json": "_terraform_light", "dtx": "_tex_2_light", "ins": "_tex_3_light", "toml": "_config_light", @@ -2120,7 +2131,6 @@ "webp": "_image_light", "sublime-project": "_sublime_light", "sublime-workspace": "_sublime_light", - "fish": "_shell_light", "mov": "_video_light", "ogv": "_video_light", "webm": "_video_light", @@ -2163,7 +2173,6 @@ "direnv": "_config_light", "env": "_config_light", "static": "_config_light", - "editorconfig": "_config_light", "slugignore": "_config_light", "tmp": "_clock_1_light", "htaccess": "_config_light", @@ -2179,6 +2188,7 @@ "clojure": "_clojure_light", "coffeescript": "_coffee_light", "jsonc": "_json_light", + "json": "_json_light", "c": "_c_light", "cpp": "_cpp_light", "cuda-cpp": "_cu_light", @@ -2188,15 +2198,15 @@ "dockerfile": "_docker_light", "ignore": "_git_light", "fsharp": "_f-sharp_light", + "git-commit": "_git_light", "go": "_go2_light", "groovy": "_grails_light", "handlebars": "_mustache_light", "html": "_html_3_light", - "properties": "_java_light", + "properties": "_config_light", "java": "_java_light", "javascriptreact": "_react_light", "javascript": "_javascript_light", - "json": "_json_light", "julia": "_julia_light", "tex": "_tex_1_light", "latex": "_tex_light", @@ -2248,7 +2258,8 @@ "vala": "_vala_light", "vue": "_vue_light", "postcss": "_css_light", - "django-html": "_html_3_light" + "django-html": "_html_3_light", + "blade": "_php_light" }, "fileNames": { "mix": "_hex_light", @@ -2300,14 +2311,19 @@ "yarn.lock": "_yarn_light", "webpack.config.js": "_webpack_light", "webpack.config.cjs": "_webpack_light", + "webpack.config.ts": "_webpack_light", "webpack.config.build.js": "_webpack_light", "webpack.config.build.cjs": "_webpack_light", + "webpack.config.build.ts": "_webpack_light", "webpack.common.js": "_webpack_light", "webpack.common.cjs": "_webpack_light", + "webpack.common.ts": "_webpack_light", "webpack.dev.js": "_webpack_light", "webpack.dev.cjs": "_webpack_light", + "webpack.dev.ts": "_webpack_light", "webpack.prod.js": "_webpack_light", "webpack.prod.cjs": "_webpack_light", + "webpack.prod.ts": "_webpack_light", "license": "_license_light", "licence": "_license_light", "license.txt": "_license_light", @@ -2330,5 +2346,5 @@ "npm-debug.log": "_npm_ignored_light" } }, - "version": "https://github.com/jesseweed/seti-ui/commit/8dba1bc311dad1b9bc23c4779149f3bf9baa8cb0" + "version": "https://github.com/jesseweed/seti-ui/commit/fd20793e5a75b350eab8d489165fb9b420df3f62" } \ No newline at end of file diff --git a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json index 2febfd9bca0..e10c6e67403 100644 --- a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json +++ b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json @@ -9,7 +9,8 @@ { "scope": [ "meta.embedded", - "source.groovy.embedded" + "source.groovy.embedded", + "string meta.image.inline.markdown" ], "settings": { "foreground": "#839496" diff --git a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json index 85cdac449d7..e5f8e5b5ee5 100644 --- a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json +++ b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json @@ -9,7 +9,8 @@ { "scope": [ "meta.embedded", - "source.groovy.embedded" + "source.groovy.embedded", + "string meta.image.inline.markdown" ], "settings": { "foreground": "#657B83" @@ -488,6 +489,9 @@ "terminal.ansiBrightMagenta": "#6c71c4", "terminal.ansiBrightCyan": "#93a1a1", "terminal.ansiBrightWhite": "#fdf6e3", + // Set terminal background explicitly, otherwise selection becomes invisible when the + // terminal is in the side bar + "terminal.background": "#FDF6E3", // Interactive Playground "walkThrough.embeddedEditorBackground": "#00000014" }, diff --git a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json index 70b57d594fe..45f1a1d55b0 100644 --- a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json +++ b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json @@ -15,8 +15,8 @@ "editor.foreground": "#ffffff", "editor.selectionBackground": "#003f8e", "minimap.selectionHighlight": "#003f8e", - "editor.lineHighlightBackground": "#00346e", - "editorLineNumber.activeForeground": "#949494", + "editor.lineHighlightBackground": "#00346e", + "editorLineNumber.activeForeground": "#949494", "editorCursor.foreground": "#ffffff", "editorWhitespace.foreground": "#404f7d", "editorWidget.background": "#001c40", @@ -36,6 +36,7 @@ "statusBar.noFolderBackground": "#001126", "statusBar.debuggingBackground": "#001126", "activityBar.background": "#001733", + "activityBarItem.settingsProfilesBackground": "#003271", "progressBar.background": "#bbdaffcc", "badge.background": "#bbdaffcc", "badge.foreground": "#001733", @@ -65,7 +66,12 @@ } }, { - "scope": ["meta.embedded", "source.groovy.embedded"], + "scope": [ + "meta.embedded", + "source.groovy.embedded", + "meta.jsx.children", + "string meta.image.inline.markdown" + ], "settings": { //"background": "#002451", "foreground": "#FFFFFF" diff --git a/extensions/tsconfig.base.json b/extensions/tsconfig.base.json index 5651d572632..2e4a6009a02 100644 --- a/extensions/tsconfig.base.json +++ b/extensions/tsconfig.base.json @@ -20,7 +20,10 @@ "ES2020.Promise", "ES2020.String", "ES2020.Symbol.WellKnown", - "ES2020.Intl" + "ES2020.Intl", + "ES2021.Promise", + "ES2021.String", + "ES2021.WeakRef" ], "module": "commonjs", "strict": true, diff --git a/extensions/typescript-basics/cgmanifest.json b/extensions/typescript-basics/cgmanifest.json index d0fcb000eca..7e93b3d9ab0 100644 --- a/extensions/typescript-basics/cgmanifest.json +++ b/extensions/typescript-basics/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "TypeScript-TmLanguage", "repositoryUrl": "https://github.com/microsoft/TypeScript-TmLanguage", - "commitHash": "4d30ff834ec324f56291addd197aa1e423cedfdd" + "commitHash": "c2744520e325330d0608fc1d1993d7fe98e66202" } }, "license": "MIT", diff --git a/extensions/typescript-basics/language-configuration.json b/extensions/typescript-basics/language-configuration.json index d940228f3e4..dab624eb8a7 100644 --- a/extensions/typescript-basics/language-configuration.json +++ b/extensions/typescript-basics/language-configuration.json @@ -99,6 +99,24 @@ ">" ] ], + "colorizedBracketPairs": [ + [ + "(", + ")" + ], + [ + "[", + "]" + ], + [ + "{", + "}" + ], + [ + "<", + ">" + ] + ], "autoCloseBefore": ";:.,=}])>` \n\t", "folding": { "markers": { diff --git a/extensions/typescript-basics/package.json b/extensions/typescript-basics/package.json index cb6c20d8eed..fef8f0221f0 100644 --- a/extensions/typescript-basics/package.json +++ b/extensions/typescript-basics/package.json @@ -64,6 +64,13 @@ "language": "typescript", "scopeName": "source.ts", "path": "./syntaxes/TypeScript.tmLanguage.json", + "unbalancedBracketScopes": [ + "keyword.operator.relational", + "storage.type.function.arrow", + "keyword.operator.bitwise.shift", + "meta.brace.angle", + "punctuation.definition.tag" + ], "tokenTypes": { "meta.template.expression": "other", "meta.template.expression string": "string", @@ -78,6 +85,12 @@ "language": "typescriptreact", "scopeName": "source.tsx", "path": "./syntaxes/TypeScriptReact.tmLanguage.json", + "unbalancedBracketScopes": [ + "keyword.operator.relational", + "storage.type.function.arrow", + "keyword.operator.bitwise.shift", + "punctuation.definition.tag" + ], "embeddedLanguages": { "meta.tag.tsx": "jsx-tags", "meta.tag.without-attributes.tsx": "jsx-tags", diff --git a/extensions/typescript-basics/snippets/typescript.code-snippets b/extensions/typescript-basics/snippets/typescript.code-snippets index 0162ef50975..35b2aa1711c 100644 --- a/extensions/typescript-basics/snippets/typescript.code-snippets +++ b/extensions/typescript-basics/snippets/typescript.code-snippets @@ -14,6 +14,7 @@ }, "Class Definition": { "prefix": "class", + "isFileTemplate": true, "body": [ "class ${1:name} {", "\tconstructor(${2:parameters}) {", diff --git a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json index 5164273d6a4..636fad5e441 100644 --- a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json +++ b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/4d30ff834ec324f56291addd197aa1e423cedfdd", + "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/c2744520e325330d0608fc1d1993d7fe98e66202", "name": "TypeScript", "scopeName": "source.ts", "patterns": [ @@ -2268,11 +2268,47 @@ "name": "keyword.control.from.ts", "match": "\\bfrom\\b" }, + { + "include": "#import-export-assert-clause" + }, { "include": "#import-export-clause" } ] }, + "import-export-assert-clause": { + "begin": "(?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|(===|!==|==|!=)|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)", + "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)))\\s*$)", "beginCaptures": { "1": { "name": "storage.modifier.async.ts" @@ -3318,13 +3357,16 @@ } }, { - "begin": "(?]|\\|\\||\\&\\&|\\!\\=\\=|$|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|((?\\s*$)", + "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name|resolution-mode)\\s*=\\s*((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))+\\s*/>\\s*$)", "beginCaptures": { "1": { "name": "punctuation.definition.comment.ts" @@ -5141,7 +5183,7 @@ "patterns": [ { "name": "entity.other.attribute-name.directive.ts", - "match": "path|types|no-default-lib|lib|name" + "match": "path|types|no-default-lib|lib|name|resolution-mode" }, { "name": "keyword.operator.assignment.ts", diff --git a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json index fcecb2b8c46..c74c76d077d 100644 --- a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json +++ b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/4d30ff834ec324f56291addd197aa1e423cedfdd", + "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/c2744520e325330d0608fc1d1993d7fe98e66202", "name": "TypeScriptReact", "scopeName": "source.tsx", "patterns": [ @@ -2271,11 +2271,47 @@ "name": "keyword.control.from.tsx", "match": "\\bfrom\\b" }, + { + "include": "#import-export-assert-clause" + }, { "include": "#import-export-clause" } ] }, + "import-export-assert-clause": { + "begin": "(?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|(===|!==|==|!=)|(([\\&\\~\\^\\|]\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s+instanceof(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<))\\s*$)", + "begin": "(?<=[(=,]|=>|^return|[^\\._$[:alnum:]]return)\\s*(async)?(?=\\s*((((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*))?\\()|(<)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)))\\s*$)", "beginCaptures": { "1": { "name": "storage.modifier.async.tsx" @@ -3269,13 +3308,16 @@ } }, { - "begin": "(?]|\\|\\||\\&\\&|\\!\\=\\=|$|((?]|\\|\\||\\&\\&|\\!\\=\\=|$|((?\\s*$)", + "begin": "^(///)\\s*(?=<(reference|amd-dependency|amd-module)(\\s+(path|types|no-default-lib|lib|name|resolution-mode)\\s*=\\s*((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))+\\s*/>\\s*$)", "beginCaptures": { "1": { "name": "punctuation.definition.comment.tsx" @@ -5092,7 +5134,7 @@ "patterns": [ { "name": "entity.other.attribute-name.directive.tsx", - "match": "path|types|no-default-lib|lib|name" + "match": "path|types|no-default-lib|lib|name|resolution-mode" }, { "name": "keyword.operator.assignment.tsx", @@ -5775,10 +5817,6 @@ "name": "punctuation.definition.entity.tsx" } } - }, - { - "name": "invalid.illegal.bad-ampersand.tsx", - "match": "&" } ] }, diff --git a/extensions/typescript-language-features/.eslintrc.json b/extensions/typescript-language-features/.eslintrc.json index ae8cc48c050..f7c6c1b495b 100644 --- a/extensions/typescript-language-features/.eslintrc.json +++ b/extensions/typescript-language-features/.eslintrc.json @@ -1,5 +1,5 @@ { "rules": { - "prefer-const": "error" + "@typescript-eslint/prefer-optional-chain": "warn" } } diff --git a/extensions/typescript-language-features/extension-browser.webpack.config.js b/extensions/typescript-language-features/extension-browser.webpack.config.js index e7ad156bf94..7fb010d0448 100644 --- a/extensions/typescript-language-features/extension-browser.webpack.config.js +++ b/extensions/typescript-language-features/extension-browser.webpack.config.js @@ -8,6 +8,8 @@ 'use strict'; const CopyPlugin = require('copy-webpack-plugin'); const Terser = require('terser'); +const fs = require('fs'); +const path = require('path'); const defaultConfig = require('../shared.webpack.config'); const withBrowserDefaults = defaultConfig.browser; @@ -35,7 +37,7 @@ module.exports = withBrowserDefaults({ extension: './src/extension.browser.ts', }, plugins: [ - ...browserPlugins, // add plugins, don't replace inherited + ...browserPlugins(__dirname), // add plugins, don't replace inherited // @ts-ignore new CopyPlugin({ @@ -64,9 +66,18 @@ module.exports = withBrowserDefaults({ { from: '../node_modules/typescript/lib/tsserver.js', to: 'typescript/tsserver.web.js', - transform: (content) => { - return Terser.minify(content.toString()).then(output => output.code); + transform: async (content) => { + const dynamicImportCompatPath = path.join(__dirname, '..', 'node_modules', 'typescript', 'lib', 'dynamicImportCompat.js'); + const prefix = fs.existsSync(dynamicImportCompatPath) ? fs.readFileSync(dynamicImportCompatPath) : undefined; + const output = await Terser.minify(content.toString()); + if (!output.code) { + throw new Error('Terser returned undefined code'); + } + if (prefix) { + return prefix.toString() + '\n' + output.code; + } + return output.code; }, transformPath: (targetPath) => { return targetPath.replace('tsserver.js', 'tsserver.web.js'); diff --git a/extensions/typescript-language-features/media/icon.png b/extensions/typescript-language-features/media/icon.png index 013843b544d..1bdda21844c 100644 Binary files a/extensions/typescript-language-features/media/icon.png and b/extensions/typescript-language-features/media/icon.png differ diff --git a/extensions/typescript-language-features/media/nodejsWalkthroughIcon.png b/extensions/typescript-language-features/media/nodejsWalkthroughIcon.png new file mode 100644 index 00000000000..10a8e5b822b Binary files /dev/null and b/extensions/typescript-language-features/media/nodejsWalkthroughIcon.png differ diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json index 2a7fd5151a1..1ca2f8692ef 100644 --- a/extensions/typescript-language-features/package.json +++ b/extensions/typescript-language-features/package.json @@ -6,7 +6,7 @@ "author": "vscode", "publisher": "vscode", "license": "MIT", - "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", + "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255", "enabledApiProposals": [ "resolvers", "workspaceTrust" @@ -34,10 +34,11 @@ "Programming Languages" ], "dependencies": { - "@vscode/extension-telemetry": "0.4.10", + "@vscode/extension-telemetry": "0.6.2", "jsonc-parser": "^2.2.1", "semver": "5.5.1", - "vscode-nls": "^5.0.0", + "vscode-nls": "^5.2.0", + "vscode-tas-client": "^0.1.63", "vscode-uri": "^3.0.3" }, "devDependencies": { @@ -67,7 +68,8 @@ "onCommand:typescript.fileReferences", "onCommand:typescript.goToSourceDefinition", "onTaskType:typescript", - "onLanguage:jsonc" + "onLanguage:jsonc", + "onWalkthrough:nodejsWelcome" ], "main": "./out/extension", "browser": "./dist/browser/extension", @@ -136,6 +138,10 @@ { "fileMatch": "jsconfig.*.json", "url": "./schemas/jsconfig.schema.json" + }, + { + "fileMatch": "typedoc.json", + "url": "https://typedoc.org/schema.json" } ], "configuration": { @@ -982,6 +988,22 @@ "markdownDescription": "%typescript.preferences.includePackageJsonAutoImports%", "scope": "window" }, + "typescript.preferences.autoImportFileExcludePatterns": { + "type": "array", + "items": { + "type": "string" + }, + "markdownDescription": "%typescript.preferences.autoImportFileExcludePatterns%", + "scope": "resource" + }, + "javascript.preferences.autoImportFileExcludePatterns": { + "type": "array", + "items": { + "type": "string" + }, + "markdownDescription": "%typescript.preferences.autoImportFileExcludePatterns%", + "scope": "resource" + }, "javascript.preferences.renameShorthandProperties": { "type": "boolean", "default": true, @@ -1250,6 +1272,26 @@ "command": "typescript.goToSourceDefinition", "title": "%typescript.goToSourceDefinition%", "category": "TypeScript" + }, + { + "command": "typescript.sortImports", + "title": "%typescript.sortImports%", + "category": "TypeScript" + }, + { + "command": "javascript.sortImports", + "title": "%typescript.sortImports%", + "category": "JavaScript" + }, + { + "command": "typescript.removeUnusedImports", + "title": "%typescript.removeUnusedImports%", + "category": "TypeScript" + }, + { + "command": "javascript.removeUnusedImports", + "title": "%typescript.removeUnusedImports%", + "category": "JavaScript" } ], "menus": { @@ -1305,6 +1347,22 @@ { "command": "typescript.goToSourceDefinition", "when": "tsSupportsSourceDefinition && typescript.isManagedFile" + }, + { + "command": "typescript.sortImports", + "when": "supportedCodeAction =~ /(\\s|^)source\\.sortImports\\b/ && editorLangId =~ /^typescript(react)?$/" + }, + { + "command": "javascript.sortImports", + "when": "supportedCodeAction =~ /(\\s|^)source\\.sortImports\\b/ && editorLangId =~ /^javascript(react)?$/" + }, + { + "command": "typescript.removeUnusedImports", + "when": "supportedCodeAction =~ /(\\s|^)source\\.removeUnusedImports\\b/ && editorLangId =~ /^typescript(react)?$/" + }, + { + "command": "javascript.removeUnusedImports", + "when": "supportedCodeAction =~ /(\\s|^)source\\.removeUnusedImports\\b/ && editorLangId =~ /^javascript(react)?$/" } ], "editor/context": [ @@ -1435,7 +1493,7 @@ "background": { "activeOnStart": true, "beginsPattern": { - "regexp": "^\\s*(?:message TS6032:|\\[?\\D*.{1,2}[:.].{1,2}[:.].{1,2}\\D*(├\\D*\\d{1,2}\\D+┤)?(?:\\]| -)) File change detected\\. Starting incremental compilation\\.\\.\\." + "regexp": "^\\s*(?:message TS6032:|\\[?\\D*.{1,2}[:.].{1,2}[:.].{1,2}\\D*(├\\D*\\d{1,2}\\D+┤)?(?:\\]| -)) (Starting compilation in watch mode|File change detected\\. Starting incremental compilation)\\.\\.\\." }, "endsPattern": { "regexp": "^\\s*(?:message TS6042:|\\[?\\D*.{1,2}[:.].{1,2}[:.].{1,2}\\D*(├\\D*\\d{1,2}\\D+┤)?(?:\\]| -)) (?:Compilation complete\\.|Found \\d+ errors?\\.) Watching for file changes\\." @@ -1507,6 +1565,59 @@ } ] } + ], + "walkthroughs": [ + { + "id": "nodejsWelcome", + "title": "%walkthroughs.nodejsWelcome.title%", + "icon": "media/nodejsWalkthroughIcon.png", + "description": "%walkthroughs.nodejsWelcome.description%", + "when": "false", + "steps": [ + { + "id": "walkthroughs.nodejsWelcome.downloadNode.forMacOrWindows", + "title": "%walkthroughs.nodejsWelcome.downloadNode.forMacOrWindows.title%", + "description": "%walkthroughs.nodejsWelcome.downloadNode.forMacOrWindows.description%", + "media": { + "svg": "resources/walkthroughs/install-node-js.svg" + }, + "when": "isWindows || isMac" + }, + { + "id": "walkthroughs.nodejsWelcome.downloadNode.forLinux", + "title": "%walkthroughs.nodejsWelcome.downloadNode.forLinux.title%", + "description": "%walkthroughs.nodejsWelcome.downloadNode.forLinux.description%", + "media": { + "svg": "resources/walkthroughs/install-node-js.svg" + }, + "when": "isLinux" + }, + { + "id": "walkthroughs.nodejsWelcome.makeJsFile", + "title": "%walkthroughs.nodejsWelcome.makeJsFile.title%", + "description": "%walkthroughs.nodejsWelcome.makeJsFile.description%", + "media": { + "svg": "resources/walkthroughs/create-a-js-file.svg" + } + }, + { + "id": "walkthroughs.nodejsWelcome.debugJsFile", + "title": "%walkthroughs.nodejsWelcome.debugJsFile.title%", + "description": "%walkthroughs.nodejsWelcome.debugJsFile.description%", + "media": { + "svg": "resources/walkthroughs/debug-and-run.svg" + } + }, + { + "id": "walkthroughs.nodejsWelcome.learnMoreAboutJs", + "title": "%walkthroughs.nodejsWelcome.learnMoreAboutJs.title%", + "description": "%walkthroughs.nodejsWelcome.learnMoreAboutJs.description%", + "media": { + "svg": "resources/walkthroughs/learn-more.svg" + } + } + ] + } ] }, "repository": { diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json index 513bcfbaaa1..80c6b23964a 100644 --- a/extensions/typescript-language-features/package.nls.json +++ b/extensions/typescript-language-features/package.nls.json @@ -86,29 +86,29 @@ "inlayHints.parameterNames.all": "Enable parameter name hints for literal and non-literal arguments.", "configuration.inlayHints.parameterNames.enabled": { "message": "Enable/disable inlay hints for parameter names:\n```typescript\n\nparseInt(/* str: */ '123', /* radix: */ 8)\n \n```\nRequires using TypeScript 4.4+ in the workspace.", - "comment": "The text inside the ``` block is code and should not be localized." + "comment": ["The text inside the ``` block is code and should not be localized."] }, "configuration.inlayHints.parameterNames.suppressWhenArgumentMatchesName": "Suppress parameter name hints on arguments whose text is identical to the parameter name.", "configuration.inlayHints.parameterTypes.enabled": { "message": "Enable/disable inlay hints for implicit parameter types:\n```typescript\n\nel.addEventListener('click', e /* :MouseEvent */ => ...)\n \n```\nRequires using TypeScript 4.4+ in the workspace.", - "comment": "The text inside the ``` block is code and should not be localized." + "comment": ["The text inside the ``` block is code and should not be localized."] }, "configuration.inlayHints.variableTypes.enabled": { "message": "Enable/disable inlay hints for implicit variable types:\n```typescript\n\nconst foo /* :number */ = Date.now();\n \n```\nRequires using TypeScript 4.4+ in the workspace.", - "comment": "The text inside the ``` block is code and should not be localized." + "comment": ["The text inside the ``` block is code and should not be localized."] }, "configuration.inlayHints.variableTypes.suppressWhenTypeMatchesName": "Suppress type hints on variables whose name is identical to the type name. Requires using TypeScript 4.8+ in the workspace.", "configuration.inlayHints.propertyDeclarationTypes.enabled": { "message": "Enable/disable inlay hints for implicit types on property declarations:\n```typescript\n\nclass Foo {\n\tprop /* :number */ = Date.now();\n}\n \n```\nRequires using TypeScript 4.4+ in the workspace.", - "comment": "The text inside the ``` block is code and should not be localized." + "comment": ["The text inside the ``` block is code and should not be localized."] }, "configuration.inlayHints.functionLikeReturnTypes.enabled": { "message": "Enable/disable inlay hints for implicit return types on function signatures:\n```typescript\n\nfunction foo() /* :number */ {\n\treturn Date.now();\n} \n \n```\nRequires using TypeScript 4.4+ in the workspace.", - "comment": "The text inside the ``` block is code and should not be localized." + "comment": ["The text inside the ``` block is code and should not be localized."] }, "configuration.inlayHints.enumMemberValues.enabled": { "message": "Enable/disable inlay hints for member values in enum declarations:\n```typescript\n\nenum MyValue {\n\tA /* = 0 */;\n\tB /* = 1 */;\n}\n \n```\nRequires using TypeScript 4.4+ in the workspace.", - "comment": "The text inside the ``` block is code and should not be localized." + "comment": ["The text inside the ``` block is code and should not be localized."] }, "taskDefinition.tsconfig.description": "The tsconfig file that defines the TS build.", "javascript.suggestionActions.enabled": "Enable/disable suggestion diagnostics for JavaScript files in the editor.", @@ -136,6 +136,7 @@ "typescript.preferences.includePackageJsonAutoImports.auto": "Search dependencies based on estimated performance impact.", "typescript.preferences.includePackageJsonAutoImports.on": "Always search dependencies.", "typescript.preferences.includePackageJsonAutoImports.off": "Never search dependencies.", + "typescript.preferences.autoImportFileExcludePatterns": "Specify glob patterns of files to exclude from auto imports. Requires using TypeScript 4.8 or newer in the workspace.", "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code.", "typescript.updateImportsOnFileMove.enabled.prompt": "Prompt on each rename.", "typescript.updateImportsOnFileMove.enabled.always": "Always update paths automatically.", @@ -186,9 +187,31 @@ "codeActions.refactor.rewrite.parameters.toDestructured.title": "Convert parameters to destructured object", "codeActions.refactor.rewrite.property.generateAccessors.title": "Generate accessors", "codeActions.refactor.rewrite.property.generateAccessors.description": "Generate 'get' and 'set' accessors", - "codeActions.source.organizeImports.title": "Organize imports", + "codeActions.source.organizeImports.title": "Organize Imports", + "typescript.sortImports": "Sort Imports", + "typescript.removeUnusedImports": "Remove Unused Imports", "typescript.findAllFileReferences": "Find File References", "typescript.goToSourceDefinition": "Go to Source Definition", "configuration.suggest.classMemberSnippets.enabled": "Enable/disable snippet completions for class members. Requires using TypeScript 4.5+ in the workspace", - "configuration.suggest.objectLiteralMethodSnippets.enabled": "Enable/disable snippet completions for methods in object literals. Requires using TypeScript 4.7+ in the workspace" + "configuration.suggest.objectLiteralMethodSnippets.enabled": "Enable/disable snippet completions for methods in object literals. Requires using TypeScript 4.7+ in the workspace", + + "walkthroughs.nodejsWelcome.title": "Get started with JavaScript and Node.js", + "walkthroughs.nodejsWelcome.description": "Make the most of Visual Studio Code's first-class JavaScript experience.", + + "walkthroughs.nodejsWelcome.downloadNode.forMacOrWindows.title": "Install Node.js", + "walkthroughs.nodejsWelcome.downloadNode.forMacOrWindows.description": "Node.js is an easy way to run JavaScript code. You can use it to quickly build command-line apps and servers. It also comes with npm, a package manager which makes reusing and sharing JavaScript code easy.\n[Install Node.js](https://nodejs.org/en/download/)", + + "walkthroughs.nodejsWelcome.downloadNode.forLinux.title": "Install Node.js", + "walkthroughs.nodejsWelcome.downloadNode.forLinux.description": "Node.js is an easy way to run JavaScript code. You can use it to quickly build command-line apps and servers. It also comes with npm, a package manager which makes reusing and sharing JavaScript code easy.\n[Install Node.js](https://nodejs.org/en/download/package-manager/)", + + "walkthroughs.nodejsWelcome.makeJsFile.title": "Create a JavaScript File", + "walkthroughs.nodejsWelcome.makeJsFile.description": "Let's write our first JavaScript file. We'll have to create a new file and save it with the ``.js`` extension at the end of the file name.\n[Create a JavaScript File](command:javascript-walkthrough.commands.createJsFile)", + + "walkthroughs.nodejsWelcome.debugJsFile.title": "Run and Debug your JavaScript", + "walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VS Code's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)", + "walkthroughs.nodejsWelcome.debugJsFile.altText": "Debug and run your JavaScript code in Node.js with Visual Studio Code.", + + "walkthroughs.nodejsWelcome.learnMoreAboutJs.title": "Explore More", + "walkthroughs.nodejsWelcome.learnMoreAboutJs.description": "Want to get more comfortable with JavaScript, Node.js, and VS Code? Be sure to check out our docs!\nWe've got lots of resources for learning [JavaScript](https://code.visualstudio.com/docs/nodejs/working-with-javascript) and [Node.js](https://code.visualstudio.com/docs/nodejs/nodejs-tutorial).\n\n[Learn More](https://code.visualstudio.com/docs/nodejs/nodejs-tutorial)", + "walkthroughs.nodejsWelcome.learnMoreAboutJs.altText": "Learn more about JavaScript and Node.js in Visual Studio Code." } diff --git a/extensions/typescript-language-features/resources/walkthroughs/create-a-js-file.svg b/extensions/typescript-language-features/resources/walkthroughs/create-a-js-file.svg new file mode 100644 index 00000000000..c9602e32ca5 --- /dev/null +++ b/extensions/typescript-language-features/resources/walkthroughs/create-a-js-file.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/extensions/typescript-language-features/resources/walkthroughs/debug-and-run.svg b/extensions/typescript-language-features/resources/walkthroughs/debug-and-run.svg new file mode 100644 index 00000000000..0fc4d754047 --- /dev/null +++ b/extensions/typescript-language-features/resources/walkthroughs/debug-and-run.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extensions/typescript-language-features/resources/walkthroughs/install-node-js.svg b/extensions/typescript-language-features/resources/walkthroughs/install-node-js.svg new file mode 100644 index 00000000000..2009e9ad5fe --- /dev/null +++ b/extensions/typescript-language-features/resources/walkthroughs/install-node-js.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extensions/typescript-language-features/resources/walkthroughs/learn-more.svg b/extensions/typescript-language-features/resources/walkthroughs/learn-more.svg new file mode 100644 index 00000000000..ea2e78bdd30 --- /dev/null +++ b/extensions/typescript-language-features/resources/walkthroughs/learn-more.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/extensions/typescript-language-features/src/experimentTelemetryReporter.ts b/extensions/typescript-language-features/src/experimentTelemetryReporter.ts new file mode 100644 index 00000000000..d7561300761 --- /dev/null +++ b/extensions/typescript-language-features/src/experimentTelemetryReporter.ts @@ -0,0 +1,50 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as vscode from 'vscode'; +import VsCodeTelemetryReporter from '@vscode/extension-telemetry'; +import * as tas from 'vscode-tas-client'; + +export interface IExperimentationTelemetryReporter extends tas.IExperimentationTelemetry, vscode.Disposable { + postEventObj(eventName: string, props: { [prop: string]: string }): void; +} + +/** + * This reporter *supports* experimentation telemetry, + * but will only do so when passed to an {@link ExperimentationService}. + */ + +export class ExperimentationTelemetryReporter + implements IExperimentationTelemetryReporter { + private _sharedProperties: Record = {}; + private _reporter: VsCodeTelemetryReporter; + constructor(reporter: VsCodeTelemetryReporter) { + this._reporter = reporter; + } + + setSharedProperty(name: string, value: string): void { + this._sharedProperties[name] = value; + } + + postEvent(eventName: string, props: Map): void { + const propsObject = { + ...this._sharedProperties, + ...Object.fromEntries(props), + }; + this._reporter.sendTelemetryEvent(eventName, propsObject); + } + + postEventObj(eventName: string, props: { [prop: string]: string }) { + this._reporter.sendTelemetryEvent(eventName, { + ...this._sharedProperties, + ...props, + }); + } + + dispose() { + this._reporter.dispose(); + } +} + diff --git a/extensions/typescript-language-features/src/experimentationService.ts b/extensions/typescript-language-features/src/experimentationService.ts new file mode 100644 index 00000000000..1f3b1fbd73b --- /dev/null +++ b/extensions/typescript-language-features/src/experimentationService.ts @@ -0,0 +1,62 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as vscode from 'vscode'; +import * as tas from 'vscode-tas-client'; + +import { IExperimentationTelemetryReporter } from './experimentTelemetryReporter'; + +interface ExperimentTypes { + // None for now. +} + +export class ExperimentationService { + private _experimentationServicePromise: Promise; + private _telemetryReporter: IExperimentationTelemetryReporter; + + constructor(telemetryReporter: IExperimentationTelemetryReporter, id: string, version: string, globalState: vscode.Memento) { + this._telemetryReporter = telemetryReporter; + this._experimentationServicePromise = createExperimentationService(this._telemetryReporter, id, version, globalState); + } + + public async getTreatmentVariable(name: K, defaultValue: ExperimentTypes[K]): Promise { + const experimentationService = await this._experimentationServicePromise; + try { + const treatmentVariable = experimentationService.getTreatmentVariableAsync('vscode', name, /*checkCache*/ true) as Promise; + return treatmentVariable; + } catch { + return defaultValue; + } + } +} + +export async function createExperimentationService( + reporter: IExperimentationTelemetryReporter, + id: string, + version: string, + globalState: vscode.Memento): Promise { + let targetPopulation: tas.TargetPopulation; + switch (vscode.env.uriScheme) { + case 'vscode': + targetPopulation = tas.TargetPopulation.Public; + break; + case 'vscode-insiders': + targetPopulation = tas.TargetPopulation.Insiders; + break; + case 'vscode-exploration': + targetPopulation = tas.TargetPopulation.Internal; + break; + case 'code-oss': + targetPopulation = tas.TargetPopulation.Team; + break; + default: + targetPopulation = tas.TargetPopulation.Public; + break; + } + + const experimentationService = tas.getExperimentationService(id, version, targetPopulation, reporter, globalState); + await experimentationService.initialFetch; + return experimentationService; +} diff --git a/extensions/typescript-language-features/src/extension.browser.ts b/extensions/typescript-language-features/src/extension.browser.ts index 6bb57c02dc9..ad947fc0302 100644 --- a/extensions/typescript-language-features/src/extension.browser.ts +++ b/extensions/typescript-language-features/src/extension.browser.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; +import VsCodeTelemetryReporter from '@vscode/extension-telemetry'; import { Api, getExtensionApi } from './api'; import { CommandManager } from './commands/commandManager'; import { registerBaseCommands } from './commands/index'; @@ -17,6 +18,8 @@ import API from './utils/api'; import { TypeScriptServiceConfiguration } from './utils/configuration'; import { BrowserServiceConfigurationProvider } from './utils/configuration.browser'; import { PluginManager } from './utils/plugins'; +import { ExperimentationTelemetryReporter, IExperimentationTelemetryReporter } from './experimentTelemetryReporter'; +import { getPackageInfo } from './utils/packageInfo'; class StaticVersionProvider implements ITypeScriptVersionProvider { @@ -55,7 +58,16 @@ export function activate( new TypeScriptVersion( TypeScriptVersionSource.Bundled, vscode.Uri.joinPath(context.extensionUri, 'dist/browser/typescript/tsserver.web.js').toString(), - API.fromSimpleString('4.5.4'))); + API.fromSimpleString('4.8.2'))); + + let experimentTelemetryReporter: IExperimentationTelemetryReporter | undefined; + const packageInfo = getPackageInfo(context); + if (packageInfo) { + const { name: id, version, aiKey } = packageInfo; + const vscTelemetryReporter = new VsCodeTelemetryReporter(id, version, aiKey); + experimentTelemetryReporter = new ExperimentationTelemetryReporter(vscTelemetryReporter); + context.subscriptions.push(experimentTelemetryReporter); + } const lazyClientHost = createLazyClientHost(context, false, { pluginManager, @@ -66,6 +78,7 @@ export function activate( processFactory: WorkerServerProcess, activeJsTsEditorTracker, serviceConfigurationProvider: new BrowserServiceConfigurationProvider(), + experimentTelemetryReporter, }, item => { onCompletionAccepted.fire(item); }); diff --git a/extensions/typescript-language-features/src/extension.ts b/extensions/typescript-language-features/src/extension.ts index e6ae13e5daa..e6b971260d3 100644 --- a/extensions/typescript-language-features/src/extension.ts +++ b/extensions/typescript-language-features/src/extension.ts @@ -5,19 +5,24 @@ import * as fs from 'fs'; import * as vscode from 'vscode'; +import VsCodeTelemetryReporter from '@vscode/extension-telemetry'; import { Api, getExtensionApi } from './api'; import { CommandManager } from './commands/commandManager'; import { registerBaseCommands } from './commands/index'; +import { ExperimentationService } from './experimentationService'; +import { ExperimentationTelemetryReporter, IExperimentationTelemetryReporter } from './experimentTelemetryReporter'; import { createLazyClientHost, lazilyActivateClient } from './lazyClientHost'; import { nodeRequestCancellerFactory } from './tsServer/cancellation.electron'; import { NodeLogDirectoryProvider } from './tsServer/logDirectoryProvider.electron'; import { ElectronServiceProcessFactory } from './tsServer/serverProcess.electron'; import { DiskTypeScriptVersionProvider } from './tsServer/versionProvider.electron'; +import { JsWalkthroughState, registerJsNodeWalkthrough } from './ui/jsNodeWalkthrough.electron'; import { ActiveJsTsEditorTracker } from './utils/activeJsTsEditorTracker'; import { ElectronServiceConfigurationProvider } from './utils/configuration.electron'; import { onCaseInsensitiveFileSystem } from './utils/fileSystem.electron'; import { PluginManager } from './utils/plugins'; import * as temp from './utils/temp.electron'; +import { getPackageInfo } from './utils/packageInfo'; export function activate( context: vscode.ExtensionContext @@ -37,6 +42,22 @@ export function activate( const activeJsTsEditorTracker = new ActiveJsTsEditorTracker(); context.subscriptions.push(activeJsTsEditorTracker); + const jsWalkthroughState = new JsWalkthroughState(); + context.subscriptions.push(jsWalkthroughState); + + let experimentTelemetryReporter: IExperimentationTelemetryReporter | undefined; + const packageInfo = getPackageInfo(context); + if (packageInfo) { + const { name: id, version, aiKey } = packageInfo; + const vscTelemetryReporter = new VsCodeTelemetryReporter(id, version, aiKey); + experimentTelemetryReporter = new ExperimentationTelemetryReporter(vscTelemetryReporter); + context.subscriptions.push(experimentTelemetryReporter); + + // Currently we have no experiments, but creating the service adds the appropriate + // shared properties to the ExperimentationTelemetryReporter we just created. + new ExperimentationService(experimentTelemetryReporter, id, version, context.globalState); + } + const lazyClientHost = createLazyClientHost(context, onCaseInsensitiveFileSystem(), { pluginManager, commandManager, @@ -46,11 +67,13 @@ export function activate( processFactory: new ElectronServiceProcessFactory(), activeJsTsEditorTracker, serviceConfigurationProvider: new ElectronServiceConfigurationProvider(), + experimentTelemetryReporter, }, item => { onCompletionAccepted.fire(item); }); registerBaseCommands(commandManager, lazyClientHost, pluginManager, activeJsTsEditorTracker); + registerJsNodeWalkthrough(commandManager, jsWalkthroughState); import('./task/taskProvider').then(module => { context.subscriptions.push(module.register(lazyClientHost.map(x => x.serviceClient))); diff --git a/extensions/typescript-language-features/src/languageFeatures/codeLens/baseCodeLensProvider.ts b/extensions/typescript-language-features/src/languageFeatures/codeLens/baseCodeLensProvider.ts index 890486d7902..214e6b24f7b 100644 --- a/extensions/typescript-language-features/src/languageFeatures/codeLens/baseCodeLensProvider.ts +++ b/extensions/typescript-language-features/src/languageFeatures/codeLens/baseCodeLensProvider.ts @@ -88,7 +88,7 @@ export function getSymbolRange( } // In older versions, we have to calculate this manually. See #23924 - const span = item.spans && item.spans[0]; + const span = item.spans?.[0]; if (!span) { return undefined; } diff --git a/extensions/typescript-language-features/src/languageFeatures/completions.ts b/extensions/typescript-language-features/src/languageFeatures/completions.ts index a7b1e6c061c..2547b92e044 100644 --- a/extensions/typescript-language-features/src/languageFeatures/completions.ts +++ b/extensions/typescript-language-features/src/languageFeatures/completions.ts @@ -117,13 +117,9 @@ class MyCompletionItem extends vscode.CompletionItem { if (tsEntry.kindModifiers) { const kindModifiers = parseKindModifier(tsEntry.kindModifiers); if (kindModifiers.has(PConst.KindModifiers.optional)) { - if (!this.insertText) { - this.insertText = this.textLabel; - } + this.insertText ??= this.textLabel; + this.filterText ??= this.textLabel; - if (!this.filterText) { - this.filterText = this.textLabel; - } if (typeof this.label === 'string') { this.label += '?'; } else { @@ -521,7 +517,7 @@ class MyCompletionItem extends vscode.CompletionItem { } } -function getScriptKindDetails(tsEntry: protocol.CompletionEntry,): string | undefined { +function getScriptKindDetails(tsEntry: Proto.CompletionEntry,): string | undefined { if (!tsEntry.kindModifiers || tsEntry.kind !== PConst.Kind.script) { return; } diff --git a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts index c35aa35aee0..fd3f84963e6 100644 --- a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts +++ b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts @@ -3,6 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import * as path from 'path'; import * as vscode from 'vscode'; import type * as Proto from '../protocol'; import { ITypeScriptServiceClient } from '../typescriptService'; @@ -174,6 +175,7 @@ export default class FileConfigurationManager extends Disposable { document); const preferences: Proto.UserPreferences = { + ...config.get('unstable'), quotePreference: this.getQuoteStylePreference(preferencesConfig), importModuleSpecifierPreference: getImportModuleSpecifierPreference(preferencesConfig), importModuleSpecifierEnding: getImportModuleSpecifierEndingPreference(preferencesConfig), @@ -188,6 +190,7 @@ export default class FileConfigurationManager extends Disposable { includeCompletionsWithSnippetText: config.get('suggest.includeCompletionsWithSnippetText', true), includeCompletionsWithClassMemberSnippets: config.get('suggest.classMemberSnippets.enabled', true), includeCompletionsWithObjectLiteralMethodSnippets: config.get('suggest.objectLiteralMethodSnippets.enabled', true), + autoImportFileExcludePatterns: this.getAutoImportFileExcludePatternsPreference(preferencesConfig, vscode.workspace.getWorkspaceFolder(document.uri)?.uri), useLabelDetailsInCompletionEntries: true, allowIncompleteCompletions: true, displayPartsForJSDoc: true, @@ -204,6 +207,18 @@ export default class FileConfigurationManager extends Disposable { default: return this.client.apiVersion.gte(API.v333) ? 'auto' : undefined; } } + + private getAutoImportFileExcludePatternsPreference(config: vscode.WorkspaceConfiguration, workspaceFolder: vscode.Uri | undefined): string[] | undefined { + return workspaceFolder && config.get('autoImportFileExcludePatterns')?.map(p => { + // Normalization rules: https://github.com/microsoft/TypeScript/pull/49578 + const slashNormalized = p.replace(/\\/g, '/'); + const isRelative = /^\.\.?($|\/)/.test(slashNormalized); + return path.isAbsolute(p) ? p : + p.startsWith('*') ? '/' + slashNormalized : + isRelative ? vscode.Uri.joinPath(workspaceFolder, p).fsPath : + '/**/' + slashNormalized; + }); + } } export class InlayHintSettingNames { diff --git a/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts b/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts index 68685848035..b9e9db47fe5 100644 --- a/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts +++ b/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts @@ -30,10 +30,7 @@ class FileReferencesCommand implements Command { return; } - if (!resource) { - resource = vscode.window.activeTextEditor?.document.uri; - } - + resource ??= vscode.window.activeTextEditor?.document.uri; if (!resource) { vscode.window.showErrorMessage(localize('error.noResource', "Find file references failed. No resource provided.")); return; diff --git a/extensions/typescript-language-features/src/languageFeatures/fixAll.ts b/extensions/typescript-language-features/src/languageFeatures/fixAll.ts index ad8630f70e7..9119b5b66ba 100644 --- a/extensions/typescript-language-features/src/languageFeatures/fixAll.ts +++ b/extensions/typescript-language-features/src/languageFeatures/fixAll.ts @@ -133,7 +133,7 @@ class SourceFixAll extends SourceAction { static readonly kind = vscode.CodeActionKind.SourceFixAll.append('ts'); constructor() { - super(localize('autoFix.label', 'Fix All'), SourceFixAll.kind); + super(localize('autoFix.label', 'Fix all fixable JS/TS issues'), SourceFixAll.kind); } async build(client: ITypeScriptServiceClient, file: string, diagnostics: readonly vscode.Diagnostic[], token: vscode.CancellationToken): Promise { diff --git a/extensions/typescript-language-features/src/languageFeatures/hover.ts b/extensions/typescript-language-features/src/languageFeatures/hover.ts index a717e088a3f..362826513bc 100644 --- a/extensions/typescript-language-features/src/languageFeatures/hover.ts +++ b/extensions/typescript-language-features/src/languageFeatures/hover.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; +import * as nls from 'vscode-nls'; import type * as Proto from '../protocol'; -import { localize } from '../tsServer/versionProvider'; import { ClientCapability, ITypeScriptServiceClient, ServerType } from '../typescriptService'; import { conditionalRegistration, requireSomeCapability } from '../utils/dependentRegistration'; import { DocumentSelector } from '../utils/documentSelector'; @@ -13,6 +13,8 @@ import { markdownDocumentation } from '../utils/previewer'; import * as typeConverters from '../utils/typeConverters'; import FileConfigurationManager from './fileConfigurationManager'; +const localize = nls.loadMessageBundle(); + class TypeScriptHoverProvider implements vscode.HoverProvider { diff --git a/extensions/typescript-language-features/src/languageFeatures/organizeImports.ts b/extensions/typescript-language-features/src/languageFeatures/organizeImports.ts index cd1aeffa823..f0ebaf7fcf1 100644 --- a/extensions/typescript-language-features/src/languageFeatures/organizeImports.ts +++ b/extensions/typescript-language-features/src/languageFeatures/organizeImports.ts @@ -7,6 +7,7 @@ import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; import { Command, CommandManager } from '../commands/commandManager'; import type * as Proto from '../protocol'; +import { OrganizeImportsMode } from '../protocol.const'; import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService'; import API from '../utils/api'; import { nulToken } from '../utils/cancellation'; @@ -18,18 +19,48 @@ import FileConfigurationManager from './fileConfigurationManager'; const localize = nls.loadMessageBundle(); +interface OrganizeImportsCommandMetadata { + readonly ids: readonly string[]; + readonly title: string; + readonly minVersion: API; + readonly kind: vscode.CodeActionKind; + readonly mode: OrganizeImportsMode; +} + +const organizeImportsCommand: OrganizeImportsCommandMetadata = { + ids: ['typescript.organizeImports'], + minVersion: API.v280, + title: localize('organizeImportsAction.title', "Organize Imports"), + kind: vscode.CodeActionKind.SourceOrganizeImports, + mode: OrganizeImportsMode.All, +}; + +const sortImportsCommand: OrganizeImportsCommandMetadata = { + ids: ['typescript.sortImports', 'javascript.sortImports'], + minVersion: API.v430, + title: localize('sortImportsAction.title', "Sort Imports"), + kind: vscode.CodeActionKind.Source.append('sortImports'), + mode: OrganizeImportsMode.SortAndCombine, +}; + +const removeUnusedImportsCommand: OrganizeImportsCommandMetadata = { + ids: ['typescript.removeUnusedImports', 'javascript.removeUnusedImports'], + minVersion: API.v490, + title: localize('removeUnusedImportsAction.title', "Remove Unused Imports"), + kind: vscode.CodeActionKind.Source.append('removeUnusedImports'), + mode: OrganizeImportsMode.RemoveUnused, +}; class OrganizeImportsCommand implements Command { - public static readonly Id = '_typescript.organizeImports'; - - public readonly id = OrganizeImportsCommand.Id; constructor( + public readonly id: string, + private readonly commandMetadata: OrganizeImportsCommandMetadata, private readonly client: ITypeScriptServiceClient, private readonly telemetryReporter: TelemetryReporter, ) { } - public async execute(file: string, sortOnly = false): Promise { + public async execute(file?: string): Promise { /* __GDPR__ "organizeImports.execute" : { "owner": "mjbvz", @@ -39,6 +70,23 @@ class OrganizeImportsCommand implements Command { } */ this.telemetryReporter.logTelemetry('organizeImports.execute', {}); + if (!file) { + const activeEditor = vscode.window.activeTextEditor; + if (!activeEditor) { + vscode.window.showErrorMessage(localize('error.organizeImports.noResource', "Organize Imports failed. No resource provided.")); + return; + } + + const resource = activeEditor.document.uri; + const document = await vscode.workspace.openTextDocument(resource); + const openedFiledPath = this.client.toOpenedFilePath(document); + if (!openedFiledPath) { + vscode.window.showErrorMessage(localize('error.organizeImports.unknownFile', "Organize Imports failed. Unknown file type.")); + return; + } + + file = openedFiledPath; + } const args: Proto.OrganizeImportsRequestArgs = { scope: { @@ -47,7 +95,9 @@ class OrganizeImportsCommand implements Command { file } }, - skipDestructiveCodeActions: sortOnly, + // Deprecated in 4.9; `mode` takes priority + skipDestructiveCodeActions: this.commandMetadata.mode === OrganizeImportsMode.SortAndCombine, + mode: typeConverters.OrganizeImportsMode.toProtocolOrganizeImportsMode(this.commandMetadata.mode), }; const response = await this.client.interruptGetErr(() => this.client.execute('organizeImports', args, nulToken)); if (response.type !== 'response' || !response.body) { @@ -63,38 +113,16 @@ class OrganizeImportsCommand implements Command { class ImportsCodeActionProvider implements vscode.CodeActionProvider { - static register( - client: ITypeScriptServiceClient, - minVersion: API, - kind: vscode.CodeActionKind, - title: string, - sortOnly: boolean, - commandManager: CommandManager, - fileConfigurationManager: FileConfigurationManager, - telemetryReporter: TelemetryReporter, - selector: DocumentSelector - ): vscode.Disposable { - return conditionalRegistration([ - requireMinVersion(client, minVersion), - requireSomeCapability(client, ClientCapability.Semantic), - ], () => { - const provider = new ImportsCodeActionProvider(client, kind, title, sortOnly, commandManager, fileConfigurationManager, telemetryReporter); - return vscode.languages.registerCodeActionsProvider(selector.semantic, provider, { - providedCodeActionKinds: [kind] - }); - }); - } - - public constructor( + constructor( private readonly client: ITypeScriptServiceClient, - private readonly kind: vscode.CodeActionKind, - private readonly title: string, - private readonly sortOnly: boolean, + private readonly commandMetadata: OrganizeImportsCommandMetadata, commandManager: CommandManager, private readonly fileConfigManager: FileConfigurationManager, telemetryReporter: TelemetryReporter, ) { - commandManager.register(new OrganizeImportsCommand(client, telemetryReporter)); + for (const id of commandMetadata.ids) { + commandManager.register(new OrganizeImportsCommand(id, commandMetadata, client, telemetryReporter)); + } } public provideCodeActions( @@ -108,14 +136,14 @@ class ImportsCodeActionProvider implements vscode.CodeActionProvider { return []; } - if (!context.only || !context.only.contains(this.kind)) { + if (!context.only || !context.only.contains(this.commandMetadata.kind)) { return []; } this.fileConfigManager.ensureConfigurationForDocument(document, token); - const action = new vscode.CodeAction(this.title, this.kind); - action.command = { title: '', command: OrganizeImportsCommand.Id, arguments: [file, this.sortOnly] }; + const action = new vscode.CodeAction(this.commandMetadata.title, this.commandMetadata.kind); + action.command = { title: '', command: this.commandMetadata.ids[0], arguments: [file] }; return [action]; } } @@ -126,29 +154,20 @@ export function register( commandManager: CommandManager, fileConfigurationManager: FileConfigurationManager, telemetryReporter: TelemetryReporter, -) { - return vscode.Disposable.from( - ImportsCodeActionProvider.register( - client, - API.v280, - vscode.CodeActionKind.SourceOrganizeImports, - localize('organizeImportsAction.title', "Organize Imports"), - false, - commandManager, - fileConfigurationManager, - telemetryReporter, - selector - ), - ImportsCodeActionProvider.register( - client, - API.v430, - vscode.CodeActionKind.Source.append('sortImports'), - localize('sortImportsAction.title', "Sort Imports"), - true, - commandManager, - fileConfigurationManager, - telemetryReporter, - selector - ), - ); +): vscode.Disposable { + const disposables: vscode.Disposable[] = []; + + for (const command of [organizeImportsCommand, sortImportsCommand, removeUnusedImportsCommand]) { + disposables.push(conditionalRegistration([ + requireMinVersion(client, command.minVersion), + requireSomeCapability(client, ClientCapability.Semantic), + ], () => { + const provider = new ImportsCodeActionProvider(client, command, commandManager, fileConfigurationManager, telemetryReporter); + return vscode.languages.registerCodeActionsProvider(selector.semantic, provider, { + providedCodeActionKinds: [command.kind] + }); + })); + } + + return vscode.Disposable.from(...disposables); } diff --git a/extensions/typescript-language-features/src/languageFeatures/refactor.ts b/extensions/typescript-language-features/src/languageFeatures/refactor.ts index d5d1723533c..144c6654609 100644 --- a/extensions/typescript-language-features/src/languageFeatures/refactor.ts +++ b/extensions/typescript-language-features/src/languageFeatures/refactor.ts @@ -135,7 +135,7 @@ const Extract_Interface = Object.freeze({ }); const Move_NewFile = Object.freeze({ - kind: vscode.CodeActionKind.Refactor.append('move').append('newFile'), + kind: vscode.CodeActionKind.RefactorMove.append('newFile'), matches: refactor => refactor.name.startsWith('Move to a new file') }); diff --git a/extensions/typescript-language-features/src/languageFeatures/signatureHelp.ts b/extensions/typescript-language-features/src/languageFeatures/signatureHelp.ts index 1d9c66caa09..8bde8b45df7 100644 --- a/extensions/typescript-language-features/src/languageFeatures/signatureHelp.ts +++ b/extensions/typescript-language-features/src/languageFeatures/signatureHelp.ts @@ -64,7 +64,7 @@ class TypeScriptSignatureHelpProvider implements vscode.SignatureHelpProvider { private getActiveParameter(info: Proto.SignatureHelpItems): number { const activeSignature = info.items[info.selectedItemIndex]; - if (activeSignature && activeSignature.isVariadic) { + if (activeSignature?.isVariadic) { return Math.min(info.argumentIndex, activeSignature.parameters.length - 1); } return info.argumentIndex; diff --git a/extensions/typescript-language-features/src/languageFeatures/sourceDefinition.ts b/extensions/typescript-language-features/src/languageFeatures/sourceDefinition.ts index d020d265995..527a25ef8b2 100644 --- a/extensions/typescript-language-features/src/languageFeatures/sourceDefinition.ts +++ b/extensions/typescript-language-features/src/languageFeatures/sourceDefinition.ts @@ -6,41 +6,13 @@ import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; import { Command, CommandManager } from '../commands/commandManager'; -import * as Proto from '../protocol'; -import { ExecConfig, ITypeScriptServiceClient, ServerResponse } from '../typescriptService'; +import { ITypeScriptServiceClient } from '../typescriptService'; import API from '../utils/api'; import { isSupportedLanguageMode } from '../utils/languageIds'; import * as typeConverters from '../utils/typeConverters'; const localize = nls.loadMessageBundle(); -namespace ExperimentalProto { - export const enum CommandTypes { - FindSourceDefinition = 'findSourceDefinition' - } - - export interface SourceDefinitionRequestArgs extends Proto.FileLocationRequestArgs { } - - export interface SourceDefinitionRequest extends Proto.Request { - command: CommandTypes.FindSourceDefinition; - arguments: SourceDefinitionRequestArgs; - } - - export interface InlayHintsResponse extends Proto.DefinitionResponse { } - - export interface IExtendedTypeScriptServiceClient { - execute( - command: K, - args: ExtendedTsServerRequests[K][0], - token: vscode.CancellationToken, - config?: ExecConfig - ): Promise>; - } - - export interface ExtendedTsServerRequests { - 'findSourceDefinition': [SourceDefinitionRequestArgs, InlayHintsResponse]; - } -} class SourceDefinitionCommand implements Command { @@ -85,7 +57,7 @@ class SourceDefinitionCommand implements Command { const position = activeEditor.selection.anchor; const args = typeConverters.Position.toFileLocationRequestArgs(openedFiledPath, position); - const response = await (this.client as ExperimentalProto.IExtendedTypeScriptServiceClient).execute('findSourceDefinition', args, token); + const response = await this.client.execute('findSourceDefinition', args, token); if (response.type === 'response' && response.body) { const locations: vscode.Location[] = response.body.map(reference => typeConverters.Location.fromTextSpan(this.client.toResource(reference.file), reference)); diff --git a/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts b/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts index aeaa1bbcaae..c2219b7b4ac 100644 --- a/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts +++ b/extensions/typescript-language-features/src/languageFeatures/tagClosing.ts @@ -53,7 +53,7 @@ class TagClosing extends Disposable { return; } - const activeDocument = vscode.window.activeTextEditor && vscode.window.activeTextEditor.document; + const activeDocument = vscode.window.activeTextEditor?.document; if (document !== activeDocument) { return; } diff --git a/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts b/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts index 7d2f0288e69..7c6995ec7d5 100644 --- a/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts +++ b/extensions/typescript-language-features/src/languageFeatures/updatePathsOnRename.ts @@ -114,7 +114,7 @@ class UpdateImportsOnFileRenameHandler extends Disposable { if (edits.size) { if (await this.confirmActionWithUser(resourcesBeingRenamed)) { - await vscode.workspace.applyEdit(edits); + await vscode.workspace.applyEdit(edits, { isRefactoring: true }); } } } @@ -147,73 +147,59 @@ class UpdateImportsOnFileRenameHandler extends Disposable { return false; } - const enum Choice { - None = 0, - Accept = 1, - Reject = 2, - Always = 3, - Never = 4, - } + const rejectItem: vscode.MessageItem = { + title: localize('reject.title', "No"), + isCloseAffordance: true, + }; - interface Item extends vscode.MessageItem { - readonly choice: Choice; - } + const acceptItem: vscode.MessageItem = { + title: localize('accept.title', "Yes"), + }; + const alwaysItem: vscode.MessageItem = { + title: localize('always.title', "Always automatically update imports"), + }; - const response = await vscode.window.showInformationMessage( + const neverItem: vscode.MessageItem = { + title: localize('never.title', "Never automatically update imports"), + }; + + const response = await vscode.window.showInformationMessage( newResources.length === 1 ? localize('prompt', "Update imports for '{0}'?", path.basename(newResources[0].fsPath)) : this.getConfirmMessage(localize('promptMoreThanOne', "Update imports for the following {0} files?", newResources.length), newResources), { modal: true, - }, { - title: localize('reject.title', "No"), - choice: Choice.Reject, - isCloseAffordance: true, - }, { - title: localize('accept.title', "Yes"), - choice: Choice.Accept, - }, { - title: localize('always.title', "Always automatically update imports"), - choice: Choice.Always, - }, { - title: localize('never.title', "Never automatically update imports"), - choice: Choice.Never, - }); + }, rejectItem, acceptItem, alwaysItem, neverItem); - if (!response) { - return false; - } - switch (response.choice) { - case Choice.Accept: - { - return true; - } - case Choice.Reject: - { - return false; - } - case Choice.Always: - { - const config = this.getConfiguration(newResources[0]); - config.update( - updateImportsOnFileMoveName, - UpdateImportsOnFileMoveSetting.Always, - vscode.ConfigurationTarget.Global); - return true; - } - case Choice.Never: + switch (response) { + case acceptItem: { + return true; + } + case rejectItem: { + return false; + } + case alwaysItem: { + const config = this.getConfiguration(newResources[0]); + config.update( + updateImportsOnFileMoveName, + UpdateImportsOnFileMoveSetting.Always, + this.getConfigTargetScope(config, updateImportsOnFileMoveName)); + return true; + } + case neverItem: { const config = this.getConfiguration(newResources[0]); config.update( updateImportsOnFileMoveName, UpdateImportsOnFileMoveSetting.Never, - vscode.ConfigurationTarget.Global); + this.getConfigTargetScope(config, updateImportsOnFileMoveName)); return false; } + default: { + return false; + } } - - return false; } private async getJsTsFileBeingMoved(resource: vscode.Uri): Promise { @@ -284,6 +270,19 @@ class UpdateImportsOnFileRenameHandler extends Disposable { paths.push(''); return paths.join('\n'); } + + private getConfigTargetScope(config: vscode.WorkspaceConfiguration, settingsName: string): vscode.ConfigurationTarget { + const inspected = config.inspect(settingsName); + if (inspected?.workspaceFolderValue) { + return vscode.ConfigurationTarget.WorkspaceFolder; + } + + if (inspected?.workspaceValue) { + return vscode.ConfigurationTarget.Workspace; + } + + return vscode.ConfigurationTarget.Global; + } } export function register( diff --git a/extensions/typescript-language-features/src/lazyClientHost.ts b/extensions/typescript-language-features/src/lazyClientHost.ts index 8ad2efac84c..377d9c09fa1 100644 --- a/extensions/typescript-language-features/src/lazyClientHost.ts +++ b/extensions/typescript-language-features/src/lazyClientHost.ts @@ -5,6 +5,7 @@ import * as vscode from 'vscode'; import { CommandManager } from './commands/commandManager'; +import { IExperimentationTelemetryReporter } from './experimentTelemetryReporter'; import { OngoingRequestCancellerFactory } from './tsServer/cancellation'; import { ILogDirectoryProvider } from './tsServer/logDirectoryProvider'; import { TsServerProcessFactory } from './tsServer/server'; @@ -30,6 +31,7 @@ export function createLazyClientHost( processFactory: TsServerProcessFactory; activeJsTsEditorTracker: ActiveJsTsEditorTracker; serviceConfigurationProvider: ServiceConfigurationProvider; + experimentTelemetryReporter: IExperimentationTelemetryReporter | undefined; }, onCompletionAccepted: (item: vscode.CompletionItem) => void, ): Lazy { diff --git a/extensions/typescript-language-features/src/protocol.const.ts b/extensions/typescript-language-features/src/protocol.const.ts index 9571d1c0e63..deb3357e6ae 100644 --- a/extensions/typescript-language-features/src/protocol.const.ts +++ b/extensions/typescript-language-features/src/protocol.const.ts @@ -89,3 +89,9 @@ export enum EventName { projectLoadingStart = 'projectLoadingStart', projectLoadingFinish = 'projectLoadingFinish', } + +export enum OrganizeImportsMode { + All = 'All', + SortAndCombine = 'SortAndCombine', + RemoveUnused = 'RemoveUnused', +} diff --git a/extensions/typescript-language-features/src/protocol.d.ts b/extensions/typescript-language-features/src/protocol.d.ts index 7e9e45f2575..1aec9e082ed 100644 --- a/extensions/typescript-language-features/src/protocol.d.ts +++ b/extensions/typescript-language-features/src/protocol.d.ts @@ -1,13 +1,19 @@ -import * as Proto from 'typescript/lib/protocol'; -export = Proto; +import * as ts from 'typescript/lib/tsserverlibrary'; +export = ts.server.protocol; + declare enum ServerType { Syntax = 'syntax', Semantic = 'semantic', } -declare module 'typescript/lib/protocol' { - interface Response { - readonly _serverType?: ServerType; +declare module 'typescript/lib/tsserverlibrary' { + namespace server.protocol { + type TextInsertion = ts.TextInsertion; + type ScriptElementKind = ts.ScriptElementKind; + + interface Response { + readonly _serverType?: ServerType; + } } } diff --git a/extensions/typescript-language-features/src/test/unit/previewer.test.ts b/extensions/typescript-language-features/src/test/unit/previewer.test.ts index 2f7af37383b..75a4464610c 100644 --- a/extensions/typescript-language-features/src/test/unit/previewer.test.ts +++ b/extensions/typescript-language-features/src/test/unit/previewer.test.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; import 'mocha'; -import { SymbolDisplayPart } from 'typescript/lib/protocol'; +import { SymbolDisplayPart } from '../../protocol'; import { Uri } from 'vscode'; import { IFilePathToResourceConverter, markdownDocumentation, plainWithLinks, tagsMarkdownPreview } from '../../utils/previewer'; diff --git a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts index ed6af73fcf4..27b41948f75 100644 --- a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts +++ b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts @@ -11,6 +11,7 @@ import { coalesce } from '../utils/arrays'; import { Delayer, setImmediate } from '../utils/async'; import { nulToken } from '../utils/cancellation'; import { Disposable } from '../utils/dispose'; +import { vscodeNotebookCell } from '../utils/fileSchemes'; import * as languageModeIds from '../utils/languageIds'; import { ResourceMap } from '../utils/resourceMap'; import * as typeConverters from '../utils/typeConverters'; @@ -361,6 +362,98 @@ class GetErrRequest { } } +class TabResourceTracker extends Disposable { + + private readonly _onDidChange = this._register(new vscode.EventEmitter<{ + readonly closed: Iterable; + readonly opened: Iterable; + }>()); + public readonly onDidChange = this._onDidChange.event; + + private readonly _tabResources: ResourceMap<{ readonly tabs: Set }>; + + constructor( + normalizePath: (resource: vscode.Uri) => string | undefined, + config: { + readonly onCaseInsensitiveFileSystem: boolean; + }, + ) { + super(); + + this._tabResources = new ResourceMap<{ readonly tabs: Set }>(normalizePath, config); + + for (const tabGroup of vscode.window.tabGroups.all) { + for (const tab of tabGroup.tabs) { + this.add(tab); + } + } + + this._register(vscode.window.tabGroups.onDidChangeTabs(e => { + const closed = e.closed.flatMap(tab => this.delete(tab)); + const opened = e.opened.flatMap(tab => this.add(tab)); + if (closed.length || opened.length) { + this._onDidChange.fire({ closed, opened }); + } + })); + } + + public has(resource: vscode.Uri): boolean { + if (resource.scheme === vscodeNotebookCell) { + const notebook = vscode.workspace.notebookDocuments.find(doc => + doc.getCells().some(cell => cell.document.uri.toString() === resource.toString())); + + return !!notebook && this.has(notebook.uri); + } + + const entry = this._tabResources.get(resource); + return !!entry && entry.tabs.size > 0; + } + + private add(tab: vscode.Tab): vscode.Uri[] { + const addedResources: vscode.Uri[] = []; + for (const uri of this.getResourcesForTab(tab)) { + const entry = this._tabResources.get(uri); + if (entry) { + entry.tabs.add(tab); + } else { + this._tabResources.set(uri, { tabs: new Set([tab]) }); + addedResources.push(uri); + } + } + return addedResources; + } + + private delete(tab: vscode.Tab): vscode.Uri[] { + const closedResources: vscode.Uri[] = []; + for (const uri of this.getResourcesForTab(tab)) { + const entry = this._tabResources.get(uri); + if (!entry) { + continue; + } + + entry.tabs.delete(tab); + if (entry.tabs.size === 0) { + this._tabResources.delete(uri); + closedResources.push(uri); + } + } + return closedResources; + } + + private getResourcesForTab(tab: vscode.Tab): vscode.Uri[] { + if (tab.input instanceof vscode.TabInputText) { + return [tab.input.uri]; + } else if (tab.input instanceof vscode.TabInputTextDiff) { + return [tab.input.original, tab.input.modified]; + } else if (tab.input instanceof vscode.TabInputNotebook) { + return [tab.input.uri]; + } else { + return []; + } + } +} + + export default class BufferSyncSupport extends Disposable { private readonly client: ITypeScriptServiceClient; @@ -375,6 +468,8 @@ export default class BufferSyncSupport extends Disposable { private listening: boolean = false; private readonly synchronizer: BufferSynchronizer; + private readonly _tabResources: TabResourceTracker; + constructor( client: ITypeScriptServiceClient, modeIds: readonly string[], @@ -391,6 +486,28 @@ export default class BufferSyncSupport extends Disposable { this.pendingDiagnostics = new PendingDiagnostics(pathNormalizer, { onCaseInsensitiveFileSystem }); this.synchronizer = new BufferSynchronizer(client, pathNormalizer, onCaseInsensitiveFileSystem); + this._tabResources = this._register(new TabResourceTracker(pathNormalizer, { onCaseInsensitiveFileSystem })); + this._register(this._tabResources.onDidChange(e => { + if (this.client.configuration.enableProjectDiagnostics) { + return; + } + + for (const closed of e.closed) { + const syncedBuffer = this.syncedBuffers.get(closed); + if (syncedBuffer) { + this.pendingDiagnostics.delete(closed); + this.pendingGetErr?.files.delete(closed); + } + } + + for (const opened of e.opened) { + const syncedBuffer = this.syncedBuffers.get(opened); + if (syncedBuffer) { + this.requestDiagnostic(syncedBuffer); + } + } + })); + this.updateConfiguration(); vscode.workspace.onDidChangeConfiguration(this.updateConfiguration, this, this._disposables); } @@ -494,6 +611,7 @@ export default class BufferSyncSupport extends Disposable { if (!syncedBuffer) { return; } + this.pendingDiagnostics.delete(resource); this.pendingGetErr?.files.delete(resource); this.syncedBuffers.delete(resource); @@ -506,7 +624,7 @@ export default class BufferSyncSupport extends Disposable { public interruptGetErr(f: () => R): R { if (!this.pendingGetErr - || this.client.configuration.enableProjectDiagnostics // `geterr` happens on seperate server so no need to cancel it. + || this.client.configuration.enableProjectDiagnostics // `geterr` happens on separate server so no need to cancel it. ) { return f(); } @@ -628,7 +746,11 @@ export default class BufferSyncSupport extends Disposable { this._validateTypeScript = tsConfig.get('validate.enable', true); } - private shouldValidate(buffer: SyncedBuffer) { + private shouldValidate(buffer: SyncedBuffer): boolean { + if (!this.client.configuration.enableProjectDiagnostics && !this._tabResources.has(buffer.resource)) { // Only validate resources that are showing to the user + return false; + } + switch (buffer.kind) { case BufferKind.JavaScript: return this._validateJavaScript; diff --git a/extensions/typescript-language-features/src/tsServer/versionProvider.electron.ts b/extensions/typescript-language-features/src/tsServer/versionProvider.electron.ts index 760f82d7b09..ad4f9b9dfe6 100644 --- a/extensions/typescript-language-features/src/tsServer/versionProvider.electron.ts +++ b/extensions/typescript-language-features/src/tsServer/versionProvider.electron.ts @@ -6,10 +6,13 @@ import * as fs from 'fs'; import * as path from 'path'; import * as vscode from 'vscode'; +import * as nls from 'vscode-nls'; import API from '../utils/api'; import { TypeScriptServiceConfiguration } from '../utils/configuration'; import { RelativeWorkspacePathResolver } from '../utils/relativePathResolver'; -import { ITypeScriptVersionProvider, localize, TypeScriptVersion, TypeScriptVersionSource } from './versionProvider'; +import { ITypeScriptVersionProvider, TypeScriptVersion, TypeScriptVersionSource } from './versionProvider'; + +const localize = nls.loadMessageBundle(); export class DiskTypeScriptVersionProvider implements ITypeScriptVersionProvider { @@ -28,7 +31,7 @@ export class DiskTypeScriptVersionProvider implements ITypeScriptVersionProvider public get globalVersion(): TypeScriptVersion | undefined { if (this.configuration?.globalTsdk) { const globals = this.loadVersionsFromSetting(TypeScriptVersionSource.UserSetting, this.configuration.globalTsdk); - if (globals && globals.length) { + if (globals?.length) { return globals[0]; } } @@ -37,7 +40,7 @@ export class DiskTypeScriptVersionProvider implements ITypeScriptVersionProvider public get localVersion(): TypeScriptVersion | undefined { const tsdkVersions = this.localTsdkVersions; - if (tsdkVersions && tsdkVersions.length) { + if (tsdkVersions?.length) { return tsdkVersions[0]; } diff --git a/extensions/typescript-language-features/src/tsServer/versionProvider.ts b/extensions/typescript-language-features/src/tsServer/versionProvider.ts index 43f16c7c19d..89fd07d8c1b 100644 --- a/extensions/typescript-language-features/src/tsServer/versionProvider.ts +++ b/extensions/typescript-language-features/src/tsServer/versionProvider.ts @@ -7,7 +7,7 @@ import * as nls from 'vscode-nls'; import API from '../utils/api'; import { TypeScriptServiceConfiguration } from '../utils/configuration'; -export const localize = nls.loadMessageBundle(); +const localize = nls.loadMessageBundle(); export const enum TypeScriptVersionSource { Bundled = 'bundled', diff --git a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts index c8635b2f668..6c2168a380c 100644 --- a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts +++ b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts @@ -10,6 +10,7 @@ import * as vscode from 'vscode'; import { CommandManager } from './commands/commandManager'; +import { IExperimentationTelemetryReporter } from './experimentTelemetryReporter'; import { DiagnosticKind } from './languageFeatures/diagnostics'; import FileConfigurationManager from './languageFeatures/fileConfigurationManager'; import LanguageProvider from './languageProvider'; @@ -72,6 +73,7 @@ export default class TypeScriptServiceClientHost extends Disposable { processFactory: TsServerProcessFactory; activeJsTsEditorTracker: ActiveJsTsEditorTracker; serviceConfigurationProvider: ServiceConfigurationProvider; + experimentTelemetryReporter: IExperimentationTelemetryReporter | undefined; }, onCompletionAccepted: (item: vscode.CompletionItem) => void, ) { diff --git a/extensions/typescript-language-features/src/typescriptService.ts b/extensions/typescript-language-features/src/typescriptService.ts index 616131b26d8..681cee3a4b5 100644 --- a/extensions/typescript-language-features/src/typescriptService.ts +++ b/extensions/typescript-language-features/src/typescriptService.ts @@ -73,6 +73,7 @@ interface StandardTsServerRequests { 'fileReferences': [Proto.FileRequestArgs, Proto.FileReferencesResponse]; 'provideInlayHints': [Proto.InlayHintsRequestArgs, Proto.InlayHintsResponse]; 'encodedSemanticClassifications-full': [Proto.EncodedSemanticClassificationsRequestArgs, Proto.EncodedSemanticClassificationsResponse]; + 'findSourceDefinition': [Proto.FileLocationRequestArgs, Proto.DefinitionResponse]; } interface NoResponseTsServerRequests { diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts index 0fdecc5c952..169df72d203 100644 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts @@ -6,6 +6,7 @@ import * as path from 'path'; import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; +import { IExperimentationTelemetryReporter } from './experimentTelemetryReporter'; import { DiagnosticKind, DiagnosticsManager } from './languageFeatures/diagnostics'; import * as Proto from './protocol'; import { EventName } from './protocol.const'; @@ -25,7 +26,7 @@ import * as fileSchemes from './utils/fileSchemes'; import { Logger } from './utils/logger'; import { isWeb } from './utils/platform'; import { TypeScriptPluginPathsProvider } from './utils/pluginPathsProvider'; -import { PluginManager } from './utils/plugins'; +import { PluginManager, TypeScriptServerPlugin } from './utils/plugins'; import { TelemetryProperties, TelemetryReporter, VSCodeTelemetryReporter } from './utils/telemetry'; import Tracer from './utils/tracer'; import { inferredProjectCompilerOptions, ProjectType } from './utils/tsconfig'; @@ -137,6 +138,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType versionProvider: ITypeScriptVersionProvider; processFactory: TsServerProcessFactory; serviceConfigurationProvider: ServiceConfigurationProvider; + experimentTelemetryReporter: IExperimentationTelemetryReporter | undefined; }, allModeIds: readonly string[] ) { @@ -205,14 +207,14 @@ export default class TypeScriptServiceClient extends Disposable implements IType } }, this, this._disposables); - this.telemetryReporter = this._register(new VSCodeTelemetryReporter(() => { + this.telemetryReporter = new VSCodeTelemetryReporter(services.experimentTelemetryReporter, () => { if (this.serverState.type === ServerState.Type.Running) { if (this.serverState.tsserverVersion) { return this.serverState.tsserverVersion; } } return this.apiVersion.fullVersionString; - })); + }); this.typescriptServerSpawner = new TypeScriptServerSpawner(this.versionProvider, this._versionManager, this.logDirectoryProvider, this.pluginPathsProvider, this.logger, this.telemetryReporter, this.tracer, this.processFactory); @@ -430,32 +432,29 @@ export default class TypeScriptServiceClient extends Disposable implements IType }); handle.onExit((data: TypeScriptServerExitEvent) => { + const { code, signal } = data; + this.error(`TSServer exited. Code: ${code}. Signal: ${signal}`); + + // In practice, the exit code is an integer with no ties to any identity, + // so it can be classified as SystemMetaData, rather than CallstackOrException. + /* __GDPR__ + "tsserver.exitWithCode" : { + "owner": "mjbvz", + "code" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }, + "signal" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }, + "${include}": [ + "${TypeScriptCommonProperties}" + ] + } + */ + this.logTelemetry('tsserver.exitWithCode', { code: code ?? undefined, signal: signal ?? undefined }); + + if (this.token !== mytoken) { // this is coming from an old process return; } - const { code, signal } = data; - - if (code === null || typeof code === 'undefined') { - this.info(`TSServer exited. Signal: ${signal}`); - } else { - // In practice, the exit code is an integer with no ties to any identity, - // so it can be classified as SystemMetaData, rather than CallstackOrException. - this.error(`TSServer exited with code: ${code}. Signal: ${signal}`); - /* __GDPR__ - "tsserver.exitWithCode" : { - "owner": "mjbvz", - "code" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }, - "signal" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }, - "${include}": [ - "${TypeScriptCommonProperties}" - ] - } - */ - this.logTelemetry('tsserver.exitWithCode', { code, signal: signal ?? undefined }); - } - if (handle.tsServerLogFile) { this.info(`TSServer log file: ${handle.tsServerLogFile}`); } @@ -554,8 +553,8 @@ export default class TypeScriptServiceClient extends Disposable implements IType } // Reconfigure any plugins - for (const [config, pluginName] of this.pluginManager.configurations()) { - this.configurePlugin(config, pluginName); + for (const [pluginName, config] of this.pluginManager.configurations()) { + this.configurePlugin(pluginName, config); } } @@ -587,6 +586,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType this.numberRestarts++; let startService = true; + const pluginExtensionList = this.pluginManager.plugins.map(plugin => plugin.extension.id).join(', '); const reportIssueItem: vscode.MessageItem = { title: localize('serverDiedReportIssue', 'Report Issue'), }; @@ -599,7 +599,9 @@ export default class TypeScriptServiceClient extends Disposable implements IType startService = false; this.hasServerFatallyCrashedTooManyTimes = true; prompt = vscode.window.showErrorMessage( - localize('serverDiedAfterStart', 'The TypeScript language service died 5 times right after it got started. The service will not be restarted.'), + this.pluginManager.plugins.length + ? localize('serverDiedImmediatelyWithPlugins', "The JS/TS language service immediately crashed 5 times. The service will not be restarted.\nThis may be caused by a plugin contributed by one of these extensions: {0}", pluginExtensionList) + : localize('serverDiedImmediately', "The JS/TS language service immediately crashed 5 times. The service will not be restarted."), reportIssueItem); /* __GDPR__ @@ -613,21 +615,30 @@ export default class TypeScriptServiceClient extends Disposable implements IType this.logTelemetry('serviceExited'); } else if (diff < 60 * 1000 * 5 /* 5 Minutes */) { this.lastStart = Date.now(); - prompt = vscode.window.showWarningMessage( - localize('serverDied', 'The TypeScript language service died unexpectedly 5 times in the last 5 Minutes.'), - reportIssueItem); + if (!this._isPromptingAfterCrash) { + prompt = vscode.window.showWarningMessage( + this.pluginManager.plugins.length + ? localize('serverDiedFiveTimesWithPlugins', "The JS/TS language service crashed 5 times in the last 5 Minutes.\nThis may be caused by a plugin contributed by one of these extensions: {0}", pluginExtensionList) + : localize('serverDiedFiveTimes', "The JS/TS language service crashed 5 times in the last 5 Minutes."), + reportIssueItem); + } } } else if (['vscode-insiders', 'code-oss'].includes(vscode.env.uriScheme)) { // Prompt after a single restart - if (!this._isPromptingAfterCrash && previousState.type === ServerState.Type.Errored && previousState.error instanceof TypeScriptServerError) { - this.numberRestarts = 0; - this._isPromptingAfterCrash = true; + this.numberRestarts = 0; + if (!this._isPromptingAfterCrash) { prompt = vscode.window.showWarningMessage( - localize('serverDiedOnce', 'The TypeScript language service died unexpectedly.'), + this.pluginManager.plugins.length + ? localize('serverDiedOnceWithPlugins', "The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}", pluginExtensionList) + : localize('serverDiedOnce', "The JS/TS language service crashed."), reportIssueItem); } } + if (prompt) { + this._isPromptingAfterCrash = true; + } + prompt?.then(item => { this._isPromptingAfterCrash = false; @@ -647,7 +658,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType }); } else { const args = previousState.type === ServerState.Type.Errored && previousState.error instanceof TypeScriptServerError - ? getReportIssueArgsForError(previousState.error, previousState.tsServerLogFile) + ? getReportIssueArgsForError(previousState.error, previousState.tsServerLogFile, this.pluginManager.plugins) : undefined; vscode.commands.executeCommand('workbench.action.openIssueReporter', args); } @@ -883,7 +894,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType this.loadingIndicator.reset(); const diagnosticEvent = event as Proto.DiagnosticEvent; - if (diagnosticEvent.body && diagnosticEvent.body.diagnostics) { + if (diagnosticEvent.body?.diagnostics) { this._onDiagnosticsReceived.fire({ kind: getDignosticsKind(event), resource: this.toResource(diagnosticEvent.body.file), @@ -1005,6 +1016,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType function getReportIssueArgsForError( error: TypeScriptServerError, logPath: string | undefined, + globalPlugins: readonly TypeScriptServerPlugin[], ): { extensionId: string; issueTitle: string; issueBody: string } | undefined { if (!error.serverStack || !error.serverMessage) { return undefined; @@ -1023,6 +1035,10 @@ function getReportIssueArgsForError( 3.`, ]; + if (globalPlugins.length) { + sections.push(`**Global TS Server Plugins**\n\n` + globalPlugins.map(plugin => `- \`${plugin.name}\``).join('\n')); + } + if (logPath) { sections.push(`**TS Server Log** @@ -1036,7 +1052,7 @@ The log file may contain personal data, including full paths and source code fro sections.push(`**TS Server Log** -❗ī¸Server logging disabled. To help us fix crashes like this, please enable logging by setting: +❗ī¸ Server logging disabled. To help us fix crashes like this, please enable logging by setting: \`\`\`json "typescript.tsserver.log": "verbose" diff --git a/extensions/typescript-language-features/src/ui/jsNodeWalkthrough.electron.ts b/extensions/typescript-language-features/src/ui/jsNodeWalkthrough.electron.ts new file mode 100644 index 00000000000..7f31bf3272a --- /dev/null +++ b/extensions/typescript-language-features/src/ui/jsNodeWalkthrough.electron.ts @@ -0,0 +1,196 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as vscode from 'vscode'; +import * as nls from 'vscode-nls'; +import * as cp from 'child_process'; + +import { Disposable } from '../utils/dispose'; +import { CommandManager } from '../commands/commandManager'; + +const localize = nls.loadMessageBundle(); + +export async function nodeWasResolvable(): Promise { + let execStr: string; + switch (process.platform) { + case 'win32': + execStr = 'where node'; + break; + case 'aix': + case 'cygwin': + case 'darwin': + case 'freebsd': + case 'haiku': + case 'linux': + case 'netbsd': + case 'openbsd': + case 'sunos': + execStr = 'which node'; + break; + default: + return false; + } + + return new Promise(resolve => { + cp.exec(execStr, { windowsHide: true }, err => { + resolve(!err); + }); + }); +} + +export class JsWalkthroughState extends Disposable { + exampleJsDocument: vscode.TextDocument | undefined = undefined; + + override dispose() { + this.exampleJsDocument = undefined; + } +} + +export class CreateNewJSFileCommand { + public static readonly id = 'javascript-walkthrough.commands.createJsFile'; + public readonly id = CreateNewJSFileCommand.id; + + constructor(private walkthroughState: JsWalkthroughState) { } + + public execute() { + createNewJSFile(this.walkthroughState); + } +} + +export class DebugJsFileCommand { + public static readonly id = 'javascript-walkthrough.commands.debugJsFile'; + public readonly id = DebugJsFileCommand.id; + + constructor(private walkthroughState: JsWalkthroughState) { } + + public execute() { + debugJsFile(this.walkthroughState); + } +} + +export class NodeInstallationFoundCommand { + public static readonly id = 'javascript-walkthrough.commands.nodeInstallationFound'; + public readonly id = NodeInstallationFoundCommand.id; + public execute() { } +} + +async function createNewJSFile(walkthroughState: JsWalkthroughState) { + const newFile = await vscode.workspace.openTextDocument({ + language: 'javascript', + content: `// Write a message to the console.\nconsole.log('hello world!');\n`, + }); + walkthroughState.exampleJsDocument = newFile; + return vscode.window.showTextDocument(newFile, vscode.ViewColumn.Beside); +} + +async function debugJsFile(walkthroughState: JsWalkthroughState) { + const hasNode = await nodeWasResolvable(); + if (!hasNode) { + const reloadResponse = localize('reloadWindowForNode', 'Reload VS Code'); + const debugAnywayResponse = localize('nodeNotFoundDebugAnyway', 'Try Debugging Anyway'); + const dismissResponse = localize('nodeNotFoundDismissDialog', 'Dismiss'); + const response = await vscode.window.showErrorMessage( + // The message + localize('noNodeInstallFound', 'We couldn\'t find Node.js on this computer. If you just installed it, you might need to reload VS Code.'), + // The options + reloadResponse, + debugAnywayResponse, + dismissResponse, + ); + + if (response === undefined || response === dismissResponse) { + return; + } + if (response === reloadResponse) { + vscode.commands.executeCommand('workbench.action.reloadWindow'); + return; + } + } + tryDebugRelevantDocument(walkthroughState.exampleJsDocument, 'javascript', ['.mjs', '.js'], () => createNewJSFile(walkthroughState)); +} + +type DocSearchResult = + | { kind: 'visible'; editor: vscode.TextEditor } + | { kind: 'hidden'; uri: vscode.Uri } + | { kind: 'not-found' }; + +async function tryDebugRelevantDocument(lastDocument: vscode.TextDocument | undefined, languageId: string, languageExtensions: [string, ...string[]], createFileAndFocus: () => Promise): Promise { + let searchResult!: DocSearchResult; + for (const languageExtension of languageExtensions) { + searchResult = tryFindRelevantDocument(lastDocument, languageId, languageExtension); + if (searchResult.kind !== 'not-found') { + break; + } + } + + let editor: vscode.TextEditor; + // If not, make one. + switch (searchResult.kind) { + case 'visible': + // Focus if necessary. + editor = searchResult.editor; + if (vscode.window.activeTextEditor !== editor) { + await vscode.window.showTextDocument(editor.document, { + viewColumn: vscode.ViewColumn.Beside, + }); + } + break; + case 'hidden': + editor = await vscode.window.showTextDocument(searchResult.uri, { + viewColumn: vscode.ViewColumn.Beside, + }); + break; + case 'not-found': + editor = await createFileAndFocus(); + break; + } + + await Promise.all([ + vscode.commands.executeCommand('workbench.action.debug.start'), + vscode.commands.executeCommand('workbench.debug.action.focusRepl'), + ]); + +} + +/** Tries to find a relevant {@link vscode.TextEditor} or a {@link vscode.Uri} for an open document */ +function tryFindRelevantDocument(lastDocument: vscode.TextDocument | undefined, languageId: string, languageExtension: string): DocSearchResult { + let editor: vscode.TextEditor | undefined; + + // Try to find the document created from the last step. + if (lastDocument) { + editor = vscode.window.visibleTextEditors.find(editor => editor.document === lastDocument); + } + + // If we couldn't find that, find a visible document with the desired language. + editor ??= vscode.window.visibleTextEditors.find(editor => editor.document.languageId === languageId); + if (editor) { + return { + kind: 'visible', + editor, + }; + } + + // If we still couldn't find that, find a possibly not-visible document. + for (const tabGroup of vscode.window.tabGroups.all) { + for (const tab of tabGroup.tabs) { + if (tab.input instanceof vscode.TabInputText && tab.input.uri.path.endsWith(languageExtension)) { + return { + kind: 'hidden', + uri: tab.input.uri, + }; + } + } + } + + return { kind: 'not-found' }; +} + +export function registerJsNodeWalkthrough( + commandManager: CommandManager, + jsWalkthroughState: JsWalkthroughState, +) { + commandManager.register(new CreateNewJSFileCommand(jsWalkthroughState)); + commandManager.register(new DebugJsFileCommand(jsWalkthroughState)); +} diff --git a/extensions/typescript-language-features/src/utils/api.ts b/extensions/typescript-language-features/src/utils/api.ts index e9e85091fa4..4af828ed45a 100644 --- a/extensions/typescript-language-features/src/utils/api.ts +++ b/extensions/typescript-language-features/src/utils/api.ts @@ -40,6 +40,8 @@ export default class API { public static readonly v440 = API.fromSimpleString('4.4.0'); public static readonly v460 = API.fromSimpleString('4.6.0'); public static readonly v470 = API.fromSimpleString('4.7.0'); + public static readonly v480 = API.fromSimpleString('4.8.0'); + public static readonly v490 = API.fromSimpleString('4.9.0'); public static fromVersionString(versionString: string): API { let version = semver.valid(versionString); diff --git a/extensions/typescript-language-features/src/utils/async.ts b/extensions/typescript-language-features/src/utils/async.ts index 75ccf258f28..db92754fd2e 100644 --- a/extensions/typescript-language-features/src/utils/async.ts +++ b/extensions/typescript-language-features/src/utils/async.ts @@ -13,7 +13,7 @@ export class Delayer { public defaultDelay: number; private timeout: any; // Timer - private completionPromise: Promise | null; + private completionPromise: Promise | null; private onSuccess: ((value: T | PromiseLike | undefined) => void) | null; private task: ITask | null; @@ -25,7 +25,7 @@ export class Delayer { this.task = null; } - public trigger(task: ITask, delay: number = this.defaultDelay): Promise { + public trigger(task: ITask, delay: number = this.defaultDelay): Promise { this.task = task; if (delay >= 0) { this.cancelTimeout(); @@ -37,7 +37,7 @@ export class Delayer { }).then(() => { this.completionPromise = null; this.onSuccess = null; - const result = this.task && this.task(); + const result = this.task?.(); this.task = null; return result; }); diff --git a/extensions/typescript-language-features/src/utils/codeAction.ts b/extensions/typescript-language-features/src/utils/codeAction.ts index df345e33517..6a7ad144482 100644 --- a/extensions/typescript-language-features/src/utils/codeAction.ts +++ b/extensions/typescript-language-features/src/utils/codeAction.ts @@ -12,7 +12,7 @@ export function getEditForCodeAction( client: ITypeScriptServiceClient, action: Proto.CodeAction ): vscode.WorkspaceEdit | undefined { - return action.changes && action.changes.length + return action.changes?.length ? typeConverters.WorkspaceEdit.fromFileCodeEdits(client, action.changes) : undefined; } @@ -36,7 +36,7 @@ export async function applyCodeActionCommands( commands: ReadonlyArray<{}> | undefined, token: vscode.CancellationToken, ): Promise { - if (commands && commands.length) { + if (commands?.length) { for (const command of commands) { await client.execute('applyCodeActionCommand', { command }, token); } diff --git a/extensions/typescript-language-features/src/utils/configuration.ts b/extensions/typescript-language-features/src/utils/configuration.ts index 2690f743848..d1bfe62f738 100644 --- a/extensions/typescript-language-features/src/utils/configuration.ts +++ b/extensions/typescript-language-features/src/utils/configuration.ts @@ -5,6 +5,7 @@ import * as vscode from 'vscode'; import * as objects from '../utils/objects'; +import * as Proto from '../protocol'; export enum TsServerLogLevel { Off, @@ -15,7 +16,7 @@ export enum TsServerLogLevel { export namespace TsServerLogLevel { export function fromString(value: string): TsServerLogLevel { - switch (value && value.toLowerCase()) { + switch (value?.toLowerCase()) { case 'normal': return TsServerLogLevel.Normal; case 'terse': @@ -112,7 +113,7 @@ export interface TypeScriptServiceConfiguration { readonly enableProjectDiagnostics: boolean; readonly maxTsServerMemory: number; readonly enablePromptUseWorkspaceTsdk: boolean; - readonly watchOptions: protocol.WatchOptions | undefined; + readonly watchOptions: Proto.WatchOptions | undefined; readonly includePackageJsonAutoImports: 'auto' | 'on' | 'off' | undefined; readonly enableTsServerTracing: boolean; } @@ -196,8 +197,8 @@ export abstract class BaseServiceConfigurationProvider implements ServiceConfigu return configuration.get('typescript.tsserver.experimental.enableProjectDiagnostics', false); } - protected readWatchOptions(configuration: vscode.WorkspaceConfiguration): protocol.WatchOptions | undefined { - return configuration.get('typescript.tsserver.watchOptions'); + protected readWatchOptions(configuration: vscode.WorkspaceConfiguration): Proto.WatchOptions | undefined { + return configuration.get('typescript.tsserver.watchOptions'); } protected readIncludePackageJsonAutoImports(configuration: vscode.WorkspaceConfiguration): 'auto' | 'on' | 'off' | undefined { diff --git a/extensions/typescript-language-features/src/utils/dependentRegistration.ts b/extensions/typescript-language-features/src/utils/dependentRegistration.ts index 3d97b8a8e7f..c53d553625c 100644 --- a/extensions/typescript-language-features/src/utils/dependentRegistration.ts +++ b/extensions/typescript-language-features/src/utils/dependentRegistration.ts @@ -54,14 +54,10 @@ class ConditionalRegistration { private update() { const enabled = this.conditions.every(condition => condition.value); if (enabled) { - if (!this.registration) { - this.registration = this.doRegister(); - } + this.registration ??= this.doRegister(); } else { - if (this.registration) { - this.registration.dispose(); - this.registration = undefined; - } + this.registration?.dispose(); + this.registration = undefined; } } } diff --git a/extensions/typescript-language-features/src/utils/logLevelMonitor.ts b/extensions/typescript-language-features/src/utils/logLevelMonitor.ts index 0744a64863e..92a48be4cfd 100644 --- a/extensions/typescript-language-features/src/utils/logLevelMonitor.ts +++ b/extensions/typescript-language-features/src/utils/logLevelMonitor.ts @@ -4,10 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import { localize } from '../tsServer/versionProvider'; +import * as nls from 'vscode-nls'; import { TsServerLogLevel } from './configuration'; import { Disposable } from './dispose'; +const localize = nls.loadMessageBundle(); + export class LogLevelMonitor extends Disposable { private static readonly logLevelConfigKey = 'typescript.tsserver.log'; diff --git a/extensions/typescript-language-features/src/utils/packageInfo.ts b/extensions/typescript-language-features/src/utils/packageInfo.ts new file mode 100644 index 00000000000..09536ab4141 --- /dev/null +++ b/extensions/typescript-language-features/src/utils/packageInfo.ts @@ -0,0 +1,24 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as vscode from 'vscode'; + +export interface PackageInfo { + name: string; + version: string; + aiKey: string; +} + +export function getPackageInfo(context: vscode.ExtensionContext) { + const packageJSON = context.extension.packageJSON; + if (packageJSON && typeof packageJSON === 'object') { + return { + name: packageJSON.name ?? '', + version: packageJSON.version ?? '', + aiKey: packageJSON.aiKey ?? '', + }; + } + return null; +} diff --git a/extensions/typescript-language-features/src/utils/plugins.ts b/extensions/typescript-language-features/src/utils/plugins.ts index 92d61e3e235..814f0e12016 100644 --- a/extensions/typescript-language-features/src/utils/plugins.ts +++ b/extensions/typescript-language-features/src/utils/plugins.ts @@ -8,6 +8,7 @@ import * as arrays from './arrays'; import { Disposable } from './dispose'; export interface TypeScriptServerPlugin { + readonly extension: vscode.Extension; readonly uri: vscode.Uri; readonly name: string; readonly enableForWorkspaceTypeScriptVersions: boolean; @@ -27,7 +28,7 @@ namespace TypeScriptServerPlugin { export class PluginManager extends Disposable { private readonly _pluginConfigurations = new Map(); - private _plugins: Map> | undefined; + private _plugins?: Map>; constructor() { super(); @@ -36,6 +37,7 @@ export class PluginManager extends Disposable { if (!this._plugins) { return; } + const newPlugins = this.readPlugins(); if (!arrays.equals(Array.from(this._plugins.values()).flat(), Array.from(newPlugins.values()).flat(), TypeScriptServerPlugin.equals)) { this._plugins = newPlugins; @@ -45,9 +47,7 @@ export class PluginManager extends Disposable { } public get plugins(): ReadonlyArray { - if (!this._plugins) { - this._plugins = this.readPlugins(); - } + this._plugins ??= this.readPlugins(); return Array.from(this._plugins.values()).flat(); } @@ -74,6 +74,7 @@ export class PluginManager extends Disposable { const plugins: TypeScriptServerPlugin[] = []; for (const plugin of pack.contributes.typescriptServerPlugins) { plugins.push({ + extension, name: plugin.name, enableForWorkspaceTypeScriptVersions: !!plugin.enableForWorkspaceTypeScriptVersions, uri: extension.extensionUri, diff --git a/extensions/typescript-language-features/src/utils/previewer.ts b/extensions/typescript-language-features/src/utils/previewer.ts index a4a42086d17..1564cdd92dd 100644 --- a/extensions/typescript-language-features/src/utils/previewer.ts +++ b/extensions/typescript-language-features/src/utils/previewer.ts @@ -84,7 +84,7 @@ function getTagDocumentation( case 'extends': case 'param': case 'template': { - const body = (convertLinkTags(tag.text, filePathConverter)).split(/^(\S+)\s*-?\s*/); + const body = getTagBody(tag, filePathConverter); if (body?.length === 3) { const param = body[1]; const doc = body[2]; @@ -106,6 +106,18 @@ function getTagDocumentation( return label + (text.match(/\r\n|\n/g) ? ' \n' + text : ` \u2014 ${text}`); } +function getTagBody(tag: Proto.JSDocTagInfo, filePathConverter: IFilePathToResourceConverter): Array | undefined { + if (tag.name === 'template') { + const parts = tag.text; + if (parts && typeof (parts) !== 'string') { + const params = parts.filter(p => p.kind === 'typeParameterName').map(p => p.text).join(', '); + const docs = parts.filter(p => p.kind === 'text').map(p => convertLinkTags(p.text.replace(/^\s*-?\s*/, ''), filePathConverter)).join(' '); + return params ? ['', params, docs] : undefined; + } + } + return (convertLinkTags(tag.text, filePathConverter)).split(/^(\S+)\s*-?\s*/); +} + export function plainWithLinks( parts: readonly Proto.SymbolDisplayPart[] | string, filePathConverter: IFilePathToResourceConverter, diff --git a/extensions/typescript-language-features/src/utils/telemetry.ts b/extensions/typescript-language-features/src/utils/telemetry.ts index 2ef271de107..4b2d3867f6d 100644 --- a/extensions/typescript-language-features/src/utils/telemetry.ts +++ b/extensions/typescript-language-features/src/utils/telemetry.ts @@ -3,15 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as vscode from 'vscode'; -import VsCodeTelemetryReporter from '@vscode/extension-telemetry'; -import { memoize } from './memoize'; - -interface PackageInfo { - readonly name: string; - readonly version: string; - readonly aiKey: string; -} +import { IExperimentationTelemetryReporter } from '../experimentTelemetryReporter'; export interface TelemetryProperties { readonly [prop: string]: string | number | boolean | undefined; @@ -19,14 +11,11 @@ export interface TelemetryProperties { export interface TelemetryReporter { logTelemetry(eventName: string, properties?: TelemetryProperties): void; - - dispose(): void; } export class VSCodeTelemetryReporter implements TelemetryReporter { - private _reporter: VsCodeTelemetryReporter | null = null; - constructor( + private readonly reporter: IExperimentationTelemetryReporter | undefined, private readonly clientVersionDelegate: () => string ) { } @@ -43,38 +32,6 @@ export class VSCodeTelemetryReporter implements TelemetryReporter { */ properties['version'] = this.clientVersionDelegate(); - reporter.sendTelemetryEvent(eventName, properties); - } - - public dispose() { - if (this._reporter) { - this._reporter.dispose(); - this._reporter = null; - } - } - - @memoize - private get reporter(): VsCodeTelemetryReporter | null { - if (this.packageInfo && this.packageInfo.aiKey) { - this._reporter = new VsCodeTelemetryReporter( - this.packageInfo.name, - this.packageInfo.version, - this.packageInfo.aiKey); - return this._reporter; - } - return null; - } - - @memoize - private get packageInfo(): PackageInfo | null { - const { packageJSON } = vscode.extensions.getExtension('vscode.typescript-language-features')!; - if (packageJSON) { - return { - name: packageJSON.name, - version: packageJSON.version, - aiKey: packageJSON.aiKey - }; - } - return null; + reporter.postEventObj(eventName, properties); } } diff --git a/extensions/typescript-language-features/src/utils/temp.electron.ts b/extensions/typescript-language-features/src/utils/temp.electron.ts index 84fc21ff885..886c8f014fe 100644 --- a/extensions/typescript-language-features/src/utils/temp.electron.ts +++ b/extensions/typescript-language-features/src/utils/temp.electron.ts @@ -34,9 +34,7 @@ const getRootTempDir = (() => { export const getInstanceTempDir = (() => { let dir: string | undefined; return () => { - if (!dir) { - dir = path.join(getRootTempDir(), makeRandomHexString(20)); - } + dir ??= path.join(getRootTempDir(), makeRandomHexString(20)); if (!fs.existsSync(dir)) { fs.mkdirSync(dir); } diff --git a/extensions/typescript-language-features/src/utils/tsconfig.ts b/extensions/typescript-language-features/src/utils/tsconfig.ts index b92a26916d1..1c71d659126 100644 --- a/extensions/typescript-language-features/src/utils/tsconfig.ts +++ b/extensions/typescript-language-features/src/utils/tsconfig.ts @@ -26,7 +26,7 @@ const defaultProjectConfig = Object.freeze module: 'ESNext' as Proto.ModuleKind, moduleResolution: 'Node' as Proto.ModuleResolutionKind, target: 'ES2020' as Proto.ScriptTarget, - jsx: 'preserve' as Proto.JsxEmit, + jsx: 'react' as Proto.JsxEmit, }); export function inferredProjectCompilerOptions( @@ -163,7 +163,7 @@ export async function openProjectConfigForFile( return; } - let res: ServerResponse.Response | undefined; + let res: ServerResponse.Response | undefined; try { res = await client.execute('projectInfo', { file, needFileNameList: false }, nulToken); } catch { diff --git a/extensions/typescript-language-features/src/utils/typeConverters.ts b/extensions/typescript-language-features/src/utils/typeConverters.ts index 1e81c133262..2574fae4064 100644 --- a/extensions/typescript-language-features/src/utils/typeConverters.ts +++ b/extensions/typescript-language-features/src/utils/typeConverters.ts @@ -136,3 +136,13 @@ export namespace CompletionTriggerKind { } } } + +export namespace OrganizeImportsMode { + export function toProtocolOrganizeImportsMode(mode: PConst.OrganizeImportsMode): Proto.OrganizeImportsMode { + switch (mode) { + case PConst.OrganizeImportsMode.All: return 'All' as Proto.OrganizeImportsMode.All; + case PConst.OrganizeImportsMode.SortAndCombine: return 'SortAndCombine' as Proto.OrganizeImportsMode.SortAndCombine; + case PConst.OrganizeImportsMode.RemoveUnused: return 'RemoveUnused' as Proto.OrganizeImportsMode.RemoveUnused; + } + } +} diff --git a/extensions/typescript-language-features/tsconfig.json b/extensions/typescript-language-features/tsconfig.json index 07d4066f89b..769e79a9072 100644 --- a/extensions/typescript-language-features/tsconfig.json +++ b/extensions/typescript-language-features/tsconfig.json @@ -10,8 +10,6 @@ "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.resolvers.d.ts", "../../src/vscode-dts/vscode.proposed.workspaceTrust.d.ts", ] diff --git a/extensions/typescript-language-features/yarn.lock b/extensions/typescript-language-features/yarn.lock index 2292b38d296..89f3521b9b6 100644 --- a/extensions/typescript-language-features/yarn.lock +++ b/extensions/typescript-language-features/yarn.lock @@ -2,6 +2,42 @@ # yarn lockfile v1 +"@microsoft/1ds-core-js@3.2.3", "@microsoft/1ds-core-js@^3.2.3": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.3.tgz#2217d92ec8b073caa4577a13f40ea3a5c4c4d4e7" + integrity sha512-796A8fd90oUKDRO7UXUT9BwZ3G+a9XzJj5v012FcCN/2qRhEsIV3x/0wkx2S08T4FiQEUPkB2uoYHpEjEneM7g== + dependencies: + "@microsoft/applicationinsights-core-js" "2.8.4" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/1ds-post-js@^3.2.3": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.3.tgz#1fa7d51615a44f289632ae8c588007ba943db216" + integrity sha512-tcGJQXXr2LYoBbIXPoUVe1KCF3OtBsuKDFL7BXfmNtuSGtWF0yejm6H83DrR8/cUIGMRMUP9lqNlqFGwDYiwAQ== + dependencies: + "@microsoft/1ds-core-js" "3.2.3" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/applicationinsights-core-js@2.8.4": + version "2.8.4" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.4.tgz#607e531bb241a8920d43960f68a7c76a6f9af596" + integrity sha512-FoA0FNOsFbJnLyTyQlYs6+HR7HMEa6nAOE6WOm9WVejBHMHQ/Bdb+hfVFi6slxwCimr/ner90jchi4/sIYdnyQ== + dependencies: + "@microsoft/applicationinsights-shims" "2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" + +"@microsoft/applicationinsights-shims@2.0.1", "@microsoft/applicationinsights-shims@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.1.tgz#5d72fb7aaf4056c4fda54f9d7c93ccf8ca9bcbfd" + integrity sha512-G0MXf6R6HndRbDy9BbEj0zrLeuhwt2nsXk2zKtF0TnYo39KgYqhYC2ayIzKPTm2KAE+xzD7rgyLdZnrcRvt9WQ== + +"@microsoft/dynamicproto-js@^1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc" + integrity sha512-D1Oivw1A4bIXhzBIy3/BBPn3p2On+kpO2NiYt9shICDK7L/w+cR6FFBUsBZ05l6iqzTeL+Jm8lAYn0g6G7DmDg== + "@types/node@16.x": version "16.11.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" @@ -12,10 +48,25 @@ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45" integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== -"@vscode/extension-telemetry@0.4.10": - version "0.4.10" - resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.4.10.tgz#be960c05bdcbea0933866346cf244acad6cac910" - integrity sha512-XgyUoWWRQExTmd9DynIIUQo1NPex/zIeetdUAXeBjVuW9ioojM1TcDaSqOa/5QLC7lx+oEXwSU1r0XSBgzyz6w== +"@vscode/extension-telemetry@0.6.2": + version "0.6.2" + resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.6.2.tgz#b86814ee680615730da94220c2b03ea9c3c14a8e" + integrity sha512-yb/wxLuaaCRcBAZtDCjNYSisAXz3FWsSqAha5nhHcYxx2ZPdQdWuZqVXGKq0ZpHVndBWWtK6XqtpCN2/HB4S1w== + dependencies: + "@microsoft/1ds-core-js" "^3.2.3" + "@microsoft/1ds-post-js" "^3.2.3" + +axios@^0.26.1: + version "0.26.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9" + integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA== + dependencies: + follow-redirects "^1.14.8" + +follow-redirects@^1.14.8: + version "1.15.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" + integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== jsonc-parser@^2.2.1: version "2.3.1" @@ -27,10 +78,24 @@ semver@5.5.1: resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477" integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw== -vscode-nls@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840" - integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA== +tas-client@0.1.58: + version "0.1.58" + resolved "https://registry.yarnpkg.com/tas-client/-/tas-client-0.1.58.tgz#67d66bf0e27df5276ebc751105e6ad47791c36d8" + integrity sha512-fOWii4wQXuo9Zl0oXgvjBzZWzKc5MmUR6XQWX93WU2c1SaP1plPo/zvXP8kpbZ9fvegFOHdapszYqMTRq/SRtg== + dependencies: + axios "^0.26.1" + +vscode-nls@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f" + integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng== + +vscode-tas-client@^0.1.63: + version "0.1.63" + resolved "https://registry.yarnpkg.com/vscode-tas-client/-/vscode-tas-client-0.1.63.tgz#df89e67e9bf7ecb46471a0fb8a4a522d2aafad65" + integrity sha512-TY5TPyibzi6rNmuUB7eRVqpzLzNfQYrrIl/0/F8ukrrbzOrKVvS31hM3urE+tbaVrnT+TMYXL16GhX57vEowhA== + dependencies: + tas-client "0.1.58" vscode-uri@^3.0.3: version "3.0.3" diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json index 8b2dab07a14..cb55247e8cc 100644 --- a/extensions/vscode-api-tests/package.json +++ b/extensions/vscode-api-tests/package.json @@ -6,7 +6,6 @@ "license": "MIT", "enabledApiProposals": [ "authSession", - "badges", "contribViewsRemote", "customEditorMove", "diffCommand", @@ -18,14 +17,10 @@ "fileSearchProvider", "findTextInFiles", "fsChunks", - "inlineCompletions", "notebookCellExecutionState", "notebookContentProvider", "notebookControllerKind", - "notebookDebugOptions", "notebookDeprecated", - "notebookEditorDecorationType", - "notebookEditorEdit", "notebookLiveShare", "notebookMessaging", "notebookMime", @@ -38,15 +33,18 @@ "taskPresentationGroup", "terminalDataWriteEvent", "terminalDimensions", - "terminalNameChangeEvent", + "tunnels", + "envShellEvent", "testCoverage", "testObserver", "textSearchProvider", "timeline", "tokenInformation", + "treeItemCheckbox", "treeViewReveal", "workspaceTrust", - "telemetry" + "telemetry", + "extensionLog" ], "private": true, "activationEvents": [], diff --git a/extensions/vscode-api-tests/src/memfs.ts b/extensions/vscode-api-tests/src/memfs.ts index 4f0129da6cb..b7392ae7195 100644 --- a/extensions/vscode-api-tests/src/memfs.ts +++ b/extensions/vscode-api-tests/src/memfs.ts @@ -65,7 +65,7 @@ export class TestFS implements vscode.FileSystemProvider { readDirectory(uri: vscode.Uri): [string, vscode.FileType][] { const entry = this._lookupAsDirectory(uri, false); - let result: [string, vscode.FileType][] = []; + const result: [string, vscode.FileType][] = []; for (const [name, child] of entry.entries) { result.push([name, child.type]); } @@ -83,8 +83,8 @@ export class TestFS implements vscode.FileSystemProvider { } writeFile(uri: vscode.Uri, content: Uint8Array, options: { create: boolean; overwrite: boolean }): void { - let basename = path.posix.basename(uri.path); - let parent = this._lookupParentDirectory(uri); + const basename = path.posix.basename(uri.path); + const parent = this._lookupParentDirectory(uri); let entry = parent.entries.get(basename); if (entry instanceof Directory) { throw vscode.FileSystemError.FileIsADirectory(uri); @@ -115,11 +115,11 @@ export class TestFS implements vscode.FileSystemProvider { throw vscode.FileSystemError.FileExists(newUri); } - let entry = this._lookup(oldUri, false); - let oldParent = this._lookupParentDirectory(oldUri); + const entry = this._lookup(oldUri, false); + const oldParent = this._lookupParentDirectory(oldUri); - let newParent = this._lookupParentDirectory(newUri); - let newName = path.posix.basename(newUri.path); + const newParent = this._lookupParentDirectory(newUri); + const newName = path.posix.basename(newUri.path); oldParent.entries.delete(entry.name); entry.name = newName; @@ -132,9 +132,9 @@ export class TestFS implements vscode.FileSystemProvider { } delete(uri: vscode.Uri): void { - let dirname = uri.with({ path: path.posix.dirname(uri.path) }); - let basename = path.posix.basename(uri.path); - let parent = this._lookupAsDirectory(dirname, false); + const dirname = uri.with({ path: path.posix.dirname(uri.path) }); + const basename = path.posix.basename(uri.path); + const parent = this._lookupAsDirectory(dirname, false); if (!parent.entries.has(basename)) { throw vscode.FileSystemError.FileNotFound(uri); } @@ -145,11 +145,11 @@ export class TestFS implements vscode.FileSystemProvider { } createDirectory(uri: vscode.Uri): void { - let basename = path.posix.basename(uri.path); - let dirname = uri.with({ path: path.posix.dirname(uri.path) }); - let parent = this._lookupAsDirectory(dirname, false); + const basename = path.posix.basename(uri.path); + const dirname = uri.with({ path: path.posix.dirname(uri.path) }); + const parent = this._lookupAsDirectory(dirname, false); - let entry = new Directory(basename); + const entry = new Directory(basename); parent.entries.set(entry.name, entry); parent.mtime = Date.now(); parent.size += 1; @@ -161,7 +161,7 @@ export class TestFS implements vscode.FileSystemProvider { private _lookup(uri: vscode.Uri, silent: false): Entry; private _lookup(uri: vscode.Uri, silent: boolean): Entry | undefined; private _lookup(uri: vscode.Uri, silent: boolean): Entry | undefined { - let parts = uri.path.split('/'); + const parts = uri.path.split('/'); let entry: Entry = this.root; for (const part of parts) { const partLow = part.toLowerCase(); @@ -173,7 +173,7 @@ export class TestFS implements vscode.FileSystemProvider { if (this.isCaseSensitive) { child = entry.entries.get(part); } else { - for (let [key, value] of entry.entries) { + for (const [key, value] of entry.entries) { if (key.toLowerCase() === partLow) { child = value; break; @@ -194,7 +194,7 @@ export class TestFS implements vscode.FileSystemProvider { } private _lookupAsDirectory(uri: vscode.Uri, silent: boolean): Directory { - let entry = this._lookup(uri, silent); + const entry = this._lookup(uri, silent); if (entry instanceof Directory) { return entry; } @@ -202,7 +202,7 @@ export class TestFS implements vscode.FileSystemProvider { } private _lookupAsFile(uri: vscode.Uri, silent: boolean): File { - let entry = this._lookup(uri, silent); + const entry = this._lookup(uri, silent); if (entry instanceof File) { return entry; } diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/commands.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/commands.test.ts index b241b7170ec..315e94e9be4 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/commands.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/commands.test.ts @@ -11,13 +11,16 @@ import { assertNoRpc, closeAllEditors } from '../utils'; suite('vscode API - commands', () => { - teardown(assertNoRpc); + teardown(async function () { + assertNoRpc(); + await closeAllEditors(); + }); test('getCommands', function (done) { - let p1 = commands.getCommands().then(commands => { + const p1 = commands.getCommands().then(commands => { let hasOneWithUnderscore = false; - for (let command of commands) { + for (const command of commands) { if (command[0] === '_') { hasOneWithUnderscore = true; break; @@ -26,9 +29,9 @@ suite('vscode API - commands', () => { assert.ok(hasOneWithUnderscore); }, done); - let p2 = commands.getCommands(true).then(commands => { + const p2 = commands.getCommands(true).then(commands => { let hasOneWithUnderscore = false; - for (let command of commands) { + for (const command of commands) { if (command[0] === '_') { hasOneWithUnderscore = true; break; @@ -45,7 +48,7 @@ suite('vscode API - commands', () => { test('command with args', async function () { let args: IArguments; - let registration = commands.registerCommand('t1', function () { + const registration = commands.registerCommand('t1', function () { args = arguments; }); @@ -59,7 +62,7 @@ suite('vscode API - commands', () => { test('editorCommand with extra args', function () { let args: IArguments; - let registration = commands.registerTextEditorCommand('t1', function () { + const registration = commands.registerTextEditorCommand('t1', function () { args = arguments; }); @@ -79,48 +82,53 @@ suite('vscode API - commands', () => { test('api-command: vscode.diff', function () { - let registration = workspace.registerTextDocumentContentProvider('sc', { + const registration = workspace.registerTextDocumentContentProvider('sc', { provideTextDocumentContent(uri) { return `content of URI ${uri.toString()}#${Math.random()}`; } }); - let a = commands.executeCommand('vscode.diff', Uri.parse('sc:a'), Uri.parse('sc:b'), 'DIFF').then(value => { + const a = commands.executeCommand('vscode.diff', Uri.parse('sc:a'), Uri.parse('sc:b'), 'DIFF').then(value => { assert.ok(value === undefined); registration.dispose(); }); - let b = commands.executeCommand('vscode.diff', Uri.parse('sc:a'), Uri.parse('sc:b')).then(value => { + const b = commands.executeCommand('vscode.diff', Uri.parse('sc:a'), Uri.parse('sc:b')).then(value => { assert.ok(value === undefined); registration.dispose(); }); - let c = commands.executeCommand('vscode.diff', Uri.parse('sc:a'), Uri.parse('sc:b'), 'Title', { selection: new Range(new Position(1, 1), new Position(1, 2)) }).then(value => { + const c = commands.executeCommand('vscode.diff', Uri.parse('sc:a'), Uri.parse('sc:b'), 'Title', { selection: new Range(new Position(1, 1), new Position(1, 2)) }).then(value => { assert.ok(value === undefined); registration.dispose(); }); - let d = commands.executeCommand('vscode.diff').then(() => assert.ok(false), () => assert.ok(true)); - let e = commands.executeCommand('vscode.diff', 1, 2, 3).then(() => assert.ok(false), () => assert.ok(true)); + const d = commands.executeCommand('vscode.diff').then(() => assert.ok(false), () => assert.ok(true)); + const e = commands.executeCommand('vscode.diff', 1, 2, 3).then(() => assert.ok(false), () => assert.ok(true)); return Promise.all([a, b, c, d, e]); }); test('api-command: vscode.open', async function () { - let uri = Uri.parse(workspace.workspaceFolders![0].uri.toString() + '/far.js'); + assert.ok(workspace.workspaceFolders); + assert.ok(workspace.workspaceFolders.length > 0); + const uri = Uri.parse(workspace.workspaceFolders[0].uri.toString() + '/far.js'); await commands.executeCommand('vscode.open', uri); - assert.strictEqual(window.activeTextEditor?.viewColumn, ViewColumn.One); + assert.strictEqual(window.tabGroups.all.length, 1); assert.strictEqual(window.tabGroups.all[0].activeTab?.group.viewColumn, ViewColumn.One); + assert.strictEqual(window.activeTextEditor?.viewColumn, ViewColumn.One); await commands.executeCommand('vscode.open', uri, ViewColumn.Two); - assert.strictEqual(window.activeTextEditor?.viewColumn, ViewColumn.Two); + assert.strictEqual(window.tabGroups.all.length, 2); assert.strictEqual(window.tabGroups.all[1].activeTab?.group.viewColumn, ViewColumn.Two); + assert.strictEqual(window.activeTextEditor?.viewColumn, ViewColumn.Two); await commands.executeCommand('vscode.open', uri, ViewColumn.One); - assert.strictEqual(window.activeTextEditor?.viewColumn, ViewColumn.One); + assert.strictEqual(window.tabGroups.all.length, 2); assert.strictEqual(window.tabGroups.all[0].activeTab?.group.viewColumn, ViewColumn.One); + assert.strictEqual(window.activeTextEditor?.viewColumn, ViewColumn.One); let e1: Error | undefined = undefined; try { @@ -151,7 +159,7 @@ suite('vscode API - commands', () => { }); test('api-command: vscode.open with untitled supports associated resource (#138925)', async function () { - let uri = Uri.parse(workspace.workspaceFolders![0].uri.toString() + '/untitled-file.txt').with({ scheme: 'untitled' }); + const uri = Uri.parse(workspace.workspaceFolders![0].uri.toString() + '/untitled-file.txt').with({ scheme: 'untitled' }); await commands.executeCommand('vscode.open', uri).then(() => assert.ok(true), () => assert.ok(false)); // untitled with associated resource are dirty from the beginning diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/env.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/env.test.ts index a445753483d..d02e5a44442 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/env.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/env.test.ts @@ -32,7 +32,7 @@ suite('vscode API - env', () => { test('env.remoteName', function () { const remoteName = env.remoteName; const knownWorkspaceExtension = extensions.getExtension('vscode.git'); - const knownUiAndWorkspaceExtension = extensions.getExtension('vscode.image-preview'); + const knownUiAndWorkspaceExtension = extensions.getExtension('vscode.media-preview'); if (typeof remoteName === 'undefined') { // not running in remote, so we expect both extensions assert.ok(knownWorkspaceExtension); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/interactiveWindow.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/interactiveWindow.test.ts index 6880607ca7d..181068b38f6 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/interactiveWindow.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/interactiveWindow.test.ts @@ -6,22 +6,22 @@ import * as assert from 'assert'; import 'mocha'; import * as vscode from 'vscode'; -import { disposeAll } from '../utils'; -import { Kernel, saveAllFilesAndCloseAll } from './notebook.test'; +import { asPromise, disposeAll } from '../utils'; +import { Kernel, saveAllFilesAndCloseAll } from './notebook.api.test'; export type INativeInteractiveWindow = { notebookUri: vscode.Uri; inputUri: vscode.Uri; notebookEditor: vscode.NotebookEditor }; async function createInteractiveWindow(kernel: Kernel) { - const { notebookEditor } = (await vscode.commands.executeCommand( + const { notebookEditor, inputUri } = (await vscode.commands.executeCommand( 'interactive.open', // Keep focus on the owning file if there is one { viewColumn: vscode.ViewColumn.Beside, preserveFocus: false }, undefined, - kernel.controller.id, + `vscode.vscode-api-tests/${kernel.controller.id}`, undefined )) as unknown as INativeInteractiveWindow; - return notebookEditor; + return { notebookEditor, inputUri }; } async function addCell(code: string, notebook: vscode.NotebookDocument) { @@ -33,9 +33,11 @@ async function addCell(code: string, notebook: vscode.NotebookDocument) { return notebook.cellAt(notebook.cellCount - 1); } -async function addCellAndRun(code: string, notebook: vscode.NotebookDocument) { +async function addCellAndRun(code: string, notebook: vscode.NotebookDocument, i: number) { const cell = await addCell(code, notebook); - await vscode.commands.executeCommand('notebook.execute'); + const event = asPromise(vscode.workspace.onDidChangeNotebookDocument); + await vscode.commands.executeCommand('notebook.cell.execute', { start: i, end: i + 1 }); + await event; assert.strictEqual(cell.outputs.length, 1, 'execute failed'); return cell; } @@ -45,11 +47,13 @@ async function addCellAndRun(code: string, notebook: vscode.NotebookDocument) { const testDisposables: vscode.Disposable[] = []; let defaultKernel: Kernel; + let secondKernel: Kernel; setup(async function () { - // there should be ONE default kernel in this suite defaultKernel = new Kernel('mainKernel', 'Notebook Default Kernel', 'interactive'); + secondKernel = new Kernel('secondKernel', 'Notebook Secondary Kernel', 'interactive'); testDisposables.push(defaultKernel.controller); + testDisposables.push(secondKernel.controller); await saveAllFilesAndCloseAll(); }); @@ -59,13 +63,18 @@ async function addCellAndRun(code: string, notebook: vscode.NotebookDocument) { await saveAllFilesAndCloseAll(); }); - test('Can open an interactive window', async () => { + test('Can open an interactive window and execute from input box', async () => { assert.ok(vscode.workspace.workspaceFolders); - const notebookEditor = await createInteractiveWindow(defaultKernel); + const { notebookEditor, inputUri } = await createInteractiveWindow(defaultKernel); assert.ok(notebookEditor); - // Try adding a cell and running it. - await addCell('print foo', notebookEditor.notebook); + const inputBox = vscode.window.visibleTextEditors.find( + (e) => e.document.uri.path === inputUri.path + ); + await inputBox!.edit((editBuilder) => { + editBuilder.insert(new vscode.Position(0, 0), 'print foo'); + }); + await vscode.commands.executeCommand('interactive.execute', notebookEditor.notebook.uri); assert.strictEqual(notebookEditor.notebook.cellCount, 1); assert.strictEqual(notebookEditor.notebook.cellAt(0).kind, vscode.NotebookCellKind.Code); @@ -73,16 +82,34 @@ async function addCellAndRun(code: string, notebook: vscode.NotebookDocument) { test('Interactive window scrolls after execute', async () => { assert.ok(vscode.workspace.workspaceFolders); - const notebookEditor = await createInteractiveWindow(defaultKernel); + const { notebookEditor } = await createInteractiveWindow(defaultKernel); assert.ok(notebookEditor); // Run and add a bunch of cells - for (let i = 0; i < 20; i++) { - await addCellAndRun(`print ${i}`, notebookEditor.notebook); + for (let i = 0; i < 10; i++) { + await addCellAndRun(`print ${i}`, notebookEditor.notebook, i); } // Verify visible range has the last cell assert.strictEqual(notebookEditor.visibleRanges[notebookEditor.visibleRanges.length - 1].end, notebookEditor.notebook.cellCount, `Last cell is not visible`); }); + + test('Interactive window has the correct kernel', async () => { + assert.ok(vscode.workspace.workspaceFolders); + const { notebookEditor } = await createInteractiveWindow(defaultKernel); + assert.ok(notebookEditor); + + await vscode.commands.executeCommand('workbench.action.closeActiveEditor'); + + // Create a new interactive window with a different kernel + const { notebookEditor: notebookEditor2 } = await createInteractiveWindow(secondKernel); + assert.ok(notebookEditor2); + + // Verify the kernel is the secondary one + await addCellAndRun(`print`, notebookEditor2.notebook, 0); + + assert.strictEqual(secondKernel.associatedNotebooks.has(notebookEditor2.notebook.uri.toString()), true, `Secondary kernel was not set as the kernel for the interactive window`); + + }); }); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/ipynb.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/ipynb.test.ts index 44359de5e84..b73025ab2e7 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/ipynb.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/ipynb.test.ts @@ -18,9 +18,9 @@ import * as vscode from 'vscode'; const notebookEditor = vscode.window.activeNotebookEditor; assert.ok(notebookEditor); - assert.strictEqual(notebookEditor.document.cellCount, 2); - assert.strictEqual(notebookEditor.document.cellAt(0).kind, vscode.NotebookCellKind.Markup); - assert.strictEqual(notebookEditor.document.cellAt(1).kind, vscode.NotebookCellKind.Code); - assert.strictEqual(notebookEditor.document.cellAt(1).outputs.length, 1); + assert.strictEqual(notebookEditor.notebook.cellCount, 2); + assert.strictEqual(notebookEditor.notebook.cellAt(0).kind, vscode.NotebookCellKind.Markup); + assert.strictEqual(notebookEditor.notebook.cellAt(1).kind, vscode.NotebookCellKind.Code); + assert.strictEqual(notebookEditor.notebook.cellAt(1).outputs.length, 1); }); }); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/languages.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/languages.test.ts index dd30fce0aa4..16a000969fb 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/languages.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/languages.test.ts @@ -33,7 +33,7 @@ suite('vscode API - languages', () => { let clock = 0; const disposables: vscode.Disposable[] = []; - let close = new Promise(resolve => { + const close = new Promise(resolve => { disposables.push(vscode.workspace.onDidCloseTextDocument(e => { if (e === doc) { assert.strictEqual(doc.languageId, langIdNow); @@ -43,7 +43,7 @@ suite('vscode API - languages', () => { } })); }); - let open = new Promise(resolve => { + const open = new Promise(resolve => { disposables.push(vscode.workspace.onDidOpenTextDocument(e => { if (e === doc) { // same instance! assert.strictEqual(doc.languageId, 'json'); @@ -53,7 +53,7 @@ suite('vscode API - languages', () => { } })); }); - let change = vscode.languages.setTextDocumentLanguage(doc, 'json'); + const change = vscode.languages.setTextDocumentLanguage(doc, 'json'); await Promise.all([change, close, open]); assert.strictEqual(clock, 2); assert.strictEqual(doc.languageId, 'json'); @@ -74,19 +74,19 @@ suite('vscode API - languages', () => { }); test('diagnostics, read & event', function () { - let uri = vscode.Uri.file('/foo/bar.txt'); - let col1 = vscode.languages.createDiagnosticCollection('foo1'); + const uri = vscode.Uri.file('/foo/bar.txt'); + const col1 = vscode.languages.createDiagnosticCollection('foo1'); col1.set(uri, [new vscode.Diagnostic(new vscode.Range(0, 0, 0, 12), 'error1')]); - let col2 = vscode.languages.createDiagnosticCollection('foo2'); + const col2 = vscode.languages.createDiagnosticCollection('foo2'); col2.set(uri, [new vscode.Diagnostic(new vscode.Range(0, 0, 0, 12), 'error1')]); - let diag = vscode.languages.getDiagnostics(uri); + const diag = vscode.languages.getDiagnostics(uri); assert.strictEqual(diag.length, 2); - let tuples = vscode.languages.getDiagnostics(); + const tuples = vscode.languages.getDiagnostics(); let found = false; - for (let [thisUri,] of tuples) { + for (const [thisUri,] of tuples) { if (thisUri.toString() === uri.toString()) { found = true; break; @@ -96,6 +96,8 @@ suite('vscode API - languages', () => { assert.ok(found); }); + // HINT: If this test fails, and you have been modifying code used in workers, you might have + // accidentally broken the workers. Check the logs for errors. test('link detector', async function () { const uri = await createRandomFile('class A { // http://a.com }', undefined, '.java'); const doc = await vscode.workspace.openTextDocument(uri); @@ -112,7 +114,7 @@ suite('vscode API - languages', () => { const links = await vscode.commands.executeCommand('vscode.executeLinkProvider', doc.uri); assert.strictEqual(links && links.length, 2, links.map(l => !l.target).join(', ')); - let [link1, link2] = links!.sort((l1, l2) => l1.range.start.compareTo(l2.range.start)); + const [link1, link2] = links!.sort((l1, l2) => l1.range.start.compareTo(l2.range.start)); assert.strictEqual(link1.target && link1.target.toString(), target.toString()); assertEqualRange(link1.range, range); @@ -130,17 +132,17 @@ suite('vscode API - languages', () => { } } - let diag1 = new vscode.Diagnostic(new vscode.Range(0, 0, 0, 5), 'montag'); - let diag2 = new D2(); + const diag1 = new vscode.Diagnostic(new vscode.Range(0, 0, 0, 5), 'montag'); + const diag2 = new D2(); let ran = false; - let uri = vscode.Uri.parse('ttt:path.far'); + const uri = vscode.Uri.parse('ttt:path.far'); - let r1 = vscode.languages.registerCodeActionsProvider({ pattern: '*.far', scheme: 'ttt' }, { + const r1 = vscode.languages.registerCodeActionsProvider({ pattern: '*.far', scheme: 'ttt' }, { provideCodeActions(_document, _range, ctx): vscode.Command[] { assert.strictEqual(ctx.diagnostics.length, 2); - let [first, second] = ctx.diagnostics; + const [first, second] = ctx.diagnostics; assert.ok(first === diag1); assert.ok(second === diag2); assert.ok(diag2 instanceof D2); @@ -149,16 +151,16 @@ suite('vscode API - languages', () => { } }); - let r2 = vscode.workspace.registerTextDocumentContentProvider('ttt', { + const r2 = vscode.workspace.registerTextDocumentContentProvider('ttt', { provideTextDocumentContent() { return 'this is some text'; } }); - let r3 = vscode.languages.createDiagnosticCollection(); + const r3 = vscode.languages.createDiagnosticCollection(); r3.set(uri, [diag1]); - let r4 = vscode.languages.createDiagnosticCollection(); + const r4 = vscode.languages.createDiagnosticCollection(); r4.set(uri, [diag2]); await vscode.workspace.openTextDocument(uri); @@ -169,13 +171,13 @@ suite('vscode API - languages', () => { test('completions with document filters', async function () { let ran = false; - let uri = vscode.Uri.file(join(vscode.workspace.rootPath || '', './bower.json')); + const uri = vscode.Uri.file(join(vscode.workspace.rootPath || '', './bower.json')); - let jsonDocumentFilter = [{ language: 'json', pattern: '**/package.json' }, { language: 'json', pattern: '**/bower.json' }, { language: 'json', pattern: '**/.bower.json' }]; + const jsonDocumentFilter = [{ language: 'json', pattern: '**/package.json' }, { language: 'json', pattern: '**/bower.json' }, { language: 'json', pattern: '**/.bower.json' }]; - let r1 = vscode.languages.registerCompletionItemProvider(jsonDocumentFilter, { + const r1 = vscode.languages.registerCompletionItemProvider(jsonDocumentFilter, { provideCompletionItems: (_document: vscode.TextDocument, _position: vscode.Position, _token: vscode.CancellationToken): vscode.CompletionItem[] => { - let proposal = new vscode.CompletionItem('foo'); + const proposal = new vscode.CompletionItem('foo'); proposal.kind = vscode.CompletionItemKind.Property; ran = true; return [proposal]; diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.api.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.api.test.ts new file mode 100644 index 00000000000..51b82032c77 --- /dev/null +++ b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.api.test.ts @@ -0,0 +1,309 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as assert from 'assert'; +import 'mocha'; +import { TextDecoder, TextEncoder } from 'util'; +import * as vscode from 'vscode'; +import { asPromise, assertNoRpc, closeAllEditors, createRandomFile, disposeAll, revertAllDirty, saveAllEditors } from '../utils'; + +async function createRandomNotebookFile() { + return createRandomFile('', undefined, '.vsctestnb'); +} + +async function openRandomNotebookDocument() { + const uri = await createRandomNotebookFile(); + return vscode.workspace.openNotebookDocument(uri); +} + +export async function saveAllFilesAndCloseAll() { + await saveAllEditors(); + await closeAllEditors(); +} + + +function sleep(ms: number): Promise { + return new Promise(resolve => { + setTimeout(resolve, ms); + }); +} + +export class Kernel { + + readonly controller: vscode.NotebookController; + + readonly associatedNotebooks = new Set(); + + constructor(id: string, label: string, viewType: string = 'notebookCoreTest') { + this.controller = vscode.notebooks.createNotebookController(id, viewType, label); + this.controller.executeHandler = this._execute.bind(this); + this.controller.supportsExecutionOrder = true; + this.controller.supportedLanguages = ['typescript', 'javascript']; + this.controller.onDidChangeSelectedNotebooks(e => { + if (e.selected) { + this.associatedNotebooks.add(e.notebook.uri.toString()); + } else { + this.associatedNotebooks.delete(e.notebook.uri.toString()); + } + }); + } + + protected async _execute(cells: vscode.NotebookCell[]): Promise { + for (const cell of cells) { + await this._runCell(cell); + } + } + + protected async _runCell(cell: vscode.NotebookCell) { + // create a single output with exec order 1 and output is plain/text + // of either the cell itself or (iff empty) the cell's document's uri + const task = this.controller.createNotebookCellExecution(cell); + task.start(Date.now()); + task.executionOrder = 1; + await sleep(10); // Force to be take some time + await task.replaceOutput([new vscode.NotebookCellOutput([ + vscode.NotebookCellOutputItem.text(cell.document.getText() || cell.document.uri.toString(), 'text/plain') + ])]); + task.end(true); + } +} + + +function getFocusedCell(editor?: vscode.NotebookEditor) { + return editor ? editor.notebook.cellAt(editor.selections[0].start) : undefined; +} + +const apiTestContentProvider: vscode.NotebookContentProvider = { + openNotebook: async (resource: vscode.Uri): Promise => { + if (/.*empty\-.*\.vsctestnb$/.test(resource.path)) { + return { + metadata: {}, + cells: [] + }; + } + + const dto: vscode.NotebookData = { + metadata: { custom: { testMetadata: false } }, + cells: [ + { + value: 'test', + languageId: 'typescript', + kind: vscode.NotebookCellKind.Code, + outputs: [], + metadata: { custom: { testCellMetadata: 123 } }, + executionSummary: { timing: { startTime: 10, endTime: 20 } } + }, + { + value: 'test2', + languageId: 'typescript', + kind: vscode.NotebookCellKind.Code, + outputs: [ + new vscode.NotebookCellOutput([ + vscode.NotebookCellOutputItem.text('Hello World', 'text/plain') + ], + { + testOutputMetadata: true, + ['text/plain']: { testOutputItemMetadata: true } + }) + ], + executionSummary: { executionOrder: 5, success: true }, + metadata: { custom: { testCellMetadata: 456 } } + } + ] + }; + return dto; + }, +}; + +(vscode.env.uiKind === vscode.UIKind.Web ? suite.skip : suite)('Notebook API tests', function () { + + const testDisposables: vscode.Disposable[] = []; + const suiteDisposables: vscode.Disposable[] = []; + + suiteTeardown(async function () { + + assertNoRpc(); + + await revertAllDirty(); + await closeAllEditors(); + + disposeAll(suiteDisposables); + suiteDisposables.length = 0; + }); + + suiteSetup(function () { + suiteDisposables.push(vscode.workspace.registerNotebookContentProvider('notebookCoreTest', apiTestContentProvider)); + }); + + let defaultKernel: Kernel; + + setup(async function () { + // there should be ONE default kernel in this suite + defaultKernel = new Kernel('mainKernel', 'Notebook Default Kernel'); + testDisposables.push(defaultKernel.controller); + await saveAllFilesAndCloseAll(); + }); + + teardown(async function () { + disposeAll(testDisposables); + testDisposables.length = 0; + await saveAllFilesAndCloseAll(); + }); + + test('notebook open', async function () { + const notebook = await openRandomNotebookDocument(); + const editor = await vscode.window.showNotebookDocument(notebook); + assert.strictEqual(getFocusedCell(editor)?.document.getText(), 'test'); + assert.strictEqual(getFocusedCell(editor)?.document.languageId, 'typescript'); + + const secondCell = editor.notebook.cellAt(1); + assert.strictEqual(secondCell.outputs.length, 1); + assert.deepStrictEqual(secondCell.outputs[0].metadata, { testOutputMetadata: true, ['text/plain']: { testOutputItemMetadata: true } }); + assert.strictEqual(secondCell.outputs[0].items.length, 1); + assert.strictEqual(secondCell.outputs[0].items[0].mime, 'text/plain'); + assert.strictEqual(new TextDecoder().decode(secondCell.outputs[0].items[0].data), 'Hello World'); + assert.strictEqual(secondCell.executionSummary?.executionOrder, 5); + assert.strictEqual(secondCell.executionSummary?.success, true); + }); + + test('multiple tabs: different editors with same document', async function () { + const notebook = await openRandomNotebookDocument(); + const firstNotebookEditor = await vscode.window.showNotebookDocument(notebook, { viewColumn: vscode.ViewColumn.One }); + const secondNotebookEditor = await vscode.window.showNotebookDocument(notebook, { viewColumn: vscode.ViewColumn.Beside }); + assert.notStrictEqual(firstNotebookEditor, secondNotebookEditor); + assert.strictEqual(firstNotebookEditor?.notebook, secondNotebookEditor?.notebook, 'split notebook editors share the same document'); + }); + + test('#106657. Opening a notebook from markers view is broken ', async function () { + + const document = await openRandomNotebookDocument(); + const [cell] = document.getCells(); + + assert.strictEqual(vscode.window.activeNotebookEditor, undefined); + + // opening a cell-uri opens a notebook editor + await vscode.window.showTextDocument(cell.document, { viewColumn: vscode.ViewColumn.Active }); + // await vscode.commands.executeCommand('vscode.open', cell.document.uri, vscode.ViewColumn.Active); + + assert.strictEqual(!!vscode.window.activeNotebookEditor, true); + assert.strictEqual(vscode.window.activeNotebookEditor!.notebook.uri.toString(), document.uri.toString()); + }); + + test('Cannot open notebook from cell-uri with vscode.open-command', async function () { + + const document = await openRandomNotebookDocument(); + const [cell] = document.getCells(); + + await saveAllFilesAndCloseAll(); + assert.strictEqual(vscode.window.activeNotebookEditor, undefined); + + // BUG is that the editor opener (https://github.com/microsoft/vscode/blob/8e7877bdc442f1e83a7fec51920d82b696139129/src/vs/editor/browser/services/openerService.ts#L69) + // removes the fragment if it matches something numeric. For notebooks that's not wanted... + // opening a cell-uri opens a notebook editor + await vscode.commands.executeCommand('vscode.open', cell.document.uri); + + assert.strictEqual(vscode.window.activeNotebookEditor!.notebook.uri.toString(), document.uri.toString()); + }); + + test('#97830, #97764. Support switch to other editor types', async function () { + const notebook = await openRandomNotebookDocument(); + const editor = await vscode.window.showNotebookDocument(notebook); + const edit = new vscode.WorkspaceEdit(); + const focusedCell = getFocusedCell(editor); + assert.ok(focusedCell); + edit.replace(focusedCell.document.uri, focusedCell.document.lineAt(0).range, 'var abc = 0;'); + await vscode.workspace.applyEdit(edit); + + assert.strictEqual(getFocusedCell(editor)?.document.getText(), 'var abc = 0;'); + + // no kernel -> no default language + assert.strictEqual(getFocusedCell(editor)?.document.languageId, 'typescript'); + + await vscode.commands.executeCommand('vscode.openWith', notebook.uri, 'default'); + assert.strictEqual(vscode.window.activeTextEditor?.document.uri.path, notebook.uri.path); + }); + + test('#102411 - untitled notebook creation failed', async function () { + await vscode.commands.executeCommand('workbench.action.files.newUntitledFile', { viewType: 'notebookCoreTest' }); + assert.notStrictEqual(vscode.window.activeNotebookEditor, undefined, 'untitled notebook editor is not undefined'); + + await closeAllEditors(); + }); + + // TODO: Skipped due to notebook content provider removal + test.skip('#115855 onDidSaveNotebookDocument', async function () { + const resource = await createRandomNotebookFile(); + const notebook = await vscode.workspace.openNotebookDocument(resource); + + const notebookEdit = new vscode.NotebookEdit(new vscode.NotebookRange(1, 1), [new vscode.NotebookCellData(vscode.NotebookCellKind.Code, 'test 2', 'javascript')]); + const edit = new vscode.WorkspaceEdit(); + edit.set(notebook.uri, [notebookEdit]); + await vscode.workspace.applyEdit(edit); + assert.strictEqual(notebook.isDirty, true); + + const saveEvent = asPromise(vscode.workspace.onDidSaveNotebookDocument); + await notebook.save(); + await saveEvent; + + assert.strictEqual(notebook.isDirty, false); + }); +}); + +suite('Notebook & LiveShare', function () { + + const suiteDisposables: vscode.Disposable[] = []; + const notebookType = 'vsls-testing'; + + suiteTeardown(() => { + vscode.Disposable.from(...suiteDisposables).dispose(); + }); + + suiteSetup(function () { + + suiteDisposables.push(vscode.workspace.registerNotebookSerializer(notebookType, new class implements vscode.NotebookSerializer { + deserializeNotebook(content: Uint8Array, _token: vscode.CancellationToken): vscode.NotebookData | Thenable { + const value = new TextDecoder().decode(content); + const cell1 = new vscode.NotebookCellData(vscode.NotebookCellKind.Code, value, 'fooLang'); + cell1.outputs = [new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stderr(value)])]; + return new vscode.NotebookData([cell1]); + } + serializeNotebook(data: vscode.NotebookData, _token: vscode.CancellationToken): Uint8Array | Thenable { + return new TextEncoder().encode(data.cells[0].value); + } + }, {}, { + displayName: 'LS', + filenamePattern: ['*'], + })); + }); + + test('command: vscode.resolveNotebookContentProviders', async function () { + + type Info = { viewType: string; displayName: string; filenamePattern: string[] }; + + const info = await vscode.commands.executeCommand('vscode.resolveNotebookContentProviders'); + assert.strictEqual(Array.isArray(info), true); + + const item = info.find(item => item.viewType === notebookType); + assert.ok(item); + assert.strictEqual(item?.viewType, notebookType); + }); + + test('command: vscode.executeDataToNotebook', async function () { + const value = 'dataToNotebook'; + const data = await vscode.commands.executeCommand('vscode.executeDataToNotebook', notebookType, new TextEncoder().encode(value)); + assert.ok(data instanceof vscode.NotebookData); + assert.strictEqual(data.cells.length, 1); + assert.strictEqual(data.cells[0].value, value); + assert.strictEqual(new TextDecoder().decode(data.cells[0].outputs![0].items[0].data), value); + }); + + test('command: vscode.executeNotebookToData', async function () { + const value = 'notebookToData'; + const notebook = new vscode.NotebookData([new vscode.NotebookCellData(vscode.NotebookCellKind.Code, value, 'fooLang')]); + const data = await vscode.commands.executeCommand('vscode.executeNotebookToData', notebookType, notebook); + assert.ok(data instanceof Uint8Array); + assert.deepStrictEqual(new TextDecoder().decode(data), value); + }); +}); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.document.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.document.test.ts index a35824f058b..e89bf64a26a 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.document.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.document.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import * as vscode from 'vscode'; import * as utils from '../utils'; -suite.skip('Notebook Document', function () { +suite('Notebook Document', function () { const simpleContentProvider = new class implements vscode.NotebookSerializer { deserializeNotebook(_data: Uint8Array): vscode.NotebookData | Thenable { @@ -26,15 +26,6 @@ suite.skip('Notebook Document', function () { [new vscode.NotebookCellData(vscode.NotebookCellKind.Code, uri.toString(), 'javascript')], ); } - async saveNotebook(_document: vscode.NotebookDocument, _cancellation: vscode.CancellationToken) { - // - } - async saveNotebookAs(_targetResource: vscode.Uri, _document: vscode.NotebookDocument, _cancellation: vscode.CancellationToken) { - // - } - async backupNotebook(_document: vscode.NotebookDocument, _context: vscode.NotebookDocumentBackupContext, _cancellation: vscode.CancellationToken) { - return { id: '', delete() { } }; - } }; const disposables: vscode.Disposable[] = []; @@ -124,7 +115,7 @@ suite.skip('Notebook Document', function () { const p = utils.asPromise(vscode.workspace.onDidOpenNotebookDocument).then(notebook => { for (let i = 0; i < notebook.cellCount; i++) { - let cell = notebook.cellAt(i); + const cell = notebook.cellAt(i); const doc = vscode.workspace.textDocuments.find(doc => doc.uri.toString() === cell.document.uri.toString()); assert.ok(doc); @@ -173,7 +164,7 @@ suite.skip('Notebook Document', function () { // inserting two new cells { const edit = new vscode.WorkspaceEdit(); - edit.replaceNotebookCells(document.uri, new vscode.NotebookRange(0, 0), [{ + edit.set(document.uri, [vscode.NotebookEdit.replaceCells(new vscode.NotebookRange(0, 0), [{ kind: vscode.NotebookCellKind.Markup, languageId: 'markdown', metadata: undefined, @@ -185,7 +176,7 @@ suite.skip('Notebook Document', function () { metadata: undefined, outputs: [], value: 'new_code' - }]); + }])]); const success = await vscode.workspace.applyEdit(edit); assert.strictEqual(success, true); @@ -198,8 +189,10 @@ suite.skip('Notebook Document', function () { // deleting cell 1 and 3 { const edit = new vscode.WorkspaceEdit(); - edit.replaceNotebookCells(document.uri, new vscode.NotebookRange(0, 1), []); - edit.replaceNotebookCells(document.uri, new vscode.NotebookRange(2, 3), []); + edit.set(document.uri, [ + vscode.NotebookEdit.replaceCells(new vscode.NotebookRange(0, 1), []), + vscode.NotebookEdit.replaceCells(new vscode.NotebookRange(2, 3), []) + ]); const success = await vscode.workspace.applyEdit(edit); assert.strictEqual(success, true); } @@ -210,7 +203,7 @@ suite.skip('Notebook Document', function () { // replacing all cells { const edit = new vscode.WorkspaceEdit(); - edit.replaceNotebookCells(document.uri, new vscode.NotebookRange(0, 1), [{ + edit.set(document.uri, [vscode.NotebookEdit.replaceCells(new vscode.NotebookRange(0, 1), [{ kind: vscode.NotebookCellKind.Markup, languageId: 'markdown', metadata: undefined, @@ -222,7 +215,7 @@ suite.skip('Notebook Document', function () { metadata: undefined, outputs: [], value: 'new2_code' - }]); + }])]); const success = await vscode.workspace.applyEdit(edit); assert.strictEqual(success, true); } @@ -233,7 +226,7 @@ suite.skip('Notebook Document', function () { // remove all cells { const edit = new vscode.WorkspaceEdit(); - edit.replaceNotebookCells(document.uri, new vscode.NotebookRange(0, document.cellCount), []); + edit.set(document.uri, [vscode.NotebookEdit.replaceCells(new vscode.NotebookRange(0, document.cellCount), [])]); const success = await vscode.workspace.applyEdit(edit); assert.strictEqual(success, true); } @@ -246,7 +239,7 @@ suite.skip('Notebook Document', function () { assert.strictEqual(document.cellCount, 1); const edit = new vscode.WorkspaceEdit(); - edit.replaceNotebookCells(document.uri, new vscode.NotebookRange(0, 0), [{ + edit.set(document.uri, [vscode.NotebookEdit.replaceCells(new vscode.NotebookRange(0, 0), [{ kind: vscode.NotebookCellKind.Markup, languageId: 'markdown', metadata: undefined, @@ -258,7 +251,7 @@ suite.skip('Notebook Document', function () { metadata: undefined, outputs: [], value: 'new_code' - }]); + }])]); const event = utils.asPromise(vscode.workspace.onDidChangeNotebookDocument); @@ -287,7 +280,7 @@ suite.skip('Notebook Document', function () { const document = await vscode.workspace.openNotebookDocument(uri); const edit = new vscode.WorkspaceEdit(); - edit.replaceNotebookCellMetadata(document.uri, 0, { inputCollapsed: true }); + edit.set(document.uri, [vscode.NotebookEdit.updateCellMetadata(0, { inputCollapsed: true })]); const success = await vscode.workspace.applyEdit(edit); assert.strictEqual(success, true); assert.strictEqual(document.cellAt(0).metadata.inputCollapsed, true); @@ -300,7 +293,7 @@ suite.skip('Notebook Document', function () { const edit = new vscode.WorkspaceEdit(); const event = utils.asPromise(vscode.workspace.onDidChangeNotebookDocument); - edit.replaceNotebookCellMetadata(document.uri, 0, { inputCollapsed: true }); + edit.set(document.uri, [vscode.NotebookEdit.updateCellMetadata(0, { inputCollapsed: true })]); const success = await vscode.workspace.applyEdit(edit); assert.strictEqual(success, true); const data = await event; @@ -315,40 +308,18 @@ suite.skip('Notebook Document', function () { assert.strictEqual(data.cellChanges[0].cell.index, 0); }); - test('document save API', async function () { + test('workspace edit API (notebookMetadata)', async function () { const uri = await utils.createRandomFile(undefined, undefined, '.nbdtest'); - const notebook = await vscode.workspace.openNotebookDocument(uri); - - assert.strictEqual(notebook.uri.toString(), uri.toString()); - assert.strictEqual(notebook.isDirty, false); - assert.strictEqual(notebook.isUntitled, false); - assert.strictEqual(notebook.cellCount, 1); - assert.strictEqual(notebook.notebookType, 'notebook.nbdtest'); + const document = await vscode.workspace.openNotebookDocument(uri); const edit = new vscode.WorkspaceEdit(); - edit.replaceNotebookCells(notebook.uri, new vscode.NotebookRange(0, 0), [{ - kind: vscode.NotebookCellKind.Markup, - languageId: 'markdown', - metadata: undefined, - outputs: [], - value: 'new_markdown' - }, { - kind: vscode.NotebookCellKind.Code, - languageId: 'fooLang', - metadata: undefined, - outputs: [], - value: 'new_code' - }]); - + const metdataEdit = vscode.NotebookEdit.updateNotebookMetadata({ ...document.metadata, custom: { ...(document.metadata.custom || {}), extraNotebookMetadata: true } }); + edit.set(document.uri, [metdataEdit]); const success = await vscode.workspace.applyEdit(edit); - assert.strictEqual(success, true); - assert.strictEqual(notebook.isDirty, true); - - await notebook.save(); - assert.strictEqual(notebook.isDirty, false); + assert.equal(success, true); + assert.ok(document.metadata.custom.extraNotebookMetadata, `Test metadata not found`); }); - test('setTextDocumentLanguage for notebook cells', async function () { const uri = await utils.createRandomFile(undefined, undefined, '.nbdtest'); @@ -381,28 +352,13 @@ suite.skip('Notebook Document', function () { assert.strictEqual(cellDoc.languageId, 'css'); }); - test('dirty state - complex', async function () { - const resource = await utils.createRandomFile(undefined, undefined, '.nbdtest'); - const document = await vscode.workspace.openNotebookDocument(resource); - assert.strictEqual(document.isDirty, false); - - const edit = new vscode.WorkspaceEdit(); - edit.replaceNotebookCells(document.uri, new vscode.NotebookRange(0, document.cellCount), []); - assert.ok(await vscode.workspace.applyEdit(edit)); - - assert.strictEqual(document.isDirty, true); - - await document.save(); - assert.strictEqual(document.isDirty, false); - }); - test('dirty state - serializer', async function () { const resource = await utils.createRandomFile(undefined, undefined, '.nbdserializer'); const document = await vscode.workspace.openNotebookDocument(resource); assert.strictEqual(document.isDirty, false); const edit = new vscode.WorkspaceEdit(); - edit.replaceNotebookCells(document.uri, new vscode.NotebookRange(0, document.cellCount), []); + edit.set(document.uri, [vscode.NotebookEdit.replaceCells(new vscode.NotebookRange(0, document.cellCount), [])]); assert.ok(await vscode.workspace.applyEdit(edit)); assert.strictEqual(document.isDirty, true); @@ -411,7 +367,7 @@ suite.skip('Notebook Document', function () { assert.strictEqual(document.isDirty, false); }); - test('onDidOpenNotebookDocument - emit event only once when opened in two editors', async function () { + test.skip('onDidOpenNotebookDocument - emit event only once when opened in two editors', async function () { // TODO@rebornix https://github.com/microsoft/vscode/issues/157222 const uri = await utils.createRandomFile(undefined, undefined, '.nbdtest'); let counter = 0; testDisposables.push(vscode.workspace.onDidOpenNotebookDocument(nb => { diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.editor.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.editor.test.ts index eeffb282f91..c00c2e45ae6 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.editor.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.editor.test.ts @@ -51,7 +51,7 @@ import * as utils from '../utils'; utils.disposeAll(disposables); disposables.length = 0; - for (let doc of vscode.workspace.notebookDocuments) { + for (const doc of vscode.workspace.notebookDocuments) { assert.strictEqual(doc.isDirty, false, doc.uri.toString()); } }); @@ -65,57 +65,27 @@ import * as utils from '../utils'; testDisposables.length = 0; }); - test.skip('showNotebookDocument', async function () { // TODO@rebornix https://github.com/microsoft/vscode/issues/139078 - - const notebookDocumentsFromOnDidOpen = new Set(); - const sub = vscode.workspace.onDidOpenNotebookDocument(e => { - notebookDocumentsFromOnDidOpen.add(e); - }); - - const uri = await utils.createRandomFile(undefined, undefined, '.nbdtest'); - - const editor = await vscode.window.showNotebookDocument(uri); - assert.strictEqual(uri.toString(), editor.document.uri.toString()); - - assert.strictEqual(notebookDocumentsFromOnDidOpen.has(editor.document), true); - - const includes = vscode.workspace.notebookDocuments.includes(editor.document); - assert.strictEqual(true, includes); - - sub.dispose(); - }); - - // TODO@rebornix deal with getting started - test.skip('notebook editor has viewColumn', async function () { - - const uri1 = await utils.createRandomFile(undefined, undefined, '.nbdtest'); - const editor1 = await vscode.window.showNotebookDocument(uri1); - - assert.strictEqual(editor1.viewColumn, vscode.ViewColumn.One); - - const uri2 = await utils.createRandomFile(undefined, undefined, '.nbdtest'); - const editor2 = await vscode.window.showNotebookDocument(uri2, { viewColumn: vscode.ViewColumn.Beside }); - assert.strictEqual(editor2.viewColumn, vscode.ViewColumn.Two); - }); - // #138683 test('Opening a notebook should fire activeNotebook event changed only once', async function () { const openedEditor = onDidOpenNotebookEditor(); const resource = await utils.createRandomFile(undefined, undefined, '.nbdtest'); - const editor = await vscode.window.showNotebookDocument(resource); + const document = await vscode.workspace.openNotebookDocument(resource); + const editor = await vscode.window.showNotebookDocument(document); assert.ok(await openedEditor); - assert.strictEqual(editor.document.uri.toString(), resource.toString()); + assert.strictEqual(editor.notebook.uri.toString(), resource.toString()); }); test('Active/Visible Editor', async function () { const firstEditorOpen = onDidOpenNotebookEditor(); const resource = await utils.createRandomFile(undefined, undefined, '.nbdtest'); - const firstEditor = await vscode.window.showNotebookDocument(resource); + const document = await vscode.workspace.openNotebookDocument(resource); + + const firstEditor = await vscode.window.showNotebookDocument(document); await firstEditorOpen; assert.strictEqual(vscode.window.activeNotebookEditor, firstEditor); assert.strictEqual(vscode.window.visibleNotebookEditors.includes(firstEditor), true); - const secondEditor = await vscode.window.showNotebookDocument(resource, { viewColumn: vscode.ViewColumn.Beside }); + const secondEditor = await vscode.window.showNotebookDocument(document, { viewColumn: vscode.ViewColumn.Beside }); // There is no guarantee that when `showNotebookDocument` resolves, the active notebook editor is already updated correctly. // assert.strictEqual(secondEditor === vscode.window.activeNotebookEditor, true); assert.notStrictEqual(firstEditor, secondEditor); @@ -128,7 +98,8 @@ import * as utils from '../utils'; test('Notebook Editor Event - onDidChangeVisibleNotebookEditors on open/close', async function () { const openedEditor = utils.asPromise(vscode.window.onDidChangeVisibleNotebookEditors); const resource = await utils.createRandomFile(undefined, undefined, '.nbdtest'); - await vscode.window.showNotebookDocument(resource); + const document = await vscode.workspace.openNotebookDocument(resource); + await vscode.window.showNotebookDocument(document); assert.ok(await openedEditor); const firstEditorClose = utils.asPromise(vscode.window.onDidChangeVisibleNotebookEditors); @@ -138,15 +109,17 @@ import * as utils from '../utils'; test('Notebook Editor Event - onDidChangeVisibleNotebookEditors on two editor groups', async function () { const resource = await utils.createRandomFile(undefined, undefined, '.nbdtest'); + const document = await vscode.workspace.openNotebookDocument(resource); + let count = 0; testDisposables.push(vscode.window.onDidChangeVisibleNotebookEditors(() => { count = vscode.window.visibleNotebookEditors.length; })); - await vscode.window.showNotebookDocument(resource, { viewColumn: vscode.ViewColumn.Active }); + await vscode.window.showNotebookDocument(document, { viewColumn: vscode.ViewColumn.Active }); assert.strictEqual(count, 1); - await vscode.window.showNotebookDocument(resource, { viewColumn: vscode.ViewColumn.Beside }); + await vscode.window.showNotebookDocument(document, { viewColumn: vscode.ViewColumn.Beside }); assert.strictEqual(count, 2); await utils.closeAllEditors(); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.kernel.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.kernel.test.ts new file mode 100644 index 00000000000..fa92d91e8a2 --- /dev/null +++ b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.kernel.test.ts @@ -0,0 +1,482 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as assert from 'assert'; +import 'mocha'; +import { TextDecoder } from 'util'; +import * as vscode from 'vscode'; +import { asPromise, assertNoRpc, closeAllEditors, createRandomFile, DeferredPromise, disposeAll, revertAllDirty, saveAllEditors } from '../utils'; + +async function createRandomNotebookFile() { + return createRandomFile('', undefined, '.vsctestnb'); +} + +async function openRandomNotebookDocument() { + const uri = await createRandomNotebookFile(); + return vscode.workspace.openNotebookDocument(uri); +} + +export async function saveAllFilesAndCloseAll() { + await saveAllEditors(); + await closeAllEditors(); +} + +async function withEvent(event: vscode.Event, callback: (e: Promise) => Promise) { + const e = asPromise(event); + await callback(e); +} + + +function sleep(ms: number): Promise { + return new Promise(resolve => { + setTimeout(resolve, ms); + }); +} + +export class Kernel { + + readonly controller: vscode.NotebookController; + + readonly associatedNotebooks = new Set(); + + constructor(id: string, label: string, viewType: string = 'notebookCoreTest') { + this.controller = vscode.notebooks.createNotebookController(id, viewType, label); + this.controller.executeHandler = this._execute.bind(this); + this.controller.supportsExecutionOrder = true; + this.controller.supportedLanguages = ['typescript', 'javascript']; + this.controller.onDidChangeSelectedNotebooks(e => { + if (e.selected) { + this.associatedNotebooks.add(e.notebook.uri.toString()); + } else { + this.associatedNotebooks.delete(e.notebook.uri.toString()); + } + }); + } + + protected async _execute(cells: vscode.NotebookCell[]): Promise { + for (const cell of cells) { + await this._runCell(cell); + } + } + + protected async _runCell(cell: vscode.NotebookCell) { + // create a single output with exec order 1 and output is plain/text + // of either the cell itself or (iff empty) the cell's document's uri + const task = this.controller.createNotebookCellExecution(cell); + task.start(Date.now()); + task.executionOrder = 1; + await sleep(10); // Force to be take some time + await task.replaceOutput([new vscode.NotebookCellOutput([ + vscode.NotebookCellOutputItem.text(cell.document.getText() || cell.document.uri.toString(), 'text/plain') + ])]); + task.end(true); + } +} + + +async function assertKernel(kernel: Kernel, notebook: vscode.NotebookDocument): Promise { + const success = await vscode.commands.executeCommand('notebook.selectKernel', { + extension: 'vscode.vscode-api-tests', + id: kernel.controller.id + }); + assert.ok(success, `expected selected kernel to be ${kernel.controller.id}`); + assert.ok(kernel.associatedNotebooks.has(notebook.uri.toString())); +} + +const apiTestContentProvider: vscode.NotebookContentProvider = { + openNotebook: async (resource: vscode.Uri): Promise => { + if (/.*empty\-.*\.vsctestnb$/.test(resource.path)) { + return { + metadata: {}, + cells: [] + }; + } + + const dto: vscode.NotebookData = { + metadata: { custom: { testMetadata: false } }, + cells: [ + { + value: 'test', + languageId: 'typescript', + kind: vscode.NotebookCellKind.Code, + outputs: [], + metadata: { custom: { testCellMetadata: 123 } }, + executionSummary: { timing: { startTime: 10, endTime: 20 } } + }, + { + value: 'test2', + languageId: 'typescript', + kind: vscode.NotebookCellKind.Code, + outputs: [ + new vscode.NotebookCellOutput([ + vscode.NotebookCellOutputItem.text('Hello World', 'text/plain') + ], + { + testOutputMetadata: true, + ['text/plain']: { testOutputItemMetadata: true } + }) + ], + executionSummary: { executionOrder: 5, success: true }, + metadata: { custom: { testCellMetadata: 456 } } + } + ] + }; + return dto; + } +}; + +(vscode.env.uiKind === vscode.UIKind.Web ? suite.skip : suite)('Notebook Kernel API tests', function () { + + const testDisposables: vscode.Disposable[] = []; + const suiteDisposables: vscode.Disposable[] = []; + + suiteTeardown(async function () { + + assertNoRpc(); + + await revertAllDirty(); + await closeAllEditors(); + + disposeAll(suiteDisposables); + suiteDisposables.length = 0; + }); + + suiteSetup(function () { + suiteDisposables.push(vscode.workspace.registerNotebookContentProvider('notebookCoreTest', apiTestContentProvider)); + }); + + let defaultKernel: Kernel; + + setup(async function () { + // there should be ONE default kernel in this suite + defaultKernel = new Kernel('mainKernel', 'Notebook Default Kernel'); + testDisposables.push(defaultKernel.controller); + await saveAllFilesAndCloseAll(); + }); + + teardown(async function () { + disposeAll(testDisposables); + testDisposables.length = 0; + await saveAllFilesAndCloseAll(); + }); + + test('cell execute command takes arguments', async () => { + const notebook = await openRandomNotebookDocument(); + await vscode.window.showNotebookDocument(notebook); + assert.strictEqual(vscode.window.activeNotebookEditor !== undefined, true, 'notebook first'); + const editor = vscode.window.activeNotebookEditor!; + const cell = editor.notebook.cellAt(0); + + await withEvent(vscode.workspace.onDidChangeNotebookDocument, async event => { + await vscode.commands.executeCommand('notebook.execute'); + await event; + assert.strictEqual(cell.outputs.length, 1, 'should execute'); // runnable, it worked + }); + + await withEvent(vscode.workspace.onDidChangeNotebookDocument, async event => { + await vscode.commands.executeCommand('notebook.cell.clearOutputs'); + await event; + assert.strictEqual(cell.outputs.length, 0, 'should clear'); + }); + + const secondResource = await createRandomNotebookFile(); + await vscode.commands.executeCommand('vscode.openWith', secondResource, 'notebookCoreTest'); + + await withEvent(vscode.workspace.onDidChangeNotebookDocument, async event => { + await vscode.commands.executeCommand('notebook.cell.execute', { start: 0, end: 1 }, notebook.uri); + await event; + assert.strictEqual(cell.outputs.length, 1, 'should execute'); // runnable, it worked + assert.strictEqual(vscode.window.activeNotebookEditor?.notebook.uri.fsPath, secondResource.fsPath); + }); + }); + + test('cell execute command takes arguments 2', async () => { + const notebook = await openRandomNotebookDocument(); + await vscode.window.showNotebookDocument(notebook); + + let firstCellExecuted = false; + let secondCellExecuted = false; + + const def = new DeferredPromise(); + testDisposables.push(vscode.workspace.onDidChangeNotebookDocument(e => { + e.cellChanges.forEach(change => { + if (change.cell.index === 0 && change.executionSummary) { + firstCellExecuted = true; + } + + if (change.cell.index === 1 && change.executionSummary) { + secondCellExecuted = true; + } + }); + + if (firstCellExecuted && secondCellExecuted) { + def.complete(); + } + })); + + vscode.commands.executeCommand('notebook.cell.execute', { document: notebook.uri, ranges: [{ start: 0, end: 1 }, { start: 1, end: 2 }] }); + + await def.p; + await saveAllFilesAndCloseAll(); + }); + + test('document execute command takes arguments', async () => { + const notebook = await openRandomNotebookDocument(); + await vscode.window.showNotebookDocument(notebook); + assert.strictEqual(vscode.window.activeNotebookEditor !== undefined, true, 'notebook first'); + const editor = vscode.window.activeNotebookEditor!; + const cell = editor.notebook.cellAt(0); + + await withEvent(vscode.workspace.onDidChangeNotebookDocument, async (event) => { + await vscode.commands.executeCommand('notebook.execute', notebook.uri); + await event; + assert.strictEqual(cell.outputs.length, 1, 'should execute'); // runnable, it worked + }); + }); + + test('cell execute and select kernel', async function () { + const notebook = await openRandomNotebookDocument(); + const editor = await vscode.window.showNotebookDocument(notebook); + assert.strictEqual(vscode.window.activeNotebookEditor === editor, true, 'notebook first'); + + const cell = editor.notebook.cellAt(0); + + const alternativeKernel = new class extends Kernel { + constructor() { + super('secondaryKernel', 'Notebook Secondary Test Kernel'); + this.controller.supportsExecutionOrder = false; + } + + override async _runCell(cell: vscode.NotebookCell) { + const task = this.controller.createNotebookCellExecution(cell); + task.start(); + await task.replaceOutput([new vscode.NotebookCellOutput([ + vscode.NotebookCellOutputItem.text('my second output', 'text/plain') + ])]); + task.end(true); + } + }; + testDisposables.push(alternativeKernel.controller); + + await withEvent(vscode.workspace.onDidChangeNotebookDocument, async (event) => { + await assertKernel(defaultKernel, notebook); + await vscode.commands.executeCommand('notebook.cell.execute'); + await event; + assert.strictEqual(cell.outputs.length, 1, 'should execute'); // runnable, it worked + assert.strictEqual(cell.outputs[0].items.length, 1); + assert.strictEqual(cell.outputs[0].items[0].mime, 'text/plain'); + assert.deepStrictEqual(new TextDecoder().decode(cell.outputs[0].items[0].data), cell.document.getText()); + }); + + await withEvent(vscode.workspace.onDidChangeNotebookDocument, async (event) => { + await assertKernel(alternativeKernel, notebook); + await vscode.commands.executeCommand('notebook.cell.execute'); + await event; + assert.strictEqual(cell.outputs.length, 1, 'should execute'); // runnable, it worked + assert.strictEqual(cell.outputs[0].items.length, 1); + assert.strictEqual(cell.outputs[0].items[0].mime, 'text/plain'); + assert.deepStrictEqual(new TextDecoder().decode(cell.outputs[0].items[0].data), 'my second output'); + }); + }); + + test('onDidChangeCellExecutionState is fired', async () => { + const notebook = await openRandomNotebookDocument(); + const editor = await vscode.window.showNotebookDocument(notebook); + const cell = editor.notebook.cellAt(0); + + let eventCount = 0; + const def = new DeferredPromise(); + testDisposables.push(vscode.notebooks.onDidChangeNotebookCellExecutionState(e => { + try { + assert.strictEqual(e.cell.document.uri.toString(), cell.document.uri.toString(), 'event should be fired for the executing cell'); + + if (eventCount === 0) { + assert.strictEqual(e.state, vscode.NotebookCellExecutionState.Pending, 'should be set to Pending'); + } else if (eventCount === 1) { + assert.strictEqual(e.state, vscode.NotebookCellExecutionState.Executing, 'should be set to Executing'); + assert.strictEqual(cell.outputs.length, 0, 'no outputs yet: ' + JSON.stringify(cell.outputs[0])); + } else if (e.state === vscode.NotebookCellExecutionState.Idle) { + assert.strictEqual(cell.outputs.length, 1, 'should have an output'); + def.complete(); + } + + eventCount++; + } catch (err) { + def.error(err); + } + })); + + vscode.commands.executeCommand('notebook.cell.execute', { document: notebook.uri, ranges: [{ start: 0, end: 1 }] }); + + await def.p; + }); + + test('Output changes are applied once the promise resolves', async function () { + + let called = false; + + const verifyOutputSyncKernel = new class extends Kernel { + + constructor() { + super('verifyOutputSyncKernel', ''); + } + + override async _execute(cells: vscode.NotebookCell[]) { + const [cell] = cells; + const task = this.controller.createNotebookCellExecution(cell); + task.start(); + await task.replaceOutput([new vscode.NotebookCellOutput([ + vscode.NotebookCellOutputItem.text('Some output', 'text/plain') + ])]); + assert.strictEqual(cell.notebook.cellAt(0).outputs.length, 1); + assert.deepStrictEqual(new TextDecoder().decode(cell.notebook.cellAt(0).outputs[0].items[0].data), 'Some output'); + task.end(undefined); + called = true; + } + }; + + const notebook = await openRandomNotebookDocument(); + await vscode.window.showNotebookDocument(notebook); + await assertKernel(verifyOutputSyncKernel, notebook); + await vscode.commands.executeCommand('notebook.cell.execute'); + assert.strictEqual(called, true); + verifyOutputSyncKernel.controller.dispose(); + }); + + test('executionSummary', async () => { + const notebook = await openRandomNotebookDocument(); + const editor = await vscode.window.showNotebookDocument(notebook); + const cell = editor.notebook.cellAt(0); + + assert.strictEqual(cell.executionSummary?.success, undefined); + assert.strictEqual(cell.executionSummary?.executionOrder, undefined); + await vscode.commands.executeCommand('notebook.cell.execute'); + assert.strictEqual(cell.outputs.length, 1, 'should execute'); + assert.ok(cell.executionSummary); + assert.strictEqual(cell.executionSummary!.success, true); + assert.strictEqual(typeof cell.executionSummary!.executionOrder, 'number'); + }); + + test('initialize executionSummary', async () => { + + const document = await openRandomNotebookDocument(); + const cell = document.cellAt(0); + + assert.strictEqual(cell.executionSummary?.success, undefined); + assert.strictEqual(cell.executionSummary?.timing?.startTime, 10); + assert.strictEqual(cell.executionSummary?.timing?.endTime, 20); + + }); + + test('execution cancelled when delete while executing', async () => { + const document = await openRandomNotebookDocument(); + const cell = document.cellAt(0); + + let executionWasCancelled = false; + const cancelledKernel = new class extends Kernel { + constructor() { + super('cancelledKernel', ''); + } + + override async _execute(cells: vscode.NotebookCell[]) { + const [cell] = cells; + const exe = this.controller.createNotebookCellExecution(cell); + exe.token.onCancellationRequested(() => executionWasCancelled = true); + } + }; + testDisposables.push(cancelledKernel.controller); + + await vscode.window.showNotebookDocument(document); + await assertKernel(cancelledKernel, document); + await vscode.commands.executeCommand('notebook.cell.execute'); + + // Delete executing cell + const edit = new vscode.WorkspaceEdit(); + edit.set(cell!.notebook.uri, [vscode.NotebookEdit.replaceCells(new vscode.NotebookRange(cell!.index, cell!.index + 1), [])]); + await vscode.workspace.applyEdit(edit); + + assert.strictEqual(executionWasCancelled, true); + }); + + test('appendOutput to different cell', async function () { + const notebook = await openRandomNotebookDocument(); + const editor = await vscode.window.showNotebookDocument(notebook); + const cell0 = editor.notebook.cellAt(0); + const notebookEdit = new vscode.NotebookEdit(new vscode.NotebookRange(1, 1), [new vscode.NotebookCellData(vscode.NotebookCellKind.Code, 'test 2', 'javascript')]); + const edit = new vscode.WorkspaceEdit(); + edit.set(notebook.uri, [notebookEdit]); + await vscode.workspace.applyEdit(edit); + const cell1 = editor.notebook.cellAt(1); + + const nextCellKernel = new class extends Kernel { + constructor() { + super('nextCellKernel', 'Append to cell kernel'); + } + + override async _runCell(cell: vscode.NotebookCell) { + const task = this.controller.createNotebookCellExecution(cell); + task.start(); + await task.appendOutput([new vscode.NotebookCellOutput([ + vscode.NotebookCellOutputItem.text('my output') + ])], cell1); + await task.appendOutput([new vscode.NotebookCellOutput([ + vscode.NotebookCellOutputItem.text('my output 2') + ])], cell1); + task.end(true); + } + }; + testDisposables.push(nextCellKernel.controller); + + await withEvent(vscode.workspace.onDidChangeNotebookDocument, async (event) => { + await assertKernel(nextCellKernel, notebook); + await vscode.commands.executeCommand('notebook.cell.execute'); + await event; + assert.strictEqual(cell0.outputs.length, 0, 'should not change cell 0'); + assert.strictEqual(cell1.outputs.length, 2, 'should update cell 1'); + assert.strictEqual(cell1.outputs[0].items.length, 1); + assert.deepStrictEqual(new TextDecoder().decode(cell1.outputs[0].items[0].data), 'my output'); + }); + }); + + test('replaceOutput to different cell', async function () { + const notebook = await openRandomNotebookDocument(); + const editor = await vscode.window.showNotebookDocument(notebook); + const cell0 = editor.notebook.cellAt(0); + const notebookEdit = new vscode.NotebookEdit(new vscode.NotebookRange(1, 1), [new vscode.NotebookCellData(vscode.NotebookCellKind.Code, 'test 2', 'javascript')]); + const edit = new vscode.WorkspaceEdit(); + edit.set(notebook.uri, [notebookEdit]); + await vscode.workspace.applyEdit(edit); + const cell1 = editor.notebook.cellAt(1); + + const nextCellKernel = new class extends Kernel { + constructor() { + super('nextCellKernel', 'Replace to cell kernel'); + } + + override async _runCell(cell: vscode.NotebookCell) { + const task = this.controller.createNotebookCellExecution(cell); + task.start(); + await task.replaceOutput([new vscode.NotebookCellOutput([ + vscode.NotebookCellOutputItem.text('my output') + ])], cell1); + await task.replaceOutput([new vscode.NotebookCellOutput([ + vscode.NotebookCellOutputItem.text('my output 2') + ])], cell1); + task.end(true); + } + }; + testDisposables.push(nextCellKernel.controller); + + await withEvent(vscode.workspace.onDidChangeNotebookDocument, async (event) => { + await assertKernel(nextCellKernel, notebook); + await vscode.commands.executeCommand('notebook.cell.execute'); + await event; + assert.strictEqual(cell0.outputs.length, 0, 'should not change cell 0'); + assert.strictEqual(cell1.outputs.length, 1, 'should update cell 1'); + assert.strictEqual(cell1.outputs[0].items.length, 1); + assert.deepStrictEqual(new TextDecoder().decode(cell1.outputs[0].items[0].data), 'my output 2'); + }); + }); +}); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.test.ts deleted file mode 100644 index 33cad6edb97..00000000000 --- a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.test.ts +++ /dev/null @@ -1,1052 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import * as assert from 'assert'; -import 'mocha'; -import { TextDecoder, TextEncoder } from 'util'; -import * as vscode from 'vscode'; -import { asPromise, assertNoRpc, closeAllEditors, createRandomFile, disposeAll, revertAllDirty, saveAllEditors } from '../utils'; - -async function createRandomNotebookFile() { - return createRandomFile('', undefined, '.vsctestnb'); -} - -async function openRandomNotebookDocument() { - const uri = await createRandomNotebookFile(); - return vscode.workspace.openNotebookDocument(uri); -} - -export async function saveAllFilesAndCloseAll() { - await saveAllEditors(); - await closeAllEditors(); -} - -async function withEvent(event: vscode.Event, callback: (e: Promise) => Promise) { - const e = asPromise(event); - await callback(e); -} - - -function sleep(ms: number): Promise { - return new Promise(resolve => { - setTimeout(resolve, ms); - }); -} - -export class Kernel { - - readonly controller: vscode.NotebookController; - - readonly associatedNotebooks = new Set(); - - constructor(id: string, label: string, viewType: string = 'notebookCoreTest') { - this.controller = vscode.notebooks.createNotebookController(id, viewType, label); - this.controller.executeHandler = this._execute.bind(this); - this.controller.supportsExecutionOrder = true; - this.controller.supportedLanguages = ['typescript', 'javascript']; - this.controller.onDidChangeSelectedNotebooks(e => { - if (e.selected) { - this.associatedNotebooks.add(e.notebook.uri.toString()); - } else { - this.associatedNotebooks.delete(e.notebook.uri.toString()); - } - }); - } - - protected async _execute(cells: vscode.NotebookCell[]): Promise { - for (const cell of cells) { - await this._runCell(cell); - } - } - - protected async _runCell(cell: vscode.NotebookCell) { - // create a single output with exec order 1 and output is plain/text - // of either the cell itself or (iff empty) the cell's document's uri - const task = this.controller.createNotebookCellExecution(cell); - task.start(Date.now()); - task.executionOrder = 1; - await sleep(10); // Force to be take some time - await task.replaceOutput([new vscode.NotebookCellOutput([ - vscode.NotebookCellOutputItem.text(cell.document.getText() || cell.document.uri.toString(), 'text/plain') - ])]); - task.end(true); - } -} - - -function getFocusedCell(editor?: vscode.NotebookEditor) { - return editor ? editor.document.cellAt(editor.selections[0].start) : undefined; -} - -async function assertKernel(kernel: Kernel, notebook: vscode.NotebookDocument): Promise { - const success = await vscode.commands.executeCommand('notebook.selectKernel', { - extension: 'vscode.vscode-api-tests', - id: kernel.controller.id - }); - assert.ok(success, `expected selected kernel to be ${kernel.controller.id}`); - assert.ok(kernel.associatedNotebooks.has(notebook.uri.toString())); -} - -const apiTestContentProvider: vscode.NotebookContentProvider = { - openNotebook: async (resource: vscode.Uri): Promise => { - if (/.*empty\-.*\.vsctestnb$/.test(resource.path)) { - return { - metadata: {}, - cells: [] - }; - } - - const dto: vscode.NotebookData = { - metadata: { custom: { testMetadata: false } }, - cells: [ - { - value: 'test', - languageId: 'typescript', - kind: vscode.NotebookCellKind.Code, - outputs: [], - metadata: { custom: { testCellMetadata: 123 } }, - executionSummary: { timing: { startTime: 10, endTime: 20 } } - }, - { - value: 'test2', - languageId: 'typescript', - kind: vscode.NotebookCellKind.Code, - outputs: [ - new vscode.NotebookCellOutput([ - vscode.NotebookCellOutputItem.text('Hello World', 'text/plain') - ], - { - testOutputMetadata: true, - ['text/plain']: { testOutputItemMetadata: true } - }) - ], - executionSummary: { executionOrder: 5, success: true }, - metadata: { custom: { testCellMetadata: 456 } } - } - ] - }; - return dto; - }, - saveNotebook: async (_document: vscode.NotebookDocument, _cancellation: vscode.CancellationToken) => { - return; - }, - saveNotebookAs: async (_targetResource: vscode.Uri, _document: vscode.NotebookDocument, _cancellation: vscode.CancellationToken) => { - return; - }, - backupNotebook: async (_document: vscode.NotebookDocument, _context: vscode.NotebookDocumentBackupContext, _cancellation: vscode.CancellationToken) => { - return { - id: '1', - delete: () => { } - }; - } -}; - -(vscode.env.uiKind === vscode.UIKind.Web ? suite.skip : suite)('Notebook API tests', function () { - - const testDisposables: vscode.Disposable[] = []; - const suiteDisposables: vscode.Disposable[] = []; - - suiteTeardown(async function () { - - assertNoRpc(); - - await revertAllDirty(); - await closeAllEditors(); - - disposeAll(suiteDisposables); - suiteDisposables.length = 0; - }); - - suiteSetup(function () { - suiteDisposables.push(vscode.workspace.registerNotebookContentProvider('notebookCoreTest', apiTestContentProvider)); - }); - - let defaultKernel: Kernel; - - setup(async function () { - // there should be ONE default kernel in this suite - defaultKernel = new Kernel('mainKernel', 'Notebook Default Kernel'); - testDisposables.push(defaultKernel.controller); - await saveAllFilesAndCloseAll(); - }); - - teardown(async function () { - disposeAll(testDisposables); - testDisposables.length = 0; - await saveAllFilesAndCloseAll(); - }); - - test.skip('correct cell selection on undo/redo of cell creation', async function () { - const notebook = await openRandomNotebookDocument(); - await vscode.window.showNotebookDocument(notebook); - await vscode.commands.executeCommand('notebook.cell.insertCodeCellBelow'); - await vscode.commands.executeCommand('undo'); - const selectionUndo = [...vscode.window.activeNotebookEditor!.selections]; - await vscode.commands.executeCommand('redo'); - const selectionRedo = vscode.window.activeNotebookEditor!.selections; - - // On undo, the selected cell must be the upper cell, ie the first one - assert.strictEqual(selectionUndo.length, 1); - assert.strictEqual(selectionUndo[0].start, 0); - assert.strictEqual(selectionUndo[0].end, 1); - // On redo, the selected cell must be the new cell, ie the second one - assert.strictEqual(selectionRedo.length, 1); - assert.strictEqual(selectionRedo[0].start, 1); - assert.strictEqual(selectionRedo[0].end, 2); - }); - - test('editor editing event', async function () { - const notebook = await openRandomNotebookDocument(); - const editor = await vscode.window.showNotebookDocument(notebook); - - const cellsChangeEvent = asPromise(vscode.workspace.onDidChangeNotebookDocument); - await vscode.commands.executeCommand('notebook.cell.insertCodeCellBelow'); - const cellChangeEventRet = await cellsChangeEvent; - assert.strictEqual(cellChangeEventRet.notebook, editor.document); - assert.strictEqual(cellChangeEventRet.contentChanges.length, 1); - assert.deepStrictEqual(cellChangeEventRet.contentChanges[0], { - range: new vscode.NotebookRange(1, 1), - removedCells: [], - addedCells: [editor.document.cellAt(1)] - }); - - const moveCellEvent = asPromise(vscode.workspace.onDidChangeNotebookDocument); - await vscode.commands.executeCommand('notebook.cell.moveUp'); - await moveCellEvent; - - const cellOutputChange = asPromise(vscode.workspace.onDidChangeNotebookDocument); - await vscode.commands.executeCommand('notebook.cell.execute'); - const cellOutputsAddedRet = await cellOutputChange; - - assert.strictEqual(cellOutputsAddedRet.notebook.uri.toString(), editor.document.uri.toString()); - assert.strictEqual(cellOutputsAddedRet.metadata, undefined); - assert.strictEqual(cellOutputsAddedRet.contentChanges.length, 0); - assert.strictEqual(cellOutputsAddedRet.cellChanges.length, 1); - assert.deepStrictEqual(cellOutputsAddedRet.cellChanges[0].cell, editor.document.cellAt(0)); - assert.deepStrictEqual(cellOutputsAddedRet.cellChanges[0].executionSummary, { executionOrder: undefined, success: undefined, timing: undefined }); // TODO@jrieken should this be undefined instead all empty? - assert.strictEqual(cellOutputsAddedRet.cellChanges[0].document, undefined); - assert.strictEqual(cellOutputsAddedRet.cellChanges[0].metadata, undefined); - assert.strictEqual(cellOutputsAddedRet.cellChanges[0].outputs, undefined); - assert.strictEqual(cellOutputsAddedRet.cellChanges[0].cell.outputs.length, 1); - - const cellOutputClear = asPromise(vscode.workspace.onDidChangeNotebookDocument); - await vscode.commands.executeCommand('notebook.cell.clearOutputs'); - const cellOutputsCleardRet = await cellOutputClear; - assert.deepStrictEqual(cellOutputsCleardRet, { - notebook: editor.document, - metadata: undefined, - contentChanges: [], - cellChanges: [{ - cell: editor.document.cellAt(0), - document: undefined, - executionSummary: undefined, - metadata: undefined, - outputs: editor.document.cellAt(0).outputs - }], - }); - assert.strictEqual(cellOutputsCleardRet.cellChanges[0].cell.outputs.length, 0); - - // const cellChangeLanguage = getEventOncePromise(vscode.notebooks.onDidChangeCellLanguage); - // await vscode.commands.executeCommand('notebook.cell.changeToMarkdown'); - // const cellChangeLanguageRet = await cellChangeLanguage; - // assert.deepStrictEqual(cellChangeLanguageRet, { - // document: vscode.window.activeNotebookEditor!.document, - // cells: vscode.window.activeNotebookEditor!.document.cellAt(0), - // language: 'markdown' - // }); - }); - - test('edit API batch edits', async function () { - const notebook = await openRandomNotebookDocument(); - const editor = await vscode.window.showNotebookDocument(notebook); - - const notebookChangeEvent = asPromise(vscode.workspace.onDidChangeNotebookDocument); - const version = editor.document.version; - await editor.edit(editBuilder => { - editBuilder.replaceCells(1, 0, [{ kind: vscode.NotebookCellKind.Code, languageId: 'javascript', value: 'test 2', outputs: [], metadata: undefined }]); - editBuilder.replaceCellMetadata(0, { inputCollapsed: false }); - }); - - await notebookChangeEvent; - assert.strictEqual(version + 1, editor.document.version); - }); - - test('edit API batch edits undo/redo', async function () { - const notebook = await openRandomNotebookDocument(); - const editor = await vscode.window.showNotebookDocument(notebook); - - const notebookChangeEvent = asPromise(vscode.workspace.onDidChangeNotebookDocument); - const version = editor.document.version; - await editor.edit(editBuilder => { - editBuilder.replaceCells(1, 0, [{ kind: vscode.NotebookCellKind.Code, languageId: 'javascript', value: 'test 2', outputs: [], metadata: undefined }]); - editBuilder.replaceCellMetadata(0, { inputCollapsed: false }); - }); - - await notebookChangeEvent; - assert.strictEqual(editor.document.cellCount, 3); - assert.strictEqual(editor.document.cellAt(0)?.metadata.inputCollapsed, false); - assert.strictEqual(version + 1, editor.document.version); - - await vscode.commands.executeCommand('undo'); - assert.strictEqual(version + 2, editor.document.version); - assert.strictEqual(editor.document.cellAt(0)?.metadata.inputCollapsed, undefined); - assert.strictEqual(editor.document.cellCount, 2); - }); - - // #126371 - test.skip('#98841, initialzation should not emit cell change events.', async function () { - let count = 0; - - testDisposables.push(vscode.workspace.onDidChangeNotebookDocument(() => { - count++; - })); - - const notebook = await openRandomNotebookDocument(); - await vscode.window.showNotebookDocument(notebook); - assert.strictEqual(count, 0); - }); - - test('notebook open', async function () { - const notebook = await openRandomNotebookDocument(); - const editor = await vscode.window.showNotebookDocument(notebook); - assert.strictEqual(vscode.window.activeNotebookEditor === editor, true, 'notebook first'); - assert.strictEqual(getFocusedCell(editor)?.document.getText(), 'test'); - assert.strictEqual(getFocusedCell(editor)?.document.languageId, 'typescript'); - - const secondCell = editor.document.cellAt(1); - assert.strictEqual(secondCell.outputs.length, 1); - assert.deepStrictEqual(secondCell.outputs[0].metadata, { testOutputMetadata: true, ['text/plain']: { testOutputItemMetadata: true } }); - assert.strictEqual(secondCell.outputs[0].items.length, 1); - assert.strictEqual(secondCell.outputs[0].items[0].mime, 'text/plain'); - assert.strictEqual(new TextDecoder().decode(secondCell.outputs[0].items[0].data), 'Hello World'); - assert.strictEqual(secondCell.executionSummary?.executionOrder, 5); - assert.strictEqual(secondCell.executionSummary?.success, true); - }); - - test('notebook cell actions', async function () { - const notebook = await openRandomNotebookDocument(); - const editor = await vscode.window.showNotebookDocument(notebook); - assert.strictEqual(vscode.window.activeNotebookEditor !== undefined, true, 'notebook first'); - assert.strictEqual(vscode.window.activeNotebookEditor === editor, true, 'notebook first'); - assert.strictEqual(getFocusedCell(editor)?.document.getText(), 'test'); - assert.strictEqual(getFocusedCell(editor)?.document.languageId, 'typescript'); - - // ---- insert cell below and focus ---- // - await vscode.commands.executeCommand('notebook.cell.insertCodeCellBelow'); - assert.strictEqual(getFocusedCell(editor)?.document.getText(), ''); - - // ---- insert cell above and focus ---- // - await vscode.commands.executeCommand('notebook.cell.insertCodeCellAbove'); - let activeCell = getFocusedCell(editor); - assert.notStrictEqual(getFocusedCell(editor), undefined); - assert.strictEqual(activeCell!.document.getText(), ''); - assert.strictEqual(editor.document.cellCount, 4); - assert.strictEqual(editor.document.getCells().indexOf(activeCell!), 1); - - // ---- focus bottom ---- // - await vscode.commands.executeCommand('notebook.focusBottom'); - activeCell = getFocusedCell(editor); - assert.strictEqual(editor.document.getCells().indexOf(activeCell!), 3); - - // ---- focus top and then copy down ---- // - await vscode.commands.executeCommand('notebook.focusTop'); - activeCell = getFocusedCell(editor); - assert.strictEqual(editor.document.getCells().indexOf(activeCell!), 0); - - await vscode.commands.executeCommand('notebook.cell.copyDown'); - activeCell = getFocusedCell(editor); - assert.strictEqual(editor.document.getCells().indexOf(activeCell!), 1); - assert.strictEqual(activeCell?.document.getText(), 'test'); - - { - const focusedCell = getFocusedCell(editor); - assert.strictEqual(focusedCell !== undefined, true); - // delete focused cell - const edit = new vscode.WorkspaceEdit(); - edit.replaceNotebookCells(focusedCell!.notebook.uri, new vscode.NotebookRange(focusedCell!.index, focusedCell!.index + 1), []); - await vscode.workspace.applyEdit(edit); - } - - activeCell = getFocusedCell(editor); - assert.strictEqual(editor.document.getCells().indexOf(activeCell!), 1); - assert.strictEqual(activeCell?.document.getText(), ''); - - // ---- focus top and then copy up ---- // - await vscode.commands.executeCommand('notebook.focusTop'); - await vscode.commands.executeCommand('notebook.cell.copyUp'); - assert.strictEqual(editor.document.cellCount, 5); - assert.strictEqual(editor.document.cellAt(0).document.getText(), 'test'); - assert.strictEqual(editor.document.cellAt(1).document.getText(), 'test'); - assert.strictEqual(editor.document.cellAt(2).document.getText(), ''); - assert.strictEqual(editor.document.cellAt(3).document.getText(), ''); - activeCell = getFocusedCell(editor); - assert.strictEqual(editor.document.getCells().indexOf(activeCell!), 0); - - - // ---- move up and down ---- // - - await vscode.commands.executeCommand('notebook.cell.moveDown'); - assert.strictEqual(editor.document.getCells().indexOf(getFocusedCell(editor)!), 1, - `first move down, active cell ${getFocusedCell(editor)!.document.uri.toString()}, ${getFocusedCell(editor)!.document.getText()}`); - - await vscode.commands.executeCommand('workbench.action.files.save'); - await vscode.commands.executeCommand('workbench.action.closeActiveEditor'); - }); - - test('editor move command - event and move cells will not recreate cells in ExtHost (#98126)', async function () { - const notebook = await openRandomNotebookDocument(); - const editor = await vscode.window.showNotebookDocument(notebook); - - const activeCell = getFocusedCell(editor); - assert.strictEqual(activeCell?.index, 0); - const notebookChangeEvent = asPromise(vscode.workspace.onDidChangeNotebookDocument); - await vscode.commands.executeCommand('notebook.cell.moveDown'); - assert.ok(await notebookChangeEvent); - - const newActiveCell = getFocusedCell(editor); - assert.strictEqual(newActiveCell?.index, 1); - assert.deepStrictEqual(activeCell, newActiveCell); - }); - - // test('document runnable based on kernel count', async () => { - // const resource = await createRandomNotebookFile(); - // await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest'); - // assert.strictEqual(vscode.window.activeNotebookEditor !== undefined, true, 'notebook first'); - // const editor = vscode.window.activeNotebookEditor!; - - // const cell = editor.document.cellAt(0); - // assert.strictEqual(cell.outputs.length, 0); - - // currentKernelProvider.setHasKernels(false); - // await vscode.commands.executeCommand('notebook.execute'); - // assert.strictEqual(cell.outputs.length, 0, 'should not execute'); // not runnable, didn't work - - // currentKernelProvider.setHasKernels(true); - - // await withEvent(vscode.notebooks.onDidChangeCellOutputs, async (event) => { - // await vscode.commands.executeCommand('notebook.execute'); - // await event; - // assert.strictEqual(cell.outputs.length, 1, 'should execute'); // runnable, it worked - // }); - - // await saveAllFilesAndCloseAll(undefined); - // }); - - - // TODO@rebornix this is wrong, `await vscode.commands.executeCommand('notebook.execute');` doesn't wait until the workspace edit is applied - test.skip('cell execute command takes arguments', async () => { - const resource = await createRandomNotebookFile(); - await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest'); - assert.strictEqual(vscode.window.activeNotebookEditor !== undefined, true, 'notebook first'); - const editor = vscode.window.activeNotebookEditor!; - const cell = editor.document.cellAt(0); - - await vscode.commands.executeCommand('notebook.execute'); - assert.strictEqual(cell.outputs.length, 0, 'should not execute'); // not runnable, didn't work - }); - - test('cell execute command takes arguments 2', async () => { - const resource = await createRandomNotebookFile(); - await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest'); - assert.strictEqual(vscode.window.activeNotebookEditor !== undefined, true, 'notebook first'); - const editor = vscode.window.activeNotebookEditor!; - const cell = editor.document.cellAt(0); - - await withEvent(vscode.workspace.onDidChangeNotebookDocument, async (event) => { - await vscode.commands.executeCommand('notebook.execute'); - await event; - assert.strictEqual(cell.outputs.length, 1, 'should execute'); // runnable, it worked - }); - - await withEvent(vscode.workspace.onDidChangeNotebookDocument, async event => { - await vscode.commands.executeCommand('notebook.cell.clearOutputs'); - await event; - assert.strictEqual(cell.outputs.length, 0, 'should clear'); - }); - - const secondResource = await createRandomNotebookFile(); - await vscode.commands.executeCommand('vscode.openWith', secondResource, 'notebookCoreTest'); - - await withEvent(vscode.workspace.onDidChangeNotebookDocument, async (event) => { - await vscode.commands.executeCommand('notebook.cell.execute', { start: 0, end: 1 }, resource); - await event; - assert.strictEqual(cell.outputs.length, 1, 'should execute'); // runnable, it worked - assert.strictEqual(vscode.window.activeNotebookEditor?.document.uri.fsPath, secondResource.fsPath); - }); - }); - - // #126371 - test.skip('cell execute command takes arguments ICellRange[]', async () => { - const resource = await createRandomNotebookFile(); - await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest'); - - vscode.commands.executeCommand('notebook.cell.execute', { ranges: [{ start: 0, end: 1 }, { start: 1, end: 2 }] }); - let firstCellExecuted = false; - let secondCellExecuted = false; - let resolve: () => void; - const p = new Promise(r => resolve = r); - const listener = vscode.workspace.onDidChangeNotebookDocument(e => { - e.cellChanges.forEach(change => { - if (change.cell.index === 0) { - firstCellExecuted = true; - } - - if (change.cell.index === 1) { - secondCellExecuted = true; - } - }); - - if (firstCellExecuted && secondCellExecuted) { - resolve(); - } - }); - - await p; - listener.dispose(); - await saveAllFilesAndCloseAll(); - }); - - test('document execute command takes arguments', async () => { - const resource = await createRandomNotebookFile(); - await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest'); - assert.strictEqual(vscode.window.activeNotebookEditor !== undefined, true, 'notebook first'); - const editor = vscode.window.activeNotebookEditor!; - const cell = editor.document.cellAt(0); - - await withEvent(vscode.workspace.onDidChangeNotebookDocument, async (event) => { - await vscode.commands.executeCommand('notebook.execute'); - await event; - assert.strictEqual(cell.outputs.length, 1, 'should execute'); // runnable, it worked - }); - - const clearChangeEvent = asPromise(vscode.workspace.onDidChangeNotebookDocument); - await vscode.commands.executeCommand('notebook.cell.clearOutputs'); - await clearChangeEvent; - assert.strictEqual(cell.outputs.length, 0, 'should clear'); - - const secondResource = await createRandomNotebookFile(); - await vscode.commands.executeCommand('vscode.openWith', secondResource, 'notebookCoreTest'); - - await withEvent(vscode.workspace.onDidChangeNotebookDocument, async (event) => { - await vscode.commands.executeCommand('notebook.execute', resource); - await event; - assert.strictEqual(cell.outputs.length, 1, 'should execute'); // runnable, it worked - assert.strictEqual(vscode.window.activeNotebookEditor?.document.uri.fsPath, secondResource.fsPath); - }); - }); - - test('cell execute and select kernel', async function () { - const notebook = await openRandomNotebookDocument(); - const editor = await vscode.window.showNotebookDocument(notebook); - assert.strictEqual(vscode.window.activeNotebookEditor === editor, true, 'notebook first'); - - const cell = editor.document.cellAt(0); - - const alternativeKernel = new class extends Kernel { - constructor() { - super('secondaryKernel', 'Notebook Secondary Test Kernel'); - this.controller.supportsExecutionOrder = false; - } - - override async _runCell(cell: vscode.NotebookCell) { - const task = this.controller.createNotebookCellExecution(cell); - task.start(); - await task.replaceOutput([new vscode.NotebookCellOutput([ - vscode.NotebookCellOutputItem.text('my second output', 'text/plain') - ])]); - task.end(true); - } - }; - testDisposables.push(alternativeKernel.controller); - - await withEvent(vscode.workspace.onDidChangeNotebookDocument, async (event) => { - await assertKernel(defaultKernel, notebook); - await vscode.commands.executeCommand('notebook.cell.execute'); - await event; - assert.strictEqual(cell.outputs.length, 1, 'should execute'); // runnable, it worked - assert.strictEqual(cell.outputs[0].items.length, 1); - assert.strictEqual(cell.outputs[0].items[0].mime, 'text/plain'); - assert.deepStrictEqual(new TextDecoder().decode(cell.outputs[0].items[0].data), cell.document.getText()); - }); - - await withEvent(vscode.workspace.onDidChangeNotebookDocument, async (event) => { - await assertKernel(alternativeKernel, notebook); - await vscode.commands.executeCommand('notebook.cell.execute'); - await event; - assert.strictEqual(cell.outputs.length, 1, 'should execute'); // runnable, it worked - assert.strictEqual(cell.outputs[0].items.length, 1); - assert.strictEqual(cell.outputs[0].items[0].mime, 'text/plain'); - assert.deepStrictEqual(new TextDecoder().decode(cell.outputs[0].items[0].data), 'my second output'); - }); - }); - - test.skip('onDidChangeCellExecutionState is fired', async () => { // TODO@rebornix https://github.com/microsoft/vscode/issues/139350 - const resource = await createRandomNotebookFile(); - await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest'); - const editor = vscode.window.activeNotebookEditor!; - const cell = editor.document.cellAt(0); - - vscode.commands.executeCommand('notebook.cell.execute'); - let eventCount = 0; - let resolve: () => void; - const p = new Promise(r => resolve = r); - const listener = vscode.notebooks.onDidChangeNotebookCellExecutionState(e => { - if (eventCount === 0) { - assert.strictEqual(e.state, vscode.NotebookCellExecutionState.Pending, 'should be set to Pending'); - } else if (eventCount === 1) { - assert.strictEqual(e.state, vscode.NotebookCellExecutionState.Executing, 'should be set to Executing'); - assert.strictEqual(cell.outputs.length, 0, 'no outputs yet: ' + JSON.stringify(cell.outputs[0])); - } else if (eventCount === 2) { - assert.strictEqual(e.state, vscode.NotebookCellExecutionState.Idle, 'should be set to Idle'); - assert.strictEqual(cell.outputs.length, 1, 'should have an output'); - resolve(); - } - - eventCount++; - }); - - await p; - listener.dispose(); - }); - - test('notebook cell document workspace edit', async function () { - const notebook = await openRandomNotebookDocument(); - const editor = await vscode.window.showNotebookDocument(notebook); - assert.strictEqual(vscode.window.activeNotebookEditor === editor, true, 'notebook first'); - assert.strictEqual(getFocusedCell(editor)?.document.getText(), 'test'); - assert.strictEqual(getFocusedCell(editor)?.document.languageId, 'typescript'); - - await vscode.commands.executeCommand('notebook.cell.insertCodeCellBelow'); - assert.strictEqual(getFocusedCell(editor)?.document.getText(), ''); - - await vscode.commands.executeCommand('notebook.cell.insertCodeCellAbove'); - const activeCell = getFocusedCell(editor); - assert.notStrictEqual(getFocusedCell(editor), undefined); - assert.strictEqual(activeCell!.document.getText(), ''); - assert.strictEqual(editor.document.cellCount, 4); - assert.strictEqual(editor.document.getCells().indexOf(activeCell!), 1); - - await withEvent(vscode.workspace.onDidChangeTextDocument, async event => { - const edit = new vscode.WorkspaceEdit(); - edit.insert(activeCell!.document.uri, new vscode.Position(0, 0), 'var abc = 0;'); - await vscode.workspace.applyEdit(edit); - await event; - assert.strictEqual(vscode.window.activeNotebookEditor === editor, true); - assert.deepStrictEqual(editor.document.cellAt(1), getFocusedCell(editor)); - assert.strictEqual(getFocusedCell(editor)?.document.getText(), 'var abc = 0;'); - }); - }); - - test.skip('multiple tabs: dirty + clean', async function () { // TODO@rebornix https://github.com/microsoft/vscode/issues/140285 - const notebook = await openRandomNotebookDocument(); - await vscode.window.showNotebookDocument(notebook); - await vscode.commands.executeCommand('notebook.cell.insertCodeCellBelow'); - assert.strictEqual(getFocusedCell(vscode.window.activeNotebookEditor)?.document.getText(), ''); - - await vscode.commands.executeCommand('notebook.cell.insertCodeCellAbove'); - const edit = new vscode.WorkspaceEdit(); - edit.insert(getFocusedCell(vscode.window.activeNotebookEditor)!.document.uri, new vscode.Position(0, 0), 'var abc = 0;'); - await vscode.workspace.applyEdit(edit); - - const secondNotebook = await openRandomNotebookDocument(); - await vscode.window.showNotebookDocument(secondNotebook); - await vscode.commands.executeCommand('workbench.action.closeActiveEditor'); - - // make sure that the previous dirty editor is still restored in the extension host and no data loss - assert.strictEqual(vscode.window.activeNotebookEditor !== undefined, true); - assert.deepStrictEqual(vscode.window.activeNotebookEditor?.document.cellAt(1), getFocusedCell(vscode.window.activeNotebookEditor)); - assert.deepStrictEqual(vscode.window.activeNotebookEditor?.document.cellCount, 4); - assert.strictEqual(getFocusedCell(vscode.window.activeNotebookEditor)?.document.getText(), 'var abc = 0;'); - - }); - - test.skip('multiple tabs: two dirty tabs and switching', async function () { - const notebook = await openRandomNotebookDocument(); - await vscode.window.showNotebookDocument(notebook); - await vscode.commands.executeCommand('notebook.cell.insertCodeCellBelow'); - assert.strictEqual(getFocusedCell(vscode.window.activeNotebookEditor)?.document.getText(), ''); - - await vscode.commands.executeCommand('notebook.cell.insertCodeCellAbove'); - const edit = new vscode.WorkspaceEdit(); - edit.insert(getFocusedCell(vscode.window.activeNotebookEditor)!.document.uri, new vscode.Position(0, 0), 'var abc = 0;'); - await vscode.workspace.applyEdit(edit); - - const secondNotebook = await openRandomNotebookDocument(); - await vscode.window.showNotebookDocument(secondNotebook); - await vscode.commands.executeCommand('notebook.cell.insertCodeCellBelow'); - assert.strictEqual(getFocusedCell(vscode.window.activeNotebookEditor)?.document.getText(), ''); - - // switch to the first editor - await vscode.window.showNotebookDocument(notebook); - assert.strictEqual(vscode.window.activeNotebookEditor !== undefined, true); - assert.deepStrictEqual(vscode.window.activeNotebookEditor?.document.cellAt(1), getFocusedCell(vscode.window.activeNotebookEditor)); - assert.deepStrictEqual(vscode.window.activeNotebookEditor?.document.cellCount, 4); - assert.strictEqual(getFocusedCell(vscode.window.activeNotebookEditor)?.document.getText(), 'var abc = 0;'); - - // switch to the second editor - await vscode.window.showNotebookDocument(secondNotebook); - assert.strictEqual(vscode.window.activeNotebookEditor !== undefined, true); - assert.deepStrictEqual(vscode.window.activeNotebookEditor?.document.cellAt(1), getFocusedCell(vscode.window.activeNotebookEditor)); - assert.deepStrictEqual(vscode.window.activeNotebookEditor?.document.cellCount, 3); - assert.strictEqual(getFocusedCell(vscode.window.activeNotebookEditor)?.document.getText(), ''); - - }); - - test('multiple tabs: different editors with same document', async function () { - - const notebook = await openRandomNotebookDocument(); - const firstNotebookEditor = await vscode.window.showNotebookDocument(notebook, { viewColumn: vscode.ViewColumn.One }); - assert.ok(firstNotebookEditor === vscode.window.activeNotebookEditor); - - assert.strictEqual(firstNotebookEditor !== undefined, true, 'notebook first'); - assert.strictEqual(getFocusedCell(vscode.window.activeNotebookEditor!)?.document.getText(), 'test'); - assert.strictEqual(getFocusedCell(vscode.window.activeNotebookEditor!)?.document.languageId, 'typescript'); - - const secondNotebookEditor = await vscode.window.showNotebookDocument(notebook, { viewColumn: vscode.ViewColumn.Beside }); - assert.strictEqual(secondNotebookEditor !== undefined, true, 'notebook first'); - assert.strictEqual(getFocusedCell(vscode.window.activeNotebookEditor!)?.document.getText(), 'test'); - assert.strictEqual(getFocusedCell(vscode.window.activeNotebookEditor!)?.document.languageId, 'typescript'); - - assert.notStrictEqual(firstNotebookEditor, secondNotebookEditor); - assert.strictEqual(firstNotebookEditor?.document, secondNotebookEditor?.document, 'split notebook editors share the same document'); - - }); - - test.skip('#106657. Opening a notebook from markers view is broken ', async function () { - - const document = await openRandomNotebookDocument(); - const [cell] = document.getCells(); - - assert.strictEqual(vscode.window.activeNotebookEditor, undefined); - - // opening a cell-uri opens a notebook editor - await vscode.window.showTextDocument(cell.document, { viewColumn: vscode.ViewColumn.Active }); - // await vscode.commands.executeCommand('vscode.open', cell.document.uri, vscode.ViewColumn.Active); - - assert.strictEqual(!!vscode.window.activeNotebookEditor, true); - assert.strictEqual(vscode.window.activeNotebookEditor!.document.uri.toString(), document.uri.toString()); - }); - - test('Cannot open notebook from cell-uri with vscode.open-command', async function () { - - const document = await openRandomNotebookDocument(); - const [cell] = document.getCells(); - - await saveAllFilesAndCloseAll(); - assert.strictEqual(vscode.window.activeNotebookEditor, undefined); - - // BUG is that the editor opener (https://github.com/microsoft/vscode/blob/8e7877bdc442f1e83a7fec51920d82b696139129/src/vs/editor/browser/services/openerService.ts#L69) - // removes the fragment if it matches something numeric. For notebooks that's not wanted... - await vscode.commands.executeCommand('vscode.open', cell.document.uri); - - assert.strictEqual(vscode.window.activeNotebookEditor!.document.uri.toString(), document.uri.toString()); - }); - - test('#97830, #97764. Support switch to other editor types', async function () { - const notebook = await openRandomNotebookDocument(); - const editor = await vscode.window.showNotebookDocument(notebook); - await vscode.commands.executeCommand('notebook.cell.insertCodeCellBelow'); - const edit = new vscode.WorkspaceEdit(); - edit.insert(getFocusedCell(editor)!.document.uri, new vscode.Position(0, 0), 'var abc = 0;'); - await vscode.workspace.applyEdit(edit); - - assert.strictEqual(getFocusedCell(editor)?.document.getText(), 'var abc = 0;'); - - // no kernel -> no default language - // assert.strictEqual(vscode.window.activeNotebookEditor!.kernel, undefined); - assert.strictEqual(getFocusedCell(editor)?.document.languageId, 'typescript'); - - await vscode.commands.executeCommand('vscode.openWith', notebook.uri, 'default'); - assert.strictEqual(vscode.window.activeTextEditor?.document.uri.path, notebook.uri.path); - }); - - // open text editor, pin, and then open a notebook - test('#96105 - dirty editors', async function () { - const resource = await createRandomNotebookFile(); - await vscode.commands.executeCommand('vscode.openWith', resource, 'default'); - const edit = new vscode.WorkspaceEdit(); - edit.insert(resource, new vscode.Position(0, 0), 'var abc = 0;'); - await vscode.workspace.applyEdit(edit); - - // now it's dirty, open the resource with notebook editor should open a new one - await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest'); - assert.notStrictEqual(vscode.window.activeNotebookEditor, undefined, 'notebook first'); - // assert.notStrictEqual(vscode.window.activeTextEditor, undefined); - - }); - - test('#102411 - untitled notebook creation failed', async function () { - await vscode.commands.executeCommand('workbench.action.files.newUntitledFile', { viewType: 'notebookCoreTest' }); - assert.notStrictEqual(vscode.window.activeNotebookEditor, undefined, 'untitled notebook editor is not undefined'); - - await closeAllEditors(); - }); - - test('#102423 - copy/paste shares the same text buffer', async function () { - const resource = await createRandomNotebookFile(); - await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest'); - - let activeCell = getFocusedCell(vscode.window.activeNotebookEditor); - assert.strictEqual(activeCell?.document.getText(), 'test'); - - await vscode.commands.executeCommand('notebook.cell.copyDown'); - await vscode.commands.executeCommand('notebook.cell.edit'); - activeCell = getFocusedCell(vscode.window.activeNotebookEditor); - assert.strictEqual(vscode.window.activeNotebookEditor!.document.getCells().indexOf(activeCell!), 1); - assert.strictEqual(activeCell?.document.getText(), 'test'); - - const edit = new vscode.WorkspaceEdit(); - edit.insert(getFocusedCell(vscode.window.activeNotebookEditor)!.document.uri, new vscode.Position(0, 0), 'var abc = 0;'); - await vscode.workspace.applyEdit(edit); - - assert.strictEqual(vscode.window.activeNotebookEditor!.document.getCells().length, 3); - assert.notStrictEqual(vscode.window.activeNotebookEditor!.document.cellAt(0).document.getText(), vscode.window.activeNotebookEditor!.document.cellAt(1).document.getText()); - - await closeAllEditors(); - }); - - test('#115855 onDidSaveNotebookDocument', async function () { - const resource = await createRandomNotebookFile(); - const notebook = await vscode.workspace.openNotebookDocument(resource); - const editor = await vscode.window.showNotebookDocument(notebook); - - const cellsChangeEvent = asPromise(vscode.workspace.onDidChangeNotebookDocument); - await editor.edit(editBuilder => { - editBuilder.replaceCells(1, 0, [{ kind: vscode.NotebookCellKind.Code, languageId: 'javascript', value: 'test 2', outputs: [], metadata: undefined }]); - }); - - const cellChangeEventRet = await cellsChangeEvent; - assert.strictEqual(cellChangeEventRet.notebook === notebook, true); - assert.strictEqual(cellChangeEventRet.notebook.isDirty, true); - - const saveEvent = asPromise(vscode.workspace.onDidSaveNotebookDocument); - - await notebook.save(); - - await saveEvent; - assert.strictEqual(notebook.isDirty, false); - }); - - test('Output changes are applied once the promise resolves', async function () { - - let called = false; - - const verifyOutputSyncKernel = new class extends Kernel { - - constructor() { - super('verifyOutputSyncKernel', ''); - } - - override async _execute(cells: vscode.NotebookCell[]) { - const [cell] = cells; - const task = this.controller.createNotebookCellExecution(cell); - task.start(); - await task.replaceOutput([new vscode.NotebookCellOutput([ - vscode.NotebookCellOutputItem.text('Some output', 'text/plain') - ])]); - assert.strictEqual(cell.notebook.cellAt(0).outputs.length, 1); - assert.deepStrictEqual(new TextDecoder().decode(cell.notebook.cellAt(0).outputs[0].items[0].data), 'Some output'); - task.end(undefined); - called = true; - } - }; - - const notebook = await openRandomNotebookDocument(); - await vscode.window.showNotebookDocument(notebook); - await assertKernel(verifyOutputSyncKernel, notebook); - await vscode.commands.executeCommand('notebook.cell.execute'); - assert.strictEqual(called, true); - verifyOutputSyncKernel.controller.dispose(); - }); - - test('executionSummary', async () => { - const resource = await createRandomNotebookFile(); - await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest'); - const editor = vscode.window.activeNotebookEditor!; - const cell = editor.document.cellAt(0); - - assert.strictEqual(cell.executionSummary?.success, undefined); - assert.strictEqual(cell.executionSummary?.executionOrder, undefined); - await vscode.commands.executeCommand('notebook.cell.execute'); - assert.strictEqual(cell.outputs.length, 1, 'should execute'); - assert.ok(cell.executionSummary); - assert.strictEqual(cell.executionSummary!.success, true); - assert.strictEqual(typeof cell.executionSummary!.executionOrder, 'number'); - }); - - test('initialize executionSummary', async () => { - - const document = await openRandomNotebookDocument(); - const cell = document.cellAt(0); - - assert.strictEqual(cell.executionSummary?.success, undefined); - assert.strictEqual(cell.executionSummary?.timing?.startTime, 10); - assert.strictEqual(cell.executionSummary?.timing?.endTime, 20); - - }); - - test('execution cancelled when delete while executing', async () => { - const document = await openRandomNotebookDocument(); - const cell = document.cellAt(0); - - let executionWasCancelled = false; - const cancelledKernel = new class extends Kernel { - constructor() { - super('cancelledKernel', ''); - } - - override async _execute(cells: vscode.NotebookCell[]) { - const [cell] = cells; - const exe = this.controller.createNotebookCellExecution(cell); - exe.token.onCancellationRequested(() => executionWasCancelled = true); - } - }; - testDisposables.push(cancelledKernel.controller); - - await vscode.window.showNotebookDocument(document); - await assertKernel(cancelledKernel, document); - await vscode.commands.executeCommand('notebook.cell.execute'); - - // Delete executing cell - const edit = new vscode.WorkspaceEdit(); - edit.replaceNotebookCells(cell!.notebook.uri, new vscode.NotebookRange(cell!.index, cell!.index + 1), []); - await vscode.workspace.applyEdit(edit); - - assert.strictEqual(executionWasCancelled, true); - }); -}); - -(vscode.env.uiKind === vscode.UIKind.Web ? suite.skip : suite)('statusbar', () => { - const emitter = new vscode.EventEmitter(); - const onDidCallProvide = emitter.event; - const suiteDisposables: vscode.Disposable[] = []; - suiteTeardown(async function () { - assertNoRpc(); - - await revertAllDirty(); - await closeAllEditors(); - - disposeAll(suiteDisposables); - suiteDisposables.length = 0; - }); - - suiteSetup(() => { - suiteDisposables.push(vscode.notebooks.registerNotebookCellStatusBarItemProvider('notebookCoreTest', { - async provideCellStatusBarItems(cell: vscode.NotebookCell, _token: vscode.CancellationToken): Promise { - emitter.fire(cell); - return []; - } - })); - - suiteDisposables.push(vscode.workspace.registerNotebookContentProvider('notebookCoreTest', apiTestContentProvider)); - }); - - test.skip('provideCellStatusBarItems called on metadata change', async function () { // TODO@rebornix https://github.com/microsoft/vscode/issues/139324 - const provideCalled = asPromise(onDidCallProvide); - const resource = await createRandomNotebookFile(); - await vscode.commands.executeCommand('vscode.openWith', resource, 'notebookCoreTest'); - await provideCalled; - - const edit = new vscode.WorkspaceEdit(); - edit.replaceNotebookCellMetadata(resource, 0, { inputCollapsed: true }); - vscode.workspace.applyEdit(edit); - await provideCalled; - }); -}); - -(vscode.env.uiKind === vscode.UIKind.Web ? suite.skip : suite)('Notebook API tests (metadata)', function () { - const testDisposables: vscode.Disposable[] = []; - const suiteDisposables: vscode.Disposable[] = []; - - suiteTeardown(async function () { - assertNoRpc(); - - await revertAllDirty(); - await closeAllEditors(); - - disposeAll(suiteDisposables); - suiteDisposables.length = 0; - }); - - suiteSetup(function () { - suiteDisposables.push(vscode.workspace.registerNotebookContentProvider('notebookCoreTest', apiTestContentProvider)); - }); - - setup(async function () { - await saveAllFilesAndCloseAll(); - }); - - teardown(async function () { - disposeAll(testDisposables); - testDisposables.length = 0; - await saveAllFilesAndCloseAll(); - }); - - test('custom metadata should be supported', async function () { - const notebook = await openRandomNotebookDocument(); - const editor = await vscode.window.showNotebookDocument(notebook); - - assert.strictEqual(editor.document.metadata.custom?.testMetadata, false); - assert.strictEqual(getFocusedCell(editor)?.metadata.custom?.testCellMetadata, 123); - assert.strictEqual(getFocusedCell(editor)?.document.languageId, 'typescript'); - }); -}); - -suite('Notebook & LiveShare', function () { - - const suiteDisposables: vscode.Disposable[] = []; - const notebookType = 'vsls-testing'; - - suiteTeardown(() => { - vscode.Disposable.from(...suiteDisposables).dispose(); - }); - - suiteSetup(function () { - - suiteDisposables.push(vscode.workspace.registerNotebookSerializer(notebookType, new class implements vscode.NotebookSerializer { - deserializeNotebook(content: Uint8Array, _token: vscode.CancellationToken): vscode.NotebookData | Thenable { - const value = new TextDecoder().decode(content); - const cell1 = new vscode.NotebookCellData(vscode.NotebookCellKind.Code, value, 'fooLang'); - cell1.outputs = [new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.stderr(value)])]; - return new vscode.NotebookData([cell1]); - } - serializeNotebook(data: vscode.NotebookData, _token: vscode.CancellationToken): Uint8Array | Thenable { - return new TextEncoder().encode(data.cells[0].value); - } - }, {}, { - displayName: 'LS', - filenamePattern: ['*'], - })); - }); - - test('command: vscode.resolveNotebookContentProviders', async function () { - - type Info = { viewType: string; displayName: string; filenamePattern: string[] }; - - const info = await vscode.commands.executeCommand('vscode.resolveNotebookContentProviders'); - assert.strictEqual(Array.isArray(info), true); - - const item = info.find(item => item.viewType === notebookType); - assert.ok(item); - assert.strictEqual(item?.viewType, notebookType); - }); - - test('command: vscode.executeDataToNotebook', async function () { - const value = 'dataToNotebook'; - const data = await vscode.commands.executeCommand('vscode.executeDataToNotebook', notebookType, new TextEncoder().encode(value)); - assert.ok(data instanceof vscode.NotebookData); - assert.strictEqual(data.cells.length, 1); - assert.strictEqual(data.cells[0].value, value); - assert.strictEqual(new TextDecoder().decode(data.cells[0].outputs![0].items[0].data), value); - }); - - test('command: vscode.executeNotebookToData', async function () { - const value = 'notebookToData'; - const notebook = new vscode.NotebookData([new vscode.NotebookCellData(vscode.NotebookCellKind.Code, value, 'fooLang')]); - const data = await vscode.commands.executeCommand('vscode.executeNotebookToData', notebookType, notebook); - assert.ok(data instanceof Uint8Array); - assert.deepStrictEqual(new TextDecoder().decode(data), value); - }); -}); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/rpc.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/rpc.test.ts index b7202716d03..8ec605add17 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/rpc.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/rpc.test.ts @@ -93,11 +93,6 @@ suite('vscode', function () { assertNoRpcFromEntry([item, 'TreeView']); }); - test('no rpc, createNotebookEditorDecorationType(...)', function () { - const item = vscode.notebooks.createNotebookEditorDecorationType({ top: {} }); - dispo.push(item); - assertNoRpcFromEntry([item, 'NotebookEditorDecorationType']); - }); test('no rpc, createNotebookController(...)', function () { const ctrl = vscode.notebooks.createNotebookController('foo', 'bar', ''); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts index e1bf968ada9..b76e348e02e 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { deepStrictEqual, doesNotThrow, equal, strictEqual, throws } from 'assert'; -import { ConfigurationTarget, Disposable, env, EnvironmentVariableMutator, EnvironmentVariableMutatorType, EventEmitter, ExtensionContext, extensions, ExtensionTerminalOptions, Pseudoterminal, Terminal, TerminalDimensions, TerminalOptions, TerminalState, UIKind, window, workspace } from 'vscode'; +import { ConfigurationTarget, Disposable, env, EnvironmentVariableMutator, EnvironmentVariableMutatorType, EventEmitter, ExtensionContext, extensions, ExtensionTerminalOptions, Pseudoterminal, Terminal, TerminalDimensions, TerminalExitReason, TerminalOptions, TerminalState, UIKind, window, workspace } from 'vscode'; import { assertNoRpc, poll } from '../utils'; // Disable terminal tests: @@ -30,7 +30,7 @@ import { assertNoRpc, poll } from '../utils'; }); suite('Terminal', () => { - let disposables: Disposable[] = []; + const disposables: Disposable[] = []; teardown(async () => { assertNoRpc(); @@ -132,7 +132,7 @@ import { assertNoRpc, poll } from '../utils'; })); }); equal(result, terminal); - let pid = await result.processId; + const pid = await result.processId; equal(true, pid && pid > 0); await new Promise(r => { disposables.push(window.onDidCloseTerminal(t => { @@ -223,7 +223,7 @@ import { assertNoRpc, poll } from '../utils'; await new Promise(r => { disposables.push(window.onDidCloseTerminal(t => { if (t === terminal) { - deepStrictEqual(t.exitStatus, { code: undefined }); + deepStrictEqual(t.exitStatus, { code: undefined, reason: TerminalExitReason.Extension }); r(); } })); @@ -579,7 +579,7 @@ import { assertNoRpc, poll } from '../utils'; strictEqual(created.exitStatus, undefined); disposables.push(window.onDidCloseTerminal(t2 => { if (t2 === created) { - deepStrictEqual(created.exitStatus, { code: undefined }); + deepStrictEqual(created.exitStatus, { code: undefined, reason: TerminalExitReason.Process }); r(); } })); @@ -604,7 +604,7 @@ import { assertNoRpc, poll } from '../utils'; strictEqual(created.exitStatus, undefined); disposables.push(window.onDidCloseTerminal(t2 => { if (t2 === created) { - deepStrictEqual(created.exitStatus, { code: 0 }); + deepStrictEqual(created.exitStatus, { code: 0, reason: TerminalExitReason.Process }); r(); } })); @@ -634,7 +634,7 @@ import { assertNoRpc, poll } from '../utils'; strictEqual(created.exitStatus, undefined); disposables.push(window.onDidCloseTerminal(t2 => { if (t2 === created) { - deepStrictEqual(created.exitStatus, { code: 22 }); + deepStrictEqual(created.exitStatus, { code: 22, reason: TerminalExitReason.Process }); r(); } })); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/types.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/types.test.ts index aa22d484574..403b81454e9 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/types.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/types.test.ts @@ -20,6 +20,7 @@ suite('vscode API - types', () => { assert.ok(vscode.CodeActionKind.Refactor instanceof vscode.CodeActionKind); assert.ok(vscode.CodeActionKind.RefactorExtract instanceof vscode.CodeActionKind); assert.ok(vscode.CodeActionKind.RefactorInline instanceof vscode.CodeActionKind); + assert.ok(vscode.CodeActionKind.RefactorMove instanceof vscode.CodeActionKind); assert.ok(vscode.CodeActionKind.RefactorRewrite instanceof vscode.CodeActionKind); assert.ok(vscode.CodeActionKind.Source instanceof vscode.CodeActionKind); assert.ok(vscode.CodeActionKind.SourceOrganizeImports instanceof vscode.CodeActionKind); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/webview.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/webview.test.ts deleted file mode 100644 index 470aee38205..00000000000 --- a/extensions/vscode-api-tests/src/singlefolder-tests/webview.test.ts +++ /dev/null @@ -1,578 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import * as assert from 'assert'; -import 'mocha'; -import * as os from 'os'; -import * as vscode from 'vscode'; -import { assertNoRpc, closeAllEditors, delay, disposeAll } from '../utils'; - -const webviewId = 'myWebview'; - -function workspaceFile(...segments: string[]) { - return vscode.Uri.joinPath(vscode.workspace.workspaceFolders![0].uri, ...segments); -} - -suite('vscode API - webview', () => { - const disposables: vscode.Disposable[] = []; - - function _register(disposable: T) { - disposables.push(disposable); - return disposable; - } - - teardown(async () => { - assertNoRpc(); - await closeAllEditors(); - disposeAll(disposables); - }); - - test('webviews should be able to send and receive messages', async () => { - const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true })); - const firstResponse = getMessage(webview); - webview.webview.html = createHtmlDocumentWithBody(/*html*/` - `); - - webview.webview.postMessage({ value: 1 }); - assert.strictEqual((await firstResponse).value, 2); - }); - - test('webviews should not have scripts enabled by default', async () => { - const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, {})); - const response = Promise.race([ - getMessage(webview), - new Promise<{}>(resolve => setTimeout(() => resolve({ value: '🎉' }), 1000)) - ]); - webview.webview.html = createHtmlDocumentWithBody(/*html*/` - `); - - assert.strictEqual((await response).value, '🎉'); - }); - - test('webviews should update html', async () => { - const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true })); - - { - const response = getMessage(webview); - webview.webview.html = createHtmlDocumentWithBody(/*html*/` - `); - - assert.strictEqual((await response).value, 'first'); - } - { - const response = getMessage(webview); - webview.webview.html = createHtmlDocumentWithBody(/*html*/` - `); - - assert.strictEqual((await response).value, 'second'); - } - }); - - test.skip('webviews should preserve vscode API state when they are hidden', async () => { - const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true })); - const ready = getMessage(webview); - webview.webview.html = createHtmlDocumentWithBody(/*html*/` - `); - await ready; - - const firstResponse = await sendReceiveMessage(webview, { type: 'add' }); - assert.strictEqual(firstResponse.value, 1); - - // Swap away from the webview - const doc = await vscode.workspace.openTextDocument(workspaceFile('bower.json')); - await vscode.window.showTextDocument(doc); - - // And then back - const ready2 = getMessage(webview); - webview.reveal(vscode.ViewColumn.One); - await ready2; - - // We should still have old state - const secondResponse = await sendReceiveMessage(webview, { type: 'get' }); - assert.strictEqual(secondResponse.value, 1); - }); - - test.skip('webviews should preserve their context when they are moved between view columns', async () => { // TODO@mjbvz https://github.com/microsoft/vscode/issues/141001 - const doc = await vscode.workspace.openTextDocument(workspaceFile('bower.json')); - await vscode.window.showTextDocument(doc, vscode.ViewColumn.One); - - // Open webview in same column - const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true })); - const ready = getMessage(webview); - webview.webview.html = statefulWebviewHtml; - await ready; - - const firstResponse = await sendReceiveMessage(webview, { type: 'add' }); - assert.strictEqual(firstResponse.value, 1); - - // Now move webview to new view column - webview.reveal(vscode.ViewColumn.Two); - - // We should still have old state - const secondResponse = await sendReceiveMessage(webview, { type: 'get' }); - assert.strictEqual(secondResponse.value, 1); - }); - - test.skip('webviews with retainContextWhenHidden should preserve their context when they are hidden', async function () { - this.retries(3); - - const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true, retainContextWhenHidden: true })); - const ready = getMessage(webview); - - webview.webview.html = statefulWebviewHtml; - await ready; - - const firstResponse = await sendReceiveMessage(webview, { type: 'add' }); - assert.strictEqual((await firstResponse).value, 1); - - // Swap away from the webview - const doc = await vscode.workspace.openTextDocument(workspaceFile('bower.json')); - await vscode.window.showTextDocument(doc); - - // And then back - webview.reveal(vscode.ViewColumn.One); - - // We should still have old state - const secondResponse = await sendReceiveMessage(webview, { type: 'get' }); - assert.strictEqual(secondResponse.value, 1); - }); - - test.skip('webviews with retainContextWhenHidden should preserve their page position when hidden', async () => { - const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true, retainContextWhenHidden: true })); - const ready = getMessage(webview); - webview.webview.html = createHtmlDocumentWithBody(/*html*/` - ${'

        Header

        '.repeat(200)} - `); - await ready; - - const firstResponse = getMessage(webview); - - assert.strictEqual(Math.round((await firstResponse).value), 100); - - // Swap away from the webview - const doc = await vscode.workspace.openTextDocument(workspaceFile('bower.json')); - await vscode.window.showTextDocument(doc); - - // And then back - webview.reveal(vscode.ViewColumn.One); - - // We should still have old scroll pos - const secondResponse = await sendReceiveMessage(webview, { type: 'get' }); - assert.strictEqual(Math.round(secondResponse.value), 100); - }); - - test.skip('webviews with retainContextWhenHidden should be able to recive messages while hidden', async () => { // TODO@mjbvz https://github.com/microsoft/vscode/issues/139960 - const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true, retainContextWhenHidden: true })); - const ready = getMessage(webview); - - webview.webview.html = statefulWebviewHtml; - await ready; - - const firstResponse = await sendReceiveMessage(webview, { type: 'add' }); - assert.strictEqual((await firstResponse).value, 1); - - // Swap away from the webview - const doc = await vscode.workspace.openTextDocument(workspaceFile('bower.json')); - await vscode.window.showTextDocument(doc); - - // Try posting a message to our hidden webview - const secondResponse = await sendReceiveMessage(webview, { type: 'add' }); - assert.strictEqual((await secondResponse).value, 2); - - // Now show webview again - webview.reveal(vscode.ViewColumn.One); - - // We should still have old state - const thirdResponse = await sendReceiveMessage(webview, { type: 'get' }); - assert.strictEqual(thirdResponse.value, 2); - }); - - - test.skip('webviews should only be able to load resources from workspace by default', async () => { // TODO@mjbvz https://github.com/microsoft/vscode/issues/139960 - const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { - viewColumn: vscode.ViewColumn.One - }, { - enableScripts: true - })); - - webview.webview.html = createHtmlDocumentWithBody(/*html*/` - `); - - const ready = getMessage(webview); - if ((await ready).userAgent.indexOf('Firefox') >= 0) { - // Skip on firefox web for now. - // Firefox service workers never seem to get any 'fetch' requests here. Other browsers work fine - return; - } - - { - const imagePath = webview.webview.asWebviewUri(workspaceFile('image.png')); - const response = await sendReceiveMessage(webview, { src: imagePath.toString() }); - assert.strictEqual(response.value, true); - } - // { - // // #102188. Resource filename containing special characters like '%', '#', '?'. - // const imagePath = webview.webview.asWebviewUri(workspaceFile('image%02.png')); - // const response = await sendReceiveMessage(webview, { src: imagePath.toString() }); - // assert.strictEqual(response.value, true); - // } - // { - // // #102188. Resource filename containing special characters like '%', '#', '?'. - // const imagePath = webview.webview.asWebviewUri(workspaceFile('image%.png')); - // const response = await sendReceiveMessage(webview, { src: imagePath.toString() }); - // assert.strictEqual(response.value, true); - // } - { - const imagePath = webview.webview.asWebviewUri(workspaceFile('no-such-image.png')); - const response = await sendReceiveMessage(webview, { src: imagePath.toString() }); - assert.strictEqual(response.value, false); - } - { - const imagePath = webview.webview.asWebviewUri(workspaceFile('..', '..', '..', 'resources', 'linux', 'code.png')); - const response = await sendReceiveMessage(webview, { src: imagePath.toString() }); - assert.strictEqual(response.value, false); - } - }); - - test.skip('webviews should allow overriding allowed resource paths using localResourceRoots', async () => { - const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { - enableScripts: true, - localResourceRoots: [workspaceFile('sub')] - })); - - webview.webview.html = createHtmlDocumentWithBody(/*html*/` - `); - - { - const response = sendReceiveMessage(webview, { src: webview.webview.asWebviewUri(workspaceFile('sub', 'image.png')).toString() }); - assert.strictEqual((await response).value, true); - } - { - const response = sendReceiveMessage(webview, { src: webview.webview.asWebviewUri(workspaceFile('image.png')).toString() }); - assert.strictEqual((await response).value, false); - } - }); - - test.skip('webviews using hard-coded old style vscode-resource uri should work', async () => { // TODO@mjbvz https://github.com/microsoft/vscode/issues/139572 - const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { - enableScripts: true, - localResourceRoots: [workspaceFile('sub')] - })); - - const imagePath = workspaceFile('sub', 'image.png').with({ scheme: 'vscode-resource' }).toString(); - - webview.webview.html = createHtmlDocumentWithBody(/*html*/` - - `); - - const ready = getMessage(webview); - if ((await ready).userAgent.indexOf('Firefox') >= 0) { - // Skip on firefox web for now. - // Firefox service workers never seem to get any 'fetch' requests here. Other browsers work fine - return; - } - const firstResponse = await sendReceiveMessage(webview, { src: imagePath.toString() }); - - assert.strictEqual(firstResponse.value, true); - }); - - test('webviews should have real view column after they are created, #56097', async () => { - const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.Active }, { enableScripts: true })); - - // Since we used a symbolic column, we don't know what view column the webview will actually show in at first - assert.strictEqual(webview.viewColumn, undefined); - - let changed = false; - const viewStateChanged = new Promise((resolve) => { - webview.onDidChangeViewState(e => { - if (changed) { - throw new Error('Only expected a single view state change'); - } - changed = true; - resolve(e); - }, undefined, disposables); - }); - - assert.strictEqual((await viewStateChanged).webviewPanel.viewColumn, vscode.ViewColumn.One); - - const firstResponse = getMessage(webview); - webview.webview.html = createHtmlDocumentWithBody(/*html*/` - `); - - webview.webview.postMessage({ value: 1 }); - await firstResponse; - assert.strictEqual(webview.viewColumn, vscode.ViewColumn.One); - }); - - if (os.platform() === 'darwin') { - test.skip('webview can copy text from webview', async () => { - const expectedText = `webview text from: ${Date.now()}!`; - - const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true, retainContextWhenHidden: true })); - const ready = getMessage(webview); - - - webview.webview.html = createHtmlDocumentWithBody(/*html*/` - ${expectedText} - `); - await ready; - - await vscode.commands.executeCommand('editor.action.clipboardCopyAction'); - await delay(200); // Make sure copy has time to reach webview - assert.strictEqual(await vscode.env.clipboard.readText(), expectedText); - }); - } - - test.skip('webviews should transfer ArrayBuffers to and from webviews', async () => { - const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true, retainContextWhenHidden: true })); - const ready = getMessage(webview); - webview.webview.html = createHtmlDocumentWithBody(/*html*/` - `); - await ready; - - const responsePromise = getMessage(webview); - - const bufferLen = 100; - - { - const arrayBuffer = new ArrayBuffer(bufferLen); - const uint8Array = new Uint8Array(arrayBuffer); - for (let i = 0; i < bufferLen; ++i) { - uint8Array[i] = i; - } - webview.webview.postMessage({ - type: 'add1', - array: arrayBuffer - }); - } - { - const response = await responsePromise; - assert.ok(response.array instanceof ArrayBuffer); - - const uint8Array = new Uint8Array(response.array); - for (let i = 0; i < bufferLen; ++i) { - assert.strictEqual(uint8Array[i], i + 1); - } - } - }); - - test.skip('webviews should transfer Typed arrays to and from webviews', async () => { - const webview = _register(vscode.window.createWebviewPanel(webviewId, 'title', { viewColumn: vscode.ViewColumn.One }, { enableScripts: true, retainContextWhenHidden: true })); - const ready = getMessage(webview); - webview.webview.html = createHtmlDocumentWithBody(/*html*/` - `); - await ready; - - const responsePromise = getMessage(webview); - - const bufferLen = 100; - { - const arrayBuffer = new ArrayBuffer(bufferLen); - const uint8Array = new Uint8Array(arrayBuffer); - const uint16Array = new Uint16Array(arrayBuffer); - for (let i = 0; i < uint16Array.length; ++i) { - uint16Array[i] = i; - } - - webview.webview.postMessage({ - type: 'add1', - array1: uint8Array, - array2: uint16Array, - }); - } - { - const response = await responsePromise; - - assert.ok(response.array1 instanceof Uint8Array); - assert.ok(response.array2 instanceof Uint16Array); - assert.ok(response.array1.buffer === response.array2.buffer); - - const uint8Array = response.array1; - for (let i = 0; i < bufferLen; ++i) { - if (i % 2 === 0) { - assert.strictEqual(uint8Array[i], Math.floor(i / 2) + 1); - } else { - assert.strictEqual(uint8Array[i], 0); - } - } - } - }); -}); - -function createHtmlDocumentWithBody(body: string): string { - return /*html*/` - - - - - - Document - - - ${body} - -`; -} - -const statefulWebviewHtml = createHtmlDocumentWithBody(/*html*/ ` - `); - - -function getMessage(webview: vscode.WebviewPanel): Promise { - return new Promise(resolve => { - const sub = webview.webview.onDidReceiveMessage(message => { - sub.dispose(); - resolve(message); - }); - }); -} - -function sendReceiveMessage(webview: vscode.WebviewPanel, message: T): Promise { - const p = getMessage(webview); - webview.webview.postMessage(message); - return p; -} diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts index 5d004bb6db7..e32589a6800 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; import { join } from 'path'; -import { CancellationTokenSource, commands, MarkdownString, TabInputNotebook, Position, QuickPickItem, Selection, StatusBarAlignment, TextEditor, TextEditorSelectionChangeKind, TextEditorViewColumnChangeEvent, TabInputText, Uri, ViewColumn, window, workspace, TabInputTextDiff } from 'vscode'; +import { CancellationTokenSource, commands, MarkdownString, TabInputNotebook, Position, QuickPickItem, Selection, StatusBarAlignment, TextEditor, TextEditorSelectionChangeKind, TextEditorViewColumnChangeEvent, TabInputText, Uri, ViewColumn, window, workspace, TabInputTextDiff, UIKind, env } from 'vscode'; import { assertNoRpc, closeAllEditors, createRandomFile, pathEquals } from '../utils'; @@ -40,13 +40,13 @@ suite('vscode API - window', () => { test('editor, assign and check view columns', async () => { const doc = await workspace.openTextDocument(join(workspace.rootPath || '', './far.js')); - let p1 = window.showTextDocument(doc, ViewColumn.One).then(editor => { + const p1 = window.showTextDocument(doc, ViewColumn.One).then(editor => { assert.strictEqual(editor.viewColumn, ViewColumn.One); }); - let p2 = window.showTextDocument(doc, ViewColumn.Two).then(editor_1 => { + const p2 = window.showTextDocument(doc, ViewColumn.Two).then(editor_1 => { assert.strictEqual(editor_1.viewColumn, ViewColumn.Two); }); - let p3 = window.showTextDocument(doc, ViewColumn.Three).then(editor_2 => { + const p3 = window.showTextDocument(doc, ViewColumn.Three).then(editor_2 => { assert.strictEqual(editor_2.viewColumn, ViewColumn.Three); }); return Promise.all([p1, p2, p3]); @@ -54,7 +54,7 @@ suite('vscode API - window', () => { test('editor, onDidChangeVisibleTextEditors', async () => { let eventCounter = 0; - let reg = window.onDidChangeVisibleTextEditors(_editor => { + const reg = window.onDidChangeVisibleTextEditors(_editor => { eventCounter += 1; }); @@ -75,7 +75,7 @@ suite('vscode API - window', () => { let actualEvent: TextEditorViewColumnChangeEvent; - let registration1 = workspace.registerTextDocumentContentProvider('bikes', { + const registration1 = workspace.registerTextDocumentContentProvider('bikes', { provideTextDocumentContent() { return 'mountainbiking,roadcycling'; } @@ -86,10 +86,10 @@ suite('vscode API - window', () => { workspace.openTextDocument(Uri.parse('bikes://testing/two')).then(doc => window.showTextDocument(doc, ViewColumn.Two)) ]).then(async editors => { - let [one, two] = editors; + const [one, two] = editors; await new Promise(resolve => { - let registration2 = window.onDidChangeTextEditorViewColumn(event => { + const registration2 = window.onDidChangeTextEditorViewColumn(event => { actualEvent = event; registration2.dispose(); resolve(); @@ -107,9 +107,9 @@ suite('vscode API - window', () => { test('editor, onDidChangeTextEditorViewColumn (move editor group)', () => { - let actualEvents: TextEditorViewColumnChangeEvent[] = []; + const actualEvents: TextEditorViewColumnChangeEvent[] = []; - let registration1 = workspace.registerTextDocumentContentProvider('bikes', { + const registration1 = workspace.registerTextDocumentContentProvider('bikes', { provideTextDocumentContent() { return 'mountainbiking,roadcycling'; } @@ -120,12 +120,12 @@ suite('vscode API - window', () => { workspace.openTextDocument(Uri.parse('bikes://testing/two')).then(doc => window.showTextDocument(doc, ViewColumn.Two)) ]).then(editors => { - let [, two] = editors; + const [, two] = editors; two.show(); return new Promise(resolve => { - let registration2 = window.onDidChangeTextEditorViewColumn(event => { + const registration2 = window.onDidChangeTextEditorViewColumn(event => { actualEvents.push(event); if (actualEvents.length === 2) { @@ -182,10 +182,10 @@ suite('vscode API - window', () => { workspace.openTextDocument(randomFile2) ]); for (let c = 0; c < 4; c++) { - let editorA = await window.showTextDocument(docA, ViewColumn.One); + const editorA = await window.showTextDocument(docA, ViewColumn.One); assertActiveEditor(editorA); - let editorB = await window.showTextDocument(docB, ViewColumn.Two); + const editorB = await window.showTextDocument(docB, ViewColumn.Two); assertActiveEditor(editorB); } }); @@ -207,9 +207,25 @@ suite('vscode API - window', () => { } })); + // verify the result array matches our expectations: depending + // on execution time there are 2 possible results for the first + // two entries. For the last entry there is only the `fileC` URI + // as expected result because it is the last editor opened. + // - either `undefined` indicating that the opening of the editor + // was cancelled by the next editor opening + // - or the expected `URI` that was opened in case it suceeds + assert.strictEqual(result.length, 3); - assert.strictEqual(result[0], undefined); - assert.strictEqual(result[1], undefined); + if (result[0]) { + assert.strictEqual(result[0].toString(), fileA.toString()); + } else { + assert.strictEqual(result[0], undefined); + } + if (result[1]) { + assert.strictEqual(result[1].toString(), fileB.toString()); + } else { + assert.strictEqual(result[1], undefined); + } assert.strictEqual(result[2]?.toString(), fileC.toString()); }); @@ -311,7 +327,7 @@ suite('vscode API - window', () => { const file30Path = join(workspace.rootPath || '', './30linefile.ts'); let finished = false; - let failOncePlease = (err: Error) => { + const failOncePlease = (err: Error) => { if (finished) { return; } @@ -319,7 +335,7 @@ suite('vscode API - window', () => { done(err); }; - let passOncePlease = () => { + const passOncePlease = () => { if (finished) { return; } @@ -327,10 +343,10 @@ suite('vscode API - window', () => { done(null); }; - let subscription = window.onDidChangeTextEditorSelection((e) => { - let lineCount = e.textEditor.document.lineCount; - let pos1 = e.textEditor.selections[0].active.line; - let pos2 = e.selections[0].active.line; + const subscription = window.onDidChangeTextEditorSelection((e) => { + const lineCount = e.textEditor.document.lineCount; + const pos1 = e.textEditor.selections[0].active.line; + const pos2 = e.selections[0].active.line; if (pos1 !== pos2) { failOncePlease(new Error('received invalid selection changed event!')); @@ -433,7 +449,7 @@ suite('vscode API - window', () => { assert.strictEqual(tabs[3].input.uri.toString(), commandFile.toString()); }); - test('Tabs - Ensure tabs getter is correct', async function () { + (env.uiKind === UIKind.Web ? test.skip : test)('Tabs - Ensure tabs getter is correct', async function () { // Reduce test timeout as this test should be quick, so even with 3 retries it will be under 60s. this.timeout(10000); // This test can be flaky because of opening a notebook @@ -714,7 +730,7 @@ suite('vscode API - window', () => { test('#7013 - input without options', function () { const source = new CancellationTokenSource(); - let p = window.showInputBox(undefined, source.token); + const p = window.showInputBox(undefined, source.token); assert.ok(typeof p === 'object'); source.dispose(); }); @@ -990,7 +1006,7 @@ suite('vscode API - window', () => { return new Promise((resolve, _reject) => { - let subscription = window.onDidChangeTextEditorSelection(e => { + const subscription = window.onDidChangeTextEditorSelection(e => { assert.ok(e.textEditor === editor); assert.strictEqual(e.kind, TextEditorSelectionChangeKind.Command); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts index a7b497e5467..18d2a8824a7 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import { commands, ConfigurationTarget, CustomExecution, Disposable, env, Event, EventEmitter, Pseudoterminal, ShellExecution, Task, TaskDefinition, TaskExecution, TaskProcessStartEvent, tasks, TaskScope, Terminal, UIKind, window, workspace } from 'vscode'; +import { commands, ConfigurationTarget, CustomExecution, Disposable, env, Event, EventEmitter, Pseudoterminal, ShellExecution, Task, TaskDefinition, TaskProcessStartEvent, tasks, TaskScope, Terminal, UIKind, window, workspace } from 'vscode'; import { assertNoRpc } from '../utils'; // Disable tasks tests: @@ -24,7 +24,7 @@ import { assertNoRpc } from '../utils'; }); suite('Tasks', () => { - let disposables: Disposable[] = []; + const disposables: Disposable[] = []; teardown(() => { assertNoRpc(); @@ -57,7 +57,6 @@ import { assertNoRpc } from '../utils'; }); const task = new Task({ type: 'testTask' }, TaskScope.Workspace, 'echo', 'testTask', new ShellExecution('echo', ['hello test'])); - let taskExecution: TaskExecution | undefined; disposables.push(tasks.onDidStartTaskProcess(async (e) => { await taskExecutionShouldBeSet; @@ -74,7 +73,7 @@ import { assertNoRpc } from '../utils'; progressMade.fire(); } })); - taskExecution = await tasks.executeTask(task); + const taskExecution = await tasks.executeTask(task); executeDoneEvent.fire(); await testDonePromise; }); @@ -147,7 +146,7 @@ import { assertNoRpc } from '../utils'; suite('CustomExecution', () => { test('task should start and shutdown successfully', async () => { window.terminals.forEach(terminal => terminal.dispose()); - interface CustomTestingTaskDefinition extends TaskDefinition { + interface ICustomTestingTaskDefinition extends TaskDefinition { /** * One of the task properties. This can be used to customize the task in the tasks.json */ @@ -179,7 +178,7 @@ import { assertNoRpc } from '../utils'; disposables.push(tasks.registerTaskProvider(taskType, { provideTasks: () => { const result: Task[] = []; - const kind: CustomTestingTaskDefinition = { + const kind: ICustomTestingTaskDefinition = { type: taskType, customProp1: 'testing task one' }; @@ -235,7 +234,7 @@ import { assertNoRpc } from '../utils'; }); test('sync task should flush all data on close', async () => { - interface CustomTestingTaskDefinition extends TaskDefinition { + interface ICustomTestingTaskDefinition extends TaskDefinition { /** * One of the task properties. This can be used to customize the task in the tasks.json */ @@ -250,7 +249,7 @@ import { assertNoRpc } from '../utils'; disposables.push(tasks.registerTaskProvider(taskType, { provideTasks: () => { const result: Task[] = []; - const kind: CustomTestingTaskDefinition = { + const kind: ICustomTestingTaskDefinition = { type: taskType, customProp1: 'testing task one' }; diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts index 4337e8043c8..f1b76a3e515 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts @@ -131,14 +131,16 @@ suite('vscode API - workspace', () => { assert.strictEqual(doc.uri.scheme, 'untitled'); assert.ok(doc.isDirty); - let closed: vscode.TextDocument; - let d0 = vscode.workspace.onDidCloseTextDocument(e => closed = e); + const closedDocuments: vscode.TextDocument[] = []; + const d0 = vscode.workspace.onDidCloseTextDocument(e => closedDocuments.push(e)); return vscode.window.showTextDocument(doc).then(() => { return doc.save().then((didSave: boolean) => { assert.strictEqual(didSave, true, `FAILED to save${doc.uri.toString()}`); + const closed = closedDocuments.filter(close => close.uri.toString() === doc.uri.toString())[0]; + assert.ok(closed); assert.ok(closed === doc); assert.ok(!doc.isDirty); assert.ok(fs.existsSync(path)); @@ -153,7 +155,7 @@ suite('vscode API - workspace', () => { test('openTextDocument, uri scheme/auth/path', function () { - let registration = vscode.workspace.registerTextDocumentContentProvider('sc', { + const registration = vscode.workspace.registerTextDocumentContentProvider('sc', { provideTextDocumentContent() { return 'SC'; } @@ -182,28 +184,28 @@ suite('vscode API - workspace', () => { const fs = new TestFS('this-fs', false); const reg = vscode.workspace.registerFileSystemProvider(fs.scheme, fs, { isCaseSensitive: fs.isCaseSensitive }); - let uriOne = vscode.Uri.parse('this-fs:/one'); - let uriTwo = vscode.Uri.parse('this-fs:/two'); - let uriONE = vscode.Uri.parse('this-fs:/ONE'); // same resource, different uri - let uriTWO = vscode.Uri.parse('this-fs:/TWO'); + const uriOne = vscode.Uri.parse('this-fs:/one'); + const uriTwo = vscode.Uri.parse('this-fs:/two'); + const uriONE = vscode.Uri.parse('this-fs:/ONE'); // same resource, different uri + const uriTWO = vscode.Uri.parse('this-fs:/TWO'); fs.writeFile(uriOne, Buffer.from('one'), { create: true, overwrite: true }); fs.writeFile(uriTwo, Buffer.from('two'), { create: true, overwrite: true }); // lower case (actual case) comes first - let docOne = await vscode.workspace.openTextDocument(uriOne); + const docOne = await vscode.workspace.openTextDocument(uriOne); assert.strictEqual(docOne.uri.toString(), uriOne.toString()); - let docONE = await vscode.workspace.openTextDocument(uriONE); + const docONE = await vscode.workspace.openTextDocument(uriONE); assert.strictEqual(docONE === docOne, true); assert.strictEqual(docONE.uri.toString(), uriOne.toString()); assert.strictEqual(docONE.uri.toString() !== uriONE.toString(), true); // yep // upper case (NOT the actual case) comes first - let docTWO = await vscode.workspace.openTextDocument(uriTWO); + const docTWO = await vscode.workspace.openTextDocument(uriTWO); assert.strictEqual(docTWO.uri.toString(), uriTWO.toString()); - let docTwo = await vscode.workspace.openTextDocument(uriTwo); + const docTwo = await vscode.workspace.openTextDocument(uriTwo); assert.strictEqual(docTWO === docTwo, true); assert.strictEqual(docTwo.uri.toString(), uriTWO.toString()); assert.strictEqual(docTwo.uri.toString() !== uriTwo.toString(), true); // yep @@ -264,7 +266,7 @@ suite('vscode API - workspace', () => { test('eol, change via onWillSave', async function () { let called = false; - let sub = vscode.workspace.onWillSaveTextDocument(e => { + const sub = vscode.workspace.onWillSaveTextDocument(e => { called = true; e.waitUntil(Promise.resolve([vscode.TextEdit.setEndOfLine(vscode.EndOfLine.LF)])); }); @@ -286,33 +288,27 @@ suite('vscode API - workspace', () => { sub.dispose(); }); - function assertEqualPath(a: string, b: string): void { - assert.ok(pathEquals(a, b), `${a} <-> ${b}`); - } test('events: onDidOpenTextDocument, onDidChangeTextDocument, onDidSaveTextDocument', async () => { const file = await createRandomFile(); - let disposables: vscode.Disposable[] = []; + const disposables: vscode.Disposable[] = []; await revertAllDirty(); // needed for a clean state for `onDidSaveTextDocument` (#102365) - let pendingAsserts: Function[] = []; - let onDidOpenTextDocument = false; + const onDidOpenTextDocument = new Set(); + const onDidChangeTextDocument = new Set(); + const onDidSaveTextDocument = new Set(); + disposables.push(vscode.workspace.onDidOpenTextDocument(e => { - pendingAsserts.push(() => assertEqualPath(e.uri.fsPath, file.fsPath)); - onDidOpenTextDocument = true; + onDidOpenTextDocument.add(e); })); - let onDidChangeTextDocument = false; disposables.push(vscode.workspace.onDidChangeTextDocument(e => { - pendingAsserts.push(() => assertEqualPath(e.document.uri.fsPath, file.fsPath)); - onDidChangeTextDocument = true; + onDidChangeTextDocument.add(e.document); })); - let onDidSaveTextDocument = false; disposables.push(vscode.workspace.onDidSaveTextDocument(e => { - pendingAsserts.push(() => assertEqualPath(e.uri.fsPath, file.fsPath)); - onDidSaveTextDocument = true; + onDidSaveTextDocument.add(e); })); const doc = await vscode.workspace.openTextDocument(file); @@ -323,25 +319,24 @@ suite('vscode API - workspace', () => { }); await doc.save(); - assert.ok(onDidOpenTextDocument); - assert.ok(onDidChangeTextDocument); - assert.ok(onDidSaveTextDocument); - pendingAsserts.forEach(assert => assert()); + assert.ok(Array.from(onDidOpenTextDocument).find(e => e.uri.toString() === file.toString()), 'did Open: ' + file.toString()); + assert.ok(Array.from(onDidChangeTextDocument).find(e => e.uri.toString() === file.toString()), 'did Change: ' + file.toString()); + assert.ok(Array.from(onDidSaveTextDocument).find(e => e.uri.toString() === file.toString()), 'did Save: ' + file.toString()); + disposeAll(disposables); return deleteFile(file); }); test('events: onDidSaveTextDocument fires even for non dirty file when saved', async () => { const file = await createRandomFile(); - let disposables: vscode.Disposable[] = []; - let pendingAsserts: Function[] = []; + const disposables: vscode.Disposable[] = []; await revertAllDirty(); // needed for a clean state for `onDidSaveTextDocument` (#102365) - let onDidSaveTextDocument = false; + const onDidSaveTextDocument = new Set(); + disposables.push(vscode.workspace.onDidSaveTextDocument(e => { - pendingAsserts.push(() => assertEqualPath(e.uri.fsPath, file.fsPath)); - onDidSaveTextDocument = true; + onDidSaveTextDocument.add(e); })); const doc = await vscode.workspace.openTextDocument(file); @@ -349,7 +344,7 @@ suite('vscode API - workspace', () => { await vscode.commands.executeCommand('workbench.action.files.save'); assert.ok(onDidSaveTextDocument); - pendingAsserts.forEach(fn => fn()); + assert.ok(Array.from(onDidSaveTextDocument).find(e => e.uri.toString() === file.toString()), 'did Save: ' + file.toString()); disposeAll(disposables); return deleteFile(file); }); @@ -369,7 +364,7 @@ suite('vscode API - workspace', () => { test('registerTextDocumentContentProvider, simple', function () { - let registration = vscode.workspace.registerTextDocumentContentProvider('foo', { + const registration = vscode.workspace.registerTextDocumentContentProvider('foo', { provideTextDocumentContent(uri) { return uri.toString(); } @@ -406,7 +401,7 @@ suite('vscode API - workspace', () => { test('registerTextDocumentContentProvider, multiple', function () { // duplicate registration - let registration1 = vscode.workspace.registerTextDocumentContentProvider('foo', { + const registration1 = vscode.workspace.registerTextDocumentContentProvider('foo', { provideTextDocumentContent(uri) { if (uri.authority === 'foo') { return '1'; @@ -414,7 +409,7 @@ suite('vscode API - workspace', () => { return undefined; } }); - let registration2 = vscode.workspace.registerTextDocumentContentProvider('foo', { + const registration2 = vscode.workspace.registerTextDocumentContentProvider('foo', { provideTextDocumentContent(uri) { if (uri.authority === 'bar') { return '2'; @@ -435,12 +430,12 @@ suite('vscode API - workspace', () => { test('registerTextDocumentContentProvider, evil provider', function () { // duplicate registration - let registration1 = vscode.workspace.registerTextDocumentContentProvider('foo', { + const registration1 = vscode.workspace.registerTextDocumentContentProvider('foo', { provideTextDocumentContent(_uri) { return '1'; } }); - let registration2 = vscode.workspace.registerTextDocumentContentProvider('foo', { + const registration2 = vscode.workspace.registerTextDocumentContentProvider('foo', { provideTextDocumentContent(_uri): string { throw new Error('fail'); } @@ -455,7 +450,7 @@ suite('vscode API - workspace', () => { test('registerTextDocumentContentProvider, invalid text', function () { - let registration = vscode.workspace.registerTextDocumentContentProvider('foo', { + const registration = vscode.workspace.registerTextDocumentContentProvider('foo', { provideTextDocumentContent(_uri) { return 123; } @@ -470,7 +465,7 @@ suite('vscode API - workspace', () => { test('registerTextDocumentContentProvider, show virtual document', function () { - let registration = vscode.workspace.registerTextDocumentContentProvider('foo', { + const registration = vscode.workspace.registerTextDocumentContentProvider('foo', { provideTextDocumentContent(_uri) { return 'I am virtual'; } @@ -489,7 +484,7 @@ suite('vscode API - workspace', () => { test('registerTextDocumentContentProvider, open/open document', function () { let callCount = 0; - let registration = vscode.workspace.registerTextDocumentContentProvider('foo', { + const registration = vscode.workspace.registerTextDocumentContentProvider('foo', { provideTextDocumentContent(_uri) { callCount += 1; return 'I am virtual'; @@ -499,7 +494,7 @@ suite('vscode API - workspace', () => { const uri = vscode.Uri.parse('foo://testing/path'); return Promise.all([vscode.workspace.openTextDocument(uri), vscode.workspace.openTextDocument(uri)]).then(docs => { - let [first, second] = docs; + const [first, second] = docs; assert.ok(first === second); assert.ok(vscode.workspace.textDocuments.some(doc => doc.uri.toString() === uri.toString())); assert.strictEqual(callCount, 1); @@ -509,7 +504,7 @@ suite('vscode API - workspace', () => { test('registerTextDocumentContentProvider, empty doc', function () { - let registration = vscode.workspace.registerTextDocumentContentProvider('foo', { + const registration = vscode.workspace.registerTextDocumentContentProvider('foo', { provideTextDocumentContent(_uri) { return ''; } @@ -527,9 +522,9 @@ suite('vscode API - workspace', () => { test('registerTextDocumentContentProvider, change event', async function () { let callCount = 0; - let emitter = new vscode.EventEmitter(); + const emitter = new vscode.EventEmitter(); - let registration = vscode.workspace.registerTextDocumentContentProvider('foo', { + const registration = vscode.workspace.registerTextDocumentContentProvider('foo', { onDidChange: emitter.event, provideTextDocumentContent(_uri) { return 'call' + (callCount++); @@ -544,7 +539,7 @@ suite('vscode API - workspace', () => { return new Promise(resolve => { - let subscription = vscode.workspace.onDidChangeTextDocument(event => { + const subscription = vscode.workspace.onDidChangeTextDocument(event => { assert.ok(event.document === doc); assert.strictEqual(event.document.getText(), 'call1'); subscription.dispose(); @@ -635,10 +630,10 @@ suite('vscode API - workspace', () => { test('applyEdit', async () => { const doc = await vscode.workspace.openTextDocument(vscode.Uri.parse('untitled:' + join(vscode.workspace.rootPath || '', './new2.txt'))); - let edit = new vscode.WorkspaceEdit(); + const edit = new vscode.WorkspaceEdit(); edit.insert(doc.uri, new vscode.Position(0, 0), new Array(1000).join('Hello World')); - let success = await vscode.workspace.applyEdit(edit); + const success = await vscode.workspace.applyEdit(edit); assert.strictEqual(success, true); assert.strictEqual(doc.isDirty, true); }); @@ -650,7 +645,7 @@ suite('vscode API - workspace', () => { edit.deleteFile(resource); edit.insert(resource, new vscode.Position(0, 0), ''); - let success = await vscode.workspace.applyEdit(edit); + const success = await vscode.workspace.applyEdit(edit); assert.strictEqual(success, false); })); @@ -661,7 +656,7 @@ suite('vscode API - workspace', () => { edit.deleteFile(resource); edit.renameFile(resource, resource); - let success = await vscode.workspace.applyEdit(edit); + const success = await vscode.workspace.applyEdit(edit); assert.strictEqual(success, false); })); @@ -672,7 +667,7 @@ suite('vscode API - workspace', () => { edit.renameFile(resource, newResource); edit.insert(resource, new vscode.Position(0, 0), ''); - let success = await vscode.workspace.applyEdit(edit); + const success = await vscode.workspace.applyEdit(edit); assert.strictEqual(success, false); })); @@ -698,7 +693,7 @@ suite('vscode API - workspace', () => { assert.ok(await vscode.workspace.applyEdit(edit)); - let doc = await vscode.workspace.openTextDocument(newUri); + const doc = await vscode.workspace.openTextDocument(newUri); assert.strictEqual(doc.getText(), 'AFTERBEFORE'); assert.strictEqual(doc.isDirty, true); } @@ -708,25 +703,25 @@ suite('vscode API - workspace', () => { } test('WorkspaceEdit: applying edits before and after rename duplicates resource #42633', withLogDisabled(async function () { - let docUri = await createRandomFile(); - let newUri = nameWithUnderscore(docUri); + const docUri = await createRandomFile(); + const newUri = nameWithUnderscore(docUri); - let we = new vscode.WorkspaceEdit(); + const we = new vscode.WorkspaceEdit(); we.insert(docUri, new vscode.Position(0, 0), 'Hello'); we.insert(docUri, new vscode.Position(0, 0), 'Foo'); we.renameFile(docUri, newUri); we.insert(newUri, new vscode.Position(0, 0), 'Bar'); assert.ok(await vscode.workspace.applyEdit(we)); - let doc = await vscode.workspace.openTextDocument(newUri); + const doc = await vscode.workspace.openTextDocument(newUri); assert.strictEqual(doc.getText(), 'BarHelloFoo'); })); test('WorkspaceEdit: Problem recreating a renamed resource #42634', withLogDisabled(async function () { - let docUri = await createRandomFile(); - let newUri = nameWithUnderscore(docUri); + const docUri = await createRandomFile(); + const newUri = nameWithUnderscore(docUri); - let we = new vscode.WorkspaceEdit(); + const we = new vscode.WorkspaceEdit(); we.insert(docUri, new vscode.Position(0, 0), 'Hello'); we.insert(docUri, new vscode.Position(0, 0), 'Foo'); we.renameFile(docUri, newUri); @@ -736,15 +731,15 @@ suite('vscode API - workspace', () => { assert.ok(await vscode.workspace.applyEdit(we)); - let newDoc = await vscode.workspace.openTextDocument(newUri); + const newDoc = await vscode.workspace.openTextDocument(newUri); assert.strictEqual(newDoc.getText(), 'HelloFoo'); - let doc = await vscode.workspace.openTextDocument(docUri); + const doc = await vscode.workspace.openTextDocument(docUri); assert.strictEqual(doc.getText(), 'Bar'); })); test('WorkspaceEdit api - after saving a deleted file, it still shows up as deleted. #42667', withLogDisabled(async function () { - let docUri = await createRandomFile(); - let we = new vscode.WorkspaceEdit(); + const docUri = await createRandomFile(); + const we = new vscode.WorkspaceEdit(); we.deleteFile(docUri); we.insert(docUri, new vscode.Position(0, 0), 'InsertText'); @@ -759,14 +754,14 @@ suite('vscode API - workspace', () => { test('WorkspaceEdit: edit and rename parent folder duplicates resource #42641', async function () { - let dir = vscode.Uri.parse(`${testFs.scheme}:/before-${rndName()}`); + const dir = vscode.Uri.parse(`${testFs.scheme}:/before-${rndName()}`); await testFs.createDirectory(dir); - let docUri = await createRandomFile('', dir); - let docParent = docUri.with({ path: posix.dirname(docUri.path) }); - let newParent = nameWithUnderscore(docParent); + const docUri = await createRandomFile('', dir); + const docParent = docUri.with({ path: posix.dirname(docUri.path) }); + const newParent = nameWithUnderscore(docParent); - let we = new vscode.WorkspaceEdit(); + const we = new vscode.WorkspaceEdit(); we.insert(docUri, new vscode.Position(0, 0), 'Hello'); we.renameFile(docParent, newParent); @@ -779,30 +774,30 @@ suite('vscode API - workspace', () => { assert.ok(true); } - let newUri = newParent.with({ path: posix.join(newParent.path, posix.basename(docUri.path)) }); - let doc = await vscode.workspace.openTextDocument(newUri); + const newUri = newParent.with({ path: posix.join(newParent.path, posix.basename(docUri.path)) }); + const doc = await vscode.workspace.openTextDocument(newUri); assert.ok(doc); assert.strictEqual(doc.getText(), 'Hello'); }); test('WorkspaceEdit: rename resource followed by edit does not work #42638', withLogDisabled(async function () { - let docUri = await createRandomFile(); - let newUri = nameWithUnderscore(docUri); + const docUri = await createRandomFile(); + const newUri = nameWithUnderscore(docUri); - let we = new vscode.WorkspaceEdit(); + const we = new vscode.WorkspaceEdit(); we.renameFile(docUri, newUri); we.insert(newUri, new vscode.Position(0, 0), 'Hello'); assert.ok(await vscode.workspace.applyEdit(we)); - let doc = await vscode.workspace.openTextDocument(newUri); + const doc = await vscode.workspace.openTextDocument(newUri); assert.strictEqual(doc.getText(), 'Hello'); })); test('WorkspaceEdit: create & override', withLogDisabled(async function () { - let docUri = await createRandomFile('before'); + const docUri = await createRandomFile('before'); let we = new vscode.WorkspaceEdit(); we.createFile(docUri); @@ -816,7 +811,7 @@ suite('vscode API - workspace', () => { })); test('WorkspaceEdit: create & ignoreIfExists', withLogDisabled(async function () { - let docUri = await createRandomFile('before'); + const docUri = await createRandomFile('before'); let we = new vscode.WorkspaceEdit(); we.createFile(docUri, { ignoreIfExists: true }); @@ -830,8 +825,8 @@ suite('vscode API - workspace', () => { })); test('WorkspaceEdit: rename & ignoreIfExists', withLogDisabled(async function () { - let aUri = await createRandomFile('aaa'); - let bUri = await createRandomFile('bbb'); + const aUri = await createRandomFile('aaa'); + const bUri = await createRandomFile('bbb'); let we = new vscode.WorkspaceEdit(); we.renameFile(aUri, bUri); @@ -852,7 +847,7 @@ suite('vscode API - workspace', () => { test('WorkspaceEdit: delete & ignoreIfNotExists', withLogDisabled(async function () { - let docUri = await createRandomFile(); + const docUri = await createRandomFile(); let we = new vscode.WorkspaceEdit(); we.deleteFile(docUri, { ignoreIfNotExists: false }); assert.ok(await vscode.workspace.applyEdit(we)); @@ -868,14 +863,14 @@ suite('vscode API - workspace', () => { test('WorkspaceEdit: insert & rename multiple', async function () { - let [f1, f2, f3] = await Promise.all([createRandomFile(), createRandomFile(), createRandomFile()]); + const [f1, f2, f3] = await Promise.all([createRandomFile(), createRandomFile(), createRandomFile()]); - let we = new vscode.WorkspaceEdit(); + const we = new vscode.WorkspaceEdit(); we.insert(f1, new vscode.Position(0, 0), 'f1'); we.insert(f2, new vscode.Position(0, 0), 'f2'); we.insert(f3, new vscode.Position(0, 0), 'f3'); - let f1_ = nameWithUnderscore(f1); + const f1_ = nameWithUnderscore(f1); we.renameFile(f1, f1_); assert.ok(await vscode.workspace.applyEdit(we)); @@ -911,7 +906,7 @@ suite('vscode API - workspace', () => { } for (let i = 0; i < 4; i++) { - let we = new vscode.WorkspaceEdit(); + const we = new vscode.WorkspaceEdit(); let oldUri: vscode.Uri; let newUri: vscode.Uri; let expected: string; @@ -946,7 +941,7 @@ suite('vscode API - workspace', () => { test('The api workspace.applyEdit failed for some case of mixing resourceChange and textEdit #80688', async function () { const file1 = await createRandomFile(); const file2 = await createRandomFile(); - let we = new vscode.WorkspaceEdit(); + const we = new vscode.WorkspaceEdit(); we.insert(file1, new vscode.Position(0, 0), 'import1;'); const file2Name = basename(file2.fsPath); @@ -965,7 +960,7 @@ suite('vscode API - workspace', () => { test('The api workspace.applyEdit failed for some case of mixing resourceChange and textEdit #80688', async function () { const file1 = await createRandomFile(); const file2 = await createRandomFile(); - let we = new vscode.WorkspaceEdit(); + const we = new vscode.WorkspaceEdit(); we.insert(file1, new vscode.Position(0, 0), 'import1;'); we.insert(file1, new vscode.Position(0, 0), 'import2;'); @@ -990,7 +985,7 @@ suite('vscode API - workspace', () => { const file2New = await createRandomFile(); const event = new Promise(resolve => { - let sub = vscode.workspace.onWillRenameFiles(e => { + const sub = vscode.workspace.onWillRenameFiles(e => { sub.dispose(); resolve(e); }); @@ -1035,7 +1030,7 @@ suite('vscode API - workspace', () => { test('Should send a single FileWillRenameEvent instead of separate events when moving multiple files at once#111867, 2/3', async function () { const event = new Promise(resolve => { - let sub = vscode.workspace.onWillCreateFiles(e => { + const sub = vscode.workspace.onWillCreateFiles(e => { sub.dispose(); resolve(e); }); @@ -1062,7 +1057,7 @@ suite('vscode API - workspace', () => { const file2 = await createRandomFile(); const event = new Promise(resolve => { - let sub = vscode.workspace.onWillDeleteFiles(e => { + const sub = vscode.workspace.onWillDeleteFiles(e => { sub.dispose(); resolve(e); }); @@ -1154,4 +1149,41 @@ suite('vscode API - workspace', () => { assert.strictEqual(document.isDirty, false); } }); + + test('SnippetString in WorkspaceEdit', async function (): Promise { + const file = await createRandomFile('hello\nworld'); + + const document = await vscode.workspace.openTextDocument(file); + const edt = await vscode.window.showTextDocument(document); + + assert.ok(edt === vscode.window.activeTextEditor); + + const we = new vscode.WorkspaceEdit(); + we.set(document.uri, [new vscode.SnippetTextEdit(new vscode.Range(0, 0, 0, 0), new vscode.SnippetString('${1:foo}${2:bar}'))]); + const success = await vscode.workspace.applyEdit(we); + if (edt !== vscode.window.activeTextEditor) { + return this.skip(); + } + + assert.ok(success); + assert.strictEqual(document.getText(), 'foobarhello\nworld'); + assert.deepStrictEqual(edt.selections, [new vscode.Selection(0, 0, 0, 3)]); + }); + + + test('Support creating binary files in a WorkspaceEdit', async function (): Promise { + + const fileUri = vscode.Uri.parse(`${testFs.scheme}:/${rndName()}`); + const data = Buffer.from('Hello Binary Files'); + + const ws = new vscode.WorkspaceEdit(); + ws.createFile(fileUri, { contents: data, ignoreIfExists: false, overwrite: false }); + + const success = await vscode.workspace.applyEdit(ws); + assert.ok(success); + + const actual = await vscode.workspace.fs.readFile(fileUri); + + assert.deepStrictEqual(actual, data); + }); }); diff --git a/extensions/vscode-api-tests/src/utils.ts b/extensions/vscode-api-tests/src/utils.ts index c5a8e58483f..7c506694289 100644 --- a/extensions/vscode-api-tests/src/utils.ts +++ b/extensions/vscode-api-tests/src/utils.ts @@ -125,11 +125,12 @@ export function assertNoRpcFromEntry(entry: [obj: any, name: string]) { } export async function asPromise(event: vscode.Event, timeout = vscode.env.uiKind === vscode.UIKind.Desktop ? 5000 : 15000): Promise { + const error = new Error('asPromise TIMEOUT reached'); return new Promise((resolve, reject) => { const handle = setTimeout(() => { sub.dispose(); - reject(new Error('asPromise TIMEOUT reached')); + reject(error); }, timeout); const sub = event(e => { @@ -183,3 +184,61 @@ export async function poll( trial++; } } + +export type ValueCallback = (value: T | Promise) => void; + +/** + * Creates a promise whose resolution or rejection can be controlled imperatively. + */ +export class DeferredPromise { + + private completeCallback!: ValueCallback; + private errorCallback!: (err: unknown) => void; + private rejected = false; + private resolved = false; + + public get isRejected() { + return this.rejected; + } + + public get isResolved() { + return this.resolved; + } + + public get isSettled() { + return this.rejected || this.resolved; + } + + public readonly p: Promise; + + constructor() { + this.p = new Promise((c, e) => { + this.completeCallback = c; + this.errorCallback = e; + }); + } + + public complete(value: T) { + return new Promise(resolve => { + this.completeCallback(value); + this.resolved = true; + resolve(); + }); + } + + public error(err: unknown) { + return new Promise(resolve => { + this.errorCallback(err); + this.rejected = true; + resolve(); + }); + } + + public cancel() { + new Promise(resolve => { + this.errorCallback(new Error('Canceled')); + this.rejected = true; + resolve(); + }); + } +} diff --git a/extensions/vscode-colorize-tests/src/colorizer.test.ts b/extensions/vscode-colorize-tests/src/colorizer.test.ts index b2cc751f8b0..0ba416b5f87 100644 --- a/extensions/vscode-colorize-tests/src/colorizer.test.ts +++ b/extensions/vscode-colorize-tests/src/colorizer.test.ts @@ -17,17 +17,17 @@ function assertUnchangedTokens(fixturesPath: string, resultsPath: string, fixtur if (!fs.existsSync(resultsPath)) { fs.mkdirSync(resultsPath); } - let resultPath = join(resultsPath, fixture.replace('.', '_') + '.json'); + const resultPath = join(resultsPath, fixture.replace('.', '_') + '.json'); if (fs.existsSync(resultPath)) { - let previousData = JSON.parse(fs.readFileSync(resultPath).toString()); + const previousData = JSON.parse(fs.readFileSync(resultPath).toString()); try { assert.deepStrictEqual(data, previousData); } catch (e) { fs.writeFileSync(resultPath, JSON.stringify(data, null, '\t'), { flag: 'w' }); if (Array.isArray(data) && Array.isArray(previousData) && data.length === previousData.length) { for (let i = 0; i < data.length; i++) { - let d = data[i]; - let p = previousData[i]; + const d = data[i]; + const p = previousData[i]; if (d.c !== p.c || hasThemeChange(d.r, p.r)) { throw e; } @@ -48,8 +48,8 @@ function assertUnchangedTokens(fixturesPath: string, resultsPath: string, fixtur } function hasThemeChange(d: any, p: any): boolean { - let keys = Object.keys(d); - for (let key of keys) { + const keys = Object.keys(d); + for (const key of keys) { if (d[key] !== p[key]) { return true; } diff --git a/extensions/vscode-colorize-tests/test/colorize-fixtures/makefile b/extensions/vscode-colorize-tests/test/colorize-fixtures/makefile index 3f77d04fa52..32daa0c97af 100644 --- a/extensions/vscode-colorize-tests/test/colorize-fixtures/makefile +++ b/extensions/vscode-colorize-tests/test/colorize-fixtures/makefile @@ -77,6 +77,10 @@ var!=echo val var:=val \ notvar=butval var:=$(val:.c=.o) +var:=blah#comment +var?=blah\#not_a_comment +var:=blah\\#comment +var!=blah\\\#not_a_comment var-$(nested-var)=val diff --git a/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json b/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json index 75021ecfe32..3989f39d021 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/12750_html.json @@ -40,9 +40,9 @@ "t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -479,4 +479,4 @@ "hc_light": "punctuation.definition.tag: #0F4A85" } } -] \ No newline at end of file +] diff --git a/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json b/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json index dae875b1f49..b7b57e957c9 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json @@ -40,9 +40,9 @@ "t": "source.css.less variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -52,9 +52,9 @@ "t": "source.css.less variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -251,4 +251,4 @@ "hc_light": "default: #292929" } } -] \ No newline at end of file +] diff --git a/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json b/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json index d80f8d84182..ed95595fd58 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/25920_html.json @@ -76,9 +76,9 @@ "t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -196,9 +196,9 @@ "t": "text.html.derivative meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -388,9 +388,9 @@ "t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -652,9 +652,9 @@ "t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -772,9 +772,9 @@ "t": "text.html.derivative meta.embedded.block.html text.html.basic meta.tag.structure.div.start.html meta.attribute.class.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -964,9 +964,9 @@ "t": "text.html.derivative meta.tag.structure.body.start.html meta.attribute.class.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } diff --git a/extensions/vscode-colorize-tests/test/colorize-results/makefile.json b/extensions/vscode-colorize-tests/test/colorize-results/makefile.json index a3abf6bf666..ecaa0f00373 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/makefile.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/makefile.json @@ -252,7 +252,31 @@ } }, { - "c": " second,second", + "c": " second", + "t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile string.interpolated.makefile string.interpolated.makefile meta.scope.function-call.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": ",", + "t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile string.interpolated.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": "second", "t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile string.interpolated.makefile string.interpolated.makefile meta.scope.function-call.makefile", "r": { "dark_plus": "string: #CE9178", @@ -1572,7 +1596,7 @@ } }, { - "c": " undefined,", + "c": " undefined", "t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile", "r": { "dark_plus": "string: #CE9178", @@ -1583,6 +1607,18 @@ "hc_light": "string: #0F4A85" } }, + { + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, { "c": "$(", "t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile punctuation.definition.variable.makefile", @@ -1680,7 +1716,43 @@ } }, { - "c": ",0,1", + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": "0", + "t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": "1", "t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile", "r": { "dark_plus": "string: #CE9178", @@ -1800,7 +1872,31 @@ } }, { - "c": " defined,TOP_DIR", + "c": " defined", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": "TOP_DIR", "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile", "r": { "dark_plus": "string: #CE9178", @@ -1836,7 +1932,19 @@ } }, { - "c": ",0)", + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": "0)", "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile", "r": { "dark_plus": "default: #D4D4D4", @@ -2076,7 +2184,31 @@ } }, { - "c": " defined,CODIT_DIR", + "c": " defined", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": "CODIT_DIR", "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile", "r": { "dark_plus": "string: #CE9178", @@ -2112,7 +2244,19 @@ } }, { - "c": ",0)", + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": "0)", "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile", "r": { "dark_plus": "default: #D4D4D4", @@ -2688,7 +2832,31 @@ } }, { - "c": "\", \"skip\")", + "c": "\"", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": " \"skip\")", "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile", "r": { "dark_plus": "default: #D4D4D4", @@ -3359,6 +3527,198 @@ "hc_light": "string: #0F4A85" } }, + { + "c": "var", + "t": "source.makefile variable.other.makefile", + "r": { + "dark_plus": "variable: #9CDCFE", + "light_plus": "variable: #001080", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "variable: #9CDCFE", + "hc_light": "variable: #001080" + } + }, + { + "c": ":=", + "t": "source.makefile punctuation.separator.key-value.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": "blah", + "t": "source.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": "#", + "t": "source.makefile comment.line.number-sign.makefile punctuation.definition.comment.makefile", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "hc_light": "comment: #515151" + } + }, + { + "c": "comment", + "t": "source.makefile comment.line.number-sign.makefile", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "hc_light": "comment: #515151" + } + }, + { + "c": "var", + "t": "source.makefile variable.other.makefile", + "r": { + "dark_plus": "variable: #9CDCFE", + "light_plus": "variable: #001080", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "variable: #9CDCFE", + "hc_light": "variable: #001080" + } + }, + { + "c": "?=", + "t": "source.makefile punctuation.separator.key-value.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": "blah\\#not_a_comment", + "t": "source.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": "var", + "t": "source.makefile variable.other.makefile", + "r": { + "dark_plus": "variable: #9CDCFE", + "light_plus": "variable: #001080", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "variable: #9CDCFE", + "hc_light": "variable: #001080" + } + }, + { + "c": ":=", + "t": "source.makefile punctuation.separator.key-value.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": "blah\\\\", + "t": "source.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": "#", + "t": "source.makefile comment.line.number-sign.makefile punctuation.definition.comment.makefile", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "hc_light": "comment: #515151" + } + }, + { + "c": "comment", + "t": "source.makefile comment.line.number-sign.makefile", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "hc_light": "comment: #515151" + } + }, + { + "c": "var", + "t": "source.makefile variable.other.makefile", + "r": { + "dark_plus": "variable: #9CDCFE", + "light_plus": "variable: #001080", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "variable: #9CDCFE", + "hc_light": "variable: #001080" + } + }, + { + "c": "!=", + "t": "source.makefile punctuation.separator.key-value.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": "blah\\\\\\#not_a_comment", + "t": "source.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, { "c": "var-", "t": "source.makefile variable.other.makefile", diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-4287_pug.json b/extensions/vscode-colorize-tests/test/colorize-results/test-4287_pug.json index 98c382df18b..4ec8289167e 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-4287_pug.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-4287_pug.json @@ -4,9 +4,9 @@ "t": "text.pug entity.other.attribute-name.class.pug", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -23,4 +23,4 @@ "hc_light": "string.comment.buffered.block.pug: #0F4A85" } } -] \ No newline at end of file +] diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-7115_xml.json b/extensions/vscode-colorize-tests/test/colorize-results/test-7115_xml.json index 95e8817adcb..e2b4189dbc2 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-7115_xml.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-7115_xml.json @@ -28,9 +28,9 @@ "t": "text.xml meta.tag.preprocessor.xml entity.other.attribute-name.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -88,9 +88,9 @@ "t": "text.xml meta.tag.preprocessor.xml entity.other.attribute-name.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -148,9 +148,9 @@ "t": "text.xml meta.tag.preprocessor.xml entity.other.attribute-name.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -316,9 +316,9 @@ "t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -388,9 +388,9 @@ "t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -635,4 +635,4 @@ "hc_light": "punctuation.definition.tag: #0F4A85" } } -] \ No newline at end of file +] diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json index f13eb72b27f..e226b96334c 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json @@ -61,7 +61,7 @@ }, { "c": "der", - "t": "source.cpp meta.preprocessor.macro.cpp variable.parameter.preprocessor.cpp", + "t": "source.cpp meta.preprocessor.macro.cpp meta.function.preprocessor.parameters.cpp variable.parameter.preprocessor.cpp", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -73,7 +73,7 @@ }, { "c": ",", - "t": "source.cpp meta.preprocessor.macro.cpp punctuation.separator.parameters.cpp", + "t": "source.cpp meta.preprocessor.macro.cpp meta.function.preprocessor.parameters.cpp punctuation.separator.parameters.cpp", "r": { "dark_plus": "meta.preprocessor: #569CD6", "light_plus": "meta.preprocessor: #0000FF", @@ -85,7 +85,7 @@ }, { "c": " ", - "t": "source.cpp meta.preprocessor.macro.cpp", + "t": "source.cpp meta.preprocessor.macro.cpp meta.function.preprocessor.parameters.cpp", "r": { "dark_plus": "meta.preprocessor: #569CD6", "light_plus": "meta.preprocessor: #0000FF", @@ -97,7 +97,7 @@ }, { "c": "base", - "t": "source.cpp meta.preprocessor.macro.cpp variable.parameter.preprocessor.cpp", + "t": "source.cpp meta.preprocessor.macro.cpp meta.function.preprocessor.parameters.cpp variable.parameter.preprocessor.cpp", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -109,7 +109,7 @@ }, { "c": ",", - "t": "source.cpp meta.preprocessor.macro.cpp punctuation.separator.parameters.cpp", + "t": "source.cpp meta.preprocessor.macro.cpp meta.function.preprocessor.parameters.cpp punctuation.separator.parameters.cpp", "r": { "dark_plus": "meta.preprocessor: #569CD6", "light_plus": "meta.preprocessor: #0000FF", @@ -121,7 +121,7 @@ }, { "c": " ", - "t": "source.cpp meta.preprocessor.macro.cpp", + "t": "source.cpp meta.preprocessor.macro.cpp meta.function.preprocessor.parameters.cpp", "r": { "dark_plus": "meta.preprocessor: #569CD6", "light_plus": "meta.preprocessor: #0000FF", @@ -133,7 +133,7 @@ }, { "c": "func", - "t": "source.cpp meta.preprocessor.macro.cpp variable.parameter.preprocessor.cpp", + "t": "source.cpp meta.preprocessor.macro.cpp meta.function.preprocessor.parameters.cpp variable.parameter.preprocessor.cpp", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -145,7 +145,7 @@ }, { "c": ",", - "t": "source.cpp meta.preprocessor.macro.cpp punctuation.separator.parameters.cpp", + "t": "source.cpp meta.preprocessor.macro.cpp meta.function.preprocessor.parameters.cpp punctuation.separator.parameters.cpp", "r": { "dark_plus": "meta.preprocessor: #569CD6", "light_plus": "meta.preprocessor: #0000FF", @@ -157,7 +157,7 @@ }, { "c": " ", - "t": "source.cpp meta.preprocessor.macro.cpp", + "t": "source.cpp meta.preprocessor.macro.cpp meta.function.preprocessor.parameters.cpp", "r": { "dark_plus": "meta.preprocessor: #569CD6", "light_plus": "meta.preprocessor: #0000FF", @@ -169,7 +169,7 @@ }, { "c": "decorators", - "t": "source.cpp meta.preprocessor.macro.cpp variable.parameter.preprocessor.cpp", + "t": "source.cpp meta.preprocessor.macro.cpp meta.function.preprocessor.parameters.cpp variable.parameter.preprocessor.cpp", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json index d13d4367a82..419443b11de 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_less.json @@ -64,9 +64,9 @@ "t": "source.css.less meta.property-list.css variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -76,9 +76,9 @@ "t": "source.css.less meta.property-list.css variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -160,9 +160,9 @@ "t": "source.css.less meta.property-list.css variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -172,9 +172,9 @@ "t": "source.css.less meta.property-list.css variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -400,9 +400,9 @@ "t": "source.css.less meta.property-list.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_scss.json b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_scss.json index 6e922a532cd..ee81512b5ca 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_scss.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-cssvariables_scss.json @@ -64,9 +64,9 @@ "t": "source.css.scss meta.property-list.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -148,9 +148,9 @@ "t": "source.css.scss meta.property-list.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -268,9 +268,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -376,9 +376,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -508,9 +508,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json b/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json index a48d921ebaa..b22ea1d7793 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-embedding_html.json @@ -268,9 +268,9 @@ "t": "text.html.derivative meta.embedded.block.html source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -424,9 +424,9 @@ "t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.event-handler.blur.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -508,9 +508,9 @@ "t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.event-handler.click.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -592,9 +592,9 @@ "t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.event-handler.drag.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -724,9 +724,9 @@ "t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.style.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -868,9 +868,9 @@ "t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.style.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1012,9 +1012,9 @@ "t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.style.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-regex_coffee.json b/extensions/vscode-colorize-tests/test/colorize-results/test-regex_coffee.json index 4140c9f0b45..e05badae2cf 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-regex_coffee.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-regex_coffee.json @@ -508,9 +508,9 @@ "t": "source.coffee string.regexp.multiline.coffee source.coffee.embedded.source", "r": { "dark_plus": "source.coffee.embedded: #9CDCFE", - "light_plus": "source.coffee.embedded: #FF0000", + "light_plus": "source.coffee.embedded: #E50000", "dark_vs": "source.coffee.embedded: #9CDCFE", - "light_vs": "source.coffee.embedded: #FF0000", + "light_vs": "source.coffee.embedded: #E50000", "hc_black": "source.coffee.embedded: #D4D4D4", "hc_light": "source.coffee.embedded: #264F78" } diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-variables_css.json b/extensions/vscode-colorize-tests/test/colorize-results/test-variables_css.json index 4bc08534cae..f2bb411df60 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-variables_css.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-variables_css.json @@ -64,9 +64,9 @@ "t": "source.css meta.property-list.css variable.css", "r": { "dark_plus": "variable.css: #9CDCFE", - "light_plus": "variable.css: #FF0000", + "light_plus": "variable.css: #E50000", "dark_vs": "variable.css: #9CDCFE", - "light_vs": "variable.css: #FF0000", + "light_vs": "variable.css: #E50000", "hc_black": "variable.css: #D4D4D4", "hc_light": "variable.css: #264F78" } @@ -148,9 +148,9 @@ "t": "source.css meta.property-list.css variable.css", "r": { "dark_plus": "variable.css: #9CDCFE", - "light_plus": "variable.css: #FF0000", + "light_plus": "variable.css: #E50000", "dark_vs": "variable.css: #9CDCFE", - "light_vs": "variable.css: #FF0000", + "light_vs": "variable.css: #E50000", "hc_black": "variable.css: #D4D4D4", "hc_light": "variable.css: #264F78" } @@ -352,9 +352,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json b/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json index 37474def82e..c173079cd2a 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json @@ -354,7 +354,7 @@ "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", "dark_vs": "source.coffee.embedded: #9CDCFE", - "light_vs": "source.coffee.embedded: #FF0000", + "light_vs": "source.coffee.embedded: #E50000", "hc_black": "variable: #9CDCFE", "hc_light": "variable: #001080" } @@ -642,7 +642,7 @@ "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", "dark_vs": "source.coffee.embedded: #9CDCFE", - "light_vs": "source.coffee.embedded: #FF0000", + "light_vs": "source.coffee.embedded: #E50000", "hc_black": "variable: #9CDCFE", "hc_light": "variable: #001080" } diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json index 5343ed1b277..c2bcf1d8c5f 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json @@ -709,7 +709,7 @@ }, { "c": "*", - "t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.cpp", + "t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.arithmetic.cpp", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -1345,7 +1345,7 @@ }, { "c": "a", - "t": "source.cpp meta.preprocessor.macro.cpp variable.parameter.preprocessor.cpp", + "t": "source.cpp meta.preprocessor.macro.cpp meta.function.preprocessor.parameters.cpp variable.parameter.preprocessor.cpp", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -1357,7 +1357,7 @@ }, { "c": ",", - "t": "source.cpp meta.preprocessor.macro.cpp punctuation.separator.parameters.cpp", + "t": "source.cpp meta.preprocessor.macro.cpp meta.function.preprocessor.parameters.cpp punctuation.separator.parameters.cpp", "r": { "dark_plus": "meta.preprocessor: #569CD6", "light_plus": "meta.preprocessor: #0000FF", @@ -1369,7 +1369,7 @@ }, { "c": " ", - "t": "source.cpp meta.preprocessor.macro.cpp", + "t": "source.cpp meta.preprocessor.macro.cpp meta.function.preprocessor.parameters.cpp", "r": { "dark_plus": "meta.preprocessor: #569CD6", "light_plus": "meta.preprocessor: #0000FF", @@ -1381,7 +1381,7 @@ }, { "c": "b", - "t": "source.cpp meta.preprocessor.macro.cpp variable.parameter.preprocessor.cpp", + "t": "source.cpp meta.preprocessor.macro.cpp meta.function.preprocessor.parameters.cpp variable.parameter.preprocessor.cpp", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json index eefa012ecba..16e42371716 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json @@ -1,7 +1,19 @@ [ { - "c": "@{", - "t": "text.html.cshtml keyword.control.cshtml", + "c": "@", + "t": "text.html.cshtml meta.structure.razor.codeblock keyword.control.cshtml.transition", + "r": { + "dark_plus": "keyword.control: #C586C0", + "light_plus": "keyword.control: #AF00DB", + "dark_vs": "keyword.control: #569CD6", + "light_vs": "keyword.control: #0000FF", + "hc_black": "keyword.control: #C586C0", + "hc_light": "keyword.control: #B5200D" + } + }, + { + "c": "{", + "t": "text.html.cshtml meta.structure.razor.codeblock keyword.control.razor.directive.codeblock.open", "r": { "dark_plus": "keyword.control: #C586C0", "light_plus": "keyword.control: #AF00DB", @@ -13,7 +25,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -25,7 +37,7 @@ }, { "c": "var", - "t": "text.html.cshtml keyword.other.var.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs keyword.other.var.cs", "r": { "dark_plus": "keyword: #569CD6", "light_plus": "keyword: #0000FF", @@ -37,7 +49,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -49,7 +61,7 @@ }, { "c": "total", - "t": "text.html.cshtml entity.name.variable.local.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs entity.name.variable.local.cs", "r": { "dark_plus": "entity.name.variable: #9CDCFE", "light_plus": "entity.name.variable: #001080", @@ -61,7 +73,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -73,7 +85,7 @@ }, { "c": "=", - "t": "text.html.cshtml keyword.operator.assignment.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs keyword.operator.assignment.cs", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -85,7 +97,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -97,7 +109,7 @@ }, { "c": "0", - "t": "text.html.cshtml constant.numeric.decimal.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs constant.numeric.decimal.cs", "r": { "dark_plus": "constant.numeric: #B5CEA8", "light_plus": "constant.numeric: #098658", @@ -109,7 +121,7 @@ }, { "c": ";", - "t": "text.html.cshtml punctuation.terminator.statement.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs punctuation.terminator.statement.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -121,7 +133,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -133,7 +145,7 @@ }, { "c": "var", - "t": "text.html.cshtml keyword.other.var.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs keyword.other.var.cs", "r": { "dark_plus": "keyword: #569CD6", "light_plus": "keyword: #0000FF", @@ -145,7 +157,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -157,7 +169,7 @@ }, { "c": "totalMessage", - "t": "text.html.cshtml entity.name.variable.local.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs entity.name.variable.local.cs", "r": { "dark_plus": "entity.name.variable: #9CDCFE", "light_plus": "entity.name.variable: #001080", @@ -169,7 +181,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -181,7 +193,7 @@ }, { "c": "=", - "t": "text.html.cshtml keyword.operator.assignment.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs keyword.operator.assignment.cs", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -193,7 +205,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -205,7 +217,7 @@ }, { "c": "\"", - "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.begin.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs string.quoted.double.cs punctuation.definition.string.begin.cs", "r": { "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", @@ -217,7 +229,7 @@ }, { "c": "\"", - "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.end.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs string.quoted.double.cs punctuation.definition.string.end.cs", "r": { "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", @@ -229,235 +241,7 @@ }, { "c": ";", - "t": "text.html.cshtml punctuation.terminator.statement.cs", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": " @", - "t": "text.html.cshtml", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": "*", - "t": "text.html.cshtml keyword.operator.arithmetic.cs", - "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000" - } - }, - { - "c": " ", - "t": "text.html.cshtml", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": "a", - "t": "text.html.cshtml variable.other.readwrite.cs", - "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "hc_light": "variable: #001080" - } - }, - { - "c": " ", - "t": "text.html.cshtml", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": "multiline", - "t": "text.html.cshtml variable.other.readwrite.cs", - "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "hc_light": "variable: #001080" - } - }, - { - "c": " ", - "t": "text.html.cshtml", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": "razor", - "t": "text.html.cshtml variable.other.readwrite.cs", - "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "hc_light": "variable: #001080" - } - }, - { - "c": " ", - "t": "text.html.cshtml", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": "comment", - "t": "text.html.cshtml variable.other.readwrite.cs", - "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "hc_light": "variable: #001080" - } - }, - { - "c": " ", - "t": "text.html.cshtml", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": "embedded", - "t": "text.html.cshtml variable.other.readwrite.cs", - "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "hc_light": "variable: #001080" - } - }, - { - "c": " ", - "t": "text.html.cshtml", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": "in", - "t": "text.html.cshtml variable.other.readwrite.cs", - "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "hc_light": "variable: #001080" - } - }, - { - "c": " ", - "t": "text.html.cshtml", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": "csharp", - "t": "text.html.cshtml variable.other.readwrite.cs", - "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "hc_light": "variable: #001080" - } - }, - { - "c": " ", - "t": "text.html.cshtml", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": "*", - "t": "text.html.cshtml keyword.operator.arithmetic.cs", - "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000" - } - }, - { - "c": "@", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs punctuation.terminator.statement.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -469,7 +253,91 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": "@", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor keyword.control.cshtml.transition", + "r": { + "dark_plus": "keyword.control: #C586C0", + "light_plus": "keyword.control: #AF00DB", + "dark_vs": "keyword.control: #569CD6", + "light_vs": "keyword.control: #0000FF", + "hc_black": "keyword.control: #C586C0", + "hc_light": "keyword.control: #B5200D" + } + }, + { + "c": "*", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor keyword.control.razor.comment.star", + "r": { + "dark_plus": "keyword.control: #C586C0", + "light_plus": "keyword.control: #AF00DB", + "dark_vs": "keyword.control: #569CD6", + "light_vs": "keyword.control: #0000FF", + "hc_black": "keyword.control: #C586C0", + "hc_light": "keyword.control: #B5200D" + } + }, + { + "c": " a multiline", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor comment.block.razor", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "hc_light": "comment: #515151" + } + }, + { + "c": " razor comment embedded in csharp ", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor comment.block.razor", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "hc_light": "comment: #515151" + } + }, + { + "c": "*", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor keyword.control.razor.comment.star", + "r": { + "dark_plus": "keyword.control: #C586C0", + "light_plus": "keyword.control: #AF00DB", + "dark_vs": "keyword.control: #569CD6", + "light_vs": "keyword.control: #0000FF", + "hc_black": "keyword.control: #C586C0", + "hc_light": "keyword.control: #B5200D" + } + }, + { + "c": "@", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor keyword.control.cshtml.transition", + "r": { + "dark_plus": "keyword.control: #C586C0", + "light_plus": "keyword.control: #AF00DB", + "dark_vs": "keyword.control: #569CD6", + "light_vs": "keyword.control: #0000FF", + "hc_black": "keyword.control: #C586C0", + "hc_light": "keyword.control: #B5200D" + } + }, + { + "c": " ", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -481,7 +349,7 @@ }, { "c": "if", - "t": "text.html.cshtml keyword.control.conditional.if.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor keyword.control.conditional.if.cs", "r": { "dark_plus": "keyword.control: #C586C0", "light_plus": "keyword.control: #AF00DB", @@ -493,7 +361,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -505,7 +373,7 @@ }, { "c": "(", - "t": "text.html.cshtml punctuation.parenthesis.open.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor punctuation.parenthesis.open.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -517,7 +385,7 @@ }, { "c": "IsPost", - "t": "text.html.cshtml variable.other.readwrite.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor variable.other.readwrite.cs", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -529,7 +397,7 @@ }, { "c": ")", - "t": "text.html.cshtml punctuation.parenthesis.close.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor punctuation.parenthesis.close.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -541,7 +409,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -553,7 +421,7 @@ }, { "c": "{", - "t": "text.html.cshtml punctuation.curlybrace.open.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.curlybrace.open.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -565,7 +433,7 @@ }, { "c": " ", - "t": "text.html.cshtml punctuation.whitespace.comment.leading.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.whitespace.comment.leading.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -577,7 +445,7 @@ }, { "c": "//", - "t": "text.html.cshtml comment.line.double-slash.cs punctuation.definition.comment.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock comment.line.double-slash.cs punctuation.definition.comment.cs", "r": { "dark_plus": "comment: #6A9955", "light_plus": "comment: #008000", @@ -589,7 +457,7 @@ }, { "c": " Retrieve the numbers that the user entered.", - "t": "text.html.cshtml comment.line.double-slash.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock comment.line.double-slash.cs", "r": { "dark_plus": "comment: #6A9955", "light_plus": "comment: #008000", @@ -601,7 +469,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -613,7 +481,7 @@ }, { "c": "var", - "t": "text.html.cshtml keyword.other.var.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.other.var.cs", "r": { "dark_plus": "keyword: #569CD6", "light_plus": "keyword: #0000FF", @@ -625,7 +493,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -637,7 +505,7 @@ }, { "c": "num1", - "t": "text.html.cshtml entity.name.variable.local.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock entity.name.variable.local.cs", "r": { "dark_plus": "entity.name.variable: #9CDCFE", "light_plus": "entity.name.variable: #001080", @@ -649,7 +517,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -661,7 +529,7 @@ }, { "c": "=", - "t": "text.html.cshtml keyword.operator.assignment.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.operator.assignment.cs", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -673,7 +541,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -685,7 +553,7 @@ }, { "c": "Request", - "t": "text.html.cshtml variable.other.object.property.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock variable.other.object.property.cs", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -697,7 +565,7 @@ }, { "c": "[", - "t": "text.html.cshtml punctuation.squarebracket.open.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.squarebracket.open.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -709,7 +577,7 @@ }, { "c": "\"", - "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.begin.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock string.quoted.double.cs punctuation.definition.string.begin.cs", "r": { "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", @@ -721,7 +589,7 @@ }, { "c": "text1", - "t": "text.html.cshtml string.quoted.double.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock string.quoted.double.cs", "r": { "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", @@ -733,7 +601,7 @@ }, { "c": "\"", - "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.end.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock string.quoted.double.cs punctuation.definition.string.end.cs", "r": { "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", @@ -745,7 +613,7 @@ }, { "c": "]", - "t": "text.html.cshtml punctuation.squarebracket.close.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.squarebracket.close.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -757,7 +625,7 @@ }, { "c": ";", - "t": "text.html.cshtml punctuation.terminator.statement.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.terminator.statement.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -769,7 +637,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -781,7 +649,7 @@ }, { "c": "var", - "t": "text.html.cshtml keyword.other.var.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.other.var.cs", "r": { "dark_plus": "keyword: #569CD6", "light_plus": "keyword: #0000FF", @@ -793,7 +661,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -805,7 +673,7 @@ }, { "c": "num2", - "t": "text.html.cshtml entity.name.variable.local.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock entity.name.variable.local.cs", "r": { "dark_plus": "entity.name.variable: #9CDCFE", "light_plus": "entity.name.variable: #001080", @@ -817,7 +685,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -829,7 +697,7 @@ }, { "c": "=", - "t": "text.html.cshtml keyword.operator.assignment.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.operator.assignment.cs", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -841,7 +709,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -853,7 +721,7 @@ }, { "c": "Request", - "t": "text.html.cshtml variable.other.object.property.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock variable.other.object.property.cs", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -865,7 +733,7 @@ }, { "c": "[", - "t": "text.html.cshtml punctuation.squarebracket.open.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.squarebracket.open.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -877,7 +745,7 @@ }, { "c": "\"", - "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.begin.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock string.quoted.double.cs punctuation.definition.string.begin.cs", "r": { "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", @@ -889,7 +757,7 @@ }, { "c": "text2", - "t": "text.html.cshtml string.quoted.double.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock string.quoted.double.cs", "r": { "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", @@ -901,7 +769,7 @@ }, { "c": "\"", - "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.end.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock string.quoted.double.cs punctuation.definition.string.end.cs", "r": { "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", @@ -913,7 +781,7 @@ }, { "c": "]", - "t": "text.html.cshtml punctuation.squarebracket.close.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.squarebracket.close.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -925,7 +793,7 @@ }, { "c": ";", - "t": "text.html.cshtml punctuation.terminator.statement.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.terminator.statement.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -937,7 +805,7 @@ }, { "c": " ", - "t": "text.html.cshtml punctuation.whitespace.comment.leading.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.whitespace.comment.leading.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -949,7 +817,7 @@ }, { "c": "//", - "t": "text.html.cshtml comment.line.double-slash.cs punctuation.definition.comment.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock comment.line.double-slash.cs punctuation.definition.comment.cs", "r": { "dark_plus": "comment: #6A9955", "light_plus": "comment: #008000", @@ -961,7 +829,7 @@ }, { "c": " Convert the entered strings into integers numbers and add.", - "t": "text.html.cshtml comment.line.double-slash.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock comment.line.double-slash.cs", "r": { "dark_plus": "comment: #6A9955", "light_plus": "comment: #008000", @@ -973,7 +841,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -985,7 +853,7 @@ }, { "c": "total", - "t": "text.html.cshtml variable.other.readwrite.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock variable.other.readwrite.cs", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -997,7 +865,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1009,7 +877,7 @@ }, { "c": "=", - "t": "text.html.cshtml keyword.operator.assignment.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.operator.assignment.cs", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -1021,7 +889,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1033,7 +901,7 @@ }, { "c": "num1", - "t": "text.html.cshtml variable.other.object.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock variable.other.object.cs", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -1045,7 +913,7 @@ }, { "c": ".", - "t": "text.html.cshtml punctuation.accessor.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.accessor.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1057,7 +925,7 @@ }, { "c": "AsInt", - "t": "text.html.cshtml entity.name.function.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock entity.name.function.cs", "r": { "dark_plus": "entity.name.function: #DCDCAA", "light_plus": "entity.name.function: #795E26", @@ -1069,7 +937,7 @@ }, { "c": "(", - "t": "text.html.cshtml punctuation.parenthesis.open.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.parenthesis.open.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1081,7 +949,7 @@ }, { "c": ")", - "t": "text.html.cshtml punctuation.parenthesis.close.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.parenthesis.close.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1093,7 +961,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1105,7 +973,7 @@ }, { "c": "+", - "t": "text.html.cshtml keyword.operator.arithmetic.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock keyword.operator.arithmetic.cs", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -1117,7 +985,7 @@ }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1129,7 +997,7 @@ }, { "c": "num2", - "t": "text.html.cshtml variable.other.object.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock variable.other.object.cs", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -1141,7 +1009,7 @@ }, { "c": ".", - "t": "text.html.cshtml punctuation.accessor.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.accessor.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1153,7 +1021,7 @@ }, { "c": "AsInt", - "t": "text.html.cshtml entity.name.function.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock entity.name.function.cs", "r": { "dark_plus": "entity.name.function: #DCDCAA", "light_plus": "entity.name.function: #795E26", @@ -1165,7 +1033,7 @@ }, { "c": "(", - "t": "text.html.cshtml punctuation.parenthesis.open.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.parenthesis.open.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1177,7 +1045,7 @@ }, { "c": ")", - "t": "text.html.cshtml punctuation.parenthesis.close.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.parenthesis.close.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1189,7 +1057,7 @@ }, { "c": ";", - "t": "text.html.cshtml punctuation.terminator.statement.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.terminator.statement.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1201,7 +1069,7 @@ }, { "c": "\t\t", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1213,295 +1081,163 @@ }, { "c": "<", - "t": "text.html.cshtml keyword.operator.relational.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.definition.tag.begin.html", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000" + "dark_plus": "punctuation.definition.tag: #808080", + "light_plus": "punctuation.definition.tag: #800000", + "dark_vs": "punctuation.definition.tag: #808080", + "light_vs": "punctuation.definition.tag: #800000", + "hc_black": "punctuation.definition.tag: #808080", + "hc_light": "punctuation.definition.tag: #0F4A85" } }, { "c": "italic", - "t": "text.html.cshtml variable.other.readwrite.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock entity.name.tag.html", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "hc_light": "variable: #001080" - } - }, - { - "c": "><", - "t": "text.html.cshtml keyword.operator.relational.cs", - "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000" - } - }, - { - "c": "bold", - "t": "text.html.cshtml variable.other.readwrite.cs", - "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "hc_light": "variable: #001080" + "dark_plus": "entity.name.tag: #569CD6", + "light_plus": "entity.name.tag: #800000", + "dark_vs": "entity.name.tag: #569CD6", + "light_vs": "entity.name.tag: #800000", + "hc_black": "entity.name.tag: #569CD6", + "hc_light": "entity.name.tag: #0F4A85" } }, { "c": ">", - "t": "text.html.cshtml keyword.operator.relational.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.definition.tag.end.html", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000" - } - }, - { - "c": "totalMessage", - "t": "text.html.cshtml variable.other.readwrite.cs", - "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "hc_light": "variable: #001080" - } - }, - { - "c": " ", - "t": "text.html.cshtml", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": "=", - "t": "text.html.cshtml keyword.operator.assignment.cs", - "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000" - } - }, - { - "c": " ", - "t": "text.html.cshtml", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": "\"", - "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.begin.cs", - "r": { - "dark_plus": "string: #CE9178", - "light_plus": "string: #A31515", - "dark_vs": "string: #CE9178", - "light_vs": "string: #A31515", - "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" - } - }, - { - "c": "Total = ", - "t": "text.html.cshtml string.quoted.double.cs", - "r": { - "dark_plus": "string: #CE9178", - "light_plus": "string: #A31515", - "dark_vs": "string: #CE9178", - "light_vs": "string: #A31515", - "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" - } - }, - { - "c": "\"", - "t": "text.html.cshtml string.quoted.double.cs punctuation.definition.string.end.cs", - "r": { - "dark_plus": "string: #CE9178", - "light_plus": "string: #A31515", - "dark_vs": "string: #CE9178", - "light_vs": "string: #A31515", - "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" - } - }, - { - "c": " ", - "t": "text.html.cshtml", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": "+", - "t": "text.html.cshtml keyword.operator.arithmetic.cs", - "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000" - } - }, - { - "c": " ", - "t": "text.html.cshtml", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": "total", - "t": "text.html.cshtml variable.other.readwrite.cs", - "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "hc_light": "variable: #001080" - } - }, - { - "c": ";", - "t": "text.html.cshtml punctuation.terminator.statement.cs", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" + "dark_plus": "punctuation.definition.tag: #808080", + "light_plus": "punctuation.definition.tag: #800000", + "dark_vs": "punctuation.definition.tag: #808080", + "light_vs": "punctuation.definition.tag: #800000", + "hc_black": "punctuation.definition.tag: #808080", + "hc_light": "punctuation.definition.tag: #0F4A85" } }, { "c": "<", - "t": "text.html.cshtml keyword.operator.relational.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.definition.tag.begin.html", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000" - } - }, - { - "c": "/", - "t": "text.html.cshtml keyword.operator.arithmetic.cs", - "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000" + "dark_plus": "punctuation.definition.tag: #808080", + "light_plus": "punctuation.definition.tag: #800000", + "dark_vs": "punctuation.definition.tag: #808080", + "light_vs": "punctuation.definition.tag: #800000", + "hc_black": "punctuation.definition.tag: #808080", + "hc_light": "punctuation.definition.tag: #0F4A85" } }, { "c": "bold", - "t": "text.html.cshtml variable.other.readwrite.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock entity.name.tag.html", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "hc_light": "variable: #001080" - } - }, - { - "c": "><", - "t": "text.html.cshtml keyword.operator.relational.cs", - "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000" - } - }, - { - "c": "/", - "t": "text.html.cshtml keyword.operator.arithmetic.cs", - "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000" - } - }, - { - "c": "italic", - "t": "text.html.cshtml variable.other.readwrite.cs", - "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "hc_light": "variable: #001080" + "dark_plus": "entity.name.tag: #569CD6", + "light_plus": "entity.name.tag: #800000", + "dark_vs": "entity.name.tag: #569CD6", + "light_vs": "entity.name.tag: #800000", + "hc_black": "entity.name.tag: #569CD6", + "hc_light": "entity.name.tag: #0F4A85" } }, { "c": ">", - "t": "text.html.cshtml keyword.operator.relational.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.definition.tag.end.html", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000" + "dark_plus": "punctuation.definition.tag: #808080", + "light_plus": "punctuation.definition.tag: #800000", + "dark_vs": "punctuation.definition.tag: #808080", + "light_vs": "punctuation.definition.tag: #800000", + "hc_black": "punctuation.definition.tag: #808080", + "hc_light": "punctuation.definition.tag: #0F4A85" + } + }, + { + "c": "totalMessage = \"Total = \" + total;", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": "", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.definition.tag.end.html", + "r": { + "dark_plus": "punctuation.definition.tag: #808080", + "light_plus": "punctuation.definition.tag: #800000", + "dark_vs": "punctuation.definition.tag: #808080", + "light_vs": "punctuation.definition.tag: #800000", + "hc_black": "punctuation.definition.tag: #808080", + "hc_light": "punctuation.definition.tag: #0F4A85" + } + }, + { + "c": "", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.definition.tag.end.html", + "r": { + "dark_plus": "punctuation.definition.tag: #808080", + "light_plus": "punctuation.definition.tag: #800000", + "dark_vs": "punctuation.definition.tag: #808080", + "light_vs": "punctuation.definition.tag: #800000", + "hc_black": "punctuation.definition.tag: #808080", + "hc_light": "punctuation.definition.tag: #0F4A85" } }, { "c": " ", - "t": "text.html.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1513,7 +1249,7 @@ }, { "c": "}", - "t": "text.html.cshtml punctuation.curlybrace.close.cs", + "t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor meta.structure.razor.csharp.codeblock punctuation.curlybrace.close.cs", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1525,7 +1261,7 @@ }, { "c": "}", - "t": "text.html.cshtml keyword.control.cshtml", + "t": "text.html.cshtml meta.structure.razor.codeblock keyword.control.razor.directive.codeblock.close", "r": { "dark_plus": "keyword.control: #C586C0", "light_plus": "keyword.control: #AF00DB", @@ -1576,9 +1312,9 @@ "t": "text.html.cshtml meta.tag.metadata.doctype.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1636,9 +1372,9 @@ "t": "text.html.cshtml meta.tag.structure.html.start.html meta.attribute.lang.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1900,9 +1636,9 @@ "t": "text.html.cshtml meta.tag.metadata.meta.void.html meta.attribute.charset.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2308,9 +2044,9 @@ "t": "text.html.cshtml meta.tag.structure.form.start.html meta.attribute.action.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2368,9 +2104,9 @@ "t": "text.html.cshtml meta.tag.structure.form.start.html meta.attribute.method.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2524,9 +2260,9 @@ "t": "text.html.cshtml meta.tag.structure.label.start.html meta.attribute.for.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2692,9 +2428,9 @@ "t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2764,9 +2500,9 @@ "t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.name.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2980,9 +2716,9 @@ "t": "text.html.cshtml meta.tag.structure.label.start.html meta.attribute.for.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -3148,9 +2884,9 @@ "t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -3220,9 +2956,9 @@ "t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.name.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -3436,9 +3172,9 @@ "t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.type.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -3508,9 +3244,9 @@ "t": "text.html.cshtml meta.tag.structure.input.void.html meta.attribute.value.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -3672,7 +3408,7 @@ } }, { - "c": "\t@* now we call the totalMessage method", + "c": "\t", "t": "text.html.cshtml", "r": { "dark_plus": "default: #D4D4D4", @@ -3684,68 +3420,8 @@ } }, { - "c": "\t (a multi line razor comment outside code) *@", - "t": "text.html.cshtml", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": " ", - "t": "text.html.cshtml", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" - } - }, - { - "c": "<", - "t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.begin.html", - "r": { - "dark_plus": "punctuation.definition.tag: #808080", - "light_plus": "punctuation.definition.tag: #800000", - "dark_vs": "punctuation.definition.tag: #808080", - "light_vs": "punctuation.definition.tag: #800000", - "hc_black": "punctuation.definition.tag: #808080", - "hc_light": "punctuation.definition.tag: #0F4A85" - } - }, - { - "c": "p", - "t": "text.html.cshtml meta.tag.structure.p.start.html entity.name.tag.html", - "r": { - "dark_plus": "entity.name.tag: #569CD6", - "light_plus": "entity.name.tag: #800000", - "dark_vs": "entity.name.tag: #569CD6", - "light_vs": "entity.name.tag: #800000", - "hc_black": "entity.name.tag: #569CD6", - "hc_light": "entity.name.tag: #0F4A85" - } - }, - { - "c": ">", - "t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.end.html", - "r": { - "dark_plus": "punctuation.definition.tag: #808080", - "light_plus": "punctuation.definition.tag: #800000", - "dark_vs": "punctuation.definition.tag: #808080", - "light_vs": "punctuation.definition.tag: #800000", - "hc_black": "punctuation.definition.tag: #808080", - "hc_light": "punctuation.definition.tag: #0F4A85" - } - }, - { - "c": "@totalMessage", - "t": "text.html.cshtml meta.expression.implicit.cshtml keyword.control.cshtml", + "c": "@", + "t": "text.html.cshtml meta.comment.razor keyword.control.cshtml.transition", "r": { "dark_plus": "keyword.control: #C586C0", "light_plus": "keyword.control: #AF00DB", @@ -3756,15 +3432,63 @@ } }, { - "c": "

        ", - "t": "text.html.cshtml meta.expression.implicit.cshtml", + "c": "*", + "t": "text.html.cshtml meta.comment.razor keyword.control.razor.comment.star", "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "hc_light": "default: #292929" + "dark_plus": "keyword.control: #C586C0", + "light_plus": "keyword.control: #AF00DB", + "dark_vs": "keyword.control: #569CD6", + "light_vs": "keyword.control: #0000FF", + "hc_black": "keyword.control: #C586C0", + "hc_light": "keyword.control: #B5200D" + } + }, + { + "c": " now we call the totalMessage method", + "t": "text.html.cshtml meta.comment.razor comment.block.razor", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "hc_light": "comment: #515151" + } + }, + { + "c": "\t (a multi line razor comment outside code) ", + "t": "text.html.cshtml meta.comment.razor comment.block.razor", + "r": { + "dark_plus": "comment: #6A9955", + "light_plus": "comment: #008000", + "dark_vs": "comment: #6A9955", + "light_vs": "comment: #008000", + "hc_black": "comment: #7CA668", + "hc_light": "comment: #515151" + } + }, + { + "c": "*", + "t": "text.html.cshtml meta.comment.razor keyword.control.razor.comment.star", + "r": { + "dark_plus": "keyword.control: #C586C0", + "light_plus": "keyword.control: #AF00DB", + "dark_vs": "keyword.control: #569CD6", + "light_vs": "keyword.control: #0000FF", + "hc_black": "keyword.control: #C586C0", + "hc_light": "keyword.control: #B5200D" + } + }, + { + "c": "@", + "t": "text.html.cshtml meta.comment.razor keyword.control.cshtml.transition", + "r": { + "dark_plus": "keyword.control: #C586C0", + "light_plus": "keyword.control: #AF00DB", + "dark_vs": "keyword.control: #569CD6", + "light_vs": "keyword.control: #0000FF", + "hc_black": "keyword.control: #C586C0", + "hc_light": "keyword.control: #B5200D" } }, { @@ -3816,7 +3540,127 @@ } }, { - "c": "@(", + "c": "@", + "t": "text.html.cshtml meta.expression.implicit.cshtml keyword.control.cshtml.transition", + "r": { + "dark_plus": "keyword.control: #C586C0", + "light_plus": "keyword.control: #AF00DB", + "dark_vs": "keyword.control: #569CD6", + "light_vs": "keyword.control: #0000FF", + "hc_black": "keyword.control: #C586C0", + "hc_light": "keyword.control: #B5200D" + } + }, + { + "c": "totalMessage", + "t": "text.html.cshtml meta.expression.implicit.cshtml source.cs variable.other.object.cs", + "r": { + "dark_plus": "variable: #9CDCFE", + "light_plus": "variable: #001080", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "variable: #9CDCFE", + "hc_light": "variable: #001080" + } + }, + { + "c": "", + "t": "text.html.cshtml meta.tag.structure.p.end.html punctuation.definition.tag.end.html", + "r": { + "dark_plus": "punctuation.definition.tag: #808080", + "light_plus": "punctuation.definition.tag: #800000", + "dark_vs": "punctuation.definition.tag: #808080", + "light_vs": "punctuation.definition.tag: #800000", + "hc_black": "punctuation.definition.tag: #808080", + "hc_light": "punctuation.definition.tag: #0F4A85" + } + }, + { + "c": " ", + "t": "text.html.cshtml", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": "<", + "t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.begin.html", + "r": { + "dark_plus": "punctuation.definition.tag: #808080", + "light_plus": "punctuation.definition.tag: #800000", + "dark_vs": "punctuation.definition.tag: #808080", + "light_vs": "punctuation.definition.tag: #800000", + "hc_black": "punctuation.definition.tag: #808080", + "hc_light": "punctuation.definition.tag: #0F4A85" + } + }, + { + "c": "p", + "t": "text.html.cshtml meta.tag.structure.p.start.html entity.name.tag.html", + "r": { + "dark_plus": "entity.name.tag: #569CD6", + "light_plus": "entity.name.tag: #800000", + "dark_vs": "entity.name.tag: #569CD6", + "light_vs": "entity.name.tag: #800000", + "hc_black": "entity.name.tag: #569CD6", + "hc_light": "entity.name.tag: #0F4A85" + } + }, + { + "c": ">", + "t": "text.html.cshtml meta.tag.structure.p.start.html punctuation.definition.tag.end.html", + "r": { + "dark_plus": "punctuation.definition.tag: #808080", + "light_plus": "punctuation.definition.tag: #800000", + "dark_vs": "punctuation.definition.tag: #808080", + "light_vs": "punctuation.definition.tag: #800000", + "hc_black": "punctuation.definition.tag: #808080", + "hc_light": "punctuation.definition.tag: #0F4A85" + } + }, + { + "c": "@", + "t": "text.html.cshtml meta.expression.explicit.cshtml keyword.control.cshtml.transition", + "r": { + "dark_plus": "keyword.control: #C586C0", + "light_plus": "keyword.control: #AF00DB", + "dark_vs": "keyword.control: #569CD6", + "light_vs": "keyword.control: #0000FF", + "hc_black": "keyword.control: #C586C0", + "hc_light": "keyword.control: #B5200D" + } + }, + { + "c": "(", "t": "text.html.cshtml meta.expression.explicit.cshtml keyword.control.cshtml", "r": { "dark_plus": "keyword.control: #C586C0", @@ -3936,7 +3780,7 @@ } }, { - "c": " An email address (with escaped at character): name@", + "c": " An email address (with escaped at character): name", "t": "text.html.cshtml", "r": { "dark_plus": "default: #D4D4D4", @@ -3948,15 +3792,27 @@ } }, { - "c": "@domain.com", - "t": "text.html.cshtml meta.expression.implicit.cshtml keyword.control.cshtml", + "c": "@@", + "t": "text.html.cshtml constant.character.escape.razor.transition", "r": { - "dark_plus": "keyword.control: #C586C0", - "light_plus": "keyword.control: #AF00DB", - "dark_vs": "keyword.control: #569CD6", - "light_vs": "keyword.control: #0000FF", - "hc_black": "keyword.control: #C586C0", - "hc_light": "keyword.control: #B5200D" + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #EE0000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "constant.character: #569CD6", + "hc_light": "constant.character.escape: #EE0000" + } + }, + { + "c": "domain.com", + "t": "text.html.cshtml", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" } }, { @@ -4031,4 +3887,4 @@ "hc_light": "punctuation.definition.tag: #0F4A85" } } -] \ No newline at end of file +] diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_css.json b/extensions/vscode-colorize-tests/test/colorize-results/test_css.json index 3278b1768d1..1d023e0aba3 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_css.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_css.json @@ -700,9 +700,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -772,9 +772,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -892,9 +892,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -1036,9 +1036,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -1108,9 +1108,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -1192,9 +1192,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -1408,9 +1408,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -1480,9 +1480,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -1552,9 +1552,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -1708,9 +1708,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -2068,9 +2068,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -2224,9 +2224,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -2452,9 +2452,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -2524,9 +2524,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -2644,9 +2644,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -2836,9 +2836,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -2920,9 +2920,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -2992,9 +2992,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3148,9 +3148,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3220,9 +3220,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3292,9 +3292,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3448,9 +3448,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3520,9 +3520,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3592,9 +3592,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3676,9 +3676,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3916,9 +3916,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3988,9 +3988,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -4120,9 +4120,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -4288,9 +4288,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -4468,9 +4468,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -4636,9 +4636,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -4708,9 +4708,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -4840,9 +4840,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -4924,9 +4924,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -5080,9 +5080,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -5284,9 +5284,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -5368,9 +5368,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -5440,9 +5440,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -5524,9 +5524,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -5608,9 +5608,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -5680,9 +5680,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -5764,9 +5764,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -5836,9 +5836,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -5956,9 +5956,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -6040,9 +6040,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -6184,9 +6184,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -6256,9 +6256,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -6448,9 +6448,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -6532,9 +6532,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -6688,9 +6688,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -6844,9 +6844,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -6976,9 +6976,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -7048,9 +7048,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -7288,9 +7288,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -7372,9 +7372,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -7516,9 +7516,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -7744,9 +7744,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -7888,9 +7888,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -7972,9 +7972,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -8044,9 +8044,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -8116,9 +8116,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -8284,9 +8284,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -8428,9 +8428,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -8632,9 +8632,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -8716,9 +8716,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -8800,9 +8800,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -9016,9 +9016,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -9232,9 +9232,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -9388,9 +9388,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -9592,9 +9592,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -9664,9 +9664,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -9748,9 +9748,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -9820,9 +9820,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -9904,9 +9904,9 @@ "t": "source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json index 33e9ef14e6d..7ba670c9e47 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json @@ -2677,7 +2677,7 @@ }, { "c": "/", - "t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp meta.parens.cpp keyword.operator.cpp", + "t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp meta.parens.cpp keyword.operator.arithmetic.cpp", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_fs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_fs.json index e0ac27238d5..499e9a81515 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_fs.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_fs.json @@ -733,7 +733,7 @@ }, { "c": "and", - "t": "source.fsharp keyword.fsharp", + "t": "source.fsharp binding.fsharp keyword.fsharp", "r": { "dark_plus": "keyword: #569CD6", "light_plus": "keyword: #0000FF", @@ -744,7 +744,7 @@ } }, { - "c": " set", + "c": " ", "t": "source.fsharp binding.fsharp", "r": { "dark_plus": "default: #D4D4D4", @@ -755,6 +755,18 @@ "hc_light": "default: #292929" } }, + { + "c": "set", + "t": "source.fsharp binding.fsharp variable.fsharp", + "r": { + "dark_plus": "variable: #9CDCFE", + "light_plus": "variable: #001080", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "variable: #9CDCFE", + "hc_light": "variable: #001080" + } + }, { "c": "(", "t": "source.fsharp binding.fsharp keyword.symbol.fsharp", diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json b/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json index e73ac0561eb..64eaa2eef81 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json @@ -40,9 +40,9 @@ "t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html entity.other.attribute-name.generic.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -52,9 +52,9 @@ "t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html punctuation.separator.key-value.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -856,9 +856,9 @@ "t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html entity.other.attribute-name.generic.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -868,9 +868,9 @@ "t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html punctuation.separator.key-value.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1048,9 +1048,9 @@ "t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html entity.other.attribute-name.generic.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1060,9 +1060,9 @@ "t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html punctuation.separator.key-value.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1612,9 +1612,9 @@ "t": "text.html.handlebars meta.tag.block.any.html meta.attribute-with-value.id.html entity.other.attribute-name.id.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1840,9 +1840,9 @@ "t": "text.html.handlebars meta.tag.inline.any.html entity.other.attribute-name.html entity.other.attribute-name.generic.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1852,9 +1852,9 @@ "t": "text.html.handlebars meta.tag.inline.any.html entity.other.attribute-name.html punctuation.separator.key-value.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2303,4 +2303,4 @@ "hc_light": "punctuation.definition.tag: #0F4A85" } } -] \ No newline at end of file +] diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json index 428e98c1118..99d47827659 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json @@ -124,9 +124,9 @@ "t": "text.html.handlebars meta.tag.block.any.html meta.attribute-with-value.id.html entity.other.attribute-name.id.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -352,9 +352,9 @@ "t": "text.html.handlebars meta.tag.inline.any.html entity.other.attribute-name.html entity.other.attribute-name.generic.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -364,9 +364,9 @@ "t": "text.html.handlebars meta.tag.inline.any.html entity.other.attribute-name.html punctuation.separator.key-value.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1072,9 +1072,9 @@ "t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html entity.other.attribute-name.generic.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1084,9 +1084,9 @@ "t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html punctuation.separator.key-value.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1528,9 +1528,9 @@ "t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html entity.other.attribute-name.generic.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1540,9 +1540,9 @@ "t": "text.html.handlebars meta.tag.block.any.html entity.other.attribute-name.html punctuation.separator.key-value.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1662,7 +1662,7 @@ "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "variable: #9CDCFE", "hc_light": "variable: #001080" } @@ -1672,9 +1672,9 @@ "t": "text.html.handlebars meta.function.inline.other.handlebars entity.other.attribute-name.handlebars", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1974,7 +1974,7 @@ "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "variable: #9CDCFE", "hc_light": "variable: #001080" } @@ -1984,9 +1984,9 @@ "t": "text.html.handlebars meta.function.inline.other.handlebars entity.other.attribute-name.handlebars", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2135,4 +2135,4 @@ "hc_light": "punctuation.definition.tag: #0F4A85" } } -] \ No newline at end of file +] diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_html.json b/extensions/vscode-colorize-tests/test/colorize-results/test_html.json index a622ecb8611..2070e202ee8 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_html.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_html.json @@ -124,9 +124,9 @@ "t": "text.html.derivative meta.tag.metadata.meta.void.html meta.attribute.charset.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -340,9 +340,9 @@ "t": "text.html.derivative meta.tag.metadata.link.void.html meta.attribute.href.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -412,9 +412,9 @@ "t": "text.html.derivative meta.tag.metadata.link.void.html meta.attribute.rel.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -544,9 +544,9 @@ "t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.style.start.html meta.attribute.type.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -676,9 +676,9 @@ "t": "text.html.derivative meta.embedded.block.html source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -748,9 +748,9 @@ "t": "text.html.derivative meta.embedded.block.html source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -1024,9 +1024,9 @@ "t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.id.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1240,9 +1240,9 @@ "t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.src.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1408,9 +1408,9 @@ "t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.src.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2512,9 +2512,9 @@ "t": "text.html.derivative meta.tag.structure.div.start.html meta.attribute.class.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2632,9 +2632,9 @@ "t": "text.html.derivative meta.tag.inline.span.start.html meta.attribute.class.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2764,9 +2764,9 @@ "t": "text.html.derivative meta.tag.inline.span.start.html meta.attribute.class.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2884,9 +2884,9 @@ "t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.href.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -3088,9 +3088,9 @@ "t": "text.html.derivative meta.tag.inline.span.start.html meta.attribute.class.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -3208,9 +3208,9 @@ "t": "text.html.derivative meta.tag.inline.a.start.html meta.attribute.href.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json b/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json index bc89c8dd8b4..1b2f32d6270 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json @@ -1948,9 +1948,9 @@ "t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx entity.other.attribute-name.js.jsx", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2008,9 +2008,9 @@ "t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx entity.other.attribute-name.js.jsx", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2380,9 +2380,9 @@ "t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx entity.other.attribute-name.js.jsx", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2452,9 +2452,9 @@ "t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx entity.other.attribute-name.js.jsx", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -2615,4 +2615,4 @@ "hc_light": "default: #292929" } } -] \ No newline at end of file +] diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_less.json b/extensions/vscode-colorize-tests/test/colorize-results/test_less.json index 6ac176bdbbd..f26403edc50 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_less.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_less.json @@ -340,9 +340,9 @@ "t": "source.css.less variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -352,9 +352,9 @@ "t": "source.css.less variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -436,9 +436,9 @@ "t": "source.css.less variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -448,9 +448,9 @@ "t": "source.css.less variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -484,9 +484,9 @@ "t": "source.css.less variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -496,9 +496,9 @@ "t": "source.css.less variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -592,9 +592,9 @@ "t": "source.css.less variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -604,9 +604,9 @@ "t": "source.css.less variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -664,9 +664,9 @@ "t": "source.css.less meta.property-list.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -700,9 +700,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -712,9 +712,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -736,9 +736,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -748,9 +748,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -808,9 +808,9 @@ "t": "source.css.less variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -820,9 +820,9 @@ "t": "source.css.less variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -856,9 +856,9 @@ "t": "source.css.less variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -868,9 +868,9 @@ "t": "source.css.less variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -1012,9 +1012,9 @@ "t": "source.css.less variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -1024,9 +1024,9 @@ "t": "source.css.less variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -1108,9 +1108,9 @@ "t": "source.css.less meta.property-list.css variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -1120,9 +1120,9 @@ "t": "source.css.less meta.property-list.css variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -1408,9 +1408,9 @@ "t": "source.css.less meta.property-list.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -1468,9 +1468,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -1480,9 +1480,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -1576,9 +1576,9 @@ "t": "source.css.less meta.property-list.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -1636,9 +1636,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -1648,9 +1648,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -2116,9 +2116,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -2200,9 +2200,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -2344,9 +2344,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -2476,9 +2476,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css meta.property-list.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -2620,9 +2620,9 @@ "t": "source.css.less meta.property-list.css meta.property-list.css meta.property-list.css meta.property-list.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -2764,9 +2764,9 @@ "t": "source.css.less variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -2776,9 +2776,9 @@ "t": "source.css.less variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -2848,9 +2848,9 @@ "t": "source.css.less variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -2860,9 +2860,9 @@ "t": "source.css.less variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -2920,9 +2920,9 @@ "t": "source.css.less variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -2932,9 +2932,9 @@ "t": "source.css.less variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -3052,9 +3052,9 @@ "t": "source.css.less meta.property-list.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3100,9 +3100,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -3112,9 +3112,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -3208,9 +3208,9 @@ "t": "source.css.less meta.property-list.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3244,9 +3244,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -3256,9 +3256,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -3292,9 +3292,9 @@ "t": "source.css.less meta.property-list.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3340,9 +3340,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -3352,9 +3352,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -3508,9 +3508,9 @@ "t": "source.css.less meta.property-list.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3556,9 +3556,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -3568,9 +3568,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -3664,9 +3664,9 @@ "t": "source.css.less meta.property-list.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3724,9 +3724,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less punctuation.definition.variable.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } @@ -3736,9 +3736,9 @@ "t": "source.css.less meta.property-list.css meta.property-value.css variable.other.less", "r": { "dark_plus": "variable.other.less: #9CDCFE", - "light_plus": "variable.other.less: #FF0000", + "light_plus": "variable.other.less: #E50000", "dark_vs": "variable.other.less: #9CDCFE", - "light_vs": "variable.other.less: #FF0000", + "light_vs": "variable.other.less: #E50000", "hc_black": "variable.other.less: #D4D4D4", "hc_light": "variable.other.less: #264F78" } diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_md.json b/extensions/vscode-colorize-tests/test/colorize-results/test_md.json index 66549f6d2d4..78de60b2f92 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_md.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_md.json @@ -424,9 +424,9 @@ "t": "text.html.markdown meta.tag.structure.div.start.html meta.attribute.class.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -496,9 +496,9 @@ "t": "text.html.markdown meta.tag.structure.div.start.html meta.attribute.unrecognized.markdown.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -724,9 +724,9 @@ "t": "text.html.markdown meta.embedded.block.html meta.tag.metadata.script.start.html meta.attribute.type.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -916,9 +916,9 @@ "t": "text.html.markdown meta.tag.inline.b.start.html meta.attribute.class.html entity.other.attribute-name.html", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1156,9 +1156,9 @@ "t": "text.html.markdown meta.embedded.block.html source.css meta.property-list.css meta.property-name.css support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json b/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json index f8aee482bdc..aee94b431d0 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json @@ -1573,14 +1573,14 @@ }, { "c": "self", - "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp meta.bracket.square.access.objcpp meta.bracket.square.access.objcpp variable.other.object.access.objcpp", + "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp meta.bracket.square.access.objcpp meta.bracket.square.access.objcpp variable.language.objcpp", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", + "dark_plus": "variable.language: #569CD6", + "light_plus": "variable.language: #0000FF", + "dark_vs": "variable.language: #569CD6", + "light_vs": "variable.language: #0000FF", "hc_black": "variable: #9CDCFE", - "hc_light": "variable: #001080" + "hc_light": "variable.language: #0F4A85" } }, { diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json b/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json index ef09f64c9fd..e0e47e6d326 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_pug.json @@ -112,9 +112,9 @@ "t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -436,9 +436,9 @@ "t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -964,9 +964,9 @@ "t": "text.pug entity.other.attribute-name.class.pug", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1132,9 +1132,9 @@ "t": "text.pug entity.other.attribute-name.class.pug", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1180,9 +1180,9 @@ "t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1228,9 +1228,9 @@ "t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1276,9 +1276,9 @@ "t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1360,9 +1360,9 @@ "t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1408,9 +1408,9 @@ "t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1492,9 +1492,9 @@ "t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1540,9 +1540,9 @@ "t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1624,9 +1624,9 @@ "t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1672,9 +1672,9 @@ "t": "text.pug meta.tag.other entity.other.attribute-name.tag.pug", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1859,4 +1859,4 @@ "hc_light": "default: #292929" } } -] \ No newline at end of file +] diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json b/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json index 4e86712fa61..3d5c91da983 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json @@ -280,9 +280,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -436,9 +436,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -568,9 +568,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -736,9 +736,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -940,9 +940,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -1060,9 +1060,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -1204,9 +1204,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -1540,9 +1540,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -1588,9 +1588,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -1672,9 +1672,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -2776,9 +2776,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -2980,9 +2980,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3100,9 +3100,9 @@ "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -3172,9 +3172,9 @@ "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -3340,9 +3340,9 @@ "t": "source.css.scss meta.property-list.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -3424,9 +3424,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -3460,9 +3460,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -3496,9 +3496,9 @@ "t": "source.css.scss meta.property-list.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -3580,9 +3580,9 @@ "t": "source.css.scss meta.property-list.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -3712,9 +3712,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -3760,9 +3760,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -3808,9 +3808,9 @@ "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -3856,9 +3856,9 @@ "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -3952,9 +3952,9 @@ "t": "source.css.scss entity.other.attribute-name.class.css variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -4024,9 +4024,9 @@ "t": "source.css.scss meta.property-list.scss variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -4180,9 +4180,9 @@ "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -4504,9 +4504,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -4720,9 +4720,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -4864,9 +4864,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -4996,9 +4996,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -5356,9 +5356,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -5560,9 +5560,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -5620,9 +5620,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -5692,9 +5692,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -5776,9 +5776,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -5908,9 +5908,9 @@ "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -5980,9 +5980,9 @@ "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -6112,9 +6112,9 @@ "t": "source.css.scss meta.at-rule.function.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -6208,9 +6208,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.return.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -6256,9 +6256,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.return.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -6316,9 +6316,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.return.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -6424,9 +6424,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.return.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -6520,9 +6520,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -6760,9 +6760,9 @@ "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -7024,9 +7024,9 @@ "t": "source.css.scss meta.at-rule.import.scss string.quoted.double.scss variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -7336,9 +7336,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -7516,9 +7516,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.media.scss meta.property-list.media-query.scss meta.property-name.media-query.scss support.type.property-name.media.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -7612,9 +7612,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -7816,9 +7816,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -7936,9 +7936,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -8164,9 +8164,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -8284,9 +8284,9 @@ "t": "source.css.scss entity.other.attribute-name.placeholder.css punctuation.definition.entity.css", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -8296,9 +8296,9 @@ "t": "source.css.scss entity.other.attribute-name.placeholder.css", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -8344,9 +8344,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -8416,9 +8416,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -8488,9 +8488,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -8668,9 +8668,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.extend.scss entity.other.attribute-name.placeholder.css punctuation.definition.entity.css", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -8680,9 +8680,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.extend.scss entity.other.attribute-name.placeholder.css", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -8884,9 +8884,9 @@ "t": "source.css.scss meta.at-rule.mixin.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -8908,9 +8908,9 @@ "t": "source.css.scss meta.at-rule.mixin.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -9028,9 +9028,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -9160,9 +9160,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.at-rule.warn.scss string.quoted.double.scss variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -9232,9 +9232,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -9328,9 +9328,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -9448,9 +9448,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -9580,9 +9580,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.at-rule.warn.scss string.quoted.double.scss variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -9652,9 +9652,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -9748,9 +9748,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -9808,9 +9808,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -9880,9 +9880,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -9916,9 +9916,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -9952,9 +9952,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -9988,9 +9988,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -10324,9 +10324,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -10588,9 +10588,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -10780,9 +10780,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -10948,9 +10948,9 @@ "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -11080,9 +11080,9 @@ "t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -11152,9 +11152,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -11296,9 +11296,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -11464,9 +11464,9 @@ "t": "source.css.scss meta.at-rule.for.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -11644,9 +11644,9 @@ "t": "source.css.scss meta.property-list.scss entity.other.attribute-name.class.css variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -11704,9 +11704,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -11800,9 +11800,9 @@ "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -11932,9 +11932,9 @@ "t": "source.css.scss meta.at-rule.each.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -12052,9 +12052,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.property-list.scss entity.other.attribute-name.class.css variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -12124,9 +12124,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -12220,9 +12220,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss string.quoted.single.scss variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -12364,9 +12364,9 @@ "t": "source.css.scss meta.at-rule.each.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -12448,9 +12448,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -12580,9 +12580,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss entity.other.attribute-name.class.css variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -12640,9 +12640,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -12736,9 +12736,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -12796,9 +12796,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -12832,9 +12832,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -13012,9 +13012,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.function.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -13048,9 +13048,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.function.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -13144,9 +13144,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.for.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -13240,9 +13240,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.for.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -13360,9 +13360,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.if.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -13492,9 +13492,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.if.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -13528,9 +13528,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.if.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -13636,9 +13636,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -13900,9 +13900,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.return.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -14104,9 +14104,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -14176,9 +14176,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -14260,9 +14260,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -14356,9 +14356,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -14572,9 +14572,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -14752,9 +14752,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -14776,9 +14776,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -14884,9 +14884,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -14932,9 +14932,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -14968,9 +14968,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -15004,9 +15004,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -15040,9 +15040,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -15436,9 +15436,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -15508,9 +15508,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.vendored.property-name.css", "r": { "dark_plus": "support.type.vendored.property-name: #9CDCFE", - "light_plus": "support.type.vendored.property-name: #FF0000", + "light_plus": "support.type.vendored.property-name: #E50000", "dark_vs": "support.type.vendored.property-name: #9CDCFE", - "light_vs": "support.type.vendored.property-name: #FF0000", + "light_vs": "support.type.vendored.property-name: #E50000", "hc_black": "support.type.vendored.property-name: #D4D4D4", "hc_light": "support.type.vendored.property-name: #264F78" } @@ -15544,9 +15544,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -15580,9 +15580,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.vendored.property-name.css", "r": { "dark_plus": "support.type.vendored.property-name: #9CDCFE", - "light_plus": "support.type.vendored.property-name: #FF0000", + "light_plus": "support.type.vendored.property-name: #E50000", "dark_vs": "support.type.vendored.property-name: #9CDCFE", - "light_vs": "support.type.vendored.property-name: #FF0000", + "light_vs": "support.type.vendored.property-name: #E50000", "hc_black": "support.type.vendored.property-name: #D4D4D4", "hc_light": "support.type.vendored.property-name: #264F78" } @@ -15616,9 +15616,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -15652,9 +15652,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -15688,9 +15688,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -16252,9 +16252,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -16276,9 +16276,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -16300,9 +16300,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -16360,9 +16360,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -16396,9 +16396,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -16432,9 +16432,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -16468,9 +16468,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -16504,9 +16504,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -16540,9 +16540,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -16576,9 +16576,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -16828,9 +16828,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -17284,9 +17284,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -17464,9 +17464,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.if.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -17668,9 +17668,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.attribute-selector.scss entity.other.attribute-name.attribute.scss", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -18016,9 +18016,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -18100,9 +18100,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -18364,9 +18364,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -19036,9 +19036,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.extend.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -19084,9 +19084,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -19144,9 +19144,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -19324,9 +19324,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.mixin.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -19468,9 +19468,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.extend.scss entity.other.attribute-name.class.css variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -19564,9 +19564,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.extend.scss variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -20152,9 +20152,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -20224,9 +20224,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -20440,9 +20440,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss entity.other.attribute-name.class.css variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -20524,9 +20524,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -20644,9 +20644,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -20740,9 +20740,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -20788,9 +20788,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -20896,9 +20896,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss variable.interpolation.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -21136,9 +21136,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -21280,9 +21280,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -21484,9 +21484,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -21628,9 +21628,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -21736,9 +21736,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.vendored.property-name.css", "r": { "dark_plus": "support.type.vendored.property-name: #9CDCFE", - "light_plus": "support.type.vendored.property-name: #FF0000", + "light_plus": "support.type.vendored.property-name: #E50000", "dark_vs": "support.type.vendored.property-name: #9CDCFE", - "light_vs": "support.type.vendored.property-name: #FF0000", + "light_vs": "support.type.vendored.property-name: #E50000", "hc_black": "support.type.vendored.property-name: #D4D4D4", "hc_light": "support.type.vendored.property-name: #264F78" } @@ -21832,9 +21832,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -21952,9 +21952,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -22180,9 +22180,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -22324,9 +22324,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css", "r": { "dark_plus": "support.type.property-name: #9CDCFE", - "light_plus": "support.type.property-name: #FF0000", + "light_plus": "support.type.property-name: #E50000", "dark_vs": "support.type.property-name: #9CDCFE", - "light_vs": "support.type.property-name: #FF0000", + "light_vs": "support.type.property-name: #E50000", "hc_black": "support.type.property-name: #D4D4D4", "hc_light": "support.type.property-name: #264F78" } @@ -22468,9 +22468,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.attribute-selector.scss entity.other.attribute-name.attribute.scss", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -22720,9 +22720,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } @@ -22804,9 +22804,9 @@ "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss variable.scss", "r": { "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #FF0000", + "light_plus": "variable.scss: #E50000", "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #FF0000", + "light_vs": "variable.scss: #E50000", "hc_black": "variable.scss: #D4D4D4", "hc_light": "variable.scss: #264F78" } diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json b/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json index 4b149ad534e..64b2f7bc6e8 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_xml.json @@ -88,9 +88,9 @@ "t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -208,9 +208,9 @@ "t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -328,9 +328,9 @@ "t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -400,9 +400,9 @@ "t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -568,9 +568,9 @@ "t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -640,9 +640,9 @@ "t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -952,9 +952,9 @@ "t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1552,9 +1552,9 @@ "t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1624,9 +1624,9 @@ "t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1744,9 +1744,9 @@ "t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1816,9 +1816,9 @@ "t": "text.xml meta.tag.xml entity.other.attribute-name.localname.xml", "r": { "dark_plus": "entity.other.attribute-name: #9CDCFE", - "light_plus": "entity.other.attribute-name: #FF0000", + "light_plus": "entity.other.attribute-name: #E50000", "dark_vs": "entity.other.attribute-name: #9CDCFE", - "light_vs": "entity.other.attribute-name: #FF0000", + "light_vs": "entity.other.attribute-name: #E50000", "hc_black": "entity.other.attribute-name: #9CDCFE", "hc_light": "entity.other.attribute-name: #264F78" } @@ -1967,4 +1967,4 @@ "hc_light": "punctuation.definition.tag: #0F4A85" } } -] \ No newline at end of file +] diff --git a/extensions/vscode-custom-editor-tests/.vscodeignore b/extensions/vscode-custom-editor-tests/.vscodeignore deleted file mode 100644 index 9f1e0620775..00000000000 --- a/extensions/vscode-custom-editor-tests/.vscodeignore +++ /dev/null @@ -1,12 +0,0 @@ -test/** -test-workspace/** -src/** -tsconfig.json -out/test/** -out/** -extension.webpack.config.js -extension-browser.webpack.config.js -cgmanifest.json -yarn.lock -preview-src/** -webpack.config.js diff --git a/extensions/vscode-custom-editor-tests/customEditorMedia/textEditor.js b/extensions/vscode-custom-editor-tests/customEditorMedia/textEditor.js deleted file mode 100644 index 8978b201c9f..00000000000 --- a/extensions/vscode-custom-editor-tests/customEditorMedia/textEditor.js +++ /dev/null @@ -1,56 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -// @ts-check -(function () { - // @ts-ignore - const vscode = acquireVsCodeApi(); - - const textArea = document.querySelector('textarea'); - - const initialState = vscode.getState(); - if (initialState) { - textArea.value = initialState.value; - } - - window.addEventListener('message', e => { - switch (e.data.type) { - case 'fakeInput': - { - const value = e.data.value; - textArea.value = value; - onInput(); - break; - } - - case 'setValue': - { - const value = e.data.value; - textArea.value = value; - vscode.setState({ value }); - - vscode.postMessage({ - type: 'didChangeContent', - value: value - }); - break; - } - } - }); - - const onInput = () => { - const value = textArea.value; - vscode.setState({ value }); - vscode.postMessage({ - type: 'edit', - value: value - }); - vscode.postMessage({ - type: 'didChangeContent', - value: value - }); - }; - - textArea.addEventListener('input', onInput); -}()); diff --git a/extensions/vscode-custom-editor-tests/media/icon.png b/extensions/vscode-custom-editor-tests/media/icon.png deleted file mode 100644 index f785ef70316..00000000000 Binary files a/extensions/vscode-custom-editor-tests/media/icon.png and /dev/null differ diff --git a/extensions/vscode-custom-editor-tests/package.json b/extensions/vscode-custom-editor-tests/package.json deleted file mode 100644 index 06814bdceb1..00000000000 --- a/extensions/vscode-custom-editor-tests/package.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "vscode-custom-editor-tests", - "description": "Custom editor tests for VS Code", - "version": "0.0.1", - "publisher": "vscode", - "license": "MIT", - "private": true, - "activationEvents": [ - "onCustomEditor:testWebviewEditor.abc" - ], - "main": "./out/extension", - "engines": { - "vscode": "^1.48.0" - }, - "icon": "media/icon.png", - "scripts": { - "compile": "node ./node_modules/vscode/bin/compile -watch -p ./", - "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-notebook-tests ./tsconfig.json" - }, - "dependencies": { - "p-limit": "^3.0.2" - }, - "devDependencies": { - "@types/mocha": "^9.1.1", - "@types/node": "16.x", - "@types/p-limit": "^2.2.0" - }, - "contributes": { - "customEditors": [ - { - "viewType": "testWebviewEditor.abc", - "displayName": "Test ABC editor", - "selector": [ - { - "filenamePattern": "*.abc" - } - ] - } - ] - }, - "repository": { - "type": "git", - "url": "https://github.com/microsoft/vscode.git" - } -} diff --git a/extensions/vscode-custom-editor-tests/src/customTextEditor.ts b/extensions/vscode-custom-editor-tests/src/customTextEditor.ts deleted file mode 100644 index 17d2ee888ae..00000000000 --- a/extensions/vscode-custom-editor-tests/src/customTextEditor.ts +++ /dev/null @@ -1,174 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import * as pLimit from 'p-limit'; -import * as path from 'path'; -import * as vscode from 'vscode'; -import { Disposable } from './dispose'; - -export namespace Testing { - export const abcEditorContentChangeCommand = '_abcEditor.contentChange'; - export const abcEditorTypeCommand = '_abcEditor.type'; - - export interface CustomEditorContentChangeEvent { - readonly content: string; - readonly source: vscode.Uri; - } -} - -export class AbcTextEditorProvider implements vscode.CustomTextEditorProvider { - - public static readonly viewType = 'testWebviewEditor.abc'; - - private activeEditor?: AbcEditor; - - public constructor( - private readonly context: vscode.ExtensionContext, - ) { } - - public register(): vscode.Disposable { - const provider = vscode.window.registerCustomEditorProvider(AbcTextEditorProvider.viewType, this); - - const commands: vscode.Disposable[] = []; - commands.push(vscode.commands.registerCommand(Testing.abcEditorTypeCommand, (content: string) => { - this.activeEditor?.testing_fakeInput(content); - })); - - return vscode.Disposable.from(provider, ...commands); - } - - public async resolveCustomTextEditor(document: vscode.TextDocument, panel: vscode.WebviewPanel) { - const editor = new AbcEditor(document, this.context.extensionPath, panel); - - this.activeEditor = editor; - - panel.onDidChangeViewState(({ webviewPanel }) => { - if (this.activeEditor === editor && !webviewPanel.active) { - this.activeEditor = undefined; - } - if (webviewPanel.active) { - this.activeEditor = editor; - } - }); - } -} - -class AbcEditor extends Disposable { - - public readonly _onDispose = this._register(new vscode.EventEmitter()); - public readonly onDispose = this._onDispose.event; - - private readonly limit = pLimit(1); - private syncedVersion: number = -1; - private currentWorkspaceEdit?: Thenable; - - constructor( - private readonly document: vscode.TextDocument, - private readonly _extensionPath: string, - private readonly panel: vscode.WebviewPanel, - ) { - super(); - - panel.webview.options = { - enableScripts: true, - }; - panel.webview.html = this.html; - - this._register(vscode.workspace.onDidChangeTextDocument(e => { - if (e.document === this.document) { - this.update(); - } - })); - - this._register(panel.webview.onDidReceiveMessage(message => { - switch (message.type) { - case 'edit': - this.doEdit(message.value); - break; - - case 'didChangeContent': - vscode.commands.executeCommand(Testing.abcEditorContentChangeCommand, { - content: message.value, - source: document.uri, - } as Testing.CustomEditorContentChangeEvent); - break; - } - })); - - this._register(panel.onDidDispose(() => { this.dispose(); })); - - this.update(); - } - - public testing_fakeInput(value: string) { - this.panel.webview.postMessage({ - type: 'fakeInput', - value: value, - }); - } - - private async doEdit(value: string) { - const edit = new vscode.WorkspaceEdit(); - edit.replace(this.document.uri, this.document.validateRange(new vscode.Range(new vscode.Position(0, 0), new vscode.Position(999999, 999999))), value); - this.limit(() => { - this.currentWorkspaceEdit = vscode.workspace.applyEdit(edit).then(() => { - this.syncedVersion = this.document.version; - this.currentWorkspaceEdit = undefined; - }); - return this.currentWorkspaceEdit; - }); - } - - public override dispose() { - if (this.isDisposed) { - return; - } - - this._onDispose.fire(); - super.dispose(); - } - - private get html() { - const contentRoot = path.join(this._extensionPath, 'customEditorMedia'); - const scriptUri = vscode.Uri.file(path.join(contentRoot, 'textEditor.js')); - const nonce = getNonce(); - return /* html */` - - - - - - Document - - - - - - `; - } - - public async update() { - await this.currentWorkspaceEdit; - - if (this.isDisposed || this.syncedVersion >= this.document.version) { - return; - } - - this.panel.webview.postMessage({ - type: 'setValue', - value: this.document.getText(), - }); - this.syncedVersion = this.document.version; - } -} - -function getNonce() { - let text = ''; - const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - for (let i = 0; i < 64; i++) { - text += possible.charAt(Math.floor(Math.random() * possible.length)); - } - return text; -} diff --git a/extensions/vscode-custom-editor-tests/src/test/customEditor.test.ts b/extensions/vscode-custom-editor-tests/src/test/customEditor.test.ts deleted file mode 100644 index 7fc68f61c02..00000000000 --- a/extensions/vscode-custom-editor-tests/src/test/customEditor.test.ts +++ /dev/null @@ -1,316 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import 'mocha'; -import * as assert from 'assert'; -import * as fs from 'fs'; -import * as path from 'path'; -import * as vscode from 'vscode'; -import { Testing } from '../customTextEditor'; -import { closeAllEditors, delay, disposeAll, randomFilePath } from './utils'; - -assert.ok(vscode.workspace.rootPath); -const testWorkspaceRoot = vscode.Uri.file(path.join(vscode.workspace.rootPath!, 'customEditors')); - -const commands = Object.freeze({ - open: 'vscode.open', - openWith: 'vscode.openWith', - save: 'workbench.action.files.save', - undo: 'undo', -}); - -async function writeRandomFile(options: { ext: string; contents: string }): Promise { - const fakeFile = randomFilePath({ root: testWorkspaceRoot, ext: options.ext }); - await fs.promises.writeFile(fakeFile.fsPath, Buffer.from(options.contents)); - return fakeFile; -} - -const disposables: vscode.Disposable[] = []; -function _register(disposable: T) { - disposables.push(disposable); - return disposable; -} - -class CustomEditorUpdateListener { - - public static create() { - return _register(new CustomEditorUpdateListener()); - } - - private readonly commandSubscription: vscode.Disposable; - - private readonly unconsumedResponses: Array = []; - private readonly callbackQueue: Array<(data: Testing.CustomEditorContentChangeEvent) => void> = []; - - private constructor() { - this.commandSubscription = vscode.commands.registerCommand(Testing.abcEditorContentChangeCommand, (data: Testing.CustomEditorContentChangeEvent) => { - if (this.callbackQueue.length) { - const callback = this.callbackQueue.shift(); - assert.ok(callback); - callback!(data); - } else { - this.unconsumedResponses.push(data); - } - }); - } - - dispose() { - this.commandSubscription.dispose(); - } - - async nextResponse(): Promise { - if (this.unconsumedResponses.length) { - return this.unconsumedResponses.shift()!; - } - - return new Promise(resolve => { - this.callbackQueue.push(resolve); - }); - } -} - - -suite('CustomEditor tests', () => { - setup(async () => { - await closeAllEditors(); - await resetTestWorkspace(); - }); - - teardown(async () => { - await closeAllEditors(); - disposeAll(disposables); - await resetTestWorkspace(); - }); - - test('Should load basic content from disk', async () => { - const startingContent = `load, init`; - const testDocument = await writeRandomFile({ ext: '.abc', contents: startingContent }); - - const listener = CustomEditorUpdateListener.create(); - - await vscode.commands.executeCommand(commands.open, testDocument); - - const { content } = await listener.nextResponse(); - assert.strictEqual(content, startingContent); - }); - - test('Should support basic edits', async () => { - const startingContent = `basic edit, init`; - const testDocument = await writeRandomFile({ ext: '.abc', contents: startingContent }); - - const listener = CustomEditorUpdateListener.create(); - - await vscode.commands.executeCommand(commands.open, testDocument); - await listener.nextResponse(); - - const newContent = `basic edit test`; - await vscode.commands.executeCommand(Testing.abcEditorTypeCommand, newContent); - const { content } = await listener.nextResponse(); - assert.strictEqual(content, newContent); - }); - - test('Should support single undo', async () => { - const startingContent = `single undo, init`; - const testDocument = await writeRandomFile({ ext: '.abc', contents: startingContent }); - - const listener = CustomEditorUpdateListener.create(); - - await vscode.commands.executeCommand(commands.open, testDocument); - await listener.nextResponse(); - - const newContent = `undo test`; - { - await vscode.commands.executeCommand(Testing.abcEditorTypeCommand, newContent); - const { content } = await listener.nextResponse(); - assert.strictEqual(content, newContent); - } - await delay(100); - { - await vscode.commands.executeCommand(commands.undo); - const { content } = await listener.nextResponse(); - assert.strictEqual(content, startingContent); - } - }); - - test('Should support multiple undo', async () => { - const startingContent = `multiple undo, init`; - const testDocument = await writeRandomFile({ ext: '.abc', contents: startingContent }); - - const listener = CustomEditorUpdateListener.create(); - - await vscode.commands.executeCommand(commands.open, testDocument); - await listener.nextResponse(); - - const count = 10; - - // Make edits - for (let i = 0; i < count; ++i) { - await vscode.commands.executeCommand(Testing.abcEditorTypeCommand, `${i}`); - const { content } = await listener.nextResponse(); - assert.strictEqual(`${i}`, content); - } - - // Then undo them in order - for (let i = count - 1; i; --i) { - await delay(100); - await vscode.commands.executeCommand(commands.undo); - const { content } = await listener.nextResponse(); - assert.strictEqual(`${i - 1}`, content); - } - - { - await delay(100); - await vscode.commands.executeCommand(commands.undo); - const { content } = await listener.nextResponse(); - assert.strictEqual(content, startingContent); - } - }); - - test('Should update custom editor on file move', async () => { - const startingContent = `file move, init`; - const testDocument = await writeRandomFile({ ext: '.abc', contents: startingContent }); - - const listener = CustomEditorUpdateListener.create(); - - await vscode.commands.executeCommand(commands.open, testDocument); - await listener.nextResponse(); - - const newFileName = vscode.Uri.file(path.join(testWorkspaceRoot.fsPath, 'y.abc')); - - const edit = new vscode.WorkspaceEdit(); - edit.renameFile(testDocument, newFileName); - - await vscode.workspace.applyEdit(edit); - - const response = (await listener.nextResponse()); - assert.strictEqual(response.content, startingContent); - assert.strictEqual(response.source.toString(), newFileName.toString()); - }); - - test('Should support saving custom editors', async () => { - const startingContent = `save, init`; - const testDocument = await writeRandomFile({ ext: '.abc', contents: startingContent }); - - const listener = CustomEditorUpdateListener.create(); - - await vscode.commands.executeCommand(commands.open, testDocument); - await listener.nextResponse(); - - const newContent = `save, new`; - { - await vscode.commands.executeCommand(Testing.abcEditorTypeCommand, newContent); - const { content } = await listener.nextResponse(); - assert.strictEqual(content, newContent); - } - { - await vscode.commands.executeCommand(commands.save); - const fileContent = (await fs.promises.readFile(testDocument.fsPath)).toString(); - assert.strictEqual(fileContent, newContent); - } - }); - - test('Should undo after saving custom editor', async () => { - const startingContent = `undo after save, init`; - const testDocument = await writeRandomFile({ ext: '.abc', contents: startingContent }); - - const listener = CustomEditorUpdateListener.create(); - - await vscode.commands.executeCommand(commands.open, testDocument); - await listener.nextResponse(); - - const newContent = `undo after save, new`; - { - await vscode.commands.executeCommand(Testing.abcEditorTypeCommand, newContent); - const { content } = await listener.nextResponse(); - assert.strictEqual(content, newContent); - } - { - await vscode.commands.executeCommand(commands.save); - const fileContent = (await fs.promises.readFile(testDocument.fsPath)).toString(); - assert.strictEqual(fileContent, newContent); - } - await delay(100); - { - await vscode.commands.executeCommand(commands.undo); - const { content } = await listener.nextResponse(); - assert.strictEqual(content, startingContent); - } - }); - - test.skip('Should support untitled custom editors', async () => { - const listener = CustomEditorUpdateListener.create(); - - const untitledFile = randomFilePath({ root: testWorkspaceRoot, ext: '.abc' }).with({ scheme: 'untitled' }); - - await vscode.commands.executeCommand(commands.open, untitledFile); - assert.strictEqual((await listener.nextResponse()).content, ''); - - await vscode.commands.executeCommand(Testing.abcEditorTypeCommand, `123`); - assert.strictEqual((await listener.nextResponse()).content, '123'); - - await vscode.commands.executeCommand(commands.save); - const content = await fs.promises.readFile(untitledFile.fsPath); - assert.strictEqual(content.toString(), '123'); - }); - - test.skip('When switching away from a non-default custom editors and then back, we should continue using the non-default editor', async () => { - const startingContent = `switch, init`; - const testDocument = await writeRandomFile({ ext: '.abc', contents: startingContent }); - - const listener = CustomEditorUpdateListener.create(); - - { - await vscode.commands.executeCommand(commands.open, testDocument, { preview: false }); - const { content } = await listener.nextResponse(); - assert.strictEqual(content, startingContent.toString()); - const activeEditor = vscode.window.activeTextEditor; - assert.ok(!activeEditor); - } - - // Switch to non-default editor - await vscode.commands.executeCommand(commands.openWith, testDocument, 'default', { preview: false }); - assert.strictEqual(vscode.window.activeTextEditor!?.document.uri.toString(), testDocument.toString()); - - // Then open a new document (hiding existing one) - const otherFile = vscode.Uri.file(path.join(testWorkspaceRoot.fsPath, 'other.json')); - await vscode.commands.executeCommand(commands.open, otherFile); - assert.strictEqual(vscode.window.activeTextEditor!?.document.uri.toString(), otherFile.toString()); - - // And then back - await vscode.commands.executeCommand('workbench.action.navigateBack'); - await vscode.commands.executeCommand('workbench.action.navigateBack'); - - // Make sure we have the file on as text - assert.ok(vscode.window.activeTextEditor); - assert.strictEqual(vscode.window.activeTextEditor!?.document.uri.toString(), testDocument.toString()); - }); - - test('Should release the text document when the editor is closed', async () => { - const startingContent = `release document init,`; - const testDocument = await writeRandomFile({ ext: '.abc', contents: startingContent }); - - const listener = CustomEditorUpdateListener.create(); - - await vscode.commands.executeCommand(commands.open, testDocument); - await listener.nextResponse(); - - const doc = vscode.workspace.textDocuments.find(x => x.uri.toString() === testDocument.toString()); - assert.ok(doc); - assert.ok(!doc!.isClosed); - - await closeAllEditors(); - await delay(100); - assert.ok(doc!.isClosed); - }); -}); - -async function resetTestWorkspace() { - try { - await vscode.workspace.fs.delete(testWorkspaceRoot, { recursive: true }); - } catch { - // ok if file doesn't exist - } - await vscode.workspace.fs.createDirectory(testWorkspaceRoot); -} diff --git a/extensions/vscode-custom-editor-tests/src/test/index.ts b/extensions/vscode-custom-editor-tests/src/test/index.ts deleted file mode 100644 index 4a5238f776c..00000000000 --- a/extensions/vscode-custom-editor-tests/src/test/index.ts +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -const path = require('path'); -const testRunner = require('../../../../test/integration/electron/testrunner'); - -const suite = 'Custom Editor Tests'; - -const options: any = { - ui: 'tdd', - color: true, - timeout: 60000 -}; - -if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) { - options.reporter = 'mocha-multi-reporters'; - options.reporterOptions = { - reporterEnabled: 'spec, mocha-junit-reporter', - mochaJunitReporterReporterOptions: { - testsuitesTitle: `${suite} ${process.platform}`, - mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${process.arch}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`) - } - }; -} - -testRunner.configure(options); - -export = testRunner; diff --git a/extensions/vscode-custom-editor-tests/src/test/utils.ts b/extensions/vscode-custom-editor-tests/src/test/utils.ts deleted file mode 100644 index 80d2eea16a4..00000000000 --- a/extensions/vscode-custom-editor-tests/src/test/utils.ts +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import * as vscode from 'vscode'; - -export function randomFilePath(args: { root: vscode.Uri; ext: string }): vscode.Uri { - const fileName = rndName(); - return vscode.Uri.joinPath(args.root, fileName + args.ext); -} - -export function rndName() { - let name = ''; - const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - for (let i = 0; i < 10; i++) { - name += possible.charAt(Math.floor(Math.random() * possible.length)); - } - return name; -} - -export function closeAllEditors(): Thenable { - return vscode.commands.executeCommand('workbench.action.closeAllEditors'); -} - -export function disposeAll(disposables: vscode.Disposable[]) { - vscode.Disposable.from(...disposables).dispose(); -} - -export function delay(ms: number) { - return new Promise(resolve => setTimeout(resolve, ms)); -} diff --git a/extensions/vscode-custom-editor-tests/test-workspace/index.abc b/extensions/vscode-custom-editor-tests/test-workspace/index.abc deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/vscode-custom-editor-tests/tsconfig.json b/extensions/vscode-custom-editor-tests/tsconfig.json deleted file mode 100644 index 7234fdfeb97..00000000000 --- a/extensions/vscode-custom-editor-tests/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../tsconfig.base.json", - "compilerOptions": { - "outDir": "./out", - "types": [ - "node" - ] - }, - "include": [ - "src/**/*", - "../../src/vscode-dts/vscode.d.ts" - ] -} diff --git a/extensions/vscode-custom-editor-tests/yarn.lock b/extensions/vscode-custom-editor-tests/yarn.lock deleted file mode 100644 index 6d502cede51..00000000000 --- a/extensions/vscode-custom-editor-tests/yarn.lock +++ /dev/null @@ -1,32 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@types/mocha@^9.1.1": - version "9.1.1" - resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4" - integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw== - -"@types/node@16.x": - version "16.11.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" - integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== - -"@types/p-limit@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@types/p-limit/-/p-limit-2.2.0.tgz#94a608e9b258a6c6156a13d1a14fd720dba70b97" - integrity sha512-fGFbybl1r0oE9mqgfc2EHHUin9ZL5rbQIexWI6jYRU1ADVn4I3LHzT+g/kpPpZsfp8PB94CQ655pfAjNF8LP6A== - dependencies: - p-limit "*" - -p-limit@*, p-limit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe" - integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg== - dependencies: - p-try "^2.0.0" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== diff --git a/extensions/vscode-notebook-tests/.vscode/launch.json b/extensions/vscode-notebook-tests/.vscode/launch.json deleted file mode 100644 index 73c3753c75c..00000000000 --- a/extensions/vscode-notebook-tests/.vscode/launch.json +++ /dev/null @@ -1,17 +0,0 @@ -// A launch configuration that compiles the extension and then opens it inside a new window -{ - "version": "0.1.0", - "configurations": [ - { - "name": "Launch Tests", - "type": "extensionHost", - "request": "launch", - "runtimeExecutable": "${execPath}", - "args": ["${workspaceFolder}/../../", "${workspaceFolder}/test", "--extensionDevelopmentPath=${workspaceFolder}", "--extensionTestsPath=${workspaceFolder}/out" ], - "stopOnEntry": false, - "sourceMaps": true, - "outDir": "${workspaceFolder}/out", - "preLaunchTask": "npm" - } - ] -} \ No newline at end of file diff --git a/extensions/vscode-notebook-tests/.vscode/tasks.json b/extensions/vscode-notebook-tests/.vscode/tasks.json deleted file mode 100644 index 390a93a3a7f..00000000000 --- a/extensions/vscode-notebook-tests/.vscode/tasks.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "version": "2.0.0", - "command": "npm", - "type": "shell", - "presentation": { - "reveal": "silent" - }, - "args": ["run", "compile"], - "isBackground": true, - "problemMatcher": "$tsc-watch" -} diff --git a/extensions/vscode-notebook-tests/media/icon.png b/extensions/vscode-notebook-tests/media/icon.png deleted file mode 100644 index f785ef70316..00000000000 Binary files a/extensions/vscode-notebook-tests/media/icon.png and /dev/null differ diff --git a/extensions/vscode-notebook-tests/package.json b/extensions/vscode-notebook-tests/package.json deleted file mode 100644 index bd3f3586db0..00000000000 --- a/extensions/vscode-notebook-tests/package.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "name": "vscode-notebook-tests", - "description": "Notebook tests for VS Code", - "version": "0.0.1", - "publisher": "vscode", - "license": "MIT", - "private": true, - "activationEvents": [ - "*" - ], - "main": "./out/extension", - "enabledApiProposals": [ - "notebookCellExecutionState", - "notebookContentProvider", - "notebookControllerKind", - "notebookDebugOptions", - "notebookDeprecated", - "notebookEditorDecorationType", - "notebookLiveShare", - "notebookMessaging", - "notebookMime" - ], - "engines": { - "vscode": "^1.25.0" - }, - "icon": "media/icon.png", - "scripts": { - "compile": "node ./node_modules/vscode/bin/compile -watch -p ./", - "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-notebook-tests ./tsconfig.json" - }, - "dependencies": {}, - "devDependencies": { - "@types/node": "16.x" - }, - "contributes": { - "commands": [ - { - "command": "vscode-notebook-tests.createNewNotebook", - "title": "Create New Notebook" - }, - { - "command": "vscode-notebook-tests.debugAction", - "title": "Debug Notebook Test Cell Action", - "icon": "$(debug)" - } - ], - "notebooks": [ - { - "type": "notebookSmokeTest", - "displayName": "Notebook Smoke Test", - "selector": [ - { - "filenamePattern": "*.smoke-nb", - "excludeFileNamePattern": "" - } - ] - } - ], - "notebookRenderer": [ - { - "id": "notebookCoreTestRenderer", - "displayName": "Notebook Core Test Renderer", - "entrypoint": "./src/customRenderer.js", - "mimeTypes": [ - "text/custom" - ] - } - ], - "menus": { - "notebook/cell/title": [ - { - "command": "vscode-notebook-tests.debugAction", - "when": "notebookType == notebookSmokeTest", - "group": "inline@1" - } - ] - }, - "jsonValidation": [ - { - "fileMatch": "vscode://vscode-notebook-cell-metadata/*", - "url": "vscode://schemas/notebook/cellmetadata" - } - ] - }, - "repository": { - "type": "git", - "url": "https://github.com/microsoft/vscode.git" - } -} diff --git a/extensions/vscode-notebook-tests/src/extension.ts b/extensions/vscode-notebook-tests/src/extension.ts deleted file mode 100644 index 7160f07c1a1..00000000000 --- a/extensions/vscode-notebook-tests/src/extension.ts +++ /dev/null @@ -1,90 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import * as vscode from 'vscode'; -import * as child_process from 'child_process'; -import * as path from 'path'; - -function wait(ms: number): Promise { - return new Promise(r => setTimeout(r, ms)); -} - -export function activate(context: vscode.ExtensionContext): any { - context.subscriptions.push(vscode.commands.registerCommand('vscode-notebook-tests.createNewNotebook', async () => { - const workspacePath = vscode.workspace.workspaceFolders![0].uri.fsPath; - const notebookPath = path.join(workspacePath, 'test.smoke-nb'); - child_process.execSync('echo \'\' > ' + notebookPath); - await wait(500); - await vscode.commands.executeCommand('vscode.open', vscode.Uri.file(notebookPath)); - })); - - context.subscriptions.push(vscode.workspace.registerNotebookContentProvider('notebookSmokeTest', { - openNotebook: async (_resource: vscode.Uri) => { - const dto: vscode.NotebookData = { - metadata: {}, - cells: [ - { - value: 'code()', - languageId: 'typescript', - kind: vscode.NotebookCellKind.Code, - outputs: [], - metadata: { custom: { testCellMetadata: 123 } } - }, - { - value: 'Markdown Cell', - languageId: 'markdown', - kind: vscode.NotebookCellKind.Markup, - outputs: [], - metadata: { custom: { testCellMetadata: 123 } } - } - ] - }; - - return dto; - }, - saveNotebook: async (_document: vscode.NotebookDocument, _cancellation: vscode.CancellationToken) => { - return; - }, - saveNotebookAs: async (_targetResource: vscode.Uri, _document: vscode.NotebookDocument, _cancellation: vscode.CancellationToken) => { - return; - }, - backupNotebook: async (_document: vscode.NotebookDocument, _context: vscode.NotebookDocumentBackupContext, _cancellation: vscode.CancellationToken) => { - return { - id: '1', - delete: () => { } - }; - } - })); - - const controller = vscode.notebooks.createNotebookController( - 'notebookSmokeTest', - 'notebookSmokeTest', - 'notebookSmokeTest' - ); - - controller.executeHandler = (cells) => { - for (const cell of cells) { - const task = controller.createNotebookCellExecution(cell); - task.start(); - task.replaceOutput([new vscode.NotebookCellOutput([ - vscode.NotebookCellOutputItem.text('test output', 'text/html') - ])]); - task.end(true); - } - }; - - context.subscriptions.push(controller); - - context.subscriptions.push(vscode.commands.registerCommand('vscode-notebook-tests.debugAction', async (cell: vscode.NotebookCell) => { - if (cell) { - const edit = new vscode.WorkspaceEdit(); - const fullRange = new vscode.Range(0, 0, cell.document.lineCount - 1, cell.document.lineAt(cell.document.lineCount - 1).range.end.character); - edit.replace(cell.document.uri, fullRange, 'test'); - await vscode.workspace.applyEdit(edit); - } else { - throw new Error('Cell not set correctly'); - } - })); -} diff --git a/extensions/vscode-notebook-tests/src/utils.ts b/extensions/vscode-notebook-tests/src/utils.ts deleted file mode 100644 index 9aad81fbf89..00000000000 --- a/extensions/vscode-notebook-tests/src/utils.ts +++ /dev/null @@ -1,266 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - - -import * as path from 'path'; -import * as vscode from 'vscode'; - -class File implements vscode.FileStat { - - type: vscode.FileType; - ctime: number; - mtime: number; - size: number; - - name: string; - data?: Uint8Array; - - constructor(name: string) { - this.type = vscode.FileType.File; - this.ctime = Date.now(); - this.mtime = Date.now(); - this.size = 0; - this.name = name; - } -} - -class Directory implements vscode.FileStat { - - type: vscode.FileType; - ctime: number; - mtime: number; - size: number; - - name: string; - entries: Map; - - constructor(name: string) { - this.type = vscode.FileType.Directory; - this.ctime = Date.now(); - this.mtime = Date.now(); - this.size = 0; - this.name = name; - this.entries = new Map(); - } -} - -export type Entry = File | Directory; - -export class TestFS implements vscode.FileSystemProvider { - - constructor( - readonly scheme: string, - readonly isCaseSensitive: boolean - ) { } - - readonly root = new Directory(''); - - // --- manage file metadata - - stat(uri: vscode.Uri): vscode.FileStat { - return this._lookup(uri, false); - } - - readDirectory(uri: vscode.Uri): [string, vscode.FileType][] { - const entry = this._lookupAsDirectory(uri, false); - const result: [string, vscode.FileType][] = []; - for (const [name, child] of entry.entries) { - result.push([name, child.type]); - } - return result; - } - - // --- manage file contents - - readFile(uri: vscode.Uri): Uint8Array { - const data = this._lookupAsFile(uri, false).data; - if (data) { - return data; - } - throw vscode.FileSystemError.FileNotFound(); - } - - writeFile(uri: vscode.Uri, content: Uint8Array, options: { create: boolean; overwrite: boolean }): void { - const basename = path.posix.basename(uri.path); - const parent = this._lookupParentDirectory(uri); - let entry = parent.entries.get(basename); - if (entry instanceof Directory) { - throw vscode.FileSystemError.FileIsADirectory(uri); - } - if (!entry && !options.create) { - throw vscode.FileSystemError.FileNotFound(uri); - } - if (entry && options.create && !options.overwrite) { - throw vscode.FileSystemError.FileExists(uri); - } - if (!entry) { - entry = new File(basename); - parent.entries.set(basename, entry); - this._fireSoon({ type: vscode.FileChangeType.Created, uri }); - } - entry.mtime = Date.now(); - entry.size = content.byteLength; - entry.data = content; - - this._fireSoon({ type: vscode.FileChangeType.Changed, uri }); - } - - // --- manage files/folders - - rename(oldUri: vscode.Uri, newUri: vscode.Uri, options: { overwrite: boolean }): void { - - if (!options.overwrite && this._lookup(newUri, true)) { - throw vscode.FileSystemError.FileExists(newUri); - } - - const entry = this._lookup(oldUri, false); - const oldParent = this._lookupParentDirectory(oldUri); - - const newParent = this._lookupParentDirectory(newUri); - const newName = path.posix.basename(newUri.path); - - oldParent.entries.delete(entry.name); - entry.name = newName; - newParent.entries.set(newName, entry); - - this._fireSoon( - { type: vscode.FileChangeType.Deleted, uri: oldUri }, - { type: vscode.FileChangeType.Created, uri: newUri } - ); - } - - delete(uri: vscode.Uri): void { - const dirname = uri.with({ path: path.posix.dirname(uri.path) }); - const basename = path.posix.basename(uri.path); - const parent = this._lookupAsDirectory(dirname, false); - if (!parent.entries.has(basename)) { - throw vscode.FileSystemError.FileNotFound(uri); - } - parent.entries.delete(basename); - parent.mtime = Date.now(); - parent.size -= 1; - this._fireSoon({ type: vscode.FileChangeType.Changed, uri: dirname }, { uri, type: vscode.FileChangeType.Deleted }); - } - - createDirectory(uri: vscode.Uri): void { - const basename = path.posix.basename(uri.path); - const dirname = uri.with({ path: path.posix.dirname(uri.path) }); - const parent = this._lookupAsDirectory(dirname, false); - - const entry = new Directory(basename); - parent.entries.set(entry.name, entry); - parent.mtime = Date.now(); - parent.size += 1; - this._fireSoon({ type: vscode.FileChangeType.Changed, uri: dirname }, { type: vscode.FileChangeType.Created, uri }); - } - - // --- lookup - - private _lookup(uri: vscode.Uri, silent: false): Entry; - private _lookup(uri: vscode.Uri, silent: boolean): Entry | undefined; - private _lookup(uri: vscode.Uri, silent: boolean): Entry | undefined { - const parts = uri.path.split('/'); - let entry: Entry = this.root; - for (const part of parts) { - const partLow = part.toLowerCase(); - if (!part) { - continue; - } - let child: Entry | undefined; - if (entry instanceof Directory) { - if (this.isCaseSensitive) { - child = entry.entries.get(part); - } else { - for (const [key, value] of entry.entries) { - if (key.toLowerCase() === partLow) { - child = value; - break; - } - } - } - } - if (!child) { - if (!silent) { - throw vscode.FileSystemError.FileNotFound(uri); - } else { - return undefined; - } - } - entry = child; - } - return entry; - } - - private _lookupAsDirectory(uri: vscode.Uri, silent: boolean): Directory { - const entry = this._lookup(uri, silent); - if (entry instanceof Directory) { - return entry; - } - throw vscode.FileSystemError.FileNotADirectory(uri); - } - - private _lookupAsFile(uri: vscode.Uri, silent: boolean): File { - const entry = this._lookup(uri, silent); - if (entry instanceof File) { - return entry; - } - throw vscode.FileSystemError.FileIsADirectory(uri); - } - - private _lookupParentDirectory(uri: vscode.Uri): Directory { - const dirname = uri.with({ path: path.posix.dirname(uri.path) }); - return this._lookupAsDirectory(dirname, false); - } - - // --- manage file events - - private _emitter = new vscode.EventEmitter(); - private _bufferedEvents: vscode.FileChangeEvent[] = []; - private _fireSoonHandle?: NodeJS.Timer; - - readonly onDidChangeFile: vscode.Event = this._emitter.event; - - watch(_resource: vscode.Uri): vscode.Disposable { - // ignore, fires for all changes... - return new vscode.Disposable(() => { }); - } - - private _fireSoon(...events: vscode.FileChangeEvent[]): void { - this._bufferedEvents.push(...events); - - if (this._fireSoonHandle) { - clearTimeout(this._fireSoonHandle); - } - - this._fireSoonHandle = setTimeout(() => { - this._emitter.fire(this._bufferedEvents); - this._bufferedEvents.length = 0; - }, 5); - } -} - -export function rndName() { - let name = ''; - const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - for (let i = 0; i < 10; i++) { - name += possible.charAt(Math.floor(Math.random() * possible.length)); - } - return name; -} - -export const testFs = new TestFS('fake-fs', true); -vscode.workspace.registerFileSystemProvider(testFs.scheme, testFs, { isCaseSensitive: testFs.isCaseSensitive }); - -export async function createRandomFile(contents = '', dir: vscode.Uri | undefined = undefined, prefix = '', ext = ''): Promise { - let fakeFile: vscode.Uri; - if (dir) { - fakeFile = dir.with({ path: dir.path + '/' + rndName() + ext }); - } else { - fakeFile = vscode.Uri.parse(`${testFs.scheme}:/${prefix}-${rndName() + ext}`); - } - - await testFs.writeFile(fakeFile, Buffer.from(contents), { create: true, overwrite: true }); - return fakeFile; -} diff --git a/extensions/vscode-notebook-tests/test/first.vsctestnb b/extensions/vscode-notebook-tests/test/first.vsctestnb deleted file mode 100644 index a4a092d8349..00000000000 --- a/extensions/vscode-notebook-tests/test/first.vsctestnb +++ /dev/null @@ -1,4 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * 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/vscode-notebook-tests/tsconfig.json b/extensions/vscode-notebook-tests/tsconfig.json deleted file mode 100644 index c9c35c63299..00000000000 --- a/extensions/vscode-notebook-tests/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../tsconfig.base.json", - "compilerOptions": { - "outDir": "./out", - "types": [ - "node" - ] - }, - "include": [ - "src/**/*", - "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.notebook*.d.ts" - ] -} diff --git a/extensions/vscode-notebook-tests/yarn.lock b/extensions/vscode-notebook-tests/yarn.lock deleted file mode 100644 index e724e7fffa3..00000000000 --- a/extensions/vscode-notebook-tests/yarn.lock +++ /dev/null @@ -1,8 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@types/node@16.x": - version "16.11.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" - integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== diff --git a/extensions/vscode-test-resolver/package.json b/extensions/vscode-test-resolver/package.json index da90e7e3809..167275aa275 100644 --- a/extensions/vscode-test-resolver/package.json +++ b/extensions/vscode-test-resolver/package.json @@ -6,7 +6,8 @@ "license": "MIT", "enableProposedApi": true, "enabledApiProposals": [ - "resolvers" + "resolvers", + "tunnels" ], "private": true, "engines": { diff --git a/extensions/vscode-test-resolver/src/extension.ts b/extensions/vscode-test-resolver/src/extension.ts index 9f6fc9efc18..05fd267d2bc 100644 --- a/extensions/vscode-test-resolver/src/extension.ts +++ b/extensions/vscode-test-resolver/src/extension.ts @@ -25,7 +25,7 @@ let outputChannel: vscode.OutputChannel; export function activate(context: vscode.ExtensionContext) { let connectionPaused = false; - let connectionPausedEvent = new vscode.EventEmitter(); + const connectionPausedEvent = new vscode.EventEmitter(); function doResolve(_authority: string, progress: vscode.Progress<{ message?: string; increment?: number }>): Promise { if (connectionPaused) { @@ -159,7 +159,7 @@ export function activate(context: vscode.ExtensionContext) { let isDisconnected = false; const handleConnectionPause = () => { - let newIsDisconnected = connectionPaused; + const newIsDisconnected = connectionPaused; if (isDisconnected !== newIsDisconnected) { outputChannel.appendLine(`Connection state: ${newIsDisconnected ? 'open' : 'paused'}`); isDisconnected = newIsDisconnected; diff --git a/extensions/vscode-test-resolver/tsconfig.json b/extensions/vscode-test-resolver/tsconfig.json index f9a183ef9e1..4a8025df9b5 100644 --- a/extensions/vscode-test-resolver/tsconfig.json +++ b/extensions/vscode-test-resolver/tsconfig.json @@ -9,6 +9,7 @@ "include": [ "src/**/*", "../../src/vscode-dts/vscode.d.ts", + "../../src/vscode-dts/vscode.proposed.tunnels.d.ts", "../../src/vscode-dts/vscode.proposed.resolvers.d.ts" ] } diff --git a/extensions/yarn.lock b/extensions/yarn.lock index da2bcfbff02..619417cb66c 100644 --- a/extensions/yarn.lock +++ b/extensions/yarn.lock @@ -42,10 +42,10 @@ node-gyp-build@^4.3.0: resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== -typescript@4.7.3: - version "4.7.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" - integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== +typescript@4.8.4: + version "4.8.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" + integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== vscode-grammar-updater@^1.1.0: version "1.1.0" diff --git a/package.json b/package.json index 151f3ba3f8a..73ab53be507 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", - "version": "1.68.0", - "distro": "2966cd72fc1a3a5fb89bf2d85a1a66e56206961a", + "version": "1.73.0", + "distro": "ad661f3c6bb1476b7153aebf2c532d69f070500c", "author": { "name": "Microsoft Corporation" }, @@ -56,17 +56,18 @@ "minify-vscode-reh-web": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode-reh-web", "hygiene": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js hygiene", "core-ci": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js core-ci", - "extensions-ci": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js extensions-ci" + "extensions-ci": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js extensions-ci", + "webview-generate-csp-hash": "npx github:apaatsio/csp-hash-from-html csp-hash ./src/vs/workbench/contrib/webview/browser/pre/index.html" }, "dependencies": { - "@microsoft/applicationinsights-web": "^2.6.4", + "@microsoft/1ds-core-js": "^3.2.2", + "@microsoft/1ds-post-js": "^3.2.2", "@parcel/watcher": "2.0.5", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/ripgrep": "^1.14.2", "@vscode/sqlite3": "5.0.8", "@vscode/sudo-prompt": "9.3.1", "@vscode/vscode-languagedetection": "1.0.21", - "applicationinsights": "1.4.2", "graceful-fs": "4.2.8", "http-proxy-agent": "^2.1.0", "https-proxy-agent": "^2.2.3", @@ -85,19 +86,21 @@ "vscode-proxy-agent": "^0.12.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "7.0.1", - "xterm": "4.19.0-beta.58", - "xterm-addon-search": "0.9.0-beta.39", - "xterm-addon-serialize": "0.7.0-beta.12", - "xterm-addon-unicode11": "0.4.0-beta.3", - "xterm-addon-webgl": "0.12.0-beta.37", - "xterm-headless": "4.19.0-beta.58", + "xterm": "5.1.0-beta.49", + "xterm-addon-canvas": "0.3.0-beta.23", + "xterm-addon-search": "0.11.0-beta.7", + "xterm-addon-serialize": "0.9.0-beta.3", + "xterm-addon-unicode11": "0.5.0-beta.1", + "xterm-addon-webgl": "0.14.0-beta.32", + "xterm-headless": "5.1.0-beta.49", "yauzl": "^2.9.2", "yazl": "^2.4.3" }, "devDependencies": { "7zip": "0.0.6", - "@playwright/test": "1.21.0", - "@types/applicationinsights": "0.20.0", + "@playwright/test": "1.27.1", + "@swc/cli": "0.1.57", + "@swc/core": "1.2.245", "@types/cookie": "^0.3.3", "@types/copy-webpack-plugin": "^6.0.3", "@types/cssnano": "^4.0.0", @@ -113,7 +116,7 @@ "@types/sinon": "^10.0.2", "@types/sinon-test": "^2.4.2", "@types/trusted-types": "^1.0.6", - "@types/vscode-notebook-renderer": "^1.60.0", + "@types/vscode-notebook-renderer": "^1.72.0", "@types/webpack": "^4.41.25", "@types/wicg-file-system-access": "^2020.9.5", "@types/windows-foreground-love": "^0.3.0", @@ -122,28 +125,31 @@ "@types/winreg": "^1.2.30", "@types/yauzl": "^2.9.1", "@types/yazl": "^2.4.2", - "@typescript-eslint/eslint-plugin": "^5.10.0", - "@typescript-eslint/parser": "^5.10.0", - "@vscode/telemetry-extractor": "^1.9.6", - "@vscode/test-web": "^0.0.22", + "@typescript-eslint/eslint-plugin": "^5.39.0", + "@typescript-eslint/experimental-utils": "^5.39.0", + "@typescript-eslint/parser": "^5.39.0", + "@vscode/l10n-dev": "0.0.15", + "@vscode/telemetry-extractor": "^1.9.8", + "@vscode/test-web": "^0.0.32", "ansi-colors": "^3.2.3", "asar": "^3.0.3", "chromium-pickle-js": "^0.2.0", "cookie": "^0.4.0", "copy-webpack-plugin": "^6.0.3", "cson-parser": "^1.3.3", - "css-loader": "^3.2.0", + "css-loader": "^3.6.0", "cssnano": "^4.1.11", "debounce": "^1.0.0", - "deemon": "^1.4.0", - "electron": "17.4.6", + "deemon": "^1.7.2", + "electron": "19.0.17", "eslint": "8.7.0", "eslint-plugin-header": "3.1.1", - "eslint-plugin-jsdoc": "^19.1.0", + "eslint-plugin-jsdoc": "^39.3.2", + "eslint-plugin-local": "^1.0.0", "event-stream": "3.3.4", "fancy-log": "^1.3.3", "fast-plist": "0.1.2", - "file-loader": "^4.2.0", + "file-loader": "^5.1.0", "glob": "^5.0.13", "gulp": "^4.0.0", "gulp-atom-electron": "^1.33.0", @@ -169,11 +175,11 @@ "husky": "^0.13.1", "innosetup": "6.0.5", "is": "^3.1.0", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-coverage": "^3.2.0", + "istanbul-lib-instrument": "^5.2.0", "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.1", + "istanbul-reports": "^3.1.5", "lazy.js": "^0.4.2", "merge-options": "^1.0.1", "mime": "^1.4.1", @@ -194,13 +200,14 @@ "request": "^2.85.0", "rimraf": "^2.2.8", "sinon": "^11.1.1", - "sinon-test": "^3.1.0", + "sinon-test": "^3.1.3", "source-map": "0.6.1", "source-map-support": "^0.3.2", - "style-loader": "^1.0.0", + "style-loader": "^1.3.0", "ts-loader": "^9.2.7", + "ts-node": "^10.9.1", "tsec": "0.1.4", - "typescript": "^4.8.0-dev.20220518", + "typescript": "^4.9.0-dev.20221024", "typescript-formatter": "7.1.0", "underscore": "^1.12.1", "util": "^0.12.4", @@ -224,7 +231,7 @@ "@vscode/windows-registry": "1.0.6", "windows-foreground-love": "0.4.0", "windows-mutex": "0.4.1", - "windows-process-tree": "0.3.3" + "windows-process-tree": "0.3.4" }, "resolutions": { "elliptic": "^6.5.3", diff --git a/product.json b/product.json index d16abf8de29..c76943372f1 100644 --- a/product.json +++ b/product.json @@ -11,6 +11,7 @@ "serverLicensePrompt": "", "serverApplicationName": "code-server-oss", "serverDataFolderName": ".vscode-server-oss", + "tunnelApplicationName": "code-tunnel-oss", "win32DirName": "Microsoft Code OSS", "win32NameVersion": "Microsoft Code OSS", "win32RegValueName": "CodeOSS", @@ -27,7 +28,7 @@ "licenseFileName": "LICENSE.txt", "reportIssueUrl": "https://github.com/microsoft/vscode/issues/new", "urlProtocol": "code-oss", - "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/3c8520fab514b9f56070214496b26ff68d1b1cb5/out/vs/workbench/contrib/webview/browser/pre/", + "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/", "builtInExtensions": [ { "name": "ms-vscode.js-debug-companion", @@ -46,7 +47,7 @@ }, { "name": "ms-vscode.js-debug", - "version": "1.68.0", + "version": "1.72.0", "repo": "https://github.com/microsoft/vscode-js-debug", "metadata": { "id": "25629058-ddac-4e17-abba-74678e126c5d", @@ -61,7 +62,7 @@ }, { "name": "ms-vscode.vscode-js-profile-table", - "version": "1.0.2", + "version": "1.0.3", "repo": "https://github.com/microsoft/vscode-js-profile-visualizer", "metadata": { "id": "7e52b41b-71ad-457b-ab7e-0620f1fc4feb", diff --git a/remote/.yarnrc b/remote/.yarnrc index 1df1b5f2441..3a3fbdc3350 100644 --- a/remote/.yarnrc +++ b/remote/.yarnrc @@ -1,4 +1,4 @@ disturl "http://nodejs.org/dist" -target "16.13.0" +target "16.14.2" runtime "node" build_from_source "true" diff --git a/remote/package.json b/remote/package.json index 49e3d17b354..1516f4ad357 100644 --- a/remote/package.json +++ b/remote/package.json @@ -3,12 +3,12 @@ "version": "0.0.0", "private": true, "dependencies": { - "@microsoft/applicationinsights-web": "^2.6.4", + "@microsoft/1ds-core-js": "^3.2.2", + "@microsoft/1ds-post-js": "^3.2.2", "@parcel/watcher": "2.0.5", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/ripgrep": "^1.14.2", "@vscode/vscode-languagedetection": "1.0.21", - "applicationinsights": "1.4.2", "cookie": "^0.4.0", "graceful-fs": "4.2.8", "http-proxy-agent": "^2.1.0", @@ -24,17 +24,18 @@ "vscode-proxy-agent": "^0.12.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "7.0.1", - "xterm": "4.19.0-beta.58", - "xterm-addon-search": "0.9.0-beta.39", - "xterm-addon-serialize": "0.7.0-beta.12", - "xterm-addon-unicode11": "0.4.0-beta.3", - "xterm-addon-webgl": "0.12.0-beta.37", - "xterm-headless": "4.19.0-beta.58", + "xterm": "5.1.0-beta.49", + "xterm-addon-canvas": "0.3.0-beta.23", + "xterm-addon-search": "0.11.0-beta.7", + "xterm-addon-serialize": "0.9.0-beta.3", + "xterm-addon-unicode11": "0.5.0-beta.1", + "xterm-addon-webgl": "0.14.0-beta.32", + "xterm-headless": "5.1.0-beta.49", "yauzl": "^2.9.2", "yazl": "^2.4.3" }, "optionalDependencies": { "@vscode/windows-registry": "1.0.6", - "windows-process-tree": "0.3.3" + "windows-process-tree": "0.3.4" } } diff --git a/remote/web/package.json b/remote/web/package.json index 387c0fb40e8..631ade07049 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -3,16 +3,18 @@ "version": "0.0.0", "private": true, "dependencies": { - "@microsoft/applicationinsights-web": "^2.6.4", + "@microsoft/1ds-core-js": "^3.2.2", + "@microsoft/1ds-post-js": "^3.2.2", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/vscode-languagedetection": "1.0.21", "jschardet": "3.0.0", "tas-client-umd": "0.1.6", "vscode-oniguruma": "1.6.1", "vscode-textmate": "7.0.1", - "xterm": "4.19.0-beta.58", - "xterm-addon-search": "0.9.0-beta.39", - "xterm-addon-unicode11": "0.4.0-beta.3", - "xterm-addon-webgl": "0.12.0-beta.37" + "xterm": "5.1.0-beta.49", + "xterm-addon-canvas": "0.3.0-beta.23", + "xterm-addon-search": "0.11.0-beta.7", + "xterm-addon-unicode11": "0.5.0-beta.1", + "xterm-addon-webgl": "0.14.0-beta.32" } } diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index 27f754d7394..844806860bf 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -2,86 +2,41 @@ # yarn lockfile v1 -"@microsoft/applicationinsights-analytics-js@2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-analytics-js/-/applicationinsights-analytics-js-2.6.4.tgz#22ad17276ed922f2f0e66b7efe304f31c50ede64" - integrity sha512-BHx3U6H4j3ddtl2wSJNt+kX2jG+qsvH4mNnimFJjZ4Mq9dheD3o6ghnBH8gQjIb5Up09JdyV5itsTZf1aC84Dg== +"@microsoft/1ds-core-js@3.2.3", "@microsoft/1ds-core-js@^3.2.2": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.3.tgz#2217d92ec8b073caa4577a13f40ea3a5c4c4d4e7" + integrity sha512-796A8fd90oUKDRO7UXUT9BwZ3G+a9XzJj5v012FcCN/2qRhEsIV3x/0wkx2S08T4FiQEUPkB2uoYHpEjEneM7g== dependencies: - "@microsoft/applicationinsights-common" "2.6.4" - "@microsoft/applicationinsights-core-js" "2.6.4" - "@microsoft/applicationinsights-shims" "2.0.0" - "@microsoft/dynamicproto-js" "^1.1.4" + "@microsoft/applicationinsights-core-js" "2.8.4" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/applicationinsights-channel-js@2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-2.6.4.tgz#49c139e8d801835bfba25547cb57d030286dec8a" - integrity sha512-ps9ZglUw8nzou9/CxmfRgHO7aGjhopu9YqsadbQL6yz/q8LSj1w30+ADa3gSMYCEEy8FQrDo5e5UebDEnX/w+A== +"@microsoft/1ds-post-js@^3.2.2": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.3.tgz#1fa7d51615a44f289632ae8c588007ba943db216" + integrity sha512-tcGJQXXr2LYoBbIXPoUVe1KCF3OtBsuKDFL7BXfmNtuSGtWF0yejm6H83DrR8/cUIGMRMUP9lqNlqFGwDYiwAQ== dependencies: - "@microsoft/applicationinsights-common" "2.6.4" - "@microsoft/applicationinsights-core-js" "2.6.4" - "@microsoft/applicationinsights-shims" "2.0.0" - "@microsoft/dynamicproto-js" "^1.1.4" + "@microsoft/1ds-core-js" "3.2.3" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/applicationinsights-common@2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-2.6.4.tgz#c3a4129c727127271c93c7e23b86cf18fcb9e3a0" - integrity sha512-/YLrKpxXL8zusjzu8GTYPuRrKw0OzUD4rLh8mxSlUZWK+SLOE/1loizJIesmd6OLgcgmOTrd1iZFVsuxn20b/g== +"@microsoft/applicationinsights-core-js@2.8.4": + version "2.8.4" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.4.tgz#607e531bb241a8920d43960f68a7c76a6f9af596" + integrity sha512-FoA0FNOsFbJnLyTyQlYs6+HR7HMEa6nAOE6WOm9WVejBHMHQ/Bdb+hfVFi6slxwCimr/ner90jchi4/sIYdnyQ== dependencies: - "@microsoft/applicationinsights-core-js" "2.6.4" - "@microsoft/applicationinsights-shims" "2.0.0" - "@microsoft/dynamicproto-js" "^1.1.4" + "@microsoft/applicationinsights-shims" "2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/applicationinsights-core-js@2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.6.4.tgz#163caa31c02e72cfe02fc4abebd6bffd6b587de3" - integrity sha512-rYxfJzl4aLXFGOLsRoJqyKj5qfhQTz1u/eXSo6N6gIIr/D+RCVNJZKVzeBh3xOOytm4UBGRshK0QFZJlIQL3Kw== - dependencies: - "@microsoft/applicationinsights-shims" "2.0.0" - "@microsoft/dynamicproto-js" "^1.1.4" +"@microsoft/applicationinsights-shims@2.0.1", "@microsoft/applicationinsights-shims@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.1.tgz#5d72fb7aaf4056c4fda54f9d7c93ccf8ca9bcbfd" + integrity sha512-G0MXf6R6HndRbDy9BbEj0zrLeuhwt2nsXk2zKtF0TnYo39KgYqhYC2ayIzKPTm2KAE+xzD7rgyLdZnrcRvt9WQ== -"@microsoft/applicationinsights-dependencies-js@2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-dependencies-js/-/applicationinsights-dependencies-js-2.6.4.tgz#6d120965cdc3ef5798feac6bc729bc97d40a4bb5" - integrity sha512-mJ/yTe00HPlUpQCmQWGhY3ronlkhsPgIYBWjxstN4NHRO4Qt17/ITxFoRa+r50J8Sf4ouc4qBoEFSVc56x80bg== - dependencies: - "@microsoft/applicationinsights-common" "2.6.4" - "@microsoft/applicationinsights-core-js" "2.6.4" - "@microsoft/applicationinsights-shims" "2.0.0" - "@microsoft/dynamicproto-js" "^1.1.4" - -"@microsoft/applicationinsights-properties-js@2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-properties-js/-/applicationinsights-properties-js-2.6.4.tgz#d779cd552277e6049b30efe71024a39bad5264e7" - integrity sha512-SdIR3gVX46N0RdC0zV/pXKoCxwT+2+79ek6hVXvXa2o2I+JfgYEAxb1Q8flYNGEdlFd/Ge7BHcJLqFvjat1t4Q== - dependencies: - "@microsoft/applicationinsights-common" "2.6.4" - "@microsoft/applicationinsights-core-js" "2.6.4" - "@microsoft/applicationinsights-shims" "2.0.0" - "@microsoft/dynamicproto-js" "^1.1.4" - -"@microsoft/applicationinsights-shims@2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.0.tgz#ee622588f14e58ae3c055b12431da8ed55d71991" - integrity sha512-OaKew7f7acuNFgKYjMSPrRTRQi93xUyONWeeCeBlJSx7oRNJaL0TqbTvW6j5GHnSr3mhinPtAQ+rCQWASBnOrg== - -"@microsoft/applicationinsights-web@^2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web/-/applicationinsights-web-2.6.4.tgz#509069c798a4da2c2b2b494bb15eb328425d4e86" - integrity sha512-/lBngt78Q7YNs8Llu1xz22f9oT5Rr2lo1QmSSSSKal30HL6kkzkP14J2E6+0+O5dRmyTDgOSiEePt6AhF8NFzg== - dependencies: - "@microsoft/applicationinsights-analytics-js" "2.6.4" - "@microsoft/applicationinsights-channel-js" "2.6.4" - "@microsoft/applicationinsights-common" "2.6.4" - "@microsoft/applicationinsights-core-js" "2.6.4" - "@microsoft/applicationinsights-dependencies-js" "2.6.4" - "@microsoft/applicationinsights-properties-js" "2.6.4" - "@microsoft/applicationinsights-shims" "2.0.0" - "@microsoft/dynamicproto-js" "^1.1.4" - -"@microsoft/dynamicproto-js@^1.1.4": - version "1.1.4" - resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.4.tgz#40e1c0ad20743fcee1604a7df2c57faf0aa1af87" - integrity sha512-Ot53G927ykMF8cQ3/zq4foZtdk+Tt1YpX7aUTHxBU7UHNdkEiBvBfZSq+rnlUmKCJ19VatwPG4mNzvcGpBj4og== +"@microsoft/dynamicproto-js@^1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc" + integrity sha512-D1Oivw1A4bIXhzBIy3/BBPn3p2On+kpO2NiYt9shICDK7L/w+cR6FFBUsBZ05l6iqzTeL+Jm8lAYn0g6G7DmDg== "@vscode/iconv-lite-umd@0.7.0": version "0.7.0" @@ -113,22 +68,27 @@ vscode-textmate@7.0.1: resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-7.0.1.tgz#8118a32b02735dccd14f893b495fa5389ad7de79" integrity sha512-zQ5U/nuXAAMsh691FtV0wPz89nSkHbs+IQV8FDk+wew9BlSDhf4UmWGlWJfTR2Ti6xZv87Tj5fENzKf6Qk7aLw== -xterm-addon-search@0.9.0-beta.39: - version "0.9.0-beta.39" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.39.tgz#e8376e1485ee7d763c07d1a8f1354114f65b3e3e" - integrity sha512-h45wkecgfqXXoAUqgNytAfSd6g0xNT6rZy/enVaEU0aes7QoL9pxHUKkCry8PP6hs03Slk0VxQ4AGsbSZGvK/w== +xterm-addon-canvas@0.3.0-beta.23: + version "0.3.0-beta.23" + resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.23.tgz#aa67f43114e0bd052311f3f88f842e85006e697f" + integrity sha512-xFeuwK1ZuIl+5Go4ZesAWe+pToqjF0LSQfECia3tTZ0emkpzR3c+wU3vWoKPj71A7ZkgCVDmCGyLAWDpTSLgEQ== -xterm-addon-unicode11@0.4.0-beta.3: - version "0.4.0-beta.3" - resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.3.tgz#f350184155fafd5ad0d6fbf31d13e6ca7dea1efa" - integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q== +xterm-addon-search@0.11.0-beta.7: + version "0.11.0-beta.7" + resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.11.0-beta.7.tgz#d90bcbe9e8f9238c18ba6145bd7ec2f8e3240052" + integrity sha512-i/c774V0/Eon3BIFRsRR3OjKTnMGkccBo12yDkOa40tnAD4aa8FjspE3bxW/Hh1mUEhCSgBSLnMDlK/GwnUC+g== -xterm-addon-webgl@0.12.0-beta.37: - version "0.12.0-beta.37" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.37.tgz#e465100041a7e0b1d32b01cd0b0ba5a516ac13c2" - integrity sha512-d4GfKlMrWZGzsMfMHd2siG+QiOvwikhwiu+JQlIhlnAShT/wU5BOGbNfDDA1tHmkW7G1UCFgucBuVxrs5wjuBQ== +xterm-addon-unicode11@0.5.0-beta.1: + version "0.5.0-beta.1" + resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0-beta.1.tgz#8a9e9356018e082318abbe2be1f9599fcc6b46a2" + integrity sha512-uAErX4gwhW6N524stLG6oZR3yBGgPnFmZ2Tv4vyYy7tcgDuHRoc22xYSCDgO1ohz1FLlOm8JGXRjXliwO9ic3A== -xterm@4.19.0-beta.58: - version "4.19.0-beta.58" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0-beta.58.tgz#cbe535b0b85bc7f8ae3cc242df006bea04cdf541" - integrity sha512-fr3QC2qS2NBab8X7kwA/3QZELzQqhAKsngvK8NkhsrFN1DAuyEETkzqXuKbO7OKpCB6VqGDN6GPkNlUB9VrIDA== +xterm-addon-webgl@0.14.0-beta.32: + version "0.14.0-beta.32" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.32.tgz#35d08d4a0b36434ea5746738987b0170f918a9e3" + integrity sha512-FnD/LX0Obxu+Q3hdkVvStlGFCtp+jzKtV6lzF42Uvh5evbGA2SBO3BxWW26VhurtEN5Pf7Iyx8sJxcPVd/tPXw== + +xterm@5.1.0-beta.49: + version "5.1.0-beta.49" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.49.tgz#4c98e5580d690a57d5d055025abb5d0e8ab2f42c" + integrity sha512-jUiJ4lBhHW7XzLPyXVzCwjljDEl5TJj9+fj677fwDb/La8qPov2R+ocjb1H/7j0sODxAV0Op2ftDCtz2JzbCvQ== diff --git a/remote/yarn.lock b/remote/yarn.lock index 0f479f0fd51..d2b29e418b7 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -2,86 +2,41 @@ # yarn lockfile v1 -"@microsoft/applicationinsights-analytics-js@2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-analytics-js/-/applicationinsights-analytics-js-2.6.4.tgz#22ad17276ed922f2f0e66b7efe304f31c50ede64" - integrity sha512-BHx3U6H4j3ddtl2wSJNt+kX2jG+qsvH4mNnimFJjZ4Mq9dheD3o6ghnBH8gQjIb5Up09JdyV5itsTZf1aC84Dg== +"@microsoft/1ds-core-js@3.2.3", "@microsoft/1ds-core-js@^3.2.2": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.3.tgz#2217d92ec8b073caa4577a13f40ea3a5c4c4d4e7" + integrity sha512-796A8fd90oUKDRO7UXUT9BwZ3G+a9XzJj5v012FcCN/2qRhEsIV3x/0wkx2S08T4FiQEUPkB2uoYHpEjEneM7g== dependencies: - "@microsoft/applicationinsights-common" "2.6.4" - "@microsoft/applicationinsights-core-js" "2.6.4" - "@microsoft/applicationinsights-shims" "2.0.0" - "@microsoft/dynamicproto-js" "^1.1.4" + "@microsoft/applicationinsights-core-js" "2.8.4" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/applicationinsights-channel-js@2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-2.6.4.tgz#49c139e8d801835bfba25547cb57d030286dec8a" - integrity sha512-ps9ZglUw8nzou9/CxmfRgHO7aGjhopu9YqsadbQL6yz/q8LSj1w30+ADa3gSMYCEEy8FQrDo5e5UebDEnX/w+A== +"@microsoft/1ds-post-js@^3.2.2": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.3.tgz#1fa7d51615a44f289632ae8c588007ba943db216" + integrity sha512-tcGJQXXr2LYoBbIXPoUVe1KCF3OtBsuKDFL7BXfmNtuSGtWF0yejm6H83DrR8/cUIGMRMUP9lqNlqFGwDYiwAQ== dependencies: - "@microsoft/applicationinsights-common" "2.6.4" - "@microsoft/applicationinsights-core-js" "2.6.4" - "@microsoft/applicationinsights-shims" "2.0.0" - "@microsoft/dynamicproto-js" "^1.1.4" + "@microsoft/1ds-core-js" "3.2.3" + "@microsoft/applicationinsights-shims" "^2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/applicationinsights-common@2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-2.6.4.tgz#c3a4129c727127271c93c7e23b86cf18fcb9e3a0" - integrity sha512-/YLrKpxXL8zusjzu8GTYPuRrKw0OzUD4rLh8mxSlUZWK+SLOE/1loizJIesmd6OLgcgmOTrd1iZFVsuxn20b/g== +"@microsoft/applicationinsights-core-js@2.8.4": + version "2.8.4" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.4.tgz#607e531bb241a8920d43960f68a7c76a6f9af596" + integrity sha512-FoA0FNOsFbJnLyTyQlYs6+HR7HMEa6nAOE6WOm9WVejBHMHQ/Bdb+hfVFi6slxwCimr/ner90jchi4/sIYdnyQ== dependencies: - "@microsoft/applicationinsights-core-js" "2.6.4" - "@microsoft/applicationinsights-shims" "2.0.0" - "@microsoft/dynamicproto-js" "^1.1.4" + "@microsoft/applicationinsights-shims" "2.0.1" + "@microsoft/dynamicproto-js" "^1.1.6" -"@microsoft/applicationinsights-core-js@2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.6.4.tgz#163caa31c02e72cfe02fc4abebd6bffd6b587de3" - integrity sha512-rYxfJzl4aLXFGOLsRoJqyKj5qfhQTz1u/eXSo6N6gIIr/D+RCVNJZKVzeBh3xOOytm4UBGRshK0QFZJlIQL3Kw== - dependencies: - "@microsoft/applicationinsights-shims" "2.0.0" - "@microsoft/dynamicproto-js" "^1.1.4" +"@microsoft/applicationinsights-shims@2.0.1", "@microsoft/applicationinsights-shims@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.1.tgz#5d72fb7aaf4056c4fda54f9d7c93ccf8ca9bcbfd" + integrity sha512-G0MXf6R6HndRbDy9BbEj0zrLeuhwt2nsXk2zKtF0TnYo39KgYqhYC2ayIzKPTm2KAE+xzD7rgyLdZnrcRvt9WQ== -"@microsoft/applicationinsights-dependencies-js@2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-dependencies-js/-/applicationinsights-dependencies-js-2.6.4.tgz#6d120965cdc3ef5798feac6bc729bc97d40a4bb5" - integrity sha512-mJ/yTe00HPlUpQCmQWGhY3ronlkhsPgIYBWjxstN4NHRO4Qt17/ITxFoRa+r50J8Sf4ouc4qBoEFSVc56x80bg== - dependencies: - "@microsoft/applicationinsights-common" "2.6.4" - "@microsoft/applicationinsights-core-js" "2.6.4" - "@microsoft/applicationinsights-shims" "2.0.0" - "@microsoft/dynamicproto-js" "^1.1.4" - -"@microsoft/applicationinsights-properties-js@2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-properties-js/-/applicationinsights-properties-js-2.6.4.tgz#d779cd552277e6049b30efe71024a39bad5264e7" - integrity sha512-SdIR3gVX46N0RdC0zV/pXKoCxwT+2+79ek6hVXvXa2o2I+JfgYEAxb1Q8flYNGEdlFd/Ge7BHcJLqFvjat1t4Q== - dependencies: - "@microsoft/applicationinsights-common" "2.6.4" - "@microsoft/applicationinsights-core-js" "2.6.4" - "@microsoft/applicationinsights-shims" "2.0.0" - "@microsoft/dynamicproto-js" "^1.1.4" - -"@microsoft/applicationinsights-shims@2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.0.tgz#ee622588f14e58ae3c055b12431da8ed55d71991" - integrity sha512-OaKew7f7acuNFgKYjMSPrRTRQi93xUyONWeeCeBlJSx7oRNJaL0TqbTvW6j5GHnSr3mhinPtAQ+rCQWASBnOrg== - -"@microsoft/applicationinsights-web@^2.6.4": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web/-/applicationinsights-web-2.6.4.tgz#509069c798a4da2c2b2b494bb15eb328425d4e86" - integrity sha512-/lBngt78Q7YNs8Llu1xz22f9oT5Rr2lo1QmSSSSKal30HL6kkzkP14J2E6+0+O5dRmyTDgOSiEePt6AhF8NFzg== - dependencies: - "@microsoft/applicationinsights-analytics-js" "2.6.4" - "@microsoft/applicationinsights-channel-js" "2.6.4" - "@microsoft/applicationinsights-common" "2.6.4" - "@microsoft/applicationinsights-core-js" "2.6.4" - "@microsoft/applicationinsights-dependencies-js" "2.6.4" - "@microsoft/applicationinsights-properties-js" "2.6.4" - "@microsoft/applicationinsights-shims" "2.0.0" - "@microsoft/dynamicproto-js" "^1.1.4" - -"@microsoft/dynamicproto-js@^1.1.4": - version "1.1.4" - resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.4.tgz#40e1c0ad20743fcee1604a7df2c57faf0aa1af87" - integrity sha512-Ot53G927ykMF8cQ3/zq4foZtdk+Tt1YpX7aUTHxBU7UHNdkEiBvBfZSq+rnlUmKCJ19VatwPG4mNzvcGpBj4og== +"@microsoft/dynamicproto-js@^1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc" + integrity sha512-D1Oivw1A4bIXhzBIy3/BBPn3p2On+kpO2NiYt9shICDK7L/w+cR6FFBUsBZ05l6iqzTeL+Jm8lAYn0g6G7DmDg== "@parcel/watcher@2.0.5": version "2.0.5" @@ -150,16 +105,6 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== -applicationinsights@1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.4.2.tgz#2f25f7a3f3e5bf0ab4486b63e42a48a9ec321d52" - integrity sha512-1wE37G9zEMZTsPJVQ8BDrQtsGgG3DGMActLHwPAF8TYHAXkfqqpeZYCH0XV4lUZ7H4MffRMwN2Ln2nEtUmT8HQ== - dependencies: - cls-hooked "^4.2.2" - continuation-local-storage "^3.2.1" - diagnostic-channel "0.2.0" - diagnostic-channel-publishers "^0.3.3" - aproba@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -173,21 +118,6 @@ are-we-there-yet@~1.1.2: delegates "^1.0.0" readable-stream "^2.0.6" -async-hook-jl@^1.7.6: - version "1.7.6" - resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68" - integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg== - dependencies: - stack-chain "^1.3.7" - -async-listener@^0.6.0: - version "0.6.10" - resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc" - integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw== - dependencies: - semver "^5.3.0" - shimmer "^1.1.0" - base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" @@ -227,15 +157,6 @@ chownr@^1.1.1: resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== -cls-hooked@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908" - integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw== - dependencies: - async-hook-jl "^1.7.6" - emitter-listener "^1.0.1" - semver "^5.4.1" - code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" @@ -246,14 +167,6 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= -continuation-local-storage@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb" - integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA== - dependencies: - async-listener "^0.6.0" - emitter-listener "^1.1.1" - cookie@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" @@ -307,25 +220,6 @@ detect-libc@^2.0.0: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== -diagnostic-channel-publishers@^0.3.3: - version "0.3.5" - resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.3.5.tgz#a84a05fd6cc1d7619fdd17791c17e540119a7536" - integrity sha512-AOIjw4T7Nxl0G2BoBPhkQ6i7T4bUd9+xvdYizwvG7vVAM1dvr+SDrcUudlmzwH0kbEwdR2V1EcnKT0wAeYLQNQ== - -diagnostic-channel@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/diagnostic-channel/-/diagnostic-channel-0.2.0.tgz#cc99af9612c23fb1fff13612c72f2cbfaa8d5a17" - integrity sha1-zJmvlhLCP7H/8TYSxy8sv6qNWhc= - dependencies: - semver "^5.3.0" - -emitter-listener@^1.0.1, emitter-listener@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8" - integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ== - dependencies: - shimmer "^1.2.0" - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -688,16 +582,6 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -semver@^5.3.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" - integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== - -semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" @@ -710,11 +594,6 @@ set-blocking@~2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= -shimmer@^1.1.0, shimmer@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" - integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== - signal-exit@^3.0.0: version "3.0.6" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" @@ -765,11 +644,6 @@ spdlog@^0.13.0: mkdirp "^0.5.5" nan "^2.14.0" -stack-chain@^1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285" - integrity sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU= - string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -902,10 +776,10 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2 || 2 || 3 || 4" -windows-process-tree@0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/windows-process-tree/-/windows-process-tree-0.3.3.tgz#7c178815f02bf4cfbcac1f93b2f3a3cc10bc9245" - integrity sha512-rkiAMP0AS27xikFyn7i4gPbOK16UdjY8X/C6eo37CnfNLqTvK2eEaT+Dh0e5xnvmlsi0lEKd60O+4ajzfDkq7A== +windows-process-tree@0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/windows-process-tree/-/windows-process-tree-0.3.4.tgz#6bc4b8010129c30ff95bcd333b9f94744dd3c4fb" + integrity sha512-rtSX73i9OnkDxSdBP9c1YBunEwheZdO/hjRwNk9uSoWqO92x0zDRGfIIK0MtUn8gZZD+2kPEVpj5MmfNl7JpJA== dependencies: nan "^2.13.2" @@ -914,35 +788,40 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -xterm-addon-search@0.9.0-beta.39: - version "0.9.0-beta.39" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.9.0-beta.39.tgz#e8376e1485ee7d763c07d1a8f1354114f65b3e3e" - integrity sha512-h45wkecgfqXXoAUqgNytAfSd6g0xNT6rZy/enVaEU0aes7QoL9pxHUKkCry8PP6hs03Slk0VxQ4AGsbSZGvK/w== +xterm-addon-canvas@0.3.0-beta.23: + version "0.3.0-beta.23" + resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.23.tgz#aa67f43114e0bd052311f3f88f842e85006e697f" + integrity sha512-xFeuwK1ZuIl+5Go4ZesAWe+pToqjF0LSQfECia3tTZ0emkpzR3c+wU3vWoKPj71A7ZkgCVDmCGyLAWDpTSLgEQ== -xterm-addon-serialize@0.7.0-beta.12: - version "0.7.0-beta.12" - resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.7.0-beta.12.tgz#4f845d8b1a9f9b7ae3f910455ce8c58b041babc7" - integrity sha512-b4Ug0B/RSJMux+KAcp+PXVqubVyXjN1yCQw1FOkgVYTpmd9AH/X+EcxKml5Lz8DsKmsXqfD9AlV3WpEeT+OtMw== +xterm-addon-search@0.11.0-beta.7: + version "0.11.0-beta.7" + resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.11.0-beta.7.tgz#d90bcbe9e8f9238c18ba6145bd7ec2f8e3240052" + integrity sha512-i/c774V0/Eon3BIFRsRR3OjKTnMGkccBo12yDkOa40tnAD4aa8FjspE3bxW/Hh1mUEhCSgBSLnMDlK/GwnUC+g== -xterm-addon-unicode11@0.4.0-beta.3: - version "0.4.0-beta.3" - resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.3.tgz#f350184155fafd5ad0d6fbf31d13e6ca7dea1efa" - integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q== +xterm-addon-serialize@0.9.0-beta.3: + version "0.9.0-beta.3" + resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.9.0-beta.3.tgz#bb4ed416db5748bcbe55a4b6d4c2151368fdae74" + integrity sha512-LaFuowtdxNdeuLm+KmtsoR4mgPOLu/I9k0hlWXbzAd1okJhthwMH4Y6cuL0/pFk1AclP5s+L42glv8PV0GnVsg== -xterm-addon-webgl@0.12.0-beta.37: - version "0.12.0-beta.37" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.37.tgz#e465100041a7e0b1d32b01cd0b0ba5a516ac13c2" - integrity sha512-d4GfKlMrWZGzsMfMHd2siG+QiOvwikhwiu+JQlIhlnAShT/wU5BOGbNfDDA1tHmkW7G1UCFgucBuVxrs5wjuBQ== +xterm-addon-unicode11@0.5.0-beta.1: + version "0.5.0-beta.1" + resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0-beta.1.tgz#8a9e9356018e082318abbe2be1f9599fcc6b46a2" + integrity sha512-uAErX4gwhW6N524stLG6oZR3yBGgPnFmZ2Tv4vyYy7tcgDuHRoc22xYSCDgO1ohz1FLlOm8JGXRjXliwO9ic3A== -xterm-headless@4.19.0-beta.58: - version "4.19.0-beta.58" - resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.19.0-beta.58.tgz#3a38cf3b9cd2606fb342a5cf8f2a0cfb963a62e8" - integrity sha512-wKQW8VzkFjyYDvcaM26gulo+YghyocfkZnKMH7gc/+/mFn3YXUPBPuOcX6e0M7NibyMlewpQpZjHQUPLBjkzfw== +xterm-addon-webgl@0.14.0-beta.32: + version "0.14.0-beta.32" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.32.tgz#35d08d4a0b36434ea5746738987b0170f918a9e3" + integrity sha512-FnD/LX0Obxu+Q3hdkVvStlGFCtp+jzKtV6lzF42Uvh5evbGA2SBO3BxWW26VhurtEN5Pf7Iyx8sJxcPVd/tPXw== -xterm@4.19.0-beta.58: - version "4.19.0-beta.58" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0-beta.58.tgz#cbe535b0b85bc7f8ae3cc242df006bea04cdf541" - integrity sha512-fr3QC2qS2NBab8X7kwA/3QZELzQqhAKsngvK8NkhsrFN1DAuyEETkzqXuKbO7OKpCB6VqGDN6GPkNlUB9VrIDA== +xterm-headless@5.1.0-beta.49: + version "5.1.0-beta.49" + resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.1.0-beta.49.tgz#c71793f7ba5ba3c403af5e5e9a7c5d89318b663d" + integrity sha512-dDHteT5DMr/li8qbaZ6FvIuZEI6SZUjNeiOrVwr//Qo4s/k4K3dRD0YxoJJ3ml/nPoxnhYyDkf9viLgm1rgEhA== + +xterm@5.1.0-beta.49: + version "5.1.0-beta.49" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.49.tgz#4c98e5580d690a57d5d055025abb5d0e8ab2f42c" + integrity sha512-jUiJ4lBhHW7XzLPyXVzCwjljDEl5TJj9+fj677fwDb/La8qPov2R+ocjb1H/7j0sODxAV0Op2ftDCtz2JzbCvQ== yallist@^4.0.0: version "4.0.0" diff --git a/resources/linux/debian/control.template b/resources/linux/debian/control.template index bfe0aa52da2..1a5981bb219 100644 --- a/resources/linux/debian/control.template +++ b/resources/linux/debian/control.template @@ -1,7 +1,8 @@ Package: @@NAME@@ Version: @@VERSION@@ Section: devel -Depends: libnss3 (>= 2:3.26), gnupg, apt, libxkbfile1, libsecret-1-0, libgtk-3-0 (>= 3.10.0), libxss1, libgbm1 +Depends: @@DEPENDS@@ +Recommends: @@RECOMMENDS@@ Priority: optional Architecture: @@ARCHITECTURE@@ Maintainer: Microsoft Corporation diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template index 5b7eadb8c9b..61659d25837 100644 --- a/resources/linux/rpm/code.spec.template +++ b/resources/linux/rpm/code.spec.template @@ -11,6 +11,8 @@ Icon: @@NAME@@.xpm Requires: @@DEPENDENCIES@@ AutoReq: 0 +%global __provides_exclude_from ^%{_datadir}/%{name}/.*\\.so.*$ + %description Visual Studio Code is a new choice of tool that combines the simplicity of a code editor with what developers need for the core edit-build-debug cycle. See https://code.visualstudio.com/docs/setup/linux for installation instructions and FAQ. @@ -19,29 +21,32 @@ Visual Studio Code is a new choice of tool that combines the simplicity of a cod %define _build_id_links none %install -mkdir -p %{buildroot}/usr/share/@@NAME@@ -mkdir -p %{buildroot}/usr/share/applications -mkdir -p %{buildroot}/usr/share/pixmaps -mkdir -p %{buildroot}/usr/share/bash-completion/completions -mkdir -p %{buildroot}/usr/share/zsh/site-functions -mkdir -p %{buildroot}/usr/share/mime/packages -cp -r usr/share/@@NAME@@/* %{buildroot}/usr/share/@@NAME@@ -cp -r usr/share/applications/@@NAME@@.desktop %{buildroot}/usr/share/applications -cp -r usr/share/applications/@@NAME@@-url-handler.desktop %{buildroot}/usr/share/applications -cp -r usr/share/mime/packages/@@NAME@@-workspace.xml %{buildroot}/usr/share/mime/packages/@@NAME@@-workspace.xml -cp -r usr/share/pixmaps/@@ICON@@.png %{buildroot}/usr/share/pixmaps -cp usr/share/bash-completion/completions/@@NAME@@ %{buildroot}/usr/share/bash-completion/completions/@@NAME@@ -cp usr/share/zsh/site-functions/_@@NAME@@ %{buildroot}/usr/share/zsh/site-functions/_@@NAME@@ +# Destination directories +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_datadir}/%{name} +mkdir -p %{buildroot}%{_datadir}/applications +mkdir -p %{buildroot}%{_datadir}/mime/packages +mkdir -p %{buildroot}%{_datadir}/pixmaps +mkdir -p %{buildroot}%{_datadir}/bash-completion/completions +mkdir -p %{buildroot}%{_datadir}/zsh/site-functions +# Application +cp -r usr/share/%{name}/* %{buildroot}%{_datadir}/%{name} +ln -s %{_datadir}/%{name}/bin/%{name} %{buildroot}%{_bindir}/%{name} +# Support files +cp -r usr/share/applications/%{name}.desktop %{buildroot}%{_datadir}/applications +cp -r usr/share/applications/%{name}-url-handler.desktop %{buildroot}%{_datadir}/applications +cp -r usr/share/mime/packages/%{name}-workspace.xml %{buildroot}%{_datadir}/mime/packages/%{name}-workspace.xml +cp -r usr/share/pixmaps/@@ICON@@.png %{buildroot}%{_datadir}/pixmaps +# Shell completions +cp usr/share/bash-completion/completions/%{name} %{buildroot}%{_datadir}/bash-completion/completions/%{name} +cp usr/share/zsh/site-functions/_%{name} %{buildroot}%{_datadir}/zsh/site-functions/_%{name} %post # Remove the legacy bin command if this is the stable build -if [ "@@NAME@@" = "code" ]; then +if [ "%{name}" = "code" ]; then rm -f /usr/local/bin/code fi -# Symlink bin command to /usr/bin -ln -sf /usr/share/@@NAME@@/bin/@@NAME@@ %{_bindir}/@@NAME@@ - # Register yum repository # TODO: #229: Enable once the yum repository is signed #if [ "@@NAME@@" != "code-oss" ]; then @@ -53,24 +58,21 @@ ln -sf /usr/share/@@NAME@@/bin/@@NAME@@ %{_bindir}/@@NAME@@ #fi # Update mimetype database to pickup workspace mimetype -update-mime-database /usr/share/mime &> /dev/null || : +update-mime-database %{_datadir}/mime &> /dev/null || : %postun -if [ $1 = 0 ]; then - rm -f /usr/bin/@@NAME@@ -fi - # Update mimetype database for removed workspace mimetype -update-mime-database /usr/share/mime &> /dev/null || : +update-mime-database %{_datadir}/mime &> /dev/null || : %files %defattr(-,root,root) -%attr(4755, root, root) /usr/share/@@NAME@@/chrome-sandbox +%attr(4755, root, root) %{_datadir}/%{name}/chrome-sandbox -/usr/share/@@NAME@@/ -/usr/share/applications/@@NAME@@.desktop -/usr/share/applications/@@NAME@@-url-handler.desktop -/usr/share/mime/packages/@@NAME@@-workspace.xml -/usr/share/pixmaps/@@ICON@@.png -/usr/share/bash-completion/completions/@@NAME@@ -/usr/share/zsh/site-functions/_@@NAME@@ +%{_bindir}/%{name} +%{_datadir}/%{name}/ +%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/%{name}-url-handler.desktop +%{_datadir}/mime/packages/%{name}-workspace.xml +%{_datadir}/pixmaps/@@ICON@@.png +%{_datadir}/bash-completion/completions/%{name} +%{_datadir}/zsh/site-functions/_%{name} diff --git a/resources/linux/snap/snapcraft.yaml b/resources/linux/snap/snapcraft.yaml index 8bbad497ace..fc775b6554f 100644 --- a/resources/linux/snap/snapcraft.yaml +++ b/resources/linux/snap/snapcraft.yaml @@ -58,11 +58,9 @@ apps: command: electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --no-sandbox common-id: @@NAME@@.desktop environment: - DISABLE_WAYLAND: 1 GSETTINGS_SCHEMA_DIR: $SNAP/usr/share/glib-2.0/schemas url-handler: command: electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --open-url --no-sandbox environment: - DISABLE_WAYLAND: 1 GSETTINGS_SCHEMA_DIR: $SNAP/usr/share/glib-2.0/schemas diff --git a/resources/server/manifest.json b/resources/server/manifest.json index 3b64fbb9ee3..d92ca7ac018 100644 --- a/resources/server/manifest.json +++ b/resources/server/manifest.json @@ -3,7 +3,9 @@ "short_name": "Code- OSS", "start_url": "/", "lang": "en-US", - "display": "standalone", + "display_override": [ + "window-controls-overlay" + ], "icons": [ { "src": "code-192.png", diff --git a/scripts/code-web.js b/scripts/code-web.js index 5130e27b9b9..d91c6a08489 100644 --- a/scripts/code-web.js +++ b/scripts/code-web.js @@ -59,7 +59,7 @@ async function main() { if (args['port'] === undefined) { serverArgs.push('--port', PORT); } - if (args['playground'] === true || (args['_'].length === 0 && !args['--folder-uri'])) { + if (args['playground'] === true || (args['_'].length === 0 && !args['folder-uri'])) { serverArgs.push('--extensionPath', WEB_DEV_EXTENSIONS_ROOT); serverArgs.push('--folder-uri', 'memfs:///sample-folder'); await ensureWebDevExtensions(args['verbose']); diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat index 8ab9e7d76dd..e5b356f3dec 100644 --- a/scripts/test-integration.bat +++ b/scripts/test-integration.bat @@ -9,41 +9,21 @@ set VSCODELOGSDIR=%~dp0\..\.build\logs\integration-tests :: Figure out which Electron to use for running tests if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" ( - :: Run out of sources: no need to compile as code.bat takes care of it chcp 65001 set INTEGRATION_TEST_ELECTRON_PATH=.\scripts\code.bat set VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE=1 - echo Storing crash reports into '%VSCODECRASHDIR%'. - echo Storing log files into '%VSCODELOGSDIR%'. echo Running integration tests out of sources. ) else ( - :: Run from a built: need to compile all test extensions - :: because we run extension tests from their source folders - :: and the build bundles extensions into .build webpacked - :: call yarn gulp compile-extension:vscode-api-tests^ - :: compile-extension:vscode-colorize-tests^ - :: compile-extension:markdown-language-features^ - :: compile-extension:typescript-language-features^ - :: compile-extension:vscode-custom-editor-tests^ - :: compile-extension:vscode-notebook-tests^ - :: compile-extension:emmet^ - :: compile-extension:css-language-features-server^ - :: compile-extension:html-language-features-server^ - :: compile-extension:json-language-features-server^ - :: compile-extension:git^ - :: compile-extension:ipynb^ - :: compile-extension-media - - :: Configuration for more verbose output set VSCODE_CLI=1 set ELECTRON_ENABLE_LOGGING=1 - echo Storing crash reports into '%VSCODECRASHDIR%'. - echo Storing log files into '%VSCODELOGSDIR%'. echo Running integration tests with '%INTEGRATION_TEST_ELECTRON_PATH%' as build. ) +echo Storing crash reports into '%VSCODECRASHDIR%'. +echo Storing log files into '%VSCODELOGSDIR%'. + :: Tests standalone (AMD) @@ -102,6 +82,12 @@ mkdir %IPYNBWORKSPACE% call "%INTEGRATION_TEST_ELECTRON_PATH%" %IPYNBWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\ipynb --extensionTestsPath=%~dp0\..\extensions\ipynb\out\test %API_TESTS_EXTRA_ARGS% if %errorlevel% neq 0 exit /b %errorlevel% +echo. +echo ### Configuration editing tests +set CFWORKSPACE=%TEMPDIR%\cf-%RANDOM% +mkdir %CFWORKSPACE% +call "%INTEGRATION_TEST_ELECTRON_PATH%" %CFWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\configuration-editing --extensionTestsPath=%~dp0\..\extensions\configuration-editing\out\test %API_TESTS_EXTRA_ARGS% +if %errorlevel% neq 0 exit /b %errorlevel% :: Tests standalone (CommonJS) diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh index e381f61b40a..e43ef46016c 100755 --- a/scripts/test-integration.sh +++ b/scripts/test-integration.sh @@ -20,39 +20,19 @@ cd $ROOT # Figure out which Electron to use for running tests if [ -z "$INTEGRATION_TEST_ELECTRON_PATH" ] then - # Run out of sources: no need to compile as code.sh takes care of it INTEGRATION_TEST_ELECTRON_PATH="./scripts/code.sh" - echo "Storing crash reports into '$VSCODECRASHDIR'." - echo "Storing log files into '$VSCODELOGSDIR'." echo "Running integration tests out of sources." else - # Run from a built: need to compile all test extensions - # because we run extension tests from their source folders - # and the build bundles extensions into .build webpacked - # yarn gulp compile-extension:vscode-api-tests \ - # compile-extension:vscode-colorize-tests \ - # compile-extension:vscode-custom-editor-tests \ - # compile-extension:vscode-notebook-tests \ - # compile-extension:markdown-language-features \ - # compile-extension:typescript-language-features \ - # compile-extension:emmet \ - # compile-extension:css-language-features-server \ - # compile-extension:html-language-features-server \ - # compile-extension:json-language-features-server \ - # compile-extension:git \ - # compile-extension:ipynb \ - # compile-extension-media - - # Configuration for more verbose output export VSCODE_CLI=1 export ELECTRON_ENABLE_LOGGING=1 - echo "Storing crash reports into '$VSCODECRASHDIR'." - echo "Storing log files into '$VSCODELOGSDIR'." echo "Running integration tests with '$INTEGRATION_TEST_ELECTRON_PATH' as build." fi +echo "Storing crash reports into '$VSCODECRASHDIR'." +echo "Storing log files into '$VSCODELOGSDIR'." + # Tests standalone (AMD) @@ -120,6 +100,12 @@ echo "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $(mktemp -d 2>/dev/null) --extensionDevelopmentPath=$ROOT/extensions/ipynb --extensionTestsPath=$ROOT/extensions/ipynb/out/test $API_TESTS_EXTRA_ARGS kill_app +echo +echo "### Configuration editing tests" +echo +"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $(mktemp -d 2>/dev/null) --extensionDevelopmentPath=$ROOT/extensions/configuration-editing --extensionTestsPath=$ROOT/extensions/configuration-editing/out/test $API_TESTS_EXTRA_ARGS +kill_app + # Tests standalone (CommonJS) diff --git a/scripts/test-remote-integration.bat b/scripts/test-remote-integration.bat index a7d0719205f..e0fda5d1c4e 100644 --- a/scripts/test-remote-integration.bat +++ b/scripts/test-remote-integration.bat @@ -19,7 +19,7 @@ IF "%VSCODEUSERDATADIR%" == "" ( set VSCODEUSERDATADIR=%TMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,5% ) -set REMOTE_VSCODE=%AUTHORITY%%EXT_PATH% +set REMOTE_EXT_PATH=%AUTHORITY%%EXT_PATH% set VSCODECRASHDIR=%~dp0\..\.build\crashes set VSCODELOGSDIR=%~dp0\..\.build\logs\integration-tests-remote set TESTRESOLVER_DATA_FOLDER=%TMP%\testresolverdatafolder-%RANDOM%-%TIME:~6,5% @@ -32,45 +32,80 @@ if "%VSCODE_REMOTE_SERVER_PATH%"=="" ( echo Using '%VSCODE_REMOTE_SERVER_PATH%' as server path ) -set API_TESTS_EXTRA_ARGS=--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=%VSCODECRASHDIR% --logsPath=%VSCODELOGSDIR% --no-cached-data --disable-updates --disable-keytar --disable-inspect --disable-workspace-trust --user-data-dir=%VSCODEUSERDATADIR% - :: Figure out which Electron to use for running tests if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" ( - echo Storing crash reports into '%VSCODECRASHDIR%' - echo Storing log files into '%VSCODELOGSDIR%' + chcp 65001 + set INTEGRATION_TEST_ELECTRON_PATH=.\scripts\code.bat + set API_TESTS_EXTRA_ARGS_BUILT= - :: Tests in the extension host running from sources - call .\scripts\code.bat --folder-uri=%REMOTE_VSCODE%/vscode-api-tests/testWorkspace --extensionDevelopmentPath=%REMOTE_VSCODE%/vscode-api-tests --extensionTestsPath=%REMOTE_VSCODE%/vscode-api-tests/out/singlefolder-tests %API_TESTS_EXTRA_ARGS% - if %errorlevel% neq 0 exit /b %errorlevel% - - call .\scripts\code.bat --file-uri=%REMOTE_VSCODE%/vscode-api-tests/testworkspace.code-workspace --extensionDevelopmentPath=%REMOTE_VSCODE%/vscode-api-tests --extensionTestsPath=%REMOTE_VSCODE%/vscode-api-tests/out/workspace-tests %API_TESTS_EXTRA_ARGS% - if %errorlevel% neq 0 exit /b %errorlevel% + echo Running integration tests out of sources. ) else ( - echo Storing crash reports into '%VSCODECRASHDIR%' - echo Storing log files into '%VSCODELOGSDIR%' - echo Using %INTEGRATION_TEST_ELECTRON_PATH% as Electron path - - :: Run from a built: need to compile all test extensions - :: because we run extension tests from their source folders - :: and the build bundles extensions into .build webpacked - :: call yarn gulp compile-extension:vscode-api-tests^ - :: compile-extension:microsoft-authentication^ - :: compile-extension:github-authentication^ - :: compile-extension:vscode-test-resolver - - :: Configuration for more verbose output set VSCODE_CLI=1 set ELECTRON_ENABLE_LOGGING=1 - set ELECTRON_ENABLE_STACK_DUMPING=1 - :: Tests in the extension host running from built version (both client and server) - call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%REMOTE_VSCODE%/vscode-api-tests/testWorkspace --extensionDevelopmentPath=%REMOTE_VSCODE%/vscode-api-tests --extensionTestsPath=%REMOTE_VSCODE%/vscode-api-tests/out/singlefolder-tests %API_TESTS_EXTRA_ARGS% --extensions-dir=%EXT_PATH% --enable-proposed-api=vscode.vscode-test-resolver --enable-proposed-api=vscode.vscode-api-tests - if %errorlevel% neq 0 exit /b %errorlevel% + :: Extra arguments only when running against a built version + set API_TESTS_EXTRA_ARGS_BUILT=--extensions-dir=%EXT_PATH% --enable-proposed-api=vscode.vscode-test-resolver --enable-proposed-api=vscode.vscode-api-tests - call "%INTEGRATION_TEST_ELECTRON_PATH%" --file-uri=%REMOTE_VSCODE%/vscode-api-tests/testworkspace.code-workspace --extensionDevelopmentPath=%REMOTE_VSCODE%/vscode-api-tests --extensionTestsPath=%REMOTE_VSCODE%/vscode-api-tests/out/workspace-tests %API_TESTS_EXTRA_ARGS% --extensions-dir=%EXT_PATH% --enable-proposed-api=vscode.vscode-test-resolver --enable-proposed-api=vscode.vscode-api-tests - if %errorlevel% neq 0 exit /b %errorlevel% + echo Using %INTEGRATION_TEST_ELECTRON_PATH% as Electron path ) +echo Storing crash reports into '%VSCODECRASHDIR%' +echo Storing log files into '%VSCODELOGSDIR%' + + +:: Tests in the extension host + +set API_TESTS_EXTRA_ARGS=--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=%VSCODECRASHDIR% --logsPath=%VSCODELOGSDIR% --no-cached-data --disable-updates --disable-keytar --disable-inspect --disable-workspace-trust --user-data-dir=%VSCODEUSERDATADIR% + +echo. +echo ### API tests (folder) +call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%REMOTE_EXT_PATH%/vscode-api-tests/testWorkspace --extensionDevelopmentPath=%REMOTE_EXT_PATH%/vscode-api-tests --extensionTestsPath=%REMOTE_EXT_PATH%/vscode-api-tests/out/singlefolder-tests %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT% +if %errorlevel% neq 0 exit /b %errorlevel% + +echo. +echo ### API tests (workspace) +call "%INTEGRATION_TEST_ELECTRON_PATH%" --file-uri=%REMOTE_EXT_PATH%/vscode-api-tests/testworkspace.code-workspace --extensionDevelopmentPath=%REMOTE_EXT_PATH%/vscode-api-tests --extensionTestsPath=%REMOTE_EXT_PATH%/vscode-api-tests/out/workspace-tests %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT% +if %errorlevel% neq 0 exit /b %errorlevel% + +echo. +echo ### TypeScript tests +call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%REMOTE_EXT_PATH%/typescript-language-features/test-workspace --extensionDevelopmentPath=%REMOTE_EXT_PATH%/typescript-language-features --extensionTestsPath=%REMOTE_EXT_PATH%/typescript-language-features\out\test\unit %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT% +if %errorlevel% neq 0 exit /b %errorlevel% + +echo. +echo ### Markdown tests +call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%REMOTE_EXT_PATH%/markdown-language-features/test-workspace --extensionDevelopmentPath=%REMOTE_EXT_PATH%/markdown-language-features --extensionTestsPath=%REMOTE_EXT_PATH%/markdown-language-features/out/test %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT% +if %errorlevel% neq 0 exit /b %errorlevel% + +echo. +echo ### Emmet tests +call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%REMOTE_EXT_PATH%/emmet/test-workspace --extensionDevelopmentPath=%REMOTE_EXT_PATH%/emmet --extensionTestsPath=%REMOTE_EXT_PATH%/emmet/out/test %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT% +if %errorlevel% neq 0 exit /b %errorlevel% + +echo. +echo ### Git tests +for /f "delims=" %%i in ('node -p "require('fs').realpathSync.native(require('os').tmpdir())"') do set TEMPDIR=%%i +set GITWORKSPACE=%TEMPDIR%\git-%RANDOM% +mkdir %GITWORKSPACE% +call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%AUTHORITY%%GITWORKSPACE% --extensionDevelopmentPath=%REMOTE_EXT_PATH%/git --extensionTestsPath=%REMOTE_EXT_PATH%/git/out/test %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT% +if %errorlevel% neq 0 exit /b %errorlevel% + +echo. +echo ### Ipynb tests +set IPYNBWORKSPACE=%TEMPDIR%\ipynb-%RANDOM% +mkdir %IPYNBWORKSPACE% +call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%AUTHORITY%%IPYNBWORKSPACE% --extensionDevelopmentPath=%REMOTE_EXT_PATH%/ipynb --extensionTestsPath=%REMOTE_EXT_PATH%/ipynb/out/test %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT% +if %errorlevel% neq 0 exit /b %errorlevel% + +echo. +echo ### Configuration editing tests +set CFWORKSPACE=%TEMPDIR%\cf-%RANDOM% +mkdir %CFWORKSPACE% +call "%INTEGRATION_TEST_ELECTRON_PATH%" --folder-uri=%AUTHORITY%/%CFWORKSPACE% --extensionDevelopmentPath=%REMOTE_EXT_PATH%/configuration-editing --extensionTestsPath=%REMOTE_EXT_PATH%/configuration-editing/out/test %API_TESTS_EXTRA_ARGS% %API_TESTS_EXTRA_ARGS_BUILT% +if %errorlevel% neq 0 exit /b %errorlevel% + +:: Cleanup + IF "%3" == "" ( rmdir /s /q %VSCODEUSERDATADIR% ) diff --git a/scripts/test-remote-integration.sh b/scripts/test-remote-integration.sh index 68c740784a6..8163e796645 100755 --- a/scripts/test-remote-integration.sh +++ b/scripts/test-remote-integration.sh @@ -34,39 +34,19 @@ export REMOTE_VSCODE=$AUTHORITY$EXT_PATH # Figure out which Electron to use for running tests if [ -z "$INTEGRATION_TEST_ELECTRON_PATH" ] then - # Run out of sources: no need to compile as code.sh takes care of it INTEGRATION_TEST_ELECTRON_PATH="./scripts/code.sh" # No extra arguments when running out of sources EXTRA_INTEGRATION_TEST_ARGUMENTS="" - echo "Storing crash reports into '$VSCODECRASHDIR'." - echo "Storing log files into '$VSCODELOGSDIR'." echo "Running remote integration tests out of sources." else - # Run from a built: need to compile all test extensions - # because we run extension tests from their source folders - # and the build bundles extensions into .build webpacked - # yarn gulp compile-extension:vscode-api-tests \ - # compile-extension:vscode-test-resolver \ - # compile-extension:markdown-language-features \ - # compile-extension:typescript-language-features \ - # compile-extension:emmet \ - # compile-extension:git \ - # compile-extension:ipynb \ - # compile-extension:microsoft-authentication \ - # compile-extension:github-authentication \ - # compile-extension-media - - # Configuration for more verbose output export VSCODE_CLI=1 export ELECTRON_ENABLE_LOGGING=1 # Running from a build, we need to enable the vscode-test-resolver extension - EXTRA_INTEGRATION_TEST_ARGUMENTS="--extensions-dir=$EXT_PATH --enable-proposed-api=vscode.vscode-test-resolver --enable-proposed-api=vscode.vscode-api-tests --enable-proposed-api=vscode.markdown-language-features --enable-proposed-api=vscode.git" + EXTRA_INTEGRATION_TEST_ARGUMENTS="--extensions-dir=$EXT_PATH --enable-proposed-api=vscode.vscode-test-resolver --enable-proposed-api=vscode.vscode-api-tests" - echo "Storing crash reports into '$VSCODECRASHDIR'." - echo "Storing log files into '$VSCODELOGSDIR'." echo "Running remote integration tests with $INTEGRATION_TEST_ELECTRON_PATH as build." fi @@ -90,6 +70,12 @@ fi API_TESTS_EXTRA_ARGS="--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=$VSCODECRASHDIR --logsPath=$VSCODELOGSDIR --no-cached-data --disable-updates --disable-keytar --disable-workspace-trust --user-data-dir=$VSCODEUSERDATADIR" +echo "Storing crash reports into '$VSCODECRASHDIR'." +echo "Storing log files into '$VSCODELOGSDIR'." + + +# Tests in the extension host + echo echo "### API tests (folder)" echo @@ -132,6 +118,11 @@ echo "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS --folder-uri=$AUTHORITY$(mktemp -d 2>/dev/null) --extensionDevelopmentPath=$REMOTE_VSCODE/ipynb --extensionTestsPath=$REMOTE_VSCODE/ipynb/out/test $API_TESTS_EXTRA_ARGS $EXTRA_INTEGRATION_TEST_ARGUMENTS kill_app +echo +echo "### Configuration editing tests" +echo +"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS --folder-uri=$AUTHORITY$(mktemp -d 2>/dev/null) --extensionDevelopmentPath=$REMOTE_VSCODE/configuration-editing --extensionTestsPath=$REMOTE_VSCODE/configuration-editing/out/test $API_TESTS_EXTRA_ARGS $EXTRA_INTEGRATION_TEST_ARGUMENTS +kill_app # Cleanup diff --git a/scripts/test-web-integration.bat b/scripts/test-web-integration.bat index c5b89b85b36..700dd0a045e 100644 --- a/scripts/test-web-integration.bat +++ b/scripts/test-web-integration.bat @@ -18,19 +18,11 @@ IF "%~1" == "" ( set REMOTE_VSCODE=%AUTHORITY%%EXT_PATH% if "%VSCODE_REMOTE_SERVER_PATH%"=="" ( + chcp 65001 + echo Using remote server out of sources for integration web tests ) else ( echo Using '%VSCODE_REMOTE_SERVER_PATH%' as server path for web integration tests - - :: Run from a built: need to compile all test extensions - :: because we run extension tests from their source folders - :: and the build bundles extensions into .build webpacked - :: call yarn gulp compile-extension:vscode-api-tests^ - :: compile-extension:markdown-language-features^ - :: compile-extension:typescript-language-features^ - :: compile-extension:emmet^ - :: compile-extension:git^ - :: compile-extension-media ) if not exist ".\test\integration\browser\out\index.js" ( @@ -38,6 +30,9 @@ if not exist ".\test\integration\browser\out\index.js" ( call yarn playwright-install ) + +:: Tests in the extension host + echo. echo ### API tests (folder) call node .\test\integration\browser\out\index.js --workspacePath=.\extensions\vscode-api-tests\testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=.\extensions\vscode-api-tests --extensionTestsPath=.\extensions\vscode-api-tests\out\singlefolder-tests %* @@ -70,3 +65,21 @@ set GITWORKSPACE=%TEMPDIR%\git-%RANDOM% mkdir %GITWORKSPACE% call node .\test\integration\browser\out\index.js --workspacePath=%GITWORKSPACE% --extensionDevelopmentPath=.\extensions\git --extensionTestsPath=.\extensions\git\out\test %* if %errorlevel% neq 0 exit /b %errorlevel% + +echo. +echo ### Ipynb tests +set IPYNBWORKSPACE=%TEMPDIR%\ipynb-%RANDOM% +mkdir %IPYNBWORKSPACE% +call node .\test\integration\browser\out\index.js --workspacePath=%IPYNBWORKSPACE% --extensionDevelopmentPath=.\extensions\ipynb --extensionTestsPath=.\extensions\ipynb\out\test %* +if %errorlevel% neq 0 exit /b %errorlevel% + +echo. +echo ### Configuration editing tests +set CFWORKSPACE=%TEMPDIR%\git-%RANDOM% +mkdir %CFWORKSPACE% +call node .\test\integration\browser\out\index.js --workspacePath=%CFWORKSPACE% --extensionDevelopmentPath=.\extensions\configuration-editing --extensionTestsPath=.\extensions\configuration-editing\out\test %* +if %errorlevel% neq 0 exit /b %errorlevel% + +popd + +endlocal diff --git a/scripts/test-web-integration.sh b/scripts/test-web-integration.sh index 4246cdc6ac1..0648a7f8cd8 100755 --- a/scripts/test-web-integration.sh +++ b/scripts/test-web-integration.sh @@ -15,17 +15,6 @@ then echo "Using remote server out of sources for integration web tests" else echo "Using $VSCODE_REMOTE_SERVER_PATH as server path for web integration tests" - - # Run from a built: need to compile all test extensions - # because we run extension tests from their source folders - # and the build bundles extensions into .build webpacked - # yarn gulp compile-extension:vscode-api-tests \ - # compile-extension:markdown-language-features \ - # compile-extension:typescript-language-features \ - # compile-extension:emmet \ - # compile-extension:git \ - # compile-extension:ipynb \ - # compile-extension-media fi if [ ! -e 'test/integration/browser/out/index.js' ];then @@ -33,6 +22,7 @@ if [ ! -e 'test/integration/browser/out/index.js' ];then yarn playwright-install fi + # Tests in the extension host echo @@ -70,3 +60,8 @@ echo "### Ipynb tests" echo node test/integration/browser/out/index.js --workspacePath $(mktemp -d 2>/dev/null) --extensionDevelopmentPath=$ROOT/extensions/ipynb --extensionTestsPath=$ROOT/extensions/ipynb/out/test "$@" +echo +echo "### Configuration editing tests" +echo +node test/integration/browser/out/index.js --workspacePath $(mktemp -d 2>/dev/null) --extensionDevelopmentPath=$ROOT/extensions/configuration-editing --extensionTestsPath=$ROOT/extensions/configuration-editing/out/test "$@" + diff --git a/scripts/update-xterm.js b/scripts/update-xterm.js index 70637a8493c..bc574935902 100644 --- a/scripts/update-xterm.js +++ b/scripts/update-xterm.js @@ -8,6 +8,7 @@ const path = require('path'); const moduleNames = [ 'xterm', + 'xterm-addon-canvas', 'xterm-addon-search', 'xterm-addon-unicode11', 'xterm-addon-webgl' @@ -30,7 +31,17 @@ function getLatestModuleVersion(moduleName) { if (err) { reject(err); } - const versions = JSON.parse(stdout); + let versions = JSON.parse(stdout); + // HACK: Some bad versions were published as v5 which cannot be unpublished, ignore these + if (moduleName === 'xterm-addon-canvas') { + versions = versions.filter(e => ![ + '0.12.0', + '5.0.0-beta.1', + '5.0.0-beta.2', + '5.0.0-beta.3', + '5.0.0-beta.4', + ].includes(e)); + } resolve(versions[versions.length - 1]); }); }); diff --git a/src/bootstrap-amd.js b/src/bootstrap-amd.js index 43a87e72353..88747c29aaf 100644 --- a/src/bootstrap-amd.js +++ b/src/bootstrap-amd.js @@ -6,6 +6,11 @@ //@ts-check 'use strict'; +// Store the node.js require function in a variable +// before loading our AMD loader to avoid issues +// when this file is bundled with other files. +const nodeRequire = require; + const loader = require('./vs/loader'); const bootstrap = require('./bootstrap'); const performance = require('./vs/base/common/performance'); @@ -17,8 +22,7 @@ const nlsConfig = bootstrap.setupNLS(); loader.config({ baseUrl: bootstrap.fileUriFromPath(__dirname, { isWindows: process.platform === 'win32' }), catchError: true, - nodeRequire: require, - nodeMain: __filename, + nodeRequire, 'vs/nls': nlsConfig, amdModulesPattern: /^vs\//, recordStats: true diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js index c035cb6f262..90da6dd16f6 100644 --- a/src/bootstrap-fork.js +++ b/src/bootstrap-fork.js @@ -88,15 +88,6 @@ function pipeLoggingToParent() { } } - // Add the stack trace as payload if we are told so. We remove the message and the 2 top frames - // to start the stacktrace where the console message was being written - if (process.env['VSCODE_LOG_STACK'] === 'true') { - const stack = new Error().stack; - if (stack) { - argsArray.push({ __$stack: stack.split('\n').slice(3).join('\n') }); - } - } - try { const res = JSON.stringify(argsArray, function (key, value) { @@ -155,13 +146,8 @@ function pipeLoggingToParent() { safeSend({ type: '__$console', severity, arguments: args }); } - let isMakingConsoleCall = false; - /** - * Wraps a console message so that it is transmitted to the renderer. If - * native logging is turned on, the original console message will be written - * as well. This is needed since the console methods are "magic" in V8 and - * are the only methods that allow later introspection of logged variables. + * Wraps a console message so that it is transmitted to the renderer. * * The wrapped property is not defined with `writable: false` to avoid * throwing errors, but rather a no-op setting. See https://github.com/microsoft/vscode-extension-telemetry/issues/88 @@ -170,26 +156,10 @@ function pipeLoggingToParent() { * @param {'log' | 'warn' | 'error'} severity */ function wrapConsoleMethod(method, severity) { - if (process.env['VSCODE_LOG_NATIVE'] === 'true') { - const original = console[method]; - const stream = method === 'error' || method === 'warn' ? process.stderr : process.stdout; - Object.defineProperty(console, method, { - set: () => { }, - get: () => function () { - safeSendConsoleMessage(severity, safeToArray(arguments)); - isMakingConsoleCall = true; - stream.write('\nSTART_NATIVE_LOG\n'); - original.apply(console, arguments); - stream.write('\nEND_NATIVE_LOG\n'); - isMakingConsoleCall = false; - }, - }); - } else { - Object.defineProperty(console, method, { - set: () => { }, - get: () => function () { safeSendConsoleMessage(severity, safeToArray(arguments)); }, - }); - } + Object.defineProperty(console, method, { + set: () => { }, + get: () => function () { safeSendConsoleMessage(severity, safeToArray(arguments)); }, + }); } /** @@ -211,13 +181,11 @@ function pipeLoggingToParent() { Object.defineProperty(stream, 'write', { set: () => { }, get: () => (chunk, encoding, callback) => { - if (!isMakingConsoleCall) { - buf += chunk.toString(encoding); - const eol = buf.length > MAX_STREAM_BUFFER_LENGTH ? buf.length : buf.lastIndexOf('\n'); - if (eol !== -1) { - console[severity](buf.slice(0, eol)); - buf = buf.slice(eol + 1); - } + buf += chunk.toString(encoding); + const eol = buf.length > MAX_STREAM_BUFFER_LENGTH ? buf.length : buf.lastIndexOf('\n'); + if (eol !== -1) { + console[severity](buf.slice(0, eol)); + buf = buf.slice(eol + 1); } original.call(stream, chunk, encoding, callback); @@ -231,7 +199,7 @@ function pipeLoggingToParent() { wrapConsoleMethod('log', 'log'); wrapConsoleMethod('warn', 'warn'); wrapConsoleMethod('error', 'error'); - } else if (process.env['VSCODE_LOG_NATIVE'] !== 'true') { + } else { console.log = function () { /* ignore */ }; console.warn = function () { /* ignore */ }; console.info = function () { /* ignore */ }; @@ -273,13 +241,17 @@ function listenForMessagePort() { // We need to listen for the 'port' event as soon as possible, // otherwise we might miss the event. But we should also be // prepared in case the event arrives late. - process.on('port', (e) => { - if (global.vscodePortsCallback) { - global.vscodePortsCallback(e.ports); - } else { - global.vscodePorts = e.ports; - } - }); + // @ts-ignore + if (process.parentPort) { + // @ts-ignore + process.parentPort.on('message', (e) => { + if (global.vscodePortsCallback) { + global.vscodePortsCallback(e.ports); + } else { + global.vscodePorts = e.ports; + } + }); + } } //#endregion diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js index 79381017f50..61ca6dd8477 100644 --- a/src/bootstrap-window.js +++ b/src/bootstrap-window.js @@ -136,6 +136,7 @@ 'vscode-textmate': `${baseNodeModulesPath}/vscode-textmate/release/main.js`, 'vscode-oniguruma': `${baseNodeModulesPath}/vscode-oniguruma/release/main.js`, 'xterm': `${baseNodeModulesPath}/xterm/lib/xterm.js`, + 'xterm-addon-canvas': `${baseNodeModulesPath}/xterm-addon-canvas/lib/xterm-addon-canvas.js`, 'xterm-addon-search': `${baseNodeModulesPath}/xterm-addon-search/lib/xterm-addon-search.js`, 'xterm-addon-unicode11': `${baseNodeModulesPath}/xterm-addon-unicode11/lib/xterm-addon-unicode11.js`, 'xterm-addon-webgl': `${baseNodeModulesPath}/xterm-addon-webgl/lib/xterm-addon-webgl.js`, @@ -150,7 +151,7 @@ // which has a fallback to using node.js `require` // (node.js enabled renderers only) if (!safeProcess.sandboxed) { - loaderConfig.amdModulesPattern = /(^vs\/)|(^vscode-textmate$)|(^vscode-oniguruma$)|(^xterm$)|(^xterm-addon-search$)|(^xterm-addon-unicode11$)|(^xterm-addon-webgl$)|(^@vscode\/iconv-lite-umd$)|(^jschardet$)|(^@vscode\/vscode-languagedetection$)|(^vscode-regexp-languagedetection$)|(^tas-client-umd$)/; + loaderConfig.amdModulesPattern = /(^vs\/)|(^vscode-textmate$)|(^vscode-oniguruma$)|(^xterm$)|(^xterm-addon-canvas$)|(^xterm-addon-search$)|(^xterm-addon-unicode11$)|(^xterm-addon-webgl$)|(^@vscode\/iconv-lite-umd$)|(^jschardet$)|(^@vscode\/vscode-languagedetection$)|(^vscode-regexp-languagedetection$)|(^tas-client-umd$)/; } // Signal before require.config() diff --git a/src/bootstrap.js b/src/bootstrap.js index 319ddba9b02..1482973371c 100644 --- a/src/bootstrap.js +++ b/src/bootstrap.js @@ -205,7 +205,7 @@ } /** - * @returns {import('./vs/base/parts/sandbox/electron-sandbox/globals').ISandboxNodeProcess | NodeJS.Process} + * @returns {import('./vs/base/parts/sandbox/electron-sandbox/globals').ISandboxNodeProcess | NodeJS.Process | undefined} */ function safeProcess() { const sandboxGlobals = safeSandboxGlobals(); @@ -269,28 +269,8 @@ //#endregion - - //#region ApplicationInsights - - // Prevents appinsights from monkey patching modules. - // This should be called before importing the applicationinsights module - function avoidMonkeyPatchFromAppInsights() { - if (typeof process === 'undefined') { - console.warn('avoidMonkeyPatchFromAppInsights() is only available in node.js environments'); - return; - } - - // @ts-ignore - process.env['APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL'] = true; // Skip monkey patching of 3rd party modules by appinsights - global['diagnosticsSource'] = {}; // Prevents diagnostic channel (which patches "require") from initializing entirely - } - - //#endregion - - return { enableASARSupport, - avoidMonkeyPatchFromAppInsights, setupNLS, fileUriFromPath }; diff --git a/src/buildfile.js b/src/buildfile.js index 6b49aa30083..de976f51000 100644 --- a/src/buildfile.js +++ b/src/buildfile.js @@ -32,12 +32,16 @@ exports.base = [ { name: 'vs/editor/common/services/editorSimpleWorker', include: ['vs/base/common/worker/simpleWorker'], - prepend: ['vs/loader.js', 'vs/nls.js'], - append: ['vs/base/worker/workerMain'], + exclude: ['vs/nls'], + prepend: [ + { path: 'vs/loader.js' }, + { path: 'vs/base/worker/workerMain.js' } + ], dest: 'vs/base/worker/workerMain.js' }, { name: 'vs/base/common/worker/simpleWorker', + exclude: ['vs/nls'], } ]; @@ -46,6 +50,7 @@ exports.workerNotebook = [createEditorWorkerModuleDescription('vs/workbench/cont exports.workerSharedProcess = [createEditorWorkerModuleDescription('vs/platform/sharedProcess/electron-browser/sharedProcessWorkerMain')]; exports.workerLanguageDetection = [createEditorWorkerModuleDescription('vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker')]; exports.workerLocalFileSearch = [createEditorWorkerModuleDescription('vs/workbench/services/search/worker/localFileSearch')]; +exports.workerProfileAnalysis = [createEditorWorkerModuleDescription('vs/platform/profiling/electron-sandbox/profileAnalysisWorker')]; exports.workbenchDesktop = [ createEditorWorkerModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer'), diff --git a/src/cli.js b/src/cli.js index 398b4c09810..dd5ea5351ec 100644 --- a/src/cli.js +++ b/src/cli.js @@ -18,9 +18,6 @@ const bootstrap = require('./bootstrap'); const bootstrapNode = require('./bootstrap-node'); const product = require('../product.json'); -// Avoid Monkey Patches from Application Insights -bootstrap.avoidMonkeyPatchFromAppInsights(); - // Enable portable support bootstrapNode.configurePortable(product); diff --git a/src/main.js b/src/main.js index c9347d4516b..f7e6e49a967 100644 --- a/src/main.js +++ b/src/main.js @@ -24,7 +24,7 @@ const { getUserDataPath } = require('./vs/platform/environment/node/userDataPath const { stripComments } = require('./vs/base/common/stripComments'); /** @type {Partial} */ const product = require('../product.json'); -const { app, protocol, crashReporter } = require('electron'); +const { app, protocol, crashReporter, Menu } = require('electron'); // Enable portable support const portable = bootstrapNode.configurePortable(product); @@ -34,7 +34,7 @@ bootstrap.enableASARSupport(); // Set userData path before app 'ready' event const args = parseCLIArgs(); -const userDataPath = getUserDataPath(args); +const userDataPath = getUserDataPath(args, product.nameShort ?? 'code-oss-dev'); app.setPath('userData', userDataPath); // Resolve code cache path @@ -43,6 +43,9 @@ const codeCachePath = getCodeCachePath(); // Configure static command line arguments const argvConfig = configureCommandlineSwitchesSync(args); +// Disable default menu (https://github.com/electron/electron/issues/35512) +Menu.setApplicationMenu(null); + // Configure crash reporter perf.mark('code/willStartCrashReporter'); // If a crash-reporter-directory is specified we store the crash reports @@ -53,8 +56,7 @@ perf.mark('code/willStartCrashReporter'); // * --disable-crash-reporter command line parameter is not set // // Disable crash reporting in all other cases. -if (args['crash-reporter-directory'] || - (argvConfig['enable-crash-reporter'] && !args['disable-crash-reporter'])) { +if (args['crash-reporter-directory'] || (argvConfig['enable-crash-reporter'] && !args['disable-crash-reporter'])) { configureCrashReporter(); } perf.mark('code/didStartCrashReporter'); @@ -153,9 +155,6 @@ function configureCommandlineSwitchesSync(cliArgs) { // alias from us for --disable-gpu 'disable-hardware-acceleration', - // provided by Electron - 'disable-color-correct-rendering', - // override for the color profile to use 'force-color-profile' ]; @@ -221,6 +220,12 @@ function configureCommandlineSwitchesSync(cliArgs) { } }); + /* Following features are disabled from the runtime. + * `CalculateNativeWinOcclusion` - Disable native window occlusion tracker, + * Refs https://groups.google.com/a/chromium.org/g/embedder-dev/c/ZF3uHHyWLKw/m/VDN2hDXMAAAJ + */ + app.commandLine.appendSwitch('disable-features', 'CalculateNativeWinOcclusion'); + // Support JS Flags const jsFlags = getJSFlags(cliArgs); if (jsFlags) { @@ -247,9 +252,7 @@ function readArgvConfigSync() { // Fallback to default if (!argvConfig) { - argvConfig = { - 'disable-color-correct-rendering': true // Force pre-Chrome-60 color profile handling (for https://github.com/microsoft/vscode/issues/51791) - }; + argvConfig = {}; } return argvConfig; @@ -279,11 +282,7 @@ function createDefaultArgvConfigSync(argvConfigPath) { '{', ' // Use software rendering instead of hardware accelerated rendering.', ' // This can help in cases where you see rendering issues in VS Code.', - ' // "disable-hardware-acceleration": true,', - '', - ' // Enabled by default by VS Code to resolve color issues in the renderer', - ' // See https://github.com/microsoft/vscode/issues/51791 for details', - ' "disable-color-correct-rendering": true', + ' // "disable-hardware-acceleration": true', '}' ]; @@ -322,7 +321,7 @@ function configureCrashReporter() { if (!fs.existsSync(crashReporterDirectory)) { try { - fs.mkdirSync(crashReporterDirectory); + fs.mkdirSync(crashReporterDirectory, { recursive: true }); } catch (error) { console.error(`The path '${crashReporterDirectory}' specified for --crash-reporter-directory does not seem to exist or cannot be created.`); app.exit(1); @@ -393,7 +392,7 @@ function configureCrashReporter() { // Start crash reporter for all processes const productName = (product.crashReporter ? product.crashReporter.productName : undefined) || product.nameShort; const companyName = (product.crashReporter ? product.crashReporter.companyName : undefined) || 'Microsoft'; - const uploadToServer = !process.env['VSCODE_DEV'] && submitURL && !crashReporterDirectory; + const uploadToServer = Boolean(!process.env['VSCODE_DEV'] && submitURL && !crashReporterDirectory); crashReporter.start({ companyName, productName: process.env['VSCODE_DEV'] ? `${productName} Dev` : productName, @@ -416,7 +415,7 @@ function getJSFlags(cliArgs) { } // Support max-memory flag - if (cliArgs['max-memory'] && !/max_old_space_size=(\d+)/g.exec(cliArgs['js-flags'])) { + if (cliArgs['max-memory'] && !/max_old_space_size=(\d+)/g.exec(cliArgs['js-flags'] ?? '')) { jsFlags.push(`--max_old_space_size=${cliArgs['max-memory']}`); } diff --git a/src/server-main.js b/src/server-main.js index bb5e3aded35..27ecbaed0d6 100644 --- a/src/server-main.js +++ b/src/server-main.js @@ -21,7 +21,7 @@ async function start() { // Do a quick parse to determine if a server or the cli needs to be started const parsedArgs = minimist(process.argv.slice(2), { boolean: ['start-server', 'list-extensions', 'print-ip-address', 'help', 'version', 'accept-server-license-terms'], - string: ['install-extension', 'install-builtin-extension', 'uninstall-extension', 'locate-extension', 'socket-path', 'host', 'port', 'pick-port', 'compatibility'], + string: ['install-extension', 'install-builtin-extension', 'uninstall-extension', 'locate-extension', 'socket-path', 'host', 'port', 'compatibility'], alias: { help: 'h', version: 'v' } }); ['host', 'port', 'accept-server-license-terms'].forEach(e => { @@ -61,7 +61,11 @@ async function start() { /** @returns {Promise} */ const getRemoteExtensionHostAgentServer = () => { if (!_remoteExtensionHostAgentServerPromise) { - _remoteExtensionHostAgentServerPromise = loadCode().then((mod) => mod.createServer(address)); + _remoteExtensionHostAgentServerPromise = loadCode().then(async (mod) => { + const server = await mod.createServer(address); + _remoteExtensionHostAgentServer = server; + return server; + }); } return _remoteExtensionHostAgentServerPromise; }; @@ -119,7 +123,7 @@ async function start() { const nodeListenOptions = ( parsedArgs['socket-path'] ? { path: sanitizeStringArg(parsedArgs['socket-path']) } - : { host, port: await parsePort(host, sanitizeStringArg(parsedArgs['port']), sanitizeStringArg(parsedArgs['pick-port'])) } + : { host, port: await parsePort(host, sanitizeStringArg(parsedArgs['port'])) } ); server.listen(nodeListenOptions, async () => { let output = Array.isArray(product.serverGreeting) && product.serverGreeting.length ? `\n\n${product.serverGreeting.join('\n')}\n\n` : ``; @@ -127,7 +131,7 @@ async function start() { if (typeof nodeListenOptions.port === 'number' && parsedArgs['print-ip-address']) { const ifaces = os.networkInterfaces(); Object.keys(ifaces).forEach(function (ifname) { - ifaces[ifname].forEach(function (iface) { + ifaces[ifname]?.forEach(function (iface) { if (!iface.internal && iface.family === 'IPv4') { output += `IP Address: ${iface.address}\n`; } @@ -171,30 +175,23 @@ function sanitizeStringArg(val) { } /** - * If `--pick-port` and `--port` is specified, connect to that port. + * If `--port` is specified and describes a single port, connect to that port. * - * If not and a port range is specified through `--pick-port` + * If `--port`describes a port range * then find a free port in that range. Throw error if no * free port available in range. * - * If only `--port` is provided then connect to that port. - * * In absence of specified ports, connect to port 8000. * @param {string | undefined} host * @param {string | undefined} strPort - * @param {string | undefined} strPickPort * @returns {Promise} * @throws */ -async function parsePort(host, strPort, strPickPort) { - let specificPort; +async function parsePort(host, strPort) { if (strPort) { let range; if (strPort.match(/^\d+$/)) { - specificPort = parseInt(strPort, 10); - if (specificPort === 0 || !strPickPort) { - return specificPort; - } + return parseInt(strPort, 10); } else if (range = parseRange(strPort)) { const port = await findFreePort(host, range.start, range.end); if (port !== undefined) { @@ -208,25 +205,6 @@ async function parsePort(host, strPort, strPickPort) { process.exit(1); } } - // pick-port is deprecated and will be removed soon - if (strPickPort) { - const range = parseRange(strPickPort); - if (range) { - if (range.start <= specificPort && specificPort <= range.end) { - return specificPort; - } else { - const port = await findFreePort(host, range.start, range.end); - if (port !== undefined) { - return port; - } - console.log(`--pick-port: Could not find free port in range: ${range.start} - ${range.end}.`); - process.exit(1); - } - } else { - console.log(`--pick-port "${strPickPort}" is not a valid range. Ranges must be in the form 'from-to' with 'from' an integer larger than 0 and not larger than 'end'.`); - process.exit(1); - } - } return 8000; } diff --git a/src/tsconfig.base.json b/src/tsconfig.base.json index 18f99a6b7fe..a309a50adaa 100644 --- a/src/tsconfig.base.json +++ b/src/tsconfig.base.json @@ -37,6 +37,9 @@ "ES2020.String", "ES2020.Symbol.WellKnown", "ES2020.Intl", + "ES2021.Promise", + "ES2021.String", + "ES2021.WeakRef", "DOM", "DOM.Iterable", "WebWorker.ImportScripts" diff --git a/src/tsconfig.json b/src/tsconfig.json index eaaa3fb52b8..10ead1ecb06 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -5,7 +5,7 @@ "preserveConstEnums": true, "sourceMap": false, "outDir": "../out/vs", - "target": "es2020", + "target": "es2021", "types": [ "keytar", "mocha", diff --git a/src/tsconfig.monaco.json b/src/tsconfig.monaco.json index 7d18928f6b4..057aa8748ae 100644 --- a/src/tsconfig.monaco.json +++ b/src/tsconfig.monaco.json @@ -18,9 +18,8 @@ "include": [ "typings/require.d.ts", "typings/thenable.d.ts", - "vs/css.d.ts", + "vs/loader.d.ts", "vs/monaco.d.ts", - "vs/nls.d.ts", "vs/editor/*", "vs/base/common/*", "vs/base/browser/*", @@ -31,6 +30,7 @@ "node_modules/*", "vs/platform/files/browser/htmlFileSystemProvider.ts", "vs/platform/files/browser/webFileSystemAccess.ts", + "vs/platform/telemetry/*", "vs/platform/assignment/*" ] } diff --git a/src/tsconfig.vscode-dts.json b/src/tsconfig.vscode-dts.json index 4ae9bc7643a..b8607658396 100644 --- a/src/tsconfig.vscode-dts.json +++ b/src/tsconfig.vscode-dts.json @@ -14,6 +14,7 @@ "types": [], "lib": [ "es5", + "ES2015.Iterable" ], }, "include": [ diff --git a/src/tsec.exemptions.json b/src/tsec.exemptions.json index d5ce3f010a9..9902ab953e7 100644 --- a/src/tsec.exemptions.json +++ b/src/tsec.exemptions.json @@ -7,7 +7,7 @@ "vs/workbench/api/worker/extHostExtensionService.ts", "vs/base/worker/workerMain", "vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts", - "vs/workbench/services/keybinding/test/electron-browser/keyboardMapperTestUtils.ts" + "vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts" ], "ban-trustedtypes-createpolicy": [ "vs/base/browser/dom.ts", @@ -15,6 +15,7 @@ "vs/base/browser/defaultWorkerFactory.ts", "vs/base/worker/workerMain.ts", "vs/editor/contrib/markdownRenderer/browser/markdownRenderer.ts", + "vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts", "vs/editor/browser/view/domLineBreaksComputer.ts", "vs/editor/browser/view/viewLayer.ts", "vs/editor/browser/widget/diffEditorWidget.ts", diff --git a/src/vs/base/browser/broadcast.ts b/src/vs/base/browser/broadcast.ts new file mode 100644 index 00000000000..d7785f42ff8 --- /dev/null +++ b/src/vs/base/browser/broadcast.ts @@ -0,0 +1,69 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { getErrorMessage } from 'vs/base/common/errors'; +import { Emitter } from 'vs/base/common/event'; +import { Disposable, toDisposable } from 'vs/base/common/lifecycle'; + +export class BroadcastDataChannel extends Disposable { + + private broadcastChannel: BroadcastChannel | undefined; + + private readonly _onDidReceiveData = this._register(new Emitter()); + readonly onDidReceiveData = this._onDidReceiveData.event; + + constructor(private readonly channelName: string) { + super(); + + // Use BroadcastChannel + if ('BroadcastChannel' in window) { + try { + this.broadcastChannel = new BroadcastChannel(channelName); + const listener = (event: MessageEvent) => { + this._onDidReceiveData.fire(event.data); + }; + this.broadcastChannel.addEventListener('message', listener); + this._register(toDisposable(() => { + if (this.broadcastChannel) { + this.broadcastChannel.removeEventListener('message', listener); + this.broadcastChannel.close(); + } + })); + } catch (error) { + console.warn('Error while creating broadcast channel. Falling back to localStorage.', getErrorMessage(error)); + } + } + + // BroadcastChannel is not supported. Use storage. + if (!this.broadcastChannel) { + this.channelName = `BroadcastDataChannel.${channelName}`; + this.createBroadcastChannel(); + } + } + + private createBroadcastChannel(): void { + const listener = (event: StorageEvent) => { + if (event.key === this.channelName && event.newValue) { + this._onDidReceiveData.fire(JSON.parse(event.newValue)); + } + }; + window.addEventListener('storage', listener); + this._register(toDisposable(() => window.removeEventListener('storage', listener))); + } + + /** + * Sends the data to other BroadcastChannel objects set up for this channel. Data can be structured objects, e.g. nested objects and arrays. + * @param data data to broadcast + */ + postData(data: T): void { + if (this.broadcastChannel) { + this.broadcastChannel.postMessage(data); + } else { + // remove previous changes so that event is triggered even if new changes are same as old changes + window.localStorage.removeItem(this.channelName); + window.localStorage.setItem(this.channelName, JSON.stringify(data)); + } + } +} diff --git a/src/vs/base/browser/browser.ts b/src/vs/base/browser/browser.ts index d41cafcdb77..cd5a4254fc8 100644 --- a/src/vs/base/browser/browser.ts +++ b/src/vs/base/browser/browser.ts @@ -71,9 +71,7 @@ class DevicePixelRatioMonitor extends Disposable { } private _handleChange(fireEvent: boolean): void { - if (this._mediaQueryList) { - this._mediaQueryList.removeEventListener('change', this._listener); - } + this._mediaQueryList?.removeEventListener('change', this._listener); this._mediaQueryList = matchMedia(`(resolution: ${window.devicePixelRatio}dppx)`); this._mediaQueryList.addEventListener('change', this._listener); @@ -196,12 +194,23 @@ export const isAndroid = (userAgent.indexOf('Android') >= 0); let standalone = false; if (window.matchMedia) { - const matchMedia = window.matchMedia('(display-mode: standalone)'); - standalone = matchMedia.matches; - addMatchMediaChangeListener(matchMedia, ({ matches }) => { + const standaloneMatchMedia = window.matchMedia('(display-mode: standalone) or (display-mode: window-controls-overlay)'); + const fullScreenMatchMedia = window.matchMedia('(display-mode: fullscreen)'); + standalone = standaloneMatchMedia.matches; + addMatchMediaChangeListener(standaloneMatchMedia, ({ matches }) => { + // entering fullscreen would change standaloneMatchMedia.matches to false + // if standalone is true (running as PWA) and entering fullscreen, skip this change + if (standalone && fullScreenMatchMedia.matches) { + return; + } + // otherwise update standalone (browser to PWA or PWA to browser) standalone = matches; }); } export function isStandalone(): boolean { return standalone; } + +export function isWCOVisible(): boolean { + return (navigator as any)?.windowControlsOverlay?.visible; +} diff --git a/src/vs/base/browser/defaultWorkerFactory.ts b/src/vs/base/browser/defaultWorkerFactory.ts index 147ccc7c21b..87103de1a54 100644 --- a/src/vs/base/browser/defaultWorkerFactory.ts +++ b/src/vs/base/browser/defaultWorkerFactory.ts @@ -3,6 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { COI } from 'vs/base/common/network'; import { globals } from 'vs/base/common/platform'; import { IWorker, IWorkerCallback, IWorkerFactory, logOnceWebWorkerWarning } from 'vs/base/common/worker/simpleWorker'; @@ -41,7 +42,21 @@ export function getWorkerBootstrapUrl(scriptPath: string, label: string): string const blob = new Blob([js], { type: 'application/javascript' }); return URL.createObjectURL(blob); } - return scriptPath + '#' + label; + + const start = scriptPath.lastIndexOf('?'); + const end = scriptPath.lastIndexOf('#', start); + const params = start > 0 + ? new URLSearchParams(scriptPath.substring(start + 1, ~end ? end : undefined)) + : new URLSearchParams(); + + COI.addSearchParam(params, true, true); + const search = params.toString(); + + if (!search) { + return `${scriptPath}#${label}`; + } else { + return `${scriptPath}?${params.toString()}#${label}`; + } } // ESM-comment-end @@ -86,15 +101,11 @@ class WebWorker implements IWorker { } public postMessage(message: any, transfer: Transferable[]): void { - if (this.worker) { - this.worker.then(w => w.postMessage(message, transfer)); - } + this.worker?.then(w => w.postMessage(message, transfer)); } public dispose(): void { - if (this.worker) { - this.worker.then(w => w.terminate()); - } + this.worker?.then(w => w.terminate()); this.worker = null; } } @@ -112,7 +123,7 @@ export class DefaultWorkerFactory implements IWorkerFactory { } public create(moduleId: string, onMessageCallback: IWorkerCallback, onErrorCallback: (err: any) => void): IWorker { - let workerId = (++DefaultWorkerFactory.LAST_WORKER_ID); + const workerId = (++DefaultWorkerFactory.LAST_WORKER_ID); if (this._webWorkerFailedBeforeError) { throw this._webWorkerFailedBeforeError; diff --git a/src/vs/base/browser/deviceAccess.ts b/src/vs/base/browser/deviceAccess.ts new file mode 100644 index 00000000000..17cb1beb028 --- /dev/null +++ b/src/vs/base/browser/deviceAccess.ts @@ -0,0 +1,108 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +// https://wicg.github.io/webusb/ + +export interface UsbDeviceData { + readonly deviceClass: number; + readonly deviceProtocol: number; + readonly deviceSubclass: number; + readonly deviceVersionMajor: number; + readonly deviceVersionMinor: number; + readonly deviceVersionSubminor: number; + readonly manufacturerName?: string; + readonly productId: number; + readonly productName?: string; + readonly serialNumber?: string; + readonly usbVersionMajor: number; + readonly usbVersionMinor: number; + readonly usbVersionSubminor: number; + readonly vendorId: number; +} + +export async function requestUsbDevice(options?: { filters?: unknown[] }): Promise { + const usb = (navigator as any).usb; + if (!usb) { + return undefined; + } + + const device = await usb.requestDevice({ filters: options?.filters ?? [] }); + if (!device) { + return undefined; + } + + return { + deviceClass: device.deviceClass, + deviceProtocol: device.deviceProtocol, + deviceSubclass: device.deviceSubclass, + deviceVersionMajor: device.deviceVersionMajor, + deviceVersionMinor: device.deviceVersionMinor, + deviceVersionSubminor: device.deviceVersionSubminor, + manufacturerName: device.manufacturerName, + productId: device.productId, + productName: device.productName, + serialNumber: device.serialNumber, + usbVersionMajor: device.usbVersionMajor, + usbVersionMinor: device.usbVersionMinor, + usbVersionSubminor: device.usbVersionSubminor, + vendorId: device.vendorId, + }; +} + +// https://wicg.github.io/serial/ + +export interface SerialPortData { + readonly usbVendorId?: number | undefined; + readonly usbProductId?: number | undefined; +} + +export async function requestSerialPort(options?: { filters?: unknown[] }): Promise { + const serial = (navigator as any).serial; + if (!serial) { + return undefined; + } + + const port = await serial.requestPort({ filters: options?.filters ?? [] }); + if (!port) { + return undefined; + } + + const info = port.getInfo(); + return { + usbVendorId: info.usbVendorId, + usbProductId: info.usbProductId + }; +} + +// https://wicg.github.io/webhid/ + +export interface HidDeviceData { + readonly opened: boolean; + readonly vendorId: number; + readonly productId: number; + readonly productName: string; + readonly collections: []; +} + +export async function requestHidDevice(options?: { filters?: unknown[] }): Promise { + const hid = (navigator as any).hid; + if (!hid) { + return undefined; + } + + const devices = await hid.requestDevice({ filters: options?.filters ?? [] }); + if (!devices.length) { + return undefined; + } + + const device = devices[0]; + return { + opened: device.opened, + vendorId: device.vendorId, + productId: device.productId, + productName: device.productName, + collections: device.collections + }; +} diff --git a/src/vs/base/browser/dnd.ts b/src/vs/base/browser/dnd.ts index e1a0872271a..8b557e01bef 100644 --- a/src/vs/base/browser/dnd.ts +++ b/src/vs/base/browser/dnd.ts @@ -92,24 +92,3 @@ export interface IDragAndDropData { update(dataTransfer: DataTransfer): void; getData(): unknown; } - -export class DragAndDropData implements IDragAndDropData { - - constructor(private data: T) { } - - update(): void { - // noop - } - - getData(): T { - return this.data; - } -} - -export interface IStaticDND { - CurrentDragAndDropData: IDragAndDropData | undefined; -} - -export const StaticDND: IStaticDND = { - CurrentDragAndDropData: undefined -}; diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts index d2fa1bd3ba8..b756f7b5bf4 100644 --- a/src/vs/base/browser/dom.ts +++ b/src/vs/base/browser/dom.ts @@ -88,7 +88,7 @@ function _wrapAsStandardKeyboardEvent(handler: (e: IKeyboardEvent) => void): (e: return handler(new StandardKeyboardEvent(e)); }; } -export let addStandardDisposableListener: IAddStandardDisposableListenerSignature = function addStandardDisposableListener(node: HTMLElement, type: string, handler: (event: any) => void, useCapture?: boolean): IDisposable { +export const addStandardDisposableListener: IAddStandardDisposableListenerSignature = function addStandardDisposableListener(node: HTMLElement, type: string, handler: (event: any) => void, useCapture?: boolean): IDisposable { let wrapHandler = handler; if (type === 'click' || type === 'mousedown') { @@ -100,14 +100,14 @@ export let addStandardDisposableListener: IAddStandardDisposableListenerSignatur return addDisposableListener(node, type, wrapHandler, useCapture); }; -export let addStandardDisposableGenericMouseDownListener = function addStandardDisposableListener(node: HTMLElement, handler: (event: any) => void, useCapture?: boolean): IDisposable { - let wrapHandler = _wrapAsStandardMouseEvent(handler); +export const addStandardDisposableGenericMouseDownListener = function addStandardDisposableListener(node: HTMLElement, handler: (event: any) => void, useCapture?: boolean): IDisposable { + const wrapHandler = _wrapAsStandardMouseEvent(handler); return addDisposableGenericMouseDownListener(node, wrapHandler, useCapture); }; -export let addStandardDisposableGenericMouseUpListener = function addStandardDisposableListener(node: HTMLElement, handler: (event: any) => void, useCapture?: boolean): IDisposable { - let wrapHandler = _wrapAsStandardMouseEvent(handler); +export const addStandardDisposableGenericMouseUpListener = function addStandardDisposableListener(node: HTMLElement, handler: (event: any) => void, useCapture?: boolean): IDisposable { + const wrapHandler = _wrapAsStandardMouseEvent(handler); return addDisposableGenericMouseUpListener(node, wrapHandler, useCapture); }; @@ -122,74 +122,6 @@ export function addDisposableGenericMouseMoveListener(node: EventTarget, handler export function addDisposableGenericMouseUpListener(node: EventTarget, handler: (event: any) => void, useCapture?: boolean): IDisposable { return addDisposableListener(node, platform.isIOS && BrowserFeatures.pointerEvents ? EventType.POINTER_UP : EventType.MOUSE_UP, handler, useCapture); } -export function addDisposableNonBubblingMouseOutListener(node: Element, handler: (event: MouseEvent) => void): IDisposable { - return addDisposableListener(node, 'mouseout', (e: MouseEvent) => { - // Mouse out bubbles, so this is an attempt to ignore faux mouse outs coming from children elements - let toElement: Node | null = (e.relatedTarget); - while (toElement && toElement !== node) { - toElement = toElement.parentNode; - } - if (toElement === node) { - return; - } - - handler(e); - }); -} - -export function addDisposableNonBubblingPointerOutListener(node: Element, handler: (event: MouseEvent) => void): IDisposable { - return addDisposableListener(node, 'pointerout', (e: MouseEvent) => { - // Mouse out bubbles, so this is an attempt to ignore faux mouse outs coming from children elements - let toElement: Node | null = (e.relatedTarget); - while (toElement && toElement !== node) { - toElement = toElement.parentNode; - } - if (toElement === node) { - return; - } - - handler(e); - }); -} - -export function createEventEmitter(target: HTMLElement, type: K, options?: boolean | AddEventListenerOptions): event.Emitter { - let domListener: DomListener | null = null; - const handler = (e: HTMLElementEventMap[K]) => result.fire(e); - const onFirstListenerAdd = () => { - if (!domListener) { - domListener = new DomListener(target, type, handler, options); - } - }; - const onLastListenerRemove = () => { - if (domListener) { - domListener.dispose(); - domListener = null; - } - }; - const result = new event.Emitter({ onFirstListenerAdd, onLastListenerRemove }); - return result; -} - -interface IRequestAnimationFrame { - (callback: (time: number) => void): number; -} -let _animationFrame: IRequestAnimationFrame | null = null; -function doRequestAnimationFrame(callback: (time: number) => void): number { - if (!_animationFrame) { - const emulatedRequestAnimationFrame = (callback: (time: number) => void): any => { - return setTimeout(() => callback(new Date().getTime()), 0); - }; - _animationFrame = ( - self.requestAnimationFrame - || (self).msRequestAnimationFrame - || (self).webkitRequestAnimationFrame - || (self).mozRequestAnimationFrame - || (self).oRequestAnimationFrame - || emulatedRequestAnimationFrame - ); - } - return _animationFrame.call(self, callback); -} /** * Schedule a callback to be run at the next animation frame. @@ -258,7 +190,7 @@ class AnimationFrameQueueItem implements IDisposable { */ let inAnimationFrameRunner = false; - let animationFrameRunner = () => { + const animationFrameRunner = () => { animFrameRequested = false; CURRENT_QUEUE = NEXT_QUEUE; @@ -267,19 +199,19 @@ class AnimationFrameQueueItem implements IDisposable { inAnimationFrameRunner = true; while (CURRENT_QUEUE.length > 0) { CURRENT_QUEUE.sort(AnimationFrameQueueItem.sort); - let top = CURRENT_QUEUE.shift()!; + const top = CURRENT_QUEUE.shift()!; top.execute(); } inAnimationFrameRunner = false; }; scheduleAtNextAnimationFrame = (runner: () => void, priority: number = 0) => { - let item = new AnimationFrameQueueItem(runner, priority); + const item = new AnimationFrameQueueItem(runner, priority); NEXT_QUEUE.push(item); if (!animFrameRequested) { animFrameRequested = true; - doRequestAnimationFrame(animationFrameRunner); + requestAnimationFrame(animationFrameRunner); } return item; @@ -287,7 +219,7 @@ class AnimationFrameQueueItem implements IDisposable { runAtThisOrScheduleAtNextAnimationFrame = (runner: () => void, priority?: number) => { if (inAnimationFrameRunner) { - let item = new AnimationFrameQueueItem(runner, priority); + const item = new AnimationFrameQueueItem(runner, priority); CURRENT_QUEUE!.push(item); return item; } else { @@ -323,9 +255,9 @@ class TimeoutThrottledDomListener extends Disposable { let lastEvent: R | null = null; let lastHandlerTime = 0; - let timeout = this._register(new TimeoutTimer()); + const timeout = this._register(new TimeoutTimer()); - let invokeHandler = () => { + const invokeHandler = () => { lastHandlerTime = (new Date()).getTime(); handler(lastEvent); lastEvent = null; @@ -334,7 +266,7 @@ class TimeoutThrottledDomListener extends Disposable { this._register(addDisposableListener(node, type, (e) => { lastEvent = eventMerger(lastEvent, e); - let elapsedTime = (new Date()).getTime() - lastHandlerTime; + const elapsedTime = (new Date()).getTime() - lastHandlerTime; if (elapsedTime >= minimumTimeMs) { timeout.cancel(); @@ -392,16 +324,8 @@ class SizeUtils { } private static getDimension(element: HTMLElement, cssPropertyName: string, jsPropertyName: string): number { - let computedStyle: CSSStyleDeclaration = getComputedStyle(element); - let value = '0'; - if (computedStyle) { - if (computedStyle.getPropertyValue) { - value = computedStyle.getPropertyValue(cssPropertyName); - } else { - // IE8 - value = (computedStyle).getAttribute(jsPropertyName); - } - } + const computedStyle = getComputedStyle(element); + const value = computedStyle ? computedStyle.getPropertyValue(cssPropertyName) : '0'; return SizeUtils.convertToPixels(element, value); } @@ -568,10 +492,10 @@ export function position(element: HTMLElement, top: number, right?: number, bott * Returns the position of a dom node relative to the entire page. */ export function getDomNodePagePosition(domNode: HTMLElement): IDomNodePagePosition { - let bb = domNode.getBoundingClientRect(); + const bb = domNode.getBoundingClientRect(); return { - left: bb.left + StandardWindow.scrollX, - top: bb.top + StandardWindow.scrollY, + left: bb.left + window.scrollX, + top: bb.top + window.scrollY, width: bb.width, height: bb.height }; @@ -595,61 +519,37 @@ export function getDomNodeZoomLevel(domNode: HTMLElement): number { return zoom; } -export interface IStandardWindow { - readonly scrollX: number; - readonly scrollY: number; -} - -export const StandardWindow: IStandardWindow = new class implements IStandardWindow { - get scrollX(): number { - if (typeof window.scrollX === 'number') { - // modern browsers - return window.scrollX; - } else { - return document.body.scrollLeft + document.documentElement!.scrollLeft; - } - } - - get scrollY(): number { - if (typeof window.scrollY === 'number') { - // modern browsers - return window.scrollY; - } else { - return document.body.scrollTop + document.documentElement!.scrollTop; - } - } -}; // Adapted from WinJS // Gets the width of the element, including margins. export function getTotalWidth(element: HTMLElement): number { - let margin = SizeUtils.getMarginLeft(element) + SizeUtils.getMarginRight(element); + const margin = SizeUtils.getMarginLeft(element) + SizeUtils.getMarginRight(element); return element.offsetWidth + margin; } export function getContentWidth(element: HTMLElement): number { - let border = SizeUtils.getBorderLeftWidth(element) + SizeUtils.getBorderRightWidth(element); - let padding = SizeUtils.getPaddingLeft(element) + SizeUtils.getPaddingRight(element); + const border = SizeUtils.getBorderLeftWidth(element) + SizeUtils.getBorderRightWidth(element); + const padding = SizeUtils.getPaddingLeft(element) + SizeUtils.getPaddingRight(element); return element.offsetWidth - border - padding; } export function getTotalScrollWidth(element: HTMLElement): number { - let margin = SizeUtils.getMarginLeft(element) + SizeUtils.getMarginRight(element); + const margin = SizeUtils.getMarginLeft(element) + SizeUtils.getMarginRight(element); return element.scrollWidth + margin; } // Adapted from WinJS // Gets the height of the content of the specified element. The content height does not include borders or padding. export function getContentHeight(element: HTMLElement): number { - let border = SizeUtils.getBorderTopWidth(element) + SizeUtils.getBorderBottomWidth(element); - let padding = SizeUtils.getPaddingTop(element) + SizeUtils.getPaddingBottom(element); + const border = SizeUtils.getBorderTopWidth(element) + SizeUtils.getBorderBottomWidth(element); + const padding = SizeUtils.getPaddingTop(element) + SizeUtils.getPaddingBottom(element); return element.offsetHeight - border - padding; } // Adapted from WinJS // Gets the height of the element, including its margins. export function getTotalHeight(element: HTMLElement): number { - let margin = SizeUtils.getMarginTop(element) + SizeUtils.getMarginBottom(element); + const margin = SizeUtils.getMarginTop(element) + SizeUtils.getMarginBottom(element); return element.offsetHeight + margin; } @@ -659,16 +559,16 @@ function getRelativeLeft(element: HTMLElement, parent: HTMLElement): number { return 0; } - let elementPosition = getTopLeftOffset(element); - let parentPosition = getTopLeftOffset(parent); + const elementPosition = getTopLeftOffset(element); + const parentPosition = getTopLeftOffset(parent); return elementPosition.left - parentPosition.left; } export function getLargestChildWidth(parent: HTMLElement, children: HTMLElement[]): number { - let childWidths = children.map((child) => { + const childWidths = children.map((child) => { return Math.max(getTotalScrollWidth(child), getTotalWidth(child)) + getRelativeLeft(child, parent) || 0; }); - let maxWidth = Math.max(...childWidths); + const maxWidth = Math.max(...childWidths); return maxWidth; } @@ -787,7 +687,7 @@ export function getActiveElement(): Element | null { } export function createStyleSheet(container: HTMLElement = document.getElementsByTagName('head')[0]): HTMLStyleElement { - let style = document.createElement('style'); + const style = document.createElement('style'); style.type = 'text/css'; style.media = 'screen'; container.appendChild(style); @@ -795,7 +695,7 @@ export function createStyleSheet(container: HTMLElement = document.getElementsBy } export function createMetaElement(container: HTMLElement = document.getElementsByTagName('head')[0]): HTMLMetaElement { - let meta = document.createElement('meta'); + const meta = document.createElement('meta'); container.appendChild(meta); return meta; } @@ -833,10 +733,10 @@ export function removeCSSRulesContainingSelector(ruleName: string, style: HTMLSt return; } - let rules = getDynamicStyleSheetRules(style); - let toDelete: number[] = []; + const rules = getDynamicStyleSheetRules(style); + const toDelete: number[] = []; for (let i = 0; i < rules.length; i++) { - let rule = rules[i]; + const rule = rules[i]; if (rule.selectorText.indexOf(ruleName) !== -1) { toDelete.push(i); } @@ -870,6 +770,7 @@ export const EventType = { POINTER_UP: 'pointerup', POINTER_DOWN: 'pointerdown', POINTER_MOVE: 'pointermove', + POINTER_LEAVE: 'pointerleave', CONTEXT_MENU: 'contextmenu', WHEEL: 'wheel', // Keyboard @@ -920,22 +821,12 @@ export interface EventLike { } export const EventHelper = { - stop: function (e: EventLike, cancelBubble?: boolean) { - if (e.preventDefault) { - e.preventDefault(); - } else { - // IE8 - (e).returnValue = false; - } - + stop: (e: T, cancelBubble?: boolean): T => { + e.preventDefault(); if (cancelBubble) { - if (e.stopPropagation) { - e.stopPropagation(); - } else { - // IE8 - (e).cancelBubble = true; - } + e.stopPropagation(); } + return e; } }; @@ -946,7 +837,7 @@ export interface IFocusTracker extends Disposable { } export function saveParentsScrollTop(node: Element): number[] { - let r: number[] = []; + const r: number[] = []; for (let i = 0; node && node.nodeType === node.ELEMENT_NODE; i++) { r[i] = node.scrollTop; node = node.parentNode; @@ -1006,7 +897,7 @@ class FocusTracker extends Disposable implements IFocusTracker { }; this._refreshStateHandler = () => { - let currentNodeHasFocus = FocusTracker.hasFocusWithin(element); + const currentNodeHasFocus = FocusTracker.hasFocusWithin(element); if (currentNodeHasFocus !== hasFocus) { if (hasFocus) { onBlur(); @@ -1066,15 +957,13 @@ export enum Namespace { } function _$(namespace: Namespace, description: string, attrs?: { [key: string]: any }, ...children: Array): T { - let match = SELECTOR_REGEX.exec(description); + const match = SELECTOR_REGEX.exec(description); if (!match) { throw new Error('Bad use of emmet'); } - attrs = { ...(attrs || {}) }; - - let tagName = match[1] || 'div'; + const tagName = match[1] || 'div'; let result: T; if (namespace !== Namespace.HTML) { @@ -1090,24 +979,24 @@ function _$(namespace: Namespace, description: string, attrs? result.className = match[4].replace(/\./g, ' ').trim(); } - Object.keys(attrs).forEach(name => { - const value = attrs![name]; - - if (typeof value === 'undefined') { - return; - } - - if (/^on\w+$/.test(name)) { - (result)[name] = value; - } else if (name === 'selected') { - if (value) { - result.setAttribute(name, 'true'); + if (attrs) { + Object.entries(attrs).forEach(([name, value]) => { + if (typeof value === 'undefined') { + return; } - } else { - result.setAttribute(name, value); - } - }); + if (/^on\w+$/.test(name)) { + (result)[name] = value; + } else if (name === 'selected') { + if (value) { + result.setAttribute(name, 'true'); + } + + } else { + result.setAttribute(name, value); + } + }); + } result.append(...children); @@ -1141,14 +1030,14 @@ export function join(nodes: Node[], separator: Node | string): Node[] { } export function show(...elements: HTMLElement[]): void { - for (let element of elements) { + for (const element of elements) { element.style.display = ''; element.removeAttribute('aria-hidden'); } } export function hide(...elements: HTMLElement[]): void { - for (let element of elements) { + for (const element of elements) { element.style.display = 'none'; element.setAttribute('aria-hidden', 'true'); } @@ -1176,19 +1065,13 @@ export function removeTabIndexAndUpdateFocus(node: HTMLElement): void { // typically never want that, rather put focus to the closest element // in the hierarchy of the parent DOM nodes. if (document.activeElement === node) { - let parentFocusable = findParentWithAttribute(node.parentElement, 'tabIndex'); - if (parentFocusable) { - parentFocusable.focus(); - } + const parentFocusable = findParentWithAttribute(node.parentElement, 'tabIndex'); + parentFocusable?.focus(); } node.removeAttribute('tabindex'); } -export function getElementsByTagName(tag: string): HTMLElement[] { - return Array.prototype.slice.call(document.getElementsByTagName(tag), 0); -} - export function finalHandler(fn: (event: T) => any): (event: T) => any { return e => { e.preventDefault(); @@ -1478,20 +1361,92 @@ const defaultSafeProtocols = [ Schemas.command, ]; +/** + * List of safe, non-input html tags. + */ +export const basicMarkupHtmlTags = Object.freeze([ + 'a', + 'abbr', + 'b', + 'bdo', + 'blockquote', + 'br', + 'caption', + 'cite', + 'code', + 'col', + 'colgroup', + 'dd', + 'del', + 'details', + 'dfn', + 'div', + 'dl', + 'dt', + 'em', + 'figcaption', + 'figure', + 'h1', + 'h2', + 'h3', + 'h4', + 'h5', + 'h6', + 'hr', + 'i', + 'img', + 'ins', + 'kbd', + 'label', + 'li', + 'mark', + 'ol', + 'p', + 'pre', + 'q', + 'rp', + 'rt', + 'ruby', + 'samp', + 'small', + 'small', + 'span', + 'strike', + 'strong', + 'sub', + 'summary', + 'sup', + 'table', + 'tbody', + 'td', + 'tfoot', + 'th', + 'thead', + 'time', + 'tr', + 'tt', + 'u', + 'ul', + 'var', + 'video', + 'wbr', +]); + +const defaultDomPurifyConfig = Object.freeze({ + ALLOWED_TAGS: ['a', 'button', 'blockquote', 'code', 'div', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'input', 'label', 'li', 'p', 'pre', 'select', 'small', 'span', 'strong', 'textarea', 'ul', 'ol'], + ALLOWED_ATTR: ['href', 'data-href', 'data-command', 'target', 'title', 'name', 'src', 'alt', 'class', 'id', 'role', 'tabindex', 'style', 'data-code', 'width', 'height', 'align', 'x-dispatch', 'required', 'checked', 'placeholder', 'type'], + RETURN_DOM: false, + RETURN_DOM_FRAGMENT: false, + RETURN_TRUSTED_TYPE: true +}); + /** * Sanitizes the given `value` and reset the given `node` with it. */ export function safeInnerHtml(node: HTMLElement, value: string): void { - const options: dompurify.Config = { - ALLOWED_TAGS: ['a', 'button', 'blockquote', 'code', 'div', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'input', 'label', 'li', 'p', 'pre', 'select', 'small', 'span', 'strong', 'textarea', 'ul', 'ol'], - ALLOWED_ATTR: ['href', 'data-href', 'data-command', 'target', 'title', 'name', 'src', 'alt', 'class', 'id', 'role', 'tabindex', 'style', 'data-code', 'width', 'height', 'align', 'x-dispatch', 'required', 'checked', 'placeholder', 'type'], - RETURN_DOM: false, - RETURN_DOM_FRAGMENT: false, - }; - const hook = hookDomPurifyHrefAndSrcSanitizer(defaultSafeProtocols); try { - const html = dompurify.sanitize(value, { ...options, RETURN_TRUSTED_TYPE: true }); + const html = dompurify.sanitize(value, defaultDomPurifyConfig); node.innerHTML = html as unknown as string; } finally { hook.dispose(); @@ -1685,25 +1640,12 @@ export function getCookieValue(name: string): string | undefined { return match ? match.pop() : undefined; } -export const enum ZIndex { - SASH = 35, - SuggestWidget = 40, - Hover = 50, - DragImage = 1000, - MenubarMenuItemsHolder = 2000, // quick-input-widget - ContextView = 2500, - ModalDialog = 2600, - PaneDropOverlay = 10000 -} - - export interface IDragAndDropObserverCallbacks { readonly onDragEnter: (e: DragEvent) => void; readonly onDragLeave: (e: DragEvent) => void; readonly onDrop: (e: DragEvent) => void; readonly onDragEnd: (e: DragEvent) => void; - - readonly onDragOver?: (e: DragEvent) => void; + readonly onDragOver?: (e: DragEvent, dragDuration: number) => void; } export class DragAndDropObserver extends Disposable { @@ -1714,6 +1656,9 @@ export class DragAndDropObserver extends Disposable { // repeadedly. private counter: number = 0; + // Allows to measure the duration of the drag operation. + private dragStartTime = 0; + constructor(private readonly element: HTMLElement, private readonly callbacks: IDragAndDropObserverCallbacks) { super(); @@ -1723,6 +1668,7 @@ export class DragAndDropObserver extends Disposable { private registerListeners(): void { this._register(addDisposableListener(this.element, EventType.DRAG_ENTER, (e: DragEvent) => { this.counter++; + this.dragStartTime = e.timeStamp; this.callbacks.onDragEnter(e); })); @@ -1730,39 +1676,182 @@ export class DragAndDropObserver extends Disposable { this._register(addDisposableListener(this.element, EventType.DRAG_OVER, (e: DragEvent) => { e.preventDefault(); // needed so that the drop event fires (https://stackoverflow.com/questions/21339924/drop-event-not-firing-in-chrome) - if (this.callbacks.onDragOver) { - this.callbacks.onDragOver(e); - } + this.callbacks.onDragOver?.(e, e.timeStamp - this.dragStartTime); })); this._register(addDisposableListener(this.element, EventType.DRAG_LEAVE, (e: DragEvent) => { this.counter--; if (this.counter === 0) { + this.dragStartTime = 0; + this.callbacks.onDragLeave(e); } })); this._register(addDisposableListener(this.element, EventType.DRAG_END, (e: DragEvent) => { this.counter = 0; + this.dragStartTime = 0; + this.callbacks.onDragEnd(e); })); this._register(addDisposableListener(this.element, EventType.DROP, (e: DragEvent) => { this.counter = 0; + this.dragStartTime = 0; + this.callbacks.onDrop(e); })); } } -export function computeClippingRect(elementOrRect: HTMLElement | DOMRectReadOnly, clipper: HTMLElement) { - const frameRect = (elementOrRect instanceof HTMLElement ? elementOrRect.getBoundingClientRect() : elementOrRect); - const rootRect = clipper.getBoundingClientRect(); +type HTMLElementAttributeKeys = Partial<{ [K in keyof T]: T[K] extends Function ? never : T[K] extends object ? HTMLElementAttributeKeys : T[K] }>; +type ElementAttributes = HTMLElementAttributeKeys & Record; +type RemoveHTMLElement = T extends HTMLElement ? never : T; +type UnionToIntersection = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never; +type ArrayToObj = UnionToIntersection>; +type HHTMLElementTagNameMap = HTMLElementTagNameMap & { '': HTMLDivElement }; - const top = Math.max(rootRect.top - frameRect.top, 0); - const right = Math.max(frameRect.width - (frameRect.right - rootRect.right), 0); - const bottom = Math.max(frameRect.height - (frameRect.bottom - rootRect.bottom), 0); - const left = Math.max(rootRect.left - frameRect.left, 0); +type TagToElement = T extends `${infer TStart}#${string}` + ? TStart extends keyof HHTMLElementTagNameMap + ? HHTMLElementTagNameMap[TStart] + : HTMLElement + : T extends `${infer TStart}.${string}` + ? TStart extends keyof HHTMLElementTagNameMap + ? HHTMLElementTagNameMap[TStart] + : HTMLElement + : T extends keyof HTMLElementTagNameMap + ? HTMLElementTagNameMap[T] + : HTMLElement; - return { top, right, bottom, left }; +type TagToElementAndId = TTag extends `${infer TTag}@${infer TId}` + ? { element: TagToElement; id: TId } + : { element: TagToElement; id: 'root' }; + +type TagToRecord = TagToElementAndId extends { element: infer TElement; id: infer TId } + ? Record<(TId extends string ? TId : never) | 'root', TElement> + : never; + +type Child = HTMLElement | string | Record; +type Children = [] + | [Child] + | [Child, Child] + | [Child, Child, Child] + | [Child, Child, Child, Child] + | [Child, Child, Child, Child, Child] + | [Child, Child, Child, Child, Child, Child] + | [Child, Child, Child, Child, Child, Child, Child] + | [Child, Child, Child, Child, Child, Child, Child, Child] + | [Child, Child, Child, Child, Child, Child, Child, Child, Child] + | [Child, Child, Child, Child, Child, Child, Child, Child, Child, Child] + | [Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child] + | [Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child] + | [Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child] + | [Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child] + | [Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child] + | [Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child, Child]; + +const H_REGEX = /(?[\w\-]+)?(?:#(?[\w\-]+))?(?(?:\.(?:[\w\-]+))*)(?:@(?(?:[\w\_])+))?/; + +/** + * A helper function to create nested dom nodes. + * + * + * ```ts + * const elements = h('div.code-view', [ + * h('div.title@title'), + * h('div.container', [ + * h('div.gutter@gutterDiv'), + * h('div@editor'), + * ]), + * ]); + * const editor = createEditor(elements.editor); + * ``` +*/ +export function h + (tag: TTag): + TagToRecord extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never; + +export function h + (tag: TTag, children: T): + (ArrayToObj & TagToRecord) extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never; + +export function h + (tag: TTag, attributes: Partial>>): + TagToRecord extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never; + +export function h + (tag: TTag, attributes: Partial>>, children: T): + (ArrayToObj & TagToRecord) extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never; + +export function h(tag: string, ...args: [] | [attributes: { $: string } & Partial> | Record, children?: any[]] | [children: any[]]): Record { + let attributes: { $?: string } & Partial>; + let children: (Record | HTMLElement)[] | undefined; + + if (Array.isArray(args[0])) { + attributes = {}; + children = args[0]; + } else { + attributes = args[0] as any || {}; + children = args[1]; + } + + const match = H_REGEX.exec(tag); + + if (!match || !match.groups) { + throw new Error('Bad use of h'); + } + + const tagName = match.groups['tag'] || 'div'; + const el = document.createElement(tagName); + + if (match.groups['id']) { + el.id = match.groups['id']; + } + + if (match.groups['class']) { + el.className = match.groups['class'].replace(/\./g, ' ').trim(); + } + + const result: Record = {}; + + if (match.groups['name']) { + result[match.groups['name']] = el; + } + + if (children) { + for (const c of children) { + if (c instanceof HTMLElement) { + el.appendChild(c); + } else if (typeof c === 'string') { + el.append(c); + } else { + Object.assign(result, c); + el.appendChild(c.root); + } + } + } + + for (const [key, value] of Object.entries(attributes)) { + if (key === 'style') { + for (const [cssKey, cssValue] of Object.entries(value)) { + el.style.setProperty( + camelCaseToHyphenCase(cssKey), + typeof cssValue === 'number' ? cssValue + 'px' : '' + cssValue + ); + } + } else if (key === 'tabIndex') { + el.tabIndex = value; + } else { + el.setAttribute(camelCaseToHyphenCase(key), value.toString()); + } + } + + result['root'] = el; + + return result; +} + +function camelCaseToHyphenCase(str: string) { + return str.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase(); } diff --git a/src/vs/base/browser/event.ts b/src/vs/base/browser/event.ts index adef057e119..600a5f78248 100644 --- a/src/vs/base/browser/event.ts +++ b/src/vs/base/browser/event.ts @@ -45,18 +45,3 @@ export class DomEmitter implements IDisposable { this.emitter.dispose(); } } - -export interface CancellableEvent { - preventDefault(): void; - stopPropagation(): void; -} - -export function stopEvent(event: T): T { - event.preventDefault(); - event.stopPropagation(); - return event; -} - -export function stop(event: BaseEvent): BaseEvent { - return BaseEvent.map(event, stopEvent); -} diff --git a/src/vs/base/browser/fastDomNode.ts b/src/vs/base/browser/fastDomNode.ts index 30122d0c4ad..ccda35c1ac7 100644 --- a/src/vs/base/browser/fastDomNode.ts +++ b/src/vs/base/browser/fastDomNode.ts @@ -12,6 +12,10 @@ export class FastDomNode { private _left: string = ''; private _bottom: string = ''; private _right: string = ''; + private _paddingTop: string = ''; + private _paddingLeft: string = ''; + private _paddingBottom: string = ''; + private _paddingRight: string = ''; private _fontFamily: string = ''; private _fontWeight: string = ''; private _fontSize: string = ''; @@ -97,6 +101,42 @@ export class FastDomNode { this.domNode.style.right = this._right; } + public setPaddingTop(_paddingTop: number | string): void { + const paddingTop = numberAsPixels(_paddingTop); + if (this._paddingTop === paddingTop) { + return; + } + this._paddingTop = paddingTop; + this.domNode.style.paddingTop = this._paddingTop; + } + + public setPaddingLeft(_paddingLeft: number | string): void { + const paddingLeft = numberAsPixels(_paddingLeft); + if (this._paddingLeft === paddingLeft) { + return; + } + this._paddingLeft = paddingLeft; + this.domNode.style.paddingLeft = this._paddingLeft; + } + + public setPaddingBottom(_paddingBottom: number | string): void { + const paddingBottom = numberAsPixels(_paddingBottom); + if (this._paddingBottom === paddingBottom) { + return; + } + this._paddingBottom = paddingBottom; + this.domNode.style.paddingBottom = this._paddingBottom; + } + + public setPaddingRight(_paddingRight: number | string): void { + const paddingRight = numberAsPixels(_paddingRight); + if (this._paddingRight === paddingRight) { + return; + } + this._paddingRight = paddingRight; + this.domNode.style.paddingRight = this._paddingRight; + } + public setFontFamily(fontFamily: string): void { if (this._fontFamily === fontFamily) { return; diff --git a/src/vs/base/browser/formattedTextRenderer.ts b/src/vs/base/browser/formattedTextRenderer.ts index daef833851a..2ae545682cd 100644 --- a/src/vs/base/browser/formattedTextRenderer.ts +++ b/src/vs/base/browser/formattedTextRenderer.ts @@ -8,7 +8,7 @@ import { IMouseEvent } from 'vs/base/browser/mouseEvent'; import { DisposableStore } from 'vs/base/common/lifecycle'; export interface IContentActionHandler { - callback: (content: string, event?: IMouseEvent) => void; + callback: (content: string, event: IMouseEvent) => void; readonly disposables: DisposableStore; } diff --git a/src/vs/base/browser/globalPointerMoveMonitor.ts b/src/vs/base/browser/globalPointerMoveMonitor.ts index d5c432114d7..0348db2528f 100644 --- a/src/vs/base/browser/globalPointerMoveMonitor.ts +++ b/src/vs/base/browser/globalPointerMoveMonitor.ts @@ -64,7 +64,17 @@ export class GlobalPointerMoveMonitor implements IDisposable { try { initialElement.setPointerCapture(pointerId); this._hooks.add(toDisposable(() => { - initialElement.releasePointerCapture(pointerId); + try { + initialElement.releasePointerCapture(pointerId); + } catch (err) { + // See https://github.com/microsoft/vscode/issues/161731 + // + // `releasePointerCapture` sometimes fails when being invoked with the exception: + // DOMException: Failed to execute 'releasePointerCapture' on 'Element': + // No active pointer with the given id is found. + // + // There's no need to do anything in case of failure + } })); } catch (err) { // See https://github.com/microsoft/vscode/issues/144584 diff --git a/src/vs/base/browser/iframe.ts b/src/vs/base/browser/iframe.ts index c7201130637..40ca2f9f507 100644 --- a/src/vs/base/browser/iframe.ts +++ b/src/vs/base/browser/iframe.ts @@ -27,8 +27,8 @@ function getParentWindowIfSameOrigin(w: Window): Window | null { // Cannot really tell if we have access to the parent window unless we try to access something in it try { - let location = w.location; - let parentLocation = w.parent.location; + const location = w.location; + const parentLocation = w.parent.location; if (location.origin !== 'null' && parentLocation.origin !== 'null' && location.origin !== parentLocation.origin) { hasDifferentOriginAncestorFlag = true; return null; @@ -97,7 +97,7 @@ export class IframeUtils { let top = 0, left = 0; - let windowChain = this.getSameOriginWindowChain(); + const windowChain = this.getSameOriginWindowChain(); for (const windowChainEl of windowChain) { @@ -112,7 +112,7 @@ export class IframeUtils { break; } - let boundingRect = windowChainEl.iframeElement.getBoundingClientRect(); + const boundingRect = windowChainEl.iframeElement.getBoundingClientRect(); top += boundingRect.top; left += boundingRect.left; } diff --git a/src/vs/base/browser/indexedDB.ts b/src/vs/base/browser/indexedDB.ts index 5fba9c0ab4c..5d985a1e571 100644 --- a/src/vs/base/browser/indexedDB.ts +++ b/src/vs/base/browser/indexedDB.ts @@ -6,7 +6,6 @@ import { toErrorMessage } from 'vs/base/common/errorMessage'; import { getErrorMessage } from 'vs/base/common/errors'; import { mark } from 'vs/base/common/performance'; -import { isArray } from 'vs/base/common/types'; class MissingStoresError extends Error { constructor(readonly db: IDBDatabase) { @@ -28,7 +27,7 @@ export class IndexedDB { return new IndexedDB(database, name); } - static async openDatabase(name: string, version: number | undefined, stores: string[]): Promise { + private static async openDatabase(name: string, version: number | undefined, stores: string[]): Promise { mark(`code/willOpenDatabase/${name}`); try { return await IndexedDB.doOpenDatabase(name, version, stores); @@ -106,9 +105,7 @@ export class IndexedDB { if (this.pendingTransactions.length) { this.pendingTransactions.splice(0, this.pendingTransactions.length).forEach(transaction => transaction.abort()); } - if (this.database) { - this.database.close(); - } + this.database?.close(); this.database = null; } @@ -122,7 +119,7 @@ export class IndexedDB { this.pendingTransactions.push(transaction); return new Promise((c, e) => { transaction.oncomplete = () => { - if (isArray(request)) { + if (Array.isArray(request)) { c(request.map(r => r.result)); } else { c(request.result); diff --git a/src/vs/base/browser/keyboardEvent.ts b/src/vs/base/browser/keyboardEvent.ts index 785c2221e47..e7267d73408 100644 --- a/src/vs/base/browser/keyboardEvent.ts +++ b/src/vs/base/browser/keyboardEvent.ts @@ -13,7 +13,7 @@ import * as platform from 'vs/base/common/platform'; function extractKeyCode(e: KeyboardEvent): KeyCode { if (e.charCode) { // "keypress" events mostly - let char = String.fromCharCode(e.charCode).toUpperCase(); + const char = String.fromCharCode(e.charCode).toUpperCase(); return KeyCodeUtils.fromString(char); } @@ -77,7 +77,7 @@ const shiftKeyMod = KeyMod.Shift; const metaKeyMod = (platform.isMacintosh ? KeyMod.CtrlCmd : KeyMod.WinCtrl); export function printKeyboardEvent(e: KeyboardEvent): string { - let modifiers: string[] = []; + const modifiers: string[] = []; if (e.ctrlKey) { modifiers.push(`ctrl`); } @@ -94,7 +94,7 @@ export function printKeyboardEvent(e: KeyboardEvent): string { } export function printStandardKeyboardEvent(e: StandardKeyboardEvent): string { - let modifiers: string[] = []; + const modifiers: string[] = []; if (e.ctrlKey) { modifiers.push(`ctrl`); } @@ -128,7 +128,7 @@ export class StandardKeyboardEvent implements IKeyboardEvent { private _asRuntimeKeybinding: SimpleKeybinding; constructor(source: KeyboardEvent) { - let e = source; + const e = source; this.browserEvent = e; this.target = e.target; diff --git a/src/vs/base/browser/markdownRenderer.ts b/src/vs/base/browser/markdownRenderer.ts index 4c0ce0e0060..825ab6e6984 100644 --- a/src/vs/base/browser/markdownRenderer.ts +++ b/src/vs/base/browser/markdownRenderer.ts @@ -9,13 +9,12 @@ import { DomEmitter } from 'vs/base/browser/event'; import { createElement, FormattedTextRenderOptions } from 'vs/base/browser/formattedTextRenderer'; import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels'; -import { raceCancellation } from 'vs/base/common/async'; -import { CancellationTokenSource } from 'vs/base/common/cancellation'; import { onUnexpectedError } from 'vs/base/common/errors'; import { Event } from 'vs/base/common/event'; -import { IMarkdownString, parseHrefAndDimensions, removeMarkdownEscapes } from 'vs/base/common/htmlContent'; +import { IMarkdownString, escapeDoubleQuotes, parseHrefAndDimensions, removeMarkdownEscapes, MarkdownStringTrustedOptions } from 'vs/base/common/htmlContent'; import { markdownEscapeEscapedIcons } from 'vs/base/common/iconLabels'; import { defaultGenerator } from 'vs/base/common/idGenerator'; +import { Lazy } from 'vs/base/common/lazy'; import { DisposableStore } from 'vs/base/common/lifecycle'; import { marked } from 'vs/base/common/marked/marked'; import { parse } from 'vs/base/common/marshalling'; @@ -34,6 +33,53 @@ export interface MarkdownRenderOptions extends FormattedTextRenderOptions { readonly asyncRenderCallback?: () => void; } +const defaultMarkedRenderers = Object.freeze({ + image: (href: string | null, title: string | null, text: string): string => { + let dimensions: string[] = []; + let attributes: string[] = []; + if (href) { + ({ href, dimensions } = parseHrefAndDimensions(href)); + attributes.push(`src="${escapeDoubleQuotes(href)}"`); + } + if (text) { + attributes.push(`alt="${escapeDoubleQuotes(text)}"`); + } + if (title) { + attributes.push(`title="${escapeDoubleQuotes(title)}"`); + } + if (dimensions.length) { + attributes = attributes.concat(dimensions); + } + return ''; + }, + + paragraph: (text: string): string => { + return `

        ${text}

        `; + }, + + link: (href: string | null, title: string | null, text: string): string => { + if (typeof href !== 'string') { + return ''; + } + + // Remove markdown escapes. Workaround for https://github.com/chjj/marked/issues/829 + if (href === text) { // raw link case + text = removeMarkdownEscapes(text); + } + + title = typeof title === 'string' ? escapeDoubleQuotes(removeMarkdownEscapes(title)) : ''; + href = removeMarkdownEscapes(href); + + // HTML Encode href + href = href.replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); + return `${text}`; + }, +}); + /** * Low-level way create a html element from a markdown string. * @@ -44,8 +90,6 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende const disposables = new DisposableStore(); let isDisposed = false; - const cts = disposables.add(new CancellationTokenSource()); - const element = createElement(options); const _uriMassage = function (part: string): string { @@ -96,74 +140,19 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende return uri.toString(); }; - // signal to code-block render that the - // element has been created - let signalInnerHTML: () => void; - const withInnerHTML = new Promise(c => signalInnerHTML = c); - const renderer = new marked.Renderer(); + renderer.image = defaultMarkedRenderers.image; + renderer.link = defaultMarkedRenderers.link; + renderer.paragraph = defaultMarkedRenderers.paragraph; - renderer.image = (href: string, title: string, text: string) => { - let dimensions: string[] = []; - let attributes: string[] = []; - if (href) { - ({ href, dimensions } = parseHrefAndDimensions(href)); - attributes.push(`src="${href}"`); - } - if (text) { - attributes.push(`alt="${text}"`); - } - if (title) { - attributes.push(`title="${title}"`); - } - if (dimensions.length) { - attributes = attributes.concat(dimensions); - } - return ''; - }; - renderer.link = (href, title, text): string => { - if (typeof href !== 'string') { - return ''; - } - - // Remove markdown escapes. Workaround for https://github.com/chjj/marked/issues/829 - if (href === text) { // raw link case - text = removeMarkdownEscapes(text); - } - - title = typeof title === 'string' ? removeMarkdownEscapes(title) : ''; - href = removeMarkdownEscapes(href); - - // HTML Encode href - href = href.replace(/&/g, '&') - .replace(//g, '>') - .replace(/"/g, '"') - .replace(/'/g, '''); - return `${text}`; - }; - renderer.paragraph = (text): string => { - return `

        ${text}

        `; - }; + // Will collect [id, renderedElement] tuples + const codeBlocks: Promise<[string, HTMLElement]>[] = []; if (options.codeBlockRenderer) { renderer.code = (code, lang) => { - const value = options.codeBlockRenderer!(lang ?? '', code); - // when code-block rendering is async we return sync - // but update the node with the real result later. const id = defaultGenerator.nextId(); - raceCancellation(Promise.all([value, withInnerHTML]), cts.token).then(values => { - if (!isDisposed && values) { - const span = element.querySelector(`div[data-code="${id}"]`); - if (span) { - DOM.reset(span, values[0]); - } - options.asyncRenderCallback?.(); - } - }).catch(() => { - // ignore - }); - + const value = options.codeBlockRenderer!(postProcessCodeBlockLanguageId(lang), code); + codeBlocks.push(value.then(element => [id, element])); return `
        ${escape(code)}
        `; }; } @@ -265,7 +254,7 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende || /^command:(\/\/\/)?_workbench\.downloadResource/i.test(href) ) { // drop the link - a.replaceWith(a.textContent ?? ''); + a.replaceWith(...a.childNodes); } else { let resolvedHref = _href(href, false); if (markdown.baseUri) { @@ -277,8 +266,22 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende element.innerHTML = sanitizeRenderedMarkdown(markdown, markdownHtmlDoc.body.innerHTML) as unknown as string; - // signal that async code blocks can be now be inserted - signalInnerHTML!(); + if (codeBlocks.length > 0) { + Promise.all(codeBlocks).then((tuples) => { + if (isDisposed) { + return; + } + const renderedElements = new Map(tuples); + const placeholderElements = element.querySelectorAll(`div[data-code]`); + for (const placeholderElement of placeholderElements) { + const renderedElement = renderedElements.get(placeholderElement.dataset['code'] ?? ''); + if (renderedElement) { + DOM.reset(placeholderElement, renderedElement); + } + } + options.asyncRenderCallback?.(); + }); + } // signal size changes for image tags if (options.asyncRenderCallback) { @@ -294,12 +297,23 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende element, dispose: () => { isDisposed = true; - cts.cancel(); disposables.dispose(); } }; } +function postProcessCodeBlockLanguageId(lang: string | undefined): string { + if (!lang) { + return ''; + } + + const parts = lang.split(/[\s+|:|,|\{|\?]/, 1); + if (parts.length) { + return parts[0]; + } + return lang; +} + function resolveWithBaseUri(baseUri: URI, href: string): string { const hasScheme = /^\w[\w\d+.-]*:/.test(href); if (hasScheme) { @@ -314,7 +328,7 @@ function resolveWithBaseUri(baseUri: URI, href: string): string { } function sanitizeRenderedMarkdown( - options: { isTrusted?: boolean }, + options: { isTrusted?: boolean | MarkdownStringTrustedOptions }, renderedMarkdown: string, ): TrustedHTML { const { config, allowedSchemes } = getSanitizerOptions(options); @@ -344,7 +358,27 @@ function sanitizeRenderedMarkdown( } } -function getSanitizerOptions(options: { readonly isTrusted?: boolean }): { config: dompurify.Config; allowedSchemes: string[] } { +export const allowedMarkdownAttr = [ + 'align', + 'alt', + 'class', + 'controls', + 'data-code', + 'data-href', + 'height', + 'href', + 'loop', + 'muted', + 'playsinline', + 'poster', + 'src', + 'style', + 'target', + 'title', + 'width', +]; + +function getSanitizerOptions(options: { readonly isTrusted?: boolean | MarkdownStringTrustedOptions }): { config: dompurify.Config; allowedSchemes: string[] } { const allowedSchemes = [ Schemas.http, Schemas.https, @@ -366,8 +400,8 @@ function getSanitizerOptions(options: { readonly isTrusted?: boolean }): { confi // Since we have our own sanitize function for marked, it's possible we missed some tag so let dompurify make sure. // HTML tags that can result from markdown are from reading https://spec.commonmark.org/0.29/ // HTML table tags that can result from markdown are from https://github.github.com/gfm/#tables-extension- - ALLOWED_TAGS: ['ul', 'li', 'p', 'b', 'i', 'code', 'blockquote', 'ol', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'em', 'pre', 'table', 'thead', 'tbody', 'tr', 'th', 'td', 'div', 'del', 'a', 'strong', 'br', 'img', 'span'], - ALLOWED_ATTR: ['href', 'data-href', 'target', 'title', 'src', 'alt', 'class', 'style', 'data-code', 'width', 'height', 'align'], + ALLOWED_TAGS: [...DOM.basicMarkupHtmlTags], + ALLOWED_ATTR: allowedMarkdownAttr, ALLOW_UNKNOWN_PROTOCOLS: true, }, allowedSchemes @@ -386,6 +420,27 @@ export function renderStringAsPlaintext(string: IMarkdownString | string) { * Strips all markdown from `markdown`. For example `# Header` would be output as `Header`. */ export function renderMarkdownAsPlaintext(markdown: IMarkdownString) { + // values that are too long will freeze the UI + let value = markdown.value ?? ''; + if (value.length > 100_000) { + value = `${value.substr(0, 100_000)}â€Ļ`; + } + + const html = marked.parse(value, { renderer: plainTextRenderer.getValue() }).replace(/&(#\d+|[a-zA-Z]+);/g, m => unescapeInfo.get(m) ?? m); + + return sanitizeRenderedMarkdown({ isTrusted: false }, html).toString(); +} + +const unescapeInfo = new Map([ + ['"', '"'], + [' ', ' '], + ['&', '&'], + [''', '\''], + ['<', '<'], + ['>', '>'], +]); + +const plainTextRenderer = new Lazy(() => { const renderer = new marked.Renderer(); renderer.code = (code: string): string => { @@ -448,22 +503,5 @@ export function renderMarkdownAsPlaintext(markdown: IMarkdownString) { renderer.link = (_href: string, _title: string, text: string): string => { return text; }; - // values that are too long will freeze the UI - let value = markdown.value ?? ''; - if (value.length > 100_000) { - value = `${value.substr(0, 100_000)}â€Ļ`; - } - - const unescapeInfo = new Map([ - ['"', '"'], - [' ', ' '], - ['&', '&'], - [''', '\''], - ['<', '<'], - ['>', '>'], - ]); - - const html = marked.parse(value, { renderer }).replace(/&(#\d+|[a-zA-Z]+);/g, m => unescapeInfo.get(m) ?? m); - - return sanitizeRenderedMarkdown({ isTrusted: false }, html).toString(); -} + return renderer; +}); diff --git a/src/vs/base/browser/mouseEvent.ts b/src/vs/base/browser/mouseEvent.ts index a78d4324356..e6f5d3b5a4b 100644 --- a/src/vs/base/browser/mouseEvent.ts +++ b/src/vs/base/browser/mouseEvent.ts @@ -74,7 +74,7 @@ export class StandardMouseEvent implements IMouseEvent { } // Find the position of the iframe this code is executing in relative to the iframe where the event was captured. - let iframeOffsets = IframeUtils.getPositionOfChildWindowRelativeToAncestorWindow(self, e.view); + const iframeOffsets = IframeUtils.getPositionOfChildWindowRelativeToAncestorWindow(self, e.view); this.posx -= iframeOffsets.left; this.posy -= iframeOffsets.top; } @@ -88,28 +88,14 @@ export class StandardMouseEvent implements IMouseEvent { } } -export interface IDataTransfer { - dropEffect: string; - effectAllowed: string; - types: any[]; - files: any[]; - - setData(type: string, data: string): void; - setDragImage(image: any, x: number, y: number): void; - - getData(type: string): string; - clearData(types?: string[]): void; -} - export class DragMouseEvent extends StandardMouseEvent { - public readonly dataTransfer: IDataTransfer; + public readonly dataTransfer: DataTransfer; constructor(e: MouseEvent) { super(e); this.dataTransfer = (e).dataTransfer; } - } export interface IMouseWheelEvent extends MouseEvent { @@ -152,8 +138,8 @@ export class StandardWheelEvent { if (e) { // Old (deprecated) wheel events - let e1 = e; - let e2 = e; + const e1 = e; + const e2 = e; // vertical delta scroll if (typeof e1.wheelDeltaY !== 'undefined') { @@ -211,14 +197,10 @@ export class StandardWheelEvent { } public preventDefault(): void { - if (this.browserEvent) { - this.browserEvent.preventDefault(); - } + this.browserEvent?.preventDefault(); } public stopPropagation(): void { - if (this.browserEvent) { - this.browserEvent.stopPropagation(); - } + this.browserEvent?.stopPropagation(); } } diff --git a/src/vs/base/browser/touch.ts b/src/vs/base/browser/touch.ts index 72bd66c6adf..5ef1672c3f1 100644 --- a/src/vs/base/browser/touch.ts +++ b/src/vs/base/browser/touch.ts @@ -6,7 +6,8 @@ import * as DomUtils from 'vs/base/browser/dom'; import * as arrays from 'vs/base/common/arrays'; import { memoize } from 'vs/base/common/decorators'; -import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; +import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; +import { LinkedList } from 'vs/base/common/linkedList'; export namespace EventType { export const Tap = '-monaco-gesturetap'; @@ -71,11 +72,11 @@ export class Gesture extends Disposable { private static readonly HOLD_DELAY = 700; private dispatched = false; - private targets: HTMLElement[]; - private ignoreTargets: HTMLElement[]; + private readonly targets = new LinkedList(); + private readonly ignoreTargets = new LinkedList(); private handle: IDisposable | null; - private activeTouches: { [id: number]: TouchData }; + private readonly activeTouches: { [id: number]: TouchData }; private _lastSetTapCountTime: number; @@ -87,8 +88,6 @@ export class Gesture extends Disposable { this.activeTouches = {}; this.handle = null; - this.targets = []; - this.ignoreTargets = []; this._lastSetTapCountTime = 0; this._register(DomUtils.addDisposableListener(document, 'touchstart', (e: TouchEvent) => this.onTouchStart(e), { passive: false })); this._register(DomUtils.addDisposableListener(document, 'touchend', (e: TouchEvent) => this.onTouchEnd(e))); @@ -103,13 +102,8 @@ export class Gesture extends Disposable { Gesture.INSTANCE = new Gesture(); } - Gesture.INSTANCE.targets.push(element); - - return { - dispose: () => { - Gesture.INSTANCE.targets = Gesture.INSTANCE.targets.filter(t => t !== element); - } - }; + const remove = Gesture.INSTANCE.targets.push(element); + return toDisposable(remove); } public static ignoreTarget(element: HTMLElement): IDisposable { @@ -120,13 +114,8 @@ export class Gesture extends Disposable { Gesture.INSTANCE = new Gesture(); } - Gesture.INSTANCE.ignoreTargets.push(element); - - return { - dispose: () => { - Gesture.INSTANCE.ignoreTargets = Gesture.INSTANCE.ignoreTargets.filter(t => t !== element); - } - }; + const remove = Gesture.INSTANCE.ignoreTargets.push(element); + return toDisposable(remove); } @memoize @@ -146,7 +135,7 @@ export class Gesture extends Disposable { } private onTouchStart(e: TouchEvent): void { - let timestamp = Date.now(); // use Date.now() because on FF e.timeStamp is not epoch based. + const timestamp = Date.now(); // use Date.now() because on FF e.timeStamp is not epoch based. if (this.handle) { this.handle.dispose(); @@ -154,7 +143,7 @@ export class Gesture extends Disposable { } for (let i = 0, len = e.targetTouches.length; i < len; i++) { - let touch = e.targetTouches.item(i); + const touch = e.targetTouches.item(i); this.activeTouches[touch.identifier] = { id: touch.identifier, @@ -167,7 +156,7 @@ export class Gesture extends Disposable { rollingPageY: [touch.pageY] }; - let evt = this.newGestureEvent(EventType.Start, touch.target); + const evt = this.newGestureEvent(EventType.Start, touch.target); evt.pageX = touch.pageX; evt.pageY = touch.pageY; this.dispatchEvent(evt); @@ -181,27 +170,27 @@ export class Gesture extends Disposable { } private onTouchEnd(e: TouchEvent): void { - let timestamp = Date.now(); // use Date.now() because on FF e.timeStamp is not epoch based. + const timestamp = Date.now(); // use Date.now() because on FF e.timeStamp is not epoch based. - let activeTouchCount = Object.keys(this.activeTouches).length; + const activeTouchCount = Object.keys(this.activeTouches).length; for (let i = 0, len = e.changedTouches.length; i < len; i++) { - let touch = e.changedTouches.item(i); + const touch = e.changedTouches.item(i); if (!this.activeTouches.hasOwnProperty(String(touch.identifier))) { console.warn('move of an UNKNOWN touch', touch); continue; } - let data = this.activeTouches[touch.identifier], + const data = this.activeTouches[touch.identifier], holdTime = Date.now() - data.initialTimeStamp; if (holdTime < Gesture.HOLD_DELAY && Math.abs(data.initialPageX - arrays.tail(data.rollingPageX)) < 30 && Math.abs(data.initialPageY - arrays.tail(data.rollingPageY)) < 30) { - let evt = this.newGestureEvent(EventType.Tap, data.initialTarget); + const evt = this.newGestureEvent(EventType.Tap, data.initialTarget); evt.pageX = arrays.tail(data.rollingPageX); evt.pageY = arrays.tail(data.rollingPageY); this.dispatchEvent(evt); @@ -210,21 +199,21 @@ export class Gesture extends Disposable { && Math.abs(data.initialPageX - arrays.tail(data.rollingPageX)) < 30 && Math.abs(data.initialPageY - arrays.tail(data.rollingPageY)) < 30) { - let evt = this.newGestureEvent(EventType.Contextmenu, data.initialTarget); + const evt = this.newGestureEvent(EventType.Contextmenu, data.initialTarget); evt.pageX = arrays.tail(data.rollingPageX); evt.pageY = arrays.tail(data.rollingPageY); this.dispatchEvent(evt); } else if (activeTouchCount === 1) { - let finalX = arrays.tail(data.rollingPageX); - let finalY = arrays.tail(data.rollingPageY); + const finalX = arrays.tail(data.rollingPageX); + const finalY = arrays.tail(data.rollingPageY); - let deltaT = arrays.tail(data.rollingTimestamps) - data.rollingTimestamps[0]; - let deltaX = finalX - data.rollingPageX[0]; - let deltaY = finalY - data.rollingPageY[0]; + const deltaT = arrays.tail(data.rollingTimestamps) - data.rollingTimestamps[0]; + const deltaX = finalX - data.rollingPageX[0]; + const deltaY = finalY - data.rollingPageY[0]; // We need to get all the dispatch targets on the start of the inertia event - const dispatchTo = this.targets.filter(t => data.initialTarget instanceof Node && t.contains(data.initialTarget)); + const dispatchTo = [...this.targets].filter(t => data.initialTarget instanceof Node && t.contains(data.initialTarget)); this.inertia(dispatchTo, timestamp, // time now Math.abs(deltaX) / deltaT, // speed deltaX > 0 ? 1 : -1, // x direction @@ -249,7 +238,7 @@ export class Gesture extends Disposable { } private newGestureEvent(type: string, initialTarget?: EventTarget): GestureEvent { - let event = document.createEvent('CustomEvent') as unknown as GestureEvent; + const event = document.createEvent('CustomEvent') as unknown as GestureEvent; event.initEvent(type, false, true); event.initialTarget = initialTarget; event.tapCount = 0; @@ -273,28 +262,30 @@ export class Gesture extends Disposable { this._lastSetTapCountTime = 0; } - for (let i = 0; i < this.ignoreTargets.length; i++) { - if (event.initialTarget instanceof Node && this.ignoreTargets[i].contains(event.initialTarget)) { - return; + if (event.initialTarget instanceof Node) { + for (const ignoreTarget of this.ignoreTargets) { + if (ignoreTarget.contains(event.initialTarget)) { + return; + } + } + + for (const target of this.targets) { + if (target.contains(event.initialTarget)) { + target.dispatchEvent(event); + this.dispatched = true; + } } } - - this.targets.forEach(target => { - if (event.initialTarget instanceof Node && target.contains(event.initialTarget)) { - target.dispatchEvent(event); - this.dispatched = true; - } - }); } - private inertia(dispatchTo: EventTarget[], t1: number, vX: number, dirX: number, x: number, vY: number, dirY: number, y: number): void { + private inertia(dispatchTo: readonly EventTarget[], t1: number, vX: number, dirX: number, x: number, vY: number, dirY: number, y: number): void { this.handle = DomUtils.scheduleAtNextAnimationFrame(() => { - let now = Date.now(); + const now = Date.now(); // velocity: old speed + accel_over_time - let deltaT = now - t1, - delta_pos_x = 0, delta_pos_y = 0, - stopped = true; + const deltaT = now - t1; + let delta_pos_x = 0, delta_pos_y = 0; + let stopped = true; vX += Gesture.SCROLL_FRICTION * deltaT; vY += Gesture.SCROLL_FRICTION * deltaT; @@ -310,7 +301,7 @@ export class Gesture extends Disposable { } // dispatch translation event - let evt = this.newGestureEvent(EventType.Change); + const evt = this.newGestureEvent(EventType.Change); evt.translationX = delta_pos_x; evt.translationY = delta_pos_y; dispatchTo.forEach(d => d.dispatchEvent(evt)); @@ -322,20 +313,20 @@ export class Gesture extends Disposable { } private onTouchMove(e: TouchEvent): void { - let timestamp = Date.now(); // use Date.now() because on FF e.timeStamp is not epoch based. + const timestamp = Date.now(); // use Date.now() because on FF e.timeStamp is not epoch based. for (let i = 0, len = e.changedTouches.length; i < len; i++) { - let touch = e.changedTouches.item(i); + const touch = e.changedTouches.item(i); if (!this.activeTouches.hasOwnProperty(String(touch.identifier))) { console.warn('end of an UNKNOWN touch', touch); continue; } - let data = this.activeTouches[touch.identifier]; + const data = this.activeTouches[touch.identifier]; - let evt = this.newGestureEvent(EventType.Change, data.initialTarget); + const evt = this.newGestureEvent(EventType.Change, data.initialTarget); evt.translationX = touch.pageX - arrays.tail(data.rollingPageX); evt.translationY = touch.pageY - arrays.tail(data.rollingPageY); evt.pageX = touch.pageX; diff --git a/src/vs/base/browser/ui/actionbar/actionViewItems.ts b/src/vs/base/browser/ui/actionbar/actionViewItems.ts index 61340ea1ba2..02e9bc99513 100644 --- a/src/vs/base/browser/ui/actionbar/actionViewItems.ts +++ b/src/vs/base/browser/ui/actionbar/actionViewItems.ts @@ -23,6 +23,7 @@ export interface IBaseActionViewItemOptions { draggable?: boolean; isMenu?: boolean; useEventAsContext?: boolean; + hoverDelegate?: IHoverDelegate; } export class BaseActionViewItem extends Disposable implements IActionViewItem { @@ -32,6 +33,8 @@ export class BaseActionViewItem extends Disposable implements IActionViewItem { _context: unknown; readonly _action: IAction; + private customHover?: ICustomHover; + get action() { return this._action; } @@ -92,10 +95,6 @@ export class BaseActionViewItem extends Disposable implements IActionViewItem { this._actionRunner = actionRunner; } - getAction(): IAction { - return this._action; - } - isEnabled(): boolean { return this._action.enabled; } @@ -210,8 +209,34 @@ export class BaseActionViewItem extends Disposable implements IActionViewItem { // implement in subclass } + protected getTooltip(): string | undefined { + return this.action.tooltip; + } + protected updateTooltip(): void { - // implement in subclass + if (!this.element) { + return; + } + const title = this.getTooltip() ?? ''; + this.updateAriaLabel(); + if (!this.options.hoverDelegate) { + this.element.title = title; + } else { + this.element.title = ''; + if (!this.customHover) { + this.customHover = setupCustomHover(this.options.hoverDelegate, this.element, title); + this._store.add(this.customHover); + } else { + this.customHover.update(title); + } + } + } + + protected updateAriaLabel(): void { + if (this.element) { + const title = this.getTooltip() ?? ''; + this.element.setAttribute('aria-label', title); + } } protected updateClass(): void { @@ -236,7 +261,6 @@ export interface IActionViewItemOptions extends IBaseActionViewItemOptions { icon?: boolean; label?: boolean; keybinding?: string | null; - hoverDelegate?: IHoverDelegate; } export class ActionViewItem extends BaseActionViewItem { @@ -245,7 +269,6 @@ export class ActionViewItem extends BaseActionViewItem { protected override options: IActionViewItemOptions; private cssClass?: string; - private customHover?: ICustomHover; constructor(context: unknown, action: IAction, options: IActionViewItemOptions = {}) { super(context, action, options); @@ -313,41 +336,24 @@ export class ActionViewItem extends BaseActionViewItem { override updateLabel(): void { if (this.options.label && this.label) { - this.label.textContent = this.getAction().label; + this.label.textContent = this.action.label; } } - override updateTooltip(): void { + override getTooltip() { let title: string | null = null; - if (this.getAction().tooltip) { - title = this.getAction().tooltip; + if (this.action.tooltip) { + title = this.action.tooltip; - } else if (!this.options.label && this.getAction().label && this.options.icon) { - title = this.getAction().label; + } else if (!this.options.label && this.action.label && this.options.icon) { + title = this.action.label; if (this.options.keybinding) { title = nls.localize({ key: 'titleLabel', comment: ['action title', 'action keybinding'] }, "{0} ({1})", title, this.options.keybinding); } } - this._applyUpdateTooltip(title); - } - - protected _applyUpdateTooltip(title: string | undefined | null): void { - if (title && this.label) { - this.label.setAttribute('aria-label', title); - if (!this.options.hoverDelegate) { - this.label.title = title; - } else { - this.label.title = ''; - if (!this.customHover) { - this.customHover = setupCustomHover(this.options.hoverDelegate, this.label, title); - this._store.add(this.customHover); - } else { - this.customHover.update(title); - } - } - } + return title ?? undefined; } override updateClass(): void { @@ -356,7 +362,7 @@ export class ActionViewItem extends BaseActionViewItem { } if (this.options.icon) { - this.cssClass = this.getAction().class; + this.cssClass = this.action.class; if (this.label) { this.label.classList.add('codicon'); @@ -367,37 +373,38 @@ export class ActionViewItem extends BaseActionViewItem { this.updateEnabled(); } else { - if (this.label) { - this.label.classList.remove('codicon'); - } + this.label?.classList.remove('codicon'); } } override updateEnabled(): void { - if (this.getAction().enabled) { + if (this.action.enabled) { if (this.label) { this.label.removeAttribute('aria-disabled'); this.label.classList.remove('disabled'); } - if (this.element) { - this.element.classList.remove('disabled'); - } + this.element?.classList.remove('disabled'); } else { if (this.label) { this.label.setAttribute('aria-disabled', 'true'); this.label.classList.add('disabled'); } - if (this.element) { - this.element.classList.add('disabled'); - } + this.element?.classList.add('disabled'); + } + } + + override updateAriaLabel(): void { + if (this.label) { + const title = this.getTooltip() ?? ''; + this.label.setAttribute('aria-label', title); } } override updateChecked(): void { if (this.label) { - if (this.getAction().checked) { + if (this.action.checked) { this.label.classList.add('checked'); } else { this.label.classList.remove('checked'); @@ -428,9 +435,11 @@ export class SelectActionViewItem extends BaseActionViewItem { } private registerListeners(): void { - this._register(this.selectBox.onDidSelect(e => { - this.actionRunner.run(this._action, this.getActionContext(e.selected, e.index)); - })); + this._register(this.selectBox.onDidSelect(e => this.runAction(e.selected, e.index))); + } + + protected runAction(option: string, index: number): void { + this.actionRunner.run(this._action, this.getActionContext(option, index)); } protected getActionContext(option: string, index: number) { @@ -442,15 +451,11 @@ export class SelectActionViewItem extends BaseActionViewItem { } override focus(): void { - if (this.selectBox) { - this.selectBox.focus(); - } + this.selectBox?.focus(); } override blur(): void { - if (this.selectBox) { - this.selectBox.blur(); - } + this.selectBox?.blur(); } override render(container: HTMLElement): void { diff --git a/src/vs/base/browser/ui/actionbar/actionbar.css b/src/vs/base/browser/ui/actionbar/actionbar.css index 4d210d5c16a..45e5f3800a3 100644 --- a/src/vs/base/browser/ui/actionbar/actionbar.css +++ b/src/vs/base/browser/ui/actionbar/actionbar.css @@ -46,6 +46,7 @@ } .monaco-action-bar .action-label { + display: flex; font-size: 11px; padding: 3px; border-radius: 5px; @@ -105,6 +106,12 @@ display: flex; } -.monaco-action-bar .action-item.action-dropdown-item > .action-label { - margin-right: 1px; +.monaco-action-bar .action-item.action-dropdown-item > .action-dropdown-item-separator { + display: flex; + align-items: center; + cursor: default; +} + +.monaco-action-bar .action-item.action-dropdown-item > .action-dropdown-item-separator > div { + width: 1px; } diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts index 7280c8a4737..a0f509ed0ae 100644 --- a/src/vs/base/browser/ui/actionbar/actionbar.ts +++ b/src/vs/base/browser/ui/actionbar/actionbar.ts @@ -10,7 +10,7 @@ import { IHoverDelegate } from 'vs/base/browser/ui/iconLabel/iconHoverDelegate'; import { ActionRunner, IAction, IActionRunner, IRunEvent, Separator } from 'vs/base/common/actions'; import { Emitter } from 'vs/base/common/event'; import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; -import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle'; +import { Disposable, DisposableMap, DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle'; import * as types from 'vs/base/common/types'; import 'vs/css!./actionbar'; @@ -62,17 +62,17 @@ export class ActionBar extends Disposable implements IActionRunner { private readonly options: IActionBarOptions; private _actionRunner: IActionRunner; + private readonly _actionRunnerDisposables = this._register(new DisposableStore()); private _context: unknown; private readonly _orientation: ActionsOrientation; private readonly _triggerKeys: { keys: KeyCode[]; keyDown: boolean; }; - private _actionIds: string[]; // View Items viewItems: IActionViewItem[]; - private viewItemDisposables: Map; + private readonly viewItemDisposables = this._register(new DisposableMap()); private previouslyFocusedItem?: number; protected focusedItem?: number; private focusTracker: DOM.IFocusTracker; @@ -96,8 +96,8 @@ export class ActionBar extends Disposable implements IActionRunner { private _onDidRun = this._register(new Emitter()); readonly onDidRun = this._onDidRun.event; - private _onBeforeRun = this._register(new Emitter()); - readonly onBeforeRun = this._onBeforeRun.event; + private _onWillRun = this._register(new Emitter()); + readonly onWillRun = this._onWillRun.event; constructor(container: HTMLElement, options: IActionBarOptions = {}) { super(); @@ -114,15 +114,13 @@ export class ActionBar extends Disposable implements IActionRunner { this._actionRunner = this.options.actionRunner; } else { this._actionRunner = new ActionRunner(); - this._register(this._actionRunner); + this._actionRunnerDisposables.add(this._actionRunner); } - this._register(this._actionRunner.onDidRun(e => this._onDidRun.fire(e))); - this._register(this._actionRunner.onBeforeRun(e => this._onBeforeRun.fire(e))); + this._actionRunnerDisposables.add(this._actionRunner.onDidRun(e => this._onDidRun.fire(e))); + this._actionRunnerDisposables.add(this._actionRunner.onWillRun(e => this._onWillRun.fire(e))); - this._actionIds = []; this.viewItems = []; - this.viewItemDisposables = new Map(); this.focusedItem = undefined; this.domNode = document.createElement('div'); @@ -294,10 +292,14 @@ export class ActionBar extends Disposable implements IActionRunner { } set actionRunner(actionRunner: IActionRunner) { - if (actionRunner) { - this._actionRunner = actionRunner; - this.viewItems.forEach(item => item.actionRunner = actionRunner); - } + this._actionRunner = actionRunner; + + // when setting a new `IActionRunner` make sure to dispose old listeners and + // start to forward events from the new listener + this._actionRunnerDisposables.clear(); + this._actionRunnerDisposables.add(this._actionRunner.onDidRun(e => this._onDidRun.fire(e))); + this._actionRunnerDisposables.add(this._actionRunner.onWillRun(e => this._onWillRun.fire(e))); + this.viewItems.forEach(item => item.actionRunner = actionRunner); } getContainer(): HTMLElement { @@ -305,11 +307,32 @@ export class ActionBar extends Disposable implements IActionRunner { } hasAction(action: IAction): boolean { - return this._actionIds.includes(action.id); + return this.viewItems.findIndex(candidate => candidate.action.id === action.id) !== -1; } - getAction(index: number): IAction { - return this.viewItems[index].action; + getAction(indexOrElement: number | HTMLElement): IAction | undefined { + + // by index + if (typeof indexOrElement === 'number') { + return this.viewItems[indexOrElement]?.action; + } + + // by element + if (indexOrElement instanceof HTMLElement) { + while (indexOrElement.parentElement !== this.actionsList) { + if (!indexOrElement.parentElement) { + return undefined; + } + indexOrElement = indexOrElement.parentElement; + } + for (let i = 0; i < this.actionsList.childNodes.length; i++) { + if (this.actionsList.childNodes[i] === indexOrElement) { + return this.viewItems[i].action; + } + } + } + + return undefined; } push(arg: IAction | ReadonlyArray, options: IActionOptions = {}): void { @@ -351,11 +374,9 @@ export class ActionBar extends Disposable implements IActionRunner { if (index === null || index < 0 || index >= this.actionsList.children.length) { this.actionsList.appendChild(actionViewItemElement); this.viewItems.push(item); - this._actionIds.push(action.id); } else { this.actionsList.insertBefore(actionViewItemElement, this.actionsList.children[index]); this.viewItems.splice(index, 0, item); - this._actionIds.splice(index, 0, action.id); index++; } }); @@ -391,20 +412,15 @@ export class ActionBar extends Disposable implements IActionRunner { pull(index: number): void { if (index >= 0 && index < this.viewItems.length) { this.actionsList.removeChild(this.actionsList.childNodes[index]); - this.viewItemDisposables.get(this.viewItems[index])?.dispose(); - this.viewItemDisposables.delete(this.viewItems[index]); + this.viewItemDisposables.deleteAndDispose(this.viewItems[index]); dispose(this.viewItems.splice(index, 1)); - this._actionIds.splice(index, 1); this.refreshRole(); } } clear(): void { - dispose(this.viewItems); - this.viewItemDisposables.forEach(d => d.dispose()); - this.viewItemDisposables.clear(); - this.viewItems = []; - this._actionIds = []; + this.viewItems = dispose(this.viewItems); + this.viewItemDisposables.clearAndDisposeAll(); DOM.clearNode(this.actionsList); this.refreshRole(); } @@ -559,13 +575,8 @@ export class ActionBar extends Disposable implements IActionRunner { } override dispose(): void { - dispose(this.viewItems); - this.viewItems = []; - - this._actionIds = []; - + this.viewItems = dispose(this.viewItems); this.getContainer().remove(); - super.dispose(); } } diff --git a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css index 3cd0166692f..4a3cf074790 100644 --- a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css +++ b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css @@ -6,7 +6,6 @@ .monaco-breadcrumbs { user-select: none; -webkit-user-select: none; - -ms-user-select: none; display: flex; flex-direction: row; flex-wrap: nowrap; diff --git a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts index 2ea4bc96091..be32475e007 100644 --- a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts +++ b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts @@ -170,7 +170,7 @@ export class BreadcrumbsWidget { } domFocus(): void { - let idx = this._focusedItemIdx >= 0 ? this._focusedItemIdx : this._items.length - 1; + const idx = this._focusedItemIdx >= 0 ? this._focusedItemIdx : this._items.length - 1; if (idx >= 0 && idx < this._items.length) { this._focus(idx, undefined); } else { @@ -226,7 +226,7 @@ export class BreadcrumbsWidget { } reveal(item: BreadcrumbsItem): void { - let idx = this._items.indexOf(item); + const idx = this._items.indexOf(item); if (idx >= 0) { this._reveal(idx, false); } @@ -281,7 +281,7 @@ export class BreadcrumbsWidget { dispose(removed); this._focus(-1, undefined); } catch (e) { - let newError = new Error(`BreadcrumbsItem#setItems: newItems: ${items.length}, prefix: ${prefix}, removed: ${removed.length}`); + const newError = new Error(`BreadcrumbsItem#setItems: newItems: ${items.length}, prefix: ${prefix}, removed: ${removed.length}`); newError.name = e.name; newError.stack = e.stack; throw newError; @@ -291,8 +291,8 @@ export class BreadcrumbsWidget { private _render(start: number): void { let didChange = false; for (; start < this._items.length && start < this._nodes.length; start++) { - let item = this._items[start]; - let node = this._nodes[start]; + const item = this._items[start]; + const node = this._nodes[start]; this._renderItem(item, node); didChange = true; } @@ -308,8 +308,8 @@ export class BreadcrumbsWidget { // case b: more items -> render them for (; start < this._items.length; start++) { - let item = this._items[start]; - let node = this._freeNodes.length > 0 ? this._freeNodes.pop() : document.createElement('div'); + const item = this._items[start]; + const node = this._freeNodes.length > 0 ? this._freeNodes.pop() : document.createElement('div'); if (node) { this._renderItem(item, node); this._domNode.appendChild(node); @@ -343,7 +343,7 @@ export class BreadcrumbsWidget { return; } for (let el: HTMLElement | null = event.target; el; el = el.parentElement) { - let idx = this._nodes.indexOf(el as HTMLDivElement); + const idx = this._nodes.indexOf(el as HTMLDivElement); if (idx >= 0) { this._focus(idx, event); this._select(idx, event); diff --git a/src/vs/base/browser/ui/button/button.css b/src/vs/base/browser/ui/button/button.css index ed4131eefd3..36beeb00478 100644 --- a/src/vs/base/browser/ui/button/button.css +++ b/src/vs/base/browser/ui/button/button.css @@ -8,6 +8,7 @@ display: flex; width: 100%; padding: 4px; + border-radius: 2px; text-align: center; cursor: pointer; justify-content: center; @@ -38,8 +39,36 @@ cursor: pointer; } -.monaco-button-dropdown > .monaco-dropdown-button { - margin-left: 1px; +.monaco-button-dropdown.disabled { + cursor: default; +} + +.monaco-button-dropdown > .monaco-button:focus { + outline-offset: -1px !important; +} + +.monaco-button-dropdown.disabled > .monaco-button.disabled, +.monaco-button-dropdown.disabled > .monaco-button.disabled:focus, +.monaco-button-dropdown.disabled > .monaco-button-dropdown-separator { + opacity: 0.4 !important; +} + +.monaco-button-dropdown > .monaco-button.monaco-text-button { + border-right-width: 0 !important; +} + +.monaco-button-dropdown .monaco-button-dropdown-separator { + padding: 4px 0; + cursor: default; +} + +.monaco-button-dropdown .monaco-button-dropdown-separator > div { + height: 100%; + width: 1px; +} + +.monaco-button-dropdown > .monaco-button.monaco-dropdown-button { + border-left-width: 0 !important; } .monaco-description-button { diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts index 721059b4a27..6a4b19b76a2 100644 --- a/src/vs/base/browser/ui/button/button.ts +++ b/src/vs/base/browser/ui/button/button.ts @@ -15,6 +15,7 @@ import { Emitter, Event as BaseEvent } from 'vs/base/common/event'; import { KeyCode } from 'vs/base/common/keyCodes'; import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; import { mixin } from 'vs/base/common/objects'; +import { localize } from 'vs/nls'; import 'vs/css!./button'; export interface IButtonOptions extends IButtonStyles { @@ -27,6 +28,7 @@ export interface IButtonStyles { buttonBackground?: Color; buttonHoverBackground?: Color; buttonForeground?: Color; + buttonSeparator?: Color; buttonSecondaryBackground?: Color; buttonSecondaryHoverBackground?: Color; buttonSecondaryForeground?: Color; @@ -36,6 +38,7 @@ export interface IButtonStyles { const defaultOptions: IButtonStyles = { buttonBackground: Color.fromHex('#0E639C'), buttonHoverBackground: Color.fromHex('#006BB3'), + buttonSeparator: Color.white, buttonForeground: Color.white }; @@ -136,8 +139,8 @@ export class Button extends Disposable implements IButton { // Also set hover background when button is focused for feedback this.focusTracker = this._register(trackFocus(this._element)); - this._register(this.focusTracker.onDidFocus(() => this.setHoverBackground())); - this._register(this.focusTracker.onDidBlur(() => this.applyStyles())); // restore standard styles + this._register(this.focusTracker.onDidFocus(() => { if (this.enabled) { this.setHoverBackground(); } })); + this._register(this.focusTracker.onDidBlur(() => { if (this.enabled) { this.applyStyles(); } })); this.applyStyles(); } @@ -195,7 +198,26 @@ export class Button extends Disposable implements IButton { set label(value: string) { this._element.classList.add('monaco-text-button'); if (this.options.supportIcons) { - reset(this._element, ...renderLabelWithIcons(value)); + const content: HTMLSpanElement[] = []; + for (let segment of renderLabelWithIcons(value)) { + if (typeof (segment) === 'string') { + segment = segment.trim(); + + // Ignore empty segment + if (segment === '') { + continue; + } + + // Convert string segments to nodes + const node = document.createElement('span'); + node.textContent = segment; + content.push(node); + } else { + content.push(segment); + } + } + + reset(this._element, ...content); } else { this._element.textContent = value; } @@ -238,6 +260,7 @@ export interface IButtonWithDropdownOptions extends IButtonOptions { readonly contextMenuProvider: IContextMenuProvider; readonly actions: IAction[]; readonly actionRunner?: IActionRunner; + readonly addPrimaryActionToDropdown?: boolean; } export class ButtonWithDropdown extends Disposable implements IButton { @@ -245,6 +268,8 @@ export class ButtonWithDropdown extends Disposable implements IButton { private readonly button: Button; private readonly action: Action; private readonly dropdownButton: Button; + private readonly separatorContainer: HTMLDivElement; + private readonly separator: HTMLDivElement; readonly element: HTMLElement; private readonly _onDidClick = this._register(new Emitter()); @@ -261,13 +286,23 @@ export class ButtonWithDropdown extends Disposable implements IButton { this._register(this.button.onDidClick(e => this._onDidClick.fire(e))); this.action = this._register(new Action('primaryAction', this.button.label, undefined, true, async () => this._onDidClick.fire(undefined))); + this.separatorContainer = document.createElement('div'); + this.separatorContainer.classList.add('monaco-button-dropdown-separator'); + + this.separator = document.createElement('div'); + this.separatorContainer.appendChild(this.separator); + this.element.appendChild(this.separatorContainer); + this.dropdownButton = this._register(new Button(this.element, { ...options, title: false, supportIcons: true })); + this.dropdownButton.element.title = localize("button dropdown more actions", 'More Actions...'); + this.dropdownButton.element.setAttribute('aria-haspopup', 'true'); + this.dropdownButton.element.setAttribute('aria-expanded', 'false'); this.dropdownButton.element.classList.add('monaco-dropdown-button'); this.dropdownButton.icon = Codicon.dropDownButton; this._register(this.dropdownButton.onDidClick(e => { options.contextMenuProvider.showContextMenu({ getAnchor: () => this.dropdownButton.element, - getActions: () => [this.action, ...options.actions], + getActions: () => options.addPrimaryActionToDropdown === false ? [...options.actions] : [this.action, ...options.actions], actionRunner: options.actionRunner, onHide: () => this.dropdownButton.element.setAttribute('aria-expanded', 'false') }); @@ -287,6 +322,8 @@ export class ButtonWithDropdown extends Disposable implements IButton { set enabled(enabled: boolean) { this.button.enabled = enabled; this.dropdownButton.enabled = enabled; + + this.element.classList.toggle('disabled', !enabled); } get enabled(): boolean { @@ -296,6 +333,20 @@ export class ButtonWithDropdown extends Disposable implements IButton { style(styles: IButtonStyles): void { this.button.style(styles); this.dropdownButton.style(styles); + + // Separator + const border = styles.buttonBorder ? styles.buttonBorder.toString() : ''; + + this.separatorContainer.style.borderTopWidth = border ? '1px' : ''; + this.separatorContainer.style.borderTopStyle = border ? 'solid' : ''; + this.separatorContainer.style.borderTopColor = border; + + this.separatorContainer.style.borderBottomWidth = border ? '1px' : ''; + this.separatorContainer.style.borderBottomStyle = border ? 'solid' : ''; + this.separatorContainer.style.borderBottomColor = border; + + this.separatorContainer.style.backgroundColor = styles.buttonBackground?.toString() ?? ''; + this.separator.style.backgroundColor = styles.buttonSeparator?.toString() ?? ''; } focus(): void { @@ -319,12 +370,10 @@ export class ButtonWithDescription extends Button implements IButtonWithDescript this._labelElement = document.createElement('div'); this._labelElement.classList.add('monaco-button-label'); - this._labelElement.tabIndex = -1; this._element.appendChild(this._labelElement); this._descriptionElement = document.createElement('div'); this._descriptionElement.classList.add('monaco-button-description'); - this._descriptionElement.tabIndex = -1; this._element.appendChild(this._descriptionElement); } diff --git a/src/vs/base/browser/ui/centered/centeredViewLayout.ts b/src/vs/base/browser/ui/centered/centeredViewLayout.ts index b16ac4334ca..b746382e57a 100644 --- a/src/vs/base/browser/ui/centered/centeredViewLayout.ts +++ b/src/vs/base/browser/ui/centered/centeredViewLayout.ts @@ -159,9 +159,7 @@ export class CenteredViewLayout implements IDisposable { this.container.removeChild(this.splitView.el); } this.splitViewDisposables.clear(); - if (this.splitView) { - this.splitView.dispose(); - } + this.splitView?.dispose(); this.splitView = undefined; this.emptyViews = undefined; this.container.appendChild(this.view.element); diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.css b/src/vs/base/browser/ui/codicons/codicon/codicon.css index acfc8297605..02154e77b68 100644 --- a/src/vs/base/browser/ui/codicons/codicon/codicon.css +++ b/src/vs/base/browser/ui/codicons/codicon/codicon.css @@ -20,7 +20,6 @@ -moz-osx-font-smoothing: grayscale; user-select: none; -webkit-user-select: none; - -ms-user-select: none; } /* icon rules are dynamically created by the platform theme service (see iconsStyleSheet.ts) */ diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf index 2c1c167368c..bab11139af8 100644 Binary files a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf and b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf differ diff --git a/src/vs/base/browser/ui/contextview/contextview.css b/src/vs/base/browser/ui/contextview/contextview.css index bb7ebbcfdb2..cca41507ae9 100644 --- a/src/vs/base/browser/ui/contextview/contextview.css +++ b/src/vs/base/browser/ui/contextview/contextview.css @@ -5,7 +5,6 @@ .context-view { position: absolute; - z-index: 2500; } .context-view.fixed { @@ -13,6 +12,5 @@ font-family: inherit; font-size: 13px; position: fixed; - z-index: 2500; color: inherit; } diff --git a/src/vs/base/browser/ui/contextview/contextview.ts b/src/vs/base/browser/ui/contextview/contextview.ts index 1aa24bde272..27958b235af 100644 --- a/src/vs/base/browser/ui/contextview/contextview.ts +++ b/src/vs/base/browser/ui/contextview/contextview.ts @@ -206,7 +206,7 @@ export class ContextView extends Disposable { this.view.className = 'context-view'; this.view.style.top = '0px'; this.view.style.left = '0px'; - this.view.style.zIndex = '2500'; + this.view.style.zIndex = '2575'; this.view.style.position = this.useFixedPosition ? 'fixed' : 'absolute'; DOM.show(this.view); @@ -220,9 +220,7 @@ export class ContextView extends Disposable { this.doLayout(); // Focus - if (this.delegate.focus) { - this.delegate.focus(); - } + this.delegate.focus?.(); } getViewElement(): HTMLElement { @@ -253,14 +251,14 @@ export class ContextView extends Disposable { } // Get anchor - let anchor = this.delegate!.getAnchor(); + const anchor = this.delegate!.getAnchor(); // Compute around let around: IView; // Get the element's position and size (to anchor the view) if (DOM.isHTMLElement(anchor)) { - let elementPosition = DOM.getDomNodePagePosition(anchor); + const elementPosition = DOM.getDomNodePagePosition(anchor); // In areas where zoom is applied to the element or its ancestors, we need to adjust the size of the element // e.g. The title bar has counter zoom behavior meaning it applies the inverse of zoom level. @@ -363,7 +361,7 @@ export class ContextView extends Disposable { } } -let SHADOW_ROOT_CSS = /* css */ ` +const SHADOW_ROOT_CSS = /* css */ ` :host { all: initial; /* 1st rule so subsequent properties are reset. */ } diff --git a/src/vs/base/browser/ui/dialog/dialog.css b/src/vs/base/browser/ui/dialog/dialog.css index 9efe725d04d..9b7681e1fa8 100644 --- a/src/vs/base/browser/ui/dialog/dialog.css +++ b/src/vs/base/browser/ui/dialog/dialog.css @@ -66,7 +66,6 @@ padding-left: 24px; user-select: text; -webkit-user-select: text; - -ms-user-select: text; word-wrap: break-word; /* never overflow long words, but break to next line */ white-space: normal; } @@ -105,7 +104,6 @@ cursor: pointer; user-select: none; -webkit-user-select: none; - -ms-user-select: none; } /** Dialog: Input */ @@ -148,7 +146,6 @@ .monaco-dialog-box > .dialog-buttons-row > .dialog-buttons > .monaco-button { width: fit-content; - width: -moz-fit-content; padding: 5px 10px; overflow: hidden; text-overflow: ellipsis; diff --git a/src/vs/base/browser/ui/dialog/dialog.ts b/src/vs/base/browser/ui/dialog/dialog.ts index 53d63ded4fa..b8f106ef7af 100644 --- a/src/vs/base/browser/ui/dialog/dialog.ts +++ b/src/vs/base/browser/ui/dialog/dialog.ts @@ -165,7 +165,7 @@ export class Dialog extends Disposable { } private getIconAriaLabel(): string { - let typeLabel = nls.localize('dialogInfoMessage', 'Info'); + const typeLabel = nls.localize('dialogInfoMessage', 'Info'); switch (this.options.type) { case 'error': nls.localize('dialogErrorMessage', 'Error'); @@ -427,13 +427,9 @@ export class Dialog extends Disposable { this.element.style.backgroundColor = bgColor?.toString() ?? ''; this.element.style.border = border; - if (this.buttonBar) { - this.buttonBar.buttons.forEach(button => button.style(style)); - } + this.buttonBar?.buttons.forEach(button => button.style(style)); - if (this.checkbox) { - this.checkbox.style(style); - } + this.checkbox?.style(style); if (fgColor && bgColor) { const messageDetailColor = fgColor.transparent(.9); diff --git a/src/vs/base/browser/ui/dropdown/dropdown.ts b/src/vs/base/browser/ui/dropdown/dropdown.ts index b45468dd137..b0f07682dd6 100644 --- a/src/vs/base/browser/ui/dropdown/dropdown.ts +++ b/src/vs/base/browser/ui/dropdown/dropdown.ts @@ -56,8 +56,10 @@ export class BaseDropdown extends ActionRunner { for (const event of [EventType.MOUSE_DOWN, GestureEventType.Tap]) { this._register(addDisposableListener(this._label, event, e => { - if (e instanceof MouseEvent && e.detail > 1) { - return; // prevent multiple clicks to open multiple context menus (https://github.com/microsoft/vscode/issues/41363) + if (e instanceof MouseEvent && (e.detail > 1 || e.button !== 0)) { + // prevent right click trigger to allow separate context menu (https://github.com/microsoft/vscode/issues/151064) + // prevent multiple clicks to open multiple context menus (https://github.com/microsoft/vscode/issues/41363) + return; } if (this.visible) { @@ -190,9 +192,7 @@ export class Dropdown extends BaseDropdown { override hide(): void { super.hide(); - if (this.contextViewProvider) { - this.contextViewProvider.hideContextView(); - } + this.contextViewProvider?.hideContextView(); } protected renderContents(container: HTMLElement): IDisposable | null { diff --git a/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts b/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts index 0af76e3b6a0..75d35b2b4d7 100644 --- a/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts +++ b/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts @@ -3,8 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import * as nls from 'vs/nls'; import { IContextMenuProvider } from 'vs/base/browser/contextmenu'; -import { $, addDisposableListener, append, EventType } from 'vs/base/browser/dom'; +import { $, addDisposableListener, append, EventType, h } from 'vs/base/browser/dom'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar'; import { ActionViewItem, BaseActionViewItem, IActionViewItemOptions, IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems'; @@ -126,9 +127,22 @@ export class DropdownMenuActionViewItem extends BaseActionViewItem { }; } + this.updateTooltip(); this.updateEnabled(); } + override getTooltip(): string | undefined { + let title: string | null = null; + + if (this.action.tooltip) { + title = this.action.tooltip; + } else if (this.action.label) { + title = this.action.label; + } + + return title ?? undefined; + } + override setActionContext(newContext: unknown): void { super.setActionContext(newContext); @@ -142,13 +156,11 @@ export class DropdownMenuActionViewItem extends BaseActionViewItem { } show(): void { - if (this.dropdownMenu) { - this.dropdownMenu.show(); - } + this.dropdownMenu?.show(); } protected override updateEnabled(): void { - const disabled = !this.getAction().enabled; + const disabled = !this.action.enabled; this.actionItem?.classList.toggle('disabled', disabled); this.element?.classList.toggle('disabled', disabled); } @@ -182,7 +194,13 @@ export class ActionWithDropdownActionViewItem extends ActionViewItem { return Array.isArray(actionsProvider) ? actionsProvider : (actionsProvider as IActionProvider).getActions(); // TODO: microsoft/TypeScript#42768 } }; - this.dropdownMenuActionViewItem = new DropdownMenuActionViewItem(this._register(new Action('dropdownAction', undefined)), menuActionsProvider, this.contextMenuProvider, { classNames: ['dropdown', ...Codicon.dropDownButton.classNamesArray, ...(this.options).menuActionClassNames || []] }); + + const menuActionClassNames = (this.options).menuActionClassNames || []; + const separator = h('div.action-dropdown-item-separator', [h('div', {})]).root; + separator.classList.toggle('prominent', menuActionClassNames.includes('prominent')); + append(this.element, separator); + + this.dropdownMenuActionViewItem = new DropdownMenuActionViewItem(this._register(new Action('dropdownAction', nls.localize('moreActions', "More Actions..."))), menuActionsProvider, this.contextMenuProvider, { classNames: ['dropdown', ...Codicon.dropDownButton.classNamesArray, ...menuActionClassNames] }); this.dropdownMenuActionViewItem.render(this.element); this._register(addDisposableListener(this.element, EventType.KEY_DOWN, e => { diff --git a/src/vs/base/browser/ui/findinput/findInput.ts b/src/vs/base/browser/ui/findinput/findInput.ts index bc23ea46c6b..d9809ddf156 100644 --- a/src/vs/base/browser/ui/findinput/findInput.ts +++ b/src/vs/base/browser/ui/findinput/findInput.ts @@ -6,7 +6,7 @@ import * as dom from 'vs/base/browser/dom'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { IMouseEvent } from 'vs/base/browser/mouseEvent'; -import { IToggleStyles } from 'vs/base/browser/ui/toggle/toggle'; +import { IToggleStyles, Toggle } from 'vs/base/browser/ui/toggle/toggle'; import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview'; import { CaseSensitiveToggle, RegexToggle, WholeWordsToggle } from 'vs/base/browser/ui/findinput/findInputToggles'; import { HistoryInputBox, IInputBoxStyles, IInputValidator, IMessage as InputBoxMessage } from 'vs/base/browser/ui/inputbox/inputBox'; @@ -16,6 +16,7 @@ import { Emitter, Event } from 'vs/base/common/event'; import { KeyCode } from 'vs/base/common/keyCodes'; import 'vs/css!./findInput'; import * as nls from 'vs/nls'; +import { DisposableStore } from 'vs/base/common/lifecycle'; export interface IFindInputOptions extends IFindInputStyles { @@ -27,10 +28,12 @@ export interface IFindInputOptions extends IFindInputStyles { readonly flexibleWidth?: boolean; readonly flexibleMaxHeight?: number; + readonly showCommonFindToggles?: boolean; readonly appendCaseSensitiveLabel?: string; readonly appendWholeWordsLabel?: string; readonly appendRegexLabel?: string; readonly history?: string[]; + readonly additionalToggles?: Toggle[]; readonly showHistoryHint?: () => boolean; } @@ -46,12 +49,13 @@ export class FindInput extends Widget { static readonly OPTION_CHANGE: string = 'optionChange'; - private contextViewProvider: IContextViewProvider; private placeholder: string; private validation?: IInputValidator; private label: string; + private readonly showCommonFindToggles: boolean; private fixFocusOnOptionClickEnabled = true; private imeSessionInProgress = false; + private additionalTogglesDisposables: DisposableStore = new DisposableStore(); protected inputActiveOptionBorder?: Color; protected inputActiveOptionForeground?: Color; @@ -70,12 +74,13 @@ export class FindInput extends Widget { protected inputValidationErrorBackground?: Color; protected inputValidationErrorForeground?: Color; - protected controls: HTMLDivElement; - protected regex: RegexToggle; - protected wholeWords: WholeWordsToggle; - protected caseSensitive: CaseSensitiveToggle; - public domNode: HTMLElement; - public inputBox: HistoryInputBox; + protected readonly controls: HTMLDivElement; + protected readonly regex?: RegexToggle; + protected readonly wholeWords?: WholeWordsToggle; + protected readonly caseSensitive?: CaseSensitiveToggle; + protected additionalToggles: Toggle[] = []; + public readonly domNode: HTMLElement; + public readonly inputBox: HistoryInputBox; private readonly _onDidOptionChange = this._register(new Emitter()); public readonly onDidOptionChange: Event = this._onDidOptionChange.event; @@ -98,12 +103,12 @@ export class FindInput extends Widget { private _onRegexKeyDown = this._register(new Emitter()); public readonly onRegexKeyDown: Event = this._onRegexKeyDown.event; - constructor(parent: HTMLElement | null, contextViewProvider: IContextViewProvider, private readonly _showOptionButtons: boolean, options: IFindInputOptions) { + constructor(parent: HTMLElement | null, contextViewProvider: IContextViewProvider | undefined, options: IFindInputOptions) { super(); - this.contextViewProvider = contextViewProvider; this.placeholder = options.placeholder || ''; this.validation = options.validation; this.label = options.label || NLS_DEFAULT_LABEL; + this.showCommonFindToggles = !!options.showCommonFindToggles; this.inputActiveOptionBorder = options.inputActiveOptionBorder; this.inputActiveOptionForeground = options.inputActiveOptionForeground; @@ -133,7 +138,7 @@ export class FindInput extends Widget { this.domNode = document.createElement('div'); this.domNode.classList.add('monaco-findInput'); - this.inputBox = this._register(new HistoryInputBox(this.domNode, this.contextViewProvider, { + this.inputBox = this._register(new HistoryInputBox(this.domNode, contextViewProvider, { placeholder: this.placeholder || '', ariaLabel: this.label || '', validationOptions: { @@ -158,103 +163,108 @@ export class FindInput extends Widget { flexibleMaxHeight })); - this.regex = this._register(new RegexToggle({ - appendTitle: appendRegexLabel, - isChecked: false, - inputActiveOptionBorder: this.inputActiveOptionBorder, - inputActiveOptionForeground: this.inputActiveOptionForeground, - inputActiveOptionBackground: this.inputActiveOptionBackground - })); - this._register(this.regex.onChange(viaKeyboard => { - this._onDidOptionChange.fire(viaKeyboard); - if (!viaKeyboard && this.fixFocusOnOptionClickEnabled) { - this.inputBox.focus(); - } - this.validate(); - })); - this._register(this.regex.onKeyDown(e => { - this._onRegexKeyDown.fire(e); - })); - - this.wholeWords = this._register(new WholeWordsToggle({ - appendTitle: appendWholeWordsLabel, - isChecked: false, - inputActiveOptionBorder: this.inputActiveOptionBorder, - inputActiveOptionForeground: this.inputActiveOptionForeground, - inputActiveOptionBackground: this.inputActiveOptionBackground - })); - this._register(this.wholeWords.onChange(viaKeyboard => { - this._onDidOptionChange.fire(viaKeyboard); - if (!viaKeyboard && this.fixFocusOnOptionClickEnabled) { - this.inputBox.focus(); - } - this.validate(); - })); - - this.caseSensitive = this._register(new CaseSensitiveToggle({ - appendTitle: appendCaseSensitiveLabel, - isChecked: false, - inputActiveOptionBorder: this.inputActiveOptionBorder, - inputActiveOptionForeground: this.inputActiveOptionForeground, - inputActiveOptionBackground: this.inputActiveOptionBackground - })); - this._register(this.caseSensitive.onChange(viaKeyboard => { - this._onDidOptionChange.fire(viaKeyboard); - if (!viaKeyboard && this.fixFocusOnOptionClickEnabled) { - this.inputBox.focus(); - } - this.validate(); - })); - this._register(this.caseSensitive.onKeyDown(e => { - this._onCaseSensitiveKeyDown.fire(e); - })); - - if (this._showOptionButtons) { - this.inputBox.paddingRight = this.caseSensitive.width() + this.wholeWords.width() + this.regex.width(); - } - - // Arrow-Key support to navigate between options - let indexes = [this.caseSensitive.domNode, this.wholeWords.domNode, this.regex.domNode]; - this.onkeydown(this.domNode, (event: IKeyboardEvent) => { - if (event.equals(KeyCode.LeftArrow) || event.equals(KeyCode.RightArrow) || event.equals(KeyCode.Escape)) { - let index = indexes.indexOf(document.activeElement); - if (index >= 0) { - let newIndex: number = -1; - if (event.equals(KeyCode.RightArrow)) { - newIndex = (index + 1) % indexes.length; - } else if (event.equals(KeyCode.LeftArrow)) { - if (index === 0) { - newIndex = indexes.length - 1; - } else { - newIndex = index - 1; - } - } - - if (event.equals(KeyCode.Escape)) { - indexes[index].blur(); - this.inputBox.focus(); - } else if (newIndex >= 0) { - indexes[newIndex].focus(); - } - - dom.EventHelper.stop(event, true); + if (this.showCommonFindToggles) { + this.regex = this._register(new RegexToggle({ + appendTitle: appendRegexLabel, + isChecked: false, + inputActiveOptionBorder: this.inputActiveOptionBorder, + inputActiveOptionForeground: this.inputActiveOptionForeground, + inputActiveOptionBackground: this.inputActiveOptionBackground + })); + this._register(this.regex.onChange(viaKeyboard => { + this._onDidOptionChange.fire(viaKeyboard); + if (!viaKeyboard && this.fixFocusOnOptionClickEnabled) { + this.inputBox.focus(); } - } - }); + this.validate(); + })); + this._register(this.regex.onKeyDown(e => { + this._onRegexKeyDown.fire(e); + })); + this.wholeWords = this._register(new WholeWordsToggle({ + appendTitle: appendWholeWordsLabel, + isChecked: false, + inputActiveOptionBorder: this.inputActiveOptionBorder, + inputActiveOptionForeground: this.inputActiveOptionForeground, + inputActiveOptionBackground: this.inputActiveOptionBackground + })); + this._register(this.wholeWords.onChange(viaKeyboard => { + this._onDidOptionChange.fire(viaKeyboard); + if (!viaKeyboard && this.fixFocusOnOptionClickEnabled) { + this.inputBox.focus(); + } + this.validate(); + })); + + this.caseSensitive = this._register(new CaseSensitiveToggle({ + appendTitle: appendCaseSensitiveLabel, + isChecked: false, + inputActiveOptionBorder: this.inputActiveOptionBorder, + inputActiveOptionForeground: this.inputActiveOptionForeground, + inputActiveOptionBackground: this.inputActiveOptionBackground + })); + this._register(this.caseSensitive.onChange(viaKeyboard => { + this._onDidOptionChange.fire(viaKeyboard); + if (!viaKeyboard && this.fixFocusOnOptionClickEnabled) { + this.inputBox.focus(); + } + this.validate(); + })); + this._register(this.caseSensitive.onKeyDown(e => { + this._onCaseSensitiveKeyDown.fire(e); + })); + + // Arrow-Key support to navigate between options + const indexes = [this.caseSensitive.domNode, this.wholeWords.domNode, this.regex.domNode]; + this.onkeydown(this.domNode, (event: IKeyboardEvent) => { + if (event.equals(KeyCode.LeftArrow) || event.equals(KeyCode.RightArrow) || event.equals(KeyCode.Escape)) { + const index = indexes.indexOf(document.activeElement); + if (index >= 0) { + let newIndex: number = -1; + if (event.equals(KeyCode.RightArrow)) { + newIndex = (index + 1) % indexes.length; + } else if (event.equals(KeyCode.LeftArrow)) { + if (index === 0) { + newIndex = indexes.length - 1; + } else { + newIndex = index - 1; + } + } + + if (event.equals(KeyCode.Escape)) { + indexes[index].blur(); + this.inputBox.focus(); + } else if (newIndex >= 0) { + indexes[newIndex].focus(); + } + + dom.EventHelper.stop(event, true); + } + } + }); + } this.controls = document.createElement('div'); this.controls.className = 'controls'; - this.controls.style.display = this._showOptionButtons ? 'block' : 'none'; - this.controls.appendChild(this.caseSensitive.domNode); - this.controls.appendChild(this.wholeWords.domNode); - this.controls.appendChild(this.regex.domNode); - - this.domNode.appendChild(this.controls); - - if (parent) { - parent.appendChild(this.domNode); + this.controls.style.display = this.showCommonFindToggles ? 'block' : 'none'; + if (this.caseSensitive) { + this.controls.append(this.caseSensitive.domNode); } + if (this.wholeWords) { + this.controls.appendChild(this.wholeWords.domNode); + } + if (this.regex) { + this.controls.appendChild(this.regex.domNode); + } + + this.setAdditionalToggles(options?.additionalToggles); + + if (this.controls) { + this.domNode.appendChild(this.controls); + } + + parent?.appendChild(this.domNode); this._register(dom.addDisposableListener(this.inputBox.inputElement, 'compositionstart', (e: CompositionEvent) => { this.imeSessionInProgress = true; @@ -281,17 +291,25 @@ export class FindInput extends Widget { public enable(): void { this.domNode.classList.remove('disabled'); this.inputBox.enable(); - this.regex.enable(); - this.wholeWords.enable(); - this.caseSensitive.enable(); + this.regex?.enable(); + this.wholeWords?.enable(); + this.caseSensitive?.enable(); + + for (const toggle of this.additionalToggles) { + toggle.enable(); + } } public disable(): void { this.domNode.classList.add('disabled'); this.inputBox.disable(); - this.regex.disable(); - this.wholeWords.disable(); - this.caseSensitive.disable(); + this.regex?.disable(); + this.wholeWords?.disable(); + this.caseSensitive?.disable(); + + for (const toggle of this.additionalToggles) { + toggle.disable(); + } } public setFocusInputOnOptionClick(value: boolean): void { @@ -306,6 +324,37 @@ export class FindInput extends Widget { } } + public setAdditionalToggles(toggles: Toggle[] | undefined): void { + for (const currentToggle of this.additionalToggles) { + currentToggle.domNode.remove(); + } + this.additionalToggles = []; + this.additionalTogglesDisposables.dispose(); + this.additionalTogglesDisposables = new DisposableStore(); + + for (const toggle of toggles ?? []) { + this.additionalTogglesDisposables.add(toggle); + this.controls.appendChild(toggle.domNode); + + this.additionalTogglesDisposables.add(toggle.onChange(viaKeyboard => { + this._onDidOptionChange.fire(viaKeyboard); + if (!viaKeyboard && this.fixFocusOnOptionClickEnabled) { + this.inputBox.focus(); + } + })); + + this.additionalToggles.push(toggle); + } + + if (this.additionalToggles.length > 0) { + this.controls.style.display = 'block'; + } + + this.inputBox.paddingRight = + ((this.caseSensitive?.width() ?? 0) + (this.wholeWords?.width() ?? 0) + (this.regex?.width() ?? 0)) + + this.additionalToggles.reduce((r, t) => r + t.width(), 0); + } + public clear(): void { this.clearValidation(); this.setValue(''); @@ -354,9 +403,13 @@ export class FindInput extends Widget { inputActiveOptionForeground: this.inputActiveOptionForeground, inputActiveOptionBackground: this.inputActiveOptionBackground, }; - this.regex.style(toggleStyles); - this.wholeWords.style(toggleStyles); - this.caseSensitive.style(toggleStyles); + this.regex?.style(toggleStyles); + this.wholeWords?.style(toggleStyles); + this.caseSensitive?.style(toggleStyles); + + for (const toggle of this.additionalToggles) { + toggle.style(toggleStyles); + } const inputBoxStyles: IInputBoxStyles = { inputBackground: this.inputBackground, @@ -385,36 +438,42 @@ export class FindInput extends Widget { } public getCaseSensitive(): boolean { - return this.caseSensitive.checked; + return this.caseSensitive?.checked ?? false; } public setCaseSensitive(value: boolean): void { - this.caseSensitive.checked = value; + if (this.caseSensitive) { + this.caseSensitive.checked = value; + } } public getWholeWords(): boolean { - return this.wholeWords.checked; + return this.wholeWords?.checked ?? false; } public setWholeWords(value: boolean): void { - this.wholeWords.checked = value; + if (this.wholeWords) { + this.wholeWords.checked = value; + } } public getRegex(): boolean { - return this.regex.checked; + return this.regex?.checked ?? false; } public setRegex(value: boolean): void { - this.regex.checked = value; - this.validate(); + if (this.regex) { + this.regex.checked = value; + this.validate(); + } } public focusOnCaseSensitive(): void { - this.caseSensitive.focus(); + this.caseSensitive?.focus(); } public focusOnRegex(): void { - this.regex.focus(); + this.regex?.focus(); } private _lastHighlightFindOptions: number = 0; diff --git a/src/vs/base/browser/ui/findinput/replaceInput.ts b/src/vs/base/browser/ui/findinput/replaceInput.ts index d2008722b71..2861edde0b8 100644 --- a/src/vs/base/browser/ui/findinput/replaceInput.ts +++ b/src/vs/base/browser/ui/findinput/replaceInput.ts @@ -189,10 +189,10 @@ export class ReplaceInput extends Widget { } // Arrow-Key support to navigate between options - let indexes = [this.preserveCase.domNode]; + const indexes = [this.preserveCase.domNode]; this.onkeydown(this.domNode, (event: IKeyboardEvent) => { if (event.equals(KeyCode.LeftArrow) || event.equals(KeyCode.RightArrow) || event.equals(KeyCode.Escape)) { - let index = indexes.indexOf(document.activeElement); + const index = indexes.indexOf(document.activeElement); if (index >= 0) { let newIndex: number = -1; if (event.equals(KeyCode.RightArrow)) { @@ -218,16 +218,14 @@ export class ReplaceInput extends Widget { }); - let controls = document.createElement('div'); + const controls = document.createElement('div'); controls.className = 'controls'; controls.style.display = this._showOptionButtons ? 'block' : 'none'; controls.appendChild(this.preserveCase.domNode); this.domNode.appendChild(controls); - if (parent) { - parent.appendChild(this.domNode); - } + parent?.appendChild(this.domNode); this.onkeydown(this.inputBox.inputElement, (e) => this._onKeyDown.fire(e)); this.onkeyup(this.inputBox.inputElement, (e) => this._onKeyUp.fire(e)); @@ -355,27 +353,19 @@ export class ReplaceInput extends Widget { } public validate(): void { - if (this.inputBox) { - this.inputBox.validate(); - } + this.inputBox?.validate(); } public showMessage(message: InputBoxMessage): void { - if (this.inputBox) { - this.inputBox.showMessage(message); - } + this.inputBox?.showMessage(message); } public clearMessage(): void { - if (this.inputBox) { - this.inputBox.hideMessage(); - } + this.inputBox?.hideMessage(); } private clearValidation(): void { - if (this.inputBox) { - this.inputBox.hideMessage(); - } + this.inputBox?.hideMessage(); } public set width(newWidth: number) { diff --git a/src/vs/base/browser/ui/grid/grid.ts b/src/vs/base/browser/ui/grid/grid.ts index e4cbed18667..cf8798982b0 100644 --- a/src/vs/base/browser/ui/grid/grid.ts +++ b/src/vs/base/browser/ui/grid/grid.ts @@ -527,6 +527,16 @@ export class Grid extends Disposable { return this.gridview.resizeView(location, size); } + /** + * Returns whether all other {@link IView views} are at their minimum size. + * + * @param view The reference {@link IView view}. + */ + isViewSizeMaximized(view: T): boolean { + const location = this.getViewLocation(view); + return this.gridview.isViewSizeMaximized(location); + } + /** * Get the size of a {@link IView view}. * diff --git a/src/vs/base/browser/ui/grid/gridview.ts b/src/vs/base/browser/ui/grid/gridview.ts index dca11631c87..bcd35d6c1f8 100644 --- a/src/vs/base/browser/ui/grid/gridview.ts +++ b/src/vs/base/browser/ui/grid/gridview.ts @@ -592,6 +592,10 @@ class BranchNode implements ISplitView, IDisposable { this.splitview.resizeView(index, size); } + isChildSizeMaximized(index: number): boolean { + return this.splitview.isViewSizeMaximized(index); + } + distributeViewSizes(recursive = false): void { this.splitview.distributeViewSizes(); @@ -857,9 +861,7 @@ class LeafNode implements ISplitView, IDisposable { set boundarySashes(boundarySashes: IRelativeBoundarySashes) { this._boundarySashes = boundarySashes; - if (this.view.setBoundarySashes) { - this.view.setBoundarySashes(toAbsoluteBoundarySashes(boundarySashes, this.orientation)); - } + this.view.setBoundarySashes?.(toAbsoluteBoundarySashes(boundarySashes, this.orientation)); } layout(size: number, offset: number, ctx: ILayoutContext | undefined): void { @@ -897,9 +899,7 @@ class LeafNode implements ISplitView, IDisposable { } setVisible(visible: boolean): void { - if (this.view.setVisible) { - this.view.setVisible(visible); - } + this.view.setVisible?.(visible); } dispose(): void { @@ -1153,7 +1153,7 @@ export class GridView implements IDisposable { this.layoutController.isLayoutEnabled = true; const [size, orthogonalSize, offset, orthogonalOffset] = this.root.orientation === Orientation.HORIZONTAL ? [height, width, top, left] : [width, height, left, top]; - this.root.layout(size, offset, { orthogonalSize, absoluteOffset: offset, absoluteOrthogonalOffset: orthogonalOffset, absoluteSize: size, absoluteOrthogonalSize: orthogonalSize }); + this.root.layout(size, 0, { orthogonalSize, absoluteOffset: offset, absoluteOrthogonalOffset: orthogonalOffset, absoluteSize: size, absoluteOrthogonalSize: orthogonalSize }); } /** @@ -1435,6 +1435,27 @@ export class GridView implements IDisposable { } } + /** + * Returns whether all other {@link IView views} are at their minimum size. + * + * @param location The {@link GridLocation location} of the view. + */ + isViewSizeMaximized(location: GridLocation): boolean { + const [ancestors, node] = this.getNode(location); + + if (!(node instanceof LeafNode)) { + throw new Error('Invalid location'); + } + + for (let i = 0; i < ancestors.length; i++) { + if (!ancestors[i].isChildSizeMaximized(location[i])) { + return false; + } + } + + return true; + } + /** * Distribute the size among all {@link IView views} within the entire * grid or within a single {@link SplitView}. diff --git a/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts b/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts index 3b69763252e..ed58c930af3 100644 --- a/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts +++ b/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts @@ -33,7 +33,7 @@ export class HighlightedLabel { private readonly domNode: HTMLElement; private text: string = ''; private title: string = ''; - private highlights: IHighlight[] = []; + private highlights: readonly IHighlight[] = []; private supportIcons: boolean; private didEverRender: boolean = false; @@ -63,7 +63,7 @@ export class HighlightedLabel { * @param escapeNewLines Whether to escape new lines. * @returns */ - set(text: string | undefined, highlights: IHighlight[] = [], title: string = '', escapeNewLines?: boolean) { + set(text: string | undefined, highlights: readonly IHighlight[] = [], title: string = '', escapeNewLines?: boolean) { if (!text) { text = ''; } @@ -96,10 +96,10 @@ export class HighlightedLabel { if (pos < highlight.start) { const substring = this.text.substring(pos, highlight.start); children.push(dom.$('span', undefined, ...this.supportIcons ? renderLabelWithIcons(substring) : [substring])); - pos = highlight.end; + pos = highlight.start; } - const substring = this.text.substring(highlight.start, highlight.end); + const substring = this.text.substring(pos, highlight.end); const element = dom.$('span.highlight', undefined, ...this.supportIcons ? renderLabelWithIcons(substring) : [substring]); if (highlight.extraClasses) { @@ -126,7 +126,7 @@ export class HighlightedLabel { this.didEverRender = true; } - static escapeNewLines(text: string, highlights: IHighlight[]): string { + static escapeNewLines(text: string, highlights: readonly IHighlight[]): string { let total = 0; let extra = 0; diff --git a/src/vs/base/browser/ui/hover/hover.css b/src/vs/base/browser/ui/hover/hover.css index af22b3388df..c24fe23a8ca 100644 --- a/src/vs/base/browser/ui/hover/hover.css +++ b/src/vs/base/browser/ui/hover/hover.css @@ -10,7 +10,6 @@ z-index: 50; user-select: text; -webkit-user-select: text; - -ms-user-select: text; box-sizing: initial; animation: fadein 100ms linear; line-height: 1.5em; diff --git a/src/vs/base/browser/ui/iconLabel/iconHoverDelegate.ts b/src/vs/base/browser/ui/iconLabel/iconHoverDelegate.ts index 79f13f8dad1..1dd1e111bd9 100644 --- a/src/vs/base/browser/ui/iconLabel/iconHoverDelegate.ts +++ b/src/vs/base/browser/ui/iconLabel/iconHoverDelegate.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { HoverPosition } from 'vs/base/browser/ui/hover/hoverWidget'; +import { IUpdatableHoverOptions } from 'vs/base/browser/ui/iconLabel/iconLabelHover'; import { IMarkdownString } from 'vs/base/common/htmlContent'; import { IDisposable } from 'vs/base/common/lifecycle'; @@ -12,7 +13,7 @@ export interface IHoverDelegateTarget extends IDisposable { x?: number; } -export interface IHoverDelegateOptions { +export interface IHoverDelegateOptions extends IUpdatableHoverOptions { content: IMarkdownString | string | HTMLElement; target: IHoverDelegateTarget | HTMLElement; hoverPosition?: HoverPosition; diff --git a/src/vs/base/browser/ui/iconLabel/iconLabel.ts b/src/vs/base/browser/ui/iconLabel/iconLabel.ts index 5e7ff8fa7de..97b27bfcce2 100644 --- a/src/vs/base/browser/ui/iconLabel/iconLabel.ts +++ b/src/vs/base/browser/ui/iconLabel/iconLabel.ts @@ -14,22 +14,23 @@ import { equals } from 'vs/base/common/objects'; import { Range } from 'vs/base/common/range'; export interface IIconLabelCreationOptions { - supportHighlights?: boolean; - supportDescriptionHighlights?: boolean; - supportIcons?: boolean; - hoverDelegate?: IHoverDelegate; + readonly supportHighlights?: boolean; + readonly supportDescriptionHighlights?: boolean; + readonly supportIcons?: boolean; + readonly hoverDelegate?: IHoverDelegate; } export interface IIconLabelValueOptions { title?: string | ITooltipMarkdownString; descriptionTitle?: string; hideIcon?: boolean; - extraClasses?: string[]; + extraClasses?: readonly string[]; italic?: boolean; strikethrough?: boolean; - matches?: IMatch[]; + matches?: readonly IMatch[]; labelEscapeNewLines?: boolean; - descriptionMatches?: IMatch[]; + descriptionMatches?: readonly IMatch[]; + disabledCommand?: boolean; readonly separator?: string; readonly domId?: string; } @@ -124,22 +125,28 @@ export class IconLabel extends Disposable { } setLabel(label: string | string[], description?: string, options?: IIconLabelValueOptions): void { - const classes = ['monaco-icon-label']; + const labelClasses = ['monaco-icon-label']; + const containerClasses = ['monaco-icon-label-container']; if (options) { if (options.extraClasses) { - classes.push(...options.extraClasses); + labelClasses.push(...options.extraClasses); } if (options.italic) { - classes.push('italic'); + labelClasses.push('italic'); } if (options.strikethrough) { - classes.push('strikethrough'); + labelClasses.push('strikethrough'); + } + + if (options.disabledCommand) { + containerClasses.push('disabled'); } } - this.domNode.className = classes.join(' '); + this.domNode.className = labelClasses.join(' '); + this.labelContainer.className = containerClasses.join(' '); this.setupHover(options?.descriptionTitle ? this.labelContainer : this.element, options?.title); this.nameNode.setLabel(label, options); @@ -234,7 +241,7 @@ class Label { } } -function splitMatches(labels: string[], separator: string, matches: IMatch[] | undefined): IMatch[][] | undefined { +function splitMatches(labels: string[], separator: string, matches: readonly IMatch[] | undefined): IMatch[][] | undefined { if (!matches) { return undefined; } diff --git a/src/vs/base/browser/ui/iconLabel/iconLabelHover.ts b/src/vs/base/browser/ui/iconLabel/iconLabelHover.ts index 3034ea52d93..41e4c168286 100644 --- a/src/vs/base/browser/ui/iconLabel/iconLabelHover.ts +++ b/src/vs/base/browser/ui/iconLabel/iconLabelHover.ts @@ -33,6 +33,21 @@ export function setupNativeHover(htmlElement: HTMLElement, tooltip: string | ITo export type IHoverContent = string | ITooltipMarkdownString | HTMLElement | undefined; type IResolvedHoverContent = IMarkdownString | string | HTMLElement | undefined; +/** + * Copied from src\vs\workbench\services\hover\browser\hover.ts + * @deprecated Use IHoverService + */ +export interface IHoverAction { + label: string; + commandId: string; + iconClass?: string; + run(target: HTMLElement): void; +} + +export interface IUpdatableHoverOptions { + actions?: IHoverAction[]; + linkHandler?(url: string): void; +} export interface ICustomHover extends IDisposable { @@ -49,7 +64,7 @@ export interface ICustomHover extends IDisposable { /** * Updates the contents of the hover. */ - update(tooltip: IHoverContent): void; + update(tooltip: IHoverContent, options?: IUpdatableHoverOptions): void; } @@ -61,7 +76,7 @@ class UpdatableHoverWidget implements IDisposable { constructor(private hoverDelegate: IHoverDelegate, private target: IHoverDelegateTarget | HTMLElement, private fadeInAnimation: boolean) { } - async update(content: IHoverContent, focus?: boolean): Promise { + async update(content: IHoverContent, focus?: boolean, options?: IUpdatableHoverOptions): Promise { if (this._cancellationTokenSource) { // there's an computation ongoing, cancel it this._cancellationTokenSource.dispose(true); @@ -99,10 +114,10 @@ class UpdatableHoverWidget implements IDisposable { } } - this.show(resolvedContent, focus); + this.show(resolvedContent, focus, options); } - private show(content: IResolvedHoverContent, focus?: boolean): void { + private show(content: IResolvedHoverContent, focus?: boolean, options?: IUpdatableHoverOptions): void { const oldHoverWidget = this._hoverWidget; if (this.hasContent(content)) { @@ -111,7 +126,8 @@ class UpdatableHoverWidget implements IDisposable { target: this.target, showPointer: this.hoverDelegate.placement === 'element', hoverPosition: HoverPosition.BELOW, - skipFadeInAnimation: !this.fadeInAnimation || !!oldHoverWidget // do not fade in if the hover is already showing + skipFadeInAnimation: !this.fadeInAnimation || !!oldHoverWidget, // do not fade in if the hover is already showing + ...options }; this._hoverWidget = this.hoverDelegate.showHover(hoverOptions, focus); @@ -142,7 +158,7 @@ class UpdatableHoverWidget implements IDisposable { } } -export function setupCustomHover(hoverDelegate: IHoverDelegate, htmlElement: HTMLElement, content: IHoverContent): ICustomHover { +export function setupCustomHover(hoverDelegate: IHoverDelegate, htmlElement: HTMLElement, content: IHoverContent, options?: IUpdatableHoverOptions): ICustomHover { let hoverPreparation: IDisposable | undefined; let hoverWidget: UpdatableHoverWidget | undefined; @@ -163,7 +179,7 @@ export function setupCustomHover(hoverDelegate: IHoverDelegate, htmlElement: HTM return new TimeoutTimer(async () => { if (!hoverWidget || hoverWidget.isDisposed) { hoverWidget = new UpdatableHoverWidget(hoverDelegate, target || htmlElement, delay > 0); - await hoverWidget.update(content, focus); + await hoverWidget.update(content, focus, options); } }, delay); }; @@ -208,9 +224,9 @@ export function setupCustomHover(hoverDelegate: IHoverDelegate, htmlElement: HTM hide: () => { hideHover(true, true); }, - update: async newContent => { + update: async (newContent, hoverOptions) => { content = newContent; - await hoverWidget?.update(content); + await hoverWidget?.update(content, undefined, hoverOptions); }, dispose: () => { mouseOverDomEmitter.dispose(); diff --git a/src/vs/base/browser/ui/iconLabel/iconLabels.ts b/src/vs/base/browser/ui/iconLabel/iconLabels.ts index 103bca257a5..5ecaddf78f1 100644 --- a/src/vs/base/browser/ui/iconLabel/iconLabels.ts +++ b/src/vs/base/browser/ui/iconLabel/iconLabels.ts @@ -9,12 +9,14 @@ import { CSSIcon } from 'vs/base/common/codicons'; const labelWithIconsRegex = new RegExp(`(\\\\)?\\$\\((${CSSIcon.iconNameExpression}(?:${CSSIcon.iconModifierExpression})?)\\)`, 'g'); export function renderLabelWithIcons(text: string): Array { const elements = new Array(); - let match: RegExpMatchArray | null; + let match: RegExpExecArray | null; let textStart = 0, textStop = 0; while ((match = labelWithIconsRegex.exec(text)) !== null) { textStop = match.index || 0; - elements.push(text.substring(textStart, textStop)); + if (textStart < textStop) { + elements.push(text.substring(textStart, textStop)); + } textStart = (match.index || 0) + match[0].length; const [, escaped, codicon] = match; diff --git a/src/vs/base/browser/ui/iconLabel/iconlabel.css b/src/vs/base/browser/ui/iconLabel/iconlabel.css index 45b73bece04..ab4c0e131eb 100644 --- a/src/vs/base/browser/ui/iconLabel/iconlabel.css +++ b/src/vs/base/browser/ui/iconLabel/iconlabel.css @@ -31,6 +31,9 @@ flex-shrink: 0; /* fix for https://github.com/microsoft/vscode/issues/13787 */ } +.monaco-icon-label-container.disabled { + color: var(--vscode-disabledForeground); +} .monaco-icon-label > .monaco-icon-label-container { min-width: 0; overflow: hidden; diff --git a/src/vs/base/browser/ui/inputbox/inputBox.css b/src/vs/base/browser/ui/inputbox/inputBox.css index 2279df6c298..55b552b724f 100644 --- a/src/vs/base/browser/ui/inputbox/inputBox.css +++ b/src/vs/base/browser/ui/inputbox/inputBox.css @@ -8,6 +8,7 @@ display: block; padding: 0; box-sizing: border-box; + border-radius: 2px; /* Customizable */ font-size: inherit; @@ -21,7 +22,7 @@ .monaco-inputbox > .ibwrapper > .mirror { /* Customizable */ - padding: 4px; + padding: 4px 6px; } .monaco-inputbox > .ibwrapper { @@ -49,7 +50,6 @@ .monaco-inputbox > .ibwrapper > textarea.input { display: block; - -ms-overflow-style: none; /* IE 10+: hide scrollbars */ scrollbar-width: none; /* Firefox: hide scrollbars */ outline: none; } diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts index 65524d856eb..c3d50ef272c 100644 --- a/src/vs/base/browser/ui/inputbox/inputBox.ts +++ b/src/vs/base/browser/ui/inputbox/inputBox.ts @@ -58,7 +58,7 @@ export interface IInputValidator { } export interface IMessage { - readonly content: string; + readonly content?: string; readonly formatContent?: boolean; // defaults to false readonly type?: MessageType; } @@ -159,9 +159,9 @@ export class InputBox extends Widget { this.element = dom.append(container, $('.monaco-inputbox.idle')); - let tagName = this.options.flexibleHeight ? 'textarea' : 'input'; + const tagName = this.options.flexibleHeight ? 'textarea' : 'input'; - let wrapper = dom.append(this.element, $('.ibwrapper')); + const wrapper = dom.append(this.element, $('.ibwrapper')); this.input = dom.append(wrapper, $(tagName + '.input.empty')); this.input.setAttribute('autocorrect', 'off'); this.input.setAttribute('autocapitalize', 'off'); @@ -220,7 +220,7 @@ export class InputBox extends Widget { this.onblur(this.input, () => this.onBlur()); this.onfocus(this.input, () => this.onFocus()); - this.ignoreGesture(this.input); + this._register(this.ignoreGesture(this.input)); setTimeout(() => this.updateMirror(), 0); @@ -396,7 +396,7 @@ export class InputBox extends Widget { const styles = this.stylesForType(this.message.type); this.element.style.border = styles.border ? `1px solid ${styles.border}` : ''; - if (this.hasFocus() || force) { + if (this.message.content && (this.hasFocus() || force)) { this._showMessage(); } } @@ -458,7 +458,7 @@ export class InputBox extends Widget { } let div: HTMLElement; - let layout = () => div.style.width = dom.getTotalWidth(this.element) + 'px'; + const layout = () => div.style.width = dom.getTotalWidth(this.element) + 'px'; this.contextViewProvider.showContextView({ getAnchor: () => this.element, @@ -477,8 +477,8 @@ export class InputBox extends Widget { }; const spanElement = (this.message.formatContent - ? renderFormattedText(this.message.content, renderOptions) - : renderText(this.message.content, renderOptions)); + ? renderFormattedText(this.message.content!, renderOptions) + : renderText(this.message.content!, renderOptions)); spanElement.classList.add(this.classForType(this.message.type)); const styles = this.stylesForType(this.message.type); @@ -621,9 +621,7 @@ export class InputBox extends Widget { this.message = null; - if (this.actionbar) { - this.actionbar.dispose(); - } + this.actionbar?.dispose(); super.dispose(); } diff --git a/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.ts b/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.ts index 22504652772..6a970112b27 100644 --- a/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.ts +++ b/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.ts @@ -89,7 +89,7 @@ export class KeybindingLabel implements IThemable { this.clear(); if (this.keybinding) { - let [firstPart, chordPart] = this.keybinding.getParts(); + const [firstPart, chordPart] = this.keybinding.getParts(); if (firstPart) { this.renderPart(this.domNode, firstPart, this.matches ? this.matches.firstPart : null); } diff --git a/src/vs/base/browser/ui/list/list.css b/src/vs/base/browser/ui/list/list.css index eaca3ae8bd8..ccde136e12f 100644 --- a/src/vs/base/browser/ui/list/list.css +++ b/src/vs/base/browser/ui/list/list.css @@ -13,7 +13,6 @@ .monaco-list.mouse-support { user-select: none; -webkit-user-select: none; - -ms-user-select: none; } .monaco-list > .monaco-scrollable-element { @@ -65,72 +64,7 @@ z-index: 1000; } -/* Type filter */ - -.monaco-list-type-filter { - display: flex; - align-items: center; - position: absolute; - border-radius: 2px; - padding: 0px 3px; - max-width: calc(100% - 10px); - text-overflow: ellipsis; - overflow: hidden; - text-align: right; - box-sizing: border-box; - cursor: all-scroll; - font-size: 13px; - line-height: 18px; - height: 20px; - z-index: 1; - top: 4px; -} - -.monaco-list-type-filter.dragging { - transition: top 0.2s, left 0.2s; -} - -.monaco-list-type-filter.ne { - right: 4px; -} - -.monaco-list-type-filter.nw { - left: 4px; -} - -.monaco-list-type-filter > .controls { - display: flex; - align-items: center; - box-sizing: border-box; - transition: width 0.2s; - width: 0; -} - -.monaco-list-type-filter.dragging > .controls, -.monaco-list-type-filter:hover > .controls { - width: 36px; -} - -.monaco-list-type-filter > .controls > * { - border: none; - box-sizing: border-box; - -webkit-appearance: none; - -moz-appearance: none; - background: none; - width: 16px; - height: 16px; - flex-shrink: 0; - margin: 0; - padding: 0; - display: flex; - align-items: center; - justify-content: center; - cursor: pointer; -} - -.monaco-list-type-filter > .controls > .filter { - margin-left: 4px; -} +/* Filter */ .monaco-list-type-filter-message { position: absolute; @@ -149,13 +83,3 @@ .monaco-list-type-filter-message:empty { display: none; } - -/* Electron */ - -.monaco-list-type-filter { - cursor: grab; -} - -.monaco-list-type-filter.dragging { - cursor: grabbing; -} diff --git a/src/vs/base/browser/ui/list/listPaging.ts b/src/vs/base/browser/ui/list/listPaging.ts index 43d4ad49e81..a5f3a920e38 100644 --- a/src/vs/base/browser/ui/list/listPaging.ts +++ b/src/vs/base/browser/ui/list/listPaging.ts @@ -12,7 +12,7 @@ import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { IThemable } from 'vs/base/common/styler'; import 'vs/css!./list'; import { IListContextMenuEvent, IListEvent, IListMouseEvent, IListRenderer, IListVirtualDelegate } from './list'; -import { IListAccessibilityProvider, IListOptions, IListOptionsUpdate, IListStyles, List } from './listWidget'; +import { IListAccessibilityProvider, IListOptions, IListOptionsUpdate, IListStyles, List, TypeNavigationMode } from './listWidget'; export interface IPagedRenderer extends IListRenderer { renderPlaceholder(index: number, templateData: TTemplateData): void; @@ -38,9 +38,7 @@ class PagedRenderer implements IListRenderer, height: number | undefined): void { - if (data.disposable) { - data.disposable.dispose(); - } + data.disposable?.dispose(); if (!data.data) { return; @@ -95,8 +93,8 @@ class PagedAccessibilityProvider implements IListAccessibilityProvider { - readonly enableKeyboardNavigation?: boolean; - readonly automaticKeyboardNavigation?: boolean; + readonly typeNavigationEnabled?: boolean; + readonly typeNavigationMode?: TypeNavigationMode; readonly ariaLabel?: string; readonly keyboardSupport?: boolean; readonly multipleSelectionSupport?: boolean; @@ -282,8 +280,8 @@ export class PagedList implements IThemable, IDisposable { this.list.layout(height, width); } - toggleKeyboardNavigation(): void { - this.list.toggleKeyboardNavigation(); + triggerTypeNavigation(): void { + this.list.triggerTypeNavigation(); } reveal(index: number, relativeTop?: number): void { diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts index 52d2b94841b..d51fc40e184 100644 --- a/src/vs/base/browser/ui/list/listView.ts +++ b/src/vs/base/browser/ui/list/listView.ts @@ -3,9 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { isFirefox } from 'vs/base/browser/browser'; -import { DataTransfers, IDragAndDropData, StaticDND } from 'vs/base/browser/dnd'; -import { $, addDisposableListener, animate, getContentHeight, getContentWidth, getTopLeftOffset, scheduleAtNextAnimationFrame } from 'vs/base/browser/dom'; +import { DataTransfers, IDragAndDropData } from 'vs/base/browser/dnd'; +import { $, addDisposableListener, animate, Dimension, getContentHeight, getContentWidth, getTopLeftOffset, scheduleAtNextAnimationFrame } from 'vs/base/browser/dom'; import { DomEmitter } from 'vs/base/browser/event'; import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent'; import { EventType as TouchEventType, Gesture, GestureEvent } from 'vs/base/browser/touch'; @@ -15,7 +14,6 @@ import { Delayer, disposableTimeout } from 'vs/base/common/async'; import { memoize } from 'vs/base/common/decorators'; import { Emitter, Event } from 'vs/base/common/event'; import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; -import { getOrDefault } from 'vs/base/common/objects'; import { IRange, Range } from 'vs/base/common/range'; import { INewScrollDimensions, Scrollable, ScrollbarVisibility, ScrollEvent } from 'vs/base/common/scrollable'; import { ISpliceable } from 'vs/base/common/sequence'; @@ -23,6 +21,7 @@ import { IListDragAndDrop, IListDragEvent, IListGestureEvent, IListMouseEvent, I import { RangeMap, shift } from 'vs/base/browser/ui/list/rangeMap'; import { IRow, RowCache } from 'vs/base/browser/ui/list/rowCache'; import { IObservableValue } from 'vs/base/common/observableValue'; +import { BugIndicatingError } from 'vs/base/common/errors'; interface IItem { readonly id: string; @@ -39,6 +38,10 @@ interface IItem { checkedDisposable: IDisposable; } +const StaticDND = { + CurrentDragAndDropData: undefined as IDragAndDropData | undefined +}; + export interface IListViewDragAndDrop extends IListDragAndDrop { getDragElements(element: T): T[]; } @@ -69,6 +72,7 @@ export interface IListViewOptions extends IListViewOptionsUpdate { readonly accessibilityProvider?: IListViewAccessibilityProvider; readonly transformOptimization?: boolean; readonly alwaysConsumeMouseWheel?: boolean; + readonly initialSize?: Dimension; } const DefaultOptions = { @@ -257,7 +261,7 @@ export class ListView implements ISpliceable, IDisposable { private readonly disposables: DisposableStore = new DisposableStore(); private readonly _onDidChangeContentHeight = new Emitter(); - readonly onDidChangeContentHeight: Event = Event.latch(this._onDidChangeContentHeight.event); + readonly onDidChangeContentHeight: Event = Event.latch(this._onDidChangeContentHeight.event, undefined, this.disposables); get contentHeight(): number { return this.rangeMap.size; } get onDidScroll(): Event { return this.scrollableElement.onScroll; } @@ -325,7 +329,7 @@ export class ListView implements ISpliceable, IDisposable { this.domNode.classList.toggle('mouse-support', typeof options.mouseSupport === 'boolean' ? options.mouseSupport : true); - this._horizontalScrolling = getOrDefault(options, o => o.horizontalScrolling, DefaultOptions.horizontalScrolling); + this._horizontalScrolling = options.horizontalScrolling ?? DefaultOptions.horizontalScrolling; this.domNode.classList.toggle('horizontal-scrolling', this._horizontalScrolling); this.additionalScrollHeight = typeof options.additionalScrollHeight === 'undefined' ? 0 : options.additionalScrollHeight; @@ -335,23 +339,25 @@ export class ListView implements ISpliceable, IDisposable { this.rowsContainer = document.createElement('div'); this.rowsContainer.className = 'monaco-list-rows'; - const transformOptimization = getOrDefault(options, o => o.transformOptimization, DefaultOptions.transformOptimization); + const transformOptimization = options.transformOptimization ?? DefaultOptions.transformOptimization; if (transformOptimization) { this.rowsContainer.style.transform = 'translate3d(0px, 0px, 0px)'; + this.rowsContainer.style.overflow = 'hidden'; + this.rowsContainer.style.contain = 'strict'; } this.disposables.add(Gesture.addTarget(this.rowsContainer)); this.scrollable = new Scrollable({ forceIntegerValues: true, - smoothScrollDuration: getOrDefault(options, o => o.smoothScrolling, false) ? 125 : 0, + smoothScrollDuration: (options.smoothScrolling ?? false) ? 125 : 0, scheduleAtNextAnimationFrame: cb => scheduleAtNextAnimationFrame(cb) }); this.scrollableElement = this.disposables.add(new SmoothScrollableElement(this.rowsContainer, { - alwaysConsumeMouseWheel: getOrDefault(options, o => o.alwaysConsumeMouseWheel, DefaultOptions.alwaysConsumeMouseWheel), + alwaysConsumeMouseWheel: options.alwaysConsumeMouseWheel ?? DefaultOptions.alwaysConsumeMouseWheel, horizontal: ScrollbarVisibility.Auto, - vertical: getOrDefault(options, o => o.verticalScrollMode, DefaultOptions.verticalScrollMode), - useShadows: getOrDefault(options, o => o.useShadows, DefaultOptions.useShadows), + vertical: options.verticalScrollMode ?? DefaultOptions.verticalScrollMode, + useShadows: options.useShadows ?? DefaultOptions.useShadows, mouseWheelScrollSensitivity: options.mouseWheelScrollSensitivity, fastScrollSensitivity: options.fastScrollSensitivity }, this.scrollable)); @@ -371,12 +377,12 @@ export class ListView implements ISpliceable, IDisposable { this.disposables.add(addDisposableListener(this.domNode, 'dragleave', e => this.onDragLeave(this.toDragEvent(e)))); this.disposables.add(addDisposableListener(this.domNode, 'dragend', e => this.onDragEnd(e))); - this.setRowLineHeight = getOrDefault(options, o => o.setRowLineHeight, DefaultOptions.setRowLineHeight); - this.setRowHeight = getOrDefault(options, o => o.setRowHeight, DefaultOptions.setRowHeight); - this.supportDynamicHeights = getOrDefault(options, o => o.supportDynamicHeights, DefaultOptions.supportDynamicHeights); - this.dnd = getOrDefault, IListViewDragAndDrop>(options, o => o.dnd, DefaultOptions.dnd); + this.setRowLineHeight = options.setRowLineHeight ?? DefaultOptions.setRowLineHeight; + this.setRowHeight = options.setRowHeight ?? DefaultOptions.setRowHeight; + this.supportDynamicHeights = options.supportDynamicHeights ?? DefaultOptions.supportDynamicHeights; + this.dnd = options.dnd ?? DefaultOptions.dnd; - this.layout(); + this.layout(options.initialSize?.height, options.initialSize?.width); } updateOptions(options: IListViewOptionsUpdate) { @@ -402,8 +408,12 @@ export class ListView implements ISpliceable, IDisposable { } } - triggerScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent) { - this.scrollableElement.triggerScrollFromMouseWheelEvent(browserEvent); + delegateScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent) { + this.scrollableElement.delegateScrollFromMouseWheelEvent(browserEvent); + } + + delegateVerticalScrollbarPointerDown(browserEvent: PointerEvent) { + this.scrollableElement.delegateVerticalScrollbarPointerDown(browserEvent); } updateElementHeight(index: number, size: number | undefined, anchorIndex: number | null): void { @@ -705,7 +715,7 @@ export class ListView implements ISpliceable, IDisposable { } layout(height?: number, width?: number): void { - let scrollDimensions: INewScrollDimensions = { + const scrollDimensions: INewScrollDimensions = { height: typeof height === 'number' ? height : getContentHeight(this.domNode) }; @@ -813,9 +823,7 @@ export class ListView implements ISpliceable, IDisposable { throw new Error(`No renderer found for template id ${item.templateId}`); } - if (renderer) { - renderer.renderElement(item.element, index, item.row.templateData, item.size); - } + renderer?.renderElement(item.element, index, item.row.templateData, item.size); const uri = this.dnd.getDragURI(item.element); item.dragStartDisposable.dispose(); @@ -836,7 +844,7 @@ export class ListView implements ISpliceable, IDisposable { return; } - item.row.domNode.style.width = isFirefox ? '-moz-fit-content' : 'fit-content'; + item.row.domNode.style.width = 'fit-content'; item.width = getContentWidth(item.row.domNode); const style = window.getComputedStyle(item.row.domNode); @@ -938,17 +946,17 @@ export class ListView implements ISpliceable, IDisposable { // Events - @memoize get onMouseClick(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'click')).event, e => this.toMouseEvent(e)); } - @memoize get onMouseDblClick(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'dblclick')).event, e => this.toMouseEvent(e)); } - @memoize get onMouseMiddleClick(): Event> { return Event.filter(Event.map(this.disposables.add(new DomEmitter(this.domNode, 'auxclick')).event, e => this.toMouseEvent(e as MouseEvent)), e => e.browserEvent.button === 1); } - @memoize get onMouseUp(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'mouseup')).event, e => this.toMouseEvent(e)); } - @memoize get onMouseDown(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'mousedown')).event, e => this.toMouseEvent(e)); } - @memoize get onMouseOver(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'mouseover')).event, e => this.toMouseEvent(e)); } - @memoize get onMouseMove(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'mousemove')).event, e => this.toMouseEvent(e)); } - @memoize get onMouseOut(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'mouseout')).event, e => this.toMouseEvent(e)); } - @memoize get onContextMenu(): Event | IListGestureEvent> { return Event.any(Event.map(this.disposables.add(new DomEmitter(this.domNode, 'contextmenu')).event, e => this.toMouseEvent(e)), Event.map(this.disposables.add(new DomEmitter(this.domNode, TouchEventType.Contextmenu)).event as Event, e => this.toGestureEvent(e))); } - @memoize get onTouchStart(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'touchstart')).event, e => this.toTouchEvent(e)); } - @memoize get onTap(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.rowsContainer, TouchEventType.Tap)).event, e => this.toGestureEvent(e as GestureEvent)); } + @memoize get onMouseClick(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'click')).event, e => this.toMouseEvent(e), this.disposables); } + @memoize get onMouseDblClick(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'dblclick')).event, e => this.toMouseEvent(e), this.disposables); } + @memoize get onMouseMiddleClick(): Event> { return Event.filter(Event.map(this.disposables.add(new DomEmitter(this.domNode, 'auxclick')).event, e => this.toMouseEvent(e as MouseEvent), this.disposables), e => e.browserEvent.button === 1, this.disposables); } + @memoize get onMouseUp(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'mouseup')).event, e => this.toMouseEvent(e), this.disposables); } + @memoize get onMouseDown(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'mousedown')).event, e => this.toMouseEvent(e), this.disposables); } + @memoize get onMouseOver(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'mouseover')).event, e => this.toMouseEvent(e), this.disposables); } + @memoize get onMouseMove(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'mousemove')).event, e => this.toMouseEvent(e), this.disposables); } + @memoize get onMouseOut(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'mouseout')).event, e => this.toMouseEvent(e), this.disposables); } + @memoize get onContextMenu(): Event | IListGestureEvent> { return Event.any(Event.map(this.disposables.add(new DomEmitter(this.domNode, 'contextmenu')).event, e => this.toMouseEvent(e), this.disposables), Event.map(this.disposables.add(new DomEmitter(this.domNode, TouchEventType.Contextmenu)).event as Event, e => this.toGestureEvent(e), this.disposables)); } + @memoize get onTouchStart(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.domNode, 'touchstart')).event, e => this.toTouchEvent(e), this.disposables); } + @memoize get onTap(): Event> { return Event.map(this.disposables.add(new DomEmitter(this.rowsContainer, TouchEventType.Tap)).event, e => this.toGestureEvent(e as GestureEvent), this.disposables); } private toMouseEvent(browserEvent: MouseEvent): IListMouseEvent { const index = this.getItemIndexFromEventTarget(browserEvent.target || null); @@ -1029,12 +1037,11 @@ export class ListView implements ISpliceable, IDisposable { setTimeout(() => document.body.removeChild(dragImage), 0); } + this.domNode.classList.add('dragging'); this.currentDragData = new ElementsDragAndDropData(elements); StaticDND.CurrentDragAndDropData = new ExternalElementsDragAndDropData(elements); - if (this.dnd.onDragStart) { - this.dnd.onDragStart(this.currentDragData, event); - } + this.dnd.onDragStart?.(this.currentDragData, event); } private onDragOver(event: IListDragEvent): boolean { @@ -1114,9 +1121,7 @@ export class ListView implements ISpliceable, IDisposable { const item = this.items[index]!; item.dropTarget = true; - if (item.row) { - item.row.domNode.classList.add('drop-target'); - } + item.row?.domNode.classList.add('drop-target'); } this.currentDragFeedbackDisposable = toDisposable(() => { @@ -1124,9 +1129,7 @@ export class ListView implements ISpliceable, IDisposable { const item = this.items[index]!; item.dropTarget = false; - if (item.row) { - item.row.domNode.classList.remove('drop-target'); - } + item.row?.domNode.classList.remove('drop-target'); } }); } @@ -1150,6 +1153,7 @@ export class ListView implements ISpliceable, IDisposable { const dragData = this.currentDragData; this.teardownDragAndDropScrollTopAnimation(); this.clearDragOverFeedback(); + this.domNode.classList.remove('dragging'); this.currentDragData = undefined; StaticDND.CurrentDragAndDropData = undefined; @@ -1166,12 +1170,11 @@ export class ListView implements ISpliceable, IDisposable { this.canDrop = false; this.teardownDragAndDropScrollTopAnimation(); this.clearDragOverFeedback(); + this.domNode.classList.remove('dragging'); this.currentDragData = undefined; StaticDND.CurrentDragAndDropData = undefined; - if (this.dnd.onDragEnd) { - this.dnd.onDragEnd(event); - } + this.dnd.onDragEnd?.(event); } private clearDragOverFeedback(): void { @@ -1363,32 +1366,28 @@ export class ListView implements ISpliceable, IDisposable { const size = item.size; - if (!this.setRowHeight && item.row) { - let newSize = item.row.domNode.offsetHeight; - item.size = newSize; + if (item.row) { + item.row.domNode.style.height = ''; + item.size = item.row.domNode.offsetHeight; item.lastDynamicHeightWidth = this.renderWidth; - return newSize - size; + return item.size - size; } const row = this.cache.alloc(item.templateId); - row.domNode.style.height = ''; this.rowsContainer.appendChild(row.domNode); const renderer = this.renderers.get(item.templateId); - if (renderer) { - renderer.renderElement(item.element, index, row.templateData, undefined); - if (renderer.disposeElement) { - renderer.disposeElement(item.element, index, row.templateData, undefined); - } + if (!renderer) { + throw new BugIndicatingError('Missing renderer for templateId: ' + item.templateId); } + renderer.renderElement(item.element, index, row.templateData, undefined); item.size = row.domNode.offsetHeight; + renderer.disposeElement?.(item.element, index, row.templateData, undefined); - if (this.virtualDelegate.setDynamicHeight) { - this.virtualDelegate.setDynamicHeight(item.element, item.size); - } + this.virtualDelegate.setDynamicHeight?.(item.element, item.size); item.lastDynamicHeightWidth = this.renderWidth; this.rowsContainer.removeChild(row.domNode); @@ -1429,9 +1428,7 @@ export class ListView implements ISpliceable, IDisposable { if (item.row) { const renderer = this.renderers.get(item.row.templateId); if (renderer) { - if (renderer.disposeElement) { - renderer.disposeElement(item.element, -1, item.row.templateData, undefined); - } + renderer.disposeElement?.(item.element, -1, item.row.templateData, undefined); renderer.disposeTemplate(item.row.templateData); } } diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts index 0bfef7f8ae7..c5efc9adb7a 100644 --- a/src/vs/base/browser/ui/list/listWidget.ts +++ b/src/vs/base/browser/ui/list/listWidget.ts @@ -4,11 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import { IDragAndDropData } from 'vs/base/browser/dnd'; -import { createStyleSheet } from 'vs/base/browser/dom'; -import { DomEmitter, stopEvent } from 'vs/base/browser/event'; +import { createStyleSheet, Dimension, EventHelper } from 'vs/base/browser/dom'; +import { DomEmitter } from 'vs/base/browser/event'; import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { Gesture } from 'vs/base/browser/touch'; import { alert } from 'vs/base/browser/ui/aria/aria'; +import { IFindInputStyles } from 'vs/base/browser/ui/findinput/findInput'; import { CombinedSpliceable } from 'vs/base/browser/ui/list/splice'; import { ScrollableElementChangeOptions } from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import { binarySearch, firstOrDefault, range } from 'vs/base/common/arrays'; @@ -258,6 +259,23 @@ export function isMonacoEditor(e: HTMLElement): boolean { return isMonacoEditor(e.parentElement); } +export function isButton(e: HTMLElement): boolean { + if ((e.tagName === 'A' && e.classList.contains('monaco-button')) || + (e.tagName === 'DIV' && e.classList.contains('monaco-button-dropdown'))) { + return true; + } + + if (e.classList.contains('monaco-list')) { + return false; + } + + if (!e.parentElement) { + return false; + } + + return isButton(e.parentElement); +} + class KeyboardController implements IDisposable { private readonly disposables = new DisposableStore(); @@ -265,9 +283,9 @@ class KeyboardController implements IDisposable { @memoize private get onKeyDown(): Event.IChainableEvent { - return Event.chain(this.disposables.add(new DomEmitter(this.view.domNode, 'keydown')).event) + return this.disposables.add(Event.chain(this.disposables.add(new DomEmitter(this.view.domNode, 'keydown')).event) .filter(e => !isInputElement(e.target as HTMLElement)) - .map(e => new StandardKeyboardEvent(e)); + .map(e => new StandardKeyboardEvent(e))); } constructor( @@ -367,7 +385,12 @@ class KeyboardController implements IDisposable { } } -enum TypeLabelControllerState { +export enum TypeNavigationMode { + Automatic, + Trigger +} + +enum TypeNavigationControllerState { Idle, Typing } @@ -385,12 +408,12 @@ export const DefaultKeyboardNavigationDelegate = new class implements IKeyboardN } }; -class TypeLabelController implements IDisposable { +class TypeNavigationController implements IDisposable { private enabled = false; - private state: TypeLabelControllerState = TypeLabelControllerState.Idle; + private state: TypeNavigationControllerState = TypeNavigationControllerState.Idle; - private automaticKeyboardNavigation = true; + private mode = TypeNavigationMode.Automatic; private triggered = false; private previouslyFocused = -1; @@ -401,26 +424,23 @@ class TypeLabelController implements IDisposable { private list: List, private view: ListView, private keyboardNavigationLabelProvider: IKeyboardNavigationLabelProvider, + private keyboardNavigationEventFilter: IKeyboardNavigationEventFilter, private delegate: IKeyboardNavigationDelegate ) { this.updateOptions(list.options); } updateOptions(options: IListOptions): void { - const enableKeyboardNavigation = typeof options.enableKeyboardNavigation === 'undefined' ? true : !!options.enableKeyboardNavigation; - - if (enableKeyboardNavigation) { + if (options.typeNavigationEnabled ?? true) { this.enable(); } else { this.disable(); } - if (typeof options.automaticKeyboardNavigation !== 'undefined') { - this.automaticKeyboardNavigation = options.automaticKeyboardNavigation; - } + this.mode = options.typeNavigationMode ?? TypeNavigationMode.Automatic; } - toggle(): void { + trigger(): void { this.triggered = !this.triggered; } @@ -429,21 +449,27 @@ class TypeLabelController implements IDisposable { return; } - const onChar = Event.chain(this.enabledDisposables.add(new DomEmitter(this.view.domNode, 'keydown')).event) + let typing = false; + + const onChar = this.enabledDisposables.add(Event.chain(this.enabledDisposables.add(new DomEmitter(this.view.domNode, 'keydown')).event)) .filter(e => !isInputElement(e.target as HTMLElement)) - .filter(() => this.automaticKeyboardNavigation || this.triggered) + .filter(() => this.mode === TypeNavigationMode.Automatic || this.triggered) .map(event => new StandardKeyboardEvent(event)) + .filter(e => typing || this.keyboardNavigationEventFilter(e)) .filter(e => this.delegate.mightProducePrintableCharacter(e)) - .forEach(e => e.preventDefault()) + .forEach(e => EventHelper.stop(e, true)) .map(event => event.browserEvent.key) .event; - const onClear = Event.debounce(onChar, () => null, 800); - const onInput = Event.reduce(Event.any(onChar, onClear), (r, i) => i === null ? null : ((r || '') + i)); + const onClear = Event.debounce(onChar, () => null, 800, undefined, undefined, this.enabledDisposables); + const onInput = Event.reduce(Event.any(onChar, onClear), (r, i) => i === null ? null : ((r || '') + i), undefined, this.enabledDisposables); onInput(this.onInput, this, this.enabledDisposables); onClear(this.onClear, this, this.enabledDisposables); + onChar(() => typing = true, undefined, this.enabledDisposables); + onClear(() => typing = false, undefined, this.enabledDisposables); + this.enabled = true; this.triggered = false; } @@ -473,15 +499,15 @@ class TypeLabelController implements IDisposable { private onInput(word: string | null): void { if (!word) { - this.state = TypeLabelControllerState.Idle; + this.state = TypeNavigationControllerState.Idle; this.triggered = false; return; } const focus = this.list.getFocus(); const start = focus.length > 0 ? focus[0] : 0; - const delta = this.state === TypeLabelControllerState.Idle ? 1 : 0; - this.state = TypeLabelControllerState.Typing; + const delta = this.state === TypeNavigationControllerState.Idle ? 1 : 0; + this.state = TypeNavigationControllerState.Typing; for (let i = 0; i < this.list.length; i++) { const index = (start + i + delta) % this.list.length; @@ -512,7 +538,7 @@ class DOMFocusController implements IDisposable { private list: List, private view: ListView ) { - const onKeyDown = Event.chain(this.disposables.add(new DomEmitter(view.domNode, 'keydown')).event) + const onKeyDown = this.disposables.add(Event.chain(this.disposables.add(new DomEmitter(view.domNode, 'keydown')).event)) .filter(e => !isInputElement(e.target as HTMLElement)) .map(e => new StandardKeyboardEvent(e)); @@ -801,6 +827,10 @@ export class DefaultStyleController implements IStyleController { content.push(`.monaco-list${suffix}:focus .monaco-list-row.selected .codicon { color: ${styles.listActiveSelectionIconForeground}; }`); } + if (styles.listFocusAndSelectionOutline) { + content.push(`.monaco-list${suffix}:focus .monaco-list-row.selected { outline-color: ${styles.listFocusAndSelectionOutline} !important; }`); + } + if (styles.listFocusAndSelectionBackground) { content.push(` .monaco-drag-image, @@ -839,11 +869,11 @@ export class DefaultStyleController implements IStyleController { } if (styles.listHoverBackground) { - content.push(`.monaco-list${suffix}:not(.drop-target) .monaco-list-row:hover:not(.selected):not(.focused) { background-color: ${styles.listHoverBackground}; }`); + content.push(`.monaco-list${suffix}:not(.drop-target):not(.dragging) .monaco-list-row:hover:not(.selected):not(.focused) { background-color: ${styles.listHoverBackground}; }`); } if (styles.listHoverForeground) { - content.push(`.monaco-list${suffix} .monaco-list-row:hover:not(.selected):not(.focused) { color: ${styles.listHoverForeground}; }`); + content.push(`.monaco-list${suffix}:not(.drop-target):not(.dragging) .monaco-list-row:hover:not(.selected):not(.focused) { color: ${styles.listHoverForeground}; }`); } if (styles.listSelectionOutline) { @@ -874,22 +904,6 @@ export class DefaultStyleController implements IStyleController { `); } - if (styles.listFilterWidgetBackground) { - content.push(`.monaco-list-type-filter { background-color: ${styles.listFilterWidgetBackground} }`); - } - - if (styles.listFilterWidgetOutline) { - content.push(`.monaco-list-type-filter { border: 1px solid ${styles.listFilterWidgetOutline}; }`); - } - - if (styles.listFilterWidgetNoMatchesOutline) { - content.push(`.monaco-list-type-filter.no-matches { border: 1px solid ${styles.listFilterWidgetNoMatchesOutline}; }`); - } - - if (styles.listMatchesShadow) { - content.push(`.monaco-list-type-filter { box-shadow: 1px 1px 1px ${styles.listMatchesShadow}; }`); - } - if (styles.tableColumnsBorder) { content.push(` .monaco-table:hover > .monaco-split-view2, @@ -912,9 +926,13 @@ export class DefaultStyleController implements IStyleController { } } +export interface IKeyboardNavigationEventFilter { + (e: StandardKeyboardEvent): boolean; +} + export interface IListOptionsUpdate extends IListViewOptionsUpdate { - readonly enableKeyboardNavigation?: boolean; - readonly automaticKeyboardNavigation?: boolean; + readonly typeNavigationEnabled?: boolean; + readonly typeNavigationMode?: TypeNavigationMode; readonly multipleSelectionSupport?: boolean; } @@ -927,6 +945,7 @@ export interface IListOptions extends IListOptionsUpdate { readonly multipleSelectionController?: IMultipleSelectionController; readonly styleController?: (suffix: string) => IStyleController; readonly accessibilityProvider?: IListAccessibilityProvider; + readonly keyboardNavigationEventFilter?: IKeyboardNavigationEventFilter; // list view options readonly useShadows?: boolean; @@ -941,15 +960,17 @@ export interface IListOptions extends IListOptionsUpdate { readonly smoothScrolling?: boolean; readonly scrollableElementChangeOptions?: ScrollableElementChangeOptions; readonly alwaysConsumeMouseWheel?: boolean; + readonly initialSize?: Dimension; } -export interface IListStyles { +export interface IListStyles extends IFindInputStyles { listBackground?: Color; listFocusBackground?: Color; listFocusForeground?: Color; listActiveSelectionBackground?: Color; listActiveSelectionForeground?: Color; listActiveSelectionIconForeground?: Color; + listFocusAndSelectionOutline?: Color; listFocusAndSelectionBackground?: Color; listFocusAndSelectionForeground?: Color; listInactiveSelectionBackground?: Color; @@ -967,7 +988,7 @@ export interface IListStyles { listFilterWidgetBackground?: Color; listFilterWidgetOutline?: Color; listFilterWidgetNoMatchesOutline?: Color; - listMatchesShadow?: Color; + listFilterWidgetShadow?: Color; treeIndentGuidesStroke?: Color; tableColumnsBorder?: Color; tableOddRowsBackgroundColor?: Color; @@ -978,6 +999,7 @@ const defaultStyles: IListStyles = { listActiveSelectionBackground: Color.fromHex('#0E639C'), listActiveSelectionForeground: Color.fromHex('#FFFFFF'), listActiveSelectionIconForeground: Color.fromHex('#FFFFFF'), + listFocusAndSelectionOutline: Color.fromHex('#90C2F9'), listFocusAndSelectionBackground: Color.fromHex('#094771'), listFocusAndSelectionForeground: Color.fromHex('#FFFFFF'), listInactiveSelectionBackground: Color.fromHex('#3F3F46'), @@ -1109,9 +1131,7 @@ class PipelineRenderer implements IListRenderer { let i = 0; for (const renderer of this.renderers) { - if (renderer.disposeElement) { - renderer.disposeElement(element, index, templateData[i], height); - } + renderer.disposeElement?.(element, index, templateData[i], height); i += 1; } @@ -1182,9 +1202,7 @@ class ListViewDragAndDrop implements IListViewDragAndDrop { } onDragStart(data: IDragAndDropData, originalEvent: DragEvent): void { - if (this.dnd.onDragStart) { - this.dnd.onDragStart(data, originalEvent); - } + this.dnd.onDragStart?.(data, originalEvent); } onDragOver(data: IDragAndDropData, targetElement: T, targetIndex: number, originalEvent: DragEvent): boolean | IListDragOverReaction { @@ -1196,9 +1214,7 @@ class ListViewDragAndDrop implements IListViewDragAndDrop { } onDragEnd(originalEvent: DragEvent): void { - if (this.dnd.onDragEnd) { - this.dnd.onDragEnd(originalEvent); - } + this.dnd.onDragEnd?.(originalEvent); } drop(data: IDragAndDropData, targetElement: T, targetIndex: number, originalEvent: DragEvent): void { @@ -1230,7 +1246,7 @@ export class List implements ISpliceable, IThemable, IDisposable { protected view: ListView; private spliceable: ISpliceable; private styleController: IStyleController; - private typeLabelController?: TypeLabelController; + private typeNavigationController?: TypeNavigationController; private accessibilityProvider?: IListAccessibilityProvider; private keyboardController: KeyboardController | undefined; private mouseController: MouseController; @@ -1239,11 +1255,11 @@ export class List implements ISpliceable, IThemable, IDisposable { protected readonly disposables = new DisposableStore(); @memoize get onDidChangeFocus(): Event> { - return Event.map(this.eventBufferer.wrapEvent(this.focus.onChange), e => this.toListEvent(e)); + return Event.map(this.eventBufferer.wrapEvent(this.focus.onChange), e => this.toListEvent(e), this.disposables); } @memoize get onDidChangeSelection(): Event> { - return Event.map(this.eventBufferer.wrapEvent(this.selection.onChange), e => this.toListEvent(e)); + return Event.map(this.eventBufferer.wrapEvent(this.selection.onChange), e => this.toListEvent(e), this.disposables); } get domId(): string { return this.view.domId; } @@ -1270,18 +1286,18 @@ export class List implements ISpliceable, IThemable, IDisposable { @memoize get onContextMenu(): Event> { let didJustPressContextMenuKey = false; - const fromKeyDown = Event.chain(this.disposables.add(new DomEmitter(this.view.domNode, 'keydown')).event) + const fromKeyDown = this.disposables.add(Event.chain(this.disposables.add(new DomEmitter(this.view.domNode, 'keydown')).event)) .map(e => new StandardKeyboardEvent(e)) .filter(e => didJustPressContextMenuKey = e.keyCode === KeyCode.ContextMenu || (e.shiftKey && e.keyCode === KeyCode.F10)) - .map(stopEvent) + .map(e => EventHelper.stop(e, true)) .filter(() => false) .event as Event; - const fromKeyUp = Event.chain(this.disposables.add(new DomEmitter(this.view.domNode, 'keyup')).event) + const fromKeyUp = this.disposables.add(Event.chain(this.disposables.add(new DomEmitter(this.view.domNode, 'keyup')).event)) .forEach(() => didJustPressContextMenuKey = false) .map(e => new StandardKeyboardEvent(e)) .filter(e => e.keyCode === KeyCode.ContextMenu || (e.shiftKey && e.keyCode === KeyCode.F10)) - .map(stopEvent) + .map(e => EventHelper.stop(e, true)) .map(({ browserEvent }) => { const focus = this.getFocus(); const index = focus.length ? focus[0] : undefined; @@ -1291,7 +1307,7 @@ export class List implements ISpliceable, IThemable, IDisposable { }) .event; - const fromMouse = Event.chain(this.view.onContextMenu) + const fromMouse = this.disposables.add(Event.chain(this.view.onContextMenu)) .filter(_ => !didJustPressContextMenuKey) .map(({ element, index, browserEvent }) => ({ element, index, anchor: { x: browserEvent.pageX + 1, y: browserEvent.pageY }, browserEvent })) .event; @@ -1328,9 +1344,7 @@ export class List implements ISpliceable, IThemable, IDisposable { if (this.accessibilityProvider) { baseRenderers.push(new AccessibiltyRenderer(this.accessibilityProvider)); - if (this.accessibilityProvider.onDidChangeActiveDescendant) { - this.accessibilityProvider.onDidChangeActiveDescendant(this.onDidChangeActiveDescendant, this, this.disposables); - } + this.accessibilityProvider.onDidChangeActiveDescendant?.(this.onDidChangeActiveDescendant, this, this.disposables); } renderers = renderers.map(r => new PipelineRenderer(r.templateId, [...baseRenderers, r])); @@ -1372,8 +1386,8 @@ export class List implements ISpliceable, IThemable, IDisposable { if (_options.keyboardNavigationLabelProvider) { const delegate = _options.keyboardNavigationDelegate || DefaultKeyboardNavigationDelegate; - this.typeLabelController = new TypeLabelController(this, this.view, _options.keyboardNavigationLabelProvider, delegate); - this.disposables.add(this.typeLabelController); + this.typeNavigationController = new TypeNavigationController(this, this.view, _options.keyboardNavigationLabelProvider, _options.keyboardNavigationEventFilter ?? (() => true), delegate); + this.disposables.add(this.typeNavigationController); } this.mouseController = this.createMouseController(_options); @@ -1398,9 +1412,7 @@ export class List implements ISpliceable, IThemable, IDisposable { updateOptions(optionsUpdate: IListOptionsUpdate = {}): void { this._options = { ...this._options, ...optionsUpdate }; - if (this.typeLabelController) { - this.typeLabelController.updateOptions(this._options); - } + this.typeNavigationController?.updateOptions(this._options); if (this._options.multipleSelectionController !== undefined) { if (this._options.multipleSelectionSupport) { @@ -1516,10 +1528,8 @@ export class List implements ISpliceable, IThemable, IDisposable { this.view.layout(height, width); } - toggleKeyboardNavigation(): void { - if (this.typeLabelController) { - this.typeLabelController.toggle(); - } + triggerTypeNavigation(): void { + this.typeNavigationController?.trigger(); } setSelection(indexes: number[], browserEvent?: UIEvent): void { @@ -1786,6 +1796,10 @@ export class List implements ISpliceable, IThemable, IDisposable { return this.view.domNode; } + getElementID(index: number): string { + return this.view.getElementDomId(index); + } + style(styles: IListStyles): void { this.styleController.style(styles); } diff --git a/src/vs/base/browser/ui/list/rangeMap.ts b/src/vs/base/browser/ui/list/rangeMap.ts index 8a732eb4460..5656a3b32de 100644 --- a/src/vs/base/browser/ui/list/rangeMap.ts +++ b/src/vs/base/browser/ui/list/rangeMap.ts @@ -21,7 +21,7 @@ export interface IRangedGroup { export function groupIntersect(range: IRange, groups: IRangedGroup[]): IRangedGroup[] { const result: IRangedGroup[] = []; - for (let r of groups) { + for (const r of groups) { if (range.start >= r.range.end) { continue; } @@ -62,7 +62,7 @@ export function consolidate(groups: IRangedGroup[]): IRangedGroup[] { const result: IRangedGroup[] = []; let previousGroup: IRangedGroup | null = null; - for (let group of groups) { + for (const group of groups) { const start = group.range.start; const end = group.range.end; const size = group.size; @@ -138,7 +138,7 @@ export class RangeMap { let index = 0; let size = 0; - for (let group of this.groups) { + for (const group of this.groups) { const count = group.range.end - group.range.start; const newSize = size + (count * group.size); @@ -172,7 +172,7 @@ export class RangeMap { let position = 0; let count = 0; - for (let group of this.groups) { + for (const group of this.groups) { const groupCount = group.range.end - group.range.start; const newCount = count + groupCount; diff --git a/src/vs/base/browser/ui/list/rowCache.ts b/src/vs/base/browser/ui/list/rowCache.ts index 319d839e7d7..a5c4b7e07c2 100644 --- a/src/vs/base/browser/ui/list/rowCache.ts +++ b/src/vs/base/browser/ui/list/rowCache.ts @@ -15,9 +15,7 @@ export interface IRow { function removeFromParent(element: HTMLElement): void { try { - if (element.parentElement) { - element.parentElement.removeChild(element); - } + element.parentElement?.removeChild(element); } catch (e) { // this will throw if this happens due to a blur event, nasty business } diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts index e4984b09654..e4f1e20ffd9 100644 --- a/src/vs/base/browser/ui/menu/menu.ts +++ b/src/vs/base/browser/ui/menu/menu.ts @@ -159,7 +159,7 @@ export class Menu extends ActionBar { } this._register(addDisposableListener(this.domNode, EventType.MOUSE_OUT, e => { - let relatedTarget = e.relatedTarget as HTMLElement; + const relatedTarget = e.relatedTarget as HTMLElement; if (!isAncestor(relatedTarget, this.domNode)) { this.focusedItem = undefined; this.updateFocus(); @@ -210,7 +210,7 @@ export class Menu extends ActionBar { })); - let parentData: ISubMenuData = { + const parentData: ISubMenuData = { parent: this }; @@ -341,7 +341,7 @@ export class Menu extends ActionBar { private setFocusedItem(element: HTMLElement): void { for (let i = 0; i < this.actionsList.children.length; i++) { - let elem = this.actionsList.children[i]; + const elem = this.actionsList.children[i]; if (element === elem) { this.focusedItem = i; break; @@ -446,9 +446,9 @@ class BaseMenuActionViewItem extends BaseActionViewItem { // Set mnemonic if (this.options.label && options.enableMnemonics) { - let label = this.getAction().label; + const label = this.action.label; if (label) { - let matches = MENU_MNEMONIC_REGEX.exec(label); + const matches = MENU_MNEMONIC_REGEX.exec(label); if (matches) { this.mnemonic = (!!matches[1] ? matches[1] : matches[3]).toLocaleLowerCase(); } @@ -552,9 +552,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem { override focus(): void { super.focus(); - if (this.item) { - this.item.focus(); - } + this.item?.focus(); this.applyStyle(); } @@ -574,7 +572,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem { if (this.options.label) { clearNode(this.label); - let label = stripIcons(this.getAction().label); + let label = stripIcons(this.action.label); if (label) { const cleanLabel = cleanMnemonic(label); if (!this.options.enableMnemonics) { @@ -609,9 +607,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem { this.label.innerText = replaceDoubleEscapes(label).trim(); } - if (this.item) { - this.item.setAttribute('aria-keyshortcuts', (!!matches[1] ? matches[1] : matches[3]).toLocaleLowerCase()); - } + this.item?.setAttribute('aria-keyshortcuts', (!!matches[1] ? matches[1] : matches[3]).toLocaleLowerCase()); } else { this.label.innerText = label.replace(/&&/g, '&').trim(); } @@ -628,7 +624,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem { this.item.classList.remove(...this.cssClass.split(' ')); } if (this.options.icon && this.label) { - this.cssClass = this.getAction().class || ''; + this.cssClass = this.action.class || ''; this.label.classList.add('icon'); if (this.cssClass) { this.label.classList.add(...this.cssClass.split(' ')); @@ -640,7 +636,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem { } override updateEnabled(): void { - if (this.getAction().enabled) { + if (this.action.enabled) { if (this.element) { this.element.classList.remove('disabled'); this.element.removeAttribute('aria-disabled'); @@ -669,7 +665,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem { return; } - const checked = this.getAction().checked; + const checked = this.action.checked; this.item.classList.toggle('checked', !!checked); if (checked !== undefined) { this.item.setAttribute('role', 'menuitemcheckbox'); @@ -765,7 +761,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem { } this._register(addDisposableListener(this.element, EventType.KEY_UP, e => { - let event = new StandardKeyboardEvent(e); + const event = new StandardKeyboardEvent(e); if (event.equals(KeyCode.RightArrow) || event.equals(KeyCode.Enter)) { EventHelper.stop(e, true); @@ -774,7 +770,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem { })); this._register(addDisposableListener(this.element, EventType.KEY_DOWN, e => { - let event = new StandardKeyboardEvent(e); + const event = new StandardKeyboardEvent(e); if (getActiveElement() === this.item) { if (event.equals(KeyCode.RightArrow) || event.equals(KeyCode.Enter)) { @@ -914,7 +910,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem { this.submenuContainer.style.top = `${top - viewBox.top}px`; this.submenuDisposables.add(addDisposableListener(this.submenuContainer, EventType.KEY_UP, e => { - let event = new StandardKeyboardEvent(e); + const event = new StandardKeyboardEvent(e); if (event.equals(KeyCode.LeftArrow)) { EventHelper.stop(e, true); @@ -925,7 +921,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem { })); this.submenuDisposables.add(addDisposableListener(this.submenuContainer, EventType.KEY_DOWN, e => { - let event = new StandardKeyboardEvent(e); + const event = new StandardKeyboardEvent(e); if (event.equals(KeyCode.LeftArrow)) { EventHelper.stop(e, true); } @@ -966,9 +962,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem { this.submenuIndicator.style.color = fgColor ? `${fgColor}` : ''; } - if (this.parentData.submenu) { - this.parentData.submenu.style(this.menuStyle); - } + this.parentData.submenu?.style(this.menuStyle); } override dispose(): void { diff --git a/src/vs/base/browser/ui/menu/menubar.css b/src/vs/base/browser/ui/menu/menubar.css index c4a57a11c0f..3a65f9a8829 100644 --- a/src/vs/base/browser/ui/menu/menubar.css +++ b/src/vs/base/browser/ui/menu/menubar.css @@ -10,9 +10,11 @@ flex-shrink: 1; box-sizing: border-box; height: 100%; - padding: 4px 0; overflow: hidden; - flex-wrap: wrap; +} + +.menubar.overflow-menu-only { + width: 38px; } .fullscreen .menubar:not(.compact) { @@ -21,15 +23,21 @@ } .menubar > .menubar-menu-button { + display: flex; align-items: center; box-sizing: border-box; - padding: 0px 8px; - border-radius: 5px; cursor: default; -webkit-app-region: no-drag; zoom: 1; white-space: nowrap; - outline: 0; + outline: 0 !important; +} + +.monaco-workbench .menubar:not(.compact) > .menubar-menu-button:focus .menubar-menu-title { + outline-width: 1px; + outline-style: solid; + outline-offset: -1px; + outline-color: var(--vscode-focusBorder); } .menubar.compact { @@ -43,6 +51,11 @@ padding: 0px; } +.menubar-menu-title { + padding: 0px 8px; + border-radius: 5px; +} + .menubar .menubar-menu-items-holder { position: fixed; left: 0px; @@ -64,8 +77,13 @@ } .menubar .toolbar-toggle-more { - width: 20px; - height: 100%; + width: 22px; + height: 22px; + padding: 0 8px; + display: flex; + align-items: center; + justify-content: center; + vertical-align: sub; } .menubar.compact .toolbar-toggle-more { @@ -79,19 +97,15 @@ justify-content: center; } -.menubar .toolbar-toggle-more { - padding: 0; - vertical-align: sub; -} - +.menubar:not(.compact) .menubar-menu-button:first-child .toolbar-toggle-more::before, .menubar.compact .toolbar-toggle-more::before { content: "\eb94" !important; } /* Match behavior of outline for activity bar icons */ -.menubar.compact > .menubar-menu-button.open, -.menubar.compact > .menubar-menu-button:focus, -.menubar.compact > .menubar-menu-button:hover { +.menubar.compact > .menubar-menu-button.open .menubar-menu-title, +.menubar.compact > .menubar-menu-button:focus .menubar-menu-title, +.menubar.compact > .menubar-menu-button:hover .menubar-menu-title{ outline-width: 1px !important; outline-offset: -8px !important; } diff --git a/src/vs/base/browser/ui/menu/menubar.ts b/src/vs/base/browser/ui/menu/menubar.ts index fbcc1fa7d7c..9408ea0d0b7 100644 --- a/src/vs/base/browser/ui/menu/menubar.ts +++ b/src/vs/base/browser/ui/menu/menubar.ts @@ -109,14 +109,14 @@ export class MenuBar extends Disposable { this.menuUpdater = this._register(new RunOnceScheduler(() => this.update(), 200)); this.actionRunner = this.options.actionRunner ?? this._register(new ActionRunner()); - this._register(this.actionRunner.onBeforeRun(() => { + this._register(this.actionRunner.onWillRun(() => { this.setUnfocusedState(); })); this._register(DOM.ModifierKeyEmitter.getInstance().event(this.onModifierKeyToggled, this)); this._register(DOM.addDisposableListener(this.container, DOM.EventType.KEY_DOWN, (e) => { - let event = new StandardKeyboardEvent(e as KeyboardEvent); + const event = new StandardKeyboardEvent(e as KeyboardEvent); let eventHandled = true; const key = !!e.key ? e.key.toLocaleLowerCase() : ''; @@ -154,7 +154,7 @@ export class MenuBar extends Disposable { })); this._register(DOM.addDisposableListener(this.container, DOM.EventType.FOCUS_IN, (e) => { - let event = e as FocusEvent; + const event = e as FocusEvent; if (event.relatedTarget) { if (!this.container.contains(event.relatedTarget as HTMLElement)) { @@ -164,7 +164,7 @@ export class MenuBar extends Disposable { })); this._register(DOM.addDisposableListener(this.container, DOM.EventType.FOCUS_OUT, (e) => { - let event = e as FocusEvent; + const event = e as FocusEvent; // We are losing focus and there is no related target, e.g. webview case if (!event.relatedTarget) { @@ -204,11 +204,11 @@ export class MenuBar extends Disposable { const menuIndex = this.menus.length; const cleanMenuLabel = cleanMnemonic(menuBarMenu.label); - let mnemonicMatches = MENU_MNEMONIC_REGEX.exec(menuBarMenu.label); + const mnemonicMatches = MENU_MNEMONIC_REGEX.exec(menuBarMenu.label); // Register mnemonics if (mnemonicMatches) { - let mnemonic = !!mnemonicMatches[1] ? mnemonicMatches[1] : mnemonicMatches[3]; + const mnemonic = !!mnemonicMatches[1] ? mnemonicMatches[1] : mnemonicMatches[3]; this.registerMnemonic(this.menus.length, mnemonic); } @@ -225,7 +225,7 @@ export class MenuBar extends Disposable { this.updateLabels(titleElement, buttonElement, menuBarMenu.label); this._register(DOM.addDisposableListener(buttonElement, DOM.EventType.KEY_UP, (e) => { - let event = new StandardKeyboardEvent(e as KeyboardEvent); + const event = new StandardKeyboardEvent(e as KeyboardEvent); let eventHandled = true; if ((event.equals(KeyCode.DownArrow) || event.equals(KeyCode.Enter)) && !this.isOpen) { @@ -313,8 +313,7 @@ export class MenuBar extends Disposable { createOverflowMenu(): void { const label = this.isCompact ? nls.localize('mAppMenu', 'Application Menu') : nls.localize('mMore', 'More'); - const title = this.isCompact ? label : undefined; - const buttonElement = $('div.menubar-menu-button', { 'role': 'menuitem', 'tabindex': this.isCompact ? 0 : -1, 'aria-label': label, 'title': title, 'aria-haspopup': true }); + const buttonElement = $('div.menubar-menu-button', { 'role': 'menuitem', 'tabindex': this.isCompact ? 0 : -1, 'aria-label': label, 'aria-haspopup': true }); const titleElement = $('div.menubar-menu-title.toolbar-toggle-more' + Codicon.menuBarMore.cssSelector, { 'role': 'none', 'aria-hidden': true }); buttonElement.appendChild(titleElement); @@ -322,7 +321,7 @@ export class MenuBar extends Disposable { buttonElement.style.visibility = 'hidden'; this._register(DOM.addDisposableListener(buttonElement, DOM.EventType.KEY_UP, (e) => { - let event = new StandardKeyboardEvent(e as KeyboardEvent); + const event = new StandardKeyboardEvent(e as KeyboardEvent); let eventHandled = true; const triggerKeys = [KeyCode.Enter]; @@ -330,7 +329,12 @@ export class MenuBar extends Disposable { triggerKeys.push(KeyCode.DownArrow); } else { triggerKeys.push(KeyCode.Space); - triggerKeys.push(this.options.compactMode === Direction.Right ? KeyCode.RightArrow : KeyCode.LeftArrow); + + if (this.options.compactMode === Direction.Right) { + triggerKeys.push(KeyCode.RightArrow); + } else if (this.options.compactMode === Direction.Left) { + triggerKeys.push(KeyCode.LeftArrow); + } } if ((triggerKeys.some(k => event.equals(k)) && !this.isOpen)) { @@ -469,6 +473,11 @@ export class MenuBar extends Disposable { return; } + const overflowMenuOnlyClass = 'overflow-menu-only'; + + // Remove overflow only restriction to allow the most space + this.container.classList.toggle(overflowMenuOnlyClass, false); + const sizeAvailable = this.container.offsetWidth; let currentSize = 0; let full = this.isCompact; @@ -476,7 +485,7 @@ export class MenuBar extends Disposable { this.numMenusShown = 0; const showableMenus = this.menus.filter(menu => menu.buttonElement !== undefined && menu.titleElement !== undefined) as (MenuBarMenuWithElements & { titleElement: HTMLElement; buttonElement: HTMLElement })[]; - for (let menuBarMenu of showableMenus) { + for (const menuBarMenu of showableMenus) { if (!full) { const size = menuBarMenu.buttonElement.offsetWidth; if (currentSize + size > sizeAvailable) { @@ -495,6 +504,18 @@ export class MenuBar extends Disposable { } } + + // If below minimium menu threshold, show the overflow menu only as hamburger menu + if (this.numMenusShown - 1 <= showableMenus.length / 2) { + for (const menuBarMenu of showableMenus) { + menuBarMenu.buttonElement.style.visibility = 'hidden'; + } + + full = true; + this.numMenusShown = 0; + currentSize = 0; + } + // Overflow if (this.isCompact) { this.overflowMenu.actions = []; @@ -534,6 +555,9 @@ export class MenuBar extends Disposable { this.container.appendChild(this.overflowMenu.buttonElement); this.overflowMenu.buttonElement.style.visibility = 'hidden'; } + + // If we are only showing the overflow, add this class to avoid taking up space + this.container.classList.toggle(overflowMenuOnlyClass, this.numMenusShown === 0); } private updateLabels(titleElement: HTMLElement, buttonElement: HTMLElement, label: string): void { @@ -542,7 +566,7 @@ export class MenuBar extends Disposable { // Update the button label to reflect mnemonics if (this.options.enableMnemonics) { - let cleanLabel = strings.escape(label); + const cleanLabel = strings.escape(label); // This is global so reset it MENU_ESCAPED_MNEMONIC_REGEX.lastIndex = 0; @@ -569,11 +593,11 @@ export class MenuBar extends Disposable { titleElement.innerText = cleanMenuLabel.replace(/&&/g, '&'); } - let mnemonicMatches = MENU_MNEMONIC_REGEX.exec(label); + const mnemonicMatches = MENU_MNEMONIC_REGEX.exec(label); // Register mnemonics if (mnemonicMatches) { - let mnemonic = !!mnemonicMatches[1] ? mnemonicMatches[1] : mnemonicMatches[3]; + const mnemonic = !!mnemonicMatches[1] ? mnemonicMatches[1] : mnemonicMatches[3]; if (this.options.enableMnemonics) { buttonElement.setAttribute('aria-keyshortcuts', 'Alt+' + mnemonic.toLocaleLowerCase()); @@ -740,7 +764,7 @@ export class MenuBar extends Disposable { this._onFocusStateChange.fire(this.focusState >= MenubarState.FOCUSED); } - private get isVisible(): boolean { + get isVisible(): boolean { return this.focusState >= MenubarState.VISIBLE; } @@ -838,7 +862,7 @@ export class MenuBar extends Disposable { if (this.menus) { this.menus.forEach(menuBarMenu => { if (menuBarMenu.titleElement && menuBarMenu.titleElement.children.length) { - let child = menuBarMenu.titleElement.children.item(0) as HTMLElement; + const child = menuBarMenu.titleElement.children.item(0) as HTMLElement; if (child) { child.style.textDecoration = (this.options.alwaysOnMnemonics || visible) ? 'underline' : ''; } @@ -956,16 +980,12 @@ export class MenuBar extends Disposable { } if (this.focusedMenu.holder) { - if (this.focusedMenu.holder.parentElement) { - this.focusedMenu.holder.parentElement.classList.remove('open'); - } + this.focusedMenu.holder.parentElement?.classList.remove('open'); this.focusedMenu.holder.remove(); } - if (this.focusedMenu.widget) { - this.focusedMenu.widget.dispose(); - } + this.focusedMenu.widget?.dispose(); this.focusedMenu = { index: this.focusedMenu.index }; } @@ -975,7 +995,7 @@ export class MenuBar extends Disposable { const actualMenuIndex = menuIndex >= this.numMenusShown ? MenuBar.OVERFLOW_INDEX : menuIndex; const customMenu = actualMenuIndex === MenuBar.OVERFLOW_INDEX ? this.overflowMenu : this.menus[actualMenuIndex]; - if (!customMenu.actions || !customMenu.buttonElement) { + if (!customMenu.actions || !customMenu.buttonElement || !customMenu.titleElement) { return; } @@ -983,23 +1003,24 @@ export class MenuBar extends Disposable { customMenu.buttonElement.classList.add('open'); - const buttonBoundingRect = customMenu.buttonElement.getBoundingClientRect(); + const titleBoundingRect = customMenu.titleElement.getBoundingClientRect(); + const titleBoundingRectZoom = DOM.getDomNodeZoomLevel(customMenu.titleElement); if (this.options.compactMode === Direction.Right) { - menuHolder.style.top = `${buttonBoundingRect.top}px`; - menuHolder.style.left = `${buttonBoundingRect.left + this.container.clientWidth}px`; + menuHolder.style.top = `${titleBoundingRect.top}px`; + menuHolder.style.left = `${titleBoundingRect.left + this.container.clientWidth}px`; } else if (this.options.compactMode === Direction.Left) { - menuHolder.style.top = `${buttonBoundingRect.top}px`; + menuHolder.style.top = `${titleBoundingRect.top}px`; menuHolder.style.right = `${this.container.clientWidth}px`; menuHolder.style.left = 'auto'; } else { - menuHolder.style.top = `${buttonBoundingRect.bottom}px`; - menuHolder.style.left = `${buttonBoundingRect.left}px`; + menuHolder.style.top = `${titleBoundingRect.bottom * titleBoundingRectZoom}px`; + menuHolder.style.left = `${titleBoundingRect.left * titleBoundingRectZoom}px`; } customMenu.buttonElement.appendChild(menuHolder); - let menuOptions: IMenuOptions = { + const menuOptions: IMenuOptions = { getKeyBinding: this.options.getKeybinding, actionRunner: this.actionRunner, enableMnemonics: this.options.alwaysOnMnemonics || (this.mnemonicsInUse && this.options.enableMnemonics), @@ -1008,7 +1029,7 @@ export class MenuBar extends Disposable { useEventAsContext: true }; - let menuWidget = this._register(new Menu(menuHolder, customMenu.actions, menuOptions)); + const menuWidget = this._register(new Menu(menuHolder, customMenu.actions, menuOptions)); if (this.menuStyle) { menuWidget.style(this.menuStyle); } diff --git a/src/vs/editor/contrib/suggest/browser/resizable.ts b/src/vs/base/browser/ui/resizable/resizable.ts similarity index 100% rename from src/vs/editor/contrib/suggest/browser/resizable.ts rename to src/vs/base/browser/ui/resizable/resizable.ts diff --git a/src/vs/base/browser/ui/sash/sash.ts b/src/vs/base/browser/ui/sash/sash.ts index 210b95df4b5..5cbf7e6f192 100644 --- a/src/vs/base/browser/ui/sash/sash.ts +++ b/src/vs/base/browser/ui/sash/sash.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { $, append, createStyleSheet, EventHelper, EventLike, getElementsByTagName } from 'vs/base/browser/dom'; +import { $, append, createStyleSheet, EventHelper, EventLike } from 'vs/base/browser/dom'; import { DomEmitter } from 'vs/base/browser/event'; -import { EventType, Gesture, GestureEvent } from 'vs/base/browser/touch'; +import { EventType, Gesture } from 'vs/base/browser/touch'; import { Delayer } from 'vs/base/common/async'; import { memoize } from 'vs/base/common/decorators'; import { Emitter, Event } from 'vs/base/common/event'; @@ -17,7 +17,7 @@ import 'vs/css!./sash'; * Allow the sashes to be visible at runtime. * @remark Use for development purposes only. */ -let DEBUG = false; +const DEBUG = false; // DEBUG = Boolean("true"); // done "weirdly" so that a lint warning prevents you from pushing this /** @@ -155,6 +155,7 @@ interface PointerEvent extends EventLike { readonly pageY: number; readonly altKey: boolean; readonly target: EventTarget | null; + readonly initialTarget?: EventTarget | undefined; } interface IPointerEventFactory { @@ -419,17 +420,22 @@ export class Sash extends Disposable { this._register(Gesture.addTarget(this.el)); - const onTouchStart = Event.map(this._register(new DomEmitter(this.el, EventType.Start)).event, e => ({ ...e, target: e.initialTarget ?? null })); + const onTouchStart = this._register(new DomEmitter(this.el, EventType.Start)).event; this._register(onTouchStart(e => this.onPointerStart(e, new GestureEventFactory(this.el)), this)); const onTap = this._register(new DomEmitter(this.el, EventType.Tap)).event; - const onDoubleTap = Event.map( - Event.filter( - Event.debounce(onTap, (res, event) => ({ event, count: (res?.count ?? 0) + 1 }), 250), - ({ count }) => count === 2 - ), - ({ event }) => ({ ...event, target: event.initialTarget ?? null }) - ); - this._register(onDoubleTap(this.onPointerDoublePress, this)); + + let doubleTapTimeout: any = undefined; + this._register(onTap(event => { + if (doubleTapTimeout) { + clearTimeout(doubleTapTimeout); + doubleTapTimeout = undefined; + this.onPointerDoublePress(event); + return; + } + + clearTimeout(doubleTapTimeout); + doubleTapTimeout = setTimeout(() => doubleTapTimeout = undefined, 250); + }, this)); if (typeof options.size === 'number') { this.size = options.size; @@ -493,7 +499,7 @@ export class Sash extends Disposable { return; } - const iframes = getElementsByTagName('iframe'); + const iframes = document.getElementsByTagName('iframe'); for (const iframe of iframes) { iframe.classList.add(PointerEventsDisabledCssClass); // disable mouse events on iframes as long as we drag the sash } @@ -645,12 +651,14 @@ export class Sash extends Disposable { } private getOrthogonalSash(e: PointerEvent): Sash | undefined { - if (!e.target || !(e.target instanceof HTMLElement)) { + const target = e.initialTarget ?? e.target; + + if (!target || !(target instanceof HTMLElement)) { return undefined; } - if (e.target.classList.contains('orthogonal-drag-handle')) { - return e.target.classList.contains('start') ? this.orthogonalStartSash : this.orthogonalEndSash; + if (target.classList.contains('orthogonal-drag-handle')) { + return target.classList.contains('start') ? this.orthogonalStartSash : this.orthogonalEndSash; } return undefined; diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts index f83c34fe519..b6b6c32a1dc 100644 --- a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts +++ b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts @@ -232,7 +232,7 @@ export abstract class AbstractScrollableElement extends Widget { this._setListeningToMouseWheel(this._options.handleMouseWheel); this.onmouseover(this._listenOnDomNode, (e) => this._onMouseOver(e)); - this.onnonbubblingmouseout(this._listenOnDomNode, (e) => this._onMouseOut(e)); + this.onmouseleave(this._listenOnDomNode, (e) => this._onMouseLeave(e)); this._hideTimeout = this._register(new TimeoutTimer()); this._isDragging = false; @@ -334,7 +334,7 @@ export abstract class AbstractScrollableElement extends Widget { this._revealOnScroll = value; } - public triggerScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent) { + public delegateScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent) { this._onMouseWheel(new StandardWheelEvent(browserEvent)); } @@ -525,7 +525,7 @@ export abstract class AbstractScrollableElement extends Widget { this._hide(); } - private _onMouseOut(e: IMouseEvent): void { + private _onMouseLeave(e: IMouseEvent): void { this._mouseIsOver = false; this._hide(); } diff --git a/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.ts b/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.ts index 3c4a40b824f..791c7332ffb 100644 --- a/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.ts +++ b/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.ts @@ -103,9 +103,7 @@ export class ScrollbarVisibilityController extends Disposable { // The CSS animation doesn't play otherwise this._revealTimer.setIfNotSet(() => { - if (this._domNode) { - this._domNode.setClassName(this._visibleClassName); - } + this._domNode?.setClassName(this._visibleClassName); }, 0); } @@ -115,8 +113,6 @@ export class ScrollbarVisibilityController extends Disposable { return; } this._isVisible = false; - if (this._domNode) { - this._domNode.setClassName(this._invisibleClassName + (withFadeAway ? ' fade' : '')); - } + this._domNode?.setClassName(this._invisibleClassName + (withFadeAway ? ' fade' : '')); } } diff --git a/src/vs/base/browser/ui/selectBox/selectBox.css b/src/vs/base/browser/ui/selectBox/selectBox.css index d296d1ff0a0..d4a46f25f86 100644 --- a/src/vs/base/browser/ui/selectBox/selectBox.css +++ b/src/vs/base/browser/ui/selectBox/selectBox.css @@ -5,6 +5,8 @@ .monaco-select-box { width: 100%; + cursor: pointer; + border-radius: 2px; } .monaco-select-box-dropdown-container { diff --git a/src/vs/base/browser/ui/selectBox/selectBox.ts b/src/vs/base/browser/ui/selectBox/selectBox.ts index 55e23987440..d31b8828697 100644 --- a/src/vs/base/browser/ui/selectBox/selectBox.ts +++ b/src/vs/base/browser/ui/selectBox/selectBox.ts @@ -14,6 +14,7 @@ import { Event } from 'vs/base/common/event'; import { IDisposable } from 'vs/base/common/lifecycle'; import { deepClone } from 'vs/base/common/objects'; import { isMacintosh } from 'vs/base/common/platform'; +import { IThemable } from 'vs/base/common/styler'; import 'vs/css!./selectBox'; @@ -40,6 +41,7 @@ export interface ISelectBoxDelegate extends IDisposable { export interface ISelectBoxOptions { useCustomDrawn?: boolean; ariaLabel?: string; + ariaDescription?: string; minBottomMargin?: number; optionsAsChildren?: boolean; } @@ -76,7 +78,7 @@ export interface ISelectData { index: number; } -export class SelectBox extends Widget implements ISelectBoxDelegate { +export class SelectBox extends Widget implements ISelectBoxDelegate, IThemable { private selectBoxDelegate: ISelectBoxDelegate; constructor(options: ISelectOptionItem[], selected: number, contextViewProvider: IContextViewProvider, styles: ISelectBoxStyles = deepClone(defaultStyles), selectBoxOptions?: ISelectBoxOptions) { diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts index f1a181ca650..cfdaca03d75 100644 --- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts +++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts @@ -15,7 +15,7 @@ import { ISelectBoxDelegate, ISelectBoxOptions, ISelectBoxStyles, ISelectData, I import * as arrays from 'vs/base/common/arrays'; import { Emitter, Event } from 'vs/base/common/event'; import { KeyCode, KeyCodeUtils } from 'vs/base/common/keyCodes'; -import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle'; +import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; import { isMacintosh } from 'vs/base/common/platform'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import 'vs/css!./selectBoxCustom'; @@ -31,7 +31,6 @@ interface ISelectListTemplateData { text: HTMLElement; detail: HTMLElement; decoratorRight: HTMLElement; - disposables: IDisposable[]; } class SelectListRenderer implements IListRenderer { @@ -40,7 +39,6 @@ class SelectListRenderer implements IListRenderer(); this._register(this._onDidSelect); @@ -164,8 +166,8 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi this.selectionDetailsPane = dom.append(this.selectDropDownContainer, $('.select-box-details-pane')); // Create span flex box item/div we can measure and control - let widthControlOuterDiv = dom.append(this.selectDropDownContainer, $('.select-box-dropdown-container-width-control')); - let widthControlInnerDiv = dom.append(widthControlOuterDiv, $('.width-control-div')); + const widthControlOuterDiv = dom.append(this.selectDropDownContainer, $('.select-box-dropdown-container-width-control')); + const widthControlInnerDiv = dom.append(widthControlOuterDiv, $('.width-control-div')); this.widthControlElement = document.createElement('span'); this.widthControlElement.className = 'option-text-width-control'; dom.append(widthControlInnerDiv, this.widthControlElement); @@ -286,9 +288,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi // Mirror options in drop-down // Populate select list for non-native select mode - if (this.selectList) { - this.selectList.splice(0, this.selectList.length, this.options); - } + this.selectList?.splice(0, this.selectList.length, this.options); } public select(index: number): void { @@ -434,7 +434,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi } private createOption(value: string, index: number, disabled?: boolean): HTMLOptionElement { - let option = document.createElement('option'); + const option = document.createElement('option'); option.value = value; option.text = value; option.disabled = !!disabled; @@ -878,7 +878,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi } }; - const rendered = renderMarkdown({ value: text }, { actionHandler }); + const rendered = renderMarkdown({ value: text, supportThemeIcons: true }, { actionHandler }); rendered.element.classList.add('select-box-description-markdown'); cleanRenderedMarkdown(rendered.element); diff --git a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts index 7248cef367e..7a43184de2b 100644 --- a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts +++ b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts @@ -35,6 +35,10 @@ export class SelectBoxNative extends Disposable implements ISelectBoxDelegate { this.selectElement.setAttribute('aria-label', this.selectBoxOptions.ariaLabel); } + if (typeof this.selectBoxOptions.ariaDescription === 'string') { + this.selectElement.setAttribute('aria-description', this.selectBoxOptions.ariaDescription); + } + this._onDidSelect = this._register(new Emitter()); this.styles = styles; diff --git a/src/vs/base/browser/ui/splitview/paneview.css b/src/vs/base/browser/ui/splitview/paneview.css index 8610b867deb..81f66e998ab 100644 --- a/src/vs/base/browser/ui/splitview/paneview.css +++ b/src/vs/base/browser/ui/splitview/paneview.css @@ -24,7 +24,6 @@ height: 22px; font-size: 11px; font-weight: bold; - text-transform: uppercase; overflow: hidden; display: flex; cursor: pointer; @@ -32,6 +31,10 @@ box-sizing: border-box; } +.monaco-pane-view .pane > .pane-header > .title { + text-transform: uppercase; +} + .monaco-pane-view .pane.horizontal:not(.expanded) > .pane-header { flex-direction: column; height: 100%; diff --git a/src/vs/base/browser/ui/splitview/paneview.ts b/src/vs/base/browser/ui/splitview/paneview.ts index fc646081f2a..c59e58ef51f 100644 --- a/src/vs/base/browser/ui/splitview/paneview.ts +++ b/src/vs/base/browser/ui/splitview/paneview.ts @@ -60,7 +60,7 @@ export abstract class Pane extends Disposable implements IView { private _headerVisible = true; private _minimumBodySize: number; private _maximumBodySize: number; - private ariaHeaderLabel: string; + private _ariaHeaderLabel: string; private styles: IPaneStyles = {}; private animationTimer: number | undefined = undefined; @@ -70,6 +70,15 @@ export abstract class Pane extends Disposable implements IView { private readonly _onDidChangeExpansionState = this._register(new Emitter()); readonly onDidChangeExpansionState: Event = this._onDidChangeExpansionState.event; + get ariaHeaderLabel(): string { + return this._ariaHeaderLabel; + } + + set ariaHeaderLabel(newLabel: string) { + this._ariaHeaderLabel = newLabel; + this.header.setAttribute('aria-label', this.ariaHeaderLabel); + } + get draggableElement(): HTMLElement { return this.header; } @@ -127,7 +136,7 @@ export abstract class Pane extends Disposable implements IView { super(); this._expanded = typeof options.expanded === 'undefined' ? true : !!options.expanded; this._orientation = typeof options.orientation === 'undefined' ? Orientation.VERTICAL : options.orientation; - this.ariaHeaderLabel = localize('viewSection', "{0} Section", options.title); + this._ariaHeaderLabel = localize('viewSection', "{0} Section", options.title); this._minimumBodySize = typeof options.minimumBodySize === 'number' ? options.minimumBodySize : this._orientation === Orientation.HORIZONTAL ? 200 : 120; this._maximumBodySize = typeof options.maximumBodySize === 'number' ? options.maximumBodySize : Number.POSITIVE_INFINITY; @@ -143,9 +152,7 @@ export abstract class Pane extends Disposable implements IView { return false; } - if (this.element) { - this.element.classList.toggle('expanded', expanded); - } + this.element?.classList.toggle('expanded', expanded); this._expanded = !!expanded; this.updateHeader(); diff --git a/src/vs/base/browser/ui/splitview/splitview.ts b/src/vs/base/browser/ui/splitview/splitview.ts index a692d06373f..b57f817dbb7 100644 --- a/src/vs/base/browser/ui/splitview/splitview.ts +++ b/src/vs/base/browser/ui/splitview/splitview.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { $, addDisposableListener, append, scheduleAtNextAnimationFrame } from 'vs/base/browser/dom'; +import { DomEmitter } from 'vs/base/browser/event'; import { ISashEvent as IBaseSashEvent, Orientation, Sash, SashState } from 'vs/base/browser/ui/sash/sash'; import { SmoothScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; import { pushToEnd, pushToStart, range } from 'vs/base/common/arrays'; @@ -52,7 +53,7 @@ export interface IView { readonly minimumSize: number; /** - * A minimum size for this view. + * A maximum size for this view. * * @remarks If none, set it to `Number.POSITIVE_INFINITY`. */ @@ -231,9 +232,7 @@ abstract class ViewItem { this.container.classList.toggle('visible', visible); - if (this.view.setVisible) { - this.view.setVisible(visible); - } + this.view.setVisible?.(visible); } get minimumSize(): number { return this.visible ? this.view.minimumSize : 0; } @@ -556,10 +555,27 @@ export class SplitView extends Disposable { horizontal: this.orientation === Orientation.HORIZONTAL ? (options.scrollbarVisibility ?? ScrollbarVisibility.Auto) : ScrollbarVisibility.Hidden }, this.scrollable)); + // https://github.com/microsoft/vscode/issues/157737 + const onDidScrollViewContainer = this._register(new DomEmitter(this.viewContainer, 'scroll')).event; + this._register(onDidScrollViewContainer(_ => { + const position = this.scrollableElement.getScrollPosition(); + const scrollLeft = Math.abs(this.viewContainer.scrollLeft - position.scrollLeft) <= 1 ? undefined : this.viewContainer.scrollLeft; + const scrollTop = Math.abs(this.viewContainer.scrollTop - position.scrollTop) <= 1 ? undefined : this.viewContainer.scrollTop; + + if (scrollLeft !== undefined || scrollTop !== undefined) { + this.scrollableElement.setScrollPosition({ scrollLeft, scrollTop }); + } + })); + this.onDidScroll = this.scrollableElement.onScroll; this._register(this.onDidScroll(e => { - this.viewContainer.scrollTop = e.scrollTop; - this.viewContainer.scrollLeft = e.scrollLeft; + if (e.scrollTopChanged) { + this.viewContainer.scrollTop = e.scrollTop; + } + + if (e.scrollLeftChanged) { + this.viewContainer.scrollLeft = e.scrollLeft; + } })); append(this.el, this.scrollableElement.getDomNode()); @@ -933,6 +949,23 @@ export class SplitView extends Disposable { this.state = State.Idle; } + /** + * Returns whether all other {@link IView views} are at their minimum size. + */ + isViewSizeMaximized(index: number): boolean { + if (index < 0 || index >= this.viewItems.length) { + return false; + } + + for (const item of this.viewItems) { + if (item !== this.viewItems[index] && item.size > item.minimumSize) { + return false; + } + } + + return true; + } + /** * Distribute the entire {@link SplitView} size among all {@link IView views}. */ @@ -1011,7 +1044,7 @@ export class SplitView extends Disposable { // Add sash if (this.viewItems.length > 1) { - let opts = { orthogonalStartSash: this.orthogonalStartSash, orthogonalEndSash: this.orthogonalEndSash }; + const opts = { orthogonalStartSash: this.orthogonalStartSash, orthogonalEndSash: this.orthogonalEndSash }; const sash = this.orientation === Orientation.VERTICAL ? new Sash(this.sashContainer, { getHorizontalSashTop: s => this.getSashPosition(s), getHorizontalSashWidth: this.getSashOrthogonalSize }, { ...opts, orientation: Orientation.HORIZONTAL }) diff --git a/src/vs/base/browser/ui/table/table.css b/src/vs/base/browser/ui/table/table.css index 89edc6f0ffe..087f9d3ebf9 100644 --- a/src/vs/base/browser/ui/table/table.css +++ b/src/vs/base/browser/ui/table/table.css @@ -10,6 +10,7 @@ height: 100%; width: 100%; white-space: nowrap; + overflow: hidden; } .monaco-table > .monaco-split-view2 { diff --git a/src/vs/base/browser/ui/table/tableWidget.ts b/src/vs/base/browser/ui/table/tableWidget.ts index 03f6f284785..7f1d0560335 100644 --- a/src/vs/base/browser/ui/table/tableWidget.ts +++ b/src/vs/base/browser/ui/table/tableWidget.ts @@ -265,8 +265,8 @@ export class Table implements ISpliceable, IThemable, IDisposable { this.list.layout(listHeight, width); } - toggleKeyboardNavigation(): void { - this.list.toggleKeyboardNavigation(); + triggerTypeNavigation(): void { + this.list.triggerTypeNavigation(); } style(styles: ITableStyles): void { diff --git a/src/vs/base/browser/ui/toggle/toggle.css b/src/vs/base/browser/ui/toggle/toggle.css index 9c84fed3cfc..9b1968b4b5d 100644 --- a/src/vs/base/browser/ui/toggle/toggle.css +++ b/src/vs/base/browser/ui/toggle/toggle.css @@ -16,7 +16,6 @@ box-sizing: border-box; user-select: none; -webkit-user-select: none; - -ms-user-select: none; } .monaco-custom-toggle:hover { diff --git a/src/vs/base/browser/ui/toggle/toggle.ts b/src/vs/base/browser/ui/toggle/toggle.ts index 8d2387dbc26..06b5cf0fe14 100644 --- a/src/vs/base/browser/ui/toggle/toggle.ts +++ b/src/vs/base/browser/ui/toggle/toggle.ts @@ -141,13 +141,14 @@ export class Toggle extends Widget { } }); - this.ignoreGesture(this.domNode); + this._register(this.ignoreGesture(this.domNode)); this.onkeydown(this.domNode, (keyboardEvent) => { if (keyboardEvent.keyCode === KeyCode.Space || keyboardEvent.keyCode === KeyCode.Enter) { this.checked = !this._checked; this._onChange.fire(true); keyboardEvent.preventDefault(); + keyboardEvent.stopPropagation(); return; } diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts index d5811906eda..6ebd8c2a853 100644 --- a/src/vs/base/browser/ui/toolbar/toolbar.ts +++ b/src/vs/base/browser/ui/toolbar/toolbar.ts @@ -36,13 +36,13 @@ export interface IToolBarOptions { */ export class ToolBar extends Disposable { private options: IToolBarOptions; - private actionBar: ActionBar; + protected readonly actionBar: ActionBar; private toggleMenuAction: ToggleMenuAction; private toggleMenuActionViewItem: DropdownMenuActionViewItem | undefined; private submenuActionViewItems: DropdownMenuActionViewItem[] = []; private hasSecondaryActions: boolean = false; - private lookupKeybindings: boolean; - private element: HTMLElement; + private readonly lookupKeybindings: boolean; + private readonly element: HTMLElement; private _onDidChangeDropdownVisibility = this._register(new EventMultiplexer()); readonly onDidChangeDropdownVisibility = this._onDidChangeDropdownVisibility.event; @@ -130,9 +130,7 @@ export class ToolBar extends Disposable { set context(context: unknown) { this.actionBar.context = context; - if (this.toggleMenuActionViewItem) { - this.toggleMenuActionViewItem.setActionContext(context); - } + this.toggleMenuActionViewItem?.setActionContext(context); for (const actionViewItem of this.submenuActionViewItems) { actionViewItem.setActionContext(context); } @@ -142,6 +140,10 @@ export class ToolBar extends Disposable { return this.element; } + focus(): void { + this.actionBar.focus(); + } + getItemsWidth(): number { let itemsWidth = 0; for (let i = 0; i < this.actionBar.length(); i++) { @@ -150,8 +152,8 @@ export class ToolBar extends Disposable { return itemsWidth; } - getItemAction(index: number) { - return this.actionBar.getAction(index); + getItemAction(indexOrElement: number | HTMLElement) { + return this.actionBar.getAction(indexOrElement); } getItemWidth(index: number): number { @@ -169,7 +171,7 @@ export class ToolBar extends Disposable { setActions(primaryActions: ReadonlyArray, secondaryActions?: ReadonlyArray): void { this.clear(); - let primaryActionsToSet = primaryActions ? primaryActions.slice(0) : []; + const primaryActionsToSet = primaryActions ? primaryActions.slice(0) : []; // Inject additional action to open secondary actions if present this.hasSecondaryActions = !!(secondaryActions && secondaryActions.length > 0); diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts index a1470dca72f..c82ff404931 100644 --- a/src/vs/base/browser/ui/tree/abstractTree.ts +++ b/src/vs/base/browser/ui/tree/abstractTree.ts @@ -3,27 +3,34 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DragAndDropData, IDragAndDropData, StaticDND } from 'vs/base/browser/dnd'; -import { $, addDisposableListener, append, clearNode, createStyleSheet, getDomNodePagePosition, hasParentWithClass } from 'vs/base/browser/dom'; +import { IDragAndDropData } from 'vs/base/browser/dnd'; +import { $, append, clearNode, createStyleSheet, h, hasParentWithClass } from 'vs/base/browser/dom'; import { DomEmitter } from 'vs/base/browser/event'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; -import { IIdentityProvider, IKeyboardNavigationDelegate, IKeyboardNavigationLabelProvider, IListContextMenuEvent, IListDragAndDrop, IListDragOverReaction, IListMouseEvent, IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; +import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; +import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview'; +import { FindInput, IFindInputStyles } from 'vs/base/browser/ui/findinput/findInput'; +import { IMessage, MessageType } from 'vs/base/browser/ui/inputbox/inputBox'; +import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListContextMenuEvent, IListDragAndDrop, IListDragOverReaction, IListMouseEvent, IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; import { ElementsDragAndDropData } from 'vs/base/browser/ui/list/listView'; -import { DefaultKeyboardNavigationDelegate, IListOptions, IListStyles, isInputElement, isMonacoEditor, List, MouseController } from 'vs/base/browser/ui/list/listWidget'; +import { IListOptions, IListStyles, isButton, isInputElement, isMonacoEditor, List, MouseController, TypeNavigationMode } from 'vs/base/browser/ui/list/listWidget'; +import { Toggle } from 'vs/base/browser/ui/toggle/toggle'; import { getVisibleState, isFilterResult } from 'vs/base/browser/ui/tree/indexTreeModel'; import { ICollapseStateChangeEvent, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeEvent, ITreeFilter, ITreeModel, ITreeModelSpliceEvent, ITreeMouseEvent, ITreeNavigator, ITreeNode, ITreeRenderer, TreeDragOverBubble, TreeError, TreeFilterResult, TreeMouseEventTarget, TreeVisibility } from 'vs/base/browser/ui/tree/tree'; +import { Action } from 'vs/base/common/actions'; import { distinct, equals, firstOrDefault, range } from 'vs/base/common/arrays'; -import { disposableTimeout } from 'vs/base/common/async'; +import { disposableTimeout, timeout } from 'vs/base/common/async'; import { Codicon } from 'vs/base/common/codicons'; import { SetMap } from 'vs/base/common/collections'; +import { Color } from 'vs/base/common/color'; import { Emitter, Event, EventBufferer, Relay } from 'vs/base/common/event'; import { fuzzyScore, FuzzyScore } from 'vs/base/common/filters'; import { KeyCode } from 'vs/base/common/keyCodes'; import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { clamp } from 'vs/base/common/numbers'; -import { isMacintosh } from 'vs/base/common/platform'; import { ScrollEvent } from 'vs/base/common/scrollable'; import { ISpliceable } from 'vs/base/common/sequence'; +import { isNumber } from 'vs/base/common/types'; import 'vs/css!./media/tree'; import { localize } from 'vs/nls'; @@ -70,9 +77,7 @@ class TreeNodeListDragAndDrop implements IListDragAndDrop< } onDragStart(data: IDragAndDropData, originalEvent: DragEvent): void { - if (this.dnd.onDragStart) { - this.dnd.onDragStart(asTreeDragAndDropData(data), originalEvent); - } + this.dnd.onDragStart?.(asTreeDragAndDropData(data), originalEvent); } onDragOver(data: IDragAndDropData, targetNode: ITreeNode | undefined, targetIndex: number | undefined, originalEvent: DragEvent, raw = true): boolean | IListDragOverReaction { @@ -137,9 +142,7 @@ class TreeNodeListDragAndDrop implements IListDragAndDrop< } onDragEnd(originalEvent: DragEvent): void { - if (this.dnd.onDragEnd) { - this.dnd.onDragEnd(originalEvent); - } + this.dnd.onDragEnd?.(originalEvent); } } @@ -198,8 +201,7 @@ function asListOptions(modelProvider: () => ITreeModel implements IListV } setDynamicHeight(element: N, height: number): void { - if (this.delegate.setDynamicHeight) { - this.delegate.setDynamicHeight(element.element, height); - } + this.delegate.setDynamicHeight?.(element.element, height); } } @@ -298,18 +298,14 @@ interface ITreeRendererOptions { readonly hideTwistiesOfChildlessElements?: boolean; } -interface IRenderData { - templateData: ITreeListTemplateData; - height: number; -} - interface Collection { readonly elements: T[]; readonly onDidChange: Event; } -class EventCollection implements Collection { +class EventCollection implements Collection, IDisposable { + private readonly disposables = new DisposableStore(); readonly onDidChange: Event; get elements(): T[] { @@ -317,7 +313,11 @@ class EventCollection implements Collection { } constructor(onDidChange: Event, private _elements: T[] = []) { - this.onDidChange = Event.forEach(onDidChange, elements => this._elements = elements); + this.onDidChange = Event.forEach(onDidChange, elements => this._elements = elements, this.disposables); + } + + dispose(): void { + this.disposables.dispose(); } } @@ -327,12 +327,11 @@ class TreeRenderer implements IListRenderer readonly templateId: string; private renderedElements = new Map>(); - private renderedNodes = new Map, IRenderData>(); + private renderedNodes = new Map, ITreeListTemplateData>(); private indent: number = TreeRenderer.DefaultIndent; private hideTwistiesOfChildlessElements: boolean = false; private shouldRenderIndentGuides: boolean = false; - private renderedIndentGuides = new SetMap, HTMLDivElement>(); private activeIndentNodes = new Set>(); private indentGuidesDisposable: IDisposable = Disposable.None; @@ -343,21 +342,27 @@ class TreeRenderer implements IListRenderer private modelProvider: () => ITreeModel, onDidChangeCollapseState: Event>, private activeNodes: Collection>, + private renderedIndentGuides: SetMap, HTMLDivElement>, options: ITreeRendererOptions = {} ) { this.templateId = renderer.templateId; this.updateOptions(options); Event.map(onDidChangeCollapseState, e => e.node)(this.onDidChangeNodeTwistieState, this, this.disposables); - - if (renderer.onDidChangeTwistieState) { - renderer.onDidChangeTwistieState(this.onDidChangeTwistieState, this, this.disposables); - } + renderer.onDidChangeTwistieState?.(this.onDidChangeTwistieState, this, this.disposables); } updateOptions(options: ITreeRendererOptions = {}): void { if (typeof options.indent !== 'undefined') { - this.indent = clamp(options.indent, 0, 40); + const indent = clamp(options.indent, 0, 40); + + if (indent !== this.indent) { + this.indent = indent; + + for (const [node, templateData] of this.renderedNodes) { + this.renderTreeElement(node, templateData); + } + } } if (typeof options.renderIndentGuides !== 'undefined') { @@ -393,30 +398,16 @@ class TreeRenderer implements IListRenderer } renderElement(node: ITreeNode, index: number, templateData: ITreeListTemplateData, height: number | undefined): void { - if (typeof height === 'number') { - this.renderedNodes.set(node, { templateData, height }); - this.renderedElements.set(node.element, node); - } - - const indent = TreeRenderer.DefaultIndent + (node.depth - 1) * this.indent; - templateData.twistie.style.paddingLeft = `${indent}px`; - templateData.indent.style.width = `${indent + this.indent - 16}px`; - - this.renderTwistie(node, templateData); - - if (typeof height === 'number') { - this.renderIndentGuides(node, templateData); - } - + this.renderedNodes.set(node, templateData); + this.renderedElements.set(node.element, node); + this.renderTreeElement(node, templateData); this.renderer.renderElement(node, index, templateData.templateData, height); } disposeElement(node: ITreeNode, index: number, templateData: ITreeListTemplateData, height: number | undefined): void { templateData.indentGuidesDisposable.dispose(); - if (this.renderer.disposeElement) { - this.renderer.disposeElement(node, index, templateData.templateData, height); - } + this.renderer.disposeElement?.(node, index, templateData.templateData, height); if (typeof height === 'number') { this.renderedNodes.delete(node); @@ -439,18 +430,27 @@ class TreeRenderer implements IListRenderer } private onDidChangeNodeTwistieState(node: ITreeNode): void { - const data = this.renderedNodes.get(node); + const templateData = this.renderedNodes.get(node); - if (!data) { + if (!templateData) { return; } - this.renderTwistie(node, data.templateData); this._onDidChangeActiveNodes(this.activeNodes.elements); - this.renderIndentGuides(node, data.templateData); + this.renderTreeElement(node, templateData); } - private renderTwistie(node: ITreeNode, templateData: ITreeListTemplateData) { + private renderTreeElement(node: ITreeNode, templateData: ITreeListTemplateData) { + const indent = TreeRenderer.DefaultIndent + (node.depth - 1) * this.indent; + templateData.twistie.style.paddingLeft = `${indent}px`; + templateData.indent.style.width = `${indent + this.indent - 16}px`; + + if (node.collapsible) { + templateData.container.setAttribute('aria-expanded', String(!node.collapsed)); + } else { + templateData.container.removeAttribute('aria-expanded'); + } + templateData.twistie.classList.remove(...Codicon.treeItemExpanded.classNamesArray); let twistieRendered = false; @@ -470,14 +470,6 @@ class TreeRenderer implements IListRenderer templateData.twistie.classList.remove('collapsible', 'collapsed'); } - if (node.collapsible) { - templateData.container.setAttribute('aria-expanded', String(!node.collapsed)); - } else { - templateData.container.removeAttribute('aria-expanded'); - } - } - - private renderIndentGuides(target: ITreeNode, templateData: ITreeListTemplateData): void { clearNode(templateData.indent); templateData.indentGuidesDisposable.dispose(); @@ -488,8 +480,6 @@ class TreeRenderer implements IListRenderer const disposableStore = new DisposableStore(); const model = this.modelProvider(); - let node = target; - while (true) { const ref = model.getNodeLocation(node); const parentRef = model.getParentNodeLocation(ref); @@ -568,7 +558,7 @@ class TreeRenderer implements IListRenderer export type LabelFuzzyScore = { label: string; score: FuzzyScore }; -class TypeFilter implements ITreeFilter, IDisposable { +class FindFilter implements ITreeFilter, IDisposable { private _totalCount = 0; get totalCount(): number { return this._totalCount; } private _matchCount = 0; @@ -592,15 +582,11 @@ class TypeFilter implements ITreeFilter, IDi } filter(element: T, parentVisibility: TreeVisibility): TreeFilterResult { + let visibility = TreeVisibility.Visible; + if (this._filter) { const result = this._filter.filter(element, parentVisibility); - if (this.tree.options.simpleKeyboardNavigation) { - return result; - } - - let visibility: TreeVisibility; - if (typeof result === 'boolean') { visibility = result ? TreeVisibility.Visible : TreeVisibility.Hidden; } else if (isFilterResult(result)) { @@ -616,9 +602,9 @@ class TypeFilter implements ITreeFilter, IDi this._totalCount++; - if (this.tree.options.simpleKeyboardNavigation || !this._pattern) { + if (!this._pattern) { this._matchCount++; - return { data: FuzzyScore.Default, visibility: true }; + return { data: FuzzyScore.Default, visibility }; } const label = this.keyboardNavigationLabelProvider.getKeyboardNavigationLabel(element); @@ -627,22 +613,22 @@ class TypeFilter implements ITreeFilter, IDi for (const l of labels) { const labelStr = l && l.toString(); if (typeof labelStr === 'undefined') { - return { data: FuzzyScore.Default, visibility: true }; + return { data: FuzzyScore.Default, visibility }; } const score = fuzzyScore(this._pattern, this._lowercasePattern, 0, labelStr, labelStr.toLowerCase(), 0, { firstMatchCanBeWeak: true, boostFullMatch: true }); if (score) { this._matchCount++; return labels.length === 1 ? - { data: score, visibility: true } : - { data: { label: labelStr, score: score }, visibility: true }; + { data: score, visibility } : + { data: { label: labelStr, score: score }, visibility }; } } - if (this.tree.options.filterOnType) { + if (this.tree.findMode === TreeFindMode.Filter) { return TreeVisibility.Recurse; } else { - return { data: FuzzyScore.Default, visibility: true }; + return { data: FuzzyScore.Default, visibility }; } } @@ -656,170 +642,326 @@ class TypeFilter implements ITreeFilter, IDi } } -class TypeFilterController implements IDisposable { +export interface ICaseSensitiveToggleOpts { + readonly isChecked: boolean; + readonly inputActiveOptionBorder?: Color; + readonly inputActiveOptionForeground?: Color; + readonly inputActiveOptionBackground?: Color; +} - private _enabled = false; - get enabled(): boolean { return this._enabled; } +export class ModeToggle extends Toggle { + constructor(opts?: ICaseSensitiveToggleOpts) { + super({ + icon: Codicon.listFilter, + title: localize('filter', "Filter"), + isChecked: opts?.isChecked ?? false, + inputActiveOptionBorder: opts?.inputActiveOptionBorder, + inputActiveOptionForeground: opts?.inputActiveOptionForeground, + inputActiveOptionBackground: opts?.inputActiveOptionBackground + }); + } +} + +export interface IFindWidgetStyles extends IFindInputStyles, IListStyles { } + +export interface IFindWidgetOpts extends IFindWidgetStyles { } + +export enum TreeFindMode { + Highlight, + Filter +} + +class FindWidget extends Disposable { + + private readonly elements = h('.monaco-tree-type-filter', [ + h('.monaco-tree-type-filter-grab.codicon.codicon-debug-gripper@grab', { tabIndex: 0 }), + h('.monaco-tree-type-filter-input@findInput'), + h('.monaco-tree-type-filter-actionbar@actionbar'), + ]); + + set mode(mode: TreeFindMode) { + this.modeToggle.checked = mode === TreeFindMode.Filter; + this.findInput.inputBox.setPlaceHolder(mode === TreeFindMode.Filter ? localize('type to filter', "Type to filter") : localize('type to search', "Type to search")); + } + + get value(): string { + return this.findInput.inputBox.value; + } + + set value(value: string) { + this.findInput.inputBox.value = value; + } + + private readonly modeToggle: ModeToggle; + private readonly findInput: FindInput; + private readonly actionbar: ActionBar; + private width = 0; + private right = 0; + private top = 0; + + readonly _onDidDisable = new Emitter(); + readonly onDidDisable = this._onDidDisable.event; + readonly onDidChangeValue: Event; + readonly onDidChangeMode: Event; + + constructor( + container: HTMLElement, + private tree: AbstractTree, + contextViewProvider: IContextViewProvider, + mode: TreeFindMode, + options?: IFindWidgetOpts + ) { + super(); + + container.appendChild(this.elements.root); + this._register(toDisposable(() => container.removeChild(this.elements.root))); + + this.modeToggle = this._register(new ModeToggle({ ...options, isChecked: mode === TreeFindMode.Filter })); + this.onDidChangeMode = Event.map(this.modeToggle.onChange, () => this.modeToggle.checked ? TreeFindMode.Filter : TreeFindMode.Highlight, this._store); + + this.findInput = this._register(new FindInput(this.elements.findInput, contextViewProvider, { + label: localize('type to search', "Type to search"), + additionalToggles: [this.modeToggle], + showCommonFindToggles: false + })); + + this.actionbar = this._register(new ActionBar(this.elements.actionbar)); + this.mode = mode; + + const emitter = this._register(new DomEmitter(this.findInput.inputBox.inputElement, 'keydown')); + const onKeyDown = this._register(Event.chain(emitter.event)) + .map(e => new StandardKeyboardEvent(e)) + .event; + + this._register(onKeyDown((e): any => { + switch (e.keyCode) { + case KeyCode.DownArrow: + e.preventDefault(); + e.stopPropagation(); + this.tree.domFocus(); + return; + } + })); + + const closeAction = this._register(new Action('close', localize('close', "Close"), 'codicon codicon-close', true, () => this.dispose())); + this.actionbar.push(closeAction, { icon: true, label: false }); + + const onGrabMouseDown = this._register(new DomEmitter(this.elements.grab, 'mousedown')); + + this._register(onGrabMouseDown.event(e => { + const disposables = new DisposableStore(); + const onWindowMouseMove = disposables.add(new DomEmitter(window, 'mousemove')); + const onWindowMouseUp = disposables.add(new DomEmitter(window, 'mouseup')); + + const startRight = this.right; + const startX = e.pageX; + const startTop = this.top; + const startY = e.pageY; + this.elements.grab.classList.add('grabbing'); + + const transition = this.elements.root.style.transition; + this.elements.root.style.transition = 'unset'; + + const update = (e: MouseEvent) => { + const deltaX = e.pageX - startX; + this.right = startRight - deltaX; + const deltaY = e.pageY - startY; + this.top = startTop + deltaY; + this.layout(); + }; + + disposables.add(onWindowMouseMove.event(update)); + disposables.add(onWindowMouseUp.event(e => { + update(e); + this.elements.grab.classList.remove('grabbing'); + this.elements.root.style.transition = transition; + disposables.dispose(); + })); + })); + + const onGrabKeyDown = this._register(Event.chain(this._register(new DomEmitter(this.elements.grab, 'keydown')).event)) + .map(e => new StandardKeyboardEvent(e)) + .event; + + this._register(onGrabKeyDown((e): any => { + let right: number | undefined; + let top: number | undefined; + + if (e.keyCode === KeyCode.LeftArrow) { + right = Number.POSITIVE_INFINITY; + } else if (e.keyCode === KeyCode.RightArrow) { + right = 0; + } else if (e.keyCode === KeyCode.Space) { + right = this.right === 0 ? Number.POSITIVE_INFINITY : 0; + } + + if (e.keyCode === KeyCode.UpArrow) { + top = 0; + } else if (e.keyCode === KeyCode.DownArrow) { + top = Number.POSITIVE_INFINITY; + } + + if (right !== undefined) { + e.preventDefault(); + e.stopPropagation(); + this.right = right; + this.layout(); + } + + if (top !== undefined) { + e.preventDefault(); + e.stopPropagation(); + this.top = top; + const transition = this.elements.root.style.transition; + this.elements.root.style.transition = 'unset'; + this.layout(); + setTimeout(() => { + this.elements.root.style.transition = transition; + }, 0); + } + })); + + this.onDidChangeValue = this.findInput.onDidChange; + this.style(options ?? {}); + } + + style(styles: IFindWidgetStyles): void { + this.findInput.style(styles); + + if (styles.listFilterWidgetBackground) { + this.elements.root.style.backgroundColor = styles.listFilterWidgetBackground.toString(); + } + + if (styles.listFilterWidgetShadow) { + this.elements.root.style.boxShadow = `0 0 8px 2px ${styles.listFilterWidgetShadow}`; + } + } + + focus() { + this.findInput.focus(); + } + + select() { + this.findInput.select(); + } + + layout(width: number = this.width): void { + this.width = width; + this.right = clamp(this.right, 0, Math.max(0, width - 212)); + this.elements.root.style.right = `${this.right}px`; + this.top = clamp(this.top, 0, 24); + this.elements.root.style.top = `${this.top}px`; + } + + showMessage(message: IMessage): void { + this.findInput.showMessage(message); + } + + clearMessage(): void { + this.findInput.clearMessage(); + } + + override async dispose(): Promise { + this._onDidDisable.fire(); + this.elements.root.classList.add('disabled'); + await timeout(300); + super.dispose(); + } +} + +class FindController implements IDisposable { private _pattern = ''; get pattern(): string { return this._pattern; } + private previousPattern = ''; - private _filterOnType: boolean; - get filterOnType(): boolean { return this._filterOnType; } + private _mode: TreeFindMode; + get mode(): TreeFindMode { return this._mode; } + set mode(mode: TreeFindMode) { + if (mode === this._mode) { + return; + } - private _empty: boolean = false; - get empty(): boolean { return this._empty; } + this._mode = mode; - private readonly _onDidChangeEmptyState = new Emitter(); - readonly onDidChangeEmptyState: Event = Event.latch(this._onDidChangeEmptyState.event); + if (this.widget) { + this.widget.mode = this._mode; + } - private positionClassName = 'ne'; - private domNode: HTMLElement; - private messageDomNode: HTMLElement; - private labelDomNode: HTMLElement; - private filterOnTypeDomNode: HTMLInputElement; - private clearDomNode: HTMLElement; - private keyboardNavigationEventFilter?: IKeyboardNavigationEventFilter; + this.tree.refilter(); + this.render(); + this._onDidChangeMode.fire(mode); + } - private automaticKeyboardNavigation = true; - private triggered = false; + private widget: FindWidget | undefined; + private styles: IFindWidgetStyles | undefined; + private width = 0; + + private readonly _onDidChangeMode = new Emitter(); + readonly onDidChangeMode = this._onDidChangeMode.event; private readonly _onDidChangePattern = new Emitter(); readonly onDidChangePattern = this._onDidChangePattern.event; - private readonly enabledDisposables = new DisposableStore(); + private readonly _onDidChangeOpenState = new Emitter(); + readonly onDidChangeOpenState = this._onDidChangeOpenState.event; + + private enabledDisposables = new DisposableStore(); private readonly disposables = new DisposableStore(); constructor( private tree: AbstractTree, model: ITreeModel, private view: List>, - private filter: TypeFilter, - private keyboardNavigationDelegate: IKeyboardNavigationDelegate + private filter: FindFilter, + private readonly contextViewProvider: IContextViewProvider ) { - this.domNode = $(`.monaco-list-type-filter.${this.positionClassName}`); - this.domNode.draggable = true; - this.disposables.add(addDisposableListener(this.domNode, 'dragstart', () => this.onDragStart())); - - this.messageDomNode = append(view.getHTMLElement(), $(`.monaco-list-type-filter-message`)); - - this.labelDomNode = append(this.domNode, $('span.label')); - const controls = append(this.domNode, $('.controls')); - - this._filterOnType = !!tree.options.filterOnType; - this.filterOnTypeDomNode = append(controls, $('input.filter')); - this.filterOnTypeDomNode.type = 'checkbox'; - this.filterOnTypeDomNode.checked = this._filterOnType; - this.filterOnTypeDomNode.tabIndex = -1; - this.updateFilterOnTypeTitleAndIcon(); - this.disposables.add(addDisposableListener(this.filterOnTypeDomNode, 'input', () => this.onDidChangeFilterOnType())); - - this.clearDomNode = append(controls, $('button.clear' + Codicon.treeFilterClear.cssSelector)); - this.clearDomNode.tabIndex = -1; - this.clearDomNode.title = localize('clear', "Clear"); - - this.keyboardNavigationEventFilter = tree.options.keyboardNavigationEventFilter; - + this._mode = tree.options.defaultFindMode ?? TreeFindMode.Highlight; model.onDidSplice(this.onDidSpliceModel, this, this.disposables); - this.updateOptions(tree.options); } - updateOptions(options: IAbstractTreeOptions): void { - if (options.simpleKeyboardNavigation) { - this.disable(); - } else { - this.enable(); - } - - if (typeof options.filterOnType !== 'undefined') { - this._filterOnType = !!options.filterOnType; - this.filterOnTypeDomNode.checked = this._filterOnType; - this.updateFilterOnTypeTitleAndIcon(); - } - - if (typeof options.automaticKeyboardNavigation !== 'undefined') { - this.automaticKeyboardNavigation = options.automaticKeyboardNavigation; - } - - this.tree.refilter(); - this.render(); - - if (!this.automaticKeyboardNavigation) { - this.onEventOrInput(''); - } - } - - toggle(): void { - this.triggered = !this.triggered; - - if (!this.triggered) { - this.onEventOrInput(''); - } - } - - private enable(): void { - if (this._enabled) { + open(): void { + if (this.widget) { + this.widget.focus(); + this.widget.select(); return; } - const onRawKeyDown = this.enabledDisposables.add(new DomEmitter(this.view.getHTMLElement(), 'keydown')); - const onKeyDown = Event.chain(onRawKeyDown.event) - .filter(e => !isInputElement(e.target as HTMLElement) || e.target === this.filterOnTypeDomNode) - .filter(e => e.key !== 'Dead' && !/^Media/.test(e.key)) - .map(e => new StandardKeyboardEvent(e)) - .filter(this.keyboardNavigationEventFilter || (() => true)) - .filter(() => this.automaticKeyboardNavigation || this.triggered) - .filter(e => (this.keyboardNavigationDelegate.mightProducePrintableCharacter(e) && !(e.keyCode === KeyCode.DownArrow || e.keyCode === KeyCode.UpArrow || e.keyCode === KeyCode.LeftArrow || e.keyCode === KeyCode.RightArrow)) || ((this.pattern.length > 0 || this.triggered) && ((e.keyCode === KeyCode.Escape || e.keyCode === KeyCode.Backspace) && !e.altKey && !e.ctrlKey && !e.metaKey) || (e.keyCode === KeyCode.Backspace && (isMacintosh ? (e.altKey && !e.metaKey) : e.ctrlKey) && !e.shiftKey))) - .forEach(e => { e.stopPropagation(); e.preventDefault(); }) - .event; + this.mode = this.tree.options.defaultFindMode ?? TreeFindMode.Highlight; + this.widget = new FindWidget(this.view.getHTMLElement(), this.tree, this.contextViewProvider, this.mode, this.styles); + this.enabledDisposables.add(this.widget); - const onClearClick = this.enabledDisposables.add(new DomEmitter(this.clearDomNode, 'click')); + this.widget.onDidChangeValue(this.onDidChangeValue, this, this.enabledDisposables); + this.widget.onDidChangeMode(mode => this.mode = mode, undefined, this.enabledDisposables); + this.widget.onDidDisable(this.close, this, this.enabledDisposables); - Event.chain(Event.any(onKeyDown, onClearClick.event)) - .event(this.onEventOrInput, this, this.enabledDisposables); + this.widget.layout(this.width); + this.widget.focus(); - this.filter.pattern = ''; - this.tree.refilter(); - this.render(); - this._enabled = true; - this.triggered = false; + this.widget.value = this.previousPattern; + this.widget.select(); + + this._onDidChangeOpenState.fire(true); } - private disable(): void { - if (!this._enabled) { + close(): void { + if (!this.widget) { return; } - this.domNode.remove(); - this.enabledDisposables.clear(); - this.tree.refilter(); - this.render(); - this._enabled = false; - this.triggered = false; + this.widget = undefined; + + this.enabledDisposables.dispose(); + this.enabledDisposables = new DisposableStore(); + + this.previousPattern = this.pattern; + this.onDidChangeValue(''); + this.tree.domFocus(); + + this._onDidChangeOpenState.fire(false); } - private onEventOrInput(e: MouseEvent | StandardKeyboardEvent | string): void { - if (typeof e === 'string') { - this.onInput(e); - } else if (e instanceof MouseEvent || e.keyCode === KeyCode.Escape || (e.keyCode === KeyCode.Backspace && (isMacintosh ? e.altKey : e.ctrlKey))) { - this.onInput(''); - } else if (e.keyCode === KeyCode.Backspace) { - this.onInput(this.pattern.length === 0 ? '' : this.pattern.substr(0, this.pattern.length - 1)); - } else { - this.onInput(this.pattern + e.browserEvent.key); - } - } - - private onInput(pattern: string): void { - const container = this.view.getHTMLElement(); - - if (pattern && !this.domNode.parentElement) { - container.append(this.domNode); - } else if (!pattern && this.domNode.parentElement) { - this.domNode.remove(); - this.tree.domFocus(); - } - + private onDidChangeValue(pattern: string): void { this._pattern = pattern; this._onDidChangePattern.fire(pattern); @@ -841,75 +983,10 @@ class TypeFilterController implements IDisposable { } this.render(); - - if (!pattern) { - this.triggered = false; - } - } - - private onDragStart(): void { - const container = this.view.getHTMLElement(); - const { left } = getDomNodePagePosition(container); - const containerWidth = container.clientWidth; - const midContainerWidth = containerWidth / 2; - const width = this.domNode.clientWidth; - const disposables = new DisposableStore(); - let positionClassName = this.positionClassName; - - const updatePosition = () => { - switch (positionClassName) { - case 'nw': - this.domNode.style.top = `4px`; - this.domNode.style.left = `4px`; - break; - case 'ne': - this.domNode.style.top = `4px`; - this.domNode.style.left = `${containerWidth - width - 6}px`; - break; - } - }; - - const onDragOver = (event: DragEvent) => { - event.preventDefault(); // needed so that the drop event fires (https://stackoverflow.com/questions/21339924/drop-event-not-firing-in-chrome) - - const x = event.clientX - left; - if (event.dataTransfer) { - event.dataTransfer.dropEffect = 'none'; - } - - if (x < midContainerWidth) { - positionClassName = 'nw'; - } else { - positionClassName = 'ne'; - } - - updatePosition(); - }; - - const onDragEnd = () => { - this.positionClassName = positionClassName; - this.domNode.className = `monaco-list-type-filter ${this.positionClassName}`; - this.domNode.style.top = ''; - this.domNode.style.left = ''; - - dispose(disposables); - }; - - updatePosition(); - this.domNode.classList.remove(positionClassName); - - this.domNode.classList.add('dragging'); - disposables.add(toDisposable(() => this.domNode.classList.remove('dragging'))); - - disposables.add(addDisposableListener(document, 'dragover', e => onDragOver(e))); - disposables.add(addDisposableListener(this.domNode, 'dragend', () => onDragEnd())); - - StaticDND.CurrentDragAndDropData = new DragAndDropData('vscode-ui'); - disposables.add(toDisposable(() => StaticDND.CurrentDragAndDropData = undefined)); } private onDidSpliceModel(): void { - if (!this._enabled || this.pattern.length === 0) { + if (!this.widget || this.pattern.length === 0) { return; } @@ -917,46 +994,22 @@ class TypeFilterController implements IDisposable { this.render(); } - private onDidChangeFilterOnType(): void { - this.tree.updateOptions({ filterOnType: this.filterOnTypeDomNode.checked }); - this.tree.refilter(); - this.tree.domFocus(); - this.render(); - this.updateFilterOnTypeTitleAndIcon(); - } - - private updateFilterOnTypeTitleAndIcon(): void { - if (this.filterOnType) { - this.filterOnTypeDomNode.classList.remove(...Codicon.treeFilterOnTypeOff.classNamesArray); - this.filterOnTypeDomNode.classList.add(...Codicon.treeFilterOnTypeOn.classNamesArray); - this.filterOnTypeDomNode.title = localize('disable filter on type', "Disable Filter on Type"); - } else { - this.filterOnTypeDomNode.classList.remove(...Codicon.treeFilterOnTypeOn.classNamesArray); - this.filterOnTypeDomNode.classList.add(...Codicon.treeFilterOnTypeOff.classNamesArray); - this.filterOnTypeDomNode.title = localize('enable filter on type', "Enable Filter on Type"); - } - } - private render(): void { const noMatches = this.filter.totalCount > 0 && this.filter.matchCount === 0; - if (this.pattern && this.tree.options.filterOnType && noMatches) { - this.messageDomNode.textContent = localize('empty', "No elements found"); - this._empty = true; + if (this.pattern && noMatches) { + if (this.tree.options.showNotFoundMessage ?? true) { + this.widget?.showMessage({ type: MessageType.WARNING, content: localize('not found', "No elements found.") }); + } else { + this.widget?.showMessage({ type: MessageType.WARNING }); + } } else { - this.messageDomNode.innerText = ''; - this._empty = false; + this.widget?.clearMessage(); } - - this.domNode.classList.toggle('no-matches', noMatches); - this.domNode.title = localize('found', "Matched {0} out of {1} elements", this.filter.matchCount, this.filter.totalCount); - this.labelDomNode.textContent = this.pattern.length > 16 ? 'â€Ļ' + this.pattern.substr(this.pattern.length - 16) : this.pattern; - - this._onDidChangeEmptyState.fire(this._empty); } shouldAllowFocus(node: ITreeNode): boolean { - if (!this.enabled || !this.pattern || this.filterOnType) { + if (!this.widget || !this.pattern || this._mode === TreeFindMode.Filter) { return true; } @@ -967,16 +1020,20 @@ class TypeFilterController implements IDisposable { return !FuzzyScore.isDefault(node.filterData as any as FuzzyScore); } - dispose() { - if (this._enabled) { - this.domNode.remove(); - this.enabledDisposables.dispose(); - this._enabled = false; - this.triggered = false; - } + style(styles: IFindWidgetStyles): void { + this.styles = styles; + this.widget?.style(styles); + } + layout(width: number): void { + this.width = width; + this.widget?.layout(width); + } + + dispose() { this._onDidChangePattern.dispose(); - dispose(this.disposables); + this.enabledDisposables.dispose(); + this.disposables.dispose(); } } @@ -987,6 +1044,8 @@ function asTreeMouseEvent(event: IListMouseEvent>): ITreeMo target = TreeMouseEventTarget.Twistie; } else if (hasParentWithClass(event.browserEvent.target as HTMLElement, 'monaco-tl-contents', 'monaco-tl-row')) { target = TreeMouseEventTarget.Element; + } else if (hasParentWithClass(event.browserEvent.target as HTMLElement, 'monaco-tree-type-filter', 'monaco-list')) { + target = TreeMouseEventTarget.Filter; } return { @@ -1004,15 +1063,12 @@ function asTreeContextMenuEvent(event: IListContextMenuEvent extends IAbstractTreeOptionsUpdate, IListOptions { + readonly contextViewProvider?: IContextViewProvider; readonly collapseByDefault?: boolean; // defaults to false readonly filter?: ITreeFilter; readonly dnd?: ITreeDragAndDrop; - readonly keyboardNavigationEventFilter?: IKeyboardNavigationEventFilter; readonly additionalScrollHeight?: number; + readonly findWidgetEnabled?: boolean; } function dfs(node: ITreeNode, fn: (node: ITreeNode) => void): void { @@ -1158,7 +1215,9 @@ class TreeNodeListMouseController extends MouseController< } protected override onViewPointer(e: IListMouseEvent>): void { - if (isInputElement(e.browserEvent.target as HTMLElement) || isMonacoEditor(e.browserEvent.target as HTMLElement)) { + if (isButton(e.browserEvent.target as HTMLElement) || + isInputElement(e.browserEvent.target as HTMLElement) || + isMonacoEditor(e.browserEvent.target as HTMLElement)) { return; } @@ -1321,7 +1380,8 @@ export abstract class AbstractTree implements IDisposable private selection: Trait; private anchor: Trait; private eventBufferer = new EventBufferer(); - private typeFilterController?: TypeFilterController; + private findController?: FindController; + readonly onDidChangeFindOpenState: Event = Event.None; private focusNavigationFilter: ((node: ITreeNode) => boolean) | undefined; private styleElement: HTMLStyleElement; protected readonly disposables = new DisposableStore(); @@ -1332,7 +1392,7 @@ export abstract class AbstractTree implements IDisposable get onDidChangeSelection(): Event> { return this.eventBufferer.wrapEvent(this.selection.onDidChange); } get onMouseClick(): Event> { return Event.map(this.view.onMouseClick, asTreeMouseEvent); } - get onMouseDblClick(): Event> { return Event.map(this.view.onMouseDblClick, asTreeMouseEvent); } + get onMouseDblClick(): Event> { return Event.filter(Event.map(this.view.onMouseDblClick, asTreeMouseEvent), e => e.target !== TreeMouseEventTarget.Filter); } get onContextMenu(): Event> { return Event.map(this.view.onContextMenu, asTreeContextMenuEvent); } get onTap(): Event> { return Event.map(this.view.onTap, asTreeMouseEvent); } get onPointer(): Event> { return Event.map(this.view.onPointer, asTreeMouseEvent); } @@ -1351,8 +1411,11 @@ export abstract class AbstractTree implements IDisposable private readonly _onWillRefilter = new Emitter(); readonly onWillRefilter: Event = this._onWillRefilter.event; - get filterOnType(): boolean { return !!this._options.filterOnType; } - get onDidChangeTypeFilterPattern(): Event { return this.typeFilterController ? this.typeFilterController.onDidChangePattern : Event.None; } + get findMode(): TreeFindMode { return this.findController?.mode ?? TreeFindMode.Highlight; } + set findMode(findMode: TreeFindMode) { if (this.findController) { this.findController.mode = findMode; } } + readonly onDidChangeFindMode: Event; + + get onDidChangeFindPattern(): Event { return this.findController ? this.findController.onDidChangePattern : Event.None; } get expandOnDoubleClick(): boolean { return typeof this._options.expandOnDoubleClick === 'undefined' ? true : this._options.expandOnDoubleClick; } get expandOnlyOnTwistieClick(): boolean | ((e: T) => boolean) { return typeof this._options.expandOnlyOnTwistieClick === 'undefined' ? true : this._options.expandOnlyOnTwistieClick; } @@ -1373,16 +1436,17 @@ export abstract class AbstractTree implements IDisposable const onDidChangeCollapseStateRelay = new Relay>(); const onDidChangeActiveNodes = new Relay[]>(); - const activeNodes = new EventCollection(onDidChangeActiveNodes.event); - this.renderers = renderers.map(r => new TreeRenderer(r, () => this.model, onDidChangeCollapseStateRelay.event, activeNodes, _options)); - for (let r of this.renderers) { + const activeNodes = this.disposables.add(new EventCollection(onDidChangeActiveNodes.event)); + const renderedIndentGuides = new SetMap, HTMLDivElement>(); + this.renderers = renderers.map(r => new TreeRenderer(r, () => this.model, onDidChangeCollapseStateRelay.event, activeNodes, renderedIndentGuides, _options)); + for (const r of this.renderers) { this.disposables.add(r); } - let filter: TypeFilter | undefined; + let filter: FindFilter | undefined; if (_options.keyboardNavigationLabelProvider) { - filter = new TypeFilter(this, _options.keyboardNavigationLabelProvider, _options.filter as any as ITreeFilter); + filter = new FindFilter(this, _options.keyboardNavigationLabelProvider, _options.filter as any as ITreeFilter); _options = { ..._options, filter: filter as ITreeFilter }; // TODO need typescript help here this.disposables.add(filter); } @@ -1400,7 +1464,7 @@ export abstract class AbstractTree implements IDisposable this.focus.onDidModelSplice(e); this.selection.onDidModelSplice(e); }); - }); + }, this.disposables); // Make sure the `forEach` always runs onDidModelSplice(() => null, null, this.disposables); @@ -1435,11 +1499,14 @@ export abstract class AbstractTree implements IDisposable onKeyDown.filter(e => e.keyCode === KeyCode.Space).on(this.onSpace, this, this.disposables); } - if (_options.keyboardNavigationLabelProvider) { - const delegate = _options.keyboardNavigationDelegate || DefaultKeyboardNavigationDelegate; - this.typeFilterController = new TypeFilterController(this, this.model, this.view, filter!, delegate); - this.focusNavigationFilter = node => this.typeFilterController!.shouldAllowFocus(node); - this.disposables.add(this.typeFilterController!); + if ((_options.findWidgetEnabled ?? true) && _options.keyboardNavigationLabelProvider && _options.contextViewProvider) { + this.findController = new FindController(this, this.model, this.view, filter!, _options.contextViewProvider); + this.focusNavigationFilter = node => this.findController!.shouldAllowFocus(node); + this.onDidChangeFindOpenState = this.findController.onDidChangeOpenState; + this.disposables.add(this.findController!); + this.onDidChangeFindMode = this.findController.onDidChangeMode; + } else { + this.onDidChangeFindMode = Event.None; } this.styleElement = createStyleSheet(this.view.getHTMLElement()); @@ -1453,15 +1520,7 @@ export abstract class AbstractTree implements IDisposable renderer.updateOptions(optionsUpdate); } - this.view.updateOptions({ - ...this._options, - enableKeyboardNavigation: this._options.simpleKeyboardNavigation, - }); - - if (this.typeFilterController) { - this.typeFilterController.updateOptions(this._options); - } - + this.view.updateOptions(this._options); this._onDidUpdateOptions.fire(this._options); this.getHTMLElement().classList.toggle('always', this._options.renderIndentGuides === RenderIndentGuides.Always); @@ -1488,21 +1547,11 @@ export abstract class AbstractTree implements IDisposable } get contentHeight(): number { - if (this.typeFilterController && this.typeFilterController.filterOnType && this.typeFilterController.empty) { - return 100; - } - return this.view.contentHeight; } get onDidChangeContentHeight(): Event { - let result = this.view.onDidChangeContentHeight; - - if (this.typeFilterController) { - result = Event.any(result, Event.map(this.typeFilterController.onDidChangeEmptyState, () => this.contentHeight)); - } - - return result; + return this.view.onDidChangeContentHeight; } get scrollTop(): number { @@ -1564,6 +1613,10 @@ export abstract class AbstractTree implements IDisposable layout(height?: number, width?: number): void { this.view.layout(height, width); + + if (isNumber(width)) { + this.findController?.layout(width); + } } style(styles: IListStyles): void { @@ -1576,6 +1629,8 @@ export abstract class AbstractTree implements IDisposable } this.styleElement.textContent = content.join('\n'); + + this.findController?.style(styles); this.view.style(styles); } @@ -1629,12 +1684,16 @@ export abstract class AbstractTree implements IDisposable return this.model.isCollapsed(location); } - toggleKeyboardNavigation(): void { - this.view.toggleKeyboardNavigation(); + triggerTypeNavigation(): void { + this.view.triggerTypeNavigation(); + } - if (this.typeFilterController) { - this.typeFilterController.toggle(); - } + openFind(): void { + this.findController?.open(); + } + + closeFind(): void { + this.findController?.close(); } refilter(): void { diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts index 5f1b89e1e03..a8b84679303 100644 --- a/src/vs/base/browser/ui/tree/asyncDataTree.ts +++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts @@ -7,7 +7,7 @@ import { IDragAndDropData } from 'vs/base/browser/dnd'; import { IIdentityProvider, IListDragAndDrop, IListDragOverReaction, IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; import { ElementsDragAndDropData } from 'vs/base/browser/ui/list/listView'; import { IListStyles } from 'vs/base/browser/ui/list/listWidget'; -import { ComposedTreeDelegate, IAbstractTreeOptions, IAbstractTreeOptionsUpdate } from 'vs/base/browser/ui/tree/abstractTree'; +import { ComposedTreeDelegate, TreeFindMode as TreeFindMode, IAbstractTreeOptions, IAbstractTreeOptionsUpdate } from 'vs/base/browser/ui/tree/abstractTree'; import { ICompressedTreeElement, ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel'; import { getVisibleState, isFilterResult } from 'vs/base/browser/ui/tree/indexTreeModel'; import { CompressibleObjectTree, ICompressibleKeyboardNavigationLabelProvider, ICompressibleObjectTreeOptions, ICompressibleTreeRenderer, IObjectTreeOptions, IObjectTreeSetChildrenOptions, ObjectTree } from 'vs/base/browser/ui/tree/objectTree'; @@ -119,9 +119,7 @@ class AsyncDataTreeRenderer implements IT } disposeElement(node: ITreeNode, TFilterData>, index: number, templateData: IDataTreeListTemplateData, height: number | undefined): void { - if (this.renderer.disposeElement) { - this.renderer.disposeElement(this.nodeMapper.map(node) as ITreeNode, index, templateData.templateData, height); - } + this.renderer.disposeElement?.(this.nodeMapper.map(node) as ITreeNode, index, templateData.templateData, height); } disposeTemplate(templateData: IDataTreeListTemplateData): void { @@ -196,9 +194,7 @@ class AsyncDataTreeNodeListDragAndDrop implements IListDragAndDrop | undefined, targetIndex: number | undefined, originalEvent: DragEvent, raw = true): boolean | IListDragOverReaction { @@ -210,9 +206,7 @@ class AsyncDataTreeNodeListDragAndDrop implements IListDragAndDrop implements IDisposable get onDidUpdateOptions(): Event { return this.tree.onDidUpdateOptions; } - get filterOnType(): boolean { return this.tree.filterOnType; } + get onDidChangeFindOpenState(): Event { return this.tree.onDidChangeFindOpenState; } + + get findMode(): TreeFindMode { return this.tree.findMode; } + set findMode(mode: TreeFindMode) { this.tree.findMode = mode; } + readonly onDidChangeFindMode: Event; + get expandOnlyOnTwistieClick(): boolean | ((e: T) => boolean) { if (typeof this.tree.expandOnlyOnTwistieClick === 'boolean') { return this.tree.expandOnlyOnTwistieClick; @@ -373,6 +372,7 @@ export class AsyncDataTree implements IDisposable this.collapseByDefault = options.collapseByDefault; this.tree = this.createTree(user, container, delegate, renderers, options); + this.onDidChangeFindMode = this.tree.onDidChangeFindMode; this.root = createAsyncDataTreeNode({ element: undefined!, @@ -622,8 +622,16 @@ export class AsyncDataTree implements IDisposable return this.tree.isCollapsed(this.getDataNode(element)); } - toggleKeyboardNavigation(): void { - this.tree.toggleKeyboardNavigation(); + triggerTypeNavigation(): void { + this.tree.triggerTypeNavigation(); + } + + openFind(): void { + this.tree.openFind(); + } + + closeFind(): void { + this.tree.closeFind(); } refilter(): void { @@ -734,6 +742,16 @@ export class AsyncDataTree implements IDisposable return result; } + if (node !== this.root) { + const treeNode = this.tree.getNode(node); + + if (treeNode.collapsed) { + node.hasChildren = !!this.dataSource.hasChildren(node.element!); + node.stale = true; + return; + } + } + return this.doRefreshSubTree(node, recursive, viewStateContext); } @@ -1086,15 +1104,11 @@ class CompressibleAsyncDataTreeRenderer i } disposeElement(node: ITreeNode, TFilterData>, index: number, templateData: IDataTreeListTemplateData, height: number | undefined): void { - if (this.renderer.disposeElement) { - this.renderer.disposeElement(this.nodeMapper.map(node) as ITreeNode, index, templateData.templateData, height); - } + this.renderer.disposeElement?.(this.nodeMapper.map(node) as ITreeNode, index, templateData.templateData, height); } disposeCompressedElements(node: ITreeNode>, TFilterData>, index: number, templateData: IDataTreeListTemplateData, height: number | undefined): void { - if (this.renderer.disposeCompressedElements) { - this.renderer.disposeCompressedElements(this.compressibleNodeMapperProvider().map(node) as ITreeNode, TFilterData>, index, templateData.templateData, height); - } + this.renderer.disposeCompressedElements?.(this.compressibleNodeMapperProvider().map(node) as ITreeNode, TFilterData>, index, templateData.templateData, height); } disposeTemplate(templateData: IDataTreeListTemplateData): void { @@ -1189,10 +1203,10 @@ export class CompressibleAsyncDataTree extends As const expanded: string[] = []; const root = this.tree.getCompressedTreeNode(); - const queue = [root]; + const stack = [root]; - while (queue.length > 0) { - const node = queue.shift()!; + while (stack.length > 0) { + const node = stack.pop()!; if (node !== root && node.collapsible && !node.collapsed) { for (const asyncNode of node.element!.elements) { @@ -1200,7 +1214,7 @@ export class CompressibleAsyncDataTree extends As } } - queue.push(...node.children); + stack.push(...node.children); } return { focus, selection, expanded, scrollTop: this.scrollTop }; diff --git a/src/vs/base/browser/ui/tree/dataTree.ts b/src/vs/base/browser/ui/tree/dataTree.ts index afb6fa662fe..4dfe854ec04 100644 --- a/src/vs/base/browser/ui/tree/dataTree.ts +++ b/src/vs/base/browser/ui/tree/dataTree.ts @@ -140,9 +140,7 @@ export class DataTree extends AbstractTree) => { diff --git a/src/vs/base/browser/ui/tree/indexTreeModel.ts b/src/vs/base/browser/ui/tree/indexTreeModel.ts index 44c0d42819b..ae39dbf1184 100644 --- a/src/vs/base/browser/ui/tree/indexTreeModel.ts +++ b/src/vs/base/browser/ui/tree/indexTreeModel.ts @@ -526,12 +526,12 @@ export class IndexTreeModel, TFilterData = voi const childElements = treeElement.children || Iterable.empty(); const childRevealed = revealed && visibility !== TreeVisibility.Hidden && !node.collapsed; - const childNodes = Iterable.map(childElements, el => this.createTreeNode(el, node, visibility, childRevealed, treeListElements, onDidCreateNode)); let visibleChildrenCount = 0; let renderNodeCount = 1; - for (const child of childNodes) { + for (const el of childElements) { + const child = this.createTreeNode(el, node, visibility, childRevealed, treeListElements, onDidCreateNode); node.children.push(child); renderNodeCount += child.renderNodeCount; @@ -554,9 +554,7 @@ export class IndexTreeModel, TFilterData = voi node.renderNodeCount = renderNodeCount; } - if (onDidCreateNode) { - onDidCreateNode(node); - } + onDidCreateNode?.(node); return node; } diff --git a/src/vs/base/browser/ui/tree/media/tree.css b/src/vs/base/browser/ui/tree/media/tree.css index 22f0d23bf60..9256e1e8077 100644 --- a/src/vs/base/browser/ui/tree/media/tree.css +++ b/src/vs/base/browser/ui/tree/media/tree.css @@ -10,6 +10,9 @@ position: relative; } +.monaco-tl-row.disabled { + cursor: default; +} .monaco-tl-indent { height: 100%; position: absolute; @@ -67,3 +70,55 @@ /* Use steps to throttle FPS to reduce CPU usage */ animation: codicon-spin 1.25s steps(30) infinite; } + +.monaco-tree-type-filter { + position: absolute; + top: 0; + display: flex; + padding: 3px; + transition: top 0.3s; + max-width: 200px; + z-index: 100; + margin: 0 6px; +} + +.monaco-tree-type-filter.disabled { + top: -40px !important; +} + +.monaco-tree-type-filter-grab { + display: flex !important; + align-items: center; + justify-content: center; + cursor: grab; + margin-right: 2px; +} + +.monaco-tree-type-filter-grab.grabbing { + cursor: grabbing; +} + +.monaco-tree-type-filter-input { + flex: 1; +} + +.monaco-tree-type-filter-input .monaco-inputbox { + height: 23px; +} + +.monaco-tree-type-filter-input .monaco-inputbox > .ibwrapper > .input, +.monaco-tree-type-filter-input .monaco-inputbox > .ibwrapper > .mirror { + padding: 2px 4px; +} + +.monaco-tree-type-filter-input .monaco-findInput > .controls { + top: 2px; +} + +.monaco-tree-type-filter-actionbar { + margin-left: 4px; +} + +.monaco-tree-type-filter-actionbar .monaco-action-bar .action-label { + padding: 2px; +} diff --git a/src/vs/base/browser/ui/tree/objectTree.ts b/src/vs/base/browser/ui/tree/objectTree.ts index 847cb86d2fe..bd4aa34b2c7 100644 --- a/src/vs/base/browser/ui/tree/objectTree.ts +++ b/src/vs/base/browser/ui/tree/objectTree.ts @@ -140,13 +140,9 @@ class CompressibleRenderer, TFilterData, TTemplateDat disposeElement(node: ITreeNode, index: number, templateData: CompressibleTemplateData, height: number | undefined): void { if (templateData.compressedTreeNode) { - if (this.renderer.disposeCompressedElements) { - this.renderer.disposeCompressedElements(templateData.compressedTreeNode, index, templateData.data, height); - } + this.renderer.disposeCompressedElements?.(templateData.compressedTreeNode, index, templateData.data, height); } else { - if (this.renderer.disposeElement) { - this.renderer.disposeElement(node, index, templateData.data, height); - } + this.renderer.disposeElement?.(node, index, templateData.data, height); } } diff --git a/src/vs/base/browser/ui/tree/tree.ts b/src/vs/base/browser/ui/tree/tree.ts index 0166e4cd3b6..f29091c104a 100644 --- a/src/vs/base/browser/ui/tree/tree.ts +++ b/src/vs/base/browser/ui/tree/tree.ts @@ -141,7 +141,8 @@ export interface ITreeEvent { export enum TreeMouseEventTarget { Unknown, Twistie, - Element + Element, + Filter } export interface ITreeMouseEvent { diff --git a/src/vs/base/browser/ui/widget.ts b/src/vs/base/browser/ui/widget.ts index 3b17f5bce8f..2586cce024e 100644 --- a/src/vs/base/browser/ui/widget.ts +++ b/src/vs/base/browser/ui/widget.ts @@ -7,7 +7,7 @@ import * as dom from 'vs/base/browser/dom'; import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { IMouseEvent, StandardMouseEvent } from 'vs/base/browser/mouseEvent'; import { Gesture } from 'vs/base/browser/touch'; -import { Disposable } from 'vs/base/common/lifecycle'; +import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; export abstract class Widget extends Disposable { @@ -23,8 +23,8 @@ export abstract class Widget extends Disposable { this._register(dom.addDisposableListener(domNode, dom.EventType.MOUSE_OVER, (e: MouseEvent) => listener(new StandardMouseEvent(e)))); } - protected onnonbubblingmouseout(domNode: HTMLElement, listener: (e: IMouseEvent) => void): void { - this._register(dom.addDisposableNonBubblingMouseOutListener(domNode, (e: MouseEvent) => listener(new StandardMouseEvent(e)))); + protected onmouseleave(domNode: HTMLElement, listener: (e: IMouseEvent) => void): void { + this._register(dom.addDisposableListener(domNode, dom.EventType.MOUSE_LEAVE, (e: MouseEvent) => listener(new StandardMouseEvent(e)))); } protected onkeydown(domNode: HTMLElement, listener: (e: IKeyboardEvent) => void): void { @@ -51,7 +51,7 @@ export abstract class Widget extends Disposable { this._register(dom.addDisposableListener(domNode, dom.EventType.CHANGE, listener)); } - protected ignoreGesture(domNode: HTMLElement): void { - Gesture.ignoreTarget(domNode); + protected ignoreGesture(domNode: HTMLElement): IDisposable { + return Gesture.ignoreTarget(domNode); } } diff --git a/src/vs/base/common/actions.ts b/src/vs/base/common/actions.ts index f9729a18770..769e8039d7f 100644 --- a/src/vs/base/common/actions.ts +++ b/src/vs/base/common/actions.ts @@ -15,8 +15,9 @@ export interface ITelemetryData { export type WorkbenchActionExecutedClassification = { owner: 'bpasero'; - id: { classification: 'SystemMetaData'; purpose: 'FeatureInsight' }; - from: { classification: 'SystemMetaData'; purpose: 'FeatureInsight' }; + comment: 'TODO @bpasero'; + id: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The identifier of the action that was run.' }; + from: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The name of the component the action was run from.' }; }; export type WorkbenchActionExecutedEvent = { @@ -24,7 +25,7 @@ export type WorkbenchActionExecutedEvent = { from: string; }; -export interface IAction extends IDisposable { +export interface IAction { readonly id: string; label: string; tooltip: string; @@ -36,7 +37,7 @@ export interface IAction extends IDisposable { export interface IActionRunner extends IDisposable { readonly onDidRun: Event; - readonly onBeforeRun: Event; + readonly onWillRun: Event; run(action: IAction, context?: unknown): unknown; } @@ -164,10 +165,10 @@ export interface IRunEvent { export class ActionRunner extends Disposable implements IActionRunner { - private _onBeforeRun = this._register(new Emitter()); - readonly onBeforeRun = this._onBeforeRun.event; + private readonly _onWillRun = this._register(new Emitter()); + readonly onWillRun = this._onWillRun.event; - private _onDidRun = this._register(new Emitter()); + private readonly _onDidRun = this._register(new Emitter()); readonly onDidRun = this._onDidRun.event; async run(action: IAction, context?: unknown): Promise { @@ -175,7 +176,7 @@ export class ActionRunner extends Disposable implements IActionRunner { return; } - this._onBeforeRun.fire({ action }); + this._onWillRun.fire({ action }); let error: Error | undefined = undefined; try { @@ -192,7 +193,7 @@ export class ActionRunner extends Disposable implements IActionRunner { } } -export class Separator extends Action { +export class Separator implements IAction { /** * Joins all non-empty lists of actions with separators. @@ -214,12 +215,14 @@ export class Separator extends Action { static readonly ID = 'vs.actions.separator'; - constructor(label?: string) { - super(Separator.ID, label, label ? 'separator text' : 'separator'); + readonly id: string = Separator.ID; - this.checked = false; - this.enabled = false; - } + readonly label: string = ''; + readonly tooltip: string = ''; + readonly class: string = 'separator'; + readonly enabled: boolean = false; + readonly checked: boolean = false; + async run() { } } export class SubmenuAction implements IAction { @@ -241,12 +244,6 @@ export class SubmenuAction implements IAction { this._actions = actions; } - dispose(): void { - // there is NOTHING to dispose and the SubmenuAction should - // never have anything to dispose as it is a convenience type - // to bridge into the rendering world. - } - async run(): Promise { } } @@ -267,7 +264,6 @@ export function toAction(props: { id: string; label: string; enabled?: boolean; enabled: props.enabled ?? true, checked: props.checked ?? false, run: async () => props.run(), - tooltip: props.label, - dispose: () => { } + tooltip: props.label }; } diff --git a/src/vs/base/common/amd.ts b/src/vs/base/common/amd.ts index 9dff71689ed..7f788bf4629 100644 --- a/src/vs/base/common/amd.ts +++ b/src/vs/base/common/amd.ts @@ -26,7 +26,7 @@ export abstract class LoaderStats { } function diff(map: Map, stat: LoaderEvent) { - let duration = map.get(stat.detail); + const duration = map.get(stat.detail); if (!duration) { // console.warn('BAD events, end WITHOUT start', stat); // map.delete(stat.detail); @@ -79,7 +79,7 @@ export abstract class LoaderStats { nodeRequire.forEach(value => nodeRequireTotal += value); function to2dArray(map: Map): [string, number][] { - let res: [string, number][] = []; + const res: [string, number][] = []; map.forEach((value, index) => res.push([index, value])); return res; } @@ -96,7 +96,7 @@ export abstract class LoaderStats { static toMarkdownTable(header: string[], rows: Array>): string { let result = ''; - let lengths: number[] = []; + const lengths: number[] = []; header.forEach((cell, ci) => { lengths[ci] = cell.length; }); diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts index 826d3558c35..2457de74f0b 100644 --- a/src/vs/base/common/arrays.ts +++ b/src/vs/base/common/arrays.ts @@ -46,6 +46,18 @@ export function equals(one: ReadonlyArray | undefined, other: ReadonlyArra return true; } +/** + * Remove the element at `index` by replacing it with the last element. This is faster than `splice` + * but changes the order of the array + */ +export function removeFastWithoutKeepingOrder(array: T[], index: number) { + const last = array.length - 1; + if (index < last) { + array[index] = array[last]; + } + array.pop(); +} + /** * Performs a binary search algorithm over a sorted array. * @@ -126,12 +138,12 @@ export function quickSelect(nth: number, data: T[], compare: Compare): T { throw new TypeError('invalid index'); } - let pivotValue = data[Math.floor(data.length * Math.random())]; - let lower: T[] = []; - let higher: T[] = []; - let pivots: T[] = []; + const pivotValue = data[Math.floor(data.length * Math.random())]; + const lower: T[] = []; + const higher: T[] = []; + const pivots: T[] = []; - for (let value of data) { + for (const value of data) { const val = compare(value, pivotValue); if (val < 0) { lower.push(value); @@ -677,6 +689,18 @@ export function compareBy(selector: (item: TItem) => TCompare return (a, b) => comparator(selector(a), selector(b)); } +export function tieBreakComparators(...comparators: Comparator[]): Comparator { + return (item1, item2) => { + for (const comparator of comparators) { + const result = comparator(item1, item2); + if (!CompareResult.isNeitherLessOrGreaterThan(result)) { + return result; + } + } + return CompareResult.neitherLessOrGreaterThan; + }; +} + /** * The natural order on numbers. */ @@ -805,3 +829,79 @@ export class ArrayQueue { return result; } } + +/** + * This class is faster than an iterator and array for lazy computed data. +*/ +export class CallbackIterable { + public static readonly empty = new CallbackIterable(_callback => { }); + + constructor( + /** + * Calls the callback for every item. + * Stops when the callback returns false. + */ + public readonly iterate: (callback: (item: T) => boolean) => void + ) { + } + + forEach(handler: (item: T) => void) { + this.iterate(item => { handler(item); return true; }); + } + + toArray(): T[] { + const result: T[] = []; + this.iterate(item => { result.push(item); return true; }); + return result; + } + + filter(predicate: (item: T) => boolean): CallbackIterable { + return new CallbackIterable(cb => this.iterate(item => predicate(item) ? cb(item) : true)); + } + + map(mapFn: (item: T) => TResult): CallbackIterable { + return new CallbackIterable(cb => this.iterate(item => cb(mapFn(item)))); + } + + some(predicate: (item: T) => boolean): boolean { + let result = false; + this.iterate(item => { result = predicate(item); return !result; }); + return result; + } + + findFirst(predicate: (item: T) => boolean): T | undefined { + let result: T | undefined; + this.iterate(item => { + if (predicate(item)) { + result = item; + return false; + } + return true; + }); + return result; + } + + findLast(predicate: (item: T) => boolean): T | undefined { + let result: T | undefined; + this.iterate(item => { + if (predicate(item)) { + result = item; + } + return true; + }); + return result; + } + + findLastMaxBy(comparator: Comparator): T | undefined { + let result: T | undefined; + let first = true; + this.iterate(item => { + if (first || CompareResult.isGreaterThan(comparator(item, result!))) { + first = false; + result = item; + } + return true; + }); + return result; + } +} diff --git a/src/vs/base/common/assert.ts b/src/vs/base/common/assert.ts index 9e2510b4d0b..5efd7244ff4 100644 --- a/src/vs/base/common/assert.ts +++ b/src/vs/base/common/assert.ts @@ -3,11 +3,60 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { BugIndicatingError, onUnexpectedError } from 'vs/base/common/errors'; + /** * Throws an error with the provided message if the provided value does not evaluate to a true Javascript value. + * + * @deprecated Use `assert(...)` instead. + * This method is usually used like this: + * ```ts + * import * as assert from 'vs/base/common/assert'; + * assert.ok(...); + * ``` + * + * However, `assert` in that example is a user chosen name. + * There is no tooling for generating such an import statement. + * Thus, the `assert(...)` function should be used instead. */ export function ok(value?: unknown, message?: string) { if (!value) { throw new Error(message ? `Assertion failed (${message})` : 'Assertion Failed'); } } + +export function assertNever(value: never, message = 'Unreachable'): never { + throw new Error(message); +} + +export function assert(condition: boolean): void { + if (!condition) { + throw new BugIndicatingError('Assertion Failed'); + } +} + +/** + * condition must be side-effect free! + */ +export function assertFn(condition: () => boolean): void { + if (!condition()) { + // eslint-disable-next-line no-debugger + debugger; + // Reevaluate `condition` again to make debugging easier + condition(); + onUnexpectedError(new BugIndicatingError('Assertion Failed')); + } +} + +export function checkAdjacentItems(items: readonly T[], predicate: (item1: T, item2: T) => boolean): boolean { + let i = 0; + while (i < items.length - 1) { + const a = items[i]; + const b = items[i + 1]; + if (!predicate(a, b)) { + return false; + } + i++; + } + return true; +} diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts index 031b10f3e9f..232375b7f10 100644 --- a/src/vs/base/common/async.ts +++ b/src/vs/base/common/async.ts @@ -354,9 +354,7 @@ export class Delayer implements IDisposable { this.cancelTimeout(); if (this.completionPromise) { - if (this.doReject) { - this.doReject(new CancellationError()); - } + this.doReject?.(new CancellationError()); this.completionPromise = null; } } @@ -885,9 +883,7 @@ export class RunOnceScheduler { } protected doRun(): void { - if (this.runner) { - this.runner(); - } + this.runner?.(); } } @@ -960,9 +956,7 @@ export class ProcessTimeRunOnceScheduler { // time elapsed clearInterval(this.intervalToken); this.intervalToken = -1; - if (this.runner) { - this.runner(); - } + this.runner?.(); } } @@ -985,9 +979,7 @@ export class RunOnceWorker extends RunOnceScheduler { const units = this.units; this.units = []; - if (this.runner) { - this.runner(units); - } + this.runner?.(units); } override dispose(): void { @@ -1119,7 +1111,22 @@ export interface IdleDeadline { } /** - * Execute the callback the next time the browser is idle + * Execute the callback the next time the browser is idle, returning an + * {@link IDisposable} that will cancel the callback when disposed. This wraps + * [requestIdleCallback] so it will fallback to [setTimeout] if the environment + * doesn't support it. + * + * @param callback The callback to run when idle, this includes an + * [IdleDeadline] that provides the time alloted for the idle callback by the + * browser. Not respecting this deadline will result in a degraded user + * experience. + * @param timeout A timeout at which point to queue no longer wait for an idle + * callback but queue it on the regular event loop (like setTimeout). Typically + * this should not be used. + * + * [IdleDeadline]: https://developer.mozilla.org/en-US/docs/Web/API/IdleDeadline + * [requestIdleCallback]: https://developer.mozilla.org/en-US/docs/Web/API/Window/requestIdleCallback + * [setTimeout]: https://developer.mozilla.org/en-US/docs/Web/API/Window/setTimeout */ export let runWhenIdle: (callback: (idle: IdleDeadline) => void, timeout?: number) => IDisposable; @@ -1235,15 +1242,15 @@ export async function retry(task: ITask>, delay: number, retries: //#region Task Sequentializer interface IPendingTask { - taskId: number; - cancel: () => void; - promise: Promise; + readonly taskId: number; + readonly cancel: () => void; + readonly promise: Promise; } -interface ISequentialTask { - promise: Promise; - promiseResolve: () => void; - promiseReject: (error: Error) => void; +interface INextTask { + readonly promise: Promise; + readonly promiseResolve: () => void; + readonly promiseReject: (error: Error) => void; run: () => Promise; } @@ -1251,9 +1258,14 @@ export interface ITaskSequentializerWithPendingTask { readonly pending: Promise; } +export interface ITaskSequentializerWithNextTask { + readonly next: INextTask; +} + export class TaskSequentializer { + private _pending?: IPendingTask; - private _next?: ISequentialTask; + private _next?: INextTask; hasPending(taskId?: number): this is ITaskSequentializerWithPendingTask { if (!this._pending) { @@ -1268,7 +1280,7 @@ export class TaskSequentializer { } get pending(): Promise | undefined { - return this._pending ? this._pending.promise : undefined; + return this._pending?.promise; } cancelPending(): void { @@ -1332,6 +1344,14 @@ export class TaskSequentializer { return this._next.promise; } + + hasNext(): this is ITaskSequentializerWithNextTask { + return !!this._next; + } + + async join(): Promise { + return this._next?.promise ?? this._pending?.promise; + } } //#endregion @@ -1397,7 +1417,7 @@ export class DeferredPromise { return this.rejected || this.resolved; } - public p: Promise; + public readonly p: Promise; constructor() { this.p = new Promise((c, e) => { diff --git a/src/vs/base/common/cancellation.ts b/src/vs/base/common/cancellation.ts index 9cc02257cab..78e01b75ec1 100644 --- a/src/vs/base/common/cancellation.ts +++ b/src/vs/base/common/cancellation.ts @@ -129,9 +129,7 @@ export class CancellationTokenSource { if (cancel) { this.cancel(); } - if (this._parentListener) { - this._parentListener.dispose(); - } + this._parentListener?.dispose(); if (!this._token) { // ensure to initialize with an empty token if we had none this._token = CancellationToken.None; diff --git a/src/vs/base/common/codicons.ts b/src/vs/base/common/codicons.ts index 9c782da6f2b..9d60df36d53 100644 --- a/src/vs/base/common/codicons.ts +++ b/src/vs/base/common/codicons.ts @@ -94,11 +94,11 @@ export class Codicon implements CSSIcon { public static readonly eyeUnwatch = new Codicon('eye-unwatch', { fontCharacter: '\\ea70' }); public static readonly eyeWatch = new Codicon('eye-watch', { fontCharacter: '\\ea70' }); public static readonly circleFilled = new Codicon('circle-filled', { fontCharacter: '\\ea71' }); - public static readonly primitiveDot = new Codicon('primitive-dot', { fontCharacter: '\\ea71' }); - public static readonly closeDirty = new Codicon('close-dirty', { fontCharacter: '\\ea71' }); - public static readonly debugBreakpoint = new Codicon('debug-breakpoint', { fontCharacter: '\\ea71' }); - public static readonly debugBreakpointDisabled = new Codicon('debug-breakpoint-disabled', { fontCharacter: '\\ea71' }); - public static readonly debugHint = new Codicon('debug-hint', { fontCharacter: '\\ea71' }); + public static readonly primitiveDot = new Codicon('primitive-dot', Codicon.circleFilled.definition); + public static readonly closeDirty = new Codicon('close-dirty', Codicon.circleFilled.definition); + public static readonly debugBreakpoint = new Codicon('debug-breakpoint', Codicon.circleFilled.definition); + public static readonly debugBreakpointDisabled = new Codicon('debug-breakpoint-disabled', Codicon.circleFilled.definition); + public static readonly debugHint = new Codicon('debug-hint', Codicon.circleFilled.definition); public static readonly primitiveSquare = new Codicon('primitive-square', { fontCharacter: '\\ea72' }); public static readonly edit = new Codicon('edit', { fontCharacter: '\\ea73' }); public static readonly pencil = new Codicon('pencil', { fontCharacter: '\\ea73' }); @@ -218,8 +218,9 @@ export class Codicon implements CSSIcon { public static readonly chromeMaximize = new Codicon('chrome-maximize', { fontCharacter: '\\eab9' }); public static readonly chromeMinimize = new Codicon('chrome-minimize', { fontCharacter: '\\eaba' }); public static readonly chromeRestore = new Codicon('chrome-restore', { fontCharacter: '\\eabb' }); - public static readonly circleOutline = new Codicon('circle-outline', { fontCharacter: '\\eabc' }); - public static readonly debugBreakpointUnverified = new Codicon('debug-breakpoint-unverified', { fontCharacter: '\\eabc' }); + public static readonly circle = new Codicon('circle', { fontCharacter: '\\eabc' }); + public static readonly circleOutline = new Codicon('circle-outline', Codicon.circle.definition); + public static readonly debugBreakpointUnverified = new Codicon('debug-breakpoint-unverified', Codicon.circle.definition); public static readonly circleSlash = new Codicon('circle-slash', { fontCharacter: '\\eabd' }); public static readonly circuitBoard = new Codicon('circuit-board', { fontCharacter: '\\eabe' }); public static readonly clearAll = new Codicon('clear-all', { fontCharacter: '\\eabf' }); @@ -428,7 +429,8 @@ export class Codicon implements CSSIcon { public static readonly debugBreakpointFunction = new Codicon('debug-breakpoint-function', { fontCharacter: '\\eb88' }); public static readonly debugBreakpointFunctionDisabled = new Codicon('debug-breakpoint-function-disabled', { fontCharacter: '\\eb88' }); public static readonly debugStackframeActive = new Codicon('debug-stackframe-active', { fontCharacter: '\\eb89' }); - public static readonly debugStackframeDot = new Codicon('debug-stackframe-dot', { fontCharacter: '\\eb8a' }); + public static readonly circleSmallFilled = new Codicon('circle-small-filled', { fontCharacter: '\\eb8a' }); + public static readonly debugStackframeDot = new Codicon('debug-stackframe-dot', Codicon.circleSmallFilled.definition); public static readonly debugStackframe = new Codicon('debug-stackframe', { fontCharacter: '\\eb8b' }); public static readonly debugStackframeFocused = new Codicon('debug-stackframe-focused', { fontCharacter: '\\eb8b' }); public static readonly debugBreakpointUnsupported = new Codicon('debug-breakpoint-unsupported', { fontCharacter: '\\eb8c' }); @@ -472,7 +474,8 @@ export class Codicon implements CSSIcon { public static readonly pinnedDirty = new Codicon('pinned-dirty', { fontCharacter: '\\ebb2' }); public static readonly passFilled = new Codicon('pass-filled', { fontCharacter: '\\ebb3' }); public static readonly circleLargeFilled = new Codicon('circle-large-filled', { fontCharacter: '\\ebb4' }); - public static readonly circleLargeOutline = new Codicon('circle-large-outline', { fontCharacter: '\\ebb5' }); + public static readonly circleLarge = new Codicon('circle-large', { fontCharacter: '\\ebb5' }); + public static readonly circleLargeOutline = new Codicon('circle-large-outline', Codicon.circleLarge.definition); public static readonly combine = new Codicon('combine', { fontCharacter: '\\ebb6' }); public static readonly gather = new Codicon('gather', { fontCharacter: '\\ebb6' }); public static readonly table = new Codicon('table', { fontCharacter: '\\ebb7' }); @@ -552,6 +555,16 @@ export class Codicon implements CSSIcon { public static readonly arrowCircleLeft = new Codicon('arrow-circle-left', { fontCharacter: '\\ebfd' }); public static readonly arrowCircleRight = new Codicon('arrow-circle-right', { fontCharacter: '\\ebfe' }); public static readonly arrowCircleUp = new Codicon('arrow-circle-up', { fontCharacter: '\\ebff' }); + public static readonly heartFilled = new Codicon('heart-filled', { fontCharacter: '\\ec04' }); + public static readonly map = new Codicon('map', { fontCharacter: '\\ec05' }); + public static readonly mapFilled = new Codicon('map-filled', { fontCharacter: '\\ec06' }); + public static readonly circleSmall = new Codicon('circle-small', { fontCharacter: '\\ec07' }); + public static readonly bellSlash = new Codicon('bell-slash', { fontCharacter: '\\ec08' }); + public static readonly bellSlashDot = new Codicon('bell-slash-dot', { fontCharacter: '\\ec09' }); + public static readonly commentUnresolved = new Codicon('comment-unresolved', { fontCharacter: '\\ec0a' }); + public static readonly gitPullRequestGoToChanges = new Codicon('git-pull-request-go-to-changes', { fontCharacter: '\\ec0b' }); + public static readonly gitPullRequestNewChanges = new Codicon('git-pull-request-new-changes', { fontCharacter: '\\ec0c' }); + public static readonly searchFuzzy = new Codicon('search-fuzzy', { fontCharacter: '\\ec0d' }); // derived icons, that could become separate icons @@ -614,7 +627,7 @@ export namespace CSSIcon { if (!match) { return asClassNameArray(Codicon.error); } - let [, id, modifier] = match; + const [, id, modifier] = match; const classNames = ['codicon', 'codicon-' + id]; if (modifier) { classNames.push('codicon-modifier-' + modifier.substr(1)); diff --git a/src/vs/base/common/collections.ts b/src/vs/base/common/collections.ts index bc2f5c31950..d8ee92f757e 100644 --- a/src/vs/base/common/collections.ts +++ b/src/vs/base/common/collections.ts @@ -9,46 +9,12 @@ */ export type IStringDictionary = Record; - /** * An interface for a JavaScript object that * acts a dictionary. The keys are numbers. */ export type INumberDictionary = Record; -const hasOwnProperty = Object.prototype.hasOwnProperty; - -/** - * Returns an array which contains all values that reside - * in the given dictionary. - */ -export function values(from: IStringDictionary | INumberDictionary): T[] { - const result: T[] = []; - for (let key in from) { - if (hasOwnProperty.call(from, key)) { - result.push((from as any)[key]); - } - } - return result; -} - -/** - * Iterates over each entry in the provided dictionary. The iterator allows - * to remove elements and will stop when the callback returns {{false}}. - */ -export function forEach(from: IStringDictionary | INumberDictionary, callback: (entry: { key: any; value: T }, remove: () => void) => any): void { - for (let key in from) { - if (hasOwnProperty.call(from, key)) { - const result = callback({ key: key, value: (from as any)[key] }, function () { - delete (from as any)[key]; - }); - if (result === false) { - return; - } - } - } -} - /** * Groups the collection into a dictionary based on the provided * group function. @@ -66,25 +32,15 @@ export function groupBy(data: V[], groupF return result; } -export function fromMap(original: Map): IStringDictionary { - const result: IStringDictionary = Object.create(null); - if (original) { - original.forEach((value, key) => { - result[key] = value; - }); - } - return result; -} - export function diffSets(before: Set, after: Set): { removed: T[]; added: T[] } { const removed: T[] = []; const added: T[] = []; - for (let element of before) { + for (const element of before) { if (!after.has(element)) { removed.push(element); } } - for (let element of after) { + for (const element of after) { if (!before.has(element)) { added.push(element); } @@ -95,12 +51,12 @@ export function diffSets(before: Set, after: Set): { removed: T[]; adde export function diffMaps(before: Map, after: Map): { removed: V[]; added: V[] } { const removed: V[] = []; const added: V[] = []; - for (let [index, value] of before) { + for (const [index, value] of before) { if (!after.has(index)) { removed.push(value); } } - for (let [index, value] of after) { + for (const [index, value] of after) { if (!before.has(index)) { added.push(value); } diff --git a/src/vs/base/common/color.ts b/src/vs/base/common/color.ts index dcdc00dcee3..750cfe7dc71 100644 --- a/src/vs/base/common/color.ts +++ b/src/vs/base/common/color.ts @@ -259,6 +259,16 @@ export class Color { return Color.Format.CSS.parseHex(hex) || Color.red; } + static equals(a: Color | null, b: Color | null): boolean { + if (!a && !b) { + return true; + } + if (!a || !b) { + return false; + } + return a.equals(b); + } + readonly rgba: RGBA; private _hsla?: HSLA; get hsla(): HSLA { diff --git a/src/vs/base/common/comparers.ts b/src/vs/base/common/comparers.ts index 64643232f7d..8ca910e3555 100644 --- a/src/vs/base/common/comparers.ts +++ b/src/vs/base/common/comparers.ts @@ -219,7 +219,7 @@ function extractExtension(str?: string | null): string { function compareAndDisambiguateByLength(collator: Intl.Collator, one: string, other: string) { // Check for differences - let result = collator.compare(one, other); + const result = collator.compare(one, other); if (result !== 0) { return result; } diff --git a/src/vs/base/common/console.ts b/src/vs/base/common/console.ts index 194abde45b5..54bfadefbae 100644 --- a/src/vs/base/common/console.ts +++ b/src/vs/base/common/console.ts @@ -11,7 +11,7 @@ export interface IRemoteConsoleLog { arguments: string; } -interface IStackArgument { +export interface IStackArgument { __$stack: string; } diff --git a/src/vs/base/common/dataTransfer.ts b/src/vs/base/common/dataTransfer.ts index 5074f30c75e..a65c4938fc4 100644 --- a/src/vs/base/common/dataTransfer.ts +++ b/src/vs/base/common/dataTransfer.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { URI } from 'vs/base/common/uri'; +import { generateUuid } from 'vs/base/common/uuid'; export interface IDataTransferFile { readonly name: string; @@ -12,6 +13,7 @@ export interface IDataTransferFile { } export interface IDataTransferItem { + readonly id: string; asString(): Thenable; asFile(): IDataTransferFile | undefined; value: any; @@ -19,6 +21,7 @@ export interface IDataTransferItem { export function createStringDataTransferItem(stringOrPromise: string | Promise): IDataTransferItem { return { + id: generateUuid(), asString: async () => stringOrPromise, asFile: () => undefined, value: typeof stringOrPromise === 'string' ? stringOrPromise : undefined, @@ -27,6 +30,7 @@ export function createStringDataTransferItem(stringOrPromise: string | Promise Promise): IDataTransferItem { return { + id: generateUuid(), asString: async () => '', asFile: () => ({ name: fileName, uri, data }), value: undefined, diff --git a/src/vs/base/common/diff/diff.ts b/src/vs/base/common/diff/diff.ts index 670210b7c10..f97efa3baa3 100644 --- a/src/vs/base/common/diff/diff.ts +++ b/src/vs/base/common/diff/diff.ts @@ -851,7 +851,7 @@ export class LcsDiff { change.modifiedStart++; } - let mergedChangeArr: Array = [null]; + const mergedChangeArr: Array = [null]; if (i < changes.length - 1 && this.ChangesOverlap(changes[i], changes[i + 1], mergedChangeArr)) { changes[i] = mergedChangeArr[0]!; changes.splice(i + 1, 1); @@ -1047,7 +1047,7 @@ export class LcsDiff { * @returns The concatenated list */ private ConcatenateChanges(left: DiffChange[], right: DiffChange[]): DiffChange[] { - let mergedChangeArr: DiffChange[] = []; + const mergedChangeArr: DiffChange[] = []; if (left.length === 0 || right.length === 0) { return (right.length > 0) ? right : left; diff --git a/src/vs/base/common/errors.ts b/src/vs/base/common/errors.ts index 38ca3e4e102..bea757b1ac6 100644 --- a/src/vs/base/common/errors.ts +++ b/src/vs/base/common/errors.ts @@ -23,6 +23,10 @@ export class ErrorHandler { this.unexpectedErrorHandler = function (e: any) { setTimeout(() => { if (e.stack) { + if (ErrorNoTelemetry.isErrorNoTelemetry(e)) { + throw new ErrorNoTelemetry(e.message + '\n\n' + e.stack); + } + throw new Error(e.message + '\n\n' + e.stack); } @@ -95,19 +99,21 @@ export interface SerializedError { readonly name: string; readonly message: string; readonly stack: string; + readonly noTelemetry: boolean; } export function transformErrorForSerialization(error: Error): SerializedError; export function transformErrorForSerialization(error: any): any; export function transformErrorForSerialization(error: any): any { if (error instanceof Error) { - let { name, message } = error; + const { name, message } = error; const stack: string = (error).stacktrace || (error).stack; return { $isError: true, name, message, - stack + stack, + noTelemetry: ErrorNoTelemetry.isErrorNoTelemetry(error) }; } @@ -117,15 +123,15 @@ export function transformErrorForSerialization(error: any): any { // see https://github.com/v8/v8/wiki/Stack%20Trace%20API#basic-stack-traces export interface V8CallSite { - getThis(): any; - getTypeName(): string; - getFunction(): string; - getFunctionName(): string; - getMethodName(): string; - getFileName(): string; - getLineNumber(): number; - getColumnNumber(): number; - getEvalOrigin(): string; + getThis(): unknown; + getTypeName(): string | null; + getFunction(): Function | undefined; + getFunctionName(): string | null; + getMethodName(): string | null; + getFileName(): string | null; + getLineNumber(): number | null; + getColumnNumber(): number | null; + getEvalOrigin(): string | undefined; isToplevel(): boolean; isEval(): boolean; isNative(): boolean; @@ -233,24 +239,27 @@ export class ExpectedError extends Error { * Error that when thrown won't be logged in telemetry as an unhandled error. */ export class ErrorNoTelemetry extends Error { + override readonly name: string; - public static fromError(err: any): ErrorNoTelemetry { - if (err && err instanceof ErrorNoTelemetry) { + constructor(msg?: string) { + super(msg); + this.name = 'CodeExpectedError'; + } + + public static fromError(err: Error): ErrorNoTelemetry { + if (err instanceof ErrorNoTelemetry) { return err; } - if (err && err instanceof Error) { - const result = new ErrorNoTelemetry(); - result.name = err.name; - result.message = err.message; - result.stack = err.stack; - return result; - } - - return new ErrorNoTelemetry(err); + const result = new ErrorNoTelemetry(); + result.message = err.message; + result.stack = err.stack; + return result; } - readonly logTelemetry = false; + public static isErrorNoTelemetry(err: Error): err is ErrorNoTelemetry { + return err.name === 'CodeExpectedError'; + } } /** diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts index e9536b9b89b..cb280771506 100644 --- a/src/vs/base/common/event.ts +++ b/src/vs/base/common/event.ts @@ -8,13 +8,14 @@ import { onUnexpectedError } from 'vs/base/common/errors'; import { once as onceFn } from 'vs/base/common/functional'; import { combinedDisposable, Disposable, DisposableStore, IDisposable, SafeDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { LinkedList } from 'vs/base/common/linkedList'; +import { IObservable, IObserver } from 'vs/base/common/observable'; import { StopWatch } from 'vs/base/common/stopwatch'; // ----------------------------------------------------------------------------------------------------------------------- // Uncomment the next line to print warnings whenever an emitter with listeners is disposed. That is a sign of code smell. // ----------------------------------------------------------------------------------------------------------------------- -let _enableDisposeWithListenerWarning = false; +const _enableDisposeWithListenerWarning = false; // _enableDisposeWithListenerWarning = Boolean("TRUE"); // causes a linter warning so that it cannot be pushed @@ -22,7 +23,7 @@ let _enableDisposeWithListenerWarning = false; // Uncomment the next line to print warnings whenever a snapshotted event is used repeatedly without cleanup. // See https://github.com/microsoft/vscode/issues/142851 // ----------------------------------------------------------------------------------------------------------------------- -let _enableSnapshotPotentialLeakWarning = false; +const _enableSnapshotPotentialLeakWarning = false; // _enableSnapshotPotentialLeakWarning = Boolean("TRUE"); // causes a linter warning so that it cannot be pushed /** @@ -52,6 +53,39 @@ export namespace Event { } } + /** + * Given an event, returns another event which debounces calls and defers the listeners to a later task via a shared + * `setTimeout`. The event is converted into a signal (`Event`) to avoid additional object creation as a + * result of merging events and to try prevent race conditions that could arise when using related deferred and + * non-deferred events. + * + * This is useful for deferring non-critical work (eg. general UI updates) to ensure it does not block critical work + * (eg. latency of keypress to text rendered). + * + * *NOTE* that this function returns an `Event` and it MUST be called with a `DisposableStore` whenever the returned + * event is accessible to "third parties", e.g the event is a public property. Otherwise a leaked listener on the + * returned event causes this utility to leak a listener on the original event. + */ + export function defer(event: Event, disposable?: DisposableStore): Event { + return debounce(event, () => void 0, 0, undefined, undefined, disposable); + } + + /** + * Debounces an event, firing after some delay (default=0) with an array of all event original objects. + * + * *NOTE* that this function returns an `Event` and it MUST be called with a `DisposableStore` whenever the returned + * event is accessible to "third parties", e.g the event is a public property. Otherwise a leaked listener on the + * returned event causes this utility to leak a listener on the original event. + */ + export function accumulate(event: Event, delay: number = 0, disposable?: DisposableStore): Event { + return Event.debounce(event, (last, e) => { + if (!last) { + return [e]; + } + last.push(e); + return last; + }, delay, undefined, undefined, disposable); + } /** * Given an event, returns another event which only fires once. @@ -60,7 +94,7 @@ export namespace Event { return (listener, thisArgs = null, disposables?) => { // we need this, in case the event fires during the listener call let didFire = false; - let result: IDisposable; + let result: IDisposable | undefined = undefined; result = event(e => { if (didFire) { return; @@ -143,14 +177,14 @@ export namespace Event { } function snapshot(event: Event, disposable: DisposableStore | undefined): Event { - let listener: IDisposable; + let listener: IDisposable | undefined; const options: EmitterOptions | undefined = { onFirstListenerAdd() { listener = event(emitter.fire, emitter); }, onLastListenerRemove() { - listener.dispose(); + listener?.dispose(); } }; @@ -160,9 +194,7 @@ export namespace Event { const emitter = new Emitter(options); - if (disposable) { - disposable.add(emitter); - } + disposable?.add(emitter); return emitter.event; } @@ -223,9 +255,7 @@ export namespace Event { const emitter = new Emitter(options); - if (disposable) { - disposable.add(emitter); - } + disposable?.add(emitter); return emitter.event; } @@ -276,9 +306,7 @@ export namespace Event { }); const flush = () => { - if (buffer) { - buffer.forEach(e => emitter.fire(e)); - } + buffer?.forEach(e => emitter.fire(e)); buffer = null; }; @@ -310,7 +338,7 @@ export namespace Event { return emitter.event; } - export interface IChainableEvent { + export interface IChainableEvent extends IDisposable { event: Event; map(fn: (i: T) => O): IChainableEvent; @@ -327,34 +355,36 @@ export namespace Event { class ChainableEvent implements IChainableEvent { + private readonly disposables = new DisposableStore(); + constructor(readonly event: Event) { } map(fn: (i: T) => O): IChainableEvent { - return new ChainableEvent(map(this.event, fn)); + return new ChainableEvent(map(this.event, fn, this.disposables)); } forEach(fn: (i: T) => void): IChainableEvent { - return new ChainableEvent(forEach(this.event, fn)); + return new ChainableEvent(forEach(this.event, fn, this.disposables)); } filter(fn: (e: T) => boolean): IChainableEvent; filter(fn: (e: T | R) => e is R): IChainableEvent; filter(fn: (e: T) => boolean): IChainableEvent { - return new ChainableEvent(filter(this.event, fn)); + return new ChainableEvent(filter(this.event, fn, this.disposables)); } reduce(merge: (last: R | undefined, event: T) => R, initial?: R): IChainableEvent { - return new ChainableEvent(reduce(this.event, merge, initial)); + return new ChainableEvent(reduce(this.event, merge, initial, this.disposables)); } latch(): IChainableEvent { - return new ChainableEvent(latch(this.event)); + return new ChainableEvent(latch(this.event, undefined, this.disposables)); } debounce(merge: (last: T | undefined, event: T) => T, delay?: number, leading?: boolean, leakWarningThreshold?: number): IChainableEvent; debounce(merge: (last: R | undefined, event: T) => R, delay?: number, leading?: boolean, leakWarningThreshold?: number): IChainableEvent; debounce(merge: (last: R | undefined, event: T) => R, delay: number = 100, leading = false, leakWarningThreshold?: number): IChainableEvent { - return new ChainableEvent(debounce(this.event, merge, delay, leading, leakWarningThreshold)); + return new ChainableEvent(debounce(this.event, merge, delay, leading, leakWarningThreshold, this.disposables)); } on(listener: (e: T) => any, thisArgs: any, disposables: IDisposable[] | DisposableStore) { @@ -364,11 +394,12 @@ export namespace Event { once(listener: (e: T) => any, thisArgs: any, disposables: IDisposable[]) { return once(this.event)(listener, thisArgs, disposables); } + + dispose() { + this.disposables.dispose(); + } } - /** - * @deprecated DO NOT use, this leaks memory - */ export function chain(event: Event): IChainableEvent { return new ChainableEvent(event); } @@ -426,6 +457,55 @@ export namespace Event { store?.dispose(); }); } + + class EmitterObserver implements IObserver { + + readonly emitter: Emitter; + + private _counter = 0; + private _hasChanged = false; + + constructor(readonly obs: IObservable, store: DisposableStore | undefined) { + const options = { + onFirstListenerAdd: () => { + obs.addObserver(this); + }, + onLastListenerRemove: () => { + obs.removeObserver(this); + } + }; + if (!store) { + _addLeakageTraceLogic(options); + } + this.emitter = new Emitter(options); + if (store) { + store.add(this.emitter); + } + } + + beginUpdate(_observable: IObservable): void { + // console.assert(_observable === this.obs); + this._counter++; + } + + handleChange(_observable: IObservable, _change: TChange): void { + this._hasChanged = true; + } + + endUpdate(_observable: IObservable): void { + if (--this._counter === 0) { + if (this._hasChanged) { + this._hasChanged = false; + this.emitter.fire(this.obs.get()); + } + } + } + } + + export function fromObservable(obs: IObservable, store?: DisposableStore): Event { + const observer = new EmitterObserver(obs, store); + return observer.emitter.event; + } } export interface EmitterOptions { @@ -446,32 +526,36 @@ export interface EmitterOptions { } -class EventProfiling { +export class EventProfiling { + + static readonly all = new Set(); private static _idPool = 0; - private _name: string; + readonly name: string; + public listenerCount: number = 0; + public invocationCount = 0; + public elapsedOverall = 0; + public durations: number[] = []; + private _stopWatch?: StopWatch; - private _listenerCount: number = 0; - private _invocationCount = 0; - private _elapsedOverall = 0; constructor(name: string) { - this._name = `${name}_${EventProfiling._idPool++}`; + this.name = `${name}_${EventProfiling._idPool++}`; + EventProfiling.all.add(this); } start(listenerCount: number): void { this._stopWatch = new StopWatch(true); - this._listenerCount = listenerCount; + this.listenerCount = listenerCount; } stop(): void { if (this._stopWatch) { const elapsed = this._stopWatch.elapsed(); - this._elapsedOverall += elapsed; - this._invocationCount += 1; - - console.info(`did FIRE ${this._name}: elapsed_ms: ${elapsed.toFixed(5)}, listener: ${this._listenerCount} (elapsed_overall: ${this._elapsedOverall.toFixed(2)}, invocations: ${this._invocationCount})`); + this.durations.push(elapsed); + this.elapsedOverall += elapsed; + this.invocationCount += 1; this._stopWatch = undefined; } } @@ -690,9 +774,7 @@ export class Emitter { } const result = listener.subscription.set(() => { - if (removeMonitor) { - removeMonitor(); - } + removeMonitor?.(); if (!this._disposed) { removeListener(); if (this._options && this._options.onLastListenerRemove) { @@ -730,7 +812,7 @@ export class Emitter { this._deliveryQueue = new PrivateEventDeliveryQueue(); } - for (let listener of this._listeners) { + for (const listener of this._listeners) { this._deliveryQueue.push(this, listener, event); } @@ -747,7 +829,7 @@ export class Emitter { if (!this._listeners) { return false; } - return (!this._listeners.isEmpty()); + return !this._listeners.isEmpty(); } } @@ -889,9 +971,11 @@ export class PauseableEmitter extends Emitter { if (this._mergeFn) { // use the merge function to create a single composite // event. make a copy in case firing pauses this emitter - const events = Array.from(this._eventQueue); - this._eventQueue.clear(); - super.fire(this._mergeFn(events)); + if (this._eventQueue.size > 0) { + const events = Array.from(this._eventQueue); + this._eventQueue.clear(); + super.fire(this._mergeFn(events)); + } } else { // no merging, fire each event individually and test @@ -949,6 +1033,11 @@ export class MicrotaskEmitter extends Emitter { this._mergeFn = options?.merge; } override fire(event: T): void { + + if (!this.hasListeners()) { + return; + } + this._queuedEvents.push(event); if (this._queuedEvents.length === 1) { queueMicrotask(() => { diff --git a/src/vs/base/common/filters.ts b/src/vs/base/common/filters.ts index d0a8a09aa70..ebad3f5805d 100644 --- a/src/vs/base/common/filters.ts +++ b/src/vs/base/common/filters.ts @@ -316,7 +316,18 @@ function _matchesWords(word: string, target: string, i: number, j: number, conti nextWordIndex++; } } - return result === null ? null : join({ start: j, end: j + 1 }, result); + + if (!result) { + return null; + } + + // If the characters don't exactly match, then they must be word separators (see charactersMatch(...)). + // We don't want to include this in the matches but we don't want to throw the target out all together so we return `result`. + if (word.charCodeAt(i) !== target.charCodeAt(j)) { + return result; + } + + return join({ start: j, end: j + 1 }, result); } } diff --git a/src/vs/base/common/htmlContent.ts b/src/vs/base/common/htmlContent.ts index 37a897e689d..d43cc4d11b4 100644 --- a/src/vs/base/common/htmlContent.ts +++ b/src/vs/base/common/htmlContent.ts @@ -9,9 +9,13 @@ import { isEqual } from 'vs/base/common/resources'; import { escapeRegExpCharacters } from 'vs/base/common/strings'; import { URI, UriComponents } from 'vs/base/common/uri'; +export interface MarkdownStringTrustedOptions { + readonly enabledCommands: readonly string[]; +} + export interface IMarkdownString { readonly value: string; - readonly isTrusted?: boolean; + readonly isTrusted?: boolean | MarkdownStringTrustedOptions; readonly supportThemeIcons?: boolean; readonly supportHtml?: boolean; readonly baseUri?: UriComponents; @@ -26,14 +30,14 @@ export const enum MarkdownStringTextNewlineStyle { export class MarkdownString implements IMarkdownString { public value: string; - public isTrusted?: boolean; + public isTrusted?: boolean | MarkdownStringTrustedOptions; public supportThemeIcons?: boolean; public supportHtml?: boolean; public baseUri?: URI; constructor( value: string = '', - isTrustedOrOptions: boolean | { isTrusted?: boolean; supportThemeIcons?: boolean; supportHtml?: boolean } = false, + isTrustedOrOptions: boolean | { isTrusted?: boolean | MarkdownStringTrustedOptions; supportThemeIcons?: boolean; supportHtml?: boolean } = false, ) { this.value = value; if (typeof this.value !== 'string') { @@ -139,6 +143,10 @@ export function escapeMarkdownSyntaxTokens(text: string): string { return text.replace(/[\\`*_{}[\]()#+\-!]/g, '\\$&'); } +export function escapeDoubleQuotes(input: string) { + return input.replace(/"/g, '"'); +} + export function removeMarkdownEscapes(text: string): string { if (!text) { return text; diff --git a/src/vs/base/common/iterator.ts b/src/vs/base/common/iterator.ts index 2771802f1de..308e03bfcd7 100644 --- a/src/vs/base/common/iterator.ts +++ b/src/vs/base/common/iterator.ts @@ -5,7 +5,7 @@ export namespace Iterable { - export function is(thing: any): thing is IterableIterator { + export function is(thing: any): thing is Iterable { return thing && typeof thing === 'object' && typeof thing[Symbol.iterator] === 'function'; } @@ -18,6 +18,14 @@ export namespace Iterable { yield element; } + export function wrap(iterableOrElement: Iterable | T): Iterable { + if (is(iterableOrElement)) { + return iterableOrElement; + } else { + return single(iterableOrElement); + } + } + export function from(iterable: Iterable | undefined | null): Iterable { return iterable || _empty; } @@ -76,14 +84,6 @@ export namespace Iterable { } } - export function* concatNested(iterables: Iterable>): Iterable { - for (const iterable of iterables) { - for (const element of iterable) { - yield element; - } - } - } - export function reduce(iterable: Iterable, reducer: (previousValue: R, currentValue: T) => R, initialValue: R): R { let value = initialValue; for (const element of iterable) { @@ -92,13 +92,6 @@ export namespace Iterable { return value; } - export function forEach(iterable: Iterable, fn: (t: T, index: number) => any): void { - let index = 0; - for (const element of iterable) { - fn(element, index++); - } - } - /** * Returns an iterable slice of the array, with the same semantics as `array.slice()`. */ @@ -143,33 +136,4 @@ export namespace Iterable { return [consumed, { [Symbol.iterator]() { return iterator; } }]; } - - /** - * Consumes `atMost` elements from iterable and returns the consumed elements, - * and an iterable for the rest of the elements. - */ - export function collect(iterable: Iterable): T[] { - return consume(iterable)[0]; - } - - /** - * Returns whether the iterables are the same length and all items are - * equal using the comparator function. - */ - export function equals(a: Iterable, b: Iterable, comparator = (at: T, bt: T) => at === bt) { - const ai = a[Symbol.iterator](); - const bi = b[Symbol.iterator](); - while (true) { - const an = ai.next(); - const bn = bi.next(); - - if (an.done !== bn.done) { - return false; - } else if (an.done) { - return true; - } else if (!comparator(an.value, bn.value)) { - return false; - } - } - } } diff --git a/src/vs/base/common/json.ts b/src/vs/base/common/json.ts index aaf4aeaf913..dadcbaf74f1 100644 --- a/src/vs/base/common/json.ts +++ b/src/vs/base/common/json.ts @@ -200,12 +200,12 @@ export interface JSONVisitor { */ export function createScanner(text: string, ignoreTrivia: boolean = false): JSONScanner { - let pos = 0, - len = text.length, - value: string = '', - tokenOffset = 0, - token: SyntaxKind = SyntaxKind.Unknown, - scanError: ScanError = ScanError.None; + let pos = 0; + const len = text.length; + let value: string = ''; + let tokenOffset = 0; + let token: SyntaxKind = SyntaxKind.Unknown; + let scanError: ScanError = ScanError.None; function scanHexDigits(count: number): number { let digits = 0; @@ -963,7 +963,7 @@ export function findNodeAtLocation(root: Node, path: JSONPath): Node | undefined return undefined; } let node = root; - for (let segment of path) { + for (const segment of path) { if (typeof segment === 'string') { if (node.type !== 'object' || !Array.isArray(node.children)) { return undefined; @@ -1019,7 +1019,7 @@ export function getNodeValue(node: Node): any { return node.children!.map(getNodeValue); case 'object': { const obj = Object.create(null); - for (let prop of node.children!) { + for (const prop of node.children!) { const valueNode = prop.children![1]; if (valueNode) { obj[prop.children![0].value] = getNodeValue(valueNode); @@ -1315,11 +1315,11 @@ export function visit(text: string, visitor: JSONVisitor, options: ParseOptions */ export function stripComments(text: string, replaceCh?: string): string { - let _scanner = createScanner(text), - parts: string[] = [], - kind: SyntaxKind, - offset = 0, - pos: number; + const _scanner = createScanner(text); + const parts: string[] = []; + let kind: SyntaxKind; + let offset = 0; + let pos: number; do { pos = _scanner.getPosition(); diff --git a/src/vs/base/common/jsonEdit.ts b/src/vs/base/common/jsonEdit.ts index b74f35d3d87..6a6302d41ef 100644 --- a/src/vs/base/common/jsonEdit.ts +++ b/src/vs/base/common/jsonEdit.ts @@ -155,7 +155,7 @@ export function applyEdit(text: string, edit: Edit): string { } export function applyEdits(text: string, edits: Edit[]): string { - let sortedEdits = edits.slice(0).sort((a, b) => { + const sortedEdits = edits.slice(0).sort((a, b) => { const diff = a.offset - b.offset; if (diff === 0) { return a.length - b.length; @@ -164,7 +164,7 @@ export function applyEdits(text: string, edits: Edit[]): string { }); let lastModifiedOffset = text.length; for (let i = sortedEdits.length - 1; i >= 0; i--) { - let e = sortedEdits[i]; + const e = sortedEdits[i]; if (e.offset + e.length <= lastModifiedOffset) { text = applyEdit(text, e); } else { diff --git a/src/vs/base/common/keyCodes.ts b/src/vs/base/common/keyCodes.ts index 1fc19d99835..44488dbb299 100644 --- a/src/vs/base/common/keyCodes.ts +++ b/src/vs/base/common/keyCodes.ts @@ -722,8 +722,8 @@ for (let i = 0; i <= KeyCode.MAX_VALUE; i++) { [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_OEM_CLEAR', empty, empty], ]; - let seenKeyCode: boolean[] = []; - let seenScanCode: boolean[] = []; + const seenKeyCode: boolean[] = []; + const seenScanCode: boolean[] = []; for (const mapping of mappings) { const [_keyCodeOrd, immutable, scanCode, scanCodeStr, keyCode, keyCodeStr, eventKeyCode, vkey, usUserSettingsLabel, generalUserSettingsLabel] = mapping; if (!seenScanCode[scanCode]) { diff --git a/src/vs/base/common/keybindingLabels.ts b/src/vs/base/common/keybindingLabels.ts index 62e905a4bb4..bc571081ea7 100644 --- a/src/vs/base/common/keybindingLabels.ts +++ b/src/vs/base/common/keybindingLabels.ts @@ -30,7 +30,7 @@ export class ModifierLabelProvider { this.modifierLabels[OperatingSystem.Linux] = linux; } - public toLabel(OS: OperatingSystem, parts: T[], keyLabelProvider: KeyLabelProvider): string | null { + public toLabel(OS: OperatingSystem, parts: readonly T[], keyLabelProvider: KeyLabelProvider): string | null { if (parts.length === 0) { return null; } diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts index 19a6d4f46bc..95b4518feee 100644 --- a/src/vs/base/common/labels.ts +++ b/src/vs/base/common/labels.ts @@ -4,11 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import { firstOrDefault } from 'vs/base/common/arrays'; -import { hasDriveLetter, isRootOrDriveLetter, toSlashes } from 'vs/base/common/extpath'; -import { Schemas } from 'vs/base/common/network'; +import { hasDriveLetter, toSlashes } from 'vs/base/common/extpath'; import { posix, sep, win32 } from 'vs/base/common/path'; import { isMacintosh, isWindows, OperatingSystem, OS } from 'vs/base/common/platform'; -import { basename, extUri, extUriIgnorePathCase } from 'vs/base/common/resources'; +import { extUri, extUriIgnorePathCase } from 'vs/base/common/resources'; import { rtrim, startsWithIgnoreCase } from 'vs/base/common/strings'; import { URI } from 'vs/base/common/uri'; @@ -74,7 +73,7 @@ export function getPathLabel(resource: URI, formatting: IPathLabelFormatting): s // macOS/Linux: tildify with provided user home directory if (os !== OperatingSystem.Windows && tildifier?.userHome) { - let userHome = tildifier.userHome.fsPath; + const userHome = tildifier.userHome.fsPath; // This is a bit of a hack, but in order to figure out if the // resource is in the user home, we need to make sure to convert it @@ -139,27 +138,6 @@ function getRelativePathLabel(resource: URI, relativePathProvider: IRelativePath return relativePathLabel; } -export function getBaseLabel(resource: URI | string): string; -export function getBaseLabel(resource: URI | string | undefined): string | undefined; -export function getBaseLabel(resource: URI | string | undefined): string | undefined { - if (!resource) { - return undefined; - } - - if (typeof resource === 'string') { - resource = URI.file(resource); - } - - const base = basename(resource) || (resource.scheme === Schemas.file ? resource.fsPath : resource.path) /* can be empty string if '/' is passed in */; - - // convert c: => C: - if (isWindows && isRootOrDriveLetter(base)) { - return normalizeDriveLetter(base); - } - - return base; -} - export function normalizeDriveLetter(path: string, isWindowsOS: boolean = isWindows): string { if (hasDriveLetter(path, isWindowsOS)) { return path.charAt(0).toUpperCase() + path.slice(1); @@ -239,7 +217,7 @@ export function shorten(paths: string[], pathSeparator: string = sep): string[] // for every path let match = false; for (let pathIndex = 0; pathIndex < paths.length; pathIndex++) { - let originalPath = paths[pathIndex]; + const originalPath = paths[pathIndex]; if (originalPath === '') { shortenedPaths[pathIndex] = `.${pathSeparator}`; diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts index c67bb116700..d58b2fa2155 100644 --- a/src/vs/base/common/lifecycle.ts +++ b/src/vs/base/common/lifecycle.ts @@ -6,6 +6,8 @@ import { once } from 'vs/base/common/functional'; import { Iterable } from 'vs/base/common/iterator'; +// #region Disposable Tracking + /** * Enables logging of potentially leaked disposables. * @@ -108,30 +110,39 @@ export function markAsSingleton(singleton: T): T { return singleton; } -export class MultiDisposeError extends Error { - constructor( - public readonly errors: any[] - ) { - super(`Encountered errors while disposing of store. Errors: [${errors.join(', ')}]`); - } -} +// #endregion +/** + * An object that performs a cleanup operation when `.dispose()` is called. + * + * Some examples of how disposables are used: + * + * - An event listener that removes itself when `.dispose()` is called. + * - A resource such as a file system watcher that cleans up the resource when `.dispose()` is called. + * - The return value from registering a provider. When `.dispose()` is called, the provider is unregistered. + */ export interface IDisposable { dispose(): void; } +/** + * Check if `thing` is {@link IDisposable disposable}. + */ export function isDisposable(thing: E): thing is E & IDisposable { return typeof (thing).dispose === 'function' && (thing).dispose.length === 0; } +/** + * Disposes of the value(s) passed in. + */ export function dispose(disposable: T): T; export function dispose(disposable: T | undefined): T | undefined; -export function dispose = IterableIterator>(disposables: IterableIterator): A; +export function dispose = Iterable>(disposables: A): A; export function dispose(disposables: Array): Array; export function dispose(disposables: ReadonlyArray): ReadonlyArray; -export function dispose(arg: T | IterableIterator | undefined): any { +export function dispose(arg: T | Iterable | undefined): any { if (Iterable.is(arg)) { - let errors: any[] = []; + const errors: any[] = []; for (const d of arg) { if (d) { @@ -146,7 +157,7 @@ export function dispose(arg: T | IterableIterator | un if (errors.length === 1) { throw errors[0]; } else if (errors.length > 1) { - throw new MultiDisposeError(errors); + throw new AggregateError(errors, 'Encountered errors while disposing of store'); } return Array.isArray(arg) ? [] : arg; @@ -156,13 +167,27 @@ export function dispose(arg: T | IterableIterator | un } } +export function disposeIfDisposable(disposables: Array): Array { + for (const d of disposables) { + if (isDisposable(d)) { + d.dispose(); + } + } + return []; +} +/** + * Combine multiple disposable values into a single {@link IDisposable}. + */ export function combinedDisposable(...disposables: IDisposable[]): IDisposable { const parent = toDisposable(() => dispose(disposables)); setParentOfDisposables(disposables, parent); return parent; } +/** + * Turn a function that implements dispose into an {@link IDisposable}. + */ export function toDisposable(fn: () => void): IDisposable { const self = trackDisposable({ dispose: once(() => { @@ -173,11 +198,18 @@ export function toDisposable(fn: () => void): IDisposable { return self; } +/** + * Manages a collection of disposable values. + * + * This is the preferred way to manage multiple disposables. A `DisposableStore` is safer to work with than an + * `IDisposable[]` as it considers edge cases, such as registering the same value multiple times or adding an item to a + * store that has already been disposed of. + */ export class DisposableStore implements IDisposable { static DISABLE_DISPOSED_WARNING = false; - private _toDispose = new Set(); + private readonly _toDispose = new Set(); private _isDisposed = false; constructor() { @@ -200,7 +232,7 @@ export class DisposableStore implements IDisposable { } /** - * Returns `true` if this object has been disposed + * @return `true` if this object has been disposed of. */ public get isDisposed(): boolean { return this._isDisposed; @@ -210,13 +242,20 @@ export class DisposableStore implements IDisposable { * Dispose of all registered disposables but do not mark this object as disposed. */ public clear(): void { + if (this._toDispose.size === 0) { + return; + } + try { - dispose(this._toDispose.values()); + dispose(this._toDispose); } finally { this._toDispose.clear(); } } + /** + * Add a new {@link IDisposable disposable} to the collection. + */ public add(o: T): T { if (!o) { return o; @@ -238,8 +277,18 @@ export class DisposableStore implements IDisposable { } } +/** + * Abstract base class for a {@link IDisposable disposable} object. + * + * Subclasses can {@linkcode _register} disposables that will be automatically cleaned up when this object is disposed of. + */ export abstract class Disposable implements IDisposable { + /** + * A disposable that does nothing when it is disposed of. + * + * TODO: This should not be a static property. + */ static readonly None = Object.freeze({ dispose() { } }); protected readonly _store = new DisposableStore(); @@ -255,6 +304,9 @@ export abstract class Disposable implements IDisposable { this._store.dispose(); } + /** + * Adds `o` to the collection of disposables managed by this object. + */ protected _register(o: T): T { if ((o as unknown as Disposable) === this) { throw new Error('Cannot register a disposable on itself!'); @@ -293,7 +345,10 @@ export class MutableDisposable implements IDisposable { this._value = value; } - clear() { + /** + * Resets the stored value and disposed of the previously stored value. + */ + clear(): void { this.value = undefined; } @@ -439,3 +494,74 @@ export function disposeOnReturn(fn: (store: DisposableStore) => void): void { store.dispose(); } } + +/** + * A map the manages the lifecycle of the values that it stores. + */ +export class DisposableMap implements IDisposable { + + private readonly _store = new Map(); + private _isDisposed = false; + + constructor() { + trackDisposable(this); + } + + /** + * Disposes of all stored values and mark this object as disposed. + * + * Trying to use this object after it has been disposed of is an error. + */ + dispose(): void { + markAsDisposed(this); + this._isDisposed = true; + this.clearAndDisposeAll(); + } + + /** + * Disposes of all stored values and clear the map, but DO NOT mark this object as disposed. + */ + clearAndDisposeAll(): void { + if (!this._store.size) { + return; + } + + try { + dispose(this._store.values()); + } finally { + this._store.clear(); + } + } + + has(key: K): boolean { + return this._store.has(key); + } + + get(key: K): V | undefined { + return this._store.get(key); + } + + set(key: K, value: V, skipDisposeOnOverwrite = false): void { + if (this._isDisposed) { + console.warn(new Error('Trying to add a disposable to a DisposableMap that has already been disposed of. The added object will be leaked!').stack); + } + + if (!skipDisposeOnOverwrite) { + this._store.get(key)?.dispose(); + } + + this._store.set(key, value); + } + + /** + * Delete the value stored for `key` from this map and also dispose of it. + */ + deleteAndDispose(key: K): void { + this._store.get(key)?.dispose(); + this._store.delete(key); + } + + [Symbol.iterator](): IterableIterator<[K, V]> { + return this._store[Symbol.iterator](); + } +} diff --git a/src/vs/base/common/map.ts b/src/vs/base/common/map.ts index 78c23bc80b4..e8b505142b0 100644 --- a/src/vs/base/common/map.ts +++ b/src/vs/base/common/map.ts @@ -3,9 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { shuffle } from 'vs/base/common/arrays'; -import { CharCode } from 'vs/base/common/charCode'; -import { compare, compareIgnoreCase, compareSubstring, compareSubstringIgnoreCase } from 'vs/base/common/strings'; import { URI } from 'vs/base/common/uri'; export function getOrSet(map: Map, key: K, value: V): V { @@ -36,720 +33,6 @@ export function setToString(set: Set): string { return `Set(${set.size}) {${entries.join(', ')}}`; } -export interface IKeyIterator { - reset(key: K): this; - next(): this; - - hasNext(): boolean; - cmp(a: string): number; - value(): string; -} - -export class StringIterator implements IKeyIterator { - - private _value: string = ''; - private _pos: number = 0; - - reset(key: string): this { - this._value = key; - this._pos = 0; - return this; - } - - next(): this { - this._pos += 1; - return this; - } - - hasNext(): boolean { - return this._pos < this._value.length - 1; - } - - cmp(a: string): number { - const aCode = a.charCodeAt(0); - const thisCode = this._value.charCodeAt(this._pos); - return aCode - thisCode; - } - - value(): string { - return this._value[this._pos]; - } -} - -export class ConfigKeysIterator implements IKeyIterator { - - private _value!: string; - private _from!: number; - private _to!: number; - - constructor( - private readonly _caseSensitive: boolean = true - ) { } - - reset(key: string): this { - this._value = key; - this._from = 0; - this._to = 0; - return this.next(); - } - - hasNext(): boolean { - return this._to < this._value.length; - } - - next(): this { - // this._data = key.split(/[\\/]/).filter(s => !!s); - this._from = this._to; - let justSeps = true; - for (; this._to < this._value.length; this._to++) { - const ch = this._value.charCodeAt(this._to); - if (ch === CharCode.Period) { - if (justSeps) { - this._from++; - } else { - break; - } - } else { - justSeps = false; - } - } - return this; - } - - cmp(a: string): number { - return this._caseSensitive - ? compareSubstring(a, this._value, 0, a.length, this._from, this._to) - : compareSubstringIgnoreCase(a, this._value, 0, a.length, this._from, this._to); - } - - value(): string { - return this._value.substring(this._from, this._to); - } -} - -export class PathIterator implements IKeyIterator { - - private _value!: string; - private _valueLen!: number; - private _from!: number; - private _to!: number; - - constructor( - private readonly _splitOnBackslash: boolean = true, - private readonly _caseSensitive: boolean = true - ) { } - - reset(key: string): this { - this._from = 0; - this._to = 0; - this._value = key; - this._valueLen = key.length; - for (let pos = key.length - 1; pos >= 0; pos--, this._valueLen--) { - const ch = this._value.charCodeAt(pos); - if (!(ch === CharCode.Slash || this._splitOnBackslash && ch === CharCode.Backslash)) { - break; - } - } - - return this.next(); - } - - hasNext(): boolean { - return this._to < this._valueLen; - } - - next(): this { - // this._data = key.split(/[\\/]/).filter(s => !!s); - this._from = this._to; - let justSeps = true; - for (; this._to < this._valueLen; this._to++) { - const ch = this._value.charCodeAt(this._to); - if (ch === CharCode.Slash || this._splitOnBackslash && ch === CharCode.Backslash) { - if (justSeps) { - this._from++; - } else { - break; - } - } else { - justSeps = false; - } - } - return this; - } - - cmp(a: string): number { - return this._caseSensitive - ? compareSubstring(a, this._value, 0, a.length, this._from, this._to) - : compareSubstringIgnoreCase(a, this._value, 0, a.length, this._from, this._to); - } - - value(): string { - return this._value.substring(this._from, this._to); - } -} - -const enum UriIteratorState { - Scheme = 1, Authority = 2, Path = 3, Query = 4, Fragment = 5 -} - -export class UriIterator implements IKeyIterator { - - private _pathIterator!: PathIterator; - private _value!: URI; - private _states: UriIteratorState[] = []; - private _stateIdx: number = 0; - - constructor( - private readonly _ignorePathCasing: (uri: URI) => boolean, - private readonly _ignoreQueryAndFragment: (uri: URI) => boolean) { } - - reset(key: URI): this { - this._value = key; - this._states = []; - if (this._value.scheme) { - this._states.push(UriIteratorState.Scheme); - } - if (this._value.authority) { - this._states.push(UriIteratorState.Authority); - } - if (this._value.path) { - this._pathIterator = new PathIterator(false, !this._ignorePathCasing(key)); - this._pathIterator.reset(key.path); - if (this._pathIterator.value()) { - this._states.push(UriIteratorState.Path); - } - } - if (!this._ignoreQueryAndFragment(key)) { - if (this._value.query) { - this._states.push(UriIteratorState.Query); - } - if (this._value.fragment) { - this._states.push(UriIteratorState.Fragment); - } - } - this._stateIdx = 0; - return this; - } - - next(): this { - if (this._states[this._stateIdx] === UriIteratorState.Path && this._pathIterator.hasNext()) { - this._pathIterator.next(); - } else { - this._stateIdx += 1; - } - return this; - } - - hasNext(): boolean { - return (this._states[this._stateIdx] === UriIteratorState.Path && this._pathIterator.hasNext()) - || this._stateIdx < this._states.length - 1; - } - - cmp(a: string): number { - if (this._states[this._stateIdx] === UriIteratorState.Scheme) { - return compareIgnoreCase(a, this._value.scheme); - } else if (this._states[this._stateIdx] === UriIteratorState.Authority) { - return compareIgnoreCase(a, this._value.authority); - } else if (this._states[this._stateIdx] === UriIteratorState.Path) { - return this._pathIterator.cmp(a); - } else if (this._states[this._stateIdx] === UriIteratorState.Query) { - return compare(a, this._value.query); - } else if (this._states[this._stateIdx] === UriIteratorState.Fragment) { - return compare(a, this._value.fragment); - } - throw new Error(); - } - - value(): string { - if (this._states[this._stateIdx] === UriIteratorState.Scheme) { - return this._value.scheme; - } else if (this._states[this._stateIdx] === UriIteratorState.Authority) { - return this._value.authority; - } else if (this._states[this._stateIdx] === UriIteratorState.Path) { - return this._pathIterator.value(); - } else if (this._states[this._stateIdx] === UriIteratorState.Query) { - return this._value.query; - } else if (this._states[this._stateIdx] === UriIteratorState.Fragment) { - return this._value.fragment; - } - throw new Error(); - } -} - -class TernarySearchTreeNode { - height: number = 1; - segment!: string; - value: V | undefined; - key: K | undefined; - left: TernarySearchTreeNode | undefined; - mid: TernarySearchTreeNode | undefined; - right: TernarySearchTreeNode | undefined; - - isEmpty(): boolean { - return !this.left && !this.mid && !this.right && !this.value; - } - - rotateLeft() { - const tmp = this.right!; - this.right = tmp.left; - tmp.left = this; - this.updateHeight(); - tmp.updateHeight(); - return tmp; - } - - rotateRight() { - const tmp = this.left!; - this.left = tmp.right; - tmp.right = this; - this.updateHeight(); - tmp.updateHeight(); - return tmp; - } - - updateHeight() { - this.height = 1 + Math.max(this.heightLeft, this.heightRight); - } - - balanceFactor() { - return this.heightRight - this.heightLeft; - } - - get heightLeft() { - return this.left?.height ?? 0; - } - - get heightRight() { - return this.right?.height ?? 0; - } -} - -const enum Dir { - Left = -1, - Mid = 0, - Right = 1, -} - -export class TernarySearchTree { - - static forUris(ignorePathCasing: (key: URI) => boolean = () => false, ignoreQueryAndFragment: (key: URI) => boolean = () => false): TernarySearchTree { - return new TernarySearchTree(new UriIterator(ignorePathCasing, ignoreQueryAndFragment)); - } - - static forPaths(ignorePathCasing = false): TernarySearchTree { - return new TernarySearchTree(new PathIterator(undefined, !ignorePathCasing)); - } - - static forStrings(): TernarySearchTree { - return new TernarySearchTree(new StringIterator()); - } - - static forConfigKeys(): TernarySearchTree { - return new TernarySearchTree(new ConfigKeysIterator()); - } - - private _iter: IKeyIterator; - private _root: TernarySearchTreeNode | undefined; - - constructor(segments: IKeyIterator) { - this._iter = segments; - } - - clear(): void { - this._root = undefined; - } - - /** - * Fill the tree with the same value of the given keys - */ - fill(element: V, keys: readonly K[]): void; - /** - * Fill the tree with given [key,value]-tuples - */ - fill(values: readonly [K, V][]): void; - fill(values: readonly [K, V][] | V, keys?: readonly K[]): void { - if (keys) { - const arr = keys.slice(0); - shuffle(arr); - for (let k of arr) { - this.set(k, (values)); - } - } else { - const arr = (<[K, V][]>values).slice(0); - shuffle(arr); - for (let entry of arr) { - this.set(entry[0], entry[1]); - } - } - } - - set(key: K, element: V): V | undefined { - const iter = this._iter.reset(key); - let node: TernarySearchTreeNode; - - if (!this._root) { - this._root = new TernarySearchTreeNode(); - this._root.segment = iter.value(); - } - const stack: [Dir, TernarySearchTreeNode][] = []; - - // find insert_node - node = this._root; - while (true) { - const val = iter.cmp(node.segment); - if (val > 0) { - // left - if (!node.left) { - node.left = new TernarySearchTreeNode(); - node.left.segment = iter.value(); - } - stack.push([Dir.Left, node]); - node = node.left; - - } else if (val < 0) { - // right - if (!node.right) { - node.right = new TernarySearchTreeNode(); - node.right.segment = iter.value(); - } - stack.push([Dir.Right, node]); - node = node.right; - - } else if (iter.hasNext()) { - // mid - iter.next(); - if (!node.mid) { - node.mid = new TernarySearchTreeNode(); - node.mid.segment = iter.value(); - } - stack.push([Dir.Mid, node]); - node = node.mid; - } else { - break; - } - } - - // set value - const oldElement = node.value; - node.value = element; - node.key = key; - - // balance - for (let i = stack.length - 1; i >= 0; i--) { - const node = stack[i][1]; - - node.updateHeight(); - const bf = node.balanceFactor(); - - if (bf < -1 || bf > 1) { - // needs rotate - const d1 = stack[i][0]; - const d2 = stack[i + 1][0]; - - if (d1 === Dir.Right && d2 === Dir.Right) { - //right, right -> rotate left - stack[i][1] = node.rotateLeft(); - - } else if (d1 === Dir.Left && d2 === Dir.Left) { - // left, left -> rotate right - stack[i][1] = node.rotateRight(); - - } else if (d1 === Dir.Right && d2 === Dir.Left) { - // right, left -> double rotate right, left - node.right = stack[i + 1][1] = stack[i + 1][1].rotateRight(); - stack[i][1] = node.rotateLeft(); - - } else if (d1 === Dir.Left && d2 === Dir.Right) { - // left, right -> double rotate left, right - node.left = stack[i + 1][1] = stack[i + 1][1].rotateLeft(); - stack[i][1] = node.rotateRight(); - - } else { - throw new Error(); - } - - // patch path to parent - if (i > 0) { - switch (stack[i - 1][0]) { - case Dir.Left: - stack[i - 1][1].left = stack[i][1]; - break; - case Dir.Right: - stack[i - 1][1].right = stack[i][1]; - break; - case Dir.Mid: - stack[i - 1][1].mid = stack[i][1]; - break; - } - } else { - this._root = stack[0][1]; - } - } - } - - return oldElement; - } - - get(key: K): V | undefined { - return this._getNode(key)?.value; - } - - private _getNode(key: K) { - const iter = this._iter.reset(key); - let node = this._root; - while (node) { - const val = iter.cmp(node.segment); - if (val > 0) { - // left - node = node.left; - } else if (val < 0) { - // right - node = node.right; - } else if (iter.hasNext()) { - // mid - iter.next(); - node = node.mid; - } else { - break; - } - } - return node; - } - - has(key: K): boolean { - const node = this._getNode(key); - return !(node?.value === undefined && node?.mid === undefined); - } - - delete(key: K): void { - return this._delete(key, false); - } - - deleteSuperstr(key: K): void { - return this._delete(key, true); - } - - private _delete(key: K, superStr: boolean): void { - const iter = this._iter.reset(key); - const stack: [Dir, TernarySearchTreeNode][] = []; - let node = this._root; - - // find node - while (node) { - const val = iter.cmp(node.segment); - if (val > 0) { - // left - stack.push([Dir.Left, node]); - node = node.left; - } else if (val < 0) { - // right - stack.push([Dir.Right, node]); - node = node.right; - } else if (iter.hasNext()) { - // mid - iter.next(); - stack.push([Dir.Mid, node]); - node = node.mid; - } else { - break; - } - } - - if (!node) { - // node not found - return; - } - - if (superStr) { - // removing children, reset height - node.left = undefined; - node.mid = undefined; - node.right = undefined; - node.height = 1; - } else { - // removing element - node.key = undefined; - node.value = undefined; - } - - // BST node removal - if (!node.mid && !node.value) { - if (node.left && node.right) { - // full node - const min = this._min(node.right); - const { key, value, segment } = min; - this._delete(min.key!, false); - node.key = key; - node.value = value; - node.segment = segment; - - } else { - // empty or half empty - const newChild = node.left ?? node.right; - if (stack.length > 0) { - const [dir, parent] = stack[stack.length - 1]; - switch (dir) { - case Dir.Left: parent.left = newChild; break; - case Dir.Mid: parent.mid = newChild; break; - case Dir.Right: parent.right = newChild; break; - } - } else { - this._root = newChild; - } - } - } - - // AVL balance - for (let i = stack.length - 1; i >= 0; i--) { - const node = stack[i][1]; - - node.updateHeight(); - const bf = node.balanceFactor(); - if (bf > 1) { - // right heavy - if (node.right!.balanceFactor() >= 0) { - // right, right -> rotate left - stack[i][1] = node.rotateLeft(); - } else { - // right, left -> double rotate - node.right = node.right!.rotateRight(); - stack[i][1] = node.rotateLeft(); - } - - } else if (bf < -1) { - // left heavy - if (node.left!.balanceFactor() <= 0) { - // left, left -> rotate right - stack[i][1] = node.rotateRight(); - } else { - // left, right -> double rotate - node.left = node.left!.rotateLeft(); - stack[i][1] = node.rotateRight(); - } - } - - // patch path to parent - if (i > 0) { - switch (stack[i - 1][0]) { - case Dir.Left: - stack[i - 1][1].left = stack[i][1]; - break; - case Dir.Right: - stack[i - 1][1].right = stack[i][1]; - break; - case Dir.Mid: - stack[i - 1][1].mid = stack[i][1]; - break; - } - } else { - this._root = stack[0][1]; - } - } - } - - private _min(node: TernarySearchTreeNode): TernarySearchTreeNode { - while (node.left) { - node = node.left; - } - return node; - } - - findSubstr(key: K): V | undefined { - const iter = this._iter.reset(key); - let node = this._root; - let candidate: V | undefined = undefined; - while (node) { - const val = iter.cmp(node.segment); - if (val > 0) { - // left - node = node.left; - } else if (val < 0) { - // right - node = node.right; - } else if (iter.hasNext()) { - // mid - iter.next(); - candidate = node.value || candidate; - node = node.mid; - } else { - break; - } - } - return node && node.value || candidate; - } - - findSuperstr(key: K): IterableIterator<[K, V]> | undefined { - const iter = this._iter.reset(key); - let node = this._root; - while (node) { - const val = iter.cmp(node.segment); - if (val > 0) { - // left - node = node.left; - } else if (val < 0) { - // right - node = node.right; - } else if (iter.hasNext()) { - // mid - iter.next(); - node = node.mid; - } else { - // collect - if (!node.mid) { - return undefined; - } else { - return this._entries(node.mid); - } - } - } - return undefined; - } - - forEach(callback: (value: V, index: K) => any): void { - for (const [key, value] of this) { - callback(value, key); - } - } - - *[Symbol.iterator](): IterableIterator<[K, V]> { - yield* this._entries(this._root); - } - - private *_entries(node: TernarySearchTreeNode | undefined): IterableIterator<[K, V]> { - // DFS - if (!node) { - return; - } - if (node.left) { - yield* this._entries(node.left); - } - if (node.value) { - yield [node.key!, node.value]; - } - if (node.mid) { - yield* this._entries(node.mid); - } - if (node.right) { - yield* this._entries(node.right); - } - } - - // for debug/testing - _isBalanced(): boolean { - const nodeIsBalanced = (node: TernarySearchTreeNode | undefined): boolean => { - if (!node) { - return true; - } - const bf = node.balanceFactor(); - if (bf < -1 || bf > 1) { - return false; - } - return nodeIsBalanced(node.left) && nodeIsBalanced(node.right); - }; - return nodeIsBalanced(this._root); - } -} - interface ResourceMapKeyFn { (resource: URI): string; } @@ -819,31 +102,31 @@ export class ResourceMap implements Map { if (typeof thisArg !== 'undefined') { clb = clb.bind(thisArg); } - for (let [_, entry] of this.map) { + for (const [_, entry] of this.map) { clb(entry.value, entry.uri, this); } } *values(): IterableIterator { - for (let entry of this.map.values()) { + for (const entry of this.map.values()) { yield entry.value; } } *keys(): IterableIterator { - for (let entry of this.map.values()) { + for (const entry of this.map.values()) { yield entry.uri; } } *entries(): IterableIterator<[URI, T]> { - for (let entry of this.map.values()) { + for (const entry of this.map.values()) { yield [entry.uri, entry.value]; } } *[Symbol.iterator](): IterableIterator<[URI, T]> { - for (let [, entry] of this.map) { + for (const [, entry] of this.map) { yield [entry.uri, entry.value]; } } @@ -1349,47 +632,3 @@ export class LRUCache extends LinkedMap { } } } - -/** - * Wraps the map in type that only implements readonly properties. Useful - * in the extension host to prevent the consumer from making any mutations. - */ -export class ReadonlyMapView implements ReadonlyMap{ - readonly #source: ReadonlyMap; - - public get size() { - return this.#source.size; - } - - constructor(source: ReadonlyMap) { - this.#source = source; - } - - forEach(callbackfn: (value: V, key: K, map: ReadonlyMap) => void, thisArg?: any): void { - this.#source.forEach(callbackfn, thisArg); - } - - get(key: K): V | undefined { - return this.#source.get(key); - } - - has(key: K): boolean { - return this.#source.has(key); - } - - entries(): IterableIterator<[K, V]> { - return this.#source.entries(); - } - - keys(): IterableIterator { - return this.#source.keys(); - } - - values(): IterableIterator { - return this.#source.values(); - } - - [Symbol.iterator](): IterableIterator<[K, V]> { - return this.#source.entries(); - } -} diff --git a/src/vs/base/common/marked/cgmanifest.json b/src/vs/base/common/marked/cgmanifest.json index 60e11b4144e..4dffc3ff231 100644 --- a/src/vs/base/common/marked/cgmanifest.json +++ b/src/vs/base/common/marked/cgmanifest.json @@ -6,11 +6,11 @@ "git": { "name": "marked", "repositoryUrl": "https://github.com/markedjs/marked", - "commitHash": "2002557d004139ca2208c910d9ca999829b65406" + "commitHash": "7e2ef307846427650114591f9257b5545868e928" } }, "license": "MIT", - "version": "4.0.16" + "version": "4.1.0" } ], "version": 1 diff --git a/src/vs/base/common/marked/marked.d.ts b/src/vs/base/common/marked/marked.d.ts index 5b7014ec2fb..7aeab2e864d 100644 --- a/src/vs/base/common/marked/marked.d.ts +++ b/src/vs/base/common/marked/marked.d.ts @@ -10,6 +10,8 @@ // Sarun Intaralawan // Tony Brix // Anatolii Titov +// Jean-Francois Cere +// Mykhaylo Stolyarchuk // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /** @@ -75,11 +77,7 @@ export namespace marked { * @param callback Function called when the markdownString has been fully parsed when using async highlighting * @return String of compiled HTML */ - function parse( - src: string, - options?: MarkedOptions, - callback?: (error: any, parseResult: string) => void, - ): string; + function parse(src: string, options?: MarkedOptions, callback?: (error: any, parseResult: string) => void): string; /** * @param src Tokenized source as array of tokens @@ -126,34 +124,39 @@ export namespace marked { class Tokenizer { constructor(options?: MarkedOptions); options: MarkedOptions; - space(this: TokenizerThis, src: string): Tokens.Space | T; - code(this: TokenizerThis, src: string): Tokens.Code | T; - fences(this: TokenizerThis, src: string): Tokens.Code | T; - heading(this: TokenizerThis, src: string): Tokens.Heading | T; - hr(this: TokenizerThis, src: string): Tokens.Hr | T; - blockquote(this: TokenizerThis, src: string): Tokens.Blockquote | T; - list(this: TokenizerThis, src: string): Tokens.List | T; - html(this: TokenizerThis, src: string): Tokens.HTML | T; - def(this: TokenizerThis, src: string): Tokens.Def | T; - table(this: TokenizerThis, src: string): Tokens.Table | T; - lheading(this: TokenizerThis, src: string): Tokens.Heading | T; - paragraph(this: TokenizerThis, src: string): Tokens.Paragraph | T; - text(this: TokenizerThis, src: string): Tokens.Text | T; - escape(this: TokenizerThis, src: string): Tokens.Escape | T; - tag(this: TokenizerThis, src: string): Tokens.Tag | T; - link(this: TokenizerThis, src: string): Tokens.Image | Tokens.Link | T; + space(this: Tokenizer & TokenizerThis, src: string): Tokens.Space | T; + code(this: Tokenizer & TokenizerThis, src: string): Tokens.Code | T; + fences(this: Tokenizer & TokenizerThis, src: string): Tokens.Code | T; + heading(this: Tokenizer & TokenizerThis, src: string): Tokens.Heading | T; + hr(this: Tokenizer & TokenizerThis, src: string): Tokens.Hr | T; + blockquote(this: Tokenizer & TokenizerThis, src: string): Tokens.Blockquote | T; + list(this: Tokenizer & TokenizerThis, src: string): Tokens.List | T; + html(this: Tokenizer & TokenizerThis, src: string): Tokens.HTML | T; + def(this: Tokenizer & TokenizerThis, src: string): Tokens.Def | T; + table(this: Tokenizer & TokenizerThis, src: string): Tokens.Table | T; + lheading(this: Tokenizer & TokenizerThis, src: string): Tokens.Heading | T; + paragraph(this: Tokenizer & TokenizerThis, src: string): Tokens.Paragraph | T; + text(this: Tokenizer & TokenizerThis, src: string): Tokens.Text | T; + escape(this: Tokenizer & TokenizerThis, src: string): Tokens.Escape | T; + tag(this: Tokenizer & TokenizerThis, src: string): Tokens.Tag | T; + link(this: Tokenizer & TokenizerThis, src: string): Tokens.Image | Tokens.Link | T; reflink( - this: TokenizerThis, + this: Tokenizer & TokenizerThis, src: string, links: Tokens.Link[] | Tokens.Image[], ): Tokens.Link | Tokens.Image | Tokens.Text | T; - emStrong(this: TokenizerThis, src: string, maskedSrc: string, prevChar: string): Tokens.Em | Tokens.Strong | T; - codespan(this: TokenizerThis, src: string): Tokens.Codespan | T; - br(this: TokenizerThis, src: string): Tokens.Br | T; - del(this: TokenizerThis, src: string): Tokens.Del | T; - autolink(this: TokenizerThis, src: string, mangle: (cap: string) => string): Tokens.Link | T; - url(this: TokenizerThis, src: string, mangle: (cap: string) => string): Tokens.Link | T; - inlineText(this: TokenizerThis, src: string, smartypants: (cap: string) => string): Tokens.Text | T; + emStrong( + this: Tokenizer & TokenizerThis, + src: string, + maskedSrc: string, + prevChar: string, + ): Tokens.Em | Tokens.Strong | T; + codespan(this: Tokenizer & TokenizerThis, src: string): Tokens.Codespan | T; + br(this: Tokenizer & TokenizerThis, src: string): Tokens.Br | T; + del(this: Tokenizer & TokenizerThis, src: string): Tokens.Del | T; + autolink(this: Tokenizer & TokenizerThis, src: string, mangle: (cap: string) => string): Tokens.Link | T; + url(this: Tokenizer & TokenizerThis, src: string, mangle: (cap: string) => string): Tokens.Link | T; + inlineText(this: Tokenizer & TokenizerThis, src: string, smartypants: (cap: string) => string): Tokens.Text | T; } type TokenizerObject = Partial, 'constructor' | 'options'>>; @@ -161,39 +164,39 @@ export namespace marked { class Renderer { constructor(options?: MarkedOptions); options: MarkedOptions; - code(this: RendererThis, code: string, language: string | undefined, isEscaped: boolean): string | T; - blockquote(this: RendererThis, quote: string): string | T; - html(this: RendererThis, html: string): string | T; + code(this: Renderer | RendererThis, code: string, language: string | undefined, isEscaped: boolean): string | T; + blockquote(this: Renderer | RendererThis, quote: string): string | T; + html(this: Renderer | RendererThis, html: string): string | T; heading( - this: RendererThis, + this: Renderer | RendererThis, text: string, level: 1 | 2 | 3 | 4 | 5 | 6, raw: string, slugger: Slugger, ): string | T; - hr(this: RendererThis): string | T; - list(this: RendererThis, body: string, ordered: boolean, start: number): string | T; - listitem(this: RendererThis, text: string, task: boolean, checked: boolean): string | T; - checkbox(this: RendererThis, checked: boolean): string | T; - paragraph(this: RendererThis, text: string): string | T; - table(this: RendererThis, header: string, body: string): string | T; - tablerow(this: RendererThis, content: string): string | T; + hr(this: Renderer | RendererThis): string | T; + list(this: Renderer | RendererThis, body: string, ordered: boolean, start: number): string | T; + listitem(this: Renderer | RendererThis, text: string, task: boolean, checked: boolean): string | T; + checkbox(this: Renderer | RendererThis, checked: boolean): string | T; + paragraph(this: Renderer | RendererThis, text: string): string | T; + table(this: Renderer | RendererThis, header: string, body: string): string | T; + tablerow(this: Renderer | RendererThis, content: string): string | T; tablecell( - this: RendererThis, + this: Renderer | RendererThis, content: string, flags: { header: boolean; align: 'center' | 'left' | 'right' | null; }, ): string | T; - strong(this: RendererThis, text: string): string | T; - em(this: RendererThis, text: string): string | T; - codespan(this: RendererThis, code: string): string | T; - br(this: RendererThis): string | T; - del(this: RendererThis, text: string): string | T; - link(this: RendererThis, href: string | null, title: string | null, text: string): string | T; - image(this: RendererThis, href: string | null, title: string | null, text: string): string | T; - text(this: RendererThis, text: string): string | T; + strong(this: Renderer | RendererThis, text: string): string | T; + em(this: Renderer | RendererThis, text: string): string | T; + codespan(this: Renderer | RendererThis, code: string): string | T; + br(this: Renderer | RendererThis): string | T; + del(this: Renderer | RendererThis, text: string): string | T; + link(this: Renderer | RendererThis, href: string | null, title: string | null, text: string): string | T; + image(this: Renderer | RendererThis, href: string | null, title: string | null, text: string): string | T; + text(this: Renderer | RendererThis, text: string): string | T; } type RendererObject = Partial, 'constructor' | 'options'>>; @@ -221,7 +224,7 @@ export namespace marked { static parse(src: Token[] | TokensList, options?: MarkedOptions): string; static parseInline(src: Token[], options?: MarkedOptions): string; parse(src: Token[] | TokensList): string; - parseInline(src: Token[], renderer: Renderer): string; + parseInline(src: Token[], renderer?: Renderer): string; next(): Token; } @@ -236,8 +239,8 @@ export namespace marked { lex(src: string): TokensList; blockTokens(src: string, tokens: Token[]): Token[]; blockTokens(src: string, tokens: TokensList): TokensList; - inline(src: string, tokens: Token[]): void; - inlineTokens(src: string, tokens: Token[]): Token[]; + inline(src: string, tokens?: Token[]): Token[]; + inlineTokens(src: string, tokens?: Token[]): Token[]; state: { inLink: boolean; inRawBlock: boolean; @@ -461,7 +464,7 @@ export namespace marked { interface TokenizerExtension { name: string; level: 'block' | 'inline'; - start?: ((this: TokenizerThis, src: string) => number) | undefined; + start?: ((this: TokenizerThis, src: string) => number | void) | undefined; tokenizer: (this: TokenizerThis, src: string, tokens: Token[] | TokensList) => Tokens.Generic | void; childTokens?: string[] | undefined; } @@ -514,11 +517,7 @@ export namespace marked { * with an error if any occurred during highlighting and a string * if highlighting was successful) */ - highlight?( - code: string, - lang: string, - callback?: (error: any, code?: string) => void, - ): string | void; + highlight?(code: string, lang: string, callback?: (error: any, code?: string) => void): string | void; /** * Set the prefix for code block classes. diff --git a/src/vs/base/common/marked/marked.js b/src/vs/base/common/marked/marked.js index b7d8fe40e5e..f8ffa170fbb 100644 --- a/src/vs/base/common/marked/marked.js +++ b/src/vs/base/common/marked/marked.js @@ -83,6 +83,7 @@ function getDefaults() { return { + async: false, baseUrl: null, breaks: false, extensions: null, @@ -423,7 +424,7 @@ href: href, title: title, text: text, - tokens: lexer.inlineTokens(text, []) + tokens: lexer.inlineTokens(text) }; lexer.state.inLink = false; return token; @@ -531,15 +532,13 @@ } } - var token = { + return { type: 'heading', raw: cap[0], depth: cap[1].length, text: text, - tokens: [] + tokens: this.lexer.inline(text) }; - this.lexer.inline(token.text, token.tokens); - return token; } }; @@ -632,7 +631,9 @@ if (!endEarly) { var nextBulletRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:[*+-]|\\d{1,9}[.)])((?: [^\\n]*)?(?:\\n|$))"); - var hrRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)"); // Check if following lines should be included in List Item + var hrRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)"); + var fencesBeginRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:```|~~~)"); + var headingBeginRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}#"); // Check if following lines should be included in List Item while (src) { rawLine = src.split('\n', 1)[0]; @@ -640,6 +641,16 @@ if (this.options.pedantic) { line = line.replace(/^ {1,4}(?=( {4})*[^ ])/g, ' '); + } // End list item if found code fences + + + if (fencesBeginRegex.test(line)) { + break; + } // End list item if found start of new heading + + + if (headingBeginRegex.test(line)) { + break; } // End list item if found start of new bullet @@ -757,10 +768,10 @@ }; if (this.options.sanitize) { + var text = this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0]); token.type = 'paragraph'; - token.text = this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0]); - token.tokens = []; - this.lexer.inline(token.text, token.tokens); + token.text = text; + token.tokens = this.lexer.inline(text); } return token; @@ -830,8 +841,7 @@ l = item.header.length; for (j = 0; j < l; j++) { - item.header[j].tokens = []; - this.lexer.inline(item.header[j].text, item.header[j].tokens); + item.header[j].tokens = this.lexer.inline(item.header[j].text); } // cell child tokens @@ -841,8 +851,7 @@ row = item.rows[j]; for (k = 0; k < row.length; k++) { - row[k].tokens = []; - this.lexer.inline(row[k].text, row[k].tokens); + row[k].tokens = this.lexer.inline(row[k].text); } } @@ -855,15 +864,13 @@ var cap = this.rules.block.lheading.exec(src); if (cap) { - var token = { + return { type: 'heading', raw: cap[0], depth: cap[2].charAt(0) === '=' ? 1 : 2, text: cap[1], - tokens: [] + tokens: this.lexer.inline(cap[1]) }; - this.lexer.inline(token.text, token.tokens); - return token; } }; @@ -871,14 +878,13 @@ var cap = this.rules.block.paragraph.exec(src); if (cap) { - var token = { + var text = cap[1].charAt(cap[1].length - 1) === '\n' ? cap[1].slice(0, -1) : cap[1]; + return { type: 'paragraph', raw: cap[0], - text: cap[1].charAt(cap[1].length - 1) === '\n' ? cap[1].slice(0, -1) : cap[1], - tokens: [] + text: text, + tokens: this.lexer.inline(text) }; - this.lexer.inline(token.text, token.tokens); - return token; } }; @@ -886,14 +892,12 @@ var cap = this.rules.block.text.exec(src); if (cap) { - var token = { + return { type: 'text', raw: cap[0], text: cap[0], - tokens: [] + tokens: this.lexer.inline(cap[0]) }; - this.lexer.inline(token.text, token.tokens); - return token; } }; @@ -1072,7 +1076,7 @@ type: 'em', raw: src.slice(0, lLength + match.index + rLength + 1), text: _text, - tokens: this.lexer.inlineTokens(_text, []) + tokens: this.lexer.inlineTokens(_text) }; } // Create 'strong' if smallest delimiter has even char count. **a*** @@ -1082,7 +1086,7 @@ type: 'strong', raw: src.slice(0, lLength + match.index + rLength + 1), text: text, - tokens: this.lexer.inlineTokens(text, []) + tokens: this.lexer.inlineTokens(text) }; } } @@ -1128,7 +1132,7 @@ type: 'del', raw: cap[0], text: cap[2], - tokens: this.lexer.inlineTokens(cap[2], []) + tokens: this.lexer.inlineTokens(cap[2]) }; } }; @@ -1746,10 +1750,15 @@ }; _proto.inline = function inline(src, tokens) { + if (tokens === void 0) { + tokens = []; + } + this.inlineQueue.push({ src: src, tokens: tokens }); + return tokens; } /** * Lexing/Compiling @@ -2722,15 +2731,7 @@ return; } - try { - var _tokens = Lexer.lex(src, opt); - - if (opt.walkTokens) { - marked.walkTokens(_tokens, opt.walkTokens); - } - - return Parser.parse(_tokens, opt); - } catch (e) { + function onError(e) { e.message += '\nPlease report this to https://github.com/markedjs/marked.'; if (opt.silent) { @@ -2739,6 +2740,24 @@ throw e; } + + try { + var _tokens = Lexer.lex(src, opt); + + if (opt.walkTokens) { + if (opt.async) { + return Promise.all(marked.walkTokens(_tokens, opt.walkTokens)).then(function () { + return Parser.parse(_tokens, opt); + })["catch"](onError); + } + + marked.walkTokens(_tokens, opt.walkTokens); + } + + return Parser.parse(_tokens, opt); + } catch (e) { + onError(e); + } } /** * Options @@ -2903,11 +2922,14 @@ var _walkTokens = marked.defaults.walkTokens; opts.walkTokens = function (token) { - pack.walkTokens.call(this, token); + var values = []; + values.push(pack.walkTokens.call(this, token)); if (_walkTokens) { - _walkTokens.call(this, token); + values = values.concat(_walkTokens.call(this, token)); } + + return values; }; } @@ -2924,16 +2946,18 @@ marked.walkTokens = function (tokens, callback) { + var values = []; + var _loop3 = function _loop3() { var token = _step.value; - callback.call(marked, token); + values = values.concat(callback.call(marked, token)); switch (token.type) { case 'table': { for (var _iterator2 = _createForOfIteratorHelperLoose(token.header), _step2; !(_step2 = _iterator2()).done;) { var cell = _step2.value; - marked.walkTokens(cell.tokens, callback); + values = values.concat(marked.walkTokens(cell.tokens, callback)); } for (var _iterator3 = _createForOfIteratorHelperLoose(token.rows), _step3; !(_step3 = _iterator3()).done;) { @@ -2941,7 +2965,7 @@ for (var _iterator4 = _createForOfIteratorHelperLoose(row), _step4; !(_step4 = _iterator4()).done;) { var _cell = _step4.value; - marked.walkTokens(_cell.tokens, callback); + values = values.concat(marked.walkTokens(_cell.tokens, callback)); } } @@ -2950,7 +2974,7 @@ case 'list': { - marked.walkTokens(token.items, callback); + values = values.concat(marked.walkTokens(token.items, callback)); break; } @@ -2959,10 +2983,10 @@ if (marked.defaults.extensions && marked.defaults.extensions.childTokens && marked.defaults.extensions.childTokens[token.type]) { // Walk any extensions marked.defaults.extensions.childTokens[token.type].forEach(function (childTokens) { - marked.walkTokens(token[childTokens], callback); + values = values.concat(marked.walkTokens(token[childTokens], callback)); }); } else if (token.tokens) { - marked.walkTokens(token.tokens, callback); + values = values.concat(marked.walkTokens(token.tokens, callback)); } } } @@ -2971,6 +2995,8 @@ for (var _iterator = _createForOfIteratorHelperLoose(tokens), _step; !(_step = _iterator()).done;) { _loop3(); } + + return values; }; /** * Parse Inline @@ -3055,5 +3081,20 @@ // ESM-uncomment-begin // })(); -// export var marked = (__marked_exports || exports); +// export var Lexer = (__marked_exports.Lexer || exports.Lexer); +// export var Parser = (__marked_exports.Parser || exports.Parser); +// export var Renderer = (__marked_exports.Renderer || exports.Renderer); +// export var Slugger = (__marked_exports.Slugger || exports.Slugger); +// export var TextRenderer = (__marked_exports.TextRenderer || exports.TextRenderer); +// export var Tokenizer = (__marked_exports.Tokenizer || exports.Tokenizer); +// export var getDefaults = (__marked_exports.getDefaults || exports.getDefaults); +// export var lexer = (__marked_exports.lexer || exports.lexer); +// export var marked = (__marked_exports.marked || exports.marked); +// export var options = (__marked_exports.options || exports.options); +// export var parse = (__marked_exports.parse || exports.parse); +// export var parseInline = (__marked_exports.parseInline || exports.parseInline); +// export var parser = (__marked_exports.parser || exports.parser); +// export var setOptions = (__marked_exports.setOptions || exports.setOptions); +// export var use = (__marked_exports.use || exports.use); +// export var walkTokens = (__marked_exports.walkTokens || exports.walkTokens); // ESM-uncomment-end diff --git a/src/vs/base/common/marshallingIds.ts b/src/vs/base/common/marshallingIds.ts index 02b7a805f03..4387c42cc67 100644 --- a/src/vs/base/common/marshallingIds.ts +++ b/src/vs/base/common/marshallingIds.ts @@ -17,6 +17,7 @@ export const enum MarshalledId { CommentThreadNode, TimelineActionContext, NotebookCellActionContext, + NotebookActionContext, TestItemContext, Date } diff --git a/src/vs/base/common/mime.ts b/src/vs/base/common/mime.ts index 5c0b6d6054a..288a8daf33b 100644 --- a/src/vs/base/common/mime.ts +++ b/src/vs/base/common/mime.ts @@ -5,14 +5,14 @@ import { extname } from 'vs/base/common/path'; -export namespace Mimes { - export const text = 'text/plain'; - export const binary = 'application/octet-stream'; - export const unknown = 'application/unknown'; - export const markdown = 'text/markdown'; - export const latex = 'text/latex'; - export const uriList = 'text/uri-list'; -} +export const Mimes = Object.freeze({ + text: 'text/plain', + binary: 'application/octet-stream', + unknown: 'application/unknown', + markdown: 'text/markdown', + latex: 'text/latex', + uriList: 'text/uri-list', +}); interface MapExtToMediaMimes { [index: string]: string; diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts index 63d6a15b49e..648a6391131 100644 --- a/src/vs/base/common/network.ts +++ b/src/vs/base/common/network.ts @@ -101,6 +101,11 @@ export namespace Schemas { * Scheme used vs live share */ export const vsls = 'vsls'; + + /** + * Scheme used for the Source Control commit input's text document + */ + export const vscodeSourceControl = 'vscode-scm'; } export const connectionTokenCookieName = 'vscode-tkn'; @@ -145,7 +150,7 @@ class RemoteAuthoritiesImpl { } const authority = uri.authority; let host = this._hosts[authority]; - if (host && host.indexOf(':') !== -1) { + if (host && host.indexOf(':') !== -1 && host.indexOf('[') === -1) { host = `[${host}]`; } const port = this._ports[authority]; @@ -246,3 +251,53 @@ class FileAccessImpl { } export const FileAccess = new FileAccessImpl(); + + +export namespace COI { + + const coiHeaders = new Map<'3' | '2' | '1' | string, Record>([ + ['1', { 'Cross-Origin-Opener-Policy': 'same-origin' }], + ['2', { 'Cross-Origin-Embedder-Policy': 'require-corp' }], + ['3', { 'Cross-Origin-Opener-Policy': 'same-origin', 'Cross-Origin-Embedder-Policy': 'require-corp' }], + ]); + + export const CoopAndCoep = Object.freeze(coiHeaders.get('3')); + + const coiSearchParamName = 'vscode-coi'; + + /** + * Extract desired headers from `vscode-coi` invocation + */ + export function getHeadersFromQuery(url: string | URI | URL): Record | undefined { + let params: URLSearchParams | undefined; + if (typeof url === 'string') { + params = new URL(url).searchParams; + } else if (url instanceof URL) { + params = url.searchParams; + } else if (URI.isUri(url)) { + params = new URL(url.toString(true)).searchParams; + } + const value = params?.get(coiSearchParamName); + if (!value) { + return undefined; + } + return coiHeaders.get(value); + } + + /** + * Add the `vscode-coi` query attribute based on wanting `COOP` and `COEP`. Will be a noop when `crossOriginIsolated` + * isn't enabled the current context + */ + export function addSearchParam(urlOrSearch: URLSearchParams | Record, coop: boolean, coep: boolean): void { + if (!(globalThis).crossOriginIsolated) { + // depends on the current context being COI + return; + } + const value = coop && coep ? '3' : coep ? '2' : '1'; + if (urlOrSearch instanceof URLSearchParams) { + urlOrSearch.set(coiSearchParamName, value); + } else { + (>urlOrSearch)[coiSearchParamName] = value; + } + } +} diff --git a/src/vs/base/common/objects.ts b/src/vs/base/common/objects.ts index 965f997fbd7..16333957989 100644 --- a/src/vs/base/common/objects.ts +++ b/src/vs/base/common/objects.ts @@ -3,23 +3,18 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { isArray, isTypedArray, isObject, isUndefinedOrNull } from 'vs/base/common/types'; +import { isTypedArray, isObject, isUndefinedOrNull } from 'vs/base/common/types'; export function deepClone(obj: T): T { if (!obj || typeof obj !== 'object') { return obj; } if (obj instanceof RegExp) { - // See https://github.com/microsoft/TypeScript/issues/10990 - return obj as any; + return obj; } const result: any = Array.isArray(obj) ? [] : {}; - Object.keys(obj).forEach((key: string) => { - if ((obj)[key] && typeof (obj)[key] === 'object') { - result[key] = deepClone((obj)[key]); - } else { - result[key] = (obj)[key]; - } + Object.entries(obj).forEach(([key, value]) => { + result[key] = value && typeof value === 'object' ? deepClone(value) : value; }); return result; } @@ -61,7 +56,7 @@ function _cloneAndChange(obj: any, changer: (orig: any) => any, seen: Set): return changed; } - if (isArray(obj)) { + if (Array.isArray(obj)) { const r1: any[] = []; for (const e of obj) { r1.push(_cloneAndChange(e, changer, seen)); @@ -75,7 +70,7 @@ function _cloneAndChange(obj: any, changer: (orig: any) => any, seen: Set): } seen.add(obj); const r2 = {}; - for (let i2 in obj) { + for (const i2 in obj) { if (_hasOwnProperty.call(obj, i2)) { (r2 as any)[i2] = _cloneAndChange(obj[i2], changer, seen); } @@ -186,11 +181,6 @@ export function safeStringify(obj: any): string { }); } -export function getOrDefault(obj: T, fn: (obj: T) => R | undefined, defaultValue: R): R { - const result = fn(obj); - return typeof result === 'undefined' ? defaultValue : result; -} - type obj = { [key: string]: any }; /** * Returns an object that has keys for each value that is different in the base object. Keys @@ -237,3 +227,38 @@ export function filter(obj: obj, predicate: (key: string, value: any) => boolean } return result; } + +export function getAllPropertyNames(obj: object): string[] { + let res: string[] = []; + let proto = Object.getPrototypeOf(obj); + while (Object.prototype !== proto) { + res = res.concat(Object.getOwnPropertyNames(proto)); + proto = Object.getPrototypeOf(proto); + } + return res; +} + +export function getAllMethodNames(obj: object): string[] { + const methods: string[] = []; + for (const prop of getAllPropertyNames(obj)) { + if (typeof (obj as any)[prop] === 'function') { + methods.push(prop); + } + } + return methods; +} + +export function createProxyObject(methodNames: string[], invoke: (method: string, args: unknown[]) => unknown): T { + const createProxyMethod = (method: string): () => unknown => { + return function () { + const args = Array.prototype.slice.call(arguments, 0); + return invoke(method, args); + }; + }; + + const result = {} as T; + for (const methodName of methodNames) { + (result)[methodName] = createProxyMethod(methodName); + } + return result; +} diff --git a/src/vs/base/common/observable.ts b/src/vs/base/common/observable.ts new file mode 100644 index 00000000000..c588d68b9f6 --- /dev/null +++ b/src/vs/base/common/observable.ts @@ -0,0 +1,30 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +export { + IObservable, + IObserver, + IReader, + ISettable, + ISettableObservable, + ITransaction, + observableValue, + transaction, +} from 'vs/base/common/observableImpl/base'; +export { derived } from 'vs/base/common/observableImpl/derived'; +export { + autorun, + autorunDelta, + autorunHandleChanges, + autorunWithStore, +} from 'vs/base/common/observableImpl/autorun'; +export * from 'vs/base/common/observableImpl/utils'; + +import { ConsoleObservableLogger, setLogger } from 'vs/base/common/observableImpl/logging'; + +const enableLogging = false; +if (enableLogging) { + setLogger(new ConsoleObservableLogger()); +} diff --git a/src/vs/base/common/observableImpl/autorun.ts b/src/vs/base/common/observableImpl/autorun.ts new file mode 100644 index 00000000000..6efe4736783 --- /dev/null +++ b/src/vs/base/common/observableImpl/autorun.ts @@ -0,0 +1,167 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; +import { IReader, IObservable, IObserver } from 'vs/base/common/observableImpl/base'; +import { getLogger } from 'vs/base/common/observableImpl/logging'; + +export function autorun(debugName: string, fn: (reader: IReader) => void): IDisposable { + return new AutorunObserver(debugName, fn, undefined); +} + +interface IChangeContext { + readonly changedObservable: IObservable; + readonly change: unknown; + + didChange(observable: IObservable): this is { change: TChange }; +} + +export function autorunHandleChanges( + debugName: string, + options: { + /** + * Returns if this change should cause a re-run of the autorun. + */ + handleChange: (context: IChangeContext) => boolean; + }, + fn: (reader: IReader) => void +): IDisposable { + return new AutorunObserver(debugName, fn, options.handleChange); +} + +export function autorunWithStore( + fn: (reader: IReader, store: DisposableStore) => void, + debugName: string +): IDisposable { + const store = new DisposableStore(); + const disposable = autorun( + debugName, + reader => { + store.clear(); + fn(reader, store); + } + ); + return toDisposable(() => { + disposable.dispose(); + store.dispose(); + }); +} + +export class AutorunObserver implements IObserver, IReader, IDisposable { + public needsToRun = true; + private updateCount = 0; + private disposed = false; + + /** + * The actual dependencies. + */ + private _dependencies = new Set>(); + public get dependencies() { + return this._dependencies; + } + + /** + * Dependencies that have to be removed when {@link runFn} ran through. + */ + private staleDependencies = new Set>(); + + constructor( + public readonly debugName: string, + private readonly runFn: (reader: IReader) => void, + private readonly _handleChange: ((context: IChangeContext) => boolean) | undefined + ) { + getLogger()?.handleAutorunCreated(this); + this.runIfNeeded(); + } + + public subscribeTo(observable: IObservable) { + // In case the run action disposes the autorun + if (this.disposed) { + return; + } + this._dependencies.add(observable); + if (!this.staleDependencies.delete(observable)) { + observable.addObserver(this); + } + } + + public handleChange(observable: IObservable, change: TChange): void { + const shouldReact = this._handleChange ? this._handleChange({ + changedObservable: observable, + change, + didChange: o => o === observable as any, + }) : true; + this.needsToRun = this.needsToRun || shouldReact; + + if (this.updateCount === 0) { + this.runIfNeeded(); + } + } + + public beginUpdate(): void { + this.updateCount++; + } + + public endUpdate(): void { + this.updateCount--; + if (this.updateCount === 0) { + this.runIfNeeded(); + } + } + + private runIfNeeded(): void { + if (!this.needsToRun) { + return; + } + // Assert: this.staleDependencies is an empty set. + const emptySet = this.staleDependencies; + this.staleDependencies = this._dependencies; + this._dependencies = emptySet; + + this.needsToRun = false; + + getLogger()?.handleAutorunTriggered(this); + + try { + this.runFn(this); + } finally { + // We don't want our observed observables to think that they are (not even temporarily) not being observed. + // Thus, we only unsubscribe from observables that are definitely not read anymore. + for (const o of this.staleDependencies) { + o.removeObserver(this); + } + this.staleDependencies.clear(); + } + } + + public dispose(): void { + this.disposed = true; + for (const o of this._dependencies) { + o.removeObserver(this); + } + this._dependencies.clear(); + } + + public toString(): string { + return `Autorun<${this.debugName}>`; + } +} + +export namespace autorun { + export const Observer = AutorunObserver; +} +export function autorunDelta( + name: string, + observable: IObservable, + handler: (args: { lastValue: T | undefined; newValue: T }) => void +): IDisposable { + let _lastValue: T | undefined; + return autorun(name, (reader) => { + const newValue = observable.read(reader); + const lastValue = _lastValue; + _lastValue = newValue; + handler({ lastValue, newValue }); + }); +} diff --git a/src/vs/base/common/observableImpl/base.ts b/src/vs/base/common/observableImpl/base.ts new file mode 100644 index 00000000000..9d83083e49b --- /dev/null +++ b/src/vs/base/common/observableImpl/base.ts @@ -0,0 +1,244 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import type { derived } from 'vs/base/common/observableImpl/derived'; +import { getLogger } from 'vs/base/common/observableImpl/logging'; + +export interface IObservable { + readonly TChange: TChange; + + /** + * Reads the current value. + * + * Must not be called from {@link IObserver.handleChange}. + */ + get(): T; + + /** + * Adds an observer. + */ + addObserver(observer: IObserver): void; + removeObserver(observer: IObserver): void; + + /** + * Subscribes the reader to this observable and returns the current value of this observable. + */ + read(reader: IReader): T; + + map(fn: (value: T) => TNew): IObservable; + + readonly debugName: string; +} + +export interface IReader { + /** + * Reports an observable that was read. + * + * Is called by {@link IObservable.read}. + */ + subscribeTo(observable: IObservable): void; +} + +export interface IObserver { + /** + * Indicates that an update operation is about to begin. + * + * During an update, invariants might not hold for subscribed observables and + * change events might be delayed. + * However, all changes must be reported before all update operations are over. + */ + beginUpdate(observable: IObservable): void; + + /** + * Is called by a subscribed observable immediately after it notices a change. + * + * When {@link IObservable.get} returns and no change has been reported, + * there has been no change for that observable. + * + * Implementations must not call into other observables! + * The change should be processed when {@link IObserver.endUpdate} is called. + */ + handleChange(observable: IObservable, change: TChange): void; + + /** + * Indicates that an update operation has completed. + */ + endUpdate(observable: IObservable): void; +} + +export interface ISettable { + set(value: T, transaction: ITransaction | undefined, change: TChange): void; +} + +export interface ITransaction { + /** + * Calls `Observer.beginUpdate` immediately + * and `Observer.endUpdate` when the transaction is complete. + */ + updateObserver( + observer: IObserver, + observable: IObservable + ): void; +} + +let _derived: typeof derived; +/** + * @internal + * This is to allow splitting files. +*/ +export function _setDerived(derived: typeof _derived) { + _derived = derived; +} + +export abstract class ConvenientObservable implements IObservable { + get TChange(): TChange { return null!; } + + public abstract get(): T; + public abstract addObserver(observer: IObserver): void; + public abstract removeObserver(observer: IObserver): void; + + /** @sealed */ + public read(reader: IReader): T { + reader.subscribeTo(this); + return this.get(); + } + + /** @sealed */ + public map(fn: (value: T) => TNew): IObservable { + return _derived( + () => { + const name = getFunctionName(fn); + return name !== undefined ? name : `${this.debugName} (mapped)`; + }, + (reader) => fn(this.read(reader)) + ); + } + + public abstract get debugName(): string; +} + +export abstract class BaseObservable extends ConvenientObservable { + protected readonly observers = new Set(); + + /** @sealed */ + public addObserver(observer: IObserver): void { + const len = this.observers.size; + this.observers.add(observer); + if (len === 0) { + this.onFirstObserverAdded(); + } + } + + /** @sealed */ + public removeObserver(observer: IObserver): void { + const deleted = this.observers.delete(observer); + if (deleted && this.observers.size === 0) { + this.onLastObserverRemoved(); + } + } + + protected onFirstObserverAdded(): void { } + protected onLastObserverRemoved(): void { } +} + +export function transaction(fn: (tx: ITransaction) => void, getDebugName?: () => string): void { + const tx = new TransactionImpl(fn, getDebugName); + try { + getLogger()?.handleBeginTransaction(tx); + fn(tx); + } finally { + tx.finish(); + getLogger()?.handleEndTransaction(); + } +} + +export function getFunctionName(fn: Function): string | undefined { + const fnSrc = fn.toString(); + // Pattern: /** @description ... */ + const regexp = /\/\*\*\s*@description\s*([^*]*)\*\//; + const match = regexp.exec(fnSrc); + const result = match ? match[1] : undefined; + return result?.trim(); +} + +export class TransactionImpl implements ITransaction { + private updatingObservers: { observer: IObserver; observable: IObservable }[] | null = []; + + constructor(private readonly fn: Function, private readonly _getDebugName?: () => string) { } + + public getDebugName(): string | undefined { + if (this._getDebugName) { + return this._getDebugName(); + } + return getFunctionName(this.fn); + } + + public updateObserver( + observer: IObserver, + observable: IObservable + ): void { + this.updatingObservers!.push({ observer, observable }); + observer.beginUpdate(observable); + } + + public finish(): void { + const updatingObservers = this.updatingObservers!; + // Prevent anyone from updating observers from now on. + this.updatingObservers = null; + for (const { observer, observable } of updatingObservers) { + observer.endUpdate(observable); + } + } +} + +export interface ISettableObservable extends IObservable, ISettable { +} + +export function observableValue(name: string, initialValue: T): ISettableObservable { + return new ObservableValue(name, initialValue); +} + +export class ObservableValue + extends BaseObservable + implements ISettableObservable +{ + private value: T; + + constructor(public readonly debugName: string, initialValue: T) { + super(); + this.value = initialValue; + } + + public get(): T { + return this.value; + } + + public set(value: T, tx: ITransaction | undefined, change: TChange): void { + if (this.value === value) { + return; + } + + if (!tx) { + transaction((tx) => { + this.set(value, tx, change); + }, () => `Setting ${this.debugName}`); + return; + } + + const oldValue = this.value; + this.value = value; + getLogger()?.handleObservableChanged(this, { oldValue, newValue: value, change, didChange: true }); + + for (const observer of this.observers) { + tx.updateObserver(observer, this); + observer.handleChange(this, change); + } + } + + override toString(): string { + return `${this.debugName}: ${this.value}`; + } +} + diff --git a/src/vs/base/common/observableImpl/derived.ts b/src/vs/base/common/observableImpl/derived.ts new file mode 100644 index 00000000000..84a93132f15 --- /dev/null +++ b/src/vs/base/common/observableImpl/derived.ts @@ -0,0 +1,167 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { IReader, IObservable, BaseObservable, IObserver, _setDerived } from 'vs/base/common/observableImpl/base'; +import { getLogger } from 'vs/base/common/observableImpl/logging'; + +export function derived(debugName: string | (() => string), computeFn: (reader: IReader) => T): IObservable { + return new Derived(debugName, computeFn); +} + +_setDerived(derived); + +export class Derived extends BaseObservable implements IReader, IObserver { + private hadValue = false; + private hasValue = false; + private value: T | undefined = undefined; + private updateCount = 0; + + private _dependencies = new Set>(); + public get dependencies(): ReadonlySet> { + return this._dependencies; + } + + /** + * Dependencies that have to be removed when {@link runFn} ran through. + */ + private staleDependencies = new Set>(); + + public override get debugName(): string { + return typeof this._debugName === 'function' ? this._debugName() : this._debugName; + } + + constructor( + private readonly _debugName: string | (() => string), + private readonly computeFn: (reader: IReader) => T + ) { + super(); + + getLogger()?.handleDerivedCreated(this); + } + + protected override onLastObserverRemoved(): void { + /** + * We are not tracking changes anymore, thus we have to assume + * that our cache is invalid. + */ + this.hasValue = false; + this.hadValue = false; + this.value = undefined; + for (const d of this._dependencies) { + d.removeObserver(this); + } + this._dependencies.clear(); + } + + public get(): T { + if (this.observers.size === 0) { + // Cache is not valid and don't refresh the cache. + // Observables should not be read in non-reactive contexts. + const result = this.computeFn(this); + // Clear new dependencies + this.onLastObserverRemoved(); + return result; + } + + if (this.updateCount > 0 && this.hasValue) { + // Refresh dependencies + for (const d of this._dependencies) { + // Maybe `.get()` triggers `handleChange`? + d.get(); + if (!this.hasValue) { + // The other dependencies will refresh on demand + break; + } + } + } + + if (!this.hasValue) { + const emptySet = this.staleDependencies; + this.staleDependencies = this._dependencies; + this._dependencies = emptySet; + + const oldValue = this.value; + try { + this.value = this.computeFn(this); + } finally { + // We don't want our observed observables to think that they are (not even temporarily) not being observed. + // Thus, we only unsubscribe from observables that are definitely not read anymore. + for (const o of this.staleDependencies) { + o.removeObserver(this); + } + this.staleDependencies.clear(); + } + + this.hasValue = true; + const didChange = this.hadValue && oldValue !== this.value; + getLogger()?.handleDerivedRecomputed(this, { + oldValue, + newValue: this.value, + change: undefined, + didChange + }); + if (didChange) { + for (const r of this.observers) { + r.handleChange(this, undefined); + } + } + } + return this.value!; + } + + // IObserver Implementation + public beginUpdate(): void { + if (this.updateCount === 0) { + for (const r of this.observers) { + r.beginUpdate(this); + } + } + this.updateCount++; + } + + public handleChange( + _observable: IObservable, + _change: TChange + ): void { + if (this.hasValue) { + this.hadValue = true; + this.hasValue = false; + } + + // Not in transaction: Recompute & inform observers immediately + if (this.updateCount === 0 && this.observers.size > 0) { + this.get(); + } + + // Otherwise, recompute in `endUpdate` or on demand. + } + + public endUpdate(): void { + this.updateCount--; + if (this.updateCount === 0) { + if (this.observers.size > 0) { + // Propagate invalidation + this.get(); + } + + for (const r of this.observers) { + r.endUpdate(this); + } + } + } + + // IReader Implementation + public subscribeTo(observable: IObservable) { + this._dependencies.add(observable); + // We are already added as observer for stale dependencies. + if (!this.staleDependencies.delete(observable)) { + observable.addObserver(this); + } + } + + override toString(): string { + return `LazyDerived<${this.debugName}>`; + } +} diff --git a/src/vs/base/common/observableImpl/logging.ts b/src/vs/base/common/observableImpl/logging.ts new file mode 100644 index 00000000000..0c221d0c700 --- /dev/null +++ b/src/vs/base/common/observableImpl/logging.ts @@ -0,0 +1,312 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { AutorunObserver } from 'vs/base/common/observableImpl/autorun'; +import { IObservable, ObservableValue, TransactionImpl } from 'vs/base/common/observableImpl/base'; +import { Derived } from 'vs/base/common/observableImpl/derived'; +import { FromEventObservable } from 'vs/base/common/observableImpl/utils'; + +let globalObservableLogger: IObservableLogger | undefined; + +export function setLogger(logger: IObservableLogger): void { + globalObservableLogger = logger; +} + +export function getLogger(): IObservableLogger | undefined { + return globalObservableLogger; +} + +interface IChangeInformation { + oldValue: unknown; + newValue: unknown; + change: unknown; + didChange: boolean; +} + +export interface IObservableLogger { + handleObservableChanged(observable: ObservableValue, info: IChangeInformation): void; + handleFromEventObservableTriggered(observable: FromEventObservable, info: IChangeInformation): void; + + handleAutorunCreated(autorun: AutorunObserver): void; + handleAutorunTriggered(autorun: AutorunObserver): void; + + handleDerivedCreated(observable: Derived): void; + handleDerivedRecomputed(observable: Derived, info: IChangeInformation): void; + + handleBeginTransaction(transaction: TransactionImpl): void; + handleEndTransaction(): void; +} + +export class ConsoleObservableLogger implements IObservableLogger { + private indentation = 0; + + private textToConsoleArgs(text: ConsoleText): unknown[] { + return consoleTextToArgs([ + normalText(repeat('| ', this.indentation)), + text, + ]); + } + + private formatInfo(info: IChangeInformation): ConsoleText[] { + return info.didChange + ? [ + normalText(` `), + styled(formatValue(info.oldValue, 70), { + color: 'red', + strikeThrough: true, + }), + normalText(` `), + styled(formatValue(info.newValue, 60), { + color: 'green', + }), + ] + : [normalText(` (unchanged)`)]; + } + + handleObservableChanged(observable: IObservable, info: IChangeInformation): void { + console.log(...this.textToConsoleArgs([ + formatKind('observable value changed'), + styled(observable.debugName, { color: 'BlueViolet' }), + ...this.formatInfo(info), + ])); + } + + private readonly changedObservablesSets = new WeakMap>>(); + + formatChanges(changes: Set>): ConsoleText | undefined { + if (changes.size === 0) { + return undefined; + } + return styled( + ' (changed deps: ' + + [...changes].map((o) => o.debugName).join(', ') + + ')', + { color: 'gray' } + ); + } + + handleDerivedCreated(derived: Derived): void { + const existingHandleChange = derived.handleChange; + this.changedObservablesSets.set(derived, new Set()); + derived.handleChange = (observable, change) => { + this.changedObservablesSets.get(derived)!.add(observable); + return existingHandleChange.apply(derived, [observable, change]); + }; + } + + handleDerivedRecomputed(derived: Derived, info: IChangeInformation): void { + const changedObservables = this.changedObservablesSets.get(derived)!; + console.log(...this.textToConsoleArgs([ + formatKind('derived recomputed'), + styled(derived.debugName, { color: 'BlueViolet' }), + ...this.formatInfo(info), + this.formatChanges(changedObservables) + ])); + changedObservables.clear(); + } + + handleFromEventObservableTriggered(observable: FromEventObservable, info: IChangeInformation): void { + console.log(...this.textToConsoleArgs([ + formatKind('observable from event triggered'), + styled(observable.debugName, { color: 'BlueViolet' }), + ...this.formatInfo(info), + ])); + } + + handleAutorunCreated(autorun: AutorunObserver): void { + const existingHandleChange = autorun.handleChange; + this.changedObservablesSets.set(autorun, new Set()); + autorun.handleChange = (observable, change) => { + this.changedObservablesSets.get(autorun)!.add(observable); + return existingHandleChange.apply(autorun, [observable, change]); + }; + } + + handleAutorunTriggered(autorun: AutorunObserver): void { + const changedObservables = this.changedObservablesSets.get(autorun)!; + console.log(...this.textToConsoleArgs([ + formatKind('autorun'), + styled(autorun.debugName, { color: 'BlueViolet' }), + this.formatChanges(changedObservables) + ])); + changedObservables.clear(); + } + + handleBeginTransaction(transaction: TransactionImpl): void { + let transactionName = transaction.getDebugName(); + if (transactionName === undefined) { + transactionName = ''; + } + console.log(...this.textToConsoleArgs([ + formatKind('transaction'), + styled(transactionName, { color: 'BlueViolet' }), + ])); + this.indentation++; + } + + handleEndTransaction(): void { + this.indentation--; + } +} + +type ConsoleText = + | (ConsoleText | undefined)[] + | { text: string; style: string; data?: Record } + | { data: Record }; + +function consoleTextToArgs(text: ConsoleText): unknown[] { + const styles = new Array(); + const initial = {}; + const data = initial; + let firstArg = ''; + + function process(t: ConsoleText): void { + if ('length' in t) { + for (const item of t) { + if (item) { + process(item); + } + } + } else if ('text' in t) { + firstArg += `%c${t.text}`; + styles.push(t.style); + if (t.data) { + Object.assign(data, t.data); + } + } else if ('data' in t) { + Object.assign(data, t.data); + } + } + + process(text); + + const result = [firstArg, ...styles]; + if (Object.keys(data).length > 0) { + result.push(data); + } + + return result; +} + +function normalText(text: string): ConsoleText { + return styled(text, { color: 'black' }); +} + +function formatKind(kind: string): ConsoleText { + return styled(padStr(`${kind}: `, 10), { color: 'black', bold: true }); +} + +function styled( + text: string, + options: { color: string; strikeThrough?: boolean; bold?: boolean } = { + color: 'black', + } +): ConsoleText { + function objToCss(styleObj: Record): string { + return Object.entries(styleObj).reduce( + (styleString, [propName, propValue]) => { + return `${styleString}${propName}:${propValue};`; + }, + '' + ); + } + + const style: Record = { + color: options.color, + }; + if (options.strikeThrough) { + style['text-decoration'] = 'line-through'; + } + if (options.bold) { + style['font-weight'] = 'bold'; + } + + return { + text, + style: objToCss(style), + }; +} + +function formatValue(value: unknown, availableLen: number): string { + switch (typeof value) { + case 'number': + return '' + value; + case 'string': + if (value.length + 2 <= availableLen) { + return `"${value}"`; + } + return `"${value.substr(0, availableLen - 7)}"+...`; + + case 'boolean': + return value ? 'true' : 'false'; + case 'undefined': + return 'undefined'; + case 'object': + if (value === null) { + return 'null'; + } + if (Array.isArray(value)) { + return formatArray(value, availableLen); + } + return formatObject(value, availableLen); + case 'symbol': + return value.toString(); + case 'function': + return `[[Function${value.name ? ' ' + value.name : ''}]]`; + default: + return '' + value; + } +} + +function formatArray(value: unknown[], availableLen: number): string { + let result = '[ '; + let first = true; + for (const val of value) { + if (!first) { + result += ', '; + } + if (result.length - 5 > availableLen) { + result += '...'; + break; + } + first = false; + result += `${formatValue(val, availableLen - result.length)}`; + } + result += ' ]'; + return result; +} + +function formatObject(value: object, availableLen: number): string { + let result = '{ '; + let first = true; + for (const [key, val] of Object.entries(value)) { + if (!first) { + result += ', '; + } + if (result.length - 5 > availableLen) { + result += '...'; + break; + } + first = false; + result += `${key}: ${formatValue(val, availableLen - result.length)}`; + } + result += ' }'; + return result; +} + +function repeat(str: string, count: number): string { + let result = ''; + for (let i = 1; i <= count; i++) { + result += str; + } + return result; +} + +function padStr(str: string, length: number): string { + while (str.length < length) { + str += ' '; + } + return str; +} diff --git a/src/vs/base/common/observableImpl/utils.ts b/src/vs/base/common/observableImpl/utils.ts new file mode 100644 index 00000000000..f78d35a9683 --- /dev/null +++ b/src/vs/base/common/observableImpl/utils.ts @@ -0,0 +1,327 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; +import { autorun } from 'vs/base/common/observableImpl/autorun'; +import { IObservable, BaseObservable, transaction, IReader, ITransaction, ConvenientObservable, IObserver, observableValue, getFunctionName } from 'vs/base/common/observableImpl/base'; +import { derived } from 'vs/base/common/observableImpl/derived'; +import { Event } from 'vs/base/common/event'; +import { getLogger } from 'vs/base/common/observableImpl/logging'; + +export function constObservable(value: T): IObservable { + return new ConstObservable(value); +} + +class ConstObservable extends ConvenientObservable { + constructor(private readonly value: T) { + super(); + } + + public override get debugName(): string { + return this.toString(); + } + + public get(): T { + return this.value; + } + public addObserver(observer: IObserver): void { + // NO OP + } + public removeObserver(observer: IObserver): void { + // NO OP + } + + override toString(): string { + return `Const: ${this.value}`; + } +} + + +export function observableFromPromise(promise: Promise): IObservable<{ value?: T }> { + const observable = observableValue<{ value?: T }>('promiseValue', {}); + promise.then((value) => { + observable.set({ value }, undefined); + }); + return observable; +} + +export function waitForState(observable: IObservable, predicate: (state: T) => state is TState): Promise; +export function waitForState(observable: IObservable, predicate: (state: T) => boolean): Promise; +export function waitForState(observable: IObservable, predicate: (state: T) => boolean): Promise { + return new Promise(resolve => { + let didRun = false; + let shouldDispose = false; + const d = autorun('waitForState', reader => { + const currentState = observable.read(reader); + if (predicate(currentState)) { + if (!didRun) { + shouldDispose = true; + } else { + d.dispose(); + } + resolve(currentState); + } + }); + didRun = true; + if (shouldDispose) { + d.dispose(); + } + }); +} + +export function observableFromEvent( + event: Event, + getValue: (args: TArgs | undefined) => T +): IObservable { + return new FromEventObservable(event, getValue); +} + +export class FromEventObservable extends BaseObservable { + private value: T | undefined; + private hasValue = false; + private subscription: IDisposable | undefined; + + constructor( + private readonly event: Event, + private readonly getValue: (args: TArgs | undefined) => T + ) { + super(); + } + + private getDebugName(): string | undefined { + return getFunctionName(this.getValue); + } + + public get debugName(): string { + const name = this.getDebugName(); + return 'From Event' + (name ? `: ${name}` : ''); + } + + protected override onFirstObserverAdded(): void { + this.subscription = this.event(this.handleEvent); + } + + private readonly handleEvent = (args: TArgs | undefined) => { + const newValue = this.getValue(args); + + const didChange = this.value !== newValue; + + getLogger()?.handleFromEventObservableTriggered(this, { oldValue: this.value, newValue, change: undefined, didChange }); + + if (didChange) { + this.value = newValue; + + if (this.hasValue) { + transaction( + (tx) => { + for (const o of this.observers) { + tx.updateObserver(o, this); + o.handleChange(this, undefined); + } + }, + () => { + const name = this.getDebugName(); + return 'Event fired' + (name ? `: ${name}` : ''); + } + ); + } + this.hasValue = true; + } + }; + + protected override onLastObserverRemoved(): void { + this.subscription!.dispose(); + this.subscription = undefined; + this.hasValue = false; + this.value = undefined; + } + + public get(): T { + if (this.subscription) { + if (!this.hasValue) { + this.handleEvent(undefined); + } + return this.value!; + } else { + // no cache, as there are no subscribers to keep it updated + return this.getValue(undefined); + } + } +} + +export namespace observableFromEvent { + export const Observer = FromEventObservable; +} + +export function observableSignalFromEvent( + debugName: string, + event: Event +): IObservable { + return new FromEventObservableSignal(debugName, event); +} + +class FromEventObservableSignal extends BaseObservable { + private subscription: IDisposable | undefined; + + constructor( + public readonly debugName: string, + private readonly event: Event, + ) { + super(); + } + + protected override onFirstObserverAdded(): void { + this.subscription = this.event(this.handleEvent); + } + + private readonly handleEvent = () => { + transaction( + (tx) => { + for (const o of this.observers) { + tx.updateObserver(o, this); + o.handleChange(this, undefined); + } + }, + () => this.debugName + ); + }; + + protected override onLastObserverRemoved(): void { + this.subscription!.dispose(); + this.subscription = undefined; + } + + public override get(): void { + // NO OP + } +} + +export function observableSignal( + debugName: string +): IObservableSignal { + return new ObservableSignal(debugName); +} + +export interface IObservableSignal extends IObservable { + trigger(tx: ITransaction | undefined): void; +} + +class ObservableSignal extends BaseObservable implements IObservableSignal { + constructor( + public readonly debugName: string + ) { + super(); + } + + public trigger(tx: ITransaction | undefined): void { + if (!tx) { + transaction(tx => { + this.trigger(tx); + }, () => `Trigger signal ${this.debugName}`); + return; + } + + for (const o of this.observers) { + tx.updateObserver(o, this); + o.handleChange(this, undefined); + } + } + + public override get(): void { + // NO OP + } +} + +export function debouncedObservable(observable: IObservable, debounceMs: number, disposableStore: DisposableStore): IObservable { + const debouncedObservable = observableValue('debounced', undefined); + + let timeout: any = undefined; + + disposableStore.add(autorun('debounce', reader => { + const value = observable.read(reader); + + if (timeout) { + clearTimeout(timeout); + } + timeout = setTimeout(() => { + transaction(tx => { + debouncedObservable.set(value, tx); + }); + }, debounceMs); + + })); + + return debouncedObservable; +} + +export function wasEventTriggeredRecently(event: Event, timeoutMs: number, disposableStore: DisposableStore): IObservable { + const observable = observableValue('triggeredRecently', false); + + let timeout: any = undefined; + + disposableStore.add(event(() => { + observable.set(true, undefined); + + if (timeout) { + clearTimeout(timeout); + } + timeout = setTimeout(() => { + observable.set(false, undefined); + }, timeoutMs); + })); + + return observable; +} + +/** + * This ensures the observable is kept up-to-date. + * This is useful when the observables `get` method is used. +*/ +export function keepAlive(observable: IObservable): IDisposable { + const o = new KeepAliveObserver(); + observable.addObserver(o); + return toDisposable(() => { + observable.removeObserver(o); + }); +} + +class KeepAliveObserver implements IObserver { + beginUpdate(observable: IObservable): void { + // NO OP + } + + handleChange(observable: IObservable, change: TChange): void { + // NO OP + } + + endUpdate(observable: IObservable): void { + // NO OP + } +} + +export function derivedObservableWithCache(name: string, computeFn: (reader: IReader, lastValue: T | undefined) => T): IObservable { + let lastValue: T | undefined = undefined; + const observable = derived(name, reader => { + lastValue = computeFn(reader, lastValue); + return lastValue; + }); + return observable; +} + +export function derivedObservableWithWritableCache(name: string, computeFn: (reader: IReader, lastValue: T | undefined) => T): IObservable & { clearCache(transaction: ITransaction): void } { + let lastValue: T | undefined = undefined; + const counter = observableValue('derivedObservableWithWritableCache.counter', 0); + const observable = derived(name, reader => { + counter.read(reader); + lastValue = computeFn(reader, lastValue); + return lastValue; + }); + return Object.assign(observable, { + clearCache: (transaction: ITransaction) => { + lastValue = undefined; + counter.set(counter.get() + 1, transaction); + }, + }); +} diff --git a/src/vs/base/common/observableValue.ts b/src/vs/base/common/observableValue.ts index 7bdcbae66cb..e1f207c0841 100644 --- a/src/vs/base/common/observableValue.ts +++ b/src/vs/base/common/observableValue.ts @@ -5,17 +5,28 @@ import { Emitter, Event } from 'vs/base/common/event'; import { Disposable } from 'vs/base/common/lifecycle'; +//@ts-ignore +import type { IObservable } from 'vs/base/common/observable'; +/** + * @deprecated Use {@link IObservable} instead. + */ export interface IObservableValue { onDidChange: Event; readonly value: T; } +/** + * @deprecated Use {@link IObservable} instead. + */ export const staticObservableValue = (value: T): IObservableValue => ({ onDidChange: Event.None, value, }); +/** + * @deprecated Use {@link IObservable} instead. + */ export class MutableObservableValue extends Disposable implements IObservableValue { private readonly changeEmitter = this._register(new Emitter()); diff --git a/src/vs/base/common/paging.ts b/src/vs/base/common/paging.ts index 60f72b407c3..1d9b7938169 100644 --- a/src/vs/base/common/paging.ts +++ b/src/vs/base/common/paging.ts @@ -6,7 +6,6 @@ import { range } from 'vs/base/common/arrays'; import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation'; import { canceled } from 'vs/base/common/errors'; -import { isArray } from 'vs/base/common/types'; /** * A Pager is a stateless abstraction over a paged collection. @@ -65,7 +64,7 @@ export class PagedModel implements IPagedModel { get length(): number { return this.pager.total; } constructor(arg: IPager | T[]) { - this.pager = isArray(arg) ? singlePagePager(arg) : arg; + this.pager = Array.isArray(arg) ? singlePagePager(arg) : arg; const totalPages = Math.ceil(this.pager.total / this.pager.pageSize); diff --git a/src/vs/base/common/platform.ts b/src/vs/base/common/platform.ts index 948b62e0a93..f41a2f77df5 100644 --- a/src/vs/base/common/platform.ts +++ b/src/vs/base/common/platform.ts @@ -2,8 +2,9 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import * as nls from 'vs/nls'; -const LANGUAGE_DEFAULT = 'en'; +export const LANGUAGE_DEFAULT = 'en'; let _isWindows = false; let _isMacintosh = false; @@ -14,6 +15,7 @@ let _isWeb = false; let _isElectron = false; let _isIOS = false; let _isCI = false; +let _isMobile = false; let _locale: string | undefined = undefined; let _language: string = LANGUAGE_DEFAULT; let _translationsConfigFile: string | undefined = undefined; @@ -67,7 +69,6 @@ const isElectronRenderer = isElectronProcess && nodeProcess?.type === 'renderer' interface INavigator { userAgent: string; - language: string; maxTouchPoints?: number; } declare const navigator: INavigator; @@ -79,8 +80,19 @@ if (typeof navigator === 'object' && !isElectronRenderer) { _isMacintosh = _userAgent.indexOf('Macintosh') >= 0; _isIOS = (_userAgent.indexOf('Macintosh') >= 0 || _userAgent.indexOf('iPad') >= 0 || _userAgent.indexOf('iPhone') >= 0) && !!navigator.maxTouchPoints && navigator.maxTouchPoints > 0; _isLinux = _userAgent.indexOf('Linux') >= 0; + _isMobile = _userAgent?.indexOf('Mobi') >= 0; _isWeb = true; - _locale = navigator.language; + + const configuredLocale = nls.getConfiguredDefaultLocale( + // This call _must_ be done in the file that calls `nls.getConfiguredDefaultLocale` + // to ensure that the NLS AMD Loader plugin has been loaded and configured. + // This is because the loader plugin decides what the default locale is based on + // how it's able to resolve the strings. + nls.localize({ key: 'ensureLoaderPluginIsLoaded', comment: ['{Locked}'] }, '_') + ); + + _locale = configuredLocale || LANGUAGE_DEFAULT; + _language = _locale; } @@ -147,6 +159,7 @@ export const isElectron = _isElectron; export const isWeb = _isWeb; export const isWebWorker = (_isWeb && typeof globals.importScripts === 'function'); export const isIOS = _isIOS; +export const isMobile = _isMobile; /** * Whether we run inside a CI environment, such as * GH actions or Azure Pipelines. @@ -209,7 +222,7 @@ export const setTimeout0 = (() => { id: number; callback: () => void; } - let pending: IQueueElement[] = []; + const pending: IQueueElement[] = []; globals.addEventListener('message', (e: MessageEvent) => { if (e.data && e.data.vscodeScheduleAsyncWork) { for (let i = 0, len = pending.length; i < len; i++) { diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts index f822373104d..cf3eabacb71 100644 --- a/src/vs/base/common/product.ts +++ b/src/vs/base/common/product.ts @@ -70,6 +70,8 @@ export interface IProductConfiguration { readonly extensionsGallery?: { readonly serviceUrl: string; + readonly servicePPEUrl?: string; + readonly searchUrl?: string; readonly itemUrl: string; readonly publisherUrl: string; readonly resourceUrlTemplate: string; @@ -99,7 +101,7 @@ export interface IProductConfiguration { readonly enableTelemetry?: boolean; readonly openToWelcomeMainPage?: boolean; readonly aiConfig?: { - readonly asimovKey: string; + readonly ariaKey: string; }; readonly sendASmile?: { @@ -129,6 +131,9 @@ export interface IProductConfiguration { readonly serverApplicationName: string; readonly serverDataFolderName?: string; + readonly tunnelApplicationName?: string; + readonly tunnelApplicationConfig?: { authenticationProviders: IStringDictionary<{ scopes: string[] }> }; + readonly npsSurveyUrl?: string; readonly cesSurveyUrl?: string; readonly surveys?: readonly ISurveyData[]; @@ -153,7 +158,11 @@ export interface IProductConfiguration { readonly 'configurationSync.store'?: ConfigurationSyncStore; + readonly 'editSessions.store'?: Omit; readonly darwinUniversalAssetId?: string; + + // experimental + readonly enableSyncingProfiles?: boolean; } export type ImportantExtensionTip = { name: string; languages?: string[]; pattern?: string; isExtensionPack?: boolean; whenNotInstalled?: string[] }; diff --git a/src/vs/base/common/resourceTree.ts b/src/vs/base/common/resourceTree.ts index 56b1e00b91d..7d44171c1b1 100644 --- a/src/vs/base/common/resourceTree.ts +++ b/src/vs/base/common/resourceTree.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { memoize } from 'vs/base/common/decorators'; -import { PathIterator } from 'vs/base/common/map'; +import { PathIterator } from 'vs/base/common/ternarySearchTree'; import * as paths from 'vs/base/common/path'; import { extUri as defaultExtUri, IExtUri } from 'vs/base/common/resources'; import { URI } from 'vs/base/common/uri'; diff --git a/src/vs/base/common/resources.ts b/src/vs/base/common/resources.ts index 4bcd8fb899f..ee48280997a 100644 --- a/src/vs/base/common/resources.ts +++ b/src/vs/base/common/resources.ts @@ -240,7 +240,8 @@ export class ExtUri implements IExtUri { const relativePath = paths.relative(originalFSPath(from), originalFSPath(to)); return isWindows ? extpath.toSlashes(relativePath) : relativePath; } - let fromPath = from.path || '/', toPath = to.path || '/'; + let fromPath = from.path || '/'; + const toPath = to.path || '/'; if (this._ignorePathCasing(from)) { // make casing of fromPath match toPath let i = 0; diff --git a/src/vs/base/common/scrollable.ts b/src/vs/base/common/scrollable.ts index 7da28a8555d..89c832edcd5 100644 --- a/src/vs/base/common/scrollable.ts +++ b/src/vs/base/common/scrollable.ts @@ -268,9 +268,7 @@ export class Scrollable extends Disposable { this._setState(newState, Boolean(this._smoothScrolling)); // Validate outstanding animated scroll position target - if (this._smoothScrolling) { - this._smoothScrolling.acceptScrollDimensions(this._state); - } + this._smoothScrolling?.acceptScrollDimensions(this._state); } /** diff --git a/src/vs/base/common/sequence.ts b/src/vs/base/common/sequence.ts index ac3593d8990..2559c069be8 100644 --- a/src/vs/base/common/sequence.ts +++ b/src/vs/base/common/sequence.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import { Emitter, Event } from 'vs/base/common/event'; -import { IDisposable } from 'vs/base/common/lifecycle'; export interface ISplice { readonly start: number; @@ -33,26 +32,3 @@ export class Sequence implements ISequence, ISpliceable { this._onDidSplice.fire({ start, deleteCount, toInsert }); } } - -export class SimpleSequence implements ISequence { - - private _elements: T[]; - get elements(): T[] { return this._elements; } - - readonly onDidSplice: Event>; - private disposable: IDisposable; - - constructor(elements: T[], onDidAdd: Event, onDidRemove: Event) { - this._elements = [...elements]; - this.onDidSplice = Event.any( - Event.map(onDidAdd, e => ({ start: this.elements.length, deleteCount: 0, toInsert: [e] })), - Event.map(Event.filter(Event.map(onDidRemove, e => this.elements.indexOf(e)), i => i > -1), i => ({ start: i, deleteCount: 1, toInsert: [] })) - ); - - this.disposable = this.onDidSplice(({ start, deleteCount, toInsert }) => this._elements.splice(start, deleteCount, ...toInsert)); - } - - dispose(): void { - this.disposable.dispose(); - } -} diff --git a/src/vs/base/common/skipList.ts b/src/vs/base/common/skipList.ts index 6b3bd79ef4c..98ae9e4d9fd 100644 --- a/src/vs/base/common/skipList.ts +++ b/src/vs/base/common/skipList.ts @@ -135,7 +135,7 @@ export class SkipList implements Map { } private static _insert(list: SkipList, searchKey: K, value: V, comparator: Comparator) { - let update: Node[] = []; + const update: Node[] = []; let x = list._header; for (let i = list._level - 1; i >= 0; i--) { while (x.forward[i] && comparator(x.forward[i].key, searchKey) < 0) { @@ -150,7 +150,7 @@ export class SkipList implements Map { return false; } else { // insert - let lvl = SkipList._randomLevel(list); + const lvl = SkipList._randomLevel(list); if (lvl > list._level) { for (let i = list._level; i < lvl; i++) { update[i] = list._header; @@ -175,7 +175,7 @@ export class SkipList implements Map { } private static _delete(list: SkipList, searchKey: K, comparator: Comparator) { - let update: Node[] = []; + const update: Node[] = []; let x = list._header; for (let i = list._level - 1; i >= 0; i--) { while (x.forward[i] && comparator(x.forward[i].key, searchKey) < 0) { diff --git a/src/vs/base/common/stopwatch.ts b/src/vs/base/common/stopwatch.ts index ccba2ac5874..f38627afedb 100644 --- a/src/vs/base/common/stopwatch.ts +++ b/src/vs/base/common/stopwatch.ts @@ -27,6 +27,11 @@ export class StopWatch { this._stopTime = this._now(); } + public reset(): void { + this._startTime = this._now(); + this._stopTime = -1; + } + public elapsed(): number { if (this._stopTime !== -1) { return this._stopTime - this._startTime; diff --git a/src/vs/base/common/strings.ts b/src/vs/base/common/strings.ts index 62fddd69f91..f66058f8b1f 100644 --- a/src/vs/base/common/strings.ts +++ b/src/vs/base/common/strings.ts @@ -279,7 +279,7 @@ export function lastNonWhitespaceIndex(str: string, startIndex: number = str.len * replace function is allowed to be async and return a Promise. */ export function replaceAsync(str: string, search: RegExp, replacer: (match: string, ...args: any[]) => Promise): Promise { - let parts: (string | Promise)[] = []; + const parts: (string | Promise)[] = []; let last = 0; for (const match of str.matchAll(search)) { @@ -309,8 +309,8 @@ export function compare(a: string, b: string): number { export function compareSubstring(a: string, b: string, aStart: number = 0, aEnd: number = a.length, bStart: number = 0, bEnd: number = b.length): number { for (; aStart < aEnd && bStart < bEnd; aStart++, bStart++) { - let codeA = a.charCodeAt(aStart); - let codeB = b.charCodeAt(bStart); + const codeA = a.charCodeAt(aStart); + const codeB = b.charCodeAt(bStart); if (codeA < codeB) { return -1; } else if (codeA > codeB) { @@ -378,6 +378,10 @@ export function compareSubstringIgnoreCase(a: string, b: string, aStart: number return 0; } +export function isAsciiDigit(code: number): boolean { + return code >= CharCode.Digit0 && code <= CharCode.Digit9; +} + export function isLowerAsciiLetter(code: number): boolean { return code >= CharCode.a && code <= CharCode.z; } @@ -404,8 +408,8 @@ export function startsWithIgnoreCase(str: string, candidate: string): boolean { */ export function commonPrefixLength(a: string, b: string): number { - let i: number, - len = Math.min(a.length, b.length); + const len = Math.min(a.length, b.length); + let i: number; for (i = 0; i < len; i++) { if (a.charCodeAt(i) !== b.charCodeAt(i)) { @@ -421,8 +425,8 @@ export function commonPrefixLength(a: string, b: string): number { */ export function commonSuffixLength(a: string, b: string): number { - let i: number, - len = Math.min(a.length, b.length); + const len = Math.min(a.length, b.length); + let i: number; const aLastIndex = a.length - 1; const bLastIndex = b.length - 1; @@ -596,15 +600,31 @@ export function getCharContainingOffset(str: string, offset: number): [number, n return [startOffset, endOffset]; } -/** - * Generated using https://github.com/alexdima/unicode-utils/blob/main/rtl-test.js - */ -const CONTAINS_RTL = /(?:[\u05BE\u05C0\u05C3\u05C6\u05D0-\u05F4\u0608\u060B\u060D\u061B-\u064A\u066D-\u066F\u0671-\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u0710\u0712-\u072F\u074D-\u07A5\u07B1-\u07EA\u07F4\u07F5\u07FA\u07FE-\u0815\u081A\u0824\u0828\u0830-\u0858\u085E-\u088E\u08A0-\u08C9\u200F\uFB1D\uFB1F-\uFB28\uFB2A-\uFD3D\uFD50-\uFDC7\uFDF0-\uFDFC\uFE70-\uFEFC]|\uD802[\uDC00-\uDD1B\uDD20-\uDE00\uDE10-\uDE35\uDE40-\uDEE4\uDEEB-\uDF35\uDF40-\uDFFF]|\uD803[\uDC00-\uDD23\uDE80-\uDEA9\uDEAD-\uDF45\uDF51-\uDF81\uDF86-\uDFF6]|\uD83A[\uDC00-\uDCCF\uDD00-\uDD43\uDD4B-\uDFFF]|\uD83B[\uDC00-\uDEBB])/; +export function charCount(str: string): number { + const iterator = new GraphemeIterator(str); + let length = 0; + while (!iterator.eol()) { + length++; + iterator.nextGraphemeLength(); + } + return length; +} + +let CONTAINS_RTL: RegExp | undefined = undefined; + +function makeContainsRtl() { + // Generated using https://github.com/alexdima/unicode-utils/blob/main/rtl-test.js + return /(?:[\u05BE\u05C0\u05C3\u05C6\u05D0-\u05F4\u0608\u060B\u060D\u061B-\u064A\u066D-\u066F\u0671-\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u0710\u0712-\u072F\u074D-\u07A5\u07B1-\u07EA\u07F4\u07F5\u07FA\u07FE-\u0815\u081A\u0824\u0828\u0830-\u0858\u085E-\u088E\u08A0-\u08C9\u200F\uFB1D\uFB1F-\uFB28\uFB2A-\uFD3D\uFD50-\uFDC7\uFDF0-\uFDFC\uFE70-\uFEFC]|\uD802[\uDC00-\uDD1B\uDD20-\uDE00\uDE10-\uDE35\uDE40-\uDEE4\uDEEB-\uDF35\uDF40-\uDFFF]|\uD803[\uDC00-\uDD23\uDE80-\uDEA9\uDEAD-\uDF45\uDF51-\uDF81\uDF86-\uDFF6]|\uD83A[\uDC00-\uDCCF\uDD00-\uDD43\uDD4B-\uDFFF]|\uD83B[\uDC00-\uDEBB])/; +} /** * Returns true if `str` contains any Unicode character that is classified as "R" or "AL". */ export function containsRTL(str: string): boolean { + if (!CONTAINS_RTL) { + CONTAINS_RTL = makeContainsRtl(); + } + return CONTAINS_RTL.test(str); } diff --git a/src/vs/base/common/stripComments.js b/src/vs/base/common/stripComments.js index ffc8dd7dbe5..c59205e14ab 100644 --- a/src/vs/base/common/stripComments.js +++ b/src/vs/base/common/stripComments.js @@ -13,7 +13,8 @@ // Second group matches a single quoted string // Third group matches a multi line comment // Forth group matches a single line comment - const regexp = /("[^"\\]*(?:\\.[^"\\]*)*")|('[^'\\]*(?:\\.[^'\\]*)*')|(\/\*[^\/\*]*(?:(?:\*|\/)[^\/\*]*)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))/g; + // Fifth group matches a trailing comma + const regexp = /("[^"\\]*(?:\\.[^"\\]*)*")|('[^'\\]*(?:\\.[^'\\]*)*')|(\/\*[^\/\*]*(?:(?:\*|\/)[^\/\*]*)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))|(,\s*[}\]])/g; /** * @@ -21,8 +22,8 @@ * @returns {string} */ function stripComments(content) { - return content.replace(regexp, function (match, _m1, _m2, m3, m4) { - // Only one of m1, m2, m3, m4 matches + return content.replace(regexp, function (match, _m1, _m2, m3, m4, m5) { + // Only one of m1, m2, m3, m4, m5 matches if (m3) { // A block comment. Replace with nothing return ''; @@ -36,6 +37,9 @@ else { return ''; } + } else if (m5) { + // Remove the trailing comma + return match.substring(1); } else { // We match a string return match; diff --git a/src/vs/base/common/ternarySearchTree.ts b/src/vs/base/common/ternarySearchTree.ts new file mode 100644 index 00000000000..91f4301ffa9 --- /dev/null +++ b/src/vs/base/common/ternarySearchTree.ts @@ -0,0 +1,732 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { shuffle } from 'vs/base/common/arrays'; +import { CharCode } from 'vs/base/common/charCode'; +import { compare, compareIgnoreCase, compareSubstring, compareSubstringIgnoreCase } from 'vs/base/common/strings'; +import { URI } from 'vs/base/common/uri'; + +export interface IKeyIterator { + reset(key: K): this; + next(): this; + + hasNext(): boolean; + cmp(a: string): number; + value(): string; +} + +export class StringIterator implements IKeyIterator { + + private _value: string = ''; + private _pos: number = 0; + + reset(key: string): this { + this._value = key; + this._pos = 0; + return this; + } + + next(): this { + this._pos += 1; + return this; + } + + hasNext(): boolean { + return this._pos < this._value.length - 1; + } + + cmp(a: string): number { + const aCode = a.charCodeAt(0); + const thisCode = this._value.charCodeAt(this._pos); + return aCode - thisCode; + } + + value(): string { + return this._value[this._pos]; + } +} + +export class ConfigKeysIterator implements IKeyIterator { + + private _value!: string; + private _from!: number; + private _to!: number; + + constructor( + private readonly _caseSensitive: boolean = true + ) { } + + reset(key: string): this { + this._value = key; + this._from = 0; + this._to = 0; + return this.next(); + } + + hasNext(): boolean { + return this._to < this._value.length; + } + + next(): this { + // this._data = key.split(/[\\/]/).filter(s => !!s); + this._from = this._to; + let justSeps = true; + for (; this._to < this._value.length; this._to++) { + const ch = this._value.charCodeAt(this._to); + if (ch === CharCode.Period) { + if (justSeps) { + this._from++; + } else { + break; + } + } else { + justSeps = false; + } + } + return this; + } + + cmp(a: string): number { + return this._caseSensitive + ? compareSubstring(a, this._value, 0, a.length, this._from, this._to) + : compareSubstringIgnoreCase(a, this._value, 0, a.length, this._from, this._to); + } + + value(): string { + return this._value.substring(this._from, this._to); + } +} + +export class PathIterator implements IKeyIterator { + + private _value!: string; + private _valueLen!: number; + private _from!: number; + private _to!: number; + + constructor( + private readonly _splitOnBackslash: boolean = true, + private readonly _caseSensitive: boolean = true + ) { } + + reset(key: string): this { + this._from = 0; + this._to = 0; + this._value = key; + this._valueLen = key.length; + for (let pos = key.length - 1; pos >= 0; pos--, this._valueLen--) { + const ch = this._value.charCodeAt(pos); + if (!(ch === CharCode.Slash || this._splitOnBackslash && ch === CharCode.Backslash)) { + break; + } + } + + return this.next(); + } + + hasNext(): boolean { + return this._to < this._valueLen; + } + + next(): this { + // this._data = key.split(/[\\/]/).filter(s => !!s); + this._from = this._to; + let justSeps = true; + for (; this._to < this._valueLen; this._to++) { + const ch = this._value.charCodeAt(this._to); + if (ch === CharCode.Slash || this._splitOnBackslash && ch === CharCode.Backslash) { + if (justSeps) { + this._from++; + } else { + break; + } + } else { + justSeps = false; + } + } + return this; + } + + cmp(a: string): number { + return this._caseSensitive + ? compareSubstring(a, this._value, 0, a.length, this._from, this._to) + : compareSubstringIgnoreCase(a, this._value, 0, a.length, this._from, this._to); + } + + value(): string { + return this._value.substring(this._from, this._to); + } +} + +const enum UriIteratorState { + Scheme = 1, Authority = 2, Path = 3, Query = 4, Fragment = 5 +} + +export class UriIterator implements IKeyIterator { + + private _pathIterator!: PathIterator; + private _value!: URI; + private _states: UriIteratorState[] = []; + private _stateIdx: number = 0; + + constructor( + private readonly _ignorePathCasing: (uri: URI) => boolean, + private readonly _ignoreQueryAndFragment: (uri: URI) => boolean) { } + + reset(key: URI): this { + this._value = key; + this._states = []; + if (this._value.scheme) { + this._states.push(UriIteratorState.Scheme); + } + if (this._value.authority) { + this._states.push(UriIteratorState.Authority); + } + if (this._value.path) { + this._pathIterator = new PathIterator(false, !this._ignorePathCasing(key)); + this._pathIterator.reset(key.path); + if (this._pathIterator.value()) { + this._states.push(UriIteratorState.Path); + } + } + if (!this._ignoreQueryAndFragment(key)) { + if (this._value.query) { + this._states.push(UriIteratorState.Query); + } + if (this._value.fragment) { + this._states.push(UriIteratorState.Fragment); + } + } + this._stateIdx = 0; + return this; + } + + next(): this { + if (this._states[this._stateIdx] === UriIteratorState.Path && this._pathIterator.hasNext()) { + this._pathIterator.next(); + } else { + this._stateIdx += 1; + } + return this; + } + + hasNext(): boolean { + return (this._states[this._stateIdx] === UriIteratorState.Path && this._pathIterator.hasNext()) + || this._stateIdx < this._states.length - 1; + } + + cmp(a: string): number { + if (this._states[this._stateIdx] === UriIteratorState.Scheme) { + return compareIgnoreCase(a, this._value.scheme); + } else if (this._states[this._stateIdx] === UriIteratorState.Authority) { + return compareIgnoreCase(a, this._value.authority); + } else if (this._states[this._stateIdx] === UriIteratorState.Path) { + return this._pathIterator.cmp(a); + } else if (this._states[this._stateIdx] === UriIteratorState.Query) { + return compare(a, this._value.query); + } else if (this._states[this._stateIdx] === UriIteratorState.Fragment) { + return compare(a, this._value.fragment); + } + throw new Error(); + } + + value(): string { + if (this._states[this._stateIdx] === UriIteratorState.Scheme) { + return this._value.scheme; + } else if (this._states[this._stateIdx] === UriIteratorState.Authority) { + return this._value.authority; + } else if (this._states[this._stateIdx] === UriIteratorState.Path) { + return this._pathIterator.value(); + } else if (this._states[this._stateIdx] === UriIteratorState.Query) { + return this._value.query; + } else if (this._states[this._stateIdx] === UriIteratorState.Fragment) { + return this._value.fragment; + } + throw new Error(); + } +} +class TernarySearchTreeNode { + height: number = 1; + segment!: string; + value: V | undefined; + key: K | undefined; + left: TernarySearchTreeNode | undefined; + mid: TernarySearchTreeNode | undefined; + right: TernarySearchTreeNode | undefined; + + isEmpty(): boolean { + return !this.left && !this.mid && !this.right && !this.value; + } + + rotateLeft() { + const tmp = this.right!; + this.right = tmp.left; + tmp.left = this; + this.updateHeight(); + tmp.updateHeight(); + return tmp; + } + + rotateRight() { + const tmp = this.left!; + this.left = tmp.right; + tmp.right = this; + this.updateHeight(); + tmp.updateHeight(); + return tmp; + } + + updateHeight() { + this.height = 1 + Math.max(this.heightLeft, this.heightRight); + } + + balanceFactor() { + return this.heightRight - this.heightLeft; + } + + get heightLeft() { + return this.left?.height ?? 0; + } + + get heightRight() { + return this.right?.height ?? 0; + } +} + +const enum Dir { + Left = -1, + Mid = 0, + Right = 1 +} + +export class TernarySearchTree { + + static forUris(ignorePathCasing: (key: URI) => boolean = () => false, ignoreQueryAndFragment: (key: URI) => boolean = () => false): TernarySearchTree { + return new TernarySearchTree(new UriIterator(ignorePathCasing, ignoreQueryAndFragment)); + } + + static forPaths(ignorePathCasing = false): TernarySearchTree { + return new TernarySearchTree(new PathIterator(undefined, !ignorePathCasing)); + } + + static forStrings(): TernarySearchTree { + return new TernarySearchTree(new StringIterator()); + } + + static forConfigKeys(): TernarySearchTree { + return new TernarySearchTree(new ConfigKeysIterator()); + } + + private _iter: IKeyIterator; + private _root: TernarySearchTreeNode | undefined; + + constructor(segments: IKeyIterator) { + this._iter = segments; + } + + clear(): void { + this._root = undefined; + } + + /** + * Fill the tree with the same value of the given keys + */ + fill(element: V, keys: readonly K[]): void; + /** + * Fill the tree with given [key,value]-tuples + */ + fill(values: readonly [K, V][]): void; + fill(values: readonly [K, V][] | V, keys?: readonly K[]): void { + if (keys) { + const arr = keys.slice(0); + shuffle(arr); + for (const k of arr) { + this.set(k, (values)); + } + } else { + const arr = (<[K, V][]>values).slice(0); + shuffle(arr); + for (const entry of arr) { + this.set(entry[0], entry[1]); + } + } + } + + set(key: K, element: V): V | undefined { + const iter = this._iter.reset(key); + let node: TernarySearchTreeNode; + + if (!this._root) { + this._root = new TernarySearchTreeNode(); + this._root.segment = iter.value(); + } + const stack: [Dir, TernarySearchTreeNode][] = []; + + // find insert_node + node = this._root; + while (true) { + const val = iter.cmp(node.segment); + if (val > 0) { + // left + if (!node.left) { + node.left = new TernarySearchTreeNode(); + node.left.segment = iter.value(); + } + stack.push([Dir.Left, node]); + node = node.left; + + } else if (val < 0) { + // right + if (!node.right) { + node.right = new TernarySearchTreeNode(); + node.right.segment = iter.value(); + } + stack.push([Dir.Right, node]); + node = node.right; + + } else if (iter.hasNext()) { + // mid + iter.next(); + if (!node.mid) { + node.mid = new TernarySearchTreeNode(); + node.mid.segment = iter.value(); + } + stack.push([Dir.Mid, node]); + node = node.mid; + } else { + break; + } + } + + // set value + const oldElement = node.value; + node.value = element; + node.key = key; + + // balance + for (let i = stack.length - 1; i >= 0; i--) { + const node = stack[i][1]; + + node.updateHeight(); + const bf = node.balanceFactor(); + + if (bf < -1 || bf > 1) { + // needs rotate + const d1 = stack[i][0]; + const d2 = stack[i + 1][0]; + + if (d1 === Dir.Right && d2 === Dir.Right) { + //right, right -> rotate left + stack[i][1] = node.rotateLeft(); + + } else if (d1 === Dir.Left && d2 === Dir.Left) { + // left, left -> rotate right + stack[i][1] = node.rotateRight(); + + } else if (d1 === Dir.Right && d2 === Dir.Left) { + // right, left -> double rotate right, left + node.right = stack[i + 1][1] = stack[i + 1][1].rotateRight(); + stack[i][1] = node.rotateLeft(); + + } else if (d1 === Dir.Left && d2 === Dir.Right) { + // left, right -> double rotate left, right + node.left = stack[i + 1][1] = stack[i + 1][1].rotateLeft(); + stack[i][1] = node.rotateRight(); + + } else { + throw new Error(); + } + + // patch path to parent + if (i > 0) { + switch (stack[i - 1][0]) { + case Dir.Left: + stack[i - 1][1].left = stack[i][1]; + break; + case Dir.Right: + stack[i - 1][1].right = stack[i][1]; + break; + case Dir.Mid: + stack[i - 1][1].mid = stack[i][1]; + break; + } + } else { + this._root = stack[0][1]; + } + } + } + + return oldElement; + } + + get(key: K): V | undefined { + return this._getNode(key)?.value; + } + + private _getNode(key: K) { + const iter = this._iter.reset(key); + let node = this._root; + while (node) { + const val = iter.cmp(node.segment); + if (val > 0) { + // left + node = node.left; + } else if (val < 0) { + // right + node = node.right; + } else if (iter.hasNext()) { + // mid + iter.next(); + node = node.mid; + } else { + break; + } + } + return node; + } + + has(key: K): boolean { + const node = this._getNode(key); + return !(node?.value === undefined && node?.mid === undefined); + } + + delete(key: K): void { + return this._delete(key, false); + } + + deleteSuperstr(key: K): void { + return this._delete(key, true); + } + + private _delete(key: K, superStr: boolean): void { + const iter = this._iter.reset(key); + const stack: [Dir, TernarySearchTreeNode][] = []; + let node = this._root; + + // find node + while (node) { + const val = iter.cmp(node.segment); + if (val > 0) { + // left + stack.push([Dir.Left, node]); + node = node.left; + } else if (val < 0) { + // right + stack.push([Dir.Right, node]); + node = node.right; + } else if (iter.hasNext()) { + // mid + iter.next(); + stack.push([Dir.Mid, node]); + node = node.mid; + } else { + break; + } + } + + if (!node) { + // node not found + return; + } + + if (superStr) { + // removing children, reset height + node.left = undefined; + node.mid = undefined; + node.right = undefined; + node.height = 1; + } else { + // removing element + node.key = undefined; + node.value = undefined; + } + + // BST node removal + if (!node.mid && !node.value) { + if (node.left && node.right) { + // full node + // replace deleted-node with the min-node of the right branch. + // If there is no true min-node leave things as they are + const min = this._min(node.right); + if (min.key) { + const { key, value, segment } = min; + this._delete(min.key!, false); + node.key = key; + node.value = value; + node.segment = segment; + } + + } else { + // empty or half empty + const newChild = node.left ?? node.right; + if (stack.length > 0) { + const [dir, parent] = stack[stack.length - 1]; + switch (dir) { + case Dir.Left: parent.left = newChild; break; + case Dir.Mid: parent.mid = newChild; break; + case Dir.Right: parent.right = newChild; break; + } + } else { + this._root = newChild; + } + } + } + + // AVL balance + for (let i = stack.length - 1; i >= 0; i--) { + const node = stack[i][1]; + + node.updateHeight(); + const bf = node.balanceFactor(); + if (bf > 1) { + // right heavy + if (node.right!.balanceFactor() >= 0) { + // right, right -> rotate left + stack[i][1] = node.rotateLeft(); + } else { + // right, left -> double rotate + node.right = node.right!.rotateRight(); + stack[i][1] = node.rotateLeft(); + } + + } else if (bf < -1) { + // left heavy + if (node.left!.balanceFactor() <= 0) { + // left, left -> rotate right + stack[i][1] = node.rotateRight(); + } else { + // left, right -> double rotate + node.left = node.left!.rotateLeft(); + stack[i][1] = node.rotateRight(); + } + } + + // patch path to parent + if (i > 0) { + switch (stack[i - 1][0]) { + case Dir.Left: + stack[i - 1][1].left = stack[i][1]; + break; + case Dir.Right: + stack[i - 1][1].right = stack[i][1]; + break; + case Dir.Mid: + stack[i - 1][1].mid = stack[i][1]; + break; + } + } else { + this._root = stack[0][1]; + } + } + } + + private _min(node: TernarySearchTreeNode): TernarySearchTreeNode { + while (node.left) { + node = node.left; + } + return node; + } + + findSubstr(key: K): V | undefined { + const iter = this._iter.reset(key); + let node = this._root; + let candidate: V | undefined = undefined; + while (node) { + const val = iter.cmp(node.segment); + if (val > 0) { + // left + node = node.left; + } else if (val < 0) { + // right + node = node.right; + } else if (iter.hasNext()) { + // mid + iter.next(); + candidate = node.value || candidate; + node = node.mid; + } else { + break; + } + } + return node && node.value || candidate; + } + + findSuperstr(key: K): IterableIterator<[K, V]> | undefined { + const iter = this._iter.reset(key); + let node = this._root; + while (node) { + const val = iter.cmp(node.segment); + if (val > 0) { + // left + node = node.left; + } else if (val < 0) { + // right + node = node.right; + } else if (iter.hasNext()) { + // mid + iter.next(); + node = node.mid; + } else { + // collect + if (!node.mid) { + return undefined; + } else { + return this._entries(node.mid); + } + } + } + return undefined; + } + + forEach(callback: (value: V, index: K) => any): void { + for (const [key, value] of this) { + callback(value, key); + } + } + + *[Symbol.iterator](): IterableIterator<[K, V]> { + yield* this._entries(this._root); + } + + private _entries(node: TernarySearchTreeNode | undefined): IterableIterator<[K, V]> { + const result: [K, V][] = []; + this._dfsEntries(node, result); + return result[Symbol.iterator](); + } + + private _dfsEntries(node: TernarySearchTreeNode | undefined, bucket: [K, V][]) { + // DFS + if (!node) { + return; + } + if (node.left) { + this._dfsEntries(node.left, bucket); + } + if (node.value) { + bucket.push([node.key!, node.value]); + } + if (node.mid) { + this._dfsEntries(node.mid, bucket); + } + if (node.right) { + this._dfsEntries(node.right, bucket); + } + } + + // for debug/testing + _isBalanced(): boolean { + const nodeIsBalanced = (node: TernarySearchTreeNode | undefined): boolean => { + if (!node) { + return true; + } + const bf = node.balanceFactor(); + if (bf < -1 || bf > 1) { + return false; + } + return nodeIsBalanced(node.left) && nodeIsBalanced(node.right); + }; + return nodeIsBalanced(this._root); + } +} diff --git a/src/vs/base/common/types.ts b/src/vs/base/common/types.ts index c2245c67558..08063ae38d1 100644 --- a/src/vs/base/common/types.ts +++ b/src/vs/base/common/types.ts @@ -3,15 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { URI, UriComponents } from 'vs/base/common/uri'; - -/** - * @returns whether the provided parameter is a JavaScript Array or not. - */ -export function isArray(array: any): array is any[] { - return Array.isArray(array); -} - /** * @returns whether the provided parameter is a JavaScript String or not. */ @@ -27,7 +18,6 @@ export function isStringArray(value: unknown): value is string[] { } /** - * * @returns whether the provided parameter is of type `object` but **not** * `null`, an `array`, a `regexp`, nor a `date`. */ @@ -43,22 +33,12 @@ export function isObject(obj: unknown): obj is Object { } /** - * * @returns whether the provided parameter is of type `Buffer` or Uint8Array dervived type */ export function isTypedArray(obj: unknown): obj is Object { + const TypedArray = Object.getPrototypeOf(Uint8Array); return typeof obj === 'object' - && (obj instanceof Uint8Array || - obj instanceof Uint16Array || - obj instanceof Uint32Array || - obj instanceof Float32Array || - obj instanceof Float64Array || - obj instanceof Int8Array || - obj instanceof Int16Array || - obj instanceof Int32Array || - obj instanceof BigInt64Array || - obj instanceof BigUint64Array || - obj instanceof Uint8ClampedArray); + && obj instanceof TypedArray; } /** @@ -154,7 +134,7 @@ export function isEmptyObject(obj: unknown): obj is object { return false; } - for (let key in obj) { + for (const key in obj) { if (hasOwnProperty.call(obj, key)) { return false; } @@ -210,41 +190,6 @@ export function validateConstraint(arg: unknown, constraint: TypeConstraint | un } } -export function getAllPropertyNames(obj: object): string[] { - let res: string[] = []; - let proto = Object.getPrototypeOf(obj); - while (Object.prototype !== proto) { - res = res.concat(Object.getOwnPropertyNames(proto)); - proto = Object.getPrototypeOf(proto); - } - return res; -} - -export function getAllMethodNames(obj: object): string[] { - const methods: string[] = []; - for (const prop of getAllPropertyNames(obj)) { - if (typeof (obj as any)[prop] === 'function') { - methods.push(prop); - } - } - return methods; -} - -export function createProxyObject(methodNames: string[], invoke: (method: string, args: unknown[]) => unknown): T { - const createProxyMethod = (method: string): () => unknown => { - return function () { - const args = Array.prototype.slice.call(arguments, 0); - return invoke(method, args); - }; - }; - - let result = {} as T; - for (const methodName of methodNames) { - (result)[methodName] = createProxyMethod(methodName); - } - return result; -} - /** * Converts null to undefined, passes all other values through. */ @@ -275,12 +220,7 @@ export type AddFirstParameterToFunctions; */ -export type UriDto = { [K in keyof T]: T[K] extends URI - ? UriComponents - : UriDto }; - -export function assertNever(value: never, message = 'Unreachable'): never { - throw new Error(message); -} +export type AtLeastOne }> = Partial & U[keyof U]; diff --git a/src/vs/base/common/uri.ts b/src/vs/base/common/uri.ts index 4aa3825cb4e..744afa00f0c 100644 --- a/src/vs/base/common/uri.ts +++ b/src/vs/base/common/uri.ts @@ -701,3 +701,10 @@ function percentDecode(str: string): string { } return str.replace(_rEncodedAsHex, (match) => decodeURIComponentGraceful(match)); } + +/** + * Mapped-type that replaces all occurrences of URI with UriComponents + */ +export type UriDto = { [K in keyof T]: T[K] extends URI + ? UriComponents + : UriDto }; diff --git a/src/vs/base/common/uriIpc.ts b/src/vs/base/common/uriIpc.ts index 4daf230aa9d..c8a4733a479 100644 --- a/src/vs/base/common/uriIpc.ts +++ b/src/vs/base/common/uriIpc.ts @@ -90,7 +90,7 @@ function _transformOutgoingURIs(obj: any, transformer: IURITransformer, depth: n } // walk object (or array) - for (let key in obj) { + for (const key in obj) { if (Object.hasOwnProperty.call(obj, key)) { const r = _transformOutgoingURIs(obj[key], transformer, depth + 1); if (r !== null) { @@ -126,7 +126,7 @@ function _transformIncomingURIs(obj: any, transformer: IURITransformer, revive: } // walk object (or array) - for (let key in obj) { + for (const key in obj) { if (Object.hasOwnProperty.call(obj, key)) { const r = _transformIncomingURIs(obj[key], transformer, revive, depth + 1); if (r !== null) { diff --git a/src/vs/base/common/worker/simpleWorker.ts b/src/vs/base/common/worker/simpleWorker.ts index 2617e68abfc..17ecac8ff27 100644 --- a/src/vs/base/common/worker/simpleWorker.ts +++ b/src/vs/base/common/worker/simpleWorker.ts @@ -6,8 +6,8 @@ import { transformErrorForSerialization } from 'vs/base/common/errors'; import { Emitter, Event } from 'vs/base/common/event'; import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; +import { getAllMethodNames } from 'vs/base/common/objects'; import { globals, isWeb } from 'vs/base/common/platform'; -import * as types from 'vs/base/common/types'; import * as strings from 'vs/base/common/strings'; const INITIALIZE = '$initialize'; @@ -181,7 +181,7 @@ class SimpleWorkerProtocol { return; } - let reply = this._pendingReplies[replyMessage.seq]; + const reply = this._pendingReplies[replyMessage.seq]; delete this._pendingReplies[replyMessage.seq]; if (replyMessage.err) { @@ -200,8 +200,8 @@ class SimpleWorkerProtocol { } private _handleRequestMessage(requestMessage: RequestMessage): void { - let req = requestMessage.req; - let result = this._handler.handleMessage(requestMessage.method, requestMessage.args); + const req = requestMessage.req; + const result = this._handler.handleMessage(requestMessage.method, requestMessage.args); result.then((r) => { this._send(new ReplyMessage(this._workerId, req, r, undefined)); }, (e) => { @@ -239,7 +239,7 @@ class SimpleWorkerProtocol { } private _send(msg: Message): void { - let transfer: ArrayBuffer[] = []; + const transfer: ArrayBuffer[] = []; if (msg.type === MessageType.Request) { for (let i = 0; i < msg.args.length; i++) { if (msg.args[i] instanceof ArrayBuffer) { @@ -283,9 +283,7 @@ export class SimpleWorkerClient extends Disp (err: any) => { // in Firefox, web workers fail lazily :( // we will reject the proxy - if (lazyProxyReject) { - lazyProxyReject(err); - } + lazyProxyReject?.(err); } )); @@ -334,7 +332,7 @@ export class SimpleWorkerClient extends Disp loaderConfiguration = globals.requirejs.s.contexts._.config; } - const hostMethods = types.getAllMethodNames(host); + const hostMethods = getAllMethodNames(host); // Send initialize message this._onModuleLoaded = this._protocol.sendMessage(INITIALIZE, [ @@ -408,7 +406,7 @@ function createProxyObject( }; }; - let result = {} as T; + const result = {} as T; for (const methodName of methodNames) { if (propertyIsDynamicEvent(methodName)) { (result)[methodName] = createProxyDynamicEvent(methodName); @@ -509,7 +507,7 @@ export class SimpleWorkerServer { if (this._requestHandlerFactory) { // static request handler this._requestHandler = this._requestHandlerFactory(hostProxy); - return Promise.resolve(types.getAllMethodNames(this._requestHandler)); + return Promise.resolve(getAllMethodNames(this._requestHandler)); } if (loaderConfig) { @@ -550,7 +548,7 @@ export class SimpleWorkerServer { return; } - resolve(types.getAllMethodNames(this._requestHandler)); + resolve(getAllMethodNames(this._requestHandler)); }, reject); }); } diff --git a/src/vs/base/node/decoder.ts b/src/vs/base/node/decoder.ts deleted file mode 100644 index 36a3de5175c..00000000000 --- a/src/vs/base/node/decoder.ts +++ /dev/null @@ -1,62 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import * as sd from 'string_decoder'; -import { CharCode } from 'vs/base/common/charCode'; - -/** - * Convenient way to iterate over output line by line. This helper accommodates for the fact that - * a buffer might not end with new lines all the way. - * - * To use: - * - call the write method - * - forEach() over the result to get the lines - */ -export class LineDecoder { - private stringDecoder: sd.StringDecoder; - private remaining: string | null; - - constructor(encoding: BufferEncoding = 'utf8') { - this.stringDecoder = new sd.StringDecoder(encoding); - this.remaining = null; - } - - write(buffer: Buffer): string[] { - const result: string[] = []; - const value = this.remaining - ? this.remaining + this.stringDecoder.write(buffer) - : this.stringDecoder.write(buffer); - - if (value.length < 1) { - return result; - } - let start = 0; - let ch: number; - let idx = start; - while (idx < value.length) { - ch = value.charCodeAt(idx); - if (ch === CharCode.CarriageReturn || ch === CharCode.LineFeed) { - result.push(value.substring(start, idx)); - idx++; - if (idx < value.length) { - const lastChar = ch; - ch = value.charCodeAt(idx); - if ((lastChar === CharCode.CarriageReturn && ch === CharCode.LineFeed) || (lastChar === CharCode.LineFeed && ch === CharCode.CarriageReturn)) { - idx++; - } - } - start = idx; - } else { - idx++; - } - } - this.remaining = start < value.length ? value.substr(start) : null; - return result; - } - - end(): string | null { - return this.remaining; - } -} diff --git a/src/vs/base/node/id.ts b/src/vs/base/node/id.ts index 8739130322f..65bff8cc522 100644 --- a/src/vs/base/node/id.ts +++ b/src/vs/base/node/id.ts @@ -5,7 +5,7 @@ import { networkInterfaces } from 'os'; import * as errors from 'vs/base/common/errors'; -import { TernarySearchTree } from 'vs/base/common/map'; +import { TernarySearchTree } from 'vs/base/common/ternarySearchTree'; import * as uuid from 'vs/base/common/uuid'; import { getMac } from 'vs/base/node/macAddress'; @@ -55,7 +55,7 @@ export const virtualMachineHint: { value(): number } = new class { let interfaceCount = 0; const interfaces = networkInterfaces(); - for (let name in interfaces) { + for (const name in interfaces) { const networkInterface = interfaces[name]; if (networkInterface) { for (const { mac, internal } of networkInterface) { diff --git a/src/vs/base/node/languagePacks.d.ts b/src/vs/base/node/languagePacks.d.ts index 5c69043ef23..87bff5b75a4 100644 --- a/src/vs/base/node/languagePacks.d.ts +++ b/src/vs/base/node/languagePacks.d.ts @@ -21,4 +21,4 @@ export interface InternalNLSConfiguration extends NLSConfiguration { _languagePackSupport?: boolean; } -export function getNLSConfiguration(commit: string, userDataPath: string, metaDataFile: string, locale: string): Promise; +export function getNLSConfiguration(commit: string | undefined, userDataPath: string, metaDataFile: string, locale: string): Promise; diff --git a/src/vs/base/node/languagePacks.js b/src/vs/base/node/languagePacks.js index f99d3808de5..006cd42d707 100644 --- a/src/vs/base/node/languagePacks.js +++ b/src/vs/base/node/languagePacks.js @@ -10,12 +10,11 @@ 'use strict'; /** - * @param {NodeRequire} nodeRequire * @param {typeof import('path')} path * @param {typeof import('fs')} fs * @param {typeof import('../common/performance')} perf */ - function factory(nodeRequire, path, fs, perf) { + function factory(path, fs, perf) { /** * @param {string} file @@ -68,12 +67,12 @@ /** * @param {string} userDataPath - * @returns {object} + * @returns {Promise} */ - function getLanguagePackConfigurations(userDataPath) { + async function getLanguagePackConfigurations(userDataPath) { const configFile = path.join(userDataPath, 'languagepacks.json'); try { - return nodeRequire(configFile); + return JSON.parse(await readFile(configFile)); } catch (err) { // Do nothing. If we can't read the file we have no // language pack config. @@ -83,7 +82,7 @@ /** * @param {object} config - * @param {string} locale + * @param {string | undefined} locale */ function resolveLanguagePackLocale(config, locale) { try { @@ -106,10 +105,10 @@ } /** - * @param {string} commit + * @param {string | undefined} commit * @param {string} userDataPath * @param {string} metaDataFile - * @param {string} locale + * @param {string | undefined} locale */ function getNLSConfiguration(commit, userDataPath, metaDataFile, locale) { if (locale === 'pseudo') { @@ -141,94 +140,95 @@ if (!commit) { return defaultResult(initialLocale); } - const configs = getLanguagePackConfigurations(userDataPath); - if (!configs) { - return defaultResult(initialLocale); - } - locale = resolveLanguagePackLocale(configs, locale); - if (!locale) { - return defaultResult(initialLocale); - } - const packConfig = configs[locale]; - let mainPack; - if (!packConfig || typeof packConfig.hash !== 'string' || !packConfig.translations || typeof (mainPack = packConfig.translations['vscode']) !== 'string') { - return defaultResult(initialLocale); - } - return exists(mainPack).then(fileExists => { - if (!fileExists) { + return getLanguagePackConfigurations(userDataPath).then(configs => { + if (!configs) { return defaultResult(initialLocale); } - const packId = packConfig.hash + '.' + locale; - const cacheRoot = path.join(userDataPath, 'clp', packId); - const coreLocation = path.join(cacheRoot, commit); - const translationsConfigFile = path.join(cacheRoot, 'tcf.json'); - const corruptedFile = path.join(cacheRoot, 'corrupted.info'); - const result = { - locale: initialLocale, - availableLanguages: { '*': locale }, - _languagePackId: packId, - _translationsConfigFile: translationsConfigFile, - _cacheRoot: cacheRoot, - _resolvedLanguagePackCoreLocation: coreLocation, - _corruptedFile: corruptedFile - }; - return exists(corruptedFile).then(corrupted => { - // The nls cache directory is corrupted. - let toDelete; - if (corrupted) { - toDelete = rimraf(cacheRoot); - } else { - toDelete = Promise.resolve(undefined); + locale = resolveLanguagePackLocale(configs, locale); + if (!locale) { + return defaultResult(initialLocale); + } + const packConfig = configs[locale]; + let mainPack; + if (!packConfig || typeof packConfig.hash !== 'string' || !packConfig.translations || typeof (mainPack = packConfig.translations['vscode']) !== 'string') { + return defaultResult(initialLocale); + } + return exists(mainPack).then(fileExists => { + if (!fileExists) { + return defaultResult(initialLocale); } - return toDelete.then(() => { - return exists(coreLocation).then(fileExists => { - if (fileExists) { - // We don't wait for this. No big harm if we can't touch - touch(coreLocation).catch(() => { }); - perf.mark('code/didGenerateNls'); - return result; - } - return mkdirp(coreLocation).then(() => { - return Promise.all([readFile(metaDataFile), readFile(mainPack)]); - }).then(values => { - const metadata = JSON.parse(values[0]); - const packData = JSON.parse(values[1]).contents; - const bundles = Object.keys(metadata.bundles); - const writes = []; - for (const bundle of bundles) { - const modules = metadata.bundles[bundle]; - const target = Object.create(null); - for (const module of modules) { - const keys = metadata.keys[module]; - const defaultMessages = metadata.messages[module]; - const translations = packData[module]; - let targetStrings; - if (translations) { - targetStrings = []; - for (let i = 0; i < keys.length; i++) { - const elem = keys[i]; - const key = typeof elem === 'string' ? elem : elem.key; - let translatedMessage = translations[key]; - if (translatedMessage === undefined) { - translatedMessage = defaultMessages[i]; - } - targetStrings.push(translatedMessage); - } - } else { - targetStrings = defaultMessages; - } - target[module] = targetStrings; - } - writes.push(writeFile(path.join(coreLocation, bundle.replace(/\//g, '!') + '.nls.json'), JSON.stringify(target))); + const packId = packConfig.hash + '.' + locale; + const cacheRoot = path.join(userDataPath, 'clp', packId); + const coreLocation = path.join(cacheRoot, commit); + const translationsConfigFile = path.join(cacheRoot, 'tcf.json'); + const corruptedFile = path.join(cacheRoot, 'corrupted.info'); + const result = { + locale: initialLocale, + availableLanguages: { '*': locale }, + _languagePackId: packId, + _translationsConfigFile: translationsConfigFile, + _cacheRoot: cacheRoot, + _resolvedLanguagePackCoreLocation: coreLocation, + _corruptedFile: corruptedFile + }; + return exists(corruptedFile).then(corrupted => { + // The nls cache directory is corrupted. + let toDelete; + if (corrupted) { + toDelete = rimraf(cacheRoot); + } else { + toDelete = Promise.resolve(undefined); + } + return toDelete.then(() => { + return exists(coreLocation).then(fileExists => { + if (fileExists) { + // We don't wait for this. No big harm if we can't touch + touch(coreLocation).catch(() => { }); + perf.mark('code/didGenerateNls'); + return result; } - writes.push(writeFile(translationsConfigFile, JSON.stringify(packConfig.translations))); - return Promise.all(writes); - }).then(() => { - perf.mark('code/didGenerateNls'); - return result; - }).catch(err => { - console.error('Generating translation files failed.', err); - return defaultResult(locale); + return mkdirp(coreLocation).then(() => { + return Promise.all([readFile(metaDataFile), readFile(mainPack)]); + }).then(values => { + const metadata = JSON.parse(values[0]); + const packData = JSON.parse(values[1]).contents; + const bundles = Object.keys(metadata.bundles); + const writes = []; + for (const bundle of bundles) { + const modules = metadata.bundles[bundle]; + const target = Object.create(null); + for (const module of modules) { + const keys = metadata.keys[module]; + const defaultMessages = metadata.messages[module]; + const translations = packData[module]; + let targetStrings; + if (translations) { + targetStrings = []; + for (let i = 0; i < keys.length; i++) { + const elem = keys[i]; + const key = typeof elem === 'string' ? elem : elem.key; + let translatedMessage = translations[key]; + if (translatedMessage === undefined) { + translatedMessage = defaultMessages[i]; + } + targetStrings.push(translatedMessage); + } + } else { + targetStrings = defaultMessages; + } + target[module] = targetStrings; + } + writes.push(writeFile(path.join(coreLocation, bundle.replace(/\//g, '!') + '.nls.json'), JSON.stringify(target))); + } + writes.push(writeFile(translationsConfigFile, JSON.stringify(packConfig.translations))); + return Promise.all(writes); + }).then(() => { + perf.mark('code/didGenerateNls'); + return result; + }).catch(err => { + console.error('Generating translation files failed.', err); + return defaultResult(locale); + }); }); }); }); @@ -247,12 +247,12 @@ if (typeof define === 'function') { // amd - define(['require', 'path', 'fs', 'vs/base/common/performance'], function (require, /** @type {typeof import('path')} */ path, /** @type {typeof import('fs')} */ fs, /** @type {typeof import('../common/performance')} */ perf) { return factory(require.__$__nodeRequire, path, fs, perf); }); + define(['path', 'fs', 'vs/base/common/performance'], function (/** @type {typeof import('path')} */ path, /** @type {typeof import('fs')} */ fs, /** @type {typeof import('../common/performance')} */ perf) { return factory(path, fs, perf); }); } else if (typeof module === 'object' && typeof module.exports === 'object') { const path = require('path'); const fs = require('fs'); const perf = require('../common/performance'); - module.exports = factory(require, path, fs, perf); + module.exports = factory(path, fs, perf); } else { throw new Error('Unknown context'); } diff --git a/src/vs/base/node/macAddress.ts b/src/vs/base/node/macAddress.ts index a593f6df3b6..dc70ef2cbaa 100644 --- a/src/vs/base/node/macAddress.ts +++ b/src/vs/base/node/macAddress.ts @@ -18,7 +18,7 @@ function validateMacAddress(candidate: string): boolean { export function getMac(): string { const ifaces = networkInterfaces(); - for (let name in ifaces) { + for (const name in ifaces) { const networkInterface = ifaces[name]; if (networkInterface) { for (const { mac } of networkInterface) { diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts index 2283c4a61d6..28e6ca7e887 100644 --- a/src/vs/base/node/pfs.ts +++ b/src/vs/base/node/pfs.ts @@ -66,7 +66,11 @@ async function rimrafMove(path: string): Promise { // https://github.com/microsoft/vscode/issues/139908 await fs.promises.rename(path, pathInTemp); } catch (error) { - return rimrafUnlink(path); // if rename fails, delete without tmp dir + if (error.code === 'ENOENT') { + return; // ignore - path to delete did not exist + } + + return rimrafUnlink(path); // otherwise fallback to unlink } // Delete but do not return as promise @@ -390,6 +394,9 @@ interface IEnsuredWriteFileOptions extends IWriteFileOptions { } let canFlush = true; +export function configureFlushOnWrite(enabled: boolean): void { + canFlush = enabled; +} // Calls fs.writeFile() followed by a fs.sync() call to flush the changes to disk // We do this in cases where we want to make sure the data is really on disk and @@ -421,7 +428,7 @@ function doWriteFileAndFlush(path: string, data: string | Buffer | Uint8Array, o // In that case we disable flushing and warn to the console if (syncError) { console.warn('[node.js fs] fdatasync is now disabled for this session because it failed: ', syncError); - canFlush = false; + configureFlushOnWrite(false); } return fs.close(fd, closeError => callback(closeError)); @@ -455,7 +462,7 @@ export function writeFileSync(path: string, data: string | Buffer, options?: IWr fs.fdatasyncSync(fd); // https://github.com/microsoft/vscode/issues/9589 } catch (syncError) { console.warn('[node.js fs] fdatasyncSync is now disabled for this session because it failed: ', syncError); - canFlush = false; + configureFlushOnWrite(false); } } finally { fs.closeSync(fd); diff --git a/src/vs/base/node/ports.ts b/src/vs/base/node/ports.ts index 288ff34c710..d7f42c6d637 100644 --- a/src/vs/base/node/ports.ts +++ b/src/vs/base/node/ports.ts @@ -150,7 +150,7 @@ export const BROWSER_RESTRICTED_PORTS: any = { /** * Uses listen instead of connect. Is faster, but if there is another listener on 0.0.0.0 then this will take 127.0.0.1 from that listener. */ -export function findFreePortFaster(startPort: number, giveUpAfter: number, timeout: number): Promise { +export function findFreePortFaster(startPort: number, giveUpAfter: number, timeout: number, hostname: string = '127.0.0.1'): Promise { let resolved: boolean = false; let timeoutHandle: NodeJS.Timeout | undefined = undefined; let countTried: number = 1; @@ -178,7 +178,7 @@ export function findFreePortFaster(startPort: number, giveUpAfter: number, timeo if (err && ((err).code === 'EADDRINUSE' || (err).code === 'EACCES') && (countTried < giveUpAfter)) { startPort++; countTried++; - server.listen(startPort, '127.0.0.1'); + server.listen(startPort, hostname); } else { doResolve(0, resolve); } @@ -186,7 +186,7 @@ export function findFreePortFaster(startPort: number, giveUpAfter: number, timeo server.on('close', () => { doResolve(0, resolve); }); - server.listen(startPort, '127.0.0.1'); + server.listen(startPort, hostname); }); } diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts index c751a692473..a71a7b8cb4e 100644 --- a/src/vs/base/node/processes.ts +++ b/src/vs/base/node/processes.ts @@ -5,392 +5,23 @@ import * as cp from 'child_process'; import { Stats } from 'fs'; -import { IStringDictionary } from 'vs/base/common/collections'; -import * as extpath from 'vs/base/common/extpath'; -import { FileAccess } from 'vs/base/common/network'; -import * as Objects from 'vs/base/common/objects'; import * as path from 'vs/base/common/path'; import * as Platform from 'vs/base/common/platform'; import * as process from 'vs/base/common/process'; -import { CommandOptions, Executable, ForkOptions, Source, SuccessData, TerminateResponse, TerminateResponseCode } from 'vs/base/common/processes'; +import { CommandOptions, ForkOptions, Source, SuccessData, TerminateResponse, TerminateResponseCode } from 'vs/base/common/processes'; import * as Types from 'vs/base/common/types'; -import { LineDecoder } from 'vs/base/node/decoder'; import * as pfs from 'vs/base/node/pfs'; -import * as nls from 'vs/nls'; export { CommandOptions, ForkOptions, SuccessData, Source, TerminateResponse, TerminateResponseCode }; export type ValueCallback = (value: T | Promise) => void; export type ErrorCallback = (error?: any) => void; export type ProgressCallback = (progress: T) => void; -export interface LineData { - line: string; - source: Source; -} - -function getWindowsCode(status: number): TerminateResponseCode { - switch (status) { - case 0: - return TerminateResponseCode.Success; - case 1: - return TerminateResponseCode.AccessDenied; - case 128: - return TerminateResponseCode.ProcessNotFound; - default: - return TerminateResponseCode.Unknown; - } -} - -function terminateProcess(process: cp.ChildProcess, cwd?: string): Promise { - if (Platform.isWindows) { - try { - const options: any = { - stdio: ['pipe', 'pipe', 'ignore'] - }; - if (cwd) { - options.cwd = cwd; - } - const killProcess = cp.execFile('taskkill', ['/T', '/F', '/PID', process.pid!.toString()], options); - return new Promise(resolve => { - killProcess.once('error', (err) => { - resolve({ success: false, error: err }); - }); - killProcess.once('exit', (code, signal) => { - if (code === 0) { - resolve({ success: true }); - } else { - resolve({ success: false, code: code !== null ? code : TerminateResponseCode.Unknown }); - } - }); - }); - } catch (err) { - return Promise.resolve({ success: false, error: err, code: err.status ? getWindowsCode(err.status) : TerminateResponseCode.Unknown }); - } - } else if (Platform.isLinux || Platform.isMacintosh) { - try { - const cmd = FileAccess.asFileUri('vs/base/node/terminateProcess.sh', require).fsPath; - return new Promise(resolve => { - cp.execFile(cmd, [process.pid!.toString()], { encoding: 'utf8', shell: true } as cp.ExecFileOptions, (err, stdout, stderr) => { - if (err) { - resolve({ success: false, error: err }); - } else { - resolve({ success: true }); - } - }); - }); - } catch (err) { - return Promise.resolve({ success: false, error: err }); - } - } else { - process.kill('SIGKILL'); - } - return Promise.resolve({ success: true }); -} export function getWindowsShell(env = process.env as Platform.IProcessEnvironment): string { return env['comspec'] || 'cmd.exe'; } -export abstract class AbstractProcess { - private cmd: string; - private args: string[]; - private options: CommandOptions | ForkOptions; - protected shell: boolean; - - private childProcess: cp.ChildProcess | null; - protected childProcessPromise: Promise | null; - private pidResolve: ValueCallback | undefined; - protected terminateRequested: boolean; - - private static WellKnowCommands: IStringDictionary = { - 'ant': true, - 'cmake': true, - 'eslint': true, - 'gradle': true, - 'grunt': true, - 'gulp': true, - 'jake': true, - 'jenkins': true, - 'jshint': true, - 'make': true, - 'maven': true, - 'msbuild': true, - 'msc': true, - 'nmake': true, - 'npm': true, - 'rake': true, - 'tsc': true, - 'xbuild': true - }; - - public constructor(executable: Executable); - public constructor(cmd: string, args: string[] | undefined, shell: boolean, options: CommandOptions | undefined); - public constructor(arg1: string | Executable, arg2?: string[], arg3?: boolean, arg4?: CommandOptions) { - if (arg2 !== undefined && arg3 !== undefined && arg4 !== undefined) { - this.cmd = arg1; - this.args = arg2; - this.shell = arg3; - this.options = arg4; - } else { - const executable = arg1; - this.cmd = executable.command; - this.shell = executable.isShellCommand; - this.args = executable.args.slice(0); - this.options = executable.options || {}; - } - - this.childProcess = null; - this.childProcessPromise = null; - this.terminateRequested = false; - - if (this.options.env) { - const newEnv: IStringDictionary = Object.create(null); - Object.keys(process.env).forEach((key) => { - newEnv[key] = process.env[key]!; - }); - Object.keys(this.options.env).forEach((key) => { - newEnv[key] = this.options.env![key]!; - }); - this.options.env = newEnv; - } - } - - public getSanitizedCommand(): string { - let result = this.cmd.toLowerCase(); - const index = result.lastIndexOf(path.sep); - if (index !== -1) { - result = result.substring(index + 1); - } - if (AbstractProcess.WellKnowCommands[result]) { - return result; - } - return 'other'; - } - - public start(pp: ProgressCallback): Promise { - if (Platform.isWindows && ((this.options && this.options.cwd && extpath.isUNC(this.options.cwd)) || !this.options && extpath.isUNC(process.cwd()))) { - return Promise.reject(new Error(nls.localize('TaskRunner.UNC', 'Can\'t execute a shell command on a UNC drive.'))); - } - return this.useExec().then((useExec) => { - let cc: ValueCallback; - let ee: ErrorCallback; - const result = new Promise((c, e) => { - cc = c; - ee = e; - }); - - if (useExec) { - let cmd: string = this.cmd; - if (this.args) { - cmd = cmd + ' ' + this.args.join(' '); - } - this.childProcess = cp.exec(cmd, this.options, (error, stdout, stderr) => { - this.childProcess = null; - const err: any = error; - // This is tricky since executing a command shell reports error back in case the executed command return an - // error or the command didn't exist at all. So we can't blindly treat an error as a failed command. So we - // always parse the output and report success unless the job got killed. - if (err && err.killed) { - ee({ killed: this.terminateRequested, stdout: stdout.toString(), stderr: stderr.toString() }); - } else { - this.handleExec(cc, pp, error, stdout as any, stderr as any); - } - }); - } else { - let childProcess: cp.ChildProcess | null = null; - const closeHandler = (data: any) => { - this.childProcess = null; - this.childProcessPromise = null; - this.handleClose(data, cc, pp, ee); - const result: SuccessData = { - terminated: this.terminateRequested - }; - if (Types.isNumber(data)) { - result.cmdCode = data; - } - cc(result); - }; - if (this.shell && Platform.isWindows) { - const options: any = Objects.deepClone(this.options); - options.windowsVerbatimArguments = true; - options.detached = false; - let quotedCommand: boolean = false; - let quotedArg: boolean = false; - const commandLine: string[] = []; - let quoted = this.ensureQuotes(this.cmd); - commandLine.push(quoted.value); - quotedCommand = quoted.quoted; - if (this.args) { - this.args.forEach((elem) => { - quoted = this.ensureQuotes(elem); - commandLine.push(quoted.value); - quotedArg = quotedArg && quoted.quoted; - }); - } - const args: string[] = [ - '/s', - '/c', - ]; - if (quotedCommand) { - if (quotedArg) { - args.push('"' + commandLine.join(' ') + '"'); - } else if (commandLine.length > 1) { - args.push('"' + commandLine[0] + '"' + ' ' + commandLine.slice(1).join(' ')); - } else { - args.push('"' + commandLine[0] + '"'); - } - } else { - args.push(commandLine.join(' ')); - } - childProcess = cp.spawn(getWindowsShell(), args, options); - } else { - if (this.cmd) { - childProcess = cp.spawn(this.cmd, this.args, this.options); - } - } - if (childProcess) { - this.childProcess = childProcess; - this.childProcessPromise = Promise.resolve(childProcess); - if (this.pidResolve) { - this.pidResolve(Types.isNumber(childProcess.pid) ? childProcess.pid : -1); - this.pidResolve = undefined; - } - childProcess.on('error', (error: Error) => { - this.childProcess = null; - ee({ terminated: this.terminateRequested, error: error }); - }); - if (childProcess.pid) { - this.childProcess.on('close', closeHandler); - this.handleSpawn(childProcess, cc!, pp, ee!, true); - } - } - } - return result; - }); - } - - protected abstract handleExec(cc: ValueCallback, pp: ProgressCallback, error: Error | null, stdout: Buffer, stderr: Buffer): void; - protected abstract handleSpawn(childProcess: cp.ChildProcess, cc: ValueCallback, pp: ProgressCallback, ee: ErrorCallback, sync: boolean): void; - - protected handleClose(data: any, cc: ValueCallback, pp: ProgressCallback, ee: ErrorCallback): void { - // Default is to do nothing. - } - - private static readonly regexp = /^[^"].* .*[^"]/; - private ensureQuotes(value: string) { - if (AbstractProcess.regexp.test(value)) { - return { - value: '"' + value + '"', //`"${value}"`, - quoted: true - }; - } else { - return { - value: value, - quoted: value.length > 0 && value[0] === '"' && value[value.length - 1] === '"' - }; - } - } - - public get pid(): Promise { - if (this.childProcessPromise) { - return this.childProcessPromise.then(childProcess => childProcess.pid!, err => -1); - } else { - return new Promise((resolve) => { - this.pidResolve = resolve; - }); - } - } - - public terminate(): Promise { - if (!this.childProcessPromise) { - return Promise.resolve({ success: true }); - } - return this.childProcessPromise.then((childProcess) => { - this.terminateRequested = true; - return terminateProcess(childProcess, this.options.cwd).then(response => { - if (response.success) { - this.childProcess = null; - } - return response; - }); - }, (err) => { - return { success: true }; - }); - } - - private useExec(): Promise { - return new Promise(resolve => { - if (!this.shell || !Platform.isWindows) { - return resolve(false); - } - const cmdShell = cp.spawn(getWindowsShell(), ['/s', '/c']); - cmdShell.on('error', (error: Error) => { - return resolve(true); - }); - cmdShell.on('exit', (data: any) => { - return resolve(false); - }); - }); - } -} - -export class LineProcess extends AbstractProcess { - - private stdoutLineDecoder: LineDecoder | null; - private stderrLineDecoder: LineDecoder | null; - - public constructor(executable: Executable); - public constructor(cmd: string, args: string[], shell: boolean, options: CommandOptions); - public constructor(arg1: string | Executable, arg2?: string[], arg3?: boolean | ForkOptions, arg4?: CommandOptions) { - super(arg1, arg2, arg3, arg4); - - this.stdoutLineDecoder = null; - this.stderrLineDecoder = null; - } - - protected handleExec(cc: ValueCallback, pp: ProgressCallback, error: Error, stdout: Buffer, stderr: Buffer) { - [stdout, stderr].forEach((buffer: Buffer, index: number) => { - const lineDecoder = new LineDecoder(); - const lines = lineDecoder.write(buffer); - lines.forEach((line) => { - pp({ line: line, source: index === 0 ? Source.stdout : Source.stderr }); - }); - const line = lineDecoder.end(); - if (line) { - pp({ line: line, source: index === 0 ? Source.stdout : Source.stderr }); - } - }); - cc({ terminated: this.terminateRequested, error: error }); - } - - protected handleSpawn(childProcess: cp.ChildProcess, cc: ValueCallback, pp: ProgressCallback, ee: ErrorCallback, sync: boolean): void { - const stdoutLineDecoder = new LineDecoder(); - const stderrLineDecoder = new LineDecoder(); - childProcess.stdout!.on('data', (data: Buffer) => { - const lines = stdoutLineDecoder.write(data); - lines.forEach(line => pp({ line: line, source: Source.stdout })); - }); - childProcess.stderr!.on('data', (data: Buffer) => { - const lines = stderrLineDecoder.write(data); - lines.forEach(line => pp({ line: line, source: Source.stderr })); - }); - - this.stdoutLineDecoder = stdoutLineDecoder; - this.stderrLineDecoder = stderrLineDecoder; - } - - protected override handleClose(data: any, cc: ValueCallback, pp: ProgressCallback, ee: ErrorCallback): void { - const stdoutLine = this.stdoutLineDecoder ? this.stdoutLineDecoder.end() : null; - if (stdoutLine) { - pp({ line: stdoutLine, source: Source.stdout }); - } - const stderrLine = this.stderrLineDecoder ? this.stderrLineDecoder.end() : null; - if (stderrLine) { - pp({ line: stderrLine, source: Source.stderr }); - } - } -} - export interface IQueuedSender { send: (msg: any) => void; } @@ -474,7 +105,7 @@ export namespace win32 { // We have a simple file name. We get the path variable from the env // and try to find the executable on the path. - for (let pathEntry of paths) { + for (const pathEntry of paths) { // The path entry is absolute. let fullPath: string; if (path.isAbsolute(pathEntry)) { diff --git a/src/vs/base/node/ps.ts b/src/vs/base/node/ps.ts index 4eded868127..8498145bed2 100644 --- a/src/vs/base/node/ps.ts +++ b/src/vs/base/node/ps.ts @@ -52,6 +52,7 @@ export function listProcesses(rootPid: number): Promise { const ISSUE_REPORTER_HINT = /--vscode-window-kind=issue-reporter/; const PROCESS_EXPLORER_HINT = /--vscode-window-kind=process-explorer/; const UTILITY_NETWORK_HINT = /--utility-sub-type=network/; + const UTILITY_EXTENSION_HOST_HINT = /--utility-sub-type=node.mojom.NodeService/; const WINDOWS_CRASH_REPORTER = /--crashes-directory/; const WINDOWS_PTY = /\\pipe\\winpty-control/; const WINDOWS_CONSOLE_HOST = /conhost\.exe/; @@ -93,6 +94,10 @@ export function listProcesses(rootPid: number): Promise { if (UTILITY_NETWORK_HINT.exec(cmd)) { return 'utility-network-service'; } + + if (UTILITY_EXTENSION_HOST_HINT.exec(cmd)) { + return 'extension-host'; + } } return matches[1]; } diff --git a/src/vs/base/node/zip.ts b/src/vs/base/node/zip.ts index c815e61861a..2033f7cd98e 100644 --- a/src/vs/base/node/zip.ts +++ b/src/vs/base/node/zip.ts @@ -81,9 +81,7 @@ function extractEntry(stream: Readable, fileName: string, mode: number, targetPa let istream: WriteStream; token.onCancellationRequested(() => { - if (istream) { - istream.destroy(); - } + istream?.destroy(); }); return Promise.resolve(Promises.mkdir(targetDirName, { recursive: true })).then(() => new Promise((c, e) => { diff --git a/src/vs/base/parts/contextmenu/electron-sandbox/contextmenu.ts b/src/vs/base/parts/contextmenu/electron-sandbox/contextmenu.ts index 7c058d45990..74ca18173c0 100644 --- a/src/vs/base/parts/contextmenu/electron-sandbox/contextmenu.ts +++ b/src/vs/base/parts/contextmenu/electron-sandbox/contextmenu.ts @@ -15,9 +15,7 @@ export function popup(items: IContextMenuItem[], options?: IPopupOptions, onHide const onClickChannel = `vscode:onContextMenu${contextMenuId}`; const onClickChannelHandler = (event: unknown, itemId: number, context: IContextMenuEvent) => { const item = processedItems[itemId]; - if (item.click) { - item.click(context); - } + item.click?.(context); }; ipcRenderer.once(onClickChannel, onClickChannelHandler); @@ -28,9 +26,7 @@ export function popup(items: IContextMenuItem[], options?: IPopupOptions, onHide ipcRenderer.removeListener(onClickChannel, onClickChannelHandler); - if (onHide) { - onHide(); - } + onHide?.(); }); ipcRenderer.send(CONTEXT_MENU_CHANNEL, contextMenuId, items.map(item => createItem(item, processedItems)), onClickChannel, options); diff --git a/src/vs/base/parts/ipc/common/ipc.net.ts b/src/vs/base/parts/ipc/common/ipc.net.ts index e4fb1c634fb..fc0a55f8d48 100644 --- a/src/vs/base/parts/ipc/common/ipc.net.ts +++ b/src/vs/base/parts/ipc/common/ipc.net.ts @@ -136,6 +136,12 @@ export interface WebSocketCloseEvent { export type SocketCloseEvent = NodeSocketCloseEvent | WebSocketCloseEvent | undefined; +export interface SocketTimeoutEvent { + readonly unacknowledgedMsgCount: number; + readonly timeSinceOldestUnacknowledgedMsg: number; + readonly timeSinceLastReceivedSomeData: number; +} + export interface ISocket extends IDisposable { onData(listener: (e: VSBuffer) => void): IDisposable; onClose(listener: (e: SocketCloseEvent) => void): IDisposable; @@ -212,7 +218,7 @@ export class ChunkStream { return result; } - let result = VSBuffer.alloc(byteCount); + const result = VSBuffer.alloc(byteCount); let resultOffset = 0; let chunkIndex = 0; while (byteCount > 0) { @@ -256,7 +262,8 @@ const enum ProtocolMessageType { Disconnect = 5, ReplayRequest = 6, Pause = 7, - Resume = 8 + Resume = 8, + KeepAlive = 9, } function protocolMessageTypeToString(messageType: ProtocolMessageType) { @@ -269,6 +276,7 @@ function protocolMessageTypeToString(messageType: ProtocolMessageType) { case ProtocolMessageType.ReplayRequest: return 'ReplayRequest'; case ProtocolMessageType.Pause: return 'PauseWriting'; case ProtocolMessageType.Resume: return 'ResumeWriting'; + case ProtocolMessageType.KeepAlive: return 'KeepAlive'; } } @@ -667,6 +675,16 @@ class Queue { this._last = null; } + public length(): number { + let result = 0; + let current = this._first; + while (current) { + current = current.next; + result++; + } + return result; + } + public peek(): T | null { if (!this._first) { return null; @@ -675,7 +693,8 @@ class Queue { } public toArray(): T[] { - let result: T[] = [], resultLen = 0; + const result: T[] = []; + let resultLen = 0; let it = this._first; while (it) { result[resultLen++] = it.data; @@ -777,6 +796,8 @@ export class PersistentProtocol implements IMessagePassingProtocol { private _incomingMsgLastTime: number; private _incomingAckTimeout: any | null; + private _keepAliveInterval: any | null; + private _lastReplayRequestTime: number; private _lastSocketTimeoutTime: number; @@ -799,8 +820,8 @@ export class PersistentProtocol implements IMessagePassingProtocol { private readonly _onSocketClose = new BufferedEmitter(); readonly onSocketClose: Event = this._onSocketClose.event; - private readonly _onSocketTimeout = new BufferedEmitter(); - readonly onSocketTimeout: Event = this._onSocketTimeout.event; + private readonly _onSocketTimeout = new BufferedEmitter(); + readonly onSocketTimeout: Event = this._onSocketTimeout.event; public get unacknowledgedCount(): number { return this._outgoingMsgId - this._outgoingAckId; @@ -833,6 +854,11 @@ export class PersistentProtocol implements IMessagePassingProtocol { if (initialChunk) { this._socketReader.acceptChunk(initialChunk); } + + // send a message every 5s + this._keepAliveInterval = setInterval(() => { + this._sendKeepAlive(); + }, 5000); } dispose(): void { @@ -844,6 +870,10 @@ export class PersistentProtocol implements IMessagePassingProtocol { clearTimeout(this._incomingAckTimeout); this._incomingAckTimeout = null; } + if (this._keepAliveInterval) { + clearInterval(this._keepAliveInterval); + this._keepAliveInterval = null; + } this._socketDisposables = dispose(this._socketDisposables); } @@ -965,7 +995,7 @@ export class PersistentProtocol implements IMessagePassingProtocol { break; } case ProtocolMessageType.Ack: { - // nothing to do + // nothing to do, .ack is handled above already break; } case ProtocolMessageType.Disconnect: { @@ -989,6 +1019,10 @@ export class PersistentProtocol implements IMessagePassingProtocol { this._socketWriter.resume(); break; } + case ProtocolMessageType.KeepAlive: { + // nothing to do + break; + } } } @@ -1080,7 +1114,11 @@ export class PersistentProtocol implements IMessagePassingProtocol { if (!this._loadEstimator.hasHighLoad()) { // Trash the socket this._lastSocketTimeoutTime = Date.now(); - this._onSocketTimeout.fire(undefined); + this._onSocketTimeout.fire({ + unacknowledgedMsgCount: this._outgoingUnackMsg.length(), + timeSinceOldestUnacknowledgedMsg, + timeSinceLastReceivedSomeData + }); return; } } @@ -1108,6 +1146,11 @@ export class PersistentProtocol implements IMessagePassingProtocol { const msg = new ProtocolMessage(ProtocolMessageType.Ack, 0, this._incomingAckId, getEmptyBuffer()); this._socketWriter.write(msg); } + + private _sendKeepAlive(): void { + const msg = new ProtocolMessage(ProtocolMessageType.KeepAlive, 0, 0, getEmptyBuffer()); + this._socketWriter.write(msg); + } } // (() => { diff --git a/src/vs/base/parts/ipc/common/ipc.ts b/src/vs/base/parts/ipc/common/ipc.ts index 7f607bd1360..10a880d9add 100644 --- a/src/vs/base/parts/ipc/common/ipc.ts +++ b/src/vs/base/parts/ipc/common/ipc.ts @@ -8,7 +8,7 @@ import { CancelablePromise, createCancelablePromise, timeout } from 'vs/base/com import { VSBuffer } from 'vs/base/common/buffer'; import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation'; import { memoize } from 'vs/base/common/decorators'; -import * as errors from 'vs/base/common/errors'; +import { CancellationError } from 'vs/base/common/errors'; import { Emitter, Event, EventMultiplexer, Relay } from 'vs/base/common/event'; import { combinedDisposable, DisposableStore, dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { revive } from 'vs/base/common/marshalling'; @@ -516,7 +516,7 @@ export class ChannelClient implements IChannelClient, IDisposable { return { call(command: string, arg?: any, cancellationToken?: CancellationToken) { if (that.isDisposed) { - return Promise.reject(errors.canceled()); + return Promise.reject(new CancellationError()); } return that.requestPromise(channelName, command, arg, cancellationToken); }, @@ -535,14 +535,14 @@ export class ChannelClient implements IChannelClient, IDisposable { const request: IRawRequest = { id, type, channelName, name, arg }; if (cancellationToken.isCancellationRequested) { - return Promise.reject(errors.canceled()); + return Promise.reject(new CancellationError()); } let disposable: IDisposable; const result = new Promise((c, e) => { if (cancellationToken.isCancellationRequested) { - return e(errors.canceled()); + return e(new CancellationError()); } const doRequest = () => { @@ -556,7 +556,7 @@ export class ChannelClient implements IChannelClient, IDisposable { case ResponseType.PromiseError: { this.handlers.delete(id); const error = new Error(response.data.message); - (error).stack = response.data.stack; + (error).stack = Array.isArray(response.data.stack) ? response.data.stack.join('\n') : response.data.stack; error.name = response.data.name; e(error); break; @@ -591,7 +591,7 @@ export class ChannelClient implements IChannelClient, IDisposable { this.sendRequest({ id, type: RequestType.PromiseCancel }); } - e(errors.canceled()); + e(new CancellationError()); }; const cancellationTokenListener = cancellationToken.onCancellationRequested(cancel); @@ -640,18 +640,14 @@ export class ChannelClient implements IChannelClient, IDisposable { case RequestType.Promise: case RequestType.EventListen: { const msgLength = this.send([request.type, request.id, request.channelName, request.name], request.arg); - if (this.logger) { - this.logger.logOutgoing(msgLength, request.id, RequestInitiator.LocalSide, `${requestTypeToStr(request.type)}: ${request.channelName}.${request.name}`, request.arg); - } + this.logger?.logOutgoing(msgLength, request.id, RequestInitiator.LocalSide, `${requestTypeToStr(request.type)}: ${request.channelName}.${request.name}`, request.arg); return; } case RequestType.PromiseCancel: case RequestType.EventDispose: { const msgLength = this.send([request.type, request.id]); - if (this.logger) { - this.logger.logOutgoing(msgLength, request.id, RequestInitiator.LocalSide, requestTypeToStr(request.type)); - } + this.logger?.logOutgoing(msgLength, request.id, RequestInitiator.LocalSide, requestTypeToStr(request.type)); return; } } @@ -682,18 +678,14 @@ export class ChannelClient implements IChannelClient, IDisposable { switch (type) { case ResponseType.Initialize: - if (this.logger) { - this.logger.logIncoming(message.byteLength, 0, RequestInitiator.LocalSide, responseTypeToStr(type)); - } + this.logger?.logIncoming(message.byteLength, 0, RequestInitiator.LocalSide, responseTypeToStr(type)); return this.onResponse({ type: header[0] }); case ResponseType.PromiseSuccess: case ResponseType.PromiseError: case ResponseType.EventFire: case ResponseType.PromiseErrorObj: - if (this.logger) { - this.logger.logIncoming(message.byteLength, header[1], RequestInitiator.LocalSide, responseTypeToStr(type), body); - } + this.logger?.logIncoming(message.byteLength, header[1], RequestInitiator.LocalSide, responseTypeToStr(type), body); return this.onResponse({ type: header[0], id: header[1], data: body }); } } @@ -707,9 +699,7 @@ export class ChannelClient implements IChannelClient, IDisposable { const handler = this.handlers.get(response.id); - if (handler) { - handler(response); - } + handler?.(response); } @memoize @@ -816,7 +806,7 @@ export class IPCServer implements IChannelServer, I if (isFunction(routerOrClientFilter)) { // when no router is provided, we go random client picking - let connection = getRandomElement(that.connections.filter(routerOrClientFilter)); + const connection = getRandomElement(that.connections.filter(routerOrClientFilter)); connectionPromise = connection // if we found a client, let's call on it @@ -1181,7 +1171,7 @@ function prettyWithoutArrays(data: any): any { return data; } if (data && typeof data === 'object' && typeof data.toString === 'function') { - let result = data.toString(); + const result = data.toString(); if (result !== '[object Object]') { return result; } diff --git a/src/vs/base/parts/ipc/electron-main/ipc.electron.ts b/src/vs/base/parts/ipc/electron-main/ipc.electron.ts index f0d395c4bfa..b40d381cffb 100644 --- a/src/vs/base/parts/ipc/electron-main/ipc.electron.ts +++ b/src/vs/base/parts/ipc/electron-main/ipc.electron.ts @@ -37,9 +37,7 @@ export class Server extends IPCServer { const id = webContents.id; const client = Server.Clients.get(id); - if (client) { - client.dispose(); - } + client?.dispose(); const onDidClientReconnect = new Emitter(); Server.Clients.set(id, toDisposable(() => onDidClientReconnect.fire())); diff --git a/src/vs/base/parts/ipc/node/ipc.cp.ts b/src/vs/base/parts/ipc/node/ipc.cp.ts index bc8c91530aa..90595976349 100644 --- a/src/vs/base/parts/ipc/node/ipc.cp.ts +++ b/src/vs/base/parts/ipc/node/ipc.cp.ts @@ -26,9 +26,7 @@ export class Server extends IPCServer { super({ send: r => { try { - if (process.send) { - process.send((r.buffer).toString('base64')); - } + process.send?.((r.buffer).toString('base64')); } catch (e) { /* not much to do */ } }, onMessage: Event.fromNodeEventEmitter(process, 'message', msg => VSBuffer.wrap(Buffer.from(msg, 'base64'))) @@ -243,9 +241,7 @@ export class Client implements IChannelClient, IDisposable { console.warn('IPC "' + this.options.serverName + '" crashed with exit code ' + code + ' and signal ' + signal); } - if (this.disposeDelayer) { - this.disposeDelayer.cancel(); - } + this.disposeDelayer?.cancel(); this.disposeClient(); this._onDidProcessExit.fire({ code, signal }); }); diff --git a/src/vs/base/parts/ipc/node/ipc.net.ts b/src/vs/base/parts/ipc/node/ipc.net.ts index fb7e757bdca..810ba41d106 100644 --- a/src/vs/base/parts/ipc/node/ipc.net.ts +++ b/src/vs/base/parts/ipc/node/ipc.net.ts @@ -3,9 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { createHash } from 'crypto'; -import { createConnection, createServer, Server as NetServer, Socket } from 'net'; -import { tmpdir } from 'os'; +// import { createHash } from 'crypto'; +import type { Server as NetServer, Socket } from 'net'; +// import { tmpdir } from 'os'; +import type * as zlib from 'zlib'; import { VSBuffer } from 'vs/base/common/buffer'; import { onUnexpectedError } from 'vs/base/common/errors'; import { Emitter, Event } from 'vs/base/common/event'; @@ -15,13 +16,25 @@ import { Platform, platform } from 'vs/base/common/platform'; import { generateUuid } from 'vs/base/common/uuid'; import { ClientConnectionEvent, IPCServer } from 'vs/base/parts/ipc/common/ipc'; import { ChunkStream, Client, ISocket, Protocol, SocketCloseEvent, SocketCloseEventType, SocketDiagnostics, SocketDiagnosticsEventType } from 'vs/base/parts/ipc/common/ipc.net'; -import * as zlib from 'zlib'; + +// TODO@bpasero remove me once electron utility process has landed +function getNodeDependencies() { + return { + crypto: (require.__$__nodeRequire('crypto') as any) as typeof import('crypto'), + zlib: (require.__$__nodeRequire('zlib') as any) as typeof import('zlib'), + net: (require.__$__nodeRequire('net') as any) as typeof import('net'), + os: (require.__$__nodeRequire('os') as any) as typeof import('os') + }; +} export class NodeSocket implements ISocket { public readonly debugLabel: string; public readonly socket: Socket; private readonly _errorListener: (err: any) => void; + private readonly _closeListener: (hadError: boolean) => void; + private readonly _endListener: () => void; + private _canWrite = true; public traceSocketEvent(type: SocketDiagnosticsEventType, data?: VSBuffer | Uint8Array | ArrayBuffer | ArrayBufferView | any): void { SocketDiagnostics.traceSocketEvent(this.socket, this.debugLabel, type, data); @@ -47,10 +60,24 @@ export class NodeSocket implements ISocket { } }; this.socket.on('error', this._errorListener); + + this._closeListener = (hadError: boolean) => { + this.traceSocketEvent(SocketDiagnosticsEventType.Close, { hadError }); + this._canWrite = false; + }; + this.socket.on('close', this._closeListener); + + this._endListener = () => { + this.traceSocketEvent(SocketDiagnosticsEventType.NodeEndReceived); + this._canWrite = false; + }; + this.socket.on('end', this._endListener); } public dispose(): void { this.socket.off('error', this._errorListener); + this.socket.off('close', this._closeListener); + this.socket.off('end', this._endListener); this.socket.destroy(); } @@ -67,7 +94,6 @@ export class NodeSocket implements ISocket { public onClose(listener: (e: SocketCloseEvent) => void): IDisposable { const adapter = (hadError: boolean) => { - this.traceSocketEvent(SocketDiagnosticsEventType.Close, { hadError }); listener({ type: SocketCloseEventType.NodeSocketCloseEvent, hadError: hadError, @@ -82,7 +108,6 @@ export class NodeSocket implements ISocket { public onEnd(listener: () => void): IDisposable { const adapter = () => { - this.traceSocketEvent(SocketDiagnosticsEventType.NodeEndReceived); listener(); }; this.socket.on('end', adapter); @@ -93,7 +118,7 @@ export class NodeSocket implements ISocket { public write(buffer: VSBuffer): void { // return early if socket has been destroyed in the meantime - if (this.socket.destroyed) { + if (this.socket.destroyed || !this._canWrite) { return; } @@ -580,7 +605,7 @@ class ZlibInflateStream extends Disposable { options: zlib.ZlibOptions ) { super(); - this._zlibInflate = zlib.createInflateRaw(options); + this._zlibInflate = getNodeDependencies().zlib.createInflateRaw(options); this._zlibInflate.on('error', (err) => { this._tracer.traceSocketEvent(SocketDiagnosticsEventType.zlibInflateError, { message: err?.message, code: (err)?.code }); this._onError.fire(err); @@ -631,7 +656,7 @@ class ZlibDeflateStream extends Disposable { ) { super(); - this._zlibDeflate = zlib.createDeflateRaw({ + this._zlibDeflate = getNodeDependencies().zlib.createDeflateRaw({ windowBits: 15 }); this._zlibDeflate.on('error', (err) => { @@ -669,13 +694,13 @@ function unmask(buffer: VSBuffer, mask: number): void { if (mask === 0) { return; } - let cnt = buffer.byteLength >>> 2; + const cnt = buffer.byteLength >>> 2; for (let i = 0; i < cnt; i++) { const v = buffer.readUInt32BE(i * 4); buffer.writeUInt32BE(v ^ mask, i * 4); } - let offset = cnt * 4; - let bytesLeft = buffer.byteLength - offset; + const offset = cnt * 4; + const bytesLeft = buffer.byteLength - offset; const m3 = (mask >>> 24) & 0b11111111; const m2 = (mask >>> 16) & 0b11111111; const m1 = (mask >>> 8) & 0b11111111; @@ -692,7 +717,8 @@ function unmask(buffer: VSBuffer, mask: number): void { // Read this before there's any chance it is overwritten // Related to https://github.com/microsoft/vscode/issues/30624 -export const XDG_RUNTIME_DIR = process.env['XDG_RUNTIME_DIR']; +// TODO@bpasero revert me once electron utility process has landed +export const XDG_RUNTIME_DIR = typeof process !== 'undefined' ? process.env['XDG_RUNTIME_DIR'] : undefined; const safeIpcPathLengths: { [platform: number]: number } = { [Platform.Linux]: 107, @@ -713,7 +739,7 @@ export function createRandomIPCHandle(): string { if (XDG_RUNTIME_DIR) { result = join(XDG_RUNTIME_DIR, `vscode-ipc-${randomSuffix}.sock`); } else { - result = join(tmpdir(), `vscode-ipc-${randomSuffix}.sock`); + result = join(getNodeDependencies().os.tmpdir(), `vscode-ipc-${randomSuffix}.sock`); } // Validate length @@ -723,7 +749,7 @@ export function createRandomIPCHandle(): string { } export function createStaticIPCHandle(directoryPath: string, type: string, version: string): string { - const scope = createHash('md5').update(directoryPath).digest('hex'); + const scope = getNodeDependencies().crypto.createHash('md5').update(directoryPath).digest('hex'); // Windows: use named pipe if (process.platform === 'win32') { @@ -785,7 +811,7 @@ export function serve(port: number): Promise; export function serve(namedPipe: string): Promise; export function serve(hook: any): Promise { return new Promise((c, e) => { - const server = createServer(); + const server = getNodeDependencies().net.createServer(); server.on('error', e); server.listen(hook, () => { @@ -800,7 +826,7 @@ export function connect(port: number, clientId: string): Promise; export function connect(namedPipe: string, clientId: string): Promise; export function connect(hook: any, clientId: string): Promise { return new Promise((c, e) => { - const socket = createConnection(hook, () => { + const socket = getNodeDependencies().net.createConnection(hook, () => { socket.removeListener('error', e); c(Client.fromSocket(new NodeSocket(socket, `ipc-client${clientId}`), clientId)); }); diff --git a/src/vs/base/parts/ipc/test/node/ipc.cp.integrationTest.ts b/src/vs/base/parts/ipc/test/node/ipc.cp.integrationTest.ts index 227751e86c3..386580ae5a6 100644 --- a/src/vs/base/parts/ipc/test/node/ipc.cp.integrationTest.ts +++ b/src/vs/base/parts/ipc/test/node/ipc.cp.integrationTest.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; +import { timeout } from 'vs/base/common/async'; import { Client } from 'vs/base/parts/ipc/node/ipc.cp'; import { getPathFromAmdModule } from 'vs/base/test/node/testUtils'; import { TestServiceClient } from './testService'; @@ -15,7 +16,9 @@ function createClient(): Client { }); } -suite('IPC, Child Process', () => { +suite('IPC, Child Process', function () { + this.timeout(10000); + test('createChannel', () => { const client = createClient(); const channel = client.getChannel('test'); @@ -45,10 +48,12 @@ suite('IPC, Child Process', () => { }); }); - const request = service.marco(); - const result = Promise.all([request, event]); + return timeout(100).then(() => { + const request = service.marco(); + const result = Promise.all([request, event]); - return result.finally(() => client.dispose()); + return result.finally(() => client.dispose()); + }); }); test('event dispose', () => { diff --git a/src/vs/base/parts/quickinput/browser/media/quickInput.css b/src/vs/base/parts/quickinput/browser/media/quickInput.css index efab21e77bf..c1f60c0d2b9 100644 --- a/src/vs/base/parts/quickinput/browser/media/quickInput.css +++ b/src/vs/base/parts/quickinput/browser/media/quickInput.css @@ -7,10 +7,11 @@ position: absolute; width: 600px; z-index: 2550; - padding: 0 1px 1px 1px; - left: 50%; - margin-left: -300px; + left: 0; + right: 0; + margin: 0 auto; -webkit-app-region: no-drag; + border-radius: 4px; } .quick-input-titlebar { @@ -57,7 +58,7 @@ .quick-input-header { display: flex; - padding: 6px 6px 0px 6px; + padding: 8px 6px 0px 6px; margin-bottom: -2px; } @@ -151,10 +152,12 @@ .quick-input-list { line-height: 22px; margin-top: 6px; + padding: 1px; } .quick-input-widget.hidden-input .quick-input-list { - margin-top: 0; /* reduce margins when input box hidden */ + margin-top: 4px; /* reduce margins when input box hidden */ + padding-bottom: 4px; } .quick-input-list .monaco-list { @@ -162,6 +165,10 @@ max-height: calc(20 * 22px); } +.quick-input-list .monaco-scrollable-element { + padding: 0px 5px; +} + .quick-input-list .quick-input-list-entry { box-sizing: border-box; overflow: hidden; @@ -175,6 +182,10 @@ border-top-style: solid; } +.quick-input-list .monaco-list-row { + border-radius: 3px; +} + .quick-input-list .monaco-list-row[data-index="0"] .quick-input-list-entry.quick-input-list-separator-border { border-top-style: none; } @@ -246,7 +257,7 @@ } .quick-input-list .quick-input-list-entry .quick-input-list-separator { - margin-right: 8px; /* separate from keybindings or actions */ + margin-right: 4px; /* separate from keybindings or actions */ } .quick-input-list .quick-input-list-entry-action-bar { diff --git a/src/vs/base/parts/quickinput/browser/quickInput.ts b/src/vs/base/parts/quickinput/browser/quickInput.ts index e7099f2655b..a770fd6f5c4 100644 --- a/src/vs/base/parts/quickinput/browser/quickInput.ts +++ b/src/vs/base/parts/quickinput/browser/quickInput.ts @@ -15,6 +15,7 @@ import { IKeybindingLabelStyles } from 'vs/base/browser/ui/keybindingLabel/keybi import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; import { IListOptions, IListStyles, List } from 'vs/base/browser/ui/list/listWidget'; import { IProgressBarStyles, ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar'; +import { Toggle } from 'vs/base/browser/ui/toggle/toggle'; import { Action } from 'vs/base/common/actions'; import { equals } from 'vs/base/common/arrays'; import { TimeoutTimer } from 'vs/base/common/async'; @@ -28,7 +29,7 @@ import { isIOS } from 'vs/base/common/platform'; import Severity from 'vs/base/common/severity'; import { isString, withNullAsUndefined } from 'vs/base/common/types'; import { getIconClass } from 'vs/base/parts/quickinput/browser/quickInputUtils'; -import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInput, IQuickInputButton, IQuickInputHideEvent, IQuickNavigateConfiguration, IQuickPick, IQuickPickDidAcceptEvent, IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator, IQuickPickWillAcceptEvent, ItemActivation, NO_KEY_MODS, QuickInputHideReason, QuickPickInput } from 'vs/base/parts/quickinput/common/quickInput'; +import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInput, IQuickInputButton, IQuickInputHideEvent, IQuickInputToggle, IQuickNavigateConfiguration, IQuickPick, IQuickPickDidAcceptEvent, IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator, IQuickPickSeparatorButtonEvent, IQuickPickWillAcceptEvent, ItemActivation, NO_KEY_MODS, QuickInputHideReason, QuickPickInput } from 'vs/base/parts/quickinput/common/quickInput'; import 'vs/css!./media/quickInput'; import { localize } from 'vs/nls'; import { QuickInputBox } from './quickInputBox'; @@ -450,6 +451,7 @@ class QuickPick extends QuickInput implements IQuickPi private _matchOnDescription = false; private _matchOnDetail = false; private _matchOnLabel = true; + private _matchOnLabelMode: 'fuzzy' | 'contiguous' = 'fuzzy'; private _sortByLabel = true; private _autoFocusOnList = true; private _keepScrollPosition = false; @@ -463,6 +465,7 @@ class QuickPick extends QuickInput implements IQuickPi private selectedItemsToConfirm: T[] | null = []; private readonly onDidChangeSelectionEmitter = this._register(new Emitter()); private readonly onDidTriggerItemButtonEmitter = this._register(new Emitter>()); + private readonly onDidTriggerSeparatorButtonEmitter = this._register(new Emitter()); private _valueSelection: Readonly<[number, number]> | undefined; private valueSelectionUpdated = true; private _ok: boolean | 'default' = 'default'; @@ -595,6 +598,15 @@ class QuickPick extends QuickInput implements IQuickPi this.update(); } + get matchOnLabelMode() { + return this._matchOnLabelMode; + } + + set matchOnLabelMode(matchOnLabelMode: 'fuzzy' | 'contiguous') { + this._matchOnLabelMode = matchOnLabelMode; + this.update(); + } + get sortByLabel() { return this._sortByLabel; } @@ -730,10 +742,20 @@ class QuickPick extends QuickInput implements IQuickPi this.update(); } + set toggles(toggles: IQuickInputToggle[] | undefined) { + // HACK: Filter out toggles here that are not concrete Toggle objects. This is to workaround + // a layering issue as quick input's interface is in common but Toggle is in browser and + // it requires a HTMLElement on its interface + const concreteToggles = toggles?.filter(opts => opts instanceof Toggle) as Toggle[]; + this.ui.inputBox.toggles = concreteToggles; + } + onDidChangeSelection = this.onDidChangeSelectionEmitter.event; onDidTriggerItemButton = this.onDidTriggerItemButtonEmitter.event; + onDidTriggerSeparatorButton = this.onDidTriggerSeparatorButtonEmitter.event; + private trySelectFirst() { if (this.autoFocusOnList) { if (!this.canSelectMany) { @@ -873,6 +895,7 @@ class QuickPick extends QuickInput implements IQuickPi this.onDidChangeSelectionEmitter.fire(checkedItems as T[]); })); this.visibleDisposables.add(this.ui.list.onButtonTriggered(event => this.onDidTriggerItemButtonEmitter.fire(event as IQuickPickItemButtonEvent))); + this.visibleDisposables.add(this.ui.list.onSeparatorButtonTriggered(event => this.onDidTriggerSeparatorButtonEmitter.fire(event))); this.visibleDisposables.add(this.registerQuickNavigation()); this.valueSelectionUpdated = true; } @@ -994,6 +1017,7 @@ class QuickPick extends QuickInput implements IQuickPi this.ui.list.matchOnDescription = this.matchOnDescription; this.ui.list.matchOnDetail = this.matchOnDetail; this.ui.list.matchOnLabel = this.matchOnLabel; + this.ui.list.matchOnLabelMode = this.matchOnLabelMode; this.ui.list.sortByLabel = this.sortByLabel; if (this.itemsUpdated) { this.itemsUpdated = false; @@ -1146,11 +1170,14 @@ class InputBox extends QuickInput implements IInputBox { if (!this.visible) { return; } + + this.ui.container.classList.remove('hidden-input'); const visibilities: Visibilities = { title: !!this.title || !!this.step || !!this.buttons.length, description: !!this.description || !!this.step, inputBox: true, message: true }; + this.ui.setVisibilities(visibilities); super.update(); if (this.ui.inputBox.value !== this.value) { @@ -1166,7 +1193,6 @@ class InputBox extends QuickInput implements IInputBox { if (this.ui.inputBox.password !== this.password) { this.ui.inputBox.password = this.password; } - } } @@ -1331,7 +1357,9 @@ export class QuickInputController extends Disposable { switch (event.keyCode) { case KeyCode.Enter: dom.EventHelper.stop(e, true); - this.onDidAcceptEmitter.fire(); + if (this.enabled) { + this.onDidAcceptEmitter.fire(); + } break; case KeyCode.Escape: dom.EventHelper.stop(e, true); @@ -1406,9 +1434,7 @@ export class QuickInputController extends Disposable { return new Promise((doResolve, reject) => { let resolve = (result: R) => { resolve = doResolve; - if (options.onKeyMods) { - options.onKeyMods(input.keyMods); - } + options.onKeyMods?.(input.keyMods); doResolve(result); }; if (token.isCancellationRequested) { @@ -1464,6 +1490,7 @@ export class QuickInputController extends Disposable { } } })), + input.onDidTriggerSeparatorButton(event => options.onDidTriggerSeparatorButton?.(event)), input.onDidChangeValue(value => { if (activeItem && !value && (input.activeItems.length !== 1 || input.activeItems[0] !== activeItem)) { input.activeItems = [activeItem]; @@ -1601,9 +1628,7 @@ export class QuickInputController extends Disposable { this.onShowEmitter.fire(); const oldController = this.controller; this.controller = controller; - if (oldController) { - oldController.didHide(); - } + oldController?.didHide(); this.setEnabled(true); ui.leftActionBar.clear(); @@ -1651,7 +1676,7 @@ export class QuickInputController extends Disposable { ui.message.style.display = visibilities.message ? '' : 'none'; ui.progressBar.getContainer().style.display = visibilities.progressBar ? '' : 'none'; ui.list.display(!!visibilities.list); - ui.container.classList[visibilities.checkBox ? 'add' : 'remove']('show-checkboxes'); + ui.container.classList.toggle('show-checkboxes', visibilities.checkBox); this.updateLayout(); // TODO } @@ -1677,15 +1702,18 @@ export class QuickInputController extends Disposable { if (enabled !== this.enabled) { this.enabled = enabled; for (const item of this.getUI().leftActionBar.viewItems) { - (item as ActionViewItem).getAction().enabled = enabled; + (item as ActionViewItem).action.enabled = enabled; } for (const item of this.getUI().rightActionBar.viewItems) { - (item as ActionViewItem).getAction().enabled = enabled; + (item as ActionViewItem).action.enabled = enabled; } this.getUI().checkAll.disabled = !enabled; - // this.getUI().inputBox.enabled = enabled; Avoid loosing focus. + this.getUI().inputBox.enabled = enabled; this.getUI().ok.enabled = enabled; this.getUI().list.enabled = enabled; + if (!enabled) { + this.getUI().container.focus(); + } } } @@ -1764,13 +1792,12 @@ export class QuickInputController extends Disposable { } private updateLayout() { - if (this.ui) { + if (this.ui && this.isDisplayed()) { this.ui.container.style.top = `${this.titleBarOffset}px`; const style = this.ui.container.style; const width = Math.min(this.dimension!.width * 0.62 /* golden cut */, QuickInputController.MAX_WIDTH); style.width = width + 'px'; - style.marginLeft = '-' + (width / 2) + 'px'; this.ui.inputBox.layout(); this.ui.list.layout(this.dimension && this.dimension.height * 0.4); @@ -1810,6 +1837,9 @@ export class QuickInputController extends Disposable { if (this.styles.list.pickerGroupForeground) { content.push(`.quick-input-list .quick-input-list-separator { color: ${this.styles.list.pickerGroupForeground}; }`); } + if (this.styles.list.pickerGroupForeground) { + content.push(`.quick-input-list .quick-input-list-separator-as-item { color: ${this.styles.list.pickerGroupForeground}; }`); + } if ( this.styles.keybindingLabel.keybindingLabelBackground || diff --git a/src/vs/base/parts/quickinput/browser/quickInputBox.ts b/src/vs/base/parts/quickinput/browser/quickInputBox.ts index a6d798bb3da..1184a456574 100644 --- a/src/vs/base/parts/quickinput/browser/quickInputBox.ts +++ b/src/vs/base/parts/quickinput/browser/quickInputBox.ts @@ -6,7 +6,9 @@ import * as dom from 'vs/base/browser/dom'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; -import { IInputBoxStyles, InputBox, IRange, MessageType } from 'vs/base/browser/ui/inputbox/inputBox'; +import { FindInput } from 'vs/base/browser/ui/findinput/findInput'; +import { IInputBoxStyles, IRange, MessageType } from 'vs/base/browser/ui/inputbox/inputBox'; +import { Toggle } from 'vs/base/browser/ui/toggle/toggle'; import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; import Severity from 'vs/base/common/severity'; import 'vs/css!./media/quickInput'; @@ -16,113 +18,117 @@ const $ = dom.$; export class QuickInputBox extends Disposable { private container: HTMLElement; - private inputBox: InputBox; + private findInput: FindInput; constructor( private parent: HTMLElement ) { super(); this.container = dom.append(this.parent, $('.quick-input-box')); - this.inputBox = this._register(new InputBox(this.container, undefined)); + this.findInput = this._register(new FindInput(this.container, undefined, { label: '' })); } onKeyDown = (handler: (event: StandardKeyboardEvent) => void): IDisposable => { - return dom.addDisposableListener(this.inputBox.inputElement, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => { + return dom.addDisposableListener(this.findInput.inputBox.inputElement, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => { handler(new StandardKeyboardEvent(e)); }); }; onMouseDown = (handler: (event: StandardMouseEvent) => void): IDisposable => { - return dom.addDisposableListener(this.inputBox.inputElement, dom.EventType.MOUSE_DOWN, (e: MouseEvent) => { + return dom.addDisposableListener(this.findInput.inputBox.inputElement, dom.EventType.MOUSE_DOWN, (e: MouseEvent) => { handler(new StandardMouseEvent(e)); }); }; onDidChange = (handler: (event: string) => void): IDisposable => { - return this.inputBox.onDidChange(handler); + return this.findInput.onDidChange(handler); }; get value() { - return this.inputBox.value; + return this.findInput.getValue(); } set value(value: string) { - this.inputBox.value = value; + this.findInput.setValue(value); } select(range: IRange | null = null): void { - this.inputBox.select(range); + this.findInput.inputBox.select(range); } isSelectionAtEnd(): boolean { - return this.inputBox.isSelectionAtEnd(); + return this.findInput.inputBox.isSelectionAtEnd(); } setPlaceholder(placeholder: string): void { - this.inputBox.setPlaceHolder(placeholder); + this.findInput.inputBox.setPlaceHolder(placeholder); } get placeholder() { - return this.inputBox.inputElement.getAttribute('placeholder') || ''; + return this.findInput.inputBox.inputElement.getAttribute('placeholder') || ''; } set placeholder(placeholder: string) { - this.inputBox.setPlaceHolder(placeholder); + this.findInput.inputBox.setPlaceHolder(placeholder); } get ariaLabel() { - return this.inputBox.getAriaLabel(); + return this.findInput.inputBox.getAriaLabel(); } set ariaLabel(ariaLabel: string) { - this.inputBox.setAriaLabel(ariaLabel); + this.findInput.inputBox.setAriaLabel(ariaLabel); } get password() { - return this.inputBox.inputElement.type === 'password'; + return this.findInput.inputBox.inputElement.type === 'password'; } set password(password: boolean) { - this.inputBox.inputElement.type = password ? 'password' : 'text'; + this.findInput.inputBox.inputElement.type = password ? 'password' : 'text'; } set enabled(enabled: boolean) { - this.inputBox.setEnabled(enabled); + this.findInput.setEnabled(enabled); + } + + set toggles(toggles: Toggle[] | undefined) { + this.findInput.setAdditionalToggles(toggles); } hasFocus(): boolean { - return this.inputBox.hasFocus(); + return this.findInput.inputBox.hasFocus(); } setAttribute(name: string, value: string): void { - this.inputBox.inputElement.setAttribute(name, value); + this.findInput.inputBox.inputElement.setAttribute(name, value); } removeAttribute(name: string): void { - this.inputBox.inputElement.removeAttribute(name); + this.findInput.inputBox.inputElement.removeAttribute(name); } showDecoration(decoration: Severity): void { if (decoration === Severity.Ignore) { - this.inputBox.hideMessage(); + this.findInput.clearMessage(); } else { - this.inputBox.showMessage({ type: decoration === Severity.Info ? MessageType.INFO : decoration === Severity.Warning ? MessageType.WARNING : MessageType.ERROR, content: '' }); + this.findInput.showMessage({ type: decoration === Severity.Info ? MessageType.INFO : decoration === Severity.Warning ? MessageType.WARNING : MessageType.ERROR, content: '' }); } } stylesForType(decoration: Severity) { - return this.inputBox.stylesForType(decoration === Severity.Info ? MessageType.INFO : decoration === Severity.Warning ? MessageType.WARNING : MessageType.ERROR); + return this.findInput.inputBox.stylesForType(decoration === Severity.Info ? MessageType.INFO : decoration === Severity.Warning ? MessageType.WARNING : MessageType.ERROR); } setFocus(): void { - this.inputBox.focus(); + this.findInput.focus(); } layout(): void { - this.inputBox.layout(); + this.findInput.inputBox.layout(); } style(styles: IInputBoxStyles): void { - this.inputBox.style(styles); + this.findInput.style(styles); } } diff --git a/src/vs/base/parts/quickinput/browser/quickInputList.ts b/src/vs/base/parts/quickinput/browser/quickInputList.ts index bdcb5114917..82f4f05cf0f 100644 --- a/src/vs/base/parts/quickinput/browser/quickInputList.ts +++ b/src/vs/base/parts/quickinput/browser/quickInputList.ts @@ -17,14 +17,15 @@ import { compareAnything } from 'vs/base/common/comparers'; import { memoize } from 'vs/base/common/decorators'; import { Emitter, Event } from 'vs/base/common/event'; import { IMatch } from 'vs/base/common/filters'; -import { matchesFuzzyIconAware, parseLabelWithIcons } from 'vs/base/common/iconLabels'; +import { IParsedLabelWithIcons, matchesFuzzyIconAware, parseLabelWithIcons } from 'vs/base/common/iconLabels'; import { KeyCode } from 'vs/base/common/keyCodes'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; import * as platform from 'vs/base/common/platform'; +import { ltrim } from 'vs/base/common/strings'; import { withNullAsUndefined } from 'vs/base/common/types'; import { IQuickInputOptions } from 'vs/base/parts/quickinput/browser/quickInput'; import { getIconClass } from 'vs/base/parts/quickinput/browser/quickInputUtils'; -import { IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator } from 'vs/base/parts/quickinput/common/quickInput'; +import { QuickPickItem, IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator, IQuickPickSeparatorButtonEvent } from 'vs/base/parts/quickinput/common/quickInput'; import 'vs/css!./media/quickInput'; import { localize } from 'vs/nls'; @@ -33,8 +34,9 @@ const $ = dom.$; interface IListElement { readonly hasCheckbox: boolean; readonly index: number; - readonly item: IQuickPickItem; + readonly item?: IQuickPickItem; readonly saneLabel: string; + readonly saneSortLabel: string; readonly saneMeta?: string; readonly saneAriaLabel: string; readonly saneDescription?: string; @@ -45,13 +47,15 @@ interface IListElement { readonly checked: boolean; readonly separator?: IQuickPickSeparator; readonly fireButtonTriggered: (event: IQuickPickItemButtonEvent) => void; + readonly fireSeparatorButtonTriggered: (event: IQuickPickSeparatorButtonEvent) => void; } class ListElement implements IListElement, IDisposable { hasCheckbox!: boolean; index!: number; - item!: IQuickPickItem; + item?: IQuickPickItem; saneLabel!: string; + saneSortLabel!: string; saneMeta!: string; saneAriaLabel!: string; saneDescription?: string; @@ -74,6 +78,7 @@ class ListElement implements IListElement, IDisposable { descriptionHighlights?: IMatch[]; detailHighlights?: IMatch[]; fireButtonTriggered!: (event: IQuickPickItemButtonEvent) => void; + fireSeparatorButtonTriggered!: (event: IQuickPickSeparatorButtonEvent) => void; constructor(init: IListElement) { Object.assign(this, init); @@ -153,8 +158,9 @@ class ListElementRenderer implements IListRenderer data.checkbox.checked = checked)); @@ -165,13 +171,18 @@ class ListElementRenderer implements IListRenderer { let cssClasses = button.iconClass || (button.iconPath ? getIconClass(button.iconPath) : undefined); @@ -200,10 +213,15 @@ class ListElementRenderer implements IListRenderer { - element.fireButtonTriggered({ - button, - item: element.item - }); + mainItem.type !== 'separator' + ? element.fireButtonTriggered({ + button, + item: mainItem + }) + : element.fireSeparatorButtonTriggered({ + button, + separator: mainItem + }); }); action.tooltip = button.tooltip || ''; return action; @@ -216,6 +234,7 @@ class ListElementRenderer implements IListRenderer { getHeight(element: ListElement): number { + if (!element.item) { + // must be a separator + return 24; + } return element.saneDetail ? 44 : 22; } @@ -250,12 +273,13 @@ export class QuickInputList { readonly id: string; private container: HTMLElement; private list: List; - private inputElements: Array = []; + private inputElements: Array = []; private elements: ListElement[] = []; - private elementsToIndexes = new Map(); + private elementsToIndexes = new Map(); matchOnDescription = false; matchOnDetail = false; matchOnLabel = true; + matchOnLabelMode: 'fuzzy' | 'contiguous' = 'fuzzy'; matchOnMeta = true; sortByLabel = true; private readonly _onChangedAllVisibleChecked = new Emitter(); @@ -268,6 +292,8 @@ export class QuickInputList { onChangedCheckedElements: Event = this._onChangedCheckedElements.event; private readonly _onButtonTriggered = new Emitter>(); onButtonTriggered = this._onButtonTriggered.event; + private readonly _onSeparatorButtonTriggered = new Emitter(); + onSeparatorButtonTriggered = this._onSeparatorButtonTriggered.event; private readonly _onKeyDown = new Emitter(); onKeyDown: Event = this._onKeyDown.event; private readonly _onLeave = new Emitter(); @@ -283,6 +309,7 @@ export class QuickInputList { ) { this.id = id; this.container = dom.append(this.parent, $('.quick-input-list')); + const delegate = new ListElementDelegate(); const accessibilityProvider = new QuickInputAccessibilityProvider(); this.list = options.createList('QuickInput', this.container, delegate, [new ListElementRenderer()], { @@ -355,6 +382,7 @@ export class QuickInputList { this._onChangedVisibleCount, this._onChangedCheckedElements, this._onButtonTriggered, + this._onSeparatorButtonTriggered, this._onLeave, this._onKeyDown ); @@ -432,49 +460,70 @@ export class QuickInputList { } } - setElements(inputElements: Array): void { + setElements(inputElements: Array): void { this.elementDisposables = dispose(this.elementDisposables); const fireButtonTriggered = (event: IQuickPickItemButtonEvent) => this.fireButtonTriggered(event); + const fireSeparatorButtonTriggered = (event: IQuickPickSeparatorButtonEvent) => this.fireSeparatorButtonTriggered(event); this.inputElements = inputElements; this.elements = inputElements.reduce((result, item, index) => { - if (item.type !== 'separator') { - const previous = index && inputElements[index - 1]; - const saneLabel = item.label && item.label.replace(/\r?\n/g, ' '); - const saneMeta = item.meta && item.meta.replace(/\r?\n/g, ' '); - const saneDescription = item.description && item.description.replace(/\r?\n/g, ' '); - const saneDetail = item.detail && item.detail.replace(/\r?\n/g, ' '); - const saneAriaLabel = item.ariaLabel || [saneLabel, saneDescription, saneDetail] - .map(s => getCodiconAriaLabel(s)) - .filter(s => !!s) - .join(', '); + const previous = index && inputElements[index - 1]; + const saneLabel = item.label ? item.label.replace(/\r?\n/g, ' ') : ''; + const saneSortLabel = parseLabelWithIcons(saneLabel).text.trim(); - const hasCheckbox = this.parent.classList.contains('show-checkboxes'); - result.push(new ListElement({ - hasCheckbox, - index, - item, - saneLabel, - saneMeta, - saneAriaLabel, - saneDescription, - saneDetail, - labelHighlights: item.highlights?.label, - descriptionHighlights: item.highlights?.description, - detailHighlights: item.highlights?.detail, - checked: false, - separator: previous && previous.type === 'separator' ? previous : undefined, - fireButtonTriggered - })); + let saneMeta, saneDescription, saneDetail, labelHighlights, descriptionHighlights, detailHighlights; + if (item.type !== 'separator') { + saneMeta = item.meta && item.meta.replace(/\r?\n/g, ' '); + saneDescription = item.description && item.description.replace(/\r?\n/g, ' '); + saneDetail = item.detail && item.detail.replace(/\r?\n/g, ' '); + labelHighlights = item.highlights?.label; + descriptionHighlights = item.highlights?.description; + detailHighlights = item.highlights?.detail; } + const saneAriaLabel = item.ariaLabel || [saneLabel, saneDescription, saneDetail] + .map(s => getCodiconAriaLabel(s)) + .filter(s => !!s) + .join(', '); + + const hasCheckbox = this.parent.classList.contains('show-checkboxes'); + + let separator: IQuickPickSeparator | undefined; + if (item.type === 'separator') { + if (!item.buttons) { + // This separator will be rendered as a part of the list item + return result; + } + separator = item; + } else if (previous && previous.type === 'separator' && !previous.buttons) { + separator = previous; + } + + result.push(new ListElement({ + hasCheckbox, + index, + item: item.type !== 'separator' ? item : undefined, + saneLabel, + saneSortLabel, + saneMeta, + saneAriaLabel, + saneDescription, + saneDetail, + labelHighlights, + descriptionHighlights, + detailHighlights, + checked: false, + separator, + fireButtonTriggered, + fireSeparatorButtonTriggered + })); return result; }, [] as ListElement[]); this.elementDisposables.push(...this.elements); this.elementDisposables.push(...this.elements.map(element => element.onChecked(() => this.fireCheckedEvents()))); this.elementsToIndexes = this.elements.reduce((map, element, index) => { - map.set(element.item, index); + map.set(element.item ?? element.separator!, index); return map; - }, new Map()); + }, new Map()); this.list.splice(0, this.list.length); // Clear focus and selection first, sending the events when the list is empty. this.list.splice(0, this.list.length, this.elements); this._onChangedVisibleCount.fire(this.elements.length); @@ -518,7 +567,8 @@ export class QuickInputList { getCheckedElements() { return this.elements.filter(e => e.checked) - .map(e => e.item); + .map(e => e.item) + .filter(e => !!e) as IQuickPickItem[]; } setCheckedElements(items: IQuickPickItem[]) { @@ -546,39 +596,44 @@ export class QuickInputList { return; } - if (what === QuickInputListFocus.Next && this.list.getFocus()[0] === this.list.length - 1) { - what = QuickInputListFocus.First; - } - - if (what === QuickInputListFocus.Previous && this.list.getFocus()[0] === 0) { - what = QuickInputListFocus.Last; - } - if (what === QuickInputListFocus.Second && this.list.length < 2) { what = QuickInputListFocus.First; } switch (what) { case QuickInputListFocus.First: - this.list.focusFirst(); + this.list.scrollTop = 0; + this.list.focusFirst(undefined, (e) => !!e.item); break; case QuickInputListFocus.Second: - this.list.focusNth(1); + this.list.scrollTop = 0; + this.list.focusNth(1, undefined, (e) => !!e.item); break; case QuickInputListFocus.Last: - this.list.focusLast(); + this.list.scrollTop = this.list.scrollHeight; + this.list.focusLast(undefined, (e) => !!e.item); break; - case QuickInputListFocus.Next: - this.list.focusNext(); + case QuickInputListFocus.Next: { + this.list.focusNext(undefined, true, undefined, (e) => !!e.item); + const index = this.list.getFocus()[0]; + if (index !== 0 && !this.elements[index - 1].item && this.list.firstVisibleIndex > index - 1) { + this.list.reveal(index - 1); + } break; - case QuickInputListFocus.Previous: - this.list.focusPrevious(); + } + case QuickInputListFocus.Previous: { + this.list.focusPrevious(undefined, true, undefined, (e) => !!e.item); + const index = this.list.getFocus()[0]; + if (index !== 0 && !this.elements[index - 1].item && this.list.firstVisibleIndex > index - 1) { + this.list.reveal(index - 1); + } break; + } case QuickInputListFocus.NextPage: - this.list.focusNextPage(); + this.list.focusNextPage(undefined, (e) => !!e.item); break; case QuickInputListFocus.PreviousPage: - this.list.focusPreviousPage(); + this.list.focusPreviousPage(undefined, (e) => !!e.item); break; } @@ -606,6 +661,8 @@ export class QuickInputList { this.list.layout(); return false; } + + const queryWithWhitespace = query; query = query.trim(); // Reset filtering @@ -616,7 +673,9 @@ export class QuickInputList { element.detailHighlights = undefined; element.hidden = false; const previous = element.index && this.inputElements[element.index - 1]; - element.separator = previous && previous.type === 'separator' ? previous : undefined; + if (element.item) { + element.separator = previous && previous.type === 'separator' && !previous.buttons ? previous : undefined; + } }); } @@ -624,7 +683,12 @@ export class QuickInputList { else { let currentSeparator: IQuickPickSeparator | undefined; this.elements.forEach(element => { - const labelHighlights = this.matchOnLabel ? withNullAsUndefined(matchesFuzzyIconAware(query, parseLabelWithIcons(element.saneLabel))) : undefined; + let labelHighlights: IMatch[] | undefined; + if (this.matchOnLabelMode === 'fuzzy') { + labelHighlights = this.matchOnLabel ? withNullAsUndefined(matchesFuzzyIconAware(query, parseLabelWithIcons(element.saneLabel))) : undefined; + } else { + labelHighlights = this.matchOnLabel ? withNullAsUndefined(matchesContiguousIconAware(queryWithWhitespace, parseLabelWithIcons(element.saneLabel))) : undefined; + } const descriptionHighlights = this.matchOnDescription ? withNullAsUndefined(matchesFuzzyIconAware(query, parseLabelWithIcons(element.saneDescription || ''))) : undefined; const detailHighlights = this.matchOnDetail ? withNullAsUndefined(matchesFuzzyIconAware(query, parseLabelWithIcons(element.saneDetail || ''))) : undefined; const metaHighlights = this.matchOnMeta ? withNullAsUndefined(matchesFuzzyIconAware(query, parseLabelWithIcons(element.saneMeta || ''))) : undefined; @@ -638,9 +702,8 @@ export class QuickInputList { element.labelHighlights = undefined; element.descriptionHighlights = undefined; element.detailHighlights = undefined; - element.hidden = !element.item.alwaysShow; + element.hidden = element.item ? !element.item.alwaysShow : true; } - element.separator = undefined; // we can show the separator unless the list gets sorted by match if (!this.sortByLabel) { @@ -665,9 +728,9 @@ export class QuickInputList { } this.elementsToIndexes = shownElements.reduce((map, element, index) => { - map.set(element.item, index); + map.set(element.item ?? element.separator!, index); return map; - }, new Map()); + }, new Map()); this.list.splice(0, this.list.length, shownElements); this.list.setFocus([]); this.list.layout(); @@ -717,11 +780,52 @@ export class QuickInputList { this._onButtonTriggered.fire(event); } + private fireSeparatorButtonTriggered(event: IQuickPickSeparatorButtonEvent) { + this._onSeparatorButtonTriggered.fire(event); + } + style(styles: IListStyles) { this.list.style(styles); } } +export function matchesContiguousIconAware(query: string, target: IParsedLabelWithIcons): IMatch[] | null { + + const { text, iconOffsets } = target; + + // Return early if there are no icon markers in the word to match against + if (!iconOffsets || iconOffsets.length === 0) { + return matchesContiguous(query, text); + } + + // Trim the word to match against because it could have leading + // whitespace now if the word started with an icon + const wordToMatchAgainstWithoutIconsTrimmed = ltrim(text, ' '); + const leadingWhitespaceOffset = text.length - wordToMatchAgainstWithoutIconsTrimmed.length; + + // match on value without icon + const matches = matchesContiguous(query, wordToMatchAgainstWithoutIconsTrimmed); + + // Map matches back to offsets with icon and trimming + if (matches) { + for (const match of matches) { + const iconOffset = iconOffsets[match.start + leadingWhitespaceOffset] /* icon offsets at index */ + leadingWhitespaceOffset /* overall leading whitespace offset */; + match.start += iconOffset; + match.end += iconOffset; + } + } + + return matches; +} + +function matchesContiguous(word: string, wordToMatchAgainst: string): IMatch[] | null { + const matchIndex = wordToMatchAgainst.toLowerCase().indexOf(word.toLowerCase()); + if (matchIndex !== -1) { + return [{ start: matchIndex, end: matchIndex + word.length }]; + } + return null; +} + function compareEntries(elementA: ListElement, elementB: ListElement, lookFor: string): number { const labelHighlightsA = elementA.labelHighlights || []; @@ -738,7 +842,7 @@ function compareEntries(elementA: ListElement, elementB: ListElement, lookFor: s return 0; } - return compareAnything(elementA.saneLabel, elementB.saneLabel, lookFor); + return compareAnything(elementA.saneSortLabel, elementB.saneSortLabel, lookFor); } class QuickInputAccessibilityProvider implements IListAccessibilityProvider { diff --git a/src/vs/base/parts/quickinput/common/quickInput.ts b/src/vs/base/parts/quickinput/common/quickInput.ts index bf9979e00b1..2b08cceb208 100644 --- a/src/vs/base/parts/quickinput/common/quickInput.ts +++ b/src/vs/base/parts/quickinput/common/quickInput.ts @@ -18,6 +18,8 @@ export interface IQuickPickItemHighlights { detail?: IMatch[]; } +export type QuickPickItem = IQuickPickSeparator | IQuickPickItem; + export interface IQuickPickItem { type?: 'item'; id?: string; @@ -32,18 +34,21 @@ export interface IQuickPickItem { * keyboard shortcut. */ keybinding?: ResolvedKeybinding; - iconClasses?: string[]; + iconClasses?: readonly string[]; italic?: boolean; strikethrough?: boolean; highlights?: IQuickPickItemHighlights; - buttons?: IQuickInputButton[]; + buttons?: readonly IQuickInputButton[]; picked?: boolean; alwaysShow?: boolean; } export interface IQuickPickSeparator { type: 'separator'; + id?: string; label?: string; + ariaLabel?: string; + buttons?: readonly IQuickInputButton[]; } export interface IKeyMods { @@ -54,7 +59,7 @@ export interface IKeyMods { export const NO_KEY_MODS: IKeyMods = { ctrlCmd: false, alt: false }; export interface IQuickNavigateConfiguration { - keybindings: ResolvedKeybinding[]; + keybindings: readonly ResolvedKeybinding[]; } export interface IPickOptions { @@ -124,6 +129,7 @@ export interface IPickOptions { onKeyMods?: (keyMods: IKeyMods) => void; onDidFocus?: (entry: T) => void; onDidTriggerItemButton?: (context: IQuickPickItemButtonContext) => void; + onDidTriggerSeparatorButton?: (context: IQuickPickSeparatorButtonEvent) => void; } export interface IInputOptions { @@ -139,9 +145,9 @@ export interface IInputOptions { value?: string; /** - * the selection of value, default to the whole word + * the selection of value, default to the whole prefilled value */ - valueSelection?: [number, number]; + valueSelection?: readonly [number, number]; /** * the text to display underneath the input box @@ -158,6 +164,9 @@ export interface IInputOptions { */ password?: boolean; + /** + * an optional flag to not close the input on focus lost + */ ignoreFocusLost?: boolean; /** @@ -282,6 +291,8 @@ export interface IQuickPick extends IQuickInput { readonly onDidTriggerItemButton: Event>; + readonly onDidTriggerSeparatorButton: Event; + items: ReadonlyArray; canSelectMany: boolean; @@ -292,6 +303,13 @@ export interface IQuickPick extends IQuickInput { matchOnLabel: boolean; + /** + * The mode to filter label with. Fuzzy will use fuzzy searching and + * contiguous will make filter entries that do not contain the exact string + * (including whitespace). This defaults to `'fuzzy'`. + */ + matchOnLabelMode: 'fuzzy' | 'contiguous'; + sortByLabel: boolean; autoFocusOnList: boolean; @@ -331,30 +349,73 @@ export interface IQuickPick extends IQuickInput { hideInput: boolean; hideCheckAll: boolean; + + /** + * A set of `Toggle` objects to add to the input box. + */ + toggles: IQuickInputToggle[] | undefined; +} + +export interface IQuickInputToggle { + onChange: Event; } export interface IInputBox extends IQuickInput { + /** + * Value shown in the input box. + */ value: string; + /** + * Provide start and end values to be selected in the input box. + */ valueSelection: Readonly<[number, number]> | undefined; + /** + * Value shown as example for input. + */ placeholder: string | undefined; + /** + * Determines if the input value should be hidden while typing. + */ password: boolean; + /** + * Event called when the input value changes. + */ readonly onDidChangeValue: Event; + /** + * Event called when the user submits the input. + */ readonly onDidAccept: Event; + /** + * Buttons to show in addition to user input submission. + */ buttons: ReadonlyArray; + /** + * Event called when a button is selected. + */ readonly onDidTriggerButton: Event; + /** + * Text show below the input box. + */ prompt: string | undefined; + /** + * An optional validation message indicating a problem with the current input value. + * Returning undefined clears the validation message. + */ validationMessage: string | undefined; + /** + * Severity of the input validation message. + */ severity: Severity; } @@ -376,6 +437,11 @@ export interface IQuickPickItemButtonEvent { item: T; } +export interface IQuickPickSeparatorButtonEvent { + button: IQuickInputButton; + separator: IQuickPickSeparator; +} + export interface IQuickPickItemButtonContext extends IQuickPickItemButtonEvent { removeItem(): void; } diff --git a/src/vs/base/parts/quickinput/test/browser/quickinput.test.ts b/src/vs/base/parts/quickinput/test/browser/quickinput.test.ts index 02859f6ef7f..dc99756b291 100644 --- a/src/vs/base/parts/quickinput/test/browser/quickinput.test.ts +++ b/src/vs/base/parts/quickinput/test/browser/quickinput.test.ts @@ -39,7 +39,7 @@ suite('QuickInput', () => { // https://github.com/microsoft/vscode/issues/147543 controller = new QuickInputController({ container: fixture, idPrefix: 'testQuickInput', - ignoreFocusOut() { return false; }, + ignoreFocusOut() { return true; }, isScreenReaderOptimized() { return false; }, returnFocus() { }, backKeybindingLabel() { return undefined; }, @@ -80,7 +80,7 @@ suite('QuickInput', () => { // https://github.com/microsoft/vscode/issues/147543 await wait; controller.accept(); - const pick = await pickPromise; + const pick = await raceTimeout(pickPromise, 2000); assert.strictEqual(pick, item); }); @@ -104,7 +104,7 @@ suite('QuickInput', () => { // https://github.com/microsoft/vscode/issues/147543 await wait; controller.accept(); - const value = await inputPromise; + const value = await raceTimeout(inputPromise, 2000); assert.strictEqual(value, 'foo'); }); @@ -137,7 +137,7 @@ suite('QuickInput', () => { // https://github.com/microsoft/vscode/issues/147543 quickpick.activeItems = [items[items.length - 1]]; quickpick.show(); - let cursorTop = getScrollTop(); + const cursorTop = getScrollTop(); assert.notStrictEqual(cursorTop, 0); @@ -162,7 +162,7 @@ suite('QuickInput', () => { // https://github.com/microsoft/vscode/issues/147543 quickpick.activeItems = [items[items.length - 1]]; quickpick.show(); - let cursorTop = getScrollTop(); + const cursorTop = getScrollTop(); assert.notStrictEqual(cursorTop, 0); quickpick.keepScrollPosition = true; diff --git a/src/vs/base/parts/request/browser/request.ts b/src/vs/base/parts/request/browser/request.ts index 3a076f5d3fd..e2de2065455 100644 --- a/src/vs/base/parts/request/browser/request.ts +++ b/src/vs/base/parts/request/browser/request.ts @@ -55,7 +55,7 @@ export function request(options: IRequestOptions, token: CancellationToken): Pro function setRequestHeaders(xhr: XMLHttpRequest, options: IRequestOptions): void { if (options.headers) { - outer: for (let k in options.headers) { + outer: for (const k in options.headers) { switch (k) { case 'User-Agent': case 'Accept-Encoding': diff --git a/src/vs/base/parts/sandbox/common/sandboxTypes.ts b/src/vs/base/parts/sandbox/common/sandboxTypes.ts index c6c087da214..8c296184f7d 100644 --- a/src/vs/base/parts/sandbox/common/sandboxTypes.ts +++ b/src/vs/base/parts/sandbox/common/sandboxTypes.ts @@ -26,7 +26,11 @@ export interface ISandboxConfiguration { windowId: number; /** - * Absolute installation path. + * Root path of the JavaScript sources. + * + * Note: This is NOT the installation root + * directory itself but contained in it at + * a level that is platform dependent. */ appRoot: string; diff --git a/src/vs/base/parts/sandbox/electron-browser/preload.js b/src/vs/base/parts/sandbox/electron-browser/preload.js index 3e25c4097f1..53e38ce14c2 100644 --- a/src/vs/base/parts/sandbox/electron-browser/preload.js +++ b/src/vs/base/parts/sandbox/electron-browser/preload.js @@ -145,7 +145,7 @@ /** * @param {string} channel * @param {any[]} args - * @returns {Promise | undefined} + * @returns {Promise | never} */ invoke(channel, ...args) { if (validateIPC(channel)) { @@ -156,7 +156,7 @@ /** * @param {string} channel * @param {(event: IpcRendererEvent, ...args: any[]) => void} listener - * @returns {IpcRenderer} + * @returns {IpcRenderer | never} */ on(channel, listener) { if (validateIPC(channel)) { @@ -169,7 +169,7 @@ /** * @param {string} channel * @param {(event: IpcRendererEvent, ...args: any[]) => void} listener - * @returns {IpcRenderer} + * @returns {IpcRenderer | never} */ once(channel, listener) { if (validateIPC(channel)) { @@ -182,7 +182,7 @@ /** * @param {string} channel * @param {(event: IpcRendererEvent, ...args: any[]) => void} listener - * @returns {IpcRenderer} + * @returns {IpcRenderer | never} */ removeListener(channel, listener) { if (validateIPC(channel)) { diff --git a/src/vs/base/parts/sandbox/electron-sandbox/globals.ts b/src/vs/base/parts/sandbox/electron-sandbox/globals.ts index 7d9b29a6e3a..d89c22a4f0d 100644 --- a/src/vs/base/parts/sandbox/electron-sandbox/globals.ts +++ b/src/vs/base/parts/sandbox/electron-sandbox/globals.ts @@ -36,6 +36,10 @@ export interface ISandboxNodeProcess extends INodeProcess { /** * The `process.pid` property returns the PID of the process. + * + * @deprecated this property will be removed once sandbox is enabled. + * + * TODO@bpasero remove this property when sandbox is on */ readonly pid: number; diff --git a/src/vs/base/parts/storage/common/storage.ts b/src/vs/base/parts/storage/common/storage.ts index a6bfeaefbd9..8e42b693a93 100644 --- a/src/vs/base/parts/storage/common/storage.ts +++ b/src/vs/base/parts/storage/common/storage.ts @@ -357,13 +357,9 @@ export class InMemoryStorageDatabase implements IStorageDatabase { } async updateItems(request: IUpdateRequest): Promise { - if (request.insert) { - request.insert.forEach((value, key) => this.items.set(key, value)); - } + request.insert?.forEach((value, key) => this.items.set(key, value)); - if (request.delete) { - request.delete.forEach(key => this.items.delete(key)); - } + request.delete?.forEach(key => this.items.delete(key)); } async close(): Promise { } diff --git a/src/vs/base/parts/storage/node/storage.ts b/src/vs/base/parts/storage/node/storage.ts index e8bfec83a24..f4cf5ac78e1 100644 --- a/src/vs/base/parts/storage/node/storage.ts +++ b/src/vs/base/parts/storage/node/storage.ts @@ -301,9 +301,9 @@ export class SQLiteStorageDatabase implements IStorageDatabase { return new Promise((resolve, reject) => { import('@vscode/sqlite3').then(sqlite3 => { const connection: IDatabaseConnection = { - db: new (this.logger.isTracing ? sqlite3.verbose().Database : sqlite3.Database)(path, error => { + db: new (this.logger.isTracing ? sqlite3.verbose().Database : sqlite3.Database)(path, (error: (Error & { code?: string }) | null) => { if (error) { - return connection.db ? connection.db.close(() => reject(error)) : reject(error); + return (connection.db && error.code !== 'SQLITE_CANTOPEN' /* https://github.com/TryGhost/node-sqlite3/issues/1617 */) ? connection.db.close(() => reject(error)) : reject(error); } // The following exec() statement serves two purposes: @@ -440,14 +440,10 @@ class SQLiteStorageDatabaseLogger { } trace(msg: string): void { - if (this.logTrace) { - this.logTrace(msg); - } + this.logTrace?.(msg); } error(error: string | Error): void { - if (this.logError) { - this.logError(error); - } + this.logError?.(error); } } diff --git a/src/vs/base/parts/storage/test/node/storage.test.ts b/src/vs/base/parts/storage/test/node/storage.test.ts index ba47114a16b..70ff91977be 100644 --- a/src/vs/base/parts/storage/test/node/storage.test.ts +++ b/src/vs/base/parts/storage/test/node/storage.test.ts @@ -123,7 +123,7 @@ flakySuite('Storage Library', function () { const database = new TestSQLiteStorageDatabase(join(testDir, 'storage.db')); const storage = new Storage(database); - let changes = new Set(); + const changes = new Set(); storage.onDidChangeStorage(key => { changes.add(key); }); @@ -223,7 +223,7 @@ flakySuite('Storage Library', function () { }); test('explicit flush', async () => { - let storage = new Storage(new SQLiteStorageDatabase(join(testDir, 'storage.db'))); + const storage = new Storage(new SQLiteStorageDatabase(join(testDir, 'storage.db'))); await storage.init(); storage.set('foo', 'bar'); @@ -243,7 +243,7 @@ flakySuite('Storage Library', function () { test('conflicting updates', () => { return runWithFakedTimers({}, async function () { - let storage = new Storage(new SQLiteStorageDatabase(join(testDir, 'storage.db'))); + const storage = new Storage(new SQLiteStorageDatabase(join(testDir, 'storage.db'))); await storage.init(); let changes = new Set(); @@ -623,7 +623,7 @@ flakySuite('SQLite Storage Library', function () { }); test('very large item value', async function () { - let storage = new SQLiteStorageDatabase(join(testdir, 'storage.db')); + const storage = new SQLiteStorageDatabase(join(testdir, 'storage.db')); const items = new Map(); items.set('colorthemedata', '{"id":"vs vscode-theme-defaults-themes-light_plus-json","label":"Light+ (default light)","settingsId":"Default Light+","selector":"vs.vscode-theme-defaults-themes-light_plus-json","themeTokenColors":[{"settings":{"foreground":"#000000ff","background":"#ffffffff"}},{"scope":["meta.embedded","source.groovy.embedded"],"settings":{"foreground":"#000000ff"}},{"scope":"emphasis","settings":{"fontStyle":"italic"}},{"scope":"strong","settings":{"fontStyle":"bold"}},{"scope":"meta.diff.header","settings":{"foreground":"#000080"}},{"scope":"comment","settings":{"foreground":"#008000"}},{"scope":"constant.language","settings":{"foreground":"#0000ff"}},{"scope":["constant.numeric"],"settings":{"foreground":"#098658"}},{"scope":"constant.regexp","settings":{"foreground":"#811f3f"}},{"name":"css tags in selectors, xml tags","scope":"entity.name.tag","settings":{"foreground":"#800000"}},{"scope":"entity.name.selector","settings":{"foreground":"#800000"}},{"scope":"entity.other.attribute-name","settings":{"foreground":"#ff0000"}},{"scope":["entity.other.attribute-name.class.css","entity.other.attribute-name.class.mixin.css","entity.other.attribute-name.id.css","entity.other.attribute-name.parent-selector.css","entity.other.attribute-name.pseudo-class.css","entity.other.attribute-name.pseudo-element.css","source.css.less entity.other.attribute-name.id","entity.other.attribute-name.attribute.scss","entity.other.attribute-name.scss"],"settings":{"foreground":"#800000"}},{"scope":"invalid","settings":{"foreground":"#cd3131"}},{"scope":"markup.underline","settings":{"fontStyle":"underline"}},{"scope":"markup.bold","settings":{"fontStyle":"bold","foreground":"#000080"}},{"scope":"markup.heading","settings":{"fontStyle":"bold","foreground":"#800000"}},{"scope":"markup.italic","settings":{"fontStyle":"italic"}},{"scope":"markup.inserted","settings":{"foreground":"#098658"}},{"scope":"markup.deleted","settings":{"foreground":"#a31515"}},{"scope":"markup.changed","settings":{"foreground":"#0451a5"}},{"scope":["punctuation.definition.quote.begin.markdown","punctuation.definition.list.begin.markdown"],"settings":{"foreground":"#0451a5"}},{"scope":"markup.inline.raw","settings":{"foreground":"#800000"}},{"name":"brackets of XML/HTML tags","scope":"punctuation.definition.tag","settings":{"foreground":"#800000"}},{"scope":"meta.preprocessor","settings":{"foreground":"#0000ff"}},{"scope":"meta.preprocessor.string","settings":{"foreground":"#a31515"}},{"scope":"meta.preprocessor.numeric","settings":{"foreground":"#098658"}},{"scope":"meta.structure.dictionary.key.python","settings":{"foreground":"#0451a5"}},{"scope":"storage","settings":{"foreground":"#0000ff"}},{"scope":"storage.type","settings":{"foreground":"#0000ff"}},{"scope":"storage.modifier","settings":{"foreground":"#0000ff"}},{"scope":"string","settings":{"foreground":"#a31515"}},{"scope":["string.comment.buffered.block.pug","string.quoted.pug","string.interpolated.pug","string.unquoted.plain.in.yaml","string.unquoted.plain.out.yaml","string.unquoted.block.yaml","string.quoted.single.yaml","string.quoted.double.xml","string.quoted.single.xml","string.unquoted.cdata.xml","string.quoted.double.html","string.quoted.single.html","string.unquoted.html","string.quoted.single.handlebars","string.quoted.double.handlebars"],"settings":{"foreground":"#0000ff"}},{"scope":"string.regexp","settings":{"foreground":"#811f3f"}},{"name":"String interpolation","scope":["punctuation.definition.template-expression.begin","punctuation.definition.template-expression.end","punctuation.section.embedded"],"settings":{"foreground":"#0000ff"}},{"name":"Reset JavaScript string interpolation expression","scope":["meta.template.expression"],"settings":{"foreground":"#000000"}},{"scope":["support.constant.property-value","support.constant.font-name","support.constant.media-type","support.constant.media","constant.other.color.rgb-value","constant.other.rgb-value","support.constant.color"],"settings":{"foreground":"#0451a5"}},{"scope":["support.type.vendored.property-name","support.type.property-name","variable.css","variable.scss","variable.other.less","source.coffee.embedded"],"settings":{"foreground":"#ff0000"}},{"scope":["support.type.property-name.json"],"settings":{"foreground":"#0451a5"}},{"scope":"keyword","settings":{"foreground":"#0000ff"}},{"scope":"keyword.control","settings":{"foreground":"#0000ff"}},{"scope":"keyword.operator","settings":{"foreground":"#000000"}},{"scope":["keyword.operator.new","keyword.operator.expression","keyword.operator.cast","keyword.operator.sizeof","keyword.operator.instanceof","keyword.operator.logical.python"],"settings":{"foreground":"#0000ff"}},{"scope":"keyword.other.unit","settings":{"foreground":"#098658"}},{"scope":["punctuation.section.embedded.begin.php","punctuation.section.embedded.end.php"],"settings":{"foreground":"#800000"}},{"scope":"support.function.git-rebase","settings":{"foreground":"#0451a5"}},{"scope":"constant.sha.git-rebase","settings":{"foreground":"#098658"}},{"name":"coloring of the Java import and package identifiers","scope":["storage.modifier.import.java","variable.language.wildcard.java","storage.modifier.package.java"],"settings":{"foreground":"#000000"}},{"name":"this.self","scope":"variable.language","settings":{"foreground":"#0000ff"}},{"name":"Function declarations","scope":["entity.name.function","support.function","support.constant.handlebars"],"settings":{"foreground":"#795E26"}},{"name":"Types declaration and references","scope":["meta.return-type","support.class","support.type","entity.name.type","entity.name.class","storage.type.numeric.go","storage.type.byte.go","storage.type.boolean.go","storage.type.string.go","storage.type.uintptr.go","storage.type.error.go","storage.type.rune.go","storage.type.cs","storage.type.generic.cs","storage.type.modifier.cs","storage.type.variable.cs","storage.type.annotation.java","storage.type.generic.java","storage.type.java","storage.type.object.array.java","storage.type.primitive.array.java","storage.type.primitive.java","storage.type.token.java","storage.type.groovy","storage.type.annotation.groovy","storage.type.parameters.groovy","storage.type.generic.groovy","storage.type.object.array.groovy","storage.type.primitive.array.groovy","storage.type.primitive.groovy"],"settings":{"foreground":"#267f99"}},{"name":"Types declaration and references, TS grammar specific","scope":["meta.type.cast.expr","meta.type.new.expr","support.constant.math","support.constant.dom","support.constant.json","entity.other.inherited-class"],"settings":{"foreground":"#267f99"}},{"name":"Control flow keywords","scope":"keyword.control","settings":{"foreground":"#AF00DB"}},{"name":"Variable and parameter name","scope":["variable","meta.definition.variable.name","support.variable","entity.name.variable"],"settings":{"foreground":"#001080"}},{"name":"Object keys, TS grammar specific","scope":["meta.object-literal.key"],"settings":{"foreground":"#001080"}},{"name":"CSS property value","scope":["support.constant.property-value","support.constant.font-name","support.constant.media-type","support.constant.media","constant.other.color.rgb-value","constant.other.rgb-value","support.constant.color"],"settings":{"foreground":"#0451a5"}},{"name":"Regular expression groups","scope":["punctuation.definition.group.regexp","punctuation.definition.group.assertion.regexp","punctuation.definition.character-class.regexp","punctuation.character.set.begin.regexp","punctuation.character.set.end.regexp","keyword.operator.negation.regexp","support.other.parenthesis.regexp"],"settings":{"foreground":"#d16969"}},{"scope":["constant.character.character-class.regexp","constant.other.character-class.set.regexp","constant.other.character-class.regexp","constant.character.set.regexp"],"settings":{"foreground":"#811f3f"}},{"scope":"keyword.operator.quantifier.regexp","settings":{"foreground":"#000000"}},{"scope":["keyword.operator.or.regexp","keyword.control.anchor.regexp"],"settings":{"foreground":"#ff0000"}},{"scope":"constant.character","settings":{"foreground":"#0000ff"}},{"scope":"constant.character.escape","settings":{"foreground":"#ff0000"}},{"scope":"token.info-token","settings":{"foreground":"#316bcd"}},{"scope":"token.warn-token","settings":{"foreground":"#cd9731"}},{"scope":"token.error-token","settings":{"foreground":"#cd3131"}},{"scope":"token.debug-token","settings":{"foreground":"#800080"}}],"extensionData":{"extensionId":"vscode.theme-defaults","extensionPublisher":"vscode","extensionName":"theme-defaults","extensionIsBuiltin":true},"colorMap":{"editor.background":"#ffffff","editor.foreground":"#000000","editor.inactiveSelectionBackground":"#e5ebf1","editorIndentGuide.background":"#d3d3d3","editorIndentGuide.activeBackground":"#939393","editor.selectionHighlightBackground":"#add6ff4d","editorSuggestWidget.background":"#f3f3f3","activityBarBadge.background":"#007acc","sideBarTitle.foreground":"#6f6f6f","list.hoverBackground":"#e8e8e8","input.placeholderForeground":"#767676","settings.textInputBorder":"#cecece","settings.numberInputBorder":"#cecece"}}'); @@ -670,56 +670,57 @@ flakySuite('SQLite Storage Library', function () { }); test('multiple concurrent writes execute in sequence', async () => { - - class TestStorage extends Storage { - getStorage(): IStorageDatabase { - return this.database; + return runWithFakedTimers({}, async () => { + class TestStorage extends Storage { + getStorage(): IStorageDatabase { + return this.database; + } } - } - const storage = new TestStorage(new SQLiteStorageDatabase(join(testdir, 'storage.db'))); + const storage = new TestStorage(new SQLiteStorageDatabase(join(testdir, 'storage.db'))); - await storage.init(); + await storage.init(); - storage.set('foo', 'bar'); - storage.set('some/foo/path', 'some/bar/path'); + storage.set('foo', 'bar'); + storage.set('some/foo/path', 'some/bar/path'); - await timeout(2); + await timeout(2); - storage.set('foo1', 'bar'); - storage.set('some/foo1/path', 'some/bar/path'); + storage.set('foo1', 'bar'); + storage.set('some/foo1/path', 'some/bar/path'); - await timeout(2); + await timeout(2); - storage.set('foo2', 'bar'); - storage.set('some/foo2/path', 'some/bar/path'); + storage.set('foo2', 'bar'); + storage.set('some/foo2/path', 'some/bar/path'); - await timeout(2); + await timeout(2); - storage.delete('foo1'); - storage.delete('some/foo1/path'); + storage.delete('foo1'); + storage.delete('some/foo1/path'); - await timeout(2); + await timeout(2); - storage.delete('foo4'); - storage.delete('some/foo4/path'); + storage.delete('foo4'); + storage.delete('some/foo4/path'); - await timeout(5); + await timeout(5); - storage.set('foo3', 'bar'); - await storage.set('some/foo3/path', 'some/bar/path'); + storage.set('foo3', 'bar'); + await storage.set('some/foo3/path', 'some/bar/path'); - const items = await storage.getStorage().getItems(); - strictEqual(items.get('foo'), 'bar'); - strictEqual(items.get('some/foo/path'), 'some/bar/path'); - strictEqual(items.has('foo1'), false); - strictEqual(items.has('some/foo1/path'), false); - strictEqual(items.get('foo2'), 'bar'); - strictEqual(items.get('some/foo2/path'), 'some/bar/path'); - strictEqual(items.get('foo3'), 'bar'); - strictEqual(items.get('some/foo3/path'), 'some/bar/path'); + const items = await storage.getStorage().getItems(); + strictEqual(items.get('foo'), 'bar'); + strictEqual(items.get('some/foo/path'), 'some/bar/path'); + strictEqual(items.has('foo1'), false); + strictEqual(items.has('some/foo1/path'), false); + strictEqual(items.get('foo2'), 'bar'); + strictEqual(items.get('some/foo2/path'), 'some/bar/path'); + strictEqual(items.get('foo3'), 'bar'); + strictEqual(items.get('some/foo3/path'), 'some/bar/path'); - await storage.close(); + await storage.close(); + }); }); test('lots of INSERT & DELETE (below inline max)', async () => { @@ -773,4 +774,18 @@ flakySuite('SQLite Storage Library', function () { await storage.close(); }); + + test('invalid path does not hang', async () => { + const storage = new SQLiteStorageDatabase(join(testdir, 'nonexist', 'storage.db')); + + let error; + try { + await storage.getItems(); + await storage.close(); + } catch (e) { + error = e; + } + + ok(error); + }); }); diff --git a/src/vs/base/test/browser/actionbar.test.ts b/src/vs/base/test/browser/actionbar.test.ts index 0fb8338d3eb..5c593ce1b69 100644 --- a/src/vs/base/test/browser/actionbar.test.ts +++ b/src/vs/base/test/browser/actionbar.test.ts @@ -10,15 +10,15 @@ import { Action, Separator } from 'vs/base/common/actions'; suite('Actionbar', () => { test('prepareActions()', function () { - let a1 = new Separator(); - let a2 = new Separator(); - let a3 = new Action('a3'); - let a4 = new Separator(); - let a5 = new Separator(); - let a6 = new Action('a6'); - let a7 = new Separator(); + const a1 = new Separator(); + const a2 = new Separator(); + const a3 = new Action('a3'); + const a4 = new Separator(); + const a5 = new Separator(); + const a6 = new Action('a6'); + const a7 = new Separator(); - let actions = prepareActions([a1, a2, a3, a4, a5, a6, a7]); + const actions = prepareActions([a1, a2, a3, a4, a5, a6, a7]); assert.strictEqual(actions.length, 3); // duplicate separators get removed assert(actions[0] === a3); assert(actions[1] === a5); @@ -29,8 +29,8 @@ suite('Actionbar', () => { const container = document.createElement('div'); const actionbar = new ActionBar(container); - let a1 = new Action('a1'); - let a2 = new Action('a2'); + const a1 = new Action('a1'); + const a2 = new Action('a2'); actionbar.push(a1); assert.strictEqual(actionbar.hasAction(a1), true); diff --git a/src/vs/base/test/browser/dom.test.ts b/src/vs/base/test/browser/dom.test.ts index a99cd9a5ed9..1ad53561927 100644 --- a/src/vs/base/test/browser/dom.test.ts +++ b/src/vs/base/test/browser/dom.test.ts @@ -4,13 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import * as dom from 'vs/base/browser/dom'; -const $ = dom.$; +import { $, h, multibyteAwareBtoa } from 'vs/base/browser/dom'; suite('dom', () => { test('hasClass', () => { - let element = document.createElement('div'); + const element = document.createElement('div'); element.className = 'foobar boo far'; assert(element.classList.contains('foobar')); @@ -55,7 +54,7 @@ suite('dom', () => { }); test('removeClass should consider hyphens', function () { - let element = document.createElement('div'); + const element = document.createElement('div'); element.classList.add('foo-bar'); element.classList.add('bar'); @@ -73,9 +72,9 @@ suite('dom', () => { }); test('multibyteAwareBtoa', () => { - assert.ok(dom.multibyteAwareBtoa('hello world').length > 0); - assert.ok(dom.multibyteAwareBtoa('åšŗäģŽå').length > 0); - assert.ok(dom.multibyteAwareBtoa(new Array(100000).fill('vs').join('')).length > 0); // https://github.com/microsoft/vscode/issues/112013 + assert.ok(multibyteAwareBtoa('hello world').length > 0); + assert.ok(multibyteAwareBtoa('åšŗäģŽå').length > 0); + assert.ok(multibyteAwareBtoa(new Array(100000).fill('vs').join('')).length > 0); // https://github.com/microsoft/vscode/issues/112013 }); suite('$', () => { @@ -113,7 +112,7 @@ suite('dom', () => { test('should build nodes with children', () => { let div = $('div', undefined, $('span', { id: 'demospan' })); - let firstChild = div.firstChild as HTMLElement; + const firstChild = div.firstChild as HTMLElement; assert.strictEqual(firstChild.tagName, 'SPAN'); assert.strictEqual(firstChild.id, 'demospan'); @@ -123,10 +122,158 @@ suite('dom', () => { }); test('should build nodes with text children', () => { - let div = $('div', undefined, 'foobar'); - let firstChild = div.firstChild as HTMLElement; + const div = $('div', undefined, 'foobar'); + const firstChild = div.firstChild as HTMLElement; assert.strictEqual(firstChild.tagName, undefined); assert.strictEqual(firstChild.textContent, 'foobar'); }); }); + + suite('h', () => { + test('should build simple nodes', () => { + const div = h('div'); + assert(div.root instanceof HTMLElement); + assert.strictEqual(div.root.tagName, 'DIV'); + + const span = h('span'); + assert(span.root instanceof HTMLElement); + assert.strictEqual(span.root.tagName, 'SPAN'); + + const img = h('img'); + assert(img.root instanceof HTMLElement); + assert.strictEqual(img.root.tagName, 'IMG'); + }); + + test('should handle ids and classes', () => { + const divId = h('div#myid'); + assert.strictEqual(divId.root.tagName, 'DIV'); + assert.strictEqual(divId.root.id, 'myid'); + + const divClass = h('div.a'); + assert.strictEqual(divClass.root.tagName, 'DIV'); + assert.strictEqual(divClass.root.classList.length, 1); + assert(divClass.root.classList.contains('a')); + + const divClasses = h('div.a.b.c'); + assert.strictEqual(divClasses.root.tagName, 'DIV'); + assert.strictEqual(divClasses.root.classList.length, 3); + assert(divClasses.root.classList.contains('a')); + assert(divClasses.root.classList.contains('b')); + assert(divClasses.root.classList.contains('c')); + + const divAll = h('div#myid.a.b.c'); + assert.strictEqual(divAll.root.tagName, 'DIV'); + assert.strictEqual(divAll.root.id, 'myid'); + assert.strictEqual(divAll.root.classList.length, 3); + assert(divAll.root.classList.contains('a')); + assert(divAll.root.classList.contains('b')); + assert(divAll.root.classList.contains('c')); + + const spanId = h('span#myid'); + assert.strictEqual(spanId.root.tagName, 'SPAN'); + assert.strictEqual(spanId.root.id, 'myid'); + + const spanClass = h('span.a'); + assert.strictEqual(spanClass.root.tagName, 'SPAN'); + assert.strictEqual(spanClass.root.classList.length, 1); + assert(spanClass.root.classList.contains('a')); + + const spanClasses = h('span.a.b.c'); + assert.strictEqual(spanClasses.root.tagName, 'SPAN'); + assert.strictEqual(spanClasses.root.classList.length, 3); + assert(spanClasses.root.classList.contains('a')); + assert(spanClasses.root.classList.contains('b')); + assert(spanClasses.root.classList.contains('c')); + + const spanAll = h('span#myid.a.b.c'); + assert.strictEqual(spanAll.root.tagName, 'SPAN'); + assert.strictEqual(spanAll.root.id, 'myid'); + assert.strictEqual(spanAll.root.classList.length, 3); + assert(spanAll.root.classList.contains('a')); + assert(spanAll.root.classList.contains('b')); + assert(spanAll.root.classList.contains('c')); + }); + + test('should implicitly handle ids and classes', () => { + const divId = h('#myid'); + assert.strictEqual(divId.root.tagName, 'DIV'); + assert.strictEqual(divId.root.id, 'myid'); + + const divClass = h('.a'); + assert.strictEqual(divClass.root.tagName, 'DIV'); + assert.strictEqual(divClass.root.classList.length, 1); + assert(divClass.root.classList.contains('a')); + + const divClasses = h('.a.b.c'); + assert.strictEqual(divClasses.root.tagName, 'DIV'); + assert.strictEqual(divClasses.root.classList.length, 3); + assert(divClasses.root.classList.contains('a')); + assert(divClasses.root.classList.contains('b')); + assert(divClasses.root.classList.contains('c')); + + const divAll = h('#myid.a.b.c'); + assert.strictEqual(divAll.root.tagName, 'DIV'); + assert.strictEqual(divAll.root.id, 'myid'); + assert.strictEqual(divAll.root.classList.length, 3); + assert(divAll.root.classList.contains('a')); + assert(divAll.root.classList.contains('b')); + assert(divAll.root.classList.contains('c')); + }); + + test('should handle @ identifiers', () => { + const implicit = h('@el'); + assert.strictEqual(implicit.root, implicit.el); + assert.strictEqual(implicit.el.tagName, 'DIV'); + + const explicit = h('div@el'); + assert.strictEqual(explicit.root, explicit.el); + assert.strictEqual(explicit.el.tagName, 'DIV'); + + const implicitId = h('#myid@el'); + assert.strictEqual(implicitId.root, implicitId.el); + assert.strictEqual(implicitId.el.tagName, 'DIV'); + assert.strictEqual(implicitId.root.id, 'myid'); + + const explicitId = h('div#myid@el'); + assert.strictEqual(explicitId.root, explicitId.el); + assert.strictEqual(explicitId.el.tagName, 'DIV'); + assert.strictEqual(explicitId.root.id, 'myid'); + + const implicitClass = h('.a@el'); + assert.strictEqual(implicitClass.root, implicitClass.el); + assert.strictEqual(implicitClass.el.tagName, 'DIV'); + assert.strictEqual(implicitClass.root.classList.length, 1); + assert(implicitClass.root.classList.contains('a')); + + const explicitClass = h('div.a@el'); + assert.strictEqual(explicitClass.root, explicitClass.el); + assert.strictEqual(explicitClass.el.tagName, 'DIV'); + assert.strictEqual(explicitClass.root.classList.length, 1); + assert(explicitClass.root.classList.contains('a')); + }); + }); + + test('should recurse', () => { + const result = h('div.code-view', [ + h('div.title@title'), + h('div.container', [ + h('div.gutter@gutterDiv'), + h('span@editor'), + ]), + ]); + + assert.strictEqual(result.root.tagName, 'DIV'); + assert.strictEqual(result.root.className, 'code-view'); + assert.strictEqual(result.root.childElementCount, 2); + assert.strictEqual(result.root.firstElementChild, result.title); + assert.strictEqual(result.title.tagName, 'DIV'); + assert.strictEqual(result.title.className, 'title'); + assert.strictEqual(result.title.childElementCount, 0); + assert.strictEqual(result.gutterDiv.tagName, 'DIV'); + assert.strictEqual(result.gutterDiv.className, 'gutter'); + assert.strictEqual(result.gutterDiv.childElementCount, 0); + assert.strictEqual(result.editor.tagName, 'SPAN'); + assert.strictEqual(result.editor.className, ''); + assert.strictEqual(result.editor.childElementCount, 0); + }); }); diff --git a/src/vs/base/test/browser/formattedTextRenderer.test.ts b/src/vs/base/test/browser/formattedTextRenderer.test.ts index e6b0611ddce..f12ca3222ee 100644 --- a/src/vs/base/test/browser/formattedTextRenderer.test.ts +++ b/src/vs/base/test/browser/formattedTextRenderer.test.ts @@ -19,7 +19,7 @@ suite('FormattedTextRenderer', () => { }); test('render simple element', () => { - let result: HTMLElement = renderText('testing'); + const result: HTMLElement = renderText('testing'); assert.strictEqual(result.nodeType, document.ELEMENT_NODE); assert.strictEqual(result.textContent, 'testing'); @@ -27,7 +27,7 @@ suite('FormattedTextRenderer', () => { }); test('render element with class', () => { - let result: HTMLElement = renderText('testing', { + const result: HTMLElement = renderText('testing', { className: 'testClass' }); assert.strictEqual(result.nodeType, document.ELEMENT_NODE); @@ -55,18 +55,18 @@ suite('FormattedTextRenderer', () => { }); test('no formatting', () => { - let result: HTMLElement = renderFormattedText('this is just a string'); + const result: HTMLElement = renderFormattedText('this is just a string'); assert.strictEqual(result.innerHTML, 'this is just a string'); }); test('preserve newlines', () => { - let result: HTMLElement = renderFormattedText('line one\nline two'); + const result: HTMLElement = renderFormattedText('line one\nline two'); assert.strictEqual(result.innerHTML, 'line one
        line two'); }); test('action', () => { let callbackCalled = false; - let result: HTMLElement = renderFormattedText('[[action]]', { + const result: HTMLElement = renderFormattedText('[[action]]', { actionHandler: { callback(content) { assert.strictEqual(content, '0'); @@ -77,7 +77,7 @@ suite('FormattedTextRenderer', () => { }); assert.strictEqual(result.innerHTML, 'action'); - let event: MouseEvent = document.createEvent('MouseEvent'); + const event: MouseEvent = document.createEvent('MouseEvent'); event.initEvent('click', true, true); result.firstChild!.dispatchEvent(event); assert.strictEqual(callbackCalled, true); @@ -85,7 +85,7 @@ suite('FormattedTextRenderer', () => { test('fancy action', () => { let callbackCalled = false; - let result: HTMLElement = renderFormattedText('__**[[action]]**__', { + const result: HTMLElement = renderFormattedText('__**[[action]]**__', { actionHandler: { callback(content) { assert.strictEqual(content, '0'); @@ -96,7 +96,7 @@ suite('FormattedTextRenderer', () => { }); assert.strictEqual(result.innerHTML, 'action'); - let event: MouseEvent = document.createEvent('MouseEvent'); + const event: MouseEvent = document.createEvent('MouseEvent'); event.initEvent('click', true, true); result.firstChild!.firstChild!.firstChild!.dispatchEvent(event); assert.strictEqual(callbackCalled, true); @@ -104,7 +104,7 @@ suite('FormattedTextRenderer', () => { test('fancier action', () => { let callbackCalled = false; - let result: HTMLElement = renderFormattedText('``__**[[action]]**__``', { + const result: HTMLElement = renderFormattedText('``__**[[action]]**__``', { renderCodeSegments: true, actionHandler: { callback(content) { @@ -116,14 +116,14 @@ suite('FormattedTextRenderer', () => { }); assert.strictEqual(result.innerHTML, 'action'); - let event: MouseEvent = document.createEvent('MouseEvent'); + const event: MouseEvent = document.createEvent('MouseEvent'); event.initEvent('click', true, true); result.firstChild!.firstChild!.firstChild!.firstChild!.dispatchEvent(event); assert.strictEqual(callbackCalled, true); }); test('escaped formatting', () => { - let result: HTMLElement = renderFormattedText('\\*\\*bold\\*\\*'); + const result: HTMLElement = renderFormattedText('\\*\\*bold\\*\\*'); assert.strictEqual(result.children.length, 0); assert.strictEqual(result.innerHTML, '**bold**'); }); diff --git a/src/vs/base/test/browser/indexedDB.test.ts b/src/vs/base/test/browser/indexedDB.test.ts index 581b6719148..ba9dcd0f51c 100644 --- a/src/vs/base/test/browser/indexedDB.test.ts +++ b/src/vs/base/test/browser/indexedDB.test.ts @@ -16,9 +16,7 @@ flakySuite('IndexedDB', () => { }); teardown(() => { - if (indexedDB) { - indexedDB.close(); - } + indexedDB?.close(); }); test('runInTransaction', async () => { diff --git a/src/vs/base/test/browser/markdownRenderer.test.ts b/src/vs/base/test/browser/markdownRenderer.test.ts index 562c22d790f..f30fc44b962 100644 --- a/src/vs/base/test/browser/markdownRenderer.test.ts +++ b/src/vs/base/test/browser/markdownRenderer.test.ts @@ -68,7 +68,7 @@ suite('MarkdownRenderer', () => { }); suite('Code block renderer', () => { - const simpleCodeBlockRenderer = (code: string): Promise => { + const simpleCodeBlockRenderer = (lang: string, code: string): Promise => { const element = document.createElement('code'); element.textContent = code; return Promise.resolve(element); @@ -92,7 +92,7 @@ suite('MarkdownRenderer', () => { codeBlockRenderer: simpleCodeBlockRenderer }); result.dispose(); - setTimeout(resolve, 250); + setTimeout(resolve, 50); }); }); @@ -111,10 +111,23 @@ suite('MarkdownRenderer', () => { setTimeout(() => { result.dispose(); resolveCodeBlockRendering(document.createElement('code')); - setTimeout(resolve, 250); - }, 250); + setTimeout(resolve, 50); + }, 50); }); }); + + test('Code blocks should use leading language id (#157793)', async () => { + const markdown = { value: '```js some other stuff\n1 + 1;\n```' }; + const lang = await new Promise(resolve => { + renderMarkdown(markdown, { + codeBlockRenderer: async (lang, value) => { + resolve(lang); + return simpleCodeBlockRenderer(lang, value); + } + }); + }); + assert.strictEqual(lang, 'js'); + }); }); suite('ThemeIcons Support On', () => { @@ -123,7 +136,7 @@ suite('MarkdownRenderer', () => { const mds = new MarkdownString(undefined, { supportThemeIcons: true }); mds.appendText('$(zap) $(not a theme icon) $(add)'); - let result: HTMLElement = renderMarkdown(mds).element; + const result: HTMLElement = renderMarkdown(mds).element; assert.strictEqual(result.innerHTML, `

        $(zap) $(not a theme icon) $(add)

        `); }); @@ -131,7 +144,7 @@ suite('MarkdownRenderer', () => { const mds = new MarkdownString(undefined, { supportThemeIcons: true }); mds.appendMarkdown('$(zap) $(not a theme icon) $(add)'); - let result: HTMLElement = renderMarkdown(mds).element; + const result: HTMLElement = renderMarkdown(mds).element; assert.strictEqual(result.innerHTML, `

        $(not a theme icon)

        `); }); @@ -139,7 +152,7 @@ suite('MarkdownRenderer', () => { const mds = new MarkdownString(undefined, { supportThemeIcons: true }); mds.appendMarkdown('\\$(zap) $(not a theme icon) $(add)'); - let result: HTMLElement = renderMarkdown(mds).element; + const result: HTMLElement = renderMarkdown(mds).element; assert.strictEqual(result.innerHTML, `

        $(zap) $(not a theme icon)

        `); }); @@ -147,7 +160,7 @@ suite('MarkdownRenderer', () => { const mds = new MarkdownString(undefined, { supportThemeIcons: true }); mds.appendMarkdown(`[$(zap)-link](#link)`); - let result: HTMLElement = renderMarkdown(mds).element; + const result: HTMLElement = renderMarkdown(mds).element; assert.strictEqual(result.innerHTML, `

        -link

        `); }); @@ -158,7 +171,7 @@ suite('MarkdownRenderer', () => { |--------|----------------------| | $(zap) | [$(zap)-link](#link) |`); - let result: HTMLElement = renderMarkdown(mds).element; + const result: HTMLElement = renderMarkdown(mds).element; assert.strictEqual(result.innerHTML, ` @@ -173,6 +186,14 @@ suite('MarkdownRenderer', () => {
        `); }); + + test('render icon in without href (#152170)', () => { + const mds = new MarkdownString(undefined, { supportThemeIcons: true, supportHtml: true }); + mds.appendMarkdown(`$(sync)`); + + const result: HTMLElement = renderMarkdown(mds).element; + assert.strictEqual(result.innerHTML, `

        `); + }); }); suite('ThemeIcons Support Off', () => { @@ -181,7 +202,7 @@ suite('MarkdownRenderer', () => { const mds = new MarkdownString(undefined, { supportThemeIcons: false }); mds.appendText('$(zap) $(not a theme icon) $(add)'); - let result: HTMLElement = renderMarkdown(mds).element; + const result: HTMLElement = renderMarkdown(mds).element; assert.strictEqual(result.innerHTML, `

        $(zap) $(not a theme icon) $(add)

        `); }); @@ -189,7 +210,7 @@ suite('MarkdownRenderer', () => { const mds = new MarkdownString(undefined, { supportThemeIcons: false }); mds.appendMarkdown('\\$(zap) $(not a theme icon) $(add)'); - let result: HTMLElement = renderMarkdown(mds).element; + const result: HTMLElement = renderMarkdown(mds).element; assert.strictEqual(result.innerHTML, `

        $(zap) $(not a theme icon) $(add)

        `); }); }); diff --git a/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts b/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts index f5813d84446..24d4915cca2 100644 --- a/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts +++ b/src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts @@ -8,7 +8,7 @@ import { ScrollbarState } from 'vs/base/browser/ui/scrollbar/scrollbarState'; suite('ScrollbarState', () => { test('inflates slider size', () => { - let actual = new ScrollbarState(0, 14, 0, 339, 42423, 32787); + const actual = new ScrollbarState(0, 14, 0, 339, 42423, 32787); assert.strictEqual(actual.getArrowSize(), 0); assert.strictEqual(actual.getScrollPosition(), 32787); @@ -34,7 +34,7 @@ suite('ScrollbarState', () => { }); test('inflates slider size with arrows', () => { - let actual = new ScrollbarState(12, 14, 0, 339, 42423, 32787); + const actual = new ScrollbarState(12, 14, 0, 339, 42423, 32787); assert.strictEqual(actual.getArrowSize(), 12); assert.strictEqual(actual.getScrollPosition(), 32787); diff --git a/src/vs/base/test/browser/ui/splitview/splitview.test.ts b/src/vs/base/test/browser/ui/splitview/splitview.test.ts index be85ad23c15..53819418bbe 100644 --- a/src/vs/base/test/browser/ui/splitview/splitview.test.ts +++ b/src/vs/base/test/browser/ui/splitview/splitview.test.ts @@ -271,7 +271,7 @@ suite('Splitview', () => { splitview.addView(view2, Sizing.Distribute); splitview.addView(view3, Sizing.Distribute); - let sashes = getSashes(splitview); + const sashes = getSashes(splitview); assert.strictEqual(sashes.length, 2, 'there are two sashes'); assert.strictEqual(sashes[0].state, SashState.Enabled, 'first sash is enabled'); assert.strictEqual(sashes[1].state, SashState.Enabled, 'second sash is enabled'); diff --git a/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts b/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts index d4668133a7f..d10d76b0b85 100644 --- a/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts +++ b/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts @@ -8,6 +8,7 @@ import { IIdentityProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list import { AsyncDataTree } from 'vs/base/browser/ui/tree/asyncDataTree'; import { IAsyncDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree'; import { timeout } from 'vs/base/common/async'; +import { Iterable } from 'vs/base/common/iterator'; interface Element { id: string; @@ -101,7 +102,7 @@ suite('AsyncDataTree', function () { await tree.setInput(model.root); assert.strictEqual(container.querySelectorAll('.monaco-list-row').length, 1); - let twistie = container.querySelector('.monaco-list-row:first-child .monaco-tl-twistie') as HTMLElement; + const twistie = container.querySelector('.monaco-list-row:first-child .monaco-tl-twistie') as HTMLElement; assert(!twistie.classList.contains('collapsible')); assert(!twistie.classList.contains('collapsed')); @@ -435,4 +436,60 @@ suite('AsyncDataTree', function () { assert.deepStrictEqual(Array.from(container.querySelectorAll('.monaco-list-row')).map(e => e.textContent), ['a', 'b2']); }); + + test('issue #121567', async () => { + const container = document.createElement('div'); + + const calls: Element[] = []; + const dataSource = new class implements IAsyncDataSource { + hasChildren(element: Element): boolean { + return !!element.children && element.children.length > 0; + } + async getChildren(element: Element) { + calls.push(element); + return element.children ?? Iterable.empty(); + } + }; + + const model = new Model({ + id: 'root', + children: [{ + id: 'a', children: [{ + id: 'aa' + }] + }] + }); + const a = model.get('a'); + + const tree = new AsyncDataTree('test', container, new VirtualDelegate(), [new Renderer()], dataSource, { identityProvider: new IdentityProvider() }); + tree.layout(200); + + await tree.setInput(model.root); + assert.strictEqual(calls.length, 1, 'There should be a single getChildren call for the root'); + assert(tree.isCollapsible(a), 'a is collapsible'); + assert(tree.isCollapsed(a), 'a is collapsed'); + + await tree.updateChildren(a, false); + assert.strictEqual(calls.length, 1, 'There should be no changes to the calls list, since a was collapsed'); + assert(tree.isCollapsible(a), 'a is collapsible'); + assert(tree.isCollapsed(a), 'a is collapsed'); + + const children = a.children; + a.children = []; + await tree.updateChildren(a, false); + assert.strictEqual(calls.length, 1, 'There should still be no changes to the calls list, since a was collapsed'); + assert(!tree.isCollapsible(a), 'a is no longer collapsible'); + assert(tree.isCollapsed(a), 'a is collapsed'); + + a.children = children; + await tree.updateChildren(a, false); + assert.strictEqual(calls.length, 1, 'There should still be no changes to the calls list, since a was collapsed'); + assert(tree.isCollapsible(a), 'a is collapsible again'); + assert(tree.isCollapsed(a), 'a is collapsed'); + + await tree.expand(a); + assert.strictEqual(calls.length, 2, 'Finally, there should be a getChildren call for a'); + assert(tree.isCollapsible(a), 'a is still collapsible'); + assert(!tree.isCollapsed(a), 'a is expanded'); + }); }); diff --git a/src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts b/src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts index e62a4fbe39e..beee230cbad 100644 --- a/src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts +++ b/src/vs/base/test/browser/ui/tree/compressedObjectTreeModel.test.ts @@ -17,7 +17,7 @@ interface IResolvedCompressedTreeElement extends ICompressedTreeElement { function resolve(treeElement: ICompressedTreeElement): IResolvedCompressedTreeElement { const result: any = { element: treeElement.element }; - const children = [...Iterable.map(Iterable.from(treeElement.children), resolve)]; + const children = Array.from(Iterable.from(treeElement.children), resolve); if (treeElement.incompressible) { result.incompressible = true; diff --git a/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts b/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts index 3ca7b9e0e58..9ae0e08b0f1 100644 --- a/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts +++ b/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts @@ -358,7 +358,7 @@ suite('IndexTreeModel', () => { assert.deepStrictEqual(list.length, 3); - model.setCollapsed([0], false); + model.expandTo([0, 1]); assert.deepStrictEqual(list.length, 6); assert.deepStrictEqual(list[0].element, 0); assert.deepStrictEqual(list[0].collapsed, false); @@ -400,7 +400,7 @@ suite('IndexTreeModel', () => { const deleteCount = Math.ceil(Math.random() * (list.length - spliceIndex)); const insertCount = Math.floor(Math.random() * maxInserts + 1); - let inserts: ITreeElement[] = []; + const inserts: ITreeElement[] = []; for (let i = 0; i < insertCount; i++) { const element = elementCounter++; inserts.push({ element, children: [] }); diff --git a/src/vs/base/test/browser/ui/tree/objectTreeModel.test.ts b/src/vs/base/test/browser/ui/tree/objectTreeModel.test.ts index 58cc33bc6f2..df96ed68409 100644 --- a/src/vs/base/test/browser/ui/tree/objectTreeModel.test.ts +++ b/src/vs/base/test/browser/ui/tree/objectTreeModel.test.ts @@ -172,7 +172,7 @@ suite('ObjectTreeModel', function () { }); test('sorter', () => { - let compare: (a: string, b: string) => number = (a, b) => a < b ? -1 : 1; + const compare: (a: string, b: string) => number = (a, b) => a < b ? -1 : 1; const list: ITreeNode[] = []; const model = new ObjectTreeModel('test', toList(list), { sorter: { compare(a, b) { return compare(a, b); } } }); diff --git a/src/vs/base/test/common/arrays.test.ts b/src/vs/base/test/common/arrays.test.ts index 7a371c93a7f..23e2b720421 100644 --- a/src/vs/base/test/common/arrays.test.ts +++ b/src/vs/base/test/common/arrays.test.ts @@ -6,6 +6,19 @@ import * as assert from 'assert'; import * as arrays from 'vs/base/common/arrays'; suite('Arrays', () => { + + test('removeFastWithoutKeepingOrder', () => { + const array = [1, 4, 5, 7, 55, 59, 60, 61, 64, 69]; + arrays.removeFastWithoutKeepingOrder(array, 1); + assert.deepStrictEqual(array, [1, 69, 5, 7, 55, 59, 60, 61, 64]); + + arrays.removeFastWithoutKeepingOrder(array, 0); + assert.deepStrictEqual(array, [64, 69, 5, 7, 55, 59, 60, 61]); + + arrays.removeFastWithoutKeepingOrder(array, 7); + assert.deepStrictEqual(array, [64, 69, 5, 7, 55, 59, 60]); + }); + test('findFirst', () => { const array = [1, 4, 5, 7, 55, 59, 60, 61, 64, 69]; @@ -35,10 +48,10 @@ suite('Arrays', () => { function assertMedian(expexted: number, data: number[], nth: number = Math.floor(data.length / 2)) { const compare = (a: number, b: number) => a - b; - let actual1 = arrays.quickSelect(nth, data, compare); + const actual1 = arrays.quickSelect(nth, data, compare); assert.strictEqual(actual1, expexted); - let actual2 = data.slice().sort(compare)[nth]; + const actual2 = data.slice().sort(compare)[nth]; assert.strictEqual(actual2, expexted); } @@ -231,7 +244,7 @@ suite('Arrays', () => { } test('coalesce', () => { - let a: Array = arrays.coalesce([null, 1, null, 2, 3]); + const a: Array = arrays.coalesce([null, 1, null, 2, 3]); assert.strictEqual(a.length, 3); assert.strictEqual(a[0], 1); assert.strictEqual(a[1], 2); @@ -281,7 +294,7 @@ suite('Arrays', () => { assert.strictEqual(a[1], 2); assert.strictEqual(a[2], 3); - let b: number[] = []; + const b: number[] = []; b[10] = 1; b[20] = 2; b[30] = 3; @@ -291,7 +304,7 @@ suite('Arrays', () => { assert.strictEqual(b[1], 2); assert.strictEqual(b[2], 3); - let sparse: number[] = []; + const sparse: number[] = []; sparse[0] = 1; sparse[1] = 1; sparse[17] = 1; diff --git a/src/vs/base/test/common/async.test.ts b/src/vs/base/test/common/async.test.ts index b7f56b564b4..a63ba7b9897 100644 --- a/src/vs/base/test/common/async.test.ts +++ b/src/vs/base/test/common/async.test.ts @@ -15,11 +15,11 @@ suite('Async', () => { suite('cancelablePromise', function () { test('set token, don\'t wait for inner promise', function () { let canceled = 0; - let promise = async.createCancelablePromise(token => { + const promise = async.createCancelablePromise(token => { token.onCancellationRequested(_ => { canceled += 1; }); return new Promise(resolve => { /*never*/ }); }); - let result = promise.then(_ => assert.ok(false), err => { + const result = promise.then(_ => assert.ok(false), err => { assert.strictEqual(canceled, 1); assert.ok(isCancellationError(err)); }); @@ -30,11 +30,11 @@ suite('Async', () => { test('cancel despite inner promise being resolved', function () { let canceled = 0; - let promise = async.createCancelablePromise(token => { + const promise = async.createCancelablePromise(token => { token.onCancellationRequested(_ => { canceled += 1; }); return Promise.resolve(1234); }); - let result = promise.then(_ => assert.ok(false), err => { + const result = promise.then(_ => assert.ok(false), err => { assert.strictEqual(canceled, 1); assert.ok(isCancellationError(err)); }); @@ -88,11 +88,11 @@ suite('Async', () => { }); test('get inner result', async function () { - let promise = async.createCancelablePromise(token => { + const promise = async.createCancelablePromise(token => { return async.timeout(12).then(_ => 1234); }); - let result = await promise; + const result = await promise; assert.strictEqual(result, 1234); }); }); @@ -100,11 +100,11 @@ suite('Async', () => { suite('Throttler', function () { test('non async', function () { let count = 0; - let factory = () => { + const factory = () => { return Promise.resolve(++count); }; - let throttler = new async.Throttler(); + const throttler = new async.Throttler(); return Promise.all([ throttler.queue(factory).then((result) => { assert.strictEqual(result, 1); }), @@ -117,9 +117,9 @@ suite('Async', () => { test('async', () => { let count = 0; - let factory = () => async.timeout(0).then(() => ++count); + const factory = () => async.timeout(0).then(() => ++count); - let throttler = new async.Throttler(); + const throttler = new async.Throttler(); return Promise.all([ throttler.queue(factory).then((result) => { assert.strictEqual(result, 1); }), @@ -139,13 +139,13 @@ suite('Async', () => { }); test('last factory should be the one getting called', function () { - let factoryFactory = (n: number) => () => { + const factoryFactory = (n: number) => () => { return async.timeout(0).then(() => n); }; - let throttler = new async.Throttler(); + const throttler = new async.Throttler(); - let promises: Promise[] = []; + const promises: Promise[] = []; promises.push(throttler.queue(factoryFactory(1)).then((n) => { assert.strictEqual(n, 1); })); promises.push(throttler.queue(factoryFactory(2)).then((n) => { assert.strictEqual(n, 3); })); @@ -158,12 +158,12 @@ suite('Async', () => { suite('Delayer', function () { test('simple', () => { let count = 0; - let factory = () => { + const factory = () => { return Promise.resolve(++count); }; - let delayer = new async.Delayer(0); - let promises: Promise[] = []; + const delayer = new async.Delayer(0); + const promises: Promise[] = []; assert(!delayer.isTriggered()); @@ -183,12 +183,12 @@ suite('Async', () => { test('microtask delay simple', () => { let count = 0; - let factory = () => { + const factory = () => { return Promise.resolve(++count); }; - let delayer = new async.Delayer(async.MicrotaskDelay); - let promises: Promise[] = []; + const delayer = new async.Delayer(async.MicrotaskDelay); + const promises: Promise[] = []; assert(!delayer.isTriggered()); @@ -223,11 +223,11 @@ suite('Async', () => { test('simple cancel', function () { let count = 0; - let factory = () => { + const factory = () => { return Promise.resolve(++count); }; - let delayer = new async.Delayer(0); + const delayer = new async.Delayer(0); assert(!delayer.isTriggered()); @@ -246,11 +246,11 @@ suite('Async', () => { test('simple cancel microtask', function () { let count = 0; - let factory = () => { + const factory = () => { return Promise.resolve(++count); }; - let delayer = new async.Delayer(async.MicrotaskDelay); + const delayer = new async.Delayer(async.MicrotaskDelay); assert(!delayer.isTriggered()); @@ -269,12 +269,12 @@ suite('Async', () => { test('cancel should cancel all calls to trigger', function () { let count = 0; - let factory = () => { + const factory = () => { return Promise.resolve(++count); }; - let delayer = new async.Delayer(0); - let promises: Promise[] = []; + const delayer = new async.Delayer(0); + const promises: Promise[] = []; assert(!delayer.isTriggered()); @@ -296,11 +296,11 @@ suite('Async', () => { test('trigger, cancel, then trigger again', function () { let count = 0; - let factory = () => { + const factory = () => { return Promise.resolve(++count); }; - let delayer = new async.Delayer(0); + const delayer = new async.Delayer(0); let promises: Promise[] = []; assert(!delayer.isTriggered()); @@ -346,12 +346,12 @@ suite('Async', () => { }); test('last task should be the one getting called', function () { - let factoryFactory = (n: number) => () => { + const factoryFactory = (n: number) => () => { return Promise.resolve(n); }; - let delayer = new async.Delayer(0); - let promises: Promise[] = []; + const delayer = new async.Delayer(0); + const promises: Promise[] = []; assert(!delayer.isTriggered()); @@ -371,7 +371,7 @@ suite('Async', () => { suite('sequence', () => { test('simple', () => { - let factoryFactory = (n: number) => () => { + const factoryFactory = (n: number) => () => { return Promise.resolve(n); }; @@ -394,7 +394,7 @@ suite('Async', () => { suite('Limiter', () => { test('sync', function () { - let factoryFactory = (n: number) => () => { + const factoryFactory = (n: number) => () => { return Promise.resolve(n); }; @@ -418,7 +418,7 @@ suite('Async', () => { }); test('async', function () { - let factoryFactory = (n: number) => () => async.timeout(0).then(() => n); + const factoryFactory = (n: number) => () => async.timeout(0).then(() => n); let limiter = new async.Limiter(1); let promises: Promise[] = []; @@ -440,15 +440,15 @@ suite('Async', () => { test('assert degree of paralellism', function () { let activePromises = 0; - let factoryFactory = (n: number) => () => { + const factoryFactory = (n: number) => () => { activePromises++; assert(activePromises < 6); return async.timeout(0).then(() => { activePromises--; return n; }); }; - let limiter = new async.Limiter(5); + const limiter = new async.Limiter(5); - let promises: Promise[] = []; + const promises: Promise[] = []; [0, 1, 2, 3, 4, 5, 6, 7, 8, 9].forEach(n => promises.push(limiter.queue(factoryFactory(n)))); return Promise.all(promises).then((res) => { @@ -460,13 +460,13 @@ suite('Async', () => { suite('Queue', () => { test('simple', function () { - let queue = new async.Queue(); + const queue = new async.Queue(); let syncPromise = false; - let f1 = () => Promise.resolve(true).then(() => syncPromise = true); + const f1 = () => Promise.resolve(true).then(() => syncPromise = true); let asyncPromise = false; - let f2 = () => async.timeout(10).then(() => asyncPromise = true); + const f2 = () => async.timeout(10).then(() => asyncPromise = true); assert.strictEqual(queue.size, 0); @@ -483,15 +483,15 @@ suite('Async', () => { }); test('order is kept', function () { - let queue = new async.Queue(); + const queue = new async.Queue(); - let res: number[] = []; + const res: number[] = []; - let f1 = () => Promise.resolve(true).then(() => res.push(1)); - let f2 = () => async.timeout(10).then(() => res.push(2)); - let f3 = () => Promise.resolve(true).then(() => res.push(3)); - let f4 = () => async.timeout(20).then(() => res.push(4)); - let f5 = () => async.timeout(0).then(() => res.push(5)); + const f1 = () => Promise.resolve(true).then(() => res.push(1)); + const f2 = () => async.timeout(10).then(() => res.push(2)); + const f3 = () => Promise.resolve(true).then(() => res.push(3)); + const f4 = () => async.timeout(20).then(() => res.push(4)); + const f5 = () => async.timeout(0).then(() => res.push(5)); queue.queue(f1); queue.queue(f2); @@ -507,16 +507,16 @@ suite('Async', () => { }); test('errors bubble individually but not cause stop', function () { - let queue = new async.Queue(); + const queue = new async.Queue(); - let res: number[] = []; + const res: number[] = []; let error = false; - let f1 = () => Promise.resolve(true).then(() => res.push(1)); - let f2 = () => async.timeout(10).then(() => res.push(2)); - let f3 = () => Promise.resolve(true).then(() => Promise.reject(new Error('error'))); - let f4 = () => async.timeout(20).then(() => res.push(4)); - let f5 = () => async.timeout(0).then(() => res.push(5)); + const f1 = () => Promise.resolve(true).then(() => res.push(1)); + const f2 = () => async.timeout(10).then(() => res.push(2)); + const f3 = () => Promise.resolve(true).then(() => Promise.reject(new Error('error'))); + const f4 = () => async.timeout(20).then(() => res.push(4)); + const f5 = () => async.timeout(0).then(() => res.push(5)); queue.queue(f1); queue.queue(f2); @@ -532,15 +532,15 @@ suite('Async', () => { }); test('order is kept (chained)', function () { - let queue = new async.Queue(); + const queue = new async.Queue(); - let res: number[] = []; + const res: number[] = []; - let f1 = () => Promise.resolve(true).then(() => res.push(1)); - let f2 = () => async.timeout(10).then(() => res.push(2)); - let f3 = () => Promise.resolve(true).then(() => res.push(3)); - let f4 = () => async.timeout(20).then(() => res.push(4)); - let f5 = () => async.timeout(0).then(() => res.push(5)); + const f1 = () => Promise.resolve(true).then(() => res.push(1)); + const f2 = () => async.timeout(10).then(() => res.push(2)); + const f3 = () => Promise.resolve(true).then(() => res.push(3)); + const f4 = () => async.timeout(20).then(() => res.push(4)); + const f5 = () => async.timeout(0).then(() => res.push(5)); return queue.queue(f1).then(() => { return queue.queue(f2).then(() => { @@ -560,16 +560,16 @@ suite('Async', () => { }); test('events', async function () { - let queue = new async.Queue(); + const queue = new async.Queue(); let drained = false; const onDrained = Event.toPromise(queue.onDrained).then(() => drained = true); - let res: number[] = []; + const res: number[] = []; - let f1 = () => async.timeout(10).then(() => res.push(2)); - let f2 = () => async.timeout(20).then(() => res.push(4)); - let f3 = () => async.timeout(0).then(() => res.push(5)); + const f1 = () => async.timeout(10).then(() => res.push(2)); + const f2 = () => async.timeout(20).then(() => res.push(4)); + const f3 = () => async.timeout(0).then(() => res.push(5)); const q1 = queue.queue(f1); const q2 = queue.queue(f2); @@ -589,7 +589,7 @@ suite('Async', () => { suite('ResourceQueue', () => { test('simple', async function () { - let queue = new async.ResourceQueue(); + const queue = new async.ResourceQueue(); await queue.whenDrained(); // returns immediately since empty @@ -651,7 +651,7 @@ suite('Async', () => { }); test('error case', async () => { - let expectedError = new Error('fail'); + const expectedError = new Error('fail'); try { await async.retry(() => { return Promise.reject(expectedError); @@ -667,6 +667,7 @@ suite('Async', () => { const sequentializer = new async.TaskSequentializer(); assert.ok(!sequentializer.hasPending()); + assert.ok(!sequentializer.hasNext()); assert.ok(!sequentializer.hasPending(2323)); assert.ok(!sequentializer.pending); @@ -675,11 +676,13 @@ suite('Async', () => { assert.ok(!sequentializer.hasPending()); assert.ok(!sequentializer.hasPending(1)); assert.ok(!sequentializer.pending); + assert.ok(!sequentializer.hasNext()); // pending removes itself after done (use async.timeout) sequentializer.setPending(2, async.timeout(1)); assert.ok(sequentializer.hasPending()); assert.ok(sequentializer.hasPending(2)); + assert.ok(!sequentializer.hasNext()); assert.strictEqual(sequentializer.hasPending(1), false); assert.ok(sequentializer.pending); @@ -699,9 +702,12 @@ suite('Async', () => { let nextDone = false; const res = sequentializer.setNext(() => Promise.resolve(null).then(() => { nextDone = true; return; })); + assert.ok(sequentializer.hasNext()); + await res; assert.ok(pendingDone); assert.ok(nextDone); + assert.ok(!sequentializer.hasNext()); }); test('pending and next (finishes after timeout)', async function () { @@ -717,6 +723,42 @@ suite('Async', () => { await res; assert.ok(pendingDone); assert.ok(nextDone); + assert.ok(!sequentializer.hasNext()); + }); + + test('join (without next or pending)', async function () { + const sequentializer = new async.TaskSequentializer(); + + await sequentializer.join(); + assert.ok(!sequentializer.hasNext()); + }); + + test('join (without next)', async function () { + const sequentializer = new async.TaskSequentializer(); + + let pendingDone = false; + sequentializer.setPending(1, async.timeout(1).then(() => { pendingDone = true; return; })); + + await sequentializer.join(); + assert.ok(pendingDone); + assert.ok(!sequentializer.hasPending()); + }); + + test('join (with next and pending)', async function () { + const sequentializer = new async.TaskSequentializer(); + + let pendingDone = false; + sequentializer.setPending(1, async.timeout(1).then(() => { pendingDone = true; return; })); + + // next finishes after async.timeout + let nextDone = false; + sequentializer.setNext(() => async.timeout(1).then(() => { nextDone = true; return; })); + + await sequentializer.join(); + assert.ok(pendingDone); + assert.ok(nextDone); + assert.ok(!sequentializer.hasPending()); + assert.ok(!sequentializer.hasNext()); }); test('pending and multiple next (last one wins)', async function () { @@ -727,13 +769,13 @@ suite('Async', () => { // next finishes after async.timeout let firstDone = false; - let firstRes = sequentializer.setNext(() => async.timeout(2).then(() => { firstDone = true; return; })); + const firstRes = sequentializer.setNext(() => async.timeout(2).then(() => { firstDone = true; return; })); let secondDone = false; - let secondRes = sequentializer.setNext(() => async.timeout(3).then(() => { secondDone = true; return; })); + const secondRes = sequentializer.setNext(() => async.timeout(3).then(() => { secondDone = true; return; })); let thirdDone = false; - let thirdRes = sequentializer.setNext(() => async.timeout(4).then(() => { thirdDone = true; return; })); + const thirdRes = sequentializer.setNext(() => async.timeout(4).then(() => { thirdDone = true; return; })); await Promise.all([firstRes, secondRes, thirdRes]); assert.ok(pendingDone); @@ -1177,7 +1219,7 @@ suite('Async', () => { }); test('do not accept too much work', async () => { - let handled: number[] = []; + const handled: number[] = []; const handler = (units: readonly number[]) => handled.push(...units); const worker = new async.ThrottledWorker({ @@ -1203,7 +1245,7 @@ suite('Async', () => { }); test('do not accept too much work (account for max chunk size', async () => { - let handled: number[] = []; + const handled: number[] = []; const handler = (units: readonly number[]) => handled.push(...units); const worker = new async.ThrottledWorker({ @@ -1222,7 +1264,7 @@ suite('Async', () => { }); test('disposed', async () => { - let handled: number[] = []; + const handled: number[] = []; const handler = (units: readonly number[]) => handled.push(...units); const worker = new async.ThrottledWorker({ diff --git a/src/vs/base/test/common/buffer.test.ts b/src/vs/base/test/common/buffer.test.ts index c2ff953d3c4..ae210a549b3 100644 --- a/src/vs/base/test/common/buffer.test.ts +++ b/src/vs/base/test/common/buffer.test.ts @@ -40,7 +40,7 @@ suite('Buffer', () => { test('bufferWriteableStream - basics (no error)', async () => { const stream = newWriteableBufferStream(); - let chunks: VSBuffer[] = []; + const chunks: VSBuffer[] = []; stream.on('data', data => { chunks.push(data); }); @@ -50,7 +50,7 @@ suite('Buffer', () => { ended = true; }); - let errors: Error[] = []; + const errors: Error[] = []; stream.on('error', error => { errors.push(error); }); @@ -70,7 +70,7 @@ suite('Buffer', () => { test('bufferWriteableStream - basics (error)', async () => { const stream = newWriteableBufferStream(); - let chunks: VSBuffer[] = []; + const chunks: VSBuffer[] = []; stream.on('data', data => { chunks.push(data); }); @@ -80,7 +80,7 @@ suite('Buffer', () => { ended = true; }); - let errors: Error[] = []; + const errors: Error[] = []; stream.on('error', error => { errors.push(error); }); @@ -105,7 +105,7 @@ suite('Buffer', () => { await timeout(0); stream.end(VSBuffer.fromString('World')); - let chunks: VSBuffer[] = []; + const chunks: VSBuffer[] = []; stream.on('data', data => { chunks.push(data); }); @@ -115,7 +115,7 @@ suite('Buffer', () => { ended = true; }); - let errors: Error[] = []; + const errors: Error[] = []; stream.on('error', error => { errors.push(error); }); @@ -134,12 +134,12 @@ suite('Buffer', () => { await timeout(0); stream.error(new Error()); - let chunks: VSBuffer[] = []; + const chunks: VSBuffer[] = []; stream.on('data', data => { chunks.push(data); }); - let errors: Error[] = []; + const errors: Error[] = []; stream.on('error', error => { errors.push(error); }); @@ -170,12 +170,12 @@ suite('Buffer', () => { ended = true; }); - let chunks: VSBuffer[] = []; + const chunks: VSBuffer[] = []; stream.on('data', data => { chunks.push(data); }); - let errors: Error[] = []; + const errors: Error[] = []; stream.on('error', error => { errors.push(error); }); @@ -189,7 +189,7 @@ suite('Buffer', () => { test('bufferWriteableStream - nothing happens after end()', async () => { const stream = newWriteableBufferStream(); - let chunks: VSBuffer[] = []; + const chunks: VSBuffer[] = []; stream.on('data', data => { chunks.push(data); }); @@ -233,7 +233,7 @@ suite('Buffer', () => { test('bufferWriteableStream - pause/resume (simple)', async () => { const stream = newWriteableBufferStream(); - let chunks: VSBuffer[] = []; + const chunks: VSBuffer[] = []; stream.on('data', data => { chunks.push(data); }); @@ -243,7 +243,7 @@ suite('Buffer', () => { ended = true; }); - let errors: Error[] = []; + const errors: Error[] = []; stream.on('error', error => { errors.push(error); }); @@ -270,7 +270,7 @@ suite('Buffer', () => { test('bufferWriteableStream - pause/resume (pause after first write)', async () => { const stream = newWriteableBufferStream(); - let chunks: VSBuffer[] = []; + const chunks: VSBuffer[] = []; stream.on('data', data => { chunks.push(data); }); @@ -280,7 +280,7 @@ suite('Buffer', () => { ended = true; }); - let errors: Error[] = []; + const errors: Error[] = []; stream.on('error', error => { errors.push(error); }); @@ -310,7 +310,7 @@ suite('Buffer', () => { test('bufferWriteableStream - pause/resume (error)', async () => { const stream = newWriteableBufferStream(); - let chunks: VSBuffer[] = []; + const chunks: VSBuffer[] = []; stream.on('data', data => { chunks.push(data); }); @@ -320,7 +320,7 @@ suite('Buffer', () => { ended = true; }); - let errors: Error[] = []; + const errors: Error[] = []; stream.on('error', error => { errors.push(error); }); @@ -348,7 +348,7 @@ suite('Buffer', () => { test('bufferWriteableStream - destroy', async () => { const stream = newWriteableBufferStream(); - let chunks: VSBuffer[] = []; + const chunks: VSBuffer[] = []; stream.on('data', data => { chunks.push(data); }); @@ -358,7 +358,7 @@ suite('Buffer', () => { ended = true; }); - let errors: Error[] = []; + const errors: Error[] = []; stream.on('error', error => { errors.push(error); }); diff --git a/src/vs/base/test/common/cancellation.test.ts b/src/vs/base/test/common/cancellation.test.ts index 02bd2d2e8cb..0bf1cdecae3 100644 --- a/src/vs/base/test/common/cancellation.test.ts +++ b/src/vs/base/test/common/cancellation.test.ts @@ -27,7 +27,7 @@ suite('CancellationToken', function () { test('cancel happens only once', function () { - let source = new CancellationTokenSource(); + const source = new CancellationTokenSource(); assert.strictEqual(source.token.isCancellationRequested, false); let cancelCount = 0; @@ -47,7 +47,7 @@ suite('CancellationToken', function () { let count = 0; - let source = new CancellationTokenSource(); + const source = new CancellationTokenSource(); source.token.onCancellationRequested(function () { count += 1; }); @@ -84,7 +84,7 @@ suite('CancellationToken', function () { let count = 0; - let source = new CancellationTokenSource(); + const source = new CancellationTokenSource(); source.token.onCancellationRequested(function () { count += 1; }); @@ -98,7 +98,7 @@ suite('CancellationToken', function () { let count = 0; - let source = new CancellationTokenSource(); + const source = new CancellationTokenSource(); source.token.onCancellationRequested(function () { count += 1; }); @@ -110,8 +110,8 @@ suite('CancellationToken', function () { test('parent cancels child', function () { - let parent = new CancellationTokenSource(); - let child = new CancellationTokenSource(parent.token); + const parent = new CancellationTokenSource(); + const child = new CancellationTokenSource(parent.token); let count = 0; child.token.onCancellationRequested(() => count += 1); diff --git a/src/vs/base/test/common/collections.test.ts b/src/vs/base/test/common/collections.test.ts index a86eeab2de0..9dfe59a58fe 100644 --- a/src/vs/base/test/common/collections.test.ts +++ b/src/vs/base/test/common/collections.test.ts @@ -8,41 +8,17 @@ import * as collections from 'vs/base/common/collections'; suite('Collections', () => { - test('forEach', () => { - collections.forEach({}, () => assert(false)); - collections.forEach(Object.create(null), () => assert(false)); - - let count = 0; - collections.forEach({ toString: 123 }, () => count++); - assert.strictEqual(count, 1); - - count = 0; - let dict = Object.create(null); - dict['toString'] = 123; - collections.forEach(dict, () => count++); - assert.strictEqual(count, 1); - - collections.forEach(dict, () => false); - - collections.forEach(dict, (x, remove) => remove()); - assert.strictEqual(dict['toString'], undefined); - - // don't iterate over properties that are not on the object itself - let test = Object.create({ 'derived': true }); - collections.forEach(test, () => assert(false)); - }); - test('groupBy', () => { const group1 = 'a', group2 = 'b'; const value1 = 1, value2 = 2, value3 = 3; - let source = [ + const source = [ { key: group1, value: value1 }, { key: group1, value: value2 }, { key: group2, value: value3 }, ]; - let grouped = collections.groupBy(source, x => x.key); + const grouped = collections.groupBy(source, x => x.key); // Group 1 assert.strictEqual(grouped[group1].length, 2); diff --git a/src/vs/base/test/common/color.test.ts b/src/vs/base/test/common/color.test.ts index 2bd388ee5cc..be9dd23d614 100644 --- a/src/vs/base/test/common/color.test.ts +++ b/src/vs/base/test/common/color.test.ts @@ -9,7 +9,7 @@ import { Color, HSLA, HSVA, RGBA } from 'vs/base/common/color'; suite('Color', () => { test('isLighterColor', () => { - let color1 = new Color(new HSLA(60, 1, 0.5, 1)), color2 = new Color(new HSLA(0, 0, 0.753, 1)); + const color1 = new Color(new HSLA(60, 1, 0.5, 1)), color2 = new Color(new HSLA(0, 0, 0.753, 1)); assert.ok(color1.isLighterThan(color2)); @@ -18,7 +18,7 @@ suite('Color', () => { }); test('getLighterColor', () => { - let color1 = new Color(new HSLA(60, 1, 0.5, 1)), color2 = new Color(new HSLA(0, 0, 0.753, 1)); + const color1 = new Color(new HSLA(60, 1, 0.5, 1)), color2 = new Color(new HSLA(0, 0, 0.753, 1)); assert.deepStrictEqual(color1.hsla, Color.getLighterColor(color1, color2).hsla); assert.deepStrictEqual(new HSLA(0, 0, 0.916, 1), Color.getLighterColor(color2, color1).hsla); @@ -29,14 +29,14 @@ suite('Color', () => { }); test('isDarkerColor', () => { - let color1 = new Color(new HSLA(60, 1, 0.5, 1)), color2 = new Color(new HSLA(0, 0, 0.753, 1)); + const color1 = new Color(new HSLA(60, 1, 0.5, 1)), color2 = new Color(new HSLA(0, 0, 0.753, 1)); assert.ok(color2.isDarkerThan(color1)); }); test('getDarkerColor', () => { - let color1 = new Color(new HSLA(60, 1, 0.5, 1)), color2 = new Color(new HSLA(0, 0, 0.753, 1)); + const color1 = new Color(new HSLA(60, 1, 0.5, 1)), color2 = new Color(new HSLA(0, 0, 0.753, 1)); assert.deepStrictEqual(color2.hsla, Color.getDarkerColor(color2, color1).hsla); assert.deepStrictEqual(new HSLA(60, 1, 0.392, 1), Color.getDarkerColor(color1, color2).hsla); diff --git a/src/vs/base/test/common/diff/diff.test.ts b/src/vs/base/test/common/diff/diff.test.ts index 5bb62a6e29d..0ccb5b55535 100644 --- a/src/vs/base/test/common/diff/diff.test.ts +++ b/src/vs/base/test/common/diff/diff.test.ts @@ -25,8 +25,8 @@ function maskBasedSubstring(str: string, mask: boolean[]): string { } function assertAnswer(originalStr: string, modifiedStr: string, changes: IDiffChange[], answerStr: string, onlyLength: boolean = false): void { - let originalMask = createArray(originalStr.length, true); - let modifiedMask = createArray(modifiedStr.length, true); + const originalMask = createArray(originalStr.length, true); + const modifiedMask = createArray(modifiedStr.length, true); let i, j, change; for (i = 0; i < changes.length; i++) { @@ -45,8 +45,8 @@ function assertAnswer(originalStr: string, modifiedStr: string, changes: IDiffCh } } - let originalAnswer = maskBasedSubstring(originalStr, originalMask); - let modifiedAnswer = maskBasedSubstring(modifiedStr, modifiedMask); + const originalAnswer = maskBasedSubstring(originalStr, originalMask); + const modifiedAnswer = maskBasedSubstring(modifiedStr, modifiedMask); if (onlyLength) { assert.strictEqual(originalAnswer.length, answerStr.length); @@ -58,8 +58,8 @@ function assertAnswer(originalStr: string, modifiedStr: string, changes: IDiffCh } function lcsInnerTest(originalStr: string, modifiedStr: string, answerStr: string, onlyLength: boolean = false): void { - let diff = new LcsDiff(new StringDiffSequence(originalStr), new StringDiffSequence(modifiedStr)); - let changes = diff.ComputeDiff(false).changes; + const diff = new LcsDiff(new StringDiffSequence(originalStr), new StringDiffSequence(modifiedStr)); + const changes = diff.ComputeDiff(false).changes; assertAnswer(originalStr, modifiedStr, changes, answerStr, onlyLength); } @@ -98,8 +98,8 @@ suite('Diff', () => { suite('Diff - Ported from VS', () => { test('using continue processing predicate to quit early', function () { - let left = 'abcdef'; - let right = 'abxxcyyydzzzzezzzzzzzzzzzzzzzzzzzzf'; + const left = 'abcdef'; + const right = 'abxxcyyydzzzzezzzzzzzzzzzzzzzzzzzzf'; // We use a long non-matching portion at the end of the right-side string, so the backwards tracking logic // doesn't get there first. @@ -155,7 +155,7 @@ suite('Diff - Ported from VS', () => { diff = new LcsDiff(new StringDiffSequence(left), new StringDiffSequence(right), function (leftIndex, longestMatchSoFar) { assert(longestMatchSoFar <= 2); // We never see a match of length > 2 - let hitYet = hitSecondMatch; + const hitYet = hitSecondMatch; hitSecondMatch = longestMatchSoFar > 1; // Continue processing as long as there hasn't been a match made. return !hitYet; diff --git a/src/vs/base/test/common/event.test.ts b/src/vs/base/test/common/event.test.ts index 7eab340491d..d87a96adda5 100644 --- a/src/vs/base/test/common/event.test.ts +++ b/src/vs/base/test/common/event.test.ts @@ -8,7 +8,9 @@ import { CancellationToken } from 'vs/base/common/cancellation'; import { errorHandler, setUnexpectedErrorHandler } from 'vs/base/common/errors'; import { AsyncEmitter, DebounceEmitter, Emitter, Event, EventBufferer, EventMultiplexer, IWaitUntil, MicrotaskEmitter, PauseableEmitter, Relay } from 'vs/base/common/event'; import { DisposableStore, IDisposable, isDisposable, setDisposableTracker, toDisposable } from 'vs/base/common/lifecycle'; -import { DisposableTracker } from 'vs/base/test/common/utils'; +import { observableValue, transaction } from 'vs/base/common/observable'; +import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler'; +import { DisposableTracker, ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; namespace Samples { @@ -49,7 +51,7 @@ suite('Event utils dispose', function () { const actualInstances = tracker.getTrackedDisposables(); assert.strictEqual(actualInstances.length, expected.length); - for (let item of actualInstances) { + for (const item of actualInstances) { assert.ok(instances.has(item)); } @@ -76,7 +78,7 @@ suite('Event utils dispose', function () { assertDisposablesCount(1); // snaphot only listen when `evens` is being listened on let all = 0; - let leaked = evens(n => all += n); + const leaked = evens(n => all += n); assert.ok(isDisposable(leaked)); assertDisposablesCount(3); @@ -92,7 +94,7 @@ suite('Event utils dispose', function () { assertDisposablesCount(1); // debounce only listens when `debounce` is being listened on let all = 0; - let leaked = debounced(n => all += n); + const leaked = debounced(n => all += n); assert.ok(isDisposable(leaked)); assertDisposablesCount(3); @@ -111,9 +113,9 @@ suite('Event', function () { test('Emitter plain', function () { - let doc = new Samples.Document3(); + const doc = new Samples.Document3(); - let subscription = doc.onDidChange(counter.onEvent, counter); + const subscription = doc.onDidChange(counter.onEvent, counter); doc.setText('far'); doc.setText('boo'); @@ -127,9 +129,9 @@ suite('Event', function () { test('Emitter, bucket', function () { - let bucket: IDisposable[] = []; - let doc = new Samples.Document3(); - let subscription = doc.onDidChange(counter.onEvent, counter, bucket); + const bucket: IDisposable[] = []; + const doc = new Samples.Document3(); + const subscription = doc.onDidChange(counter.onEvent, counter, bucket); doc.setText('far'); doc.setText('boo'); @@ -149,9 +151,9 @@ suite('Event', function () { test('Emitter, store', function () { - let bucket = new DisposableStore(); - let doc = new Samples.Document3(); - let subscription = doc.onDidChange(counter.onEvent, counter, bucket); + const bucket = new DisposableStore(); + const doc = new Samples.Document3(); + const subscription = doc.onDidChange(counter.onEvent, counter, bucket); doc.setText('far'); doc.setText('boo'); @@ -171,7 +173,7 @@ suite('Event', function () { let firstCount = 0; let lastCount = 0; - let a = new Emitter({ + const a = new Emitter({ onFirstListenerAdd() { firstCount += 1; }, onLastListenerRemove() { lastCount += 1; } }); @@ -197,7 +199,7 @@ suite('Event', function () { setUnexpectedErrorHandler(() => null); try { - let a = new Emitter(); + const a = new Emitter(); let hit = false; a.event(function () { // eslint-disable-next-line no-throw-literal @@ -221,9 +223,9 @@ suite('Event', function () { } const context = {}; - let emitter = new Emitter(); - let reg1 = emitter.event(listener, context); - let reg2 = emitter.event(listener, context); + const emitter = new Emitter(); + const reg1 = emitter.event(listener, context); + const reg2 = emitter.event(listener, context); emitter.fire(undefined); assert.strictEqual(counter, 2); @@ -238,9 +240,9 @@ suite('Event', function () { }); test('Debounce Event', function (done: () => void) { - let doc = new Samples.Document3(); + const doc = new Samples.Document3(); - let onDocDidChange = Event.debounce(doc.onDidChange, (prev: string[] | undefined, cur) => { + const onDocDidChange = Event.debounce(doc.onDidChange, (prev: string[] | undefined, cur) => { if (!prev) { prev = [cur]; } else if (prev.indexOf(cur) < 0) { @@ -270,7 +272,7 @@ suite('Event', function () { test('Debounce Event - leading', async function () { const emitter = new Emitter(); - let debounced = Event.debounce(emitter.event, (l, e) => e, 0, /*leading=*/true); + const debounced = Event.debounce(emitter.event, (l, e) => e, 0, /*leading=*/true); let calls = 0; debounced(() => { @@ -286,7 +288,7 @@ suite('Event', function () { test('Debounce Event - leading', async function () { const emitter = new Emitter(); - let debounced = Event.debounce(emitter.event, (l, e) => e, 0, /*leading=*/true); + const debounced = Event.debounce(emitter.event, (l, e) => e, 0, /*leading=*/true); let calls = 0; debounced(() => { @@ -303,9 +305,9 @@ suite('Event', function () { test('Debounce Event - leading reset', async function () { const emitter = new Emitter(); - let debounced = Event.debounce(emitter.event, (l, e) => l ? l + 1 : 1, 0, /*leading=*/true); + const debounced = Event.debounce(emitter.event, (l, e) => l ? l + 1 : 1, 0, /*leading=*/true); - let calls: number[] = []; + const calls: number[] = []; debounced((e) => calls.push(e)); emitter.fire(1); @@ -316,26 +318,29 @@ suite('Event', function () { }); test('DebounceEmitter', async function () { - let callCount = 0; - let sum = 0; - const emitter = new DebounceEmitter({ - merge: arr => { - callCount += 1; - return arr.reduce((p, c) => p + c); - } + return runWithFakedTimers({}, async function () { + + let callCount = 0; + let sum = 0; + const emitter = new DebounceEmitter({ + merge: arr => { + callCount += 1; + return arr.reduce((p, c) => p + c); + } + }); + + emitter.event(e => { sum = e; }); + + const p = Event.toPromise(emitter.event); + + emitter.fire(1); + emitter.fire(2); + + await p; + + assert.strictEqual(callCount, 1); + assert.strictEqual(sum, 3); }); - - emitter.event(e => { sum = e; }); - - const p = Event.toPromise(emitter.event); - - emitter.fire(1); - emitter.fire(2); - - await p; - - assert.strictEqual(callCount, 1); - assert.strictEqual(sum, 3); }); test('Microtask Emitter', (done) => { @@ -396,7 +401,7 @@ suite('AsyncEmitter', function () { bar: number; } - let emitter = new AsyncEmitter(); + const emitter = new AsyncEmitter(); emitter.event(e => { assert.strictEqual(e.foo, true); @@ -409,59 +414,64 @@ suite('AsyncEmitter', function () { }); test('sequential delivery', async function () { + return runWithFakedTimers({}, async function () { - interface E extends IWaitUntil { - foo: boolean; - } + interface E extends IWaitUntil { + foo: boolean; + } - let globalState = 0; - let emitter = new AsyncEmitter(); + let globalState = 0; + const emitter = new AsyncEmitter(); - emitter.event(e => { - e.waitUntil(timeout(10).then(_ => { - assert.strictEqual(globalState, 0); - globalState += 1; - })); + emitter.event(e => { + e.waitUntil(timeout(10).then(_ => { + assert.strictEqual(globalState, 0); + globalState += 1; + })); + }); + + emitter.event(e => { + e.waitUntil(timeout(1).then(_ => { + assert.strictEqual(globalState, 1); + globalState += 1; + })); + }); + + await emitter.fireAsync({ foo: true }, CancellationToken.None); + assert.strictEqual(globalState, 2); }); - - emitter.event(e => { - e.waitUntil(timeout(1).then(_ => { - assert.strictEqual(globalState, 1); - globalState += 1; - })); - }); - - await emitter.fireAsync({ foo: true }, CancellationToken.None); - assert.strictEqual(globalState, 2); }); test('sequential, in-order delivery', async function () { - interface E extends IWaitUntil { - foo: number; - } - let events: number[] = []; - let done = false; - let emitter = new AsyncEmitter(); + return runWithFakedTimers({}, async function () { - // e1 - emitter.event(e => { - e.waitUntil(timeout(10).then(async _ => { - if (e.foo === 1) { - await emitter.fireAsync({ foo: 2 }, CancellationToken.None); - assert.deepStrictEqual(events, [1, 2]); - done = true; - } - })); + interface E extends IWaitUntil { + foo: number; + } + const events: number[] = []; + let done = false; + const emitter = new AsyncEmitter(); + + // e1 + emitter.event(e => { + e.waitUntil(timeout(10).then(async _ => { + if (e.foo === 1) { + await emitter.fireAsync({ foo: 2 }, CancellationToken.None); + assert.deepStrictEqual(events, [1, 2]); + done = true; + } + })); + }); + + // e2 + emitter.event(e => { + events.push(e.foo); + e.waitUntil(timeout(7)); + }); + + await emitter.fireAsync({ foo: 1 }, CancellationToken.None); + assert.ok(done); }); - - // e2 - emitter.event(e => { - events.push(e.foo); - e.waitUntil(timeout(7)); - }); - - await emitter.fireAsync({ foo: 1 }, CancellationToken.None); - assert.ok(done); }); test('catch errors', async function () { @@ -473,7 +483,7 @@ suite('AsyncEmitter', function () { } let globalState = 0; - let emitter = new AsyncEmitter(); + const emitter = new AsyncEmitter(); emitter.event(e => { globalState += 1; @@ -622,6 +632,44 @@ suite('PausableEmitter', function () { assert.deepStrictEqual(data, [1, 1, 2, 2, 3, 3]); }); + + test('empty pause with merge', function () { + const data: number[] = []; + const emitter = new PauseableEmitter({ merge: a => a[0] }); + emitter.event(e => data.push(1)); + + emitter.pause(); + emitter.resume(); + assert.deepStrictEqual(data, []); + }); + +}); + +suite('Event utils - ensureNoDisposablesAreLeakedInTestSuite', function () { + ensureNoDisposablesAreLeakedInTestSuite(); + + test('fromObservable', function () { + + const obs = observableValue('test', 12); + const event = Event.fromObservable(obs); + + const values: number[] = []; + const d = event(n => { values.push(n); }); + + obs.set(3, undefined); + obs.set(13, undefined); + obs.set(3, undefined); + obs.set(33, undefined); + obs.set(1, undefined); + + transaction(tx => { + obs.set(334, tx); + obs.set(99, tx); + }); + + assert.deepStrictEqual(values, ([3, 13, 3, 33, 1, 99])); + d.dispose(); + }); }); suite('Event utils', () => { @@ -1033,7 +1081,7 @@ suite('Event utils', () => { const event = eventEmitter.event; let i = 0; - let log = new Array(); + const log = new Array(); const disposable = Event.runAndSubscribeWithStore(event, (e, disposables) => { const idx = i++; log.push({ label: 'handleEvent', data: e || null, idx }); diff --git a/src/vs/base/test/common/filters.test.ts b/src/vs/base/test/common/filters.test.ts index 5fcd4f9f097..29754cc4eed 100644 --- a/src/vs/base/test/common/filters.test.ts +++ b/src/vs/base/test/common/filters.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import { anyScore, createMatches, fuzzyScore, fuzzyScoreGraceful, fuzzyScoreGracefulAggressive, FuzzyScorer, IFilter, IMatch, matchesCamelCase, matchesContiguousSubString, matchesPrefix, matchesStrictPrefix, matchesSubString, matchesWords, or } from 'vs/base/common/filters'; function filterOk(filter: IFilter, word: string, wordToMatchAgainst: string, highlights?: { start: number; end: number }[]) { - let r = filter(word, wordToMatchAgainst); + const r = filter(word, wordToMatchAgainst); assert(r, `${word} didn't match ${wordToMatchAgainst}`); if (highlights) { assert.deepStrictEqual(r, highlights); @@ -21,7 +21,7 @@ suite('Filters', () => { test('or', () => { let filter: IFilter; let counters: number[]; - let newFilter = function (i: number, r: boolean): IFilter { + const newFilter = function (i: number, r: boolean): IFilter { return function (): IMatch[] { counters[i]++; return r as any; }; }; @@ -185,24 +185,28 @@ suite('Filters', () => { assert(matchesWords('Debug Console', 'Open: Debug Console')); filterOk(matchesWords, 'gp', 'Git: Pull', [{ start: 0, end: 1 }, { start: 5, end: 6 }]); - filterOk(matchesWords, 'g p', 'Git: Pull', [{ start: 0, end: 1 }, { start: 3, end: 4 }, { start: 5, end: 6 }]); + filterOk(matchesWords, 'g p', 'Git: Pull', [{ start: 0, end: 1 }, { start: 5, end: 6 }]); filterOk(matchesWords, 'gipu', 'Git: Pull', [{ start: 0, end: 2 }, { start: 5, end: 7 }]); filterOk(matchesWords, 'gp', 'Category: Git: Pull', [{ start: 10, end: 11 }, { start: 15, end: 16 }]); - filterOk(matchesWords, 'g p', 'Category: Git: Pull', [{ start: 10, end: 11 }, { start: 13, end: 14 }, { start: 15, end: 16 }]); + filterOk(matchesWords, 'g p', 'Category: Git: Pull', [{ start: 10, end: 11 }, { start: 15, end: 16 }]); filterOk(matchesWords, 'gipu', 'Category: Git: Pull', [{ start: 10, end: 12 }, { start: 15, end: 17 }]); filterNotOk(matchesWords, 'it', 'Git: Pull'); filterNotOk(matchesWords, 'll', 'Git: Pull'); filterOk(matchesWords, 'git: プãƒĢ', 'git: プãƒĢ', [{ start: 0, end: 7 }]); - filterOk(matchesWords, 'git プãƒĢ', 'git: プãƒĢ', [{ start: 0, end: 4 }, { start: 5, end: 7 }]); + filterOk(matchesWords, 'git プãƒĢ', 'git: プãƒĢ', [{ start: 0, end: 3 }, { start: 5, end: 7 }]); filterOk(matchesWords, 'Ãļäk', 'Öhm: Älles Klar', [{ start: 0, end: 1 }, { start: 5, end: 6 }, { start: 11, end: 12 }]); // Handles issue #123915 filterOk(matchesWords, 'C++', 'C/C++: command', [{ start: 2, end: 5 }]); + // Handles issue #154533 + filterOk(matchesWords, '.', ':', []); + filterOk(matchesWords, '.', '.', [{ start: 0, end: 1 }]); + // assert.ok(matchesWords('gipu', 'Category: Git: Pull', true) === null); // assert.deepStrictEqual(matchesWords('pu', 'Category: Git: Pull', true), [{ start: 15, end: 17 }]); @@ -223,10 +227,10 @@ suite('Filters', () => { }); function assertMatches(pattern: string, word: string, decoratedWord: string | undefined, filter: FuzzyScorer, opts: { patternPos?: number; wordPos?: number; firstMatchCanBeWeak?: boolean } = {}) { - let r = filter(pattern, pattern.toLowerCase(), opts.patternPos || 0, word, word.toLowerCase(), opts.wordPos || 0, { firstMatchCanBeWeak: opts.firstMatchCanBeWeak ?? false, boostFullMatch: true }); + const r = filter(pattern, pattern.toLowerCase(), opts.patternPos || 0, word, word.toLowerCase(), opts.wordPos || 0, { firstMatchCanBeWeak: opts.firstMatchCanBeWeak ?? false, boostFullMatch: true }); assert.ok(!decoratedWord === !r); if (r) { - let matches = createMatches(r); + const matches = createMatches(r); let actualWord = ''; let pos = 0; for (const match of matches) { @@ -403,8 +407,8 @@ suite('Filters', () => { }); test('Cannot set property \'1\' of undefined, #26511', function () { - let word = new Array(123).join('a'); - let pattern = new Array(120).join('a'); + const word = new Array(123).join('a'); + const pattern = new Array(120).join('a'); fuzzyScore(pattern, pattern.toLowerCase(), 0, word, word.toLowerCase(), 0); assert.ok(true); // must not explode }); @@ -559,18 +563,18 @@ suite('Filters', () => { }); test('configurable full match boost', function () { - let prefix = 'create'; - let a = 'createModelServices'; - let b = 'create'; + const prefix = 'create'; + const a = 'createModelServices'; + const b = 'create'; - let aBoost = fuzzyScore(prefix, prefix, 0, a, a.toLowerCase(), 0, { boostFullMatch: true, firstMatchCanBeWeak: true }); - let bBoost = fuzzyScore(prefix, prefix, 0, b, b.toLowerCase(), 0, { boostFullMatch: true, firstMatchCanBeWeak: true }); + const aBoost = fuzzyScore(prefix, prefix, 0, a, a.toLowerCase(), 0, { boostFullMatch: true, firstMatchCanBeWeak: true }); + const bBoost = fuzzyScore(prefix, prefix, 0, b, b.toLowerCase(), 0, { boostFullMatch: true, firstMatchCanBeWeak: true }); assert.ok(aBoost); assert.ok(bBoost); assert.ok(aBoost[0] < bBoost[0]); - let aScore = fuzzyScore(prefix, prefix, 0, a, a.toLowerCase(), 0, { boostFullMatch: false, firstMatchCanBeWeak: true }); - let bScore = fuzzyScore(prefix, prefix, 0, b, b.toLowerCase(), 0, { boostFullMatch: false, firstMatchCanBeWeak: true }); + const aScore = fuzzyScore(prefix, prefix, 0, a, a.toLowerCase(), 0, { boostFullMatch: false, firstMatchCanBeWeak: true }); + const bScore = fuzzyScore(prefix, prefix, 0, b, b.toLowerCase(), 0, { boostFullMatch: false, firstMatchCanBeWeak: true }); assert.ok(aScore); assert.ok(bScore); assert.ok(aScore[0] === bScore[0]); diff --git a/src/vs/base/test/common/fuzzyScorer.test.ts b/src/vs/base/test/common/fuzzyScorer.test.ts index 4982bfb8b83..b925dc64084 100644 --- a/src/vs/base/test/common/fuzzyScorer.test.ts +++ b/src/vs/base/test/common/fuzzyScorer.test.ts @@ -119,7 +119,7 @@ suite('Fuzzy Scorer', () => { scores.push(_doScore(target, '4', true)); // no match // Assert scoring order - let sortedScores = scores.concat().sort((a, b) => b[0] - a[0]); + const sortedScores = scores.concat().sort((a, b) => b[0] - a[0]); assert.deepStrictEqual(scores, sortedScores); // Assert scoring positions @@ -228,7 +228,7 @@ suite('Fuzzy Scorer', () => { test('scoreItem - multiple', function () { const resource = URI.file('/xyz/some/path/someFile123.txt'); - let res1 = scoreItem(resource, 'xyz some', true, ResourceAccessor); + const res1 = scoreItem(resource, 'xyz some', true, ResourceAccessor); assert.ok(res1.score); assert.strictEqual(res1.labelMatch?.length, 1); assert.strictEqual(res1.labelMatch![0].start, 0); @@ -237,7 +237,7 @@ suite('Fuzzy Scorer', () => { assert.strictEqual(res1.descriptionMatch![0].start, 1); assert.strictEqual(res1.descriptionMatch![0].end, 4); - let res2 = scoreItem(resource, 'some xyz', true, ResourceAccessor); + const res2 = scoreItem(resource, 'some xyz', true, ResourceAccessor); assert.ok(res2.score); assert.strictEqual(res1.score, res2.score); assert.strictEqual(res2.labelMatch?.length, 1); @@ -247,7 +247,7 @@ suite('Fuzzy Scorer', () => { assert.strictEqual(res2.descriptionMatch![0].start, 1); assert.strictEqual(res2.descriptionMatch![0].end, 4); - let res3 = scoreItem(resource, 'some xyz file file123', true, ResourceAccessor); + const res3 = scoreItem(resource, 'some xyz file file123', true, ResourceAccessor); assert.ok(res3.score); assert.ok(res3.score > res2.score); assert.strictEqual(res3.labelMatch?.length, 1); @@ -257,7 +257,7 @@ suite('Fuzzy Scorer', () => { assert.strictEqual(res3.descriptionMatch![0].start, 1); assert.strictEqual(res3.descriptionMatch![0].end, 4); - let res4 = scoreItem(resource, 'path z y', true, ResourceAccessor); + const res4 = scoreItem(resource, 'path z y', true, ResourceAccessor); assert.ok(res4.score); assert.ok(res4.score < res2.score); assert.strictEqual(res4.labelMatch?.length, 0); @@ -271,11 +271,11 @@ suite('Fuzzy Scorer', () => { test('scoreItem - multiple with cache yields different results', function () { const resource = URI.file('/xyz/some/path/someFile123.txt'); const cache = {}; - let res1 = scoreItem(resource, 'xyz sm', true, ResourceAccessor, cache); + const res1 = scoreItem(resource, 'xyz sm', true, ResourceAccessor, cache); assert.ok(res1.score); // from the cache's perspective this should be a totally different query - let res2 = scoreItem(resource, 'xyz "sm"', true, ResourceAccessor, cache); + const res2 = scoreItem(resource, 'xyz "sm"', true, ResourceAccessor, cache); assert.ok(!res2.score); }); @@ -576,7 +576,7 @@ suite('Fuzzy Scorer', () => { const resourceC = URI.file('/unrelated/the/path/other/fileC.txt'); // Resource A part of path - let query = 'somepath'; + const query = 'somepath'; let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceA); @@ -595,7 +595,7 @@ suite('Fuzzy Scorer', () => { const resourceC = URI.file('/unrelated/the/path/other/fileC.txt'); // Resource A part of path - let query = 'file'; + const query = 'file'; let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceA); @@ -614,7 +614,7 @@ suite('Fuzzy Scorer', () => { const resourceC = URI.file('/unrelated/some/path/other/fileC.txt'); // Resource A part of path - let query = 'somepath'; + const query = 'somepath'; let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceA); @@ -632,9 +632,9 @@ suite('Fuzzy Scorer', () => { const resourceB = URI.file('config/test.js'); const resourceC = URI.file('config/test/t2.js'); - let query = 'co/te'; + const query = 'co/te'; - let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); + const res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); assert.strictEqual(res[1], resourceA); assert.strictEqual(res[2], resourceC); @@ -644,9 +644,9 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('parts/quick/arrow-left-dark.svg'); const resourceB = URI.file('parts/quickopen/quickopen.ts'); - let query = 'partsquick'; + const query = 'partsquick'; - let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); + const res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); assert.strictEqual(res[1], resourceA); }); @@ -670,7 +670,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('config/test/openthisAnythingHandler.js'); const resourceB = URI.file('config/test/openthisisnotsorelevantforthequeryAnyHand.js'); - let query = 'AH'; + const query = 'AH'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -685,7 +685,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('config/test/examasdaple.js'); const resourceB = URI.file('config/test/exampleasdaasd.ts'); - let query = 'xp'; + const query = 'xp'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -700,7 +700,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('config/test/examasdaple/file.js'); const resourceB = URI.file('config/test/exampleasdaasd/file.ts'); - let query = 'xp'; + const query = 'xp'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -715,7 +715,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('config/example/thisfile.ts'); const resourceB = URI.file('config/24234243244/example/file.js'); - let query = 'exfile'; + const query = 'exfile'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -754,7 +754,7 @@ suite('Fuzzy Scorer', () => { const resourceB = URI.file('app/containers/Services/NetworkData/ServiceDetails/ServiceDistribution/index.js'); const resourceC = URI.file('app/containers/Services/NetworkData/ServiceDetailTabs/ServiceTabs/StatVideo/index.js'); - let query = 'StatVideoindex'; + const query = 'StatVideoindex'; let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceC); @@ -767,7 +767,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('src/build-helper/store/redux.ts'); const resourceB = URI.file('src/repository/store/redux.ts'); - let query = 'reproreduxts'; + const query = 'reproreduxts'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -781,7 +781,7 @@ suite('Fuzzy Scorer', () => { const resourceB = URI.file('photobook/src/components/ApprovalPageHeader/index.js'); const resourceC = URI.file('photobook/src/canvasComponents/BookPage/index.js'); - let query = 'bookpageIndex'; + const query = 'bookpageIndex'; let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceC); @@ -794,7 +794,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('ui/src/utils/constants.js'); const resourceB = URI.file('ui/src/ui/Icons/index.js'); - let query = isWindows ? 'ui\\icons' : 'ui/icons'; + const query = isWindows ? 'ui\\icons' : 'ui/icons'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -807,7 +807,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('ui/src/components/IDInput/index.js'); const resourceB = URI.file('ui/src/ui/Input/index.js'); - let query = isWindows ? 'ui\\input\\index' : 'ui/input/index'; + const query = isWindows ? 'ui\\input\\index' : 'ui/input/index'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -820,7 +820,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('django/contrib/sites/locale/ga/LC_MESSAGES/django.mo'); const resourceB = URI.file('django/core/signals.py'); - let query = 'djancosig'; + const query = 'djancosig'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -834,7 +834,7 @@ suite('Fuzzy Scorer', () => { const resourceB = URI.file('adsys/protected/framework/smarty/sysplugins/smarty_internal_config.php'); const resourceC = URI.file('duowanVideo/wap/protected/config.php'); - let query = 'protectedconfig.php'; + const query = 'protectedconfig.php'; let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceA); @@ -851,7 +851,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('pkg/search/gradient/testdata/constraint_attrMatchString.yml'); const resourceB = URI.file('cmd/gradient/main.go'); - let query = 'gradientmain'; + const query = 'gradientmain'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -864,7 +864,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('alpha-beta-cappa.txt'); const resourceB = URI.file('abc.txt'); - let query = 'abc'; + const query = 'abc'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -877,7 +877,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('xerxes-yak-zubba/index.js'); const resourceB = URI.file('xyz/index.js'); - let query = 'xyz'; + const query = 'xyz'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -890,7 +890,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('AssymblyInfo.cs'); const resourceB = URI.file('IAsynchronousTask.java'); - let query = 'async'; + const query = 'async'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -903,7 +903,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('static/app/source/angluar/-admin/-organization/-settings/layout/layout.js'); const resourceB = URI.file('static/app/source/angular/-admin/-project/-settings/_settings/settings.js'); - let query = 'partisettings'; + const query = 'partisettings'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -916,7 +916,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('Trilby.TrilbyTV.Web.Portal/Views/Systems/Index.cshtml'); const resourceB = URI.file('Trilby.TrilbyTV.Web.Portal/Areas/Admins/Views/Tips/Index.cshtml'); - let query = 'tipsindex.cshtml'; + const query = 'tipsindex.cshtml'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -929,7 +929,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('editor/core/components/tests/list-view-spec.js'); const resourceB = URI.file('editor/core/components/list-view.js'); - let query = 'listview'; + const query = 'listview'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -943,7 +943,7 @@ suite('Fuzzy Scorer', () => { const resourceB = URI.file('src/vs/workbench/contrib/files/browser/views/explorerView.ts'); const resourceC = URI.file('src/vs/workbench/contrib/files/browser/views/explorerViewer.ts'); - let query = 'filesexplorerview.ts'; + const query = 'filesexplorerview.ts'; let res = [resourceA, resourceB, resourceC].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -956,7 +956,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('lists.php'); const resourceB = URI.file('lib/Lists.php'); - let query = 'Lists.php'; + const query = 'Lists.php'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceB); @@ -1039,7 +1039,7 @@ suite('Fuzzy Scorer', () => { const resourceA = URI.file('test/smoke/src/main.ts'); const resourceB = URI.file('src/vs/editor/common/services/semantikTokensProviderStyling.ts'); - let query = 'smoke main.ts'; + const query = 'smoke main.ts'; let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor)); assert.strictEqual(res[0], resourceA); @@ -1120,7 +1120,7 @@ suite('Fuzzy Scorer', () => { assert.strictEqual(query.values?.[1].normalized, 'World'); assert.strictEqual(query.values?.[1].normalizedLowercase, 'World'.toLowerCase()); - let restoredQuery = pieceToQuery(query.values!); + const restoredQuery = pieceToQuery(query.values!); assert.strictEqual(restoredQuery.original, query.original); assert.strictEqual(restoredQuery.values?.length, query.values?.length); assert.strictEqual(restoredQuery.containsPathSeparator, query.containsPathSeparator); diff --git a/src/vs/base/test/common/glob.test.ts b/src/vs/base/test/common/glob.test.ts index 7963c4c4139..679a168332b 100644 --- a/src/vs/base/test/common/glob.test.ts +++ b/src/vs/base/test/common/glob.test.ts @@ -203,7 +203,7 @@ suite('Glob', () => { }); test('file / folder match', function () { - let p = '**/node_modules/**'; + const p = '**/node_modules/**'; assertGlobMatch(p, 'node_modules'); assertGlobMatch(p, 'node_modules/'); @@ -469,8 +469,8 @@ suite('Glob', () => { }); test('expression support (single)', function () { - let siblings = ['test.html', 'test.txt', 'test.ts', 'test.js']; - let hasSibling = (name: string) => siblings.indexOf(name) !== -1; + const siblings = ['test.html', 'test.txt', 'test.ts', 'test.js']; + const hasSibling = (name: string) => siblings.indexOf(name) !== -1; // { "**/*.js": { "when": "$(basename).ts" } } let expression: glob.IExpression = { @@ -505,11 +505,11 @@ suite('Glob', () => { }); test('expression support (multiple)', function () { - let siblings = ['test.html', 'test.txt', 'test.ts', 'test.js']; - let hasSibling = (name: string) => siblings.indexOf(name) !== -1; + const siblings = ['test.html', 'test.txt', 'test.ts', 'test.js']; + const hasSibling = (name: string) => siblings.indexOf(name) !== -1; // { "**/*.js": { "when": "$(basename).ts" } } - let expression: glob.IExpression = { + const expression: glob.IExpression = { '**/*.js': { when: '$(basename).ts' }, '**/*.as': true, '**/*.foo': false, @@ -632,7 +632,7 @@ suite('Glob', () => { }); test('cached properly', function () { - let p = '**/*.js'; + const p = '**/*.js'; assertGlobMatch(p, 'foo.js'); assertGlobMatch(p, 'testing/foo.js'); @@ -692,7 +692,7 @@ suite('Glob', () => { }); test('invalid glob', function () { - let p = '**/*(.js'; + const p = '**/*(.js'; assertNoGlobMatch(p, 'foo.js'); }); @@ -710,13 +710,13 @@ suite('Glob', () => { }); test('expression with disabled glob', function () { - let expr = { '**/*.js': false }; + const expr = { '**/*.js': false }; assert.strictEqual(glob.match(expr, 'foo.js'), null); }); test('expression with two non-trivia globs', function () { - let expr = { + const expr = { '**/*.j?': true, '**/*.t?': true }; @@ -726,7 +726,7 @@ suite('Glob', () => { }); test('expression with non-trivia glob (issue 144458)', function () { - let pattern = '**/p*'; + const pattern = '**/p*'; assert.strictEqual(glob.match(pattern, 'foo/barp'), false); assert.strictEqual(glob.match(pattern, 'foo/bar/ap'), false); @@ -751,19 +751,19 @@ suite('Glob', () => { }); test('expression with empty glob', function () { - let expr = { '': true }; + const expr = { '': true }; assert.strictEqual(glob.match(expr, 'foo.js'), null); }); test('expression with other falsy value', function () { - let expr = { '**/*.js': 0 } as any; + const expr = { '**/*.js': 0 } as any; assert.strictEqual(glob.match(expr, 'foo.js'), '**/*.js'); }); test('expression with two basename globs', function () { - let expr = { + const expr = { '**/bar': true, '**/baz': true }; @@ -776,14 +776,14 @@ suite('Glob', () => { }); test('expression with two basename globs and a siblings expression', function () { - let expr = { + const expr = { '**/bar': true, '**/baz': true, '**/*.js': { when: '$(basename).ts' } }; - let siblings = ['foo.ts', 'foo.js', 'foo', 'bar']; - let hasSibling = (name: string) => siblings.indexOf(name) !== -1; + const siblings = ['foo.ts', 'foo.js', 'foo', 'bar']; + const hasSibling = (name: string) => siblings.indexOf(name) !== -1; assert.strictEqual(glob.match(expr, 'bar', hasSibling), '**/bar'); assert.strictEqual(glob.match(expr, 'foo', hasSibling), null); @@ -798,7 +798,7 @@ suite('Glob', () => { }); test('expression with multipe basename globs', function () { - let expr = { + const expr = { '**/bar': true, '{**/baz,**/foo}': true }; @@ -838,9 +838,9 @@ suite('Glob', () => { assert.strictEqual(glob.parse('{**/baz,**/foo}')('baz/bar', 'bar'), false); assert.strictEqual(glob.parse('{**/baz,**/foo}')('baz/foo', 'foo'), true); - let expr = { '**/*.js': { when: '$(basename).ts' } }; - let siblings = ['foo.ts', 'foo.js']; - let hasSibling = (name: string) => siblings.indexOf(name) !== -1; + const expr = { '**/*.js': { when: '$(basename).ts' } }; + const siblings = ['foo.ts', 'foo.js']; + const hasSibling = (name: string) => siblings.indexOf(name) !== -1; assert.strictEqual(glob.parse(expr)('bar/baz.js', 'baz.js', hasSibling), null); assert.strictEqual(glob.parse(expr)('bar/foo.js', 'foo.js', hasSibling), '**/*.js'); @@ -990,7 +990,7 @@ suite('Glob', () => { ]); const siblings = ['baz', 'baz.zip', 'nope']; - let hasSibling = (name: string) => siblings.indexOf(name) !== -1; + const hasSibling = (name: string) => siblings.indexOf(name) !== -1; testOptimizationForPaths({ '**/foo/123/**': { when: '$(basename).zip' }, '**/bar/123/**': true @@ -1020,14 +1020,14 @@ suite('Glob', () => { test('relative pattern - glob star', function () { if (isWindows) { - let p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo', pattern: '**/*.cs' }; + const p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo', pattern: '**/*.cs' }; assertGlobMatch(p, 'C:\\DNXConsoleApp\\foo\\Program.cs'); assertGlobMatch(p, 'C:\\DNXConsoleApp\\foo\\bar\\Program.cs'); assertNoGlobMatch(p, 'C:\\DNXConsoleApp\\foo\\Program.ts'); assertNoGlobMatch(p, 'C:\\DNXConsoleApp\\Program.cs'); assertNoGlobMatch(p, 'C:\\other\\DNXConsoleApp\\foo\\Program.ts'); } else { - let p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: '**/*.cs' }; + const p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: '**/*.cs' }; assertGlobMatch(p, '/DNXConsoleApp/foo/Program.cs'); assertGlobMatch(p, '/DNXConsoleApp/foo/bar/Program.cs'); assertNoGlobMatch(p, '/DNXConsoleApp/foo/Program.ts'); @@ -1038,14 +1038,14 @@ suite('Glob', () => { test('relative pattern - single star', function () { if (isWindows) { - let p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo', pattern: '*.cs' }; + const p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo', pattern: '*.cs' }; assertGlobMatch(p, 'C:\\DNXConsoleApp\\foo\\Program.cs'); assertNoGlobMatch(p, 'C:\\DNXConsoleApp\\foo\\bar\\Program.cs'); assertNoGlobMatch(p, 'C:\\DNXConsoleApp\\foo\\Program.ts'); assertNoGlobMatch(p, 'C:\\DNXConsoleApp\\Program.cs'); assertNoGlobMatch(p, 'C:\\other\\DNXConsoleApp\\foo\\Program.ts'); } else { - let p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: '*.cs' }; + const p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: '*.cs' }; assertGlobMatch(p, '/DNXConsoleApp/foo/Program.cs'); assertNoGlobMatch(p, '/DNXConsoleApp/foo/bar/Program.cs'); assertNoGlobMatch(p, '/DNXConsoleApp/foo/Program.ts'); @@ -1056,11 +1056,11 @@ suite('Glob', () => { test('relative pattern - single star with path', function () { if (isWindows) { - let p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo', pattern: 'something/*.cs' }; + const p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo', pattern: 'something/*.cs' }; assertGlobMatch(p, 'C:\\DNXConsoleApp\\foo\\something\\Program.cs'); assertNoGlobMatch(p, 'C:\\DNXConsoleApp\\foo\\Program.cs'); } else { - let p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: 'something/*.cs' }; + const p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: 'something/*.cs' }; assertGlobMatch(p, '/DNXConsoleApp/foo/something/Program.cs'); assertNoGlobMatch(p, '/DNXConsoleApp/foo/Program.cs'); } @@ -1068,11 +1068,11 @@ suite('Glob', () => { test('relative pattern - single star alone', function () { if (isWindows) { - let p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo\\something\\Program.cs', pattern: '*' }; + const p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo\\something\\Program.cs', pattern: '*' }; assertGlobMatch(p, 'C:\\DNXConsoleApp\\foo\\something\\Program.cs'); assertNoGlobMatch(p, 'C:\\DNXConsoleApp\\foo\\Program.cs'); } else { - let p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo/something/Program.cs', pattern: '*' }; + const p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo/something/Program.cs', pattern: '*' }; assertGlobMatch(p, '/DNXConsoleApp/foo/something/Program.cs'); assertNoGlobMatch(p, '/DNXConsoleApp/foo/Program.cs'); } @@ -1080,13 +1080,13 @@ suite('Glob', () => { test('relative pattern - ignores case on macOS/Windows', function () { if (isWindows) { - let p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo', pattern: 'something/*.cs' }; + const p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo', pattern: 'something/*.cs' }; assertGlobMatch(p, 'C:\\DNXConsoleApp\\foo\\something\\Program.cs'.toLowerCase()); } else if (isMacintosh) { - let p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: 'something/*.cs' }; + const p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: 'something/*.cs' }; assertGlobMatch(p, '/DNXConsoleApp/foo/something/Program.cs'.toLowerCase()); } else if (isLinux) { - let p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: 'something/*.cs' }; + const p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: 'something/*.cs' }; assertNoGlobMatch(p, '/DNXConsoleApp/foo/something/Program.cs'.toLowerCase()); } }); @@ -1097,27 +1097,27 @@ suite('Glob', () => { test('relative pattern - #57475', function () { if (isWindows) { - let p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo', pattern: 'styles/style.css' }; + const p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo', pattern: 'styles/style.css' }; assertGlobMatch(p, 'C:\\DNXConsoleApp\\foo\\styles\\style.css'); assertNoGlobMatch(p, 'C:\\DNXConsoleApp\\foo\\Program.cs'); } else { - let p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: 'styles/style.css' }; + const p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: 'styles/style.css' }; assertGlobMatch(p, '/DNXConsoleApp/foo/styles/style.css'); assertNoGlobMatch(p, '/DNXConsoleApp/foo/Program.cs'); } }); test('URI match', () => { - let p = 'scheme:/**/*.md'; + const p = 'scheme:/**/*.md'; assertGlobMatch(p, URI.file('super/duper/long/some/file.md').with({ scheme: 'scheme' }).toString()); }); test('expression fails when siblings use promises (https://github.com/microsoft/vscode/issues/146294)', async function () { - let siblings = ['test.html', 'test.txt', 'test.ts']; - let hasSibling = (name: string) => Promise.resolve(siblings.indexOf(name) !== -1); + const siblings = ['test.html', 'test.txt', 'test.ts']; + const hasSibling = (name: string) => Promise.resolve(siblings.indexOf(name) !== -1); // { "**/*.js": { "when": "$(basename).ts" } } - let expression: glob.IExpression = { + const expression: glob.IExpression = { '**/test.js': { when: '$(basename).js' }, '**/*.js': { when: '$(basename).ts' } }; diff --git a/src/vs/base/test/common/history.test.ts b/src/vs/base/test/common/history.test.ts index 7452110783d..9fdae440917 100644 --- a/src/vs/base/test/common/history.test.ts +++ b/src/vs/base/test/common/history.test.ts @@ -148,7 +148,7 @@ suite('History Navigator', () => { }); function toArray(historyNavigator: HistoryNavigator): Array { - let result: Array = []; + const result: Array = []; historyNavigator.first(); if (historyNavigator.current()) { do { diff --git a/src/vs/base/test/common/iconLabels.test.ts b/src/vs/base/test/common/iconLabels.test.ts index add853b0e94..dec436a52c3 100644 --- a/src/vs/base/test/common/iconLabels.test.ts +++ b/src/vs/base/test/common/iconLabels.test.ts @@ -13,7 +13,7 @@ export interface IIconFilter { } function filterOk(filter: IIconFilter, word: string, target: IParsedLabelWithIcons, highlights?: { start: number; end: number }[]) { - let r = filter(word, target); + const r = filter(word, target); assert(r); if (highlights) { assert.deepStrictEqual(r, highlights); diff --git a/src/vs/base/test/common/iterator.test.ts b/src/vs/base/test/common/iterator.test.ts index 186ebc866b6..f43908c415b 100644 --- a/src/vs/base/test/common/iterator.test.ts +++ b/src/vs/base/test/common/iterator.test.ts @@ -25,11 +25,8 @@ suite('Iterable', function () { assert.strictEqual(Iterable.first(customIterable), 'one'); // fresh }); - test('equals', () => { - assert.strictEqual(Iterable.equals([1, 2], [1, 2]), true); - assert.strictEqual(Iterable.equals([1, 2], [1]), false); - assert.strictEqual(Iterable.equals([1], [1, 2]), false); - assert.strictEqual(Iterable.equals([2, 1], [1, 2]), false); + test('wrap', function () { + assert.deepStrictEqual([...Iterable.wrap(1)], [1]); + assert.deepStrictEqual([...Iterable.wrap([1, 2, 3])], [1, 2, 3]); }); - }); diff --git a/src/vs/base/test/common/json.test.ts b/src/vs/base/test/common/json.test.ts index 0b1f49ff9d1..5accb16227c 100644 --- a/src/vs/base/test/common/json.test.ts +++ b/src/vs/base/test/common/json.test.ts @@ -7,7 +7,7 @@ import { createScanner, Node, parse, ParseError, ParseErrorCode, ParseOptions, p import { getParseErrorMessage } from 'vs/base/common/jsonErrorMessages'; function assertKinds(text: string, ...kinds: SyntaxKind[]): void { - let scanner = createScanner(text); + const scanner = createScanner(text); let kind: SyntaxKind; while ((kind = scanner.scan()) !== SyntaxKind.EOF) { assert.strictEqual(kind, kinds.shift()); @@ -15,15 +15,15 @@ function assertKinds(text: string, ...kinds: SyntaxKind[]): void { assert.strictEqual(kinds.length, 0); } function assertScanError(text: string, expectedKind: SyntaxKind, scanError: ScanError): void { - let scanner = createScanner(text); + const scanner = createScanner(text); scanner.scan(); assert.strictEqual(scanner.getToken(), expectedKind); assert.strictEqual(scanner.getTokenError(), scanError); } function assertValidParse(input: string, expected: any, options?: ParseOptions): void { - let errors: ParseError[] = []; - let actual = parse(input, errors, options); + const errors: ParseError[] = []; + const actual = parse(input, errors, options); if (errors.length !== 0) { assert(false, getParseErrorMessage(errors[0].error)); @@ -32,21 +32,21 @@ function assertValidParse(input: string, expected: any, options?: ParseOptions): } function assertInvalidParse(input: string, expected: any, options?: ParseOptions): void { - let errors: ParseError[] = []; - let actual = parse(input, errors, options); + const errors: ParseError[] = []; + const actual = parse(input, errors, options); assert(errors.length > 0); assert.deepStrictEqual(actual, expected); } function assertTree(input: string, expected: any, expectedErrors: number[] = [], options?: ParseOptions): void { - let errors: ParseError[] = []; - let actual = parseTree(input, errors, options); + const errors: ParseError[] = []; + const actual = parseTree(input, errors, options); assert.deepStrictEqual(errors.map(e => e.error, expected), expectedErrors); - let checkParent = (node: Node) => { + const checkParent = (node: Node) => { if (node.children) { - for (let child of node.children) { + for (const child of node.children) { assert.strictEqual(node, child.parent); delete (child).parent; // delete to avoid recursion in deep equal checkParent(child); @@ -216,7 +216,7 @@ suite('JSON', () => { }); test('parse: disallow commments', () => { - let options = { disallowComments: true }; + const options = { disallowComments: true }; assertValidParse('[ 1, 2, null, "foo" ]', [1, 2, null, 'foo'], options); assertValidParse('{ "hello": [], "world": {} }', { hello: [], world: {} }, options); diff --git a/src/vs/base/test/common/jsonEdit.test.ts b/src/vs/base/test/common/jsonEdit.test.ts index f2a517a579d..228db5b15df 100644 --- a/src/vs/base/test/common/jsonEdit.test.ts +++ b/src/vs/base/test/common/jsonEdit.test.ts @@ -12,7 +12,7 @@ suite('JSON - edits', () => { assert(edits); let lastEditOffset = content.length; for (let i = edits.length - 1; i >= 0; i--) { - let edit = edits[i]; + const edit = edits[i]; assert(edit.offset >= 0 && edit.length >= 0 && edit.offset + edit.length <= content.length); assert(typeof edit.content === 'string'); assert(lastEditOffset >= edit.offset + edit.length); // make sure all edits are ordered @@ -22,7 +22,7 @@ suite('JSON - edits', () => { assert.strictEqual(content, expected); } - let formatterOptions: FormattingOptions = { + const formatterOptions: FormattingOptions = { insertSpaces: true, tabSize: 2, eol: '\n' @@ -119,74 +119,74 @@ suite('JSON - edits', () => { }); test('insert item at 0', () => { - let content = '[\n 2,\n 3\n]'; - let edits = setProperty(content, [0], 1, formatterOptions); + const content = '[\n 2,\n 3\n]'; + const edits = setProperty(content, [0], 1, formatterOptions); assertEdit(content, edits, '[\n 1,\n 2,\n 3\n]'); }); test('insert item at 0 in empty array', () => { - let content = '[\n]'; - let edits = setProperty(content, [0], 1, formatterOptions); + const content = '[\n]'; + const edits = setProperty(content, [0], 1, formatterOptions); assertEdit(content, edits, '[\n 1\n]'); }); test('insert item at an index', () => { - let content = '[\n 1,\n 3\n]'; - let edits = setProperty(content, [1], 2, formatterOptions); + const content = '[\n 1,\n 3\n]'; + const edits = setProperty(content, [1], 2, formatterOptions); assertEdit(content, edits, '[\n 1,\n 2,\n 3\n]'); }); test('insert item at an index im empty array', () => { - let content = '[\n]'; - let edits = setProperty(content, [1], 1, formatterOptions); + const content = '[\n]'; + const edits = setProperty(content, [1], 1, formatterOptions); assertEdit(content, edits, '[\n 1\n]'); }); test('insert item at end index', () => { - let content = '[\n 1,\n 2\n]'; - let edits = setProperty(content, [2], 3, formatterOptions); + const content = '[\n 1,\n 2\n]'; + const edits = setProperty(content, [2], 3, formatterOptions); assertEdit(content, edits, '[\n 1,\n 2,\n 3\n]'); }); test('insert item at end to empty array', () => { - let content = '[\n]'; - let edits = setProperty(content, [-1], 'bar', formatterOptions); + const content = '[\n]'; + const edits = setProperty(content, [-1], 'bar', formatterOptions); assertEdit(content, edits, '[\n "bar"\n]'); }); test('insert item at end', () => { - let content = '[\n 1,\n 2\n]'; - let edits = setProperty(content, [-1], 'bar', formatterOptions); + const content = '[\n 1,\n 2\n]'; + const edits = setProperty(content, [-1], 'bar', formatterOptions); assertEdit(content, edits, '[\n 1,\n 2,\n "bar"\n]'); }); test('remove item in array with one item', () => { - let content = '[\n 1\n]'; - let edits = setProperty(content, [0], undefined, formatterOptions); + const content = '[\n 1\n]'; + const edits = setProperty(content, [0], undefined, formatterOptions); assertEdit(content, edits, '[]'); }); test('remove item in the middle of the array', () => { - let content = '[\n 1,\n 2,\n 3\n]'; - let edits = setProperty(content, [1], undefined, formatterOptions); + const content = '[\n 1,\n 2,\n 3\n]'; + const edits = setProperty(content, [1], undefined, formatterOptions); assertEdit(content, edits, '[\n 1,\n 3\n]'); }); test('remove last item in the array', () => { - let content = '[\n 1,\n 2,\n "bar"\n]'; - let edits = setProperty(content, [2], undefined, formatterOptions); + const content = '[\n 1,\n 2,\n "bar"\n]'; + const edits = setProperty(content, [2], undefined, formatterOptions); assertEdit(content, edits, '[\n 1,\n 2\n]'); }); test('remove last item in the array if ends with comma', () => { - let content = '[\n 1,\n "foo",\n "bar",\n]'; - let edits = setProperty(content, [2], undefined, formatterOptions); + const content = '[\n 1,\n "foo",\n "bar",\n]'; + const edits = setProperty(content, [2], undefined, formatterOptions); assertEdit(content, edits, '[\n 1,\n "foo"\n]'); }); test('remove last item in the array if there is a comment in the beginning', () => { - let content = '// This is a comment\n[\n 1,\n "foo",\n "bar"\n]'; - let edits = setProperty(content, [2], undefined, formatterOptions); + const content = '// This is a comment\n[\n 1,\n "foo",\n "bar"\n]'; + const edits = setProperty(content, [2], undefined, formatterOptions); assertEdit(content, edits, '// This is a comment\n[\n 1,\n "foo"\n]'); }); diff --git a/src/vs/base/test/common/jsonFormatter.test.ts b/src/vs/base/test/common/jsonFormatter.test.ts index b707e1254e6..3ecfe41c7d0 100644 --- a/src/vs/base/test/common/jsonFormatter.test.ts +++ b/src/vs/base/test/common/jsonFormatter.test.ts @@ -20,7 +20,7 @@ suite('JSON - formatter', () => { let lastEditOffset = content.length; for (let i = edits.length - 1; i >= 0; i--) { - let edit = edits[i]; + const edit = edits[i]; assert(edit.offset >= 0 && edit.length >= 0 && edit.offset + edit.length <= content.length); assert(typeof edit.content === 'string'); assert(lastEditOffset >= edit.offset + edit.length); // make sure all edits are ordered diff --git a/src/vs/base/test/common/labels.test.ts b/src/vs/base/test/common/labels.test.ts index 49cc1699699..82bb2d98a75 100644 --- a/src/vs/base/test/common/labels.test.ts +++ b/src/vs/base/test/common/labels.test.ts @@ -139,20 +139,6 @@ suite('Labels', () => { assert.strictEqual(labels.template(t, { dirty: '* ', activeEditorShort: 'somefile.txt', rootName: 'monaco', appName: 'Visual Studio Code', separator: { label: ' - ' } }), '* somefile.txt - monaco - Visual Studio Code'); }); - (isWindows ? test.skip : test)('getBaseLabel - unix', () => { - assert.strictEqual(labels.getBaseLabel('/some/folder/file.txt'), 'file.txt'); - assert.strictEqual(labels.getBaseLabel('/some/folder'), 'folder'); - assert.strictEqual(labels.getBaseLabel('/'), '/'); - }); - - (!isWindows ? test.skip : test)('getBaseLabel - windows', () => { - assert.strictEqual(labels.getBaseLabel('c:'), 'C:'); - assert.strictEqual(labels.getBaseLabel('c:\\'), 'C:'); - assert.strictEqual(labels.getBaseLabel('c:\\some\\folder\\file.txt'), 'file.txt'); - assert.strictEqual(labels.getBaseLabel('c:\\some\\folder'), 'folder'); - assert.strictEqual(labels.getBaseLabel('c:\\some\\f:older'), 'f:older'); // https://github.com/microsoft/vscode-remote-release/issues/4227 - }); - test('mnemonicButtonLabel', () => { assert.strictEqual(labels.mnemonicButtonLabel('Hello World'), 'Hello World'); assert.strictEqual(labels.mnemonicButtonLabel(''), ''); diff --git a/src/vs/base/test/common/lifecycle.test.ts b/src/vs/base/test/common/lifecycle.test.ts index 9114d780820..b3d97a77a9c 100644 --- a/src/vs/base/test/common/lifecycle.test.ts +++ b/src/vs/base/test/common/lifecycle.test.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; import { Emitter } from 'vs/base/common/event'; -import { DisposableStore, dispose, IDisposable, markAsSingleton, MultiDisposeError, ReferenceCollection, SafeDisposable, toDisposable } from 'vs/base/common/lifecycle'; +import { DisposableStore, dispose, IDisposable, markAsSingleton, ReferenceCollection, SafeDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { ensureNoDisposablesAreLeakedInTestSuite, throwIfDisposablesAreLeaked } from 'vs/base/test/common/utils'; class Disposable implements IDisposable { @@ -88,23 +88,23 @@ suite('Lifecycle', () => { assert.ok(disposedValues.has(1)); assert.ok(disposedValues.has(4)); - assert.ok(thrownError instanceof MultiDisposeError); - assert.strictEqual((thrownError as MultiDisposeError).errors.length, 2); - assert.strictEqual((thrownError as MultiDisposeError).errors[0].message, 'I am error 1'); - assert.strictEqual((thrownError as MultiDisposeError).errors[1].message, 'I am error 2'); + assert.ok(thrownError instanceof AggregateError); + assert.strictEqual((thrownError as AggregateError).errors.length, 2); + assert.strictEqual((thrownError as AggregateError).errors[0].message, 'I am error 1'); + assert.strictEqual((thrownError as AggregateError).errors[1].message, 'I am error 2'); }); test('Action bar has broken accessibility #100273', function () { - let array = [{ dispose() { } }, { dispose() { } }]; - let array2 = dispose(array); + const array = [{ dispose() { } }, { dispose() { } }]; + const array2 = dispose(array); assert.strictEqual(array.length, 2); assert.strictEqual(array2.length, 0); assert.ok(array !== array2); - let set = new Set([{ dispose() { } }, { dispose() { } }]); - let setValues = set.values(); - let setValues2 = dispose(setValues); + const set = new Set([{ dispose() { } }, { dispose() { } }]); + const setValues = set.values(); + const setValues2 = dispose(setValues); assert.ok(setValues === setValues2); }); @@ -167,10 +167,10 @@ suite('DisposableStore', () => { assert.ok(disposedValues.has(1)); assert.ok(disposedValues.has(4)); - assert.ok(thrownError instanceof MultiDisposeError); - assert.strictEqual((thrownError as MultiDisposeError).errors.length, 2); - assert.strictEqual((thrownError as MultiDisposeError).errors[0].message, 'I am error 1'); - assert.strictEqual((thrownError as MultiDisposeError).errors[1].message, 'I am error 2'); + assert.ok(thrownError instanceof AggregateError); + assert.strictEqual((thrownError as AggregateError).errors.length, 2); + assert.strictEqual((thrownError as AggregateError).errors[0].message, 'I am error 1'); + assert.strictEqual((thrownError as AggregateError).errors[1].message, 'I am error 2'); }); }); diff --git a/src/vs/base/test/common/linkedList.test.ts b/src/vs/base/test/common/linkedList.test.ts index 4d8d8f60b93..46b39b03055 100644 --- a/src/vs/base/test/common/linkedList.test.ts +++ b/src/vs/base/test/common/linkedList.test.ts @@ -66,7 +66,7 @@ suite('LinkedList', function () { }); test('Push/toArray', () => { - let list = new LinkedList(); + const list = new LinkedList(); list.push('foo'); list.push('bar'); list.push('far'); @@ -107,7 +107,7 @@ suite('LinkedList', function () { }); test('unshift/toArray', () => { - let list = new LinkedList(); + const list = new LinkedList(); list.unshift('foo'); list.unshift('bar'); list.unshift('far'); @@ -116,20 +116,20 @@ suite('LinkedList', function () { }); test('pop/unshift', function () { - let list = new LinkedList(); + const list = new LinkedList(); list.push('a'); list.push('b'); assertElements(list, 'a', 'b'); - let a = list.shift(); + const a = list.shift(); assert.strictEqual(a, 'a'); assertElements(list, 'b'); list.unshift('a'); assertElements(list, 'a', 'b'); - let b = list.pop(); + const b = list.pop(); assert.strictEqual(b, 'b'); assertElements(list, 'a'); }); diff --git a/src/vs/base/test/common/map.test.ts b/src/vs/base/test/common/map.test.ts index 1e2a792cab8..85234d90197 100644 --- a/src/vs/base/test/common/map.test.ts +++ b/src/vs/base/test/common/map.test.ts @@ -4,17 +4,14 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import { shuffle } from 'vs/base/common/arrays'; -import { randomPath } from 'vs/base/common/extpath'; -import { ConfigKeysIterator, LinkedMap, LRUCache, PathIterator, ResourceMap, StringIterator, TernarySearchTree, Touch, UriIterator } from 'vs/base/common/map'; +import { LinkedMap, LRUCache, ResourceMap, Touch } from 'vs/base/common/map'; import { extUriIgnorePathCase } from 'vs/base/common/resources'; -import { StopWatch } from 'vs/base/common/stopwatch'; import { URI } from 'vs/base/common/uri'; suite('Map', () => { test('LinkedMap - Simple', () => { - let map = new LinkedMap(); + const map = new LinkedMap(); map.set('ak', 'av'); map.set('bk', 'bv'); assert.deepStrictEqual([...map.keys()], ['ak', 'bk']); @@ -24,7 +21,7 @@ suite('Map', () => { }); test('LinkedMap - Touch Old one', () => { - let map = new LinkedMap(); + const map = new LinkedMap(); map.set('ak', 'av'); map.set('ak', 'av', Touch.AsOld); assert.deepStrictEqual([...map.keys()], ['ak']); @@ -32,7 +29,7 @@ suite('Map', () => { }); test('LinkedMap - Touch New one', () => { - let map = new LinkedMap(); + const map = new LinkedMap(); map.set('ak', 'av'); map.set('ak', 'av', Touch.AsNew); assert.deepStrictEqual([...map.keys()], ['ak']); @@ -40,7 +37,7 @@ suite('Map', () => { }); test('LinkedMap - Touch Old two', () => { - let map = new LinkedMap(); + const map = new LinkedMap(); map.set('ak', 'av'); map.set('bk', 'bv'); map.set('bk', 'bv', Touch.AsOld); @@ -49,7 +46,7 @@ suite('Map', () => { }); test('LinkedMap - Touch New two', () => { - let map = new LinkedMap(); + const map = new LinkedMap(); map.set('ak', 'av'); map.set('bk', 'bv'); map.set('ak', 'av', Touch.AsNew); @@ -58,7 +55,7 @@ suite('Map', () => { }); test('LinkedMap - Touch Old from middle', () => { - let map = new LinkedMap(); + const map = new LinkedMap(); map.set('ak', 'av'); map.set('bk', 'bv'); map.set('ck', 'cv'); @@ -68,7 +65,7 @@ suite('Map', () => { }); test('LinkedMap - Touch New from middle', () => { - let map = new LinkedMap(); + const map = new LinkedMap(); map.set('ak', 'av'); map.set('bk', 'bv'); map.set('ck', 'cv'); @@ -199,7 +196,7 @@ suite('Map', () => { cache.set(7, 7); assert.strictEqual(cache.size, 5); assert.deepStrictEqual([...cache.keys()], [3, 4, 5, 6, 7]); - let values: number[] = []; + const values: number[] = []; [3, 4, 5, 6, 7].forEach(key => values.push(cache.get(key)!)); assert.deepStrictEqual(values, [3, 4, 5, 6, 7]); }); @@ -214,7 +211,7 @@ suite('Map', () => { assert.deepStrictEqual([...cache.keys()], [1, 2, 4, 5, 3]); cache.peek(4); assert.deepStrictEqual([...cache.keys()], [1, 2, 4, 5, 3]); - let values: number[] = []; + const values: number[] = []; [1, 2, 3, 4, 5].forEach(key => values.push(cache.get(key)!)); assert.deepStrictEqual(values, [1, 2, 3, 4, 5]); }); @@ -235,7 +232,7 @@ suite('Map', () => { cache.set(i, i); } assert.deepStrictEqual(cache.size, 15); - let values: number[] = []; + const values: number[] = []; for (let i = 6; i <= 20; i++) { values.push(cache.get(i)!); assert.strictEqual(cache.get(i), i); @@ -253,7 +250,7 @@ suite('Map', () => { cache.set(11, 11); assert.strictEqual(cache.size, 5); assert.deepStrictEqual([...cache.keys()], [7, 8, 9, 10, 11]); - let values: number[] = []; + const values: number[] = []; [...cache.keys()].forEach(key => values.push(cache.get(key)!)); assert.deepStrictEqual(values, [7, 8, 9, 10, 11]); assert.deepStrictEqual([...cache.values()], values); @@ -328,854 +325,6 @@ suite('Map', () => { assert.strictEqual([...map.keys()][0], '1'); }); - - test('PathIterator', () => { - const iter = new PathIterator(); - iter.reset('file:///usr/bin/file.txt'); - - assert.strictEqual(iter.value(), 'file:'); - assert.strictEqual(iter.hasNext(), true); - assert.strictEqual(iter.cmp('file:'), 0); - assert.ok(iter.cmp('a') < 0); - assert.ok(iter.cmp('aile:') < 0); - assert.ok(iter.cmp('z') > 0); - assert.ok(iter.cmp('zile:') > 0); - - iter.next(); - assert.strictEqual(iter.value(), 'usr'); - assert.strictEqual(iter.hasNext(), true); - - iter.next(); - assert.strictEqual(iter.value(), 'bin'); - assert.strictEqual(iter.hasNext(), true); - - iter.next(); - assert.strictEqual(iter.value(), 'file.txt'); - assert.strictEqual(iter.hasNext(), false); - - iter.next(); - assert.strictEqual(iter.value(), ''); - assert.strictEqual(iter.hasNext(), false); - iter.next(); - assert.strictEqual(iter.value(), ''); - assert.strictEqual(iter.hasNext(), false); - - // - iter.reset('/foo/bar/'); - assert.strictEqual(iter.value(), 'foo'); - assert.strictEqual(iter.hasNext(), true); - - iter.next(); - assert.strictEqual(iter.value(), 'bar'); - assert.strictEqual(iter.hasNext(), false); - }); - - test('URIIterator', function () { - const iter = new UriIterator(() => false, () => false); - iter.reset(URI.parse('file:///usr/bin/file.txt')); - - assert.strictEqual(iter.value(), 'file'); - // assert.strictEqual(iter.cmp('FILE'), 0); - assert.strictEqual(iter.cmp('file'), 0); - assert.strictEqual(iter.hasNext(), true); - iter.next(); - - assert.strictEqual(iter.value(), 'usr'); - assert.strictEqual(iter.hasNext(), true); - iter.next(); - - assert.strictEqual(iter.value(), 'bin'); - assert.strictEqual(iter.hasNext(), true); - iter.next(); - - assert.strictEqual(iter.value(), 'file.txt'); - assert.strictEqual(iter.hasNext(), false); - - - iter.reset(URI.parse('file://share/usr/bin/file.txt?foo')); - - // scheme - assert.strictEqual(iter.value(), 'file'); - // assert.strictEqual(iter.cmp('FILE'), 0); - assert.strictEqual(iter.cmp('file'), 0); - assert.strictEqual(iter.hasNext(), true); - iter.next(); - - // authority - assert.strictEqual(iter.value(), 'share'); - assert.strictEqual(iter.cmp('SHARe'), 0); - assert.strictEqual(iter.hasNext(), true); - iter.next(); - - // path - assert.strictEqual(iter.value(), 'usr'); - assert.strictEqual(iter.hasNext(), true); - iter.next(); - - // path - assert.strictEqual(iter.value(), 'bin'); - assert.strictEqual(iter.hasNext(), true); - iter.next(); - - // path - assert.strictEqual(iter.value(), 'file.txt'); - assert.strictEqual(iter.hasNext(), true); - iter.next(); - - // query - assert.strictEqual(iter.value(), 'foo'); - assert.strictEqual(iter.cmp('z') > 0, true); - assert.strictEqual(iter.cmp('a') < 0, true); - assert.strictEqual(iter.hasNext(), false); - }); - - test('URIIterator - ignore query/fragment', function () { - const iter = new UriIterator(() => false, () => true); - iter.reset(URI.parse('file:///usr/bin/file.txt')); - - assert.strictEqual(iter.value(), 'file'); - // assert.strictEqual(iter.cmp('FILE'), 0); - assert.strictEqual(iter.cmp('file'), 0); - assert.strictEqual(iter.hasNext(), true); - iter.next(); - - assert.strictEqual(iter.value(), 'usr'); - assert.strictEqual(iter.hasNext(), true); - iter.next(); - - assert.strictEqual(iter.value(), 'bin'); - assert.strictEqual(iter.hasNext(), true); - iter.next(); - - assert.strictEqual(iter.value(), 'file.txt'); - assert.strictEqual(iter.hasNext(), false); - - - iter.reset(URI.parse('file://share/usr/bin/file.txt?foo')); - - // scheme - assert.strictEqual(iter.value(), 'file'); - // assert.strictEqual(iter.cmp('FILE'), 0); - assert.strictEqual(iter.cmp('file'), 0); - assert.strictEqual(iter.hasNext(), true); - iter.next(); - - // authority - assert.strictEqual(iter.value(), 'share'); - assert.strictEqual(iter.cmp('SHARe'), 0); - assert.strictEqual(iter.hasNext(), true); - iter.next(); - - // path - assert.strictEqual(iter.value(), 'usr'); - assert.strictEqual(iter.hasNext(), true); - iter.next(); - - // path - assert.strictEqual(iter.value(), 'bin'); - assert.strictEqual(iter.hasNext(), true); - iter.next(); - - // path - assert.strictEqual(iter.value(), 'file.txt'); - assert.strictEqual(iter.hasNext(), false); - }); - - function assertTstDfs(trie: TernarySearchTree, ...elements: [string, E][]) { - - assert.ok(trie._isBalanced(), 'TST is not balanced'); - - let i = 0; - for (let [key, value] of trie) { - const expected = elements[i++]; - assert.ok(expected); - assert.strictEqual(key, expected[0]); - assert.strictEqual(value, expected[1]); - } - - assert.strictEqual(i, elements.length); - - const map = new Map(); - for (const [key, value] of elements) { - map.set(key, value); - } - map.forEach((value, key) => { - assert.strictEqual(trie.get(key), value); - }); - - // forEach - let forEachCount = 0; - trie.forEach((element, key) => { - assert.strictEqual(element, map.get(key)); - forEachCount++; - }); - assert.strictEqual(map.size, forEachCount); - - // iterator - let iterCount = 0; - for (let [key, value] of trie) { - assert.strictEqual(value, map.get(key)); - iterCount++; - } - assert.strictEqual(map.size, iterCount); - - } - - test('TernarySearchTree - set', function () { - - let trie = TernarySearchTree.forStrings(); - trie.set('foobar', 1); - trie.set('foobaz', 2); - - assertTstDfs(trie, ['foobar', 1], ['foobaz', 2]); // longer - - trie = TernarySearchTree.forStrings(); - trie.set('foobar', 1); - trie.set('fooba', 2); - assertTstDfs(trie, ['fooba', 2], ['foobar', 1]); // shorter - - trie = TernarySearchTree.forStrings(); - trie.set('foo', 1); - trie.set('foo', 2); - assertTstDfs(trie, ['foo', 2]); - - trie = TernarySearchTree.forStrings(); - trie.set('foo', 1); - trie.set('foobar', 2); - trie.set('bar', 3); - trie.set('foob', 4); - trie.set('bazz', 5); - - assertTstDfs(trie, - ['bar', 3], - ['bazz', 5], - ['foo', 1], - ['foob', 4], - ['foobar', 2], - ); - }); - - test('TernarySearchTree - findLongestMatch', function () { - - let trie = TernarySearchTree.forStrings(); - trie.set('foo', 1); - trie.set('foobar', 2); - trie.set('foobaz', 3); - assertTstDfs(trie, ['foo', 1], ['foobar', 2], ['foobaz', 3]); - - assert.strictEqual(trie.findSubstr('f'), undefined); - assert.strictEqual(trie.findSubstr('z'), undefined); - assert.strictEqual(trie.findSubstr('foo'), 1); - assert.strictEqual(trie.findSubstr('fooÃļ'), 1); - assert.strictEqual(trie.findSubstr('fooba'), 1); - assert.strictEqual(trie.findSubstr('foobarr'), 2); - assert.strictEqual(trie.findSubstr('foobazrr'), 3); - }); - - test('TernarySearchTree - basics', function () { - let trie = new TernarySearchTree(new StringIterator()); - - trie.set('foo', 1); - trie.set('bar', 2); - trie.set('foobar', 3); - assertTstDfs(trie, ['bar', 2], ['foo', 1], ['foobar', 3]); - - assert.strictEqual(trie.get('foo'), 1); - assert.strictEqual(trie.get('bar'), 2); - assert.strictEqual(trie.get('foobar'), 3); - assert.strictEqual(trie.get('foobaz'), undefined); - assert.strictEqual(trie.get('foobarr'), undefined); - - assert.strictEqual(trie.findSubstr('fo'), undefined); - assert.strictEqual(trie.findSubstr('foo'), 1); - assert.strictEqual(trie.findSubstr('foooo'), 1); - - - trie.delete('foobar'); - trie.delete('bar'); - assert.strictEqual(trie.get('foobar'), undefined); - assert.strictEqual(trie.get('bar'), undefined); - - trie.set('foobar', 17); - trie.set('barr', 18); - assert.strictEqual(trie.get('foobar'), 17); - assert.strictEqual(trie.get('barr'), 18); - assert.strictEqual(trie.get('bar'), undefined); - }); - - test('TernarySearchTree - delete & cleanup', function () { - // normal delete - let trie = new TernarySearchTree(new StringIterator()); - trie.set('foo', 1); - trie.set('foobar', 2); - trie.set('bar', 3); - assertTstDfs(trie, ['bar', 3], ['foo', 1], ['foobar', 2]); - trie.delete('foo'); - assertTstDfs(trie, ['bar', 3], ['foobar', 2]); - trie.delete('foobar'); - assertTstDfs(trie, ['bar', 3]); - - // superstr-delete - trie = new TernarySearchTree(new StringIterator()); - trie.set('foo', 1); - trie.set('foobar', 2); - trie.set('bar', 3); - trie.set('foobarbaz', 4); - trie.deleteSuperstr('foo'); - assertTstDfs(trie, ['bar', 3], ['foo', 1]); - - trie = new TernarySearchTree(new StringIterator()); - trie.set('foo', 1); - trie.set('foobar', 2); - trie.set('bar', 3); - trie.set('foobarbaz', 4); - trie.deleteSuperstr('fo'); - assertTstDfs(trie, ['bar', 3]); - - // trie = new TernarySearchTree(new StringIterator()); - // trie.set('foo', 1); - // trie.set('foobar', 2); - // trie.set('bar', 3); - // trie.deleteSuperStr('f'); - // assertTernarySearchTree(trie, ['bar', 3]); - }); - - test('TernarySearchTree (PathSegments) - basics', function () { - let trie = new TernarySearchTree(new PathIterator()); - - trie.set('/user/foo/bar', 1); - trie.set('/user/foo', 2); - trie.set('/user/foo/flip/flop', 3); - - assert.strictEqual(trie.get('/user/foo/bar'), 1); - assert.strictEqual(trie.get('/user/foo'), 2); - assert.strictEqual(trie.get('/user//foo'), 2); - assert.strictEqual(trie.get('/user\\foo'), 2); - assert.strictEqual(trie.get('/user/foo/flip/flop'), 3); - - assert.strictEqual(trie.findSubstr('/user/bar'), undefined); - assert.strictEqual(trie.findSubstr('/user/foo'), 2); - assert.strictEqual(trie.findSubstr('\\user\\foo'), 2); - assert.strictEqual(trie.findSubstr('/user//foo'), 2); - assert.strictEqual(trie.findSubstr('/user/foo/ba'), 2); - assert.strictEqual(trie.findSubstr('/user/foo/far/boo'), 2); - assert.strictEqual(trie.findSubstr('/user/foo/bar'), 1); - assert.strictEqual(trie.findSubstr('/user/foo/bar/far/boo'), 1); - }); - - test('TernarySearchTree - (AVL) set', function () { - { - // rotate left - let trie = new TernarySearchTree(new PathIterator()); - trie.set('/fileA', 1); - trie.set('/fileB', 2); - trie.set('/fileC', 3); - assertTstDfs(trie, ['/fileA', 1], ['/fileB', 2], ['/fileC', 3]); - } - - { - // rotate left (inside middle) - let trie = new TernarySearchTree(new PathIterator()); - trie.set('/foo/fileA', 1); - trie.set('/foo/fileB', 2); - trie.set('/foo/fileC', 3); - assertTstDfs(trie, ['/foo/fileA', 1], ['/foo/fileB', 2], ['/foo/fileC', 3]); - } - - { - // rotate right - let trie = new TernarySearchTree(new PathIterator()); - trie.set('/fileC', 3); - trie.set('/fileB', 2); - trie.set('/fileA', 1); - assertTstDfs(trie, ['/fileA', 1], ['/fileB', 2], ['/fileC', 3]); - } - - { - // rotate right (inside middle) - let trie = new TernarySearchTree(new PathIterator()); - trie.set('/mid/fileC', 3); - trie.set('/mid/fileB', 2); - trie.set('/mid/fileA', 1); - assertTstDfs(trie, ['/mid/fileA', 1], ['/mid/fileB', 2], ['/mid/fileC', 3]); - } - - { - // rotate right, left - let trie = new TernarySearchTree(new PathIterator()); - trie.set('/fileD', 7); - trie.set('/fileB', 2); - trie.set('/fileG', 42); - trie.set('/fileF', 24); - trie.set('/fileZ', 73); - trie.set('/fileE', 15); - assertTstDfs(trie, ['/fileB', 2], ['/fileD', 7], ['/fileE', 15], ['/fileF', 24], ['/fileG', 42], ['/fileZ', 73]); - } - - { - // rotate left, right - let trie = new TernarySearchTree(new PathIterator()); - trie.set('/fileJ', 42); - trie.set('/fileZ', 73); - trie.set('/fileE', 15); - trie.set('/fileB', 2); - trie.set('/fileF', 7); - trie.set('/fileG', 1); - assertTstDfs(trie, ['/fileB', 2], ['/fileE', 15], ['/fileF', 7], ['/fileG', 1], ['/fileJ', 42], ['/fileZ', 73]); - } - }); - - test('TernarySearchTree - (BST) delete', function () { - - let trie = new TernarySearchTree(new StringIterator()); - - // delete root - trie.set('d', 1); - assertTstDfs(trie, ['d', 1]); - trie.delete('d'); - assertTstDfs(trie); - - // delete node with two element - trie.clear(); - trie.set('d', 1); - trie.set('b', 1); - trie.set('f', 1); - assertTstDfs(trie, ['b', 1], ['d', 1], ['f', 1]); - trie.delete('d'); - assertTstDfs(trie, ['b', 1], ['f', 1]); - - // single child node - trie.clear(); - trie.set('d', 1); - trie.set('b', 1); - trie.set('f', 1); - trie.set('e', 1); - assertTstDfs(trie, ['b', 1], ['d', 1], ['e', 1], ['f', 1]); - trie.delete('f'); - assertTstDfs(trie, ['b', 1], ['d', 1], ['e', 1]); - }); - - test('TernarySearchTree - (AVL) delete', function () { - - let trie = new TernarySearchTree(new StringIterator()); - - trie.clear(); - trie.set('d', 1); - trie.set('b', 1); - trie.set('f', 1); - trie.set('e', 1); - trie.set('z', 1); - assertTstDfs(trie, ['b', 1], ['d', 1], ['e', 1], ['f', 1], ['z', 1]); - - // right, right - trie.delete('b'); - assertTstDfs(trie, ['d', 1], ['e', 1], ['f', 1], ['z', 1]); - - trie.clear(); - trie.set('d', 1); - trie.set('c', 1); - trie.set('f', 1); - trie.set('a', 1); - trie.set('b', 1); - assertTstDfs(trie, ['a', 1], ['b', 1], ['c', 1], ['d', 1], ['f', 1]); - - // left, left - trie.delete('f'); - assertTstDfs(trie, ['a', 1], ['b', 1], ['c', 1], ['d', 1]); - - // mid - trie.clear(); - trie.set('a', 1); - trie.set('ad', 1); - trie.set('ab', 1); - trie.set('af', 1); - trie.set('ae', 1); - trie.set('az', 1); - assertTstDfs(trie, ['a', 1], ['ab', 1], ['ad', 1], ['ae', 1], ['af', 1], ['az', 1]); - - trie.delete('ab'); - assertTstDfs(trie, ['a', 1], ['ad', 1], ['ae', 1], ['af', 1], ['az', 1]); - - trie.delete('a'); - assertTstDfs(trie, ['ad', 1], ['ae', 1], ['af', 1], ['az', 1]); - }); - - test('TernarySearchTree: Cannot read property \'1\' of undefined #138284', function () { - - const keys = [ - URI.parse('fake-fs:/C'), - URI.parse('fake-fs:/A'), - URI.parse('fake-fs:/D'), - URI.parse('fake-fs:/B'), - ]; - - const tst = TernarySearchTree.forUris(); - - for (let item of keys) { - tst.set(item, true); - } - - assert.ok(tst._isBalanced()); - tst.delete(keys[0]); - assert.ok(tst._isBalanced()); - }); - - test('TernarySearchTree: Cannot read property \'1\' of undefined #138284 (simple)', function () { - - const keys = ['C', 'A', 'D', 'B',]; - const tst = TernarySearchTree.forStrings(); - for (let item of keys) { - tst.set(item, true); - } - assertTstDfs(tst, ['A', true], ['B', true], ['C', true], ['D', true]); - - tst.delete(keys[0]); - assertTstDfs(tst, ['A', true], ['B', true], ['D', true]); - - { - const tst = TernarySearchTree.forStrings(); - tst.set('C', true); - tst.set('A', true); - tst.set('B', true); - assertTstDfs(tst, ['A', true], ['B', true], ['C', true]); - } - - }); - - test('TernarySearchTree: Cannot read property \'1\' of undefined #138284 (random)', function () { - for (let round = 10; round >= 0; round--) { - const keys: URI[] = []; - for (let i = 0; i < 100; i++) { - keys.push(URI.from({ scheme: 'fake-fs', path: randomPath(undefined, undefined, 10) })); - } - const tst = TernarySearchTree.forUris(); - - for (let item of keys) { - tst.set(item, true); - assert.ok(tst._isBalanced()); - } - - for (let item of keys) { - tst.delete(item); - assert.ok(tst._isBalanced()); - } - } - }); - - test('TernarySearchTree (PathSegments) - lookup', function () { - - const map = new TernarySearchTree(new PathIterator()); - map.set('/user/foo/bar', 1); - map.set('/user/foo', 2); - map.set('/user/foo/flip/flop', 3); - - assert.strictEqual(map.get('/foo'), undefined); - assert.strictEqual(map.get('/user'), undefined); - assert.strictEqual(map.get('/user/foo'), 2); - assert.strictEqual(map.get('/user/foo/bar'), 1); - assert.strictEqual(map.get('/user/foo/bar/boo'), undefined); - }); - - test('TernarySearchTree (PathSegments) - superstr', function () { - - const map = new TernarySearchTree(new PathIterator()); - map.set('/user/foo/bar', 1); - map.set('/user/foo', 2); - map.set('/user/foo/flip/flop', 3); - map.set('/usr/foo', 4); - - let item: IteratorResult<[string, number]>; - let iter = map.findSuperstr('/user'); - - item = iter!.next(); - assert.strictEqual(item.value[1], 2); - assert.strictEqual(item.done, false); - item = iter!.next(); - assert.strictEqual(item.value[1], 1); - assert.strictEqual(item.done, false); - item = iter!.next(); - assert.strictEqual(item.value[1], 3); - assert.strictEqual(item.done, false); - item = iter!.next(); - assert.strictEqual(item.value, undefined); - assert.strictEqual(item.done, true); - - iter = map.findSuperstr('/usr'); - item = iter!.next(); - assert.strictEqual(item.value[1], 4); - assert.strictEqual(item.done, false); - - item = iter!.next(); - assert.strictEqual(item.value, undefined); - assert.strictEqual(item.done, true); - - assert.strictEqual(map.findSuperstr('/not'), undefined); - assert.strictEqual(map.findSuperstr('/us'), undefined); - assert.strictEqual(map.findSuperstr('/usrr'), undefined); - assert.strictEqual(map.findSuperstr('/userr'), undefined); - }); - - - test('TernarySearchTree (PathSegments) - delete_superstr', function () { - - const map = new TernarySearchTree(new PathIterator()); - map.set('/user/foo/bar', 1); - map.set('/user/foo', 2); - map.set('/user/foo/flip/flop', 3); - map.set('/usr/foo', 4); - - assertTstDfs(map, - ['/user/foo', 2], - ['/user/foo/bar', 1], - ['/user/foo/flip/flop', 3], - ['/usr/foo', 4], - ); - - // not a segment - map.deleteSuperstr('/user/fo'); - assertTstDfs(map, - ['/user/foo', 2], - ['/user/foo/bar', 1], - ['/user/foo/flip/flop', 3], - ['/usr/foo', 4], - ); - - // delete a segment - map.set('/user/foo/bar', 1); - map.set('/user/foo', 2); - map.set('/user/foo/flip/flop', 3); - map.set('/usr/foo', 4); - map.deleteSuperstr('/user/foo'); - assertTstDfs(map, - ['/user/foo', 2], - ['/usr/foo', 4], - ); - }); - - test('TernarySearchTree (URI) - basics', function () { - let trie = new TernarySearchTree(new UriIterator(() => false, () => false)); - - trie.set(URI.file('/user/foo/bar'), 1); - trie.set(URI.file('/user/foo'), 2); - trie.set(URI.file('/user/foo/flip/flop'), 3); - - assert.strictEqual(trie.get(URI.file('/user/foo/bar')), 1); - assert.strictEqual(trie.get(URI.file('/user/foo')), 2); - assert.strictEqual(trie.get(URI.file('/user/foo/flip/flop')), 3); - - assert.strictEqual(trie.findSubstr(URI.file('/user/bar')), undefined); - assert.strictEqual(trie.findSubstr(URI.file('/user/foo')), 2); - assert.strictEqual(trie.findSubstr(URI.file('/user/foo/ba')), 2); - assert.strictEqual(trie.findSubstr(URI.file('/user/foo/far/boo')), 2); - assert.strictEqual(trie.findSubstr(URI.file('/user/foo/bar')), 1); - assert.strictEqual(trie.findSubstr(URI.file('/user/foo/bar/far/boo')), 1); - }); - - test('TernarySearchTree (URI) - query parameters', function () { - let trie = new TernarySearchTree(new UriIterator(() => false, () => true)); - const root = URI.parse('memfs:/?param=1'); - trie.set(root, 1); - - assert.strictEqual(trie.get(URI.parse('memfs:/?param=1')), 1); - - assert.strictEqual(trie.findSubstr(URI.parse('memfs:/?param=1')), 1); - assert.strictEqual(trie.findSubstr(URI.parse('memfs:/aaa?param=1')), 1); - }); - - test('TernarySearchTree (URI) - lookup', function () { - - const map = new TernarySearchTree(new UriIterator(() => false, () => false)); - map.set(URI.parse('http://foo.bar/user/foo/bar'), 1); - map.set(URI.parse('http://foo.bar/user/foo?query'), 2); - map.set(URI.parse('http://foo.bar/user/foo?QUERY'), 3); - map.set(URI.parse('http://foo.bar/user/foo/flip/flop'), 3); - - assert.strictEqual(map.get(URI.parse('http://foo.bar/foo')), undefined); - assert.strictEqual(map.get(URI.parse('http://foo.bar/user')), undefined); - assert.strictEqual(map.get(URI.parse('http://foo.bar/user/foo/bar')), 1); - assert.strictEqual(map.get(URI.parse('http://foo.bar/user/foo?query')), 2); - assert.strictEqual(map.get(URI.parse('http://foo.bar/user/foo?Query')), undefined); - assert.strictEqual(map.get(URI.parse('http://foo.bar/user/foo?QUERY')), 3); - assert.strictEqual(map.get(URI.parse('http://foo.bar/user/foo/bar/boo')), undefined); - }); - - test('TernarySearchTree (URI) - lookup, casing', function () { - - const map = new TernarySearchTree(new UriIterator(uri => /^https?$/.test(uri.scheme), () => false)); - map.set(URI.parse('http://foo.bar/user/foo/bar'), 1); - assert.strictEqual(map.get(URI.parse('http://foo.bar/USER/foo/bar')), 1); - - map.set(URI.parse('foo://foo.bar/user/foo/bar'), 1); - assert.strictEqual(map.get(URI.parse('foo://foo.bar/USER/foo/bar')), undefined); - }); - - test('TernarySearchTree (URI) - superstr', function () { - - const map = new TernarySearchTree(new UriIterator(() => false, () => false)); - map.set(URI.file('/user/foo/bar'), 1); - map.set(URI.file('/user/foo'), 2); - map.set(URI.file('/user/foo/flip/flop'), 3); - map.set(URI.file('/usr/foo'), 4); - - let item: IteratorResult<[URI, number]>; - let iter = map.findSuperstr(URI.file('/user'))!; - - item = iter.next(); - assert.strictEqual(item.value[1], 2); - assert.strictEqual(item.done, false); - item = iter.next(); - assert.strictEqual(item.value[1], 1); - assert.strictEqual(item.done, false); - item = iter.next(); - assert.strictEqual(item.value[1], 3); - assert.strictEqual(item.done, false); - item = iter.next(); - assert.strictEqual(item.value, undefined); - assert.strictEqual(item.done, true); - - iter = map.findSuperstr(URI.file('/usr'))!; - item = iter.next(); - assert.strictEqual(item.value[1], 4); - assert.strictEqual(item.done, false); - - item = iter.next(); - assert.strictEqual(item.value, undefined); - assert.strictEqual(item.done, true); - - iter = map.findSuperstr(URI.file('/'))!; - item = iter.next(); - assert.strictEqual(item.value[1], 2); - assert.strictEqual(item.done, false); - item = iter.next(); - assert.strictEqual(item.value[1], 1); - assert.strictEqual(item.done, false); - item = iter.next(); - assert.strictEqual(item.value[1], 3); - assert.strictEqual(item.done, false); - item = iter.next(); - assert.strictEqual(item.value[1], 4); - assert.strictEqual(item.done, false); - item = iter.next(); - assert.strictEqual(item.value, undefined); - assert.strictEqual(item.done, true); - - assert.strictEqual(map.findSuperstr(URI.file('/not')), undefined); - assert.strictEqual(map.findSuperstr(URI.file('/us')), undefined); - assert.strictEqual(map.findSuperstr(URI.file('/usrr')), undefined); - assert.strictEqual(map.findSuperstr(URI.file('/userr')), undefined); - }); - - test('TernarySearchTree (ConfigKeySegments) - basics', function () { - let trie = new TernarySearchTree(new ConfigKeysIterator()); - - trie.set('config.foo.bar', 1); - trie.set('config.foo', 2); - trie.set('config.foo.flip.flop', 3); - - assert.strictEqual(trie.get('config.foo.bar'), 1); - assert.strictEqual(trie.get('config.foo'), 2); - assert.strictEqual(trie.get('config.foo.flip.flop'), 3); - - assert.strictEqual(trie.findSubstr('config.bar'), undefined); - assert.strictEqual(trie.findSubstr('config.foo'), 2); - assert.strictEqual(trie.findSubstr('config.foo.ba'), 2); - assert.strictEqual(trie.findSubstr('config.foo.far.boo'), 2); - assert.strictEqual(trie.findSubstr('config.foo.bar'), 1); - assert.strictEqual(trie.findSubstr('config.foo.bar.far.boo'), 1); - }); - - test('TernarySearchTree (ConfigKeySegments) - lookup', function () { - - const map = new TernarySearchTree(new ConfigKeysIterator()); - map.set('config.foo.bar', 1); - map.set('config.foo', 2); - map.set('config.foo.flip.flop', 3); - - assert.strictEqual(map.get('foo'), undefined); - assert.strictEqual(map.get('config'), undefined); - assert.strictEqual(map.get('config.foo'), 2); - assert.strictEqual(map.get('config.foo.bar'), 1); - assert.strictEqual(map.get('config.foo.bar.boo'), undefined); - }); - - test('TernarySearchTree (ConfigKeySegments) - superstr', function () { - - const map = new TernarySearchTree(new ConfigKeysIterator()); - map.set('config.foo.bar', 1); - map.set('config.foo', 2); - map.set('config.foo.flip.flop', 3); - map.set('boo', 4); - - let item: IteratorResult<[string, number]>; - let iter = map.findSuperstr('config'); - - item = iter!.next(); - assert.strictEqual(item.value[1], 2); - assert.strictEqual(item.done, false); - item = iter!.next(); - assert.strictEqual(item.value[1], 1); - assert.strictEqual(item.done, false); - item = iter!.next(); - assert.strictEqual(item.value[1], 3); - assert.strictEqual(item.done, false); - item = iter!.next(); - assert.strictEqual(item.value, undefined); - assert.strictEqual(item.done, true); - - assert.strictEqual(map.findSuperstr('foo'), undefined); - assert.strictEqual(map.findSuperstr('config.foo.no'), undefined); - assert.strictEqual(map.findSuperstr('config.foop'), undefined); - }); - - - test('TernarySearchTree (ConfigKeySegments) - delete_superstr', function () { - - const map = new TernarySearchTree(new ConfigKeysIterator()); - map.set('config.foo.bar', 1); - map.set('config.foo', 2); - map.set('config.foo.flip.flop', 3); - map.set('boo', 4); - - assertTstDfs(map, - ['boo', 4], - ['config.foo', 2], - ['config.foo.bar', 1], - ['config.foo.flip.flop', 3], - ); - - // not a segment - map.deleteSuperstr('config.fo'); - assertTstDfs(map, - ['boo', 4], - ['config.foo', 2], - ['config.foo.bar', 1], - ['config.foo.flip.flop', 3], - ); - - // delete a segment - map.set('config.foo.bar', 1); - map.set('config.foo', 2); - map.set('config.foo.flip.flop', 3); - map.set('config.boo', 4); - map.deleteSuperstr('config.foo'); - assertTstDfs(map, - ['boo', 4], - ['config.foo', 2], - ); - }); - - test('TST, fill', function () { - const tst = TernarySearchTree.forStrings(); - - const keys = ['foo', 'bar', 'bang', 'bazz']; - Object.freeze(keys); - tst.fill(true, keys); - - for (let key of keys) { - assert.ok(tst.get(key), key); - } - }); - test('ResourceMap - basics', function () { const map = new ResourceMap(); @@ -1188,7 +337,7 @@ suite('Map', () => { assert.strictEqual(map.size, 0); - let res = map.set(resource1, 1); + const res = map.set(resource1, 1); assert.ok(res === map); map.set(resource2, '2'); map.set(resource3, true); @@ -1336,105 +485,3 @@ suite('Map', () => { }); }); - -suite.skip('TST, perf', function () { - - function createRandomUris(n: number): URI[] { - const uris: URI[] = []; - function randomWord(): string { - let result = ''; - let length = 4 + Math.floor(Math.random() * 4); - for (let i = 0; i < length; i++) { - result += (Math.random() * 26 + 65).toString(36); - } - return result; - } - - // generate 10000 random words - const words: string[] = []; - for (let i = 0; i < 10000; i++) { - words.push(randomWord()); - } - - for (let i = 0; i < n; i++) { - - let len = 4 + Math.floor(Math.random() * 4); - - let segments: string[] = []; - for (; len >= 0; len--) { - segments.push(words[Math.floor(Math.random() * words.length)]); - } - - uris.push(URI.from({ scheme: 'file', path: segments.join('/') })); - } - - return uris; - } - - let tree: TernarySearchTree; - let sampleUris: URI[] = []; - let candidates: URI[] = []; - - suiteSetup(() => { - const len = 50_000; - sampleUris = createRandomUris(len); - candidates = [...sampleUris.slice(0, len / 2), ...createRandomUris(len / 2)]; - shuffle(candidates); - }); - - setup(() => { - tree = TernarySearchTree.forUris(); - for (let uri of sampleUris) { - tree.set(uri, true); - } - }); - - const _profile = false; - - function perfTest(name: string, callback: Function) { - test(name, function () { - if (_profile) { console.profile(name); } - const sw = new StopWatch(true); - callback(); - console.log(name, sw.elapsed()); - if (_profile) { console.profileEnd(); } - }); - } - - perfTest('TST, clear', function () { - tree.clear(); - }); - - perfTest('TST, insert', function () { - let insertTree = TernarySearchTree.forUris(); - for (let uri of sampleUris) { - insertTree.set(uri, true); - } - }); - - perfTest('TST, lookup', function () { - let match = 0; - for (let candidate of candidates) { - if (tree.has(candidate)) { - match += 1; - } - } - assert.strictEqual(match, sampleUris.length / 2); - }); - - perfTest('TST, substr', function () { - let match = 0; - for (let candidate of candidates) { - if (tree.findSubstr(candidate)) { - match += 1; - } - } - assert.strictEqual(match, sampleUris.length / 2); - }); - - perfTest('TST, superstr', function () { - for (let candidate of candidates) { - tree.findSuperstr(candidate); - } - }); -}); diff --git a/src/vs/base/test/common/marshalling.test.ts b/src/vs/base/test/common/marshalling.test.ts index 42bd0b44199..62210356720 100644 --- a/src/vs/base/test/common/marshalling.test.ts +++ b/src/vs/base/test/common/marshalling.test.ts @@ -9,9 +9,9 @@ import { URI } from 'vs/base/common/uri'; suite('Marshalling', () => { test('RegExp', () => { - let value = /foo/img; - let raw = stringify(value); - let clone = parse(raw); + const value = /foo/img; + const raw = stringify(value); + const clone = parse(raw); assert.strictEqual(value.source, clone.source); assert.strictEqual(value.global, clone.global); diff --git a/src/vs/base/test/common/network.test.ts b/src/vs/base/test/common/network.test.ts index f10c4991742..8916eb1c868 100644 --- a/src/vs/base/test/common/network.test.ts +++ b/src/vs/base/test/common/network.test.ts @@ -38,19 +38,19 @@ suite('network', () => { }); (isWeb ? test.skip : test)('FileAccess: query and fragment is dropped (native)', () => { - let originalFileUri = URI.file('network.test.ts').with({ query: 'foo=bar', fragment: 'something' }); - let browserUri = FileAccess.asBrowserUri(originalFileUri); + const originalFileUri = URI.file('network.test.ts').with({ query: 'foo=bar', fragment: 'something' }); + const browserUri = FileAccess.asBrowserUri(originalFileUri); assert.strictEqual(browserUri.query, ''); assert.strictEqual(browserUri.fragment, ''); }); (isWeb ? test.skip : test)('FileAccess: query and fragment is kept if URI is already of same scheme (native)', () => { - let originalFileUri = URI.file('network.test.ts').with({ query: 'foo=bar', fragment: 'something' }); - let browserUri = FileAccess.asBrowserUri(originalFileUri.with({ scheme: Schemas.vscodeFileResource })); + const originalFileUri = URI.file('network.test.ts').with({ query: 'foo=bar', fragment: 'something' }); + const browserUri = FileAccess.asBrowserUri(originalFileUri.with({ scheme: Schemas.vscodeFileResource })); assert.strictEqual(browserUri.query, 'foo=bar'); assert.strictEqual(browserUri.fragment, 'something'); - let fileUri = FileAccess.asFileUri(originalFileUri); + const fileUri = FileAccess.asFileUri(originalFileUri); assert.strictEqual(fileUri.query, 'foo=bar'); assert.strictEqual(fileUri.fragment, 'something'); }); diff --git a/src/vs/base/test/common/objects.test.ts b/src/vs/base/test/common/objects.test.ts index d98554292ee..867615abce6 100644 --- a/src/vs/base/test/common/objects.test.ts +++ b/src/vs/base/test/common/objects.test.ts @@ -5,12 +5,12 @@ import * as assert from 'assert'; import * as objects from 'vs/base/common/objects'; -let check = (one: any, other: any, msg: string) => { +const check = (one: any, other: any, msg: string) => { assert(objects.equals(one, other), msg); assert(objects.equals(other, one), '[reverse] ' + msg); }; -let checkNot = (one: any, other: any, msg: string) => { +const checkNot = (one: any, other: any, msg: string) => { assert(!objects.equals(one, other), msg); assert(!objects.equals(other, one), '[reverse] ' + msg); }; @@ -55,7 +55,7 @@ suite('Objects', () => { test('mixin - array', function () { - let foo: any = {}; + const foo: any = {}; objects.mixin(foo, { bar: [1, 2, 3] }); assert(foo.bar); @@ -67,11 +67,11 @@ suite('Objects', () => { }); test('mixin - no overwrite', function () { - let foo: any = { + const foo: any = { bar: '123' }; - let bar: any = { + const bar: any = { bar: '456' }; @@ -81,8 +81,8 @@ suite('Objects', () => { }); test('cloneAndChange', () => { - let o1 = { something: 'hello' }; - let o = { + const o1 = { something: 'hello' }; + const o = { o1: o1, o2: o1 }; @@ -90,21 +90,21 @@ suite('Objects', () => { }); test('safeStringify', () => { - let obj1: any = { + const obj1: any = { friend: null }; - let obj2: any = { + const obj2: any = { friend: null }; obj1.friend = obj2; obj2.friend = obj1; - let arr: any = [1]; + const arr: any = [1]; arr.push(arr); - let circular: any = { + const circular: any = { a: 42, b: null, c: [ @@ -119,7 +119,7 @@ suite('Objects', () => { circular.b = circular; circular.d = arr; - let result = objects.safeStringify(circular); + const result = objects.safeStringify(circular); assert.deepStrictEqual(JSON.parse(result), { a: 42, @@ -137,7 +137,7 @@ suite('Objects', () => { }); test('distinct', () => { - let base = { + const base = { one: 'one', two: 2, three: { diff --git a/src/vs/base/test/common/observable.test.ts b/src/vs/base/test/common/observable.test.ts new file mode 100644 index 00000000000..a3460dca22b --- /dev/null +++ b/src/vs/base/test/common/observable.test.ts @@ -0,0 +1,507 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as assert from 'assert'; +import { Emitter } from 'vs/base/common/event'; +import { ISettableObservable, autorun, derived, ITransaction, observableFromEvent, observableValue, transaction } from 'vs/base/common/observable'; +import { BaseObservable, IObservable, IObserver } from 'vs/base/common/observableImpl/base'; + +suite('observable integration', () => { + test('basic observable + autorun', () => { + const log = new Log(); + const observable = observableValue('MyObservableValue', 0); + + autorun('MyAutorun', (reader) => { + log.log(`value: ${observable.read(reader)}`); + }); + assert.deepStrictEqual(log.getAndClearEntries(), ['value: 0']); + + observable.set(1, undefined); + assert.deepStrictEqual(log.getAndClearEntries(), ['value: 1']); + + observable.set(1, undefined); + assert.deepStrictEqual(log.getAndClearEntries(), []); + + transaction((tx) => { + observable.set(2, tx); + assert.deepStrictEqual(log.getAndClearEntries(), []); + + observable.set(3, tx); + assert.deepStrictEqual(log.getAndClearEntries(), []); + }); + + assert.deepStrictEqual(log.getAndClearEntries(), ['value: 3']); + }); + + test('basic computed + autorun', () => { + const log = new Log(); + const observable1 = observableValue('MyObservableValue1', 0); + const observable2 = observableValue('MyObservableValue2', 0); + + const computed = derived('computed', (reader) => { + const value1 = observable1.read(reader); + const value2 = observable2.read(reader); + const sum = value1 + value2; + log.log(`recompute: ${value1} + ${value2} = ${sum}`); + return sum; + }); + + autorun('MyAutorun', (reader) => { + log.log(`value: ${computed.read(reader)}`); + }); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'recompute: 0 + 0 = 0', + 'value: 0', + ]); + + observable1.set(1, undefined); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'recompute: 1 + 0 = 1', + 'value: 1', + ]); + + observable2.set(1, undefined); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'recompute: 1 + 1 = 2', + 'value: 2', + ]); + + transaction((tx) => { + observable1.set(5, tx); + assert.deepStrictEqual(log.getAndClearEntries(), []); + + observable2.set(5, tx); + assert.deepStrictEqual(log.getAndClearEntries(), []); + }); + + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'recompute: 5 + 5 = 10', + 'value: 10', + ]); + + transaction((tx) => { + observable1.set(6, tx); + assert.deepStrictEqual(log.getAndClearEntries(), []); + + observable2.set(4, tx); + assert.deepStrictEqual(log.getAndClearEntries(), []); + }); + + assert.deepStrictEqual(log.getAndClearEntries(), ['recompute: 6 + 4 = 10']); + }); + + test('read during transaction', () => { + const log = new Log(); + const observable1 = observableValue('MyObservableValue1', 0); + const observable2 = observableValue('MyObservableValue2', 0); + + const computed = derived('computed', (reader) => { + const value1 = observable1.read(reader); + const value2 = observable2.read(reader); + const sum = value1 + value2; + log.log(`recompute: ${value1} + ${value2} = ${sum}`); + return sum; + }); + + autorun('MyAutorun', (reader) => { + log.log(`value: ${computed.read(reader)}`); + }); + + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'recompute: 0 + 0 = 0', + 'value: 0', + ]); + + log.log(`computed is ${computed.get()}`); + assert.deepStrictEqual(log.getAndClearEntries(), ['computed is 0']); + + transaction((tx) => { + observable1.set(-1, tx); + log.log(`computed is ${computed.get()}`); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'recompute: -1 + 0 = -1', + 'computed is -1', + ]); + + log.log(`computed is ${computed.get()}`); + assert.deepStrictEqual(log.getAndClearEntries(), ['computed is -1']); + + observable2.set(1, tx); + assert.deepStrictEqual(log.getAndClearEntries(), []); + }); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'recompute: -1 + 1 = 0', + 'value: 0', + ]); + }); + + test('topological order', () => { + const log = new Log(); + const observable1 = observableValue('MyObservableValue1', 0); + const observable2 = observableValue('MyObservableValue2', 0); + + const computed1 = derived('computed1', (reader) => { + const value1 = observable1.read(reader); + const value2 = observable2.read(reader); + const sum = value1 + value2; + log.log(`recompute1: ${value1} + ${value2} = ${sum}`); + return sum; + }); + + const computed2 = derived('computed2', (reader) => { + const value1 = computed1.read(reader); + const value2 = observable1.read(reader); + const value3 = observable2.read(reader); + const sum = value1 + value2 + value3; + log.log(`recompute2: ${value1} + ${value2} + ${value3} = ${sum}`); + return sum; + }); + + const computed3 = derived('computed3', (reader) => { + const value1 = computed2.read(reader); + const value2 = observable1.read(reader); + const value3 = observable2.read(reader); + const sum = value1 + value2 + value3; + log.log(`recompute3: ${value1} + ${value2} + ${value3} = ${sum}`); + return sum; + }); + + autorun('MyAutorun', (reader) => { + log.log(`value: ${computed3.read(reader)}`); + }); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'recompute1: 0 + 0 = 0', + 'recompute2: 0 + 0 + 0 = 0', + 'recompute3: 0 + 0 + 0 = 0', + 'value: 0', + ]); + + observable1.set(1, undefined); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'recompute1: 1 + 0 = 1', + 'recompute2: 1 + 1 + 0 = 2', + 'recompute3: 2 + 1 + 0 = 3', + 'value: 3', + ]); + + transaction((tx) => { + observable1.set(2, tx); + log.log(`computed2: ${computed2.get()}`); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'recompute1: 2 + 0 = 2', + 'recompute2: 2 + 2 + 0 = 4', + 'computed2: 4', + ]); + + observable1.set(3, tx); + log.log(`computed2: ${computed2.get()}`); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'recompute1: 3 + 0 = 3', + 'recompute2: 3 + 3 + 0 = 6', + 'computed2: 6', + ]); + }); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'recompute3: 6 + 3 + 0 = 9', + 'value: 9', + ]); + }); + + test('self-disposing autorun', () => { + const log = new Log(); + + const observable1 = new LoggingObservableValue('MyObservableValue1', 0, log); + const observable2 = new LoggingObservableValue('MyObservableValue2', 0, log); + const observable3 = new LoggingObservableValue('MyObservableValue3', 0, log); + + const d = autorun('autorun', (reader) => { + if (observable1.read(reader) >= 2) { + observable2.read(reader); + d.dispose(); + observable3.read(reader); + } + }); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'MyObservableValue1.firstObserverAdded', + 'MyObservableValue1.get', + ]); + + observable1.set(1, undefined); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'MyObservableValue1.set (value 1)', + 'MyObservableValue1.get', + ]); + + observable1.set(2, undefined); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'MyObservableValue1.set (value 2)', + 'MyObservableValue1.get', + 'MyObservableValue2.firstObserverAdded', + 'MyObservableValue2.get', + 'MyObservableValue1.lastObserverRemoved', + 'MyObservableValue2.lastObserverRemoved', + 'MyObservableValue3.get', + ]); + }); + + test('from event', () => { + const log = new Log(); + + let value = 0; + const eventEmitter = new Emitter(); + + let id = 0; + const observable = observableFromEvent( + (handler) => { + const curId = id++; + log.log(`subscribed handler ${curId}`); + const disposable = eventEmitter.event(handler); + + return { + dispose: () => { + log.log(`unsubscribed handler ${curId}`); + disposable.dispose(); + }, + }; + }, + () => { + log.log(`compute value ${value}`); + return value; + } + ); + assert.deepStrictEqual(log.getAndClearEntries(), []); + + log.log(`get value: ${observable.get()}`); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'compute value 0', + 'get value: 0', + ]); + + log.log(`get value: ${observable.get()}`); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'compute value 0', + 'get value: 0', + ]); + + const shouldReadObservable = observableValue('shouldReadObservable', true); + + const autorunDisposable = autorun('MyAutorun', (reader) => { + if (shouldReadObservable.read(reader)) { + observable.read(reader); + log.log( + `autorun, should read: true, value: ${observable.read(reader)}` + ); + } else { + log.log(`autorun, should read: false`); + } + }); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'subscribed handler 0', + 'compute value 0', + 'autorun, should read: true, value: 0', + ]); + + log.log(`get value: ${observable.get()}`); + assert.deepStrictEqual(log.getAndClearEntries(), ['get value: 0']); + + value = 1; + eventEmitter.fire(); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'compute value 1', + 'autorun, should read: true, value: 1', + ]); + + shouldReadObservable.set(false, undefined); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'autorun, should read: false', + 'unsubscribed handler 0', + ]); + + shouldReadObservable.set(true, undefined); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'subscribed handler 1', + 'compute value 1', + 'autorun, should read: true, value: 1', + ]); + + autorunDisposable.dispose(); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'unsubscribed handler 1', + ]); + }); + + test('get without observers', () => { + // Maybe this scenario should not be supported. + + const log = new Log(); + const observable1 = observableValue('MyObservableValue1', 0); + const computed1 = derived('computed', (reader) => { + const value1 = observable1.read(reader); + const result = value1 % 3; + log.log(`recompute1: ${value1} % 3 = ${result}`); + return result; + }); + const computed2 = derived('computed', (reader) => { + const value1 = computed1.read(reader); + + const result = value1 * 2; + log.log(`recompute2: ${value1} * 2 = ${result}`); + return result; + }); + const computed3 = derived('computed', (reader) => { + const value1 = computed1.read(reader); + + const result = value1 * 3; + log.log(`recompute3: ${value1} * 3 = ${result}`); + return result; + }); + const computedSum = derived('computed', (reader) => { + const value1 = computed2.read(reader); + const value2 = computed3.read(reader); + + const result = value1 + value2; + log.log(`recompute4: ${value1} + ${value2} = ${result}`); + return result; + }); + assert.deepStrictEqual(log.getAndClearEntries(), []); + + observable1.set(1, undefined); + assert.deepStrictEqual(log.getAndClearEntries(), []); + + log.log(`value: ${computedSum.get()}`); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'recompute1: 1 % 3 = 1', + 'recompute2: 1 * 2 = 2', + 'recompute3: 1 * 3 = 3', + 'recompute4: 2 + 3 = 5', + 'value: 5', + ]); + + log.log(`value: ${computedSum.get()}`); + assert.deepStrictEqual(log.getAndClearEntries(), [ + 'recompute1: 1 % 3 = 1', + 'recompute2: 1 * 2 = 2', + 'recompute3: 1 * 3 = 3', + 'recompute4: 2 + 3 = 5', + 'value: 5', + ]); + }); +}); + +suite('observable details', () => { + test('1', () => { + const log = new Log(); + + const shouldReadObservable = observableValue('shouldReadObservable', true); + const observable = new LoggingObservableValue('observable', 0, log); + const computed = derived('test', reader => { + if (shouldReadObservable.read(reader)) { + return observable.read(reader) * 2; + } + return 1; + }); + autorun('test', reader => { + const value = computed.read(reader); + log.log(`autorun: ${value}`); + }); + + assert.deepStrictEqual(log.getAndClearEntries(), (["observable.firstObserverAdded", "observable.get", "autorun: 0"])); + + transaction(tx => { + observable.set(1, tx); + assert.deepStrictEqual(log.getAndClearEntries(), (["observable.set (value 1)"])); + + shouldReadObservable.set(false, tx); + assert.deepStrictEqual(log.getAndClearEntries(), ([])); + + computed.get(); + assert.deepStrictEqual(log.getAndClearEntries(), (["observable.lastObserverRemoved"])); + }); + assert.deepStrictEqual(log.getAndClearEntries(), (["autorun: 1"])); + }); +}); + +export class LoggingObserver implements IObserver { + private count = 0; + + constructor(public readonly debugName: string, private readonly log: Log) { + } + + beginUpdate(observable: IObservable): void { + this.count++; + this.log.log(`${this.debugName}.beginUpdate (count ${this.count})`); + } + handleChange(observable: IObservable, change: TChange): void { + this.log.log(`${this.debugName}.handleChange (count ${this.count})`); + } + endUpdate(observable: IObservable): void { + this.log.log(`${this.debugName}.endUpdate (count ${this.count})`); + this.count--; + } +} + +export class LoggingObservableValue + extends BaseObservable + implements ISettableObservable +{ + private value: T; + + constructor(public readonly debugName: string, initialValue: T, private readonly log: Log) { + super(); + this.value = initialValue; + } + + protected override onFirstObserverAdded(): void { + this.log.log(`${this.debugName}.firstObserverAdded`); + } + + protected override onLastObserverRemoved(): void { + this.log.log(`${this.debugName}.lastObserverRemoved`); + } + + public get(): T { + this.log.log(`${this.debugName}.get`); + return this.value; + } + + public set(value: T, tx: ITransaction | undefined, change: TChange): void { + if (this.value === value) { + return; + } + + if (!tx) { + transaction((tx) => { + this.set(value, tx, change); + }, () => `Setting ${this.debugName}`); + return; + } + + this.log.log(`${this.debugName}.set (value ${value})`); + + this.value = value; + + for (const observer of this.observers) { + tx.updateObserver(observer, this); + observer.handleChange(this, change); + } + } + + override toString(): string { + return `${this.debugName}: ${this.value}`; + } +} + +class Log { + private readonly entries: string[] = []; + public log(message: string): void { + this.entries.push(message); + } + + public getAndClearEntries(): string[] { + const entries = [...this.entries]; + this.entries.length = 0; + return entries; + } +} diff --git a/src/vs/base/test/common/processes.test.ts b/src/vs/base/test/common/processes.test.ts index 182ac3979a7..e4d9a64acd5 100644 --- a/src/vs/base/test/common/processes.test.ts +++ b/src/vs/base/test/common/processes.test.ts @@ -8,7 +8,7 @@ import * as processes from 'vs/base/common/processes'; suite('Processes', () => { test('sanitizeProcessEnvironment', () => { - let env = { + const env = { FOO: 'bar', ELECTRON_ENABLE_STACK_DUMPING: 'x', ELECTRON_ENABLE_LOGGING: 'x', diff --git a/src/vs/base/test/common/resourceTree.test.ts b/src/vs/base/test/common/resourceTree.test.ts index 965e49bb6e8..7e3cefa4250 100644 --- a/src/vs/base/test/common/resourceTree.test.ts +++ b/src/vs/base/test/common/resourceTree.test.ts @@ -19,11 +19,11 @@ suite('ResourceTree', function () { tree.add(URI.file('/foo/bar.txt'), 'bar contents'); assert.strictEqual(tree.root.childrenCount, 1); - let foo = tree.root.get('foo')!; + const foo = tree.root.get('foo')!; assert(foo); assert.strictEqual(foo.childrenCount, 1); - let bar = foo.get('bar.txt')!; + const bar = foo.get('bar.txt')!; assert(bar); assert.strictEqual(bar.element, 'bar contents'); diff --git a/src/vs/base/test/common/resources.test.ts b/src/vs/base/test/common/resources.test.ts index 7a1162f27d8..a7b13f12516 100644 --- a/src/vs/base/test/common/resources.test.ts +++ b/src/vs/base/test/common/resources.test.ts @@ -235,14 +235,14 @@ suite('Resources', () => { }); function assertEqualURI(actual: URI, expected: URI, message?: string, ignoreCase?: boolean) { - let util = ignoreCase ? extUriIgnorePathCase : extUri; + const util = ignoreCase ? extUriIgnorePathCase : extUri; if (!util.isEqual(expected, actual)) { assert.strictEqual(actual.toString(), expected.toString(), message); } } function assertRelativePath(u1: URI, u2: URI, expectedPath: string | undefined, ignoreJoin?: boolean, ignoreCase?: boolean) { - let util = ignoreCase ? extUriIgnorePathCase : extUri; + const util = ignoreCase ? extUriIgnorePathCase : extUri; assert.strictEqual(util.relativePath(u1, u2), expectedPath, `from ${u1.toString()} to ${u2.toString()}`); if (expectedPath !== undefined && !ignoreJoin) { @@ -350,7 +350,7 @@ suite('Resources', () => { function assertIsEqual(u1: URI, u2: URI, ignoreCase: boolean | undefined, expected: boolean) { - let util = ignoreCase ? extUriIgnorePathCase : extUri; + const util = ignoreCase ? extUriIgnorePathCase : extUri; assert.strictEqual(util.isEqual(u1, u2), expected, `${u1.toString()}${expected ? '===' : '!=='}${u2.toString()}`); assert.strictEqual(util.compare(u1, u2) === 0, expected); @@ -363,16 +363,16 @@ suite('Resources', () => { test('isEqual', () => { - let fileURI = isWindows ? URI.file('c:\\foo\\bar') : URI.file('/foo/bar'); - let fileURI2 = isWindows ? URI.file('C:\\foo\\Bar') : URI.file('/foo/Bar'); + const fileURI = isWindows ? URI.file('c:\\foo\\bar') : URI.file('/foo/bar'); + const fileURI2 = isWindows ? URI.file('C:\\foo\\Bar') : URI.file('/foo/Bar'); assertIsEqual(fileURI, fileURI, true, true); assertIsEqual(fileURI, fileURI, false, true); assertIsEqual(fileURI, fileURI, undefined, true); assertIsEqual(fileURI, fileURI2, true, true); assertIsEqual(fileURI, fileURI2, false, false); - let fileURI3 = URI.parse('foo://server:453/foo/bar'); - let fileURI4 = URI.parse('foo://server:453/foo/Bar'); + const fileURI3 = URI.parse('foo://server:453/foo/bar'); + const fileURI4 = URI.parse('foo://server:453/foo/Bar'); assertIsEqual(fileURI3, fileURI3, true, true); assertIsEqual(fileURI3, fileURI3, false, true); assertIsEqual(fileURI3, fileURI3, undefined, true); @@ -387,8 +387,8 @@ suite('Resources', () => { assertIsEqual(URI.parse('foo://server/foo'), URI.parse('foo://server/foo/'), true, false); assertIsEqual(URI.parse('foo://server/foo'), URI.parse('foo://server/foo?'), true, true); - let fileURI5 = URI.parse('foo://server:453/foo/bar?q=1'); - let fileURI6 = URI.parse('foo://server:453/foo/bar#xy'); + const fileURI5 = URI.parse('foo://server:453/foo/bar?q=1'); + const fileURI6 = URI.parse('foo://server:453/foo/bar#xy'); assertIsEqual(fileURI5, fileURI5, true, true); assertIsEqual(fileURI5, fileURI3, true, false); @@ -399,9 +399,9 @@ suite('Resources', () => { test('isEqualOrParent', () => { - let fileURI = isWindows ? URI.file('c:\\foo\\bar') : URI.file('/foo/bar'); - let fileURI2 = isWindows ? URI.file('c:\\foo') : URI.file('/foo'); - let fileURI2b = isWindows ? URI.file('C:\\Foo\\') : URI.file('/Foo/'); + const fileURI = isWindows ? URI.file('c:\\foo\\bar') : URI.file('/foo/bar'); + const fileURI2 = isWindows ? URI.file('c:\\foo') : URI.file('/foo'); + const fileURI2b = isWindows ? URI.file('C:\\Foo\\') : URI.file('/Foo/'); assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI, fileURI), true, '1'); assert.strictEqual(extUri.isEqualOrParent(fileURI, fileURI), true, '2'); assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI, fileURI2), true, '3'); @@ -412,9 +412,9 @@ suite('Resources', () => { assert.strictEqual(extUri.isEqualOrParent(fileURI2, fileURI), false, '7'); assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI2b, fileURI2), true, '8'); - let fileURI3 = URI.parse('foo://server:453/foo/bar/goo'); - let fileURI4 = URI.parse('foo://server:453/foo/'); - let fileURI5 = URI.parse('foo://server:453/foo'); + const fileURI3 = URI.parse('foo://server:453/foo/bar/goo'); + const fileURI4 = URI.parse('foo://server:453/foo/'); + const fileURI5 = URI.parse('foo://server:453/foo'); assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI3, fileURI3, true), true, '11'); assert.strictEqual(extUri.isEqualOrParent(fileURI3, fileURI3), true, '12'); assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI3, fileURI4, true), true, '13'); @@ -422,8 +422,8 @@ suite('Resources', () => { assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI3, fileURI, true), false, '15'); assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI5, fileURI5, true), true, '16'); - let fileURI6 = URI.parse('foo://server:453/foo?q=1'); - let fileURI7 = URI.parse('foo://server:453/foo/bar?q=1'); + const fileURI6 = URI.parse('foo://server:453/foo?q=1'); + const fileURI7 = URI.parse('foo://server:453/foo/bar?q=1'); assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI6, fileURI5), false, '17'); assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI6, fileURI6), true, '18'); assert.strictEqual(extUriIgnorePathCase.isEqualOrParent(fileURI7, fileURI6), true, '19'); diff --git a/src/vs/base/test/common/scrollable.test.ts b/src/vs/base/test/common/scrollable.test.ts index bf8e6cb000a..17c9eacce57 100644 --- a/src/vs/base/test/common/scrollable.test.ts +++ b/src/vs/base/test/common/scrollable.test.ts @@ -33,8 +33,8 @@ suite('SmoothScrollingOperation', () => { const LINE_HEIGHT = 20; function extractLines(scrollable: TestSmoothScrollingOperation, now: number): [number, number] { - let scrollTop = scrollable.testTick(now).scrollTop; - let scrollBottom = scrollTop + VIEWPORT_HEIGHT; + const scrollTop = scrollable.testTick(now).scrollTop; + const scrollBottom = scrollTop + VIEWPORT_HEIGHT; const startLineNumber = Math.floor(scrollTop / LINE_HEIGHT); const endLineNumber = Math.ceil(scrollBottom / LINE_HEIGHT); @@ -45,7 +45,8 @@ suite('SmoothScrollingOperation', () => { function simulateSmoothScroll(from: number, to: number): [number, number][] { const scrollable = new TestSmoothScrollingOperation(from, to, VIEWPORT_HEIGHT, 0, ANIMATION_DURATION); - let result: [number, number][] = [], resultLen = 0; + const result: [number, number][] = []; + let resultLen = 0; result[resultLen++] = extractLines(scrollable, 0); result[resultLen++] = extractLines(scrollable, 25); result[resultLen++] = extractLines(scrollable, 50); diff --git a/src/vs/base/test/common/skipList.test.ts b/src/vs/base/test/common/skipList.test.ts index 5f7714c59b1..9712f498f20 100644 --- a/src/vs/base/test/common/skipList.test.ts +++ b/src/vs/base/test/common/skipList.test.ts @@ -15,10 +15,10 @@ suite('SkipList', function () { assert.strictEqual(list.size, expected.length); assert.deepStrictEqual([...list.values()], expected); - let valuesFromEntries = [...list.entries()].map(entry => entry[1]); + const valuesFromEntries = [...list.entries()].map(entry => entry[1]); assert.deepStrictEqual(valuesFromEntries, expected); - let valuesFromIter = [...list].map(entry => entry[1]); + const valuesFromIter = [...list].map(entry => entry[1]); assert.deepStrictEqual(valuesFromIter, expected); let i = 0; @@ -32,10 +32,10 @@ suite('SkipList', function () { assert.strictEqual(list.size, expected.length); assert.deepStrictEqual([...list.keys()], expected); - let keysFromEntries = [...list.entries()].map(entry => entry[0]); + const keysFromEntries = [...list.entries()].map(entry => entry[0]); assert.deepStrictEqual(keysFromEntries, expected); - let keysFromIter = [...list].map(entry => entry[0]); + const keysFromIter = [...list].map(entry => entry[0]); assert.deepStrictEqual(keysFromIter, expected); let i = 0; @@ -46,7 +46,7 @@ suite('SkipList', function () { } test('set/get/delete', function () { - let list = new SkipList((a, b) => a - b); + const list = new SkipList((a, b) => a - b); assert.strictEqual(list.get(3), undefined); list.set(3, 1); @@ -74,7 +74,7 @@ suite('SkipList', function () { }); test('Figure 3', function () { - let list = new SkipList((a, b) => a - b); + const list = new SkipList((a, b) => a - b); list.set(3, true); list.set(6, true); list.set(7, true); @@ -92,7 +92,7 @@ suite('SkipList', function () { }); test('capacity max', function () { - let list = new SkipList((a, b) => a - b, 10); + const list = new SkipList((a, b) => a - b, 10); list.set(1, true); list.set(2, true); list.set(3, true); @@ -132,7 +132,7 @@ suite('SkipList', function () { } function delArraySorted(array: number[], element: number) { - let idx = binarySearch(array, element, cmp); + const idx = binarySearch(array, element, cmp); if (idx >= 0) { // array = array.slice(0, idx).concat(array.slice(idx)); array.splice(idx, 1); @@ -147,13 +147,13 @@ suite('SkipList', function () { const max = 2 ** 16; const values = new Set(); for (let i = 0; i < max; i++) { - let value = Math.floor(Math.random() * max); + const value = Math.floor(Math.random() * max); values.add(value); } console.log(values.size); // init - let list = new SkipList(cmp, max); + const list = new SkipList(cmp, max); let sw = new StopWatch(true); values.forEach(value => list.set(value, true)); sw.stop(); @@ -166,9 +166,9 @@ suite('SkipList', function () { // get sw = new StopWatch(true); - let someValues = [...values].slice(0, values.size / 4); + const someValues = [...values].slice(0, values.size / 4); someValues.forEach(key => { - let value = list.get(key); // find + const value = list.get(key); // find console.assert(value, '[LIST] must have ' + key); list.get(-key); // miss }); @@ -176,7 +176,7 @@ suite('SkipList', function () { console.log(`[LIST] retrieve ${sw.elapsed()}ms (${(sw.elapsed() / (someValues.length * 2)).toPrecision(4)}ms/op)`); sw = new StopWatch(true); someValues.forEach(key => { - let idx = binarySearch(array, key, cmp); // find + const idx = binarySearch(array, key, cmp); // find console.assert(idx >= 0, '[ARRAY] must have ' + key); binarySearch(array, -key, cmp); // miss }); diff --git a/src/vs/base/test/common/stream.test.ts b/src/vs/base/test/common/stream.test.ts index bcd21afe2e4..78c38d691a4 100644 --- a/src/vs/base/test/common/stream.test.ts +++ b/src/vs/base/test/common/stream.test.ts @@ -155,10 +155,10 @@ suite('Stream', () => { res = stream.write('3'); assert.ok(!res); - let promise1 = stream.write('4'); + const promise1 = stream.write('4'); assert.ok(promise1 instanceof Promise); - let promise2 = stream.write('5'); + const promise2 = stream.write('5'); assert.ok(promise2 instanceof Promise); let drained1 = false; diff --git a/src/vs/base/test/common/stripComments.test.ts b/src/vs/base/test/common/stripComments.test.ts index cf681790b7a..d3bd74e71f5 100644 --- a/src/vs/base/test/common/stripComments.test.ts +++ b/src/vs/base/test/common/stripComments.test.ts @@ -122,4 +122,26 @@ suite('Strip Comments', () => { ].join('\n'); assert.strictEqual(stripComments(content), expected); }); + test('Trailing comma in object', () => { + const content: string = [ + "{", + ` "a": 10,`, + "}" + ].join('\n'); + const expected: string = [ + "{", + ` "a": 10`, + "}" + ].join('\n'); + assert.strictEqual(stripComments(content), expected); + }); + test('Trailing comma in array', () => { + const content: string = [ + `[ "a", "b", "c", ]` + ].join('\n'); + const expected: string = [ + `[ "a", "b", "c" ]` + ].join('\n'); + assert.strictEqual(stripComments(content), expected); + }); }); diff --git a/src/vs/base/test/common/ternarySearchtree.test.ts b/src/vs/base/test/common/ternarySearchtree.test.ts new file mode 100644 index 00000000000..4ad5d8bbebd --- /dev/null +++ b/src/vs/base/test/common/ternarySearchtree.test.ts @@ -0,0 +1,1007 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as assert from 'assert'; +import { shuffle } from 'vs/base/common/arrays'; +import { randomPath } from 'vs/base/common/extpath'; +import { StopWatch } from 'vs/base/common/stopwatch'; +import { ConfigKeysIterator, PathIterator, StringIterator, TernarySearchTree, UriIterator } from 'vs/base/common/ternarySearchTree'; +import { URI } from 'vs/base/common/uri'; + +suite('Ternary Search Tree', () => { + + test('PathIterator', () => { + const iter = new PathIterator(); + iter.reset('file:///usr/bin/file.txt'); + + assert.strictEqual(iter.value(), 'file:'); + assert.strictEqual(iter.hasNext(), true); + assert.strictEqual(iter.cmp('file:'), 0); + assert.ok(iter.cmp('a') < 0); + assert.ok(iter.cmp('aile:') < 0); + assert.ok(iter.cmp('z') > 0); + assert.ok(iter.cmp('zile:') > 0); + + iter.next(); + assert.strictEqual(iter.value(), 'usr'); + assert.strictEqual(iter.hasNext(), true); + + iter.next(); + assert.strictEqual(iter.value(), 'bin'); + assert.strictEqual(iter.hasNext(), true); + + iter.next(); + assert.strictEqual(iter.value(), 'file.txt'); + assert.strictEqual(iter.hasNext(), false); + + iter.next(); + assert.strictEqual(iter.value(), ''); + assert.strictEqual(iter.hasNext(), false); + iter.next(); + assert.strictEqual(iter.value(), ''); + assert.strictEqual(iter.hasNext(), false); + + // + iter.reset('/foo/bar/'); + assert.strictEqual(iter.value(), 'foo'); + assert.strictEqual(iter.hasNext(), true); + + iter.next(); + assert.strictEqual(iter.value(), 'bar'); + assert.strictEqual(iter.hasNext(), false); + }); + + test('URIIterator', function () { + const iter = new UriIterator(() => false, () => false); + iter.reset(URI.parse('file:///usr/bin/file.txt')); + + assert.strictEqual(iter.value(), 'file'); + // assert.strictEqual(iter.cmp('FILE'), 0); + assert.strictEqual(iter.cmp('file'), 0); + assert.strictEqual(iter.hasNext(), true); + iter.next(); + + assert.strictEqual(iter.value(), 'usr'); + assert.strictEqual(iter.hasNext(), true); + iter.next(); + + assert.strictEqual(iter.value(), 'bin'); + assert.strictEqual(iter.hasNext(), true); + iter.next(); + + assert.strictEqual(iter.value(), 'file.txt'); + assert.strictEqual(iter.hasNext(), false); + + + iter.reset(URI.parse('file://share/usr/bin/file.txt?foo')); + + // scheme + assert.strictEqual(iter.value(), 'file'); + // assert.strictEqual(iter.cmp('FILE'), 0); + assert.strictEqual(iter.cmp('file'), 0); + assert.strictEqual(iter.hasNext(), true); + iter.next(); + + // authority + assert.strictEqual(iter.value(), 'share'); + assert.strictEqual(iter.cmp('SHARe'), 0); + assert.strictEqual(iter.hasNext(), true); + iter.next(); + + // path + assert.strictEqual(iter.value(), 'usr'); + assert.strictEqual(iter.hasNext(), true); + iter.next(); + + // path + assert.strictEqual(iter.value(), 'bin'); + assert.strictEqual(iter.hasNext(), true); + iter.next(); + + // path + assert.strictEqual(iter.value(), 'file.txt'); + assert.strictEqual(iter.hasNext(), true); + iter.next(); + + // query + assert.strictEqual(iter.value(), 'foo'); + assert.strictEqual(iter.cmp('z') > 0, true); + assert.strictEqual(iter.cmp('a') < 0, true); + assert.strictEqual(iter.hasNext(), false); + }); + + test('URIIterator - ignore query/fragment', function () { + const iter = new UriIterator(() => false, () => true); + iter.reset(URI.parse('file:///usr/bin/file.txt')); + + assert.strictEqual(iter.value(), 'file'); + // assert.strictEqual(iter.cmp('FILE'), 0); + assert.strictEqual(iter.cmp('file'), 0); + assert.strictEqual(iter.hasNext(), true); + iter.next(); + + assert.strictEqual(iter.value(), 'usr'); + assert.strictEqual(iter.hasNext(), true); + iter.next(); + + assert.strictEqual(iter.value(), 'bin'); + assert.strictEqual(iter.hasNext(), true); + iter.next(); + + assert.strictEqual(iter.value(), 'file.txt'); + assert.strictEqual(iter.hasNext(), false); + + + iter.reset(URI.parse('file://share/usr/bin/file.txt?foo')); + + // scheme + assert.strictEqual(iter.value(), 'file'); + // assert.strictEqual(iter.cmp('FILE'), 0); + assert.strictEqual(iter.cmp('file'), 0); + assert.strictEqual(iter.hasNext(), true); + iter.next(); + + // authority + assert.strictEqual(iter.value(), 'share'); + assert.strictEqual(iter.cmp('SHARe'), 0); + assert.strictEqual(iter.hasNext(), true); + iter.next(); + + // path + assert.strictEqual(iter.value(), 'usr'); + assert.strictEqual(iter.hasNext(), true); + iter.next(); + + // path + assert.strictEqual(iter.value(), 'bin'); + assert.strictEqual(iter.hasNext(), true); + iter.next(); + + // path + assert.strictEqual(iter.value(), 'file.txt'); + assert.strictEqual(iter.hasNext(), false); + }); + + function assertTstDfs(trie: TernarySearchTree, ...elements: [string, E][]) { + + assert.ok(trie._isBalanced(), 'TST is not balanced'); + + let i = 0; + for (const [key, value] of trie) { + const expected = elements[i++]; + assert.ok(expected); + assert.strictEqual(key, expected[0]); + assert.strictEqual(value, expected[1]); + } + + assert.strictEqual(i, elements.length); + + const map = new Map(); + for (const [key, value] of elements) { + map.set(key, value); + } + map.forEach((value, key) => { + assert.strictEqual(trie.get(key), value); + }); + + // forEach + let forEachCount = 0; + trie.forEach((element, key) => { + assert.strictEqual(element, map.get(key)); + forEachCount++; + }); + assert.strictEqual(map.size, forEachCount); + + // iterator + let iterCount = 0; + for (const [key, value] of trie) { + assert.strictEqual(value, map.get(key)); + iterCount++; + } + assert.strictEqual(map.size, iterCount); + + } + + test('TernarySearchTree - set', function () { + + let trie = TernarySearchTree.forStrings(); + trie.set('foobar', 1); + trie.set('foobaz', 2); + + assertTstDfs(trie, ['foobar', 1], ['foobaz', 2]); // longer + + trie = TernarySearchTree.forStrings(); + trie.set('foobar', 1); + trie.set('fooba', 2); + assertTstDfs(trie, ['fooba', 2], ['foobar', 1]); // shorter + + trie = TernarySearchTree.forStrings(); + trie.set('foo', 1); + trie.set('foo', 2); + assertTstDfs(trie, ['foo', 2]); + + trie = TernarySearchTree.forStrings(); + trie.set('foo', 1); + trie.set('foobar', 2); + trie.set('bar', 3); + trie.set('foob', 4); + trie.set('bazz', 5); + + assertTstDfs(trie, + ['bar', 3], + ['bazz', 5], + ['foo', 1], + ['foob', 4], + ['foobar', 2], + ); + }); + + test('TernarySearchTree - findLongestMatch', function () { + + const trie = TernarySearchTree.forStrings(); + trie.set('foo', 1); + trie.set('foobar', 2); + trie.set('foobaz', 3); + assertTstDfs(trie, ['foo', 1], ['foobar', 2], ['foobaz', 3]); + + assert.strictEqual(trie.findSubstr('f'), undefined); + assert.strictEqual(trie.findSubstr('z'), undefined); + assert.strictEqual(trie.findSubstr('foo'), 1); + assert.strictEqual(trie.findSubstr('fooÃļ'), 1); + assert.strictEqual(trie.findSubstr('fooba'), 1); + assert.strictEqual(trie.findSubstr('foobarr'), 2); + assert.strictEqual(trie.findSubstr('foobazrr'), 3); + }); + + test('TernarySearchTree - basics', function () { + const trie = new TernarySearchTree(new StringIterator()); + + trie.set('foo', 1); + trie.set('bar', 2); + trie.set('foobar', 3); + assertTstDfs(trie, ['bar', 2], ['foo', 1], ['foobar', 3]); + + assert.strictEqual(trie.get('foo'), 1); + assert.strictEqual(trie.get('bar'), 2); + assert.strictEqual(trie.get('foobar'), 3); + assert.strictEqual(trie.get('foobaz'), undefined); + assert.strictEqual(trie.get('foobarr'), undefined); + + assert.strictEqual(trie.findSubstr('fo'), undefined); + assert.strictEqual(trie.findSubstr('foo'), 1); + assert.strictEqual(trie.findSubstr('foooo'), 1); + + + trie.delete('foobar'); + trie.delete('bar'); + assert.strictEqual(trie.get('foobar'), undefined); + assert.strictEqual(trie.get('bar'), undefined); + + trie.set('foobar', 17); + trie.set('barr', 18); + assert.strictEqual(trie.get('foobar'), 17); + assert.strictEqual(trie.get('barr'), 18); + assert.strictEqual(trie.get('bar'), undefined); + }); + + test('TernarySearchTree - delete & cleanup', function () { + // normal delete + let trie = new TernarySearchTree(new StringIterator()); + trie.set('foo', 1); + trie.set('foobar', 2); + trie.set('bar', 3); + assertTstDfs(trie, ['bar', 3], ['foo', 1], ['foobar', 2]); + trie.delete('foo'); + assertTstDfs(trie, ['bar', 3], ['foobar', 2]); + trie.delete('foobar'); + assertTstDfs(trie, ['bar', 3]); + + // superstr-delete + trie = new TernarySearchTree(new StringIterator()); + trie.set('foo', 1); + trie.set('foobar', 2); + trie.set('bar', 3); + trie.set('foobarbaz', 4); + trie.deleteSuperstr('foo'); + assertTstDfs(trie, ['bar', 3], ['foo', 1]); + + trie = new TernarySearchTree(new StringIterator()); + trie.set('foo', 1); + trie.set('foobar', 2); + trie.set('bar', 3); + trie.set('foobarbaz', 4); + trie.deleteSuperstr('fo'); + assertTstDfs(trie, ['bar', 3]); + + // trie = new TernarySearchTree(new StringIterator()); + // trie.set('foo', 1); + // trie.set('foobar', 2); + // trie.set('bar', 3); + // trie.deleteSuperStr('f'); + // assertTernarySearchTree(trie, ['bar', 3]); + }); + + test('TernarySearchTree (PathSegments) - basics', function () { + const trie = new TernarySearchTree(new PathIterator()); + + trie.set('/user/foo/bar', 1); + trie.set('/user/foo', 2); + trie.set('/user/foo/flip/flop', 3); + + assert.strictEqual(trie.get('/user/foo/bar'), 1); + assert.strictEqual(trie.get('/user/foo'), 2); + assert.strictEqual(trie.get('/user//foo'), 2); + assert.strictEqual(trie.get('/user\\foo'), 2); + assert.strictEqual(trie.get('/user/foo/flip/flop'), 3); + + assert.strictEqual(trie.findSubstr('/user/bar'), undefined); + assert.strictEqual(trie.findSubstr('/user/foo'), 2); + assert.strictEqual(trie.findSubstr('\\user\\foo'), 2); + assert.strictEqual(trie.findSubstr('/user//foo'), 2); + assert.strictEqual(trie.findSubstr('/user/foo/ba'), 2); + assert.strictEqual(trie.findSubstr('/user/foo/far/boo'), 2); + assert.strictEqual(trie.findSubstr('/user/foo/bar'), 1); + assert.strictEqual(trie.findSubstr('/user/foo/bar/far/boo'), 1); + }); + + test('TernarySearchTree - (AVL) set', function () { + { + // rotate left + const trie = new TernarySearchTree(new PathIterator()); + trie.set('/fileA', 1); + trie.set('/fileB', 2); + trie.set('/fileC', 3); + assertTstDfs(trie, ['/fileA', 1], ['/fileB', 2], ['/fileC', 3]); + } + + { + // rotate left (inside middle) + const trie = new TernarySearchTree(new PathIterator()); + trie.set('/foo/fileA', 1); + trie.set('/foo/fileB', 2); + trie.set('/foo/fileC', 3); + assertTstDfs(trie, ['/foo/fileA', 1], ['/foo/fileB', 2], ['/foo/fileC', 3]); + } + + { + // rotate right + const trie = new TernarySearchTree(new PathIterator()); + trie.set('/fileC', 3); + trie.set('/fileB', 2); + trie.set('/fileA', 1); + assertTstDfs(trie, ['/fileA', 1], ['/fileB', 2], ['/fileC', 3]); + } + + { + // rotate right (inside middle) + const trie = new TernarySearchTree(new PathIterator()); + trie.set('/mid/fileC', 3); + trie.set('/mid/fileB', 2); + trie.set('/mid/fileA', 1); + assertTstDfs(trie, ['/mid/fileA', 1], ['/mid/fileB', 2], ['/mid/fileC', 3]); + } + + { + // rotate right, left + const trie = new TernarySearchTree(new PathIterator()); + trie.set('/fileD', 7); + trie.set('/fileB', 2); + trie.set('/fileG', 42); + trie.set('/fileF', 24); + trie.set('/fileZ', 73); + trie.set('/fileE', 15); + assertTstDfs(trie, ['/fileB', 2], ['/fileD', 7], ['/fileE', 15], ['/fileF', 24], ['/fileG', 42], ['/fileZ', 73]); + } + + { + // rotate left, right + const trie = new TernarySearchTree(new PathIterator()); + trie.set('/fileJ', 42); + trie.set('/fileZ', 73); + trie.set('/fileE', 15); + trie.set('/fileB', 2); + trie.set('/fileF', 7); + trie.set('/fileG', 1); + assertTstDfs(trie, ['/fileB', 2], ['/fileE', 15], ['/fileF', 7], ['/fileG', 1], ['/fileJ', 42], ['/fileZ', 73]); + } + }); + + test('TernarySearchTree - (BST) delete', function () { + + const trie = new TernarySearchTree(new StringIterator()); + + // delete root + trie.set('d', 1); + assertTstDfs(trie, ['d', 1]); + trie.delete('d'); + assertTstDfs(trie); + + // delete node with two element + trie.clear(); + trie.set('d', 1); + trie.set('b', 1); + trie.set('f', 1); + assertTstDfs(trie, ['b', 1], ['d', 1], ['f', 1]); + trie.delete('d'); + assertTstDfs(trie, ['b', 1], ['f', 1]); + + // single child node + trie.clear(); + trie.set('d', 1); + trie.set('b', 1); + trie.set('f', 1); + trie.set('e', 1); + assertTstDfs(trie, ['b', 1], ['d', 1], ['e', 1], ['f', 1]); + trie.delete('f'); + assertTstDfs(trie, ['b', 1], ['d', 1], ['e', 1]); + }); + + test('TernarySearchTree - (AVL) delete', function () { + + const trie = new TernarySearchTree(new StringIterator()); + + trie.clear(); + trie.set('d', 1); + trie.set('b', 1); + trie.set('f', 1); + trie.set('e', 1); + trie.set('z', 1); + assertTstDfs(trie, ['b', 1], ['d', 1], ['e', 1], ['f', 1], ['z', 1]); + + // right, right + trie.delete('b'); + assertTstDfs(trie, ['d', 1], ['e', 1], ['f', 1], ['z', 1]); + + trie.clear(); + trie.set('d', 1); + trie.set('c', 1); + trie.set('f', 1); + trie.set('a', 1); + trie.set('b', 1); + assertTstDfs(trie, ['a', 1], ['b', 1], ['c', 1], ['d', 1], ['f', 1]); + + // left, left + trie.delete('f'); + assertTstDfs(trie, ['a', 1], ['b', 1], ['c', 1], ['d', 1]); + + // mid + trie.clear(); + trie.set('a', 1); + trie.set('ad', 1); + trie.set('ab', 1); + trie.set('af', 1); + trie.set('ae', 1); + trie.set('az', 1); + assertTstDfs(trie, ['a', 1], ['ab', 1], ['ad', 1], ['ae', 1], ['af', 1], ['az', 1]); + + trie.delete('ab'); + assertTstDfs(trie, ['a', 1], ['ad', 1], ['ae', 1], ['af', 1], ['az', 1]); + + trie.delete('a'); + assertTstDfs(trie, ['ad', 1], ['ae', 1], ['af', 1], ['az', 1]); + }); + + test('TernarySearchTree: Cannot read property \'1\' of undefined #138284', function () { + + const keys = [ + URI.parse('fake-fs:/C'), + URI.parse('fake-fs:/A'), + URI.parse('fake-fs:/D'), + URI.parse('fake-fs:/B'), + ]; + + const tst = TernarySearchTree.forUris(); + + for (const item of keys) { + tst.set(item, true); + } + + assert.ok(tst._isBalanced()); + tst.delete(keys[0]); + assert.ok(tst._isBalanced()); + }); + + test('TernarySearchTree: Cannot read property \'1\' of undefined #138284 (simple)', function () { + + const keys = ['C', 'A', 'D', 'B',]; + const tst = TernarySearchTree.forStrings(); + for (const item of keys) { + tst.set(item, true); + } + assertTstDfs(tst, ['A', true], ['B', true], ['C', true], ['D', true]); + + tst.delete(keys[0]); + assertTstDfs(tst, ['A', true], ['B', true], ['D', true]); + + { + const tst = TernarySearchTree.forStrings(); + tst.set('C', true); + tst.set('A', true); + tst.set('B', true); + assertTstDfs(tst, ['A', true], ['B', true], ['C', true]); + } + + }); + + test('TernarySearchTree: Cannot read property \'1\' of undefined #138284 (random)', function () { + for (let round = 10; round >= 0; round--) { + const keys: URI[] = []; + for (let i = 0; i < 100; i++) { + keys.push(URI.from({ scheme: 'fake-fs', path: randomPath(undefined, undefined, 10) })); + } + const tst = TernarySearchTree.forUris(); + + for (const item of keys) { + tst.set(item, true); + assert.ok(tst._isBalanced(), `SET${item}|${keys.map(String).join()}`); + } + + for (const item of keys) { + tst.delete(item); + assert.ok(tst._isBalanced(), `DEL${item}|${keys.map(String).join()}`); + } + } + }); + + test('TernarySearchTree: Cannot read properties of undefined (reading \'length\'): #161618 (simple)', function () { + const raw = 'config.debug.toolBarLocation,floating,config.editor.renderControlCharacters,true,config.editor.renderWhitespace,selection,config.files.autoSave,off,config.git.enabled,true,config.notebook.globalToolbar,true,config.terminal.integrated.tabs.enabled,true,config.terminal.integrated.tabs.showActions,singleTerminalOrNarrow,config.terminal.integrated.tabs.showActiveTerminal,singleTerminalOrNarrow,config.workbench.activityBar.visible,true,config.workbench.experimental.settingsProfiles.enabled,true,config.workbench.layoutControl.type,both,config.workbench.sideBar.location,left,config.workbench.statusBar.visible,true'; + const array = raw.split(','); + const tuples: [string, string][] = []; + for (let i = 0; i < array.length; i += 2) { + tuples.push([array[i], array[i + 1]]); + } + + const map = TernarySearchTree.forConfigKeys(); + map.fill(tuples); + + assert.strictEqual([...map].join(), raw); + assert.ok(map.has('config.editor.renderWhitespace')); + + const len = [...map].length; + map.delete('config.editor.renderWhitespace'); + assert.ok(map._isBalanced()); + assert.strictEqual([...map].length, len - 1); + }); + + test('TernarySearchTree: Cannot read properties of undefined (reading \'length\'): #161618 (random)', function () { + const raw = 'config.debug.toolBarLocation,floating,config.editor.renderControlCharacters,true,config.editor.renderWhitespace,selection,config.files.autoSave,off,config.git.enabled,true,config.notebook.globalToolbar,true,config.terminal.integrated.tabs.enabled,true,config.terminal.integrated.tabs.showActions,singleTerminalOrNarrow,config.terminal.integrated.tabs.showActiveTerminal,singleTerminalOrNarrow,config.workbench.activityBar.visible,true,config.workbench.experimental.settingsProfiles.enabled,true,config.workbench.layoutControl.type,both,config.workbench.sideBar.location,left,config.workbench.statusBar.visible,true'; + const array = raw.split(','); + const tuples: [string, string][] = []; + for (let i = 0; i < array.length; i += 2) { + tuples.push([array[i], array[i + 1]]); + } + + for (let round = 100; round >= 0; round--) { + shuffle(tuples); + const map = TernarySearchTree.forConfigKeys(); + map.fill(tuples); + + assert.strictEqual([...map].join(), raw); + assert.ok(map.has('config.editor.renderWhitespace')); + + const len = [...map].length; + map.delete('config.editor.renderWhitespace'); + assert.ok(map._isBalanced()); + assert.strictEqual([...map].length, len - 1); + } + }); + + test('TernarySearchTree (PathSegments) - lookup', function () { + + const map = new TernarySearchTree(new PathIterator()); + map.set('/user/foo/bar', 1); + map.set('/user/foo', 2); + map.set('/user/foo/flip/flop', 3); + + assert.strictEqual(map.get('/foo'), undefined); + assert.strictEqual(map.get('/user'), undefined); + assert.strictEqual(map.get('/user/foo'), 2); + assert.strictEqual(map.get('/user/foo/bar'), 1); + assert.strictEqual(map.get('/user/foo/bar/boo'), undefined); + }); + + test('TernarySearchTree (PathSegments) - superstr', function () { + + const map = new TernarySearchTree(new PathIterator()); + map.set('/user/foo/bar', 1); + map.set('/user/foo', 2); + map.set('/user/foo/flip/flop', 3); + map.set('/usr/foo', 4); + + let item: IteratorResult<[string, number]>; + let iter = map.findSuperstr('/user'); + + item = iter!.next(); + assert.strictEqual(item.value[1], 2); + assert.strictEqual(item.done, false); + item = iter!.next(); + assert.strictEqual(item.value[1], 1); + assert.strictEqual(item.done, false); + item = iter!.next(); + assert.strictEqual(item.value[1], 3); + assert.strictEqual(item.done, false); + item = iter!.next(); + assert.strictEqual(item.value, undefined); + assert.strictEqual(item.done, true); + + iter = map.findSuperstr('/usr'); + item = iter!.next(); + assert.strictEqual(item.value[1], 4); + assert.strictEqual(item.done, false); + + item = iter!.next(); + assert.strictEqual(item.value, undefined); + assert.strictEqual(item.done, true); + + assert.strictEqual(map.findSuperstr('/not'), undefined); + assert.strictEqual(map.findSuperstr('/us'), undefined); + assert.strictEqual(map.findSuperstr('/usrr'), undefined); + assert.strictEqual(map.findSuperstr('/userr'), undefined); + }); + + + test('TernarySearchTree (PathSegments) - delete_superstr', function () { + + const map = new TernarySearchTree(new PathIterator()); + map.set('/user/foo/bar', 1); + map.set('/user/foo', 2); + map.set('/user/foo/flip/flop', 3); + map.set('/usr/foo', 4); + + assertTstDfs(map, + ['/user/foo', 2], + ['/user/foo/bar', 1], + ['/user/foo/flip/flop', 3], + ['/usr/foo', 4], + ); + + // not a segment + map.deleteSuperstr('/user/fo'); + assertTstDfs(map, + ['/user/foo', 2], + ['/user/foo/bar', 1], + ['/user/foo/flip/flop', 3], + ['/usr/foo', 4], + ); + + // delete a segment + map.set('/user/foo/bar', 1); + map.set('/user/foo', 2); + map.set('/user/foo/flip/flop', 3); + map.set('/usr/foo', 4); + map.deleteSuperstr('/user/foo'); + assertTstDfs(map, + ['/user/foo', 2], + ['/usr/foo', 4], + ); + }); + + test('TernarySearchTree (URI) - basics', function () { + const trie = new TernarySearchTree(new UriIterator(() => false, () => false)); + + trie.set(URI.file('/user/foo/bar'), 1); + trie.set(URI.file('/user/foo'), 2); + trie.set(URI.file('/user/foo/flip/flop'), 3); + + assert.strictEqual(trie.get(URI.file('/user/foo/bar')), 1); + assert.strictEqual(trie.get(URI.file('/user/foo')), 2); + assert.strictEqual(trie.get(URI.file('/user/foo/flip/flop')), 3); + + assert.strictEqual(trie.findSubstr(URI.file('/user/bar')), undefined); + assert.strictEqual(trie.findSubstr(URI.file('/user/foo')), 2); + assert.strictEqual(trie.findSubstr(URI.file('/user/foo/ba')), 2); + assert.strictEqual(trie.findSubstr(URI.file('/user/foo/far/boo')), 2); + assert.strictEqual(trie.findSubstr(URI.file('/user/foo/bar')), 1); + assert.strictEqual(trie.findSubstr(URI.file('/user/foo/bar/far/boo')), 1); + }); + + test('TernarySearchTree (URI) - query parameters', function () { + const trie = new TernarySearchTree(new UriIterator(() => false, () => true)); + const root = URI.parse('memfs:/?param=1'); + trie.set(root, 1); + + assert.strictEqual(trie.get(URI.parse('memfs:/?param=1')), 1); + + assert.strictEqual(trie.findSubstr(URI.parse('memfs:/?param=1')), 1); + assert.strictEqual(trie.findSubstr(URI.parse('memfs:/aaa?param=1')), 1); + }); + + test('TernarySearchTree (URI) - lookup', function () { + + const map = new TernarySearchTree(new UriIterator(() => false, () => false)); + map.set(URI.parse('http://foo.bar/user/foo/bar'), 1); + map.set(URI.parse('http://foo.bar/user/foo?query'), 2); + map.set(URI.parse('http://foo.bar/user/foo?QUERY'), 3); + map.set(URI.parse('http://foo.bar/user/foo/flip/flop'), 3); + + assert.strictEqual(map.get(URI.parse('http://foo.bar/foo')), undefined); + assert.strictEqual(map.get(URI.parse('http://foo.bar/user')), undefined); + assert.strictEqual(map.get(URI.parse('http://foo.bar/user/foo/bar')), 1); + assert.strictEqual(map.get(URI.parse('http://foo.bar/user/foo?query')), 2); + assert.strictEqual(map.get(URI.parse('http://foo.bar/user/foo?Query')), undefined); + assert.strictEqual(map.get(URI.parse('http://foo.bar/user/foo?QUERY')), 3); + assert.strictEqual(map.get(URI.parse('http://foo.bar/user/foo/bar/boo')), undefined); + }); + + test('TernarySearchTree (URI) - lookup, casing', function () { + + const map = new TernarySearchTree(new UriIterator(uri => /^https?$/.test(uri.scheme), () => false)); + map.set(URI.parse('http://foo.bar/user/foo/bar'), 1); + assert.strictEqual(map.get(URI.parse('http://foo.bar/USER/foo/bar')), 1); + + map.set(URI.parse('foo://foo.bar/user/foo/bar'), 1); + assert.strictEqual(map.get(URI.parse('foo://foo.bar/USER/foo/bar')), undefined); + }); + + test('TernarySearchTree (URI) - superstr', function () { + + const map = new TernarySearchTree(new UriIterator(() => false, () => false)); + map.set(URI.file('/user/foo/bar'), 1); + map.set(URI.file('/user/foo'), 2); + map.set(URI.file('/user/foo/flip/flop'), 3); + map.set(URI.file('/usr/foo'), 4); + + let item: IteratorResult<[URI, number]>; + let iter = map.findSuperstr(URI.file('/user'))!; + + item = iter.next(); + assert.strictEqual(item.value[1], 2); + assert.strictEqual(item.done, false); + item = iter.next(); + assert.strictEqual(item.value[1], 1); + assert.strictEqual(item.done, false); + item = iter.next(); + assert.strictEqual(item.value[1], 3); + assert.strictEqual(item.done, false); + item = iter.next(); + assert.strictEqual(item.value, undefined); + assert.strictEqual(item.done, true); + + iter = map.findSuperstr(URI.file('/usr'))!; + item = iter.next(); + assert.strictEqual(item.value[1], 4); + assert.strictEqual(item.done, false); + + item = iter.next(); + assert.strictEqual(item.value, undefined); + assert.strictEqual(item.done, true); + + iter = map.findSuperstr(URI.file('/'))!; + item = iter.next(); + assert.strictEqual(item.value[1], 2); + assert.strictEqual(item.done, false); + item = iter.next(); + assert.strictEqual(item.value[1], 1); + assert.strictEqual(item.done, false); + item = iter.next(); + assert.strictEqual(item.value[1], 3); + assert.strictEqual(item.done, false); + item = iter.next(); + assert.strictEqual(item.value[1], 4); + assert.strictEqual(item.done, false); + item = iter.next(); + assert.strictEqual(item.value, undefined); + assert.strictEqual(item.done, true); + + assert.strictEqual(map.findSuperstr(URI.file('/not')), undefined); + assert.strictEqual(map.findSuperstr(URI.file('/us')), undefined); + assert.strictEqual(map.findSuperstr(URI.file('/usrr')), undefined); + assert.strictEqual(map.findSuperstr(URI.file('/userr')), undefined); + }); + + test('TernarySearchTree (ConfigKeySegments) - basics', function () { + const trie = new TernarySearchTree(new ConfigKeysIterator()); + + trie.set('config.foo.bar', 1); + trie.set('config.foo', 2); + trie.set('config.foo.flip.flop', 3); + + assert.strictEqual(trie.get('config.foo.bar'), 1); + assert.strictEqual(trie.get('config.foo'), 2); + assert.strictEqual(trie.get('config.foo.flip.flop'), 3); + + assert.strictEqual(trie.findSubstr('config.bar'), undefined); + assert.strictEqual(trie.findSubstr('config.foo'), 2); + assert.strictEqual(trie.findSubstr('config.foo.ba'), 2); + assert.strictEqual(trie.findSubstr('config.foo.far.boo'), 2); + assert.strictEqual(trie.findSubstr('config.foo.bar'), 1); + assert.strictEqual(trie.findSubstr('config.foo.bar.far.boo'), 1); + }); + + test('TernarySearchTree (ConfigKeySegments) - lookup', function () { + + const map = new TernarySearchTree(new ConfigKeysIterator()); + map.set('config.foo.bar', 1); + map.set('config.foo', 2); + map.set('config.foo.flip.flop', 3); + + assert.strictEqual(map.get('foo'), undefined); + assert.strictEqual(map.get('config'), undefined); + assert.strictEqual(map.get('config.foo'), 2); + assert.strictEqual(map.get('config.foo.bar'), 1); + assert.strictEqual(map.get('config.foo.bar.boo'), undefined); + }); + + test('TernarySearchTree (ConfigKeySegments) - superstr', function () { + + const map = new TernarySearchTree(new ConfigKeysIterator()); + map.set('config.foo.bar', 1); + map.set('config.foo', 2); + map.set('config.foo.flip.flop', 3); + map.set('boo', 4); + + let item: IteratorResult<[string, number]>; + const iter = map.findSuperstr('config'); + + item = iter!.next(); + assert.strictEqual(item.value[1], 2); + assert.strictEqual(item.done, false); + item = iter!.next(); + assert.strictEqual(item.value[1], 1); + assert.strictEqual(item.done, false); + item = iter!.next(); + assert.strictEqual(item.value[1], 3); + assert.strictEqual(item.done, false); + item = iter!.next(); + assert.strictEqual(item.value, undefined); + assert.strictEqual(item.done, true); + + assert.strictEqual(map.findSuperstr('foo'), undefined); + assert.strictEqual(map.findSuperstr('config.foo.no'), undefined); + assert.strictEqual(map.findSuperstr('config.foop'), undefined); + }); + + + test('TernarySearchTree (ConfigKeySegments) - delete_superstr', function () { + + const map = new TernarySearchTree(new ConfigKeysIterator()); + map.set('config.foo.bar', 1); + map.set('config.foo', 2); + map.set('config.foo.flip.flop', 3); + map.set('boo', 4); + + assertTstDfs(map, + ['boo', 4], + ['config.foo', 2], + ['config.foo.bar', 1], + ['config.foo.flip.flop', 3], + ); + + // not a segment + map.deleteSuperstr('config.fo'); + assertTstDfs(map, + ['boo', 4], + ['config.foo', 2], + ['config.foo.bar', 1], + ['config.foo.flip.flop', 3], + ); + + // delete a segment + map.set('config.foo.bar', 1); + map.set('config.foo', 2); + map.set('config.foo.flip.flop', 3); + map.set('config.boo', 4); + map.deleteSuperstr('config.foo'); + assertTstDfs(map, + ['boo', 4], + ['config.foo', 2], + ); + }); + + test('TST, fill', function () { + const tst = TernarySearchTree.forStrings(); + + const keys = ['foo', 'bar', 'bang', 'bazz']; + Object.freeze(keys); + tst.fill(true, keys); + + for (const key of keys) { + assert.ok(tst.get(key), key); + } + }); +}); + + +suite.skip('TST, perf', function () { + + function createRandomUris(n: number): URI[] { + const uris: URI[] = []; + function randomWord(): string { + let result = ''; + const length = 4 + Math.floor(Math.random() * 4); + for (let i = 0; i < length; i++) { + result += (Math.random() * 26 + 65).toString(36); + } + return result; + } + + // generate 10000 random words + const words: string[] = []; + for (let i = 0; i < 10000; i++) { + words.push(randomWord()); + } + + for (let i = 0; i < n; i++) { + + let len = 4 + Math.floor(Math.random() * 4); + + const segments: string[] = []; + for (; len >= 0; len--) { + segments.push(words[Math.floor(Math.random() * words.length)]); + } + + uris.push(URI.from({ scheme: 'file', path: segments.join('/') })); + } + + return uris; + } + + let tree: TernarySearchTree; + let sampleUris: URI[] = []; + let candidates: URI[] = []; + + suiteSetup(() => { + const len = 50_000; + sampleUris = createRandomUris(len); + candidates = [...sampleUris.slice(0, len / 2), ...createRandomUris(len / 2)]; + shuffle(candidates); + }); + + setup(() => { + tree = TernarySearchTree.forUris(); + for (const uri of sampleUris) { + tree.set(uri, true); + } + }); + + const _profile = false; + + function perfTest(name: string, callback: Function) { + test(name, function () { + if (_profile) { console.profile(name); } + const sw = new StopWatch(true); + callback(); + console.log(name, sw.elapsed()); + if (_profile) { console.profileEnd(); } + }); + } + + perfTest('TST, clear', function () { + tree.clear(); + }); + + perfTest('TST, insert', function () { + const insertTree = TernarySearchTree.forUris(); + for (const uri of sampleUris) { + insertTree.set(uri, true); + } + }); + + perfTest('TST, lookup', function () { + let match = 0; + for (const candidate of candidates) { + if (tree.has(candidate)) { + match += 1; + } + } + assert.strictEqual(match, sampleUris.length / 2); + }); + + perfTest('TST, substr', function () { + let match = 0; + for (const candidate of candidates) { + if (tree.findSubstr(candidate)) { + match += 1; + } + } + assert.strictEqual(match, sampleUris.length / 2); + }); + + perfTest('TST, superstr', function () { + for (const candidate of candidates) { + tree.findSuperstr(candidate); + } + }); +}); diff --git a/src/vs/base/test/common/timeTravelScheduler.ts b/src/vs/base/test/common/timeTravelScheduler.ts index 797f308dc06..d35755fd2fb 100644 --- a/src/vs/base/test/common/timeTravelScheduler.ts +++ b/src/vs/base/test/common/timeTravelScheduler.ts @@ -193,7 +193,7 @@ export class AsyncSchedulerProcessor extends Disposable { if (this.history.length >= this.maxTaskCount && this.scheduler.hasScheduledTasks) { const lastTasks = this._history.slice(Math.max(0, this.history.length - 10)).map(h => `${h.source.toString()}: ${h.source.stackTrace}`); - let e = new Error(`Queue did not get empty after processing ${this.history.length} items. These are the last ${lastTasks.length} scheduled tasks:\n${lastTasks.join('\n\n\n')}`); + const e = new Error(`Queue did not get empty after processing ${this.history.length} items. These are the last ${lastTasks.length} scheduled tasks:\n${lastTasks.join('\n\n\n')}`); this.lastError = e; throw e; } @@ -371,7 +371,7 @@ function createDateClass(scheduler: Scheduler): DateConstructor { return new (OriginalDate as any)(...args); } - for (let prop in OriginalDate) { + for (const prop in OriginalDate) { if (OriginalDate.hasOwnProperty(prop)) { (SchedulerDate as any)[prop] = (OriginalDate as any)[prop]; } diff --git a/src/vs/base/test/common/troubleshooting.ts b/src/vs/base/test/common/troubleshooting.ts index 84051e8a18a..7cfee55bd0b 100644 --- a/src/vs/base/test/common/troubleshooting.ts +++ b/src/vs/base/test/common/troubleshooting.ts @@ -47,13 +47,9 @@ export function endTrackingDisposables(): void { } export function beginLoggingFS(withStacks: boolean = false): void { - if ((self).beginLoggingFS) { - (self).beginLoggingFS(withStacks); - } + (self).beginLoggingFS?.(withStacks); } export function endLoggingFS(): void { - if ((self).endLoggingFS) { - (self).endLoggingFS(); - } + (self).endLoggingFS?.(); } diff --git a/src/vs/base/test/common/types.test.ts b/src/vs/base/test/common/types.test.ts index cb7dedbe272..1f5e7d0b812 100644 --- a/src/vs/base/test/common/types.test.ts +++ b/src/vs/base/test/common/types.test.ts @@ -82,24 +82,6 @@ suite('Types', () => { assert(types.isEmptyObject({})); }); - test('isArray', () => { - assert(!types.isArray(undefined)); - assert(!types.isArray(null)); - assert(!types.isArray('foo')); - assert(!types.isArray(5)); - assert(!types.isArray(true)); - assert(!types.isArray({})); - assert(!types.isArray(/test/)); - assert(!types.isArray(new RegExp(''))); - assert(!types.isArray(new Date())); - assert(!types.isArray(assert)); - assert(!types.isArray(function foo() { /**/ })); - assert(!types.isArray({ foo: 'bar' })); - - assert(types.isArray([])); - assert(types.isArray([1, 2, '3'])); - }); - test('isString', () => { assert(!types.isString(undefined)); assert(!types.isString(null)); diff --git a/src/vs/base/test/common/uri.test.ts b/src/vs/base/test/common/uri.test.ts index 03cb8178030..3aedee9c4f1 100644 --- a/src/vs/base/test/common/uri.test.ts +++ b/src/vs/base/test/common/uri.test.ts @@ -88,7 +88,7 @@ suite('URI', () => { }); test('with, identity', () => { - let uri = URI.parse('foo:bar/path'); + const uri = URI.parse('foo:bar/path'); let uri2 = uri.with(null!); assert.ok(uri === uri2); @@ -121,7 +121,7 @@ suite('URI', () => { }); test('with, validation', () => { - let uri = URI.parse('foo:bar/path'); + const uri = URI.parse('foo:bar/path'); assert.throws(() => uri.with({ scheme: 'fai:l' })); assert.throws(() => uri.with({ scheme: 'fäil' })); assert.throws(() => uri.with({ authority: 'fail' })); @@ -281,14 +281,14 @@ suite('URI', () => { }); test('VSCode URI module\'s driveLetterPath regex is incorrect, #32961', function () { - let uri = URI.parse('file:///_:/path'); + const uri = URI.parse('file:///_:/path'); assert.strictEqual(uri.fsPath, isWindows ? '\\_:\\path' : '/_:/path'); }); test('URI#file, no path-is-uri check', () => { // we don't complain here - let value = URI.file('file://path/to/file'); + const value = URI.file('file://path/to/file'); assert.strictEqual(value.scheme, 'file'); assert.strictEqual(value.authority, ''); assert.strictEqual(value.path, '/file://path/to/file'); @@ -475,10 +475,10 @@ suite('URI', () => { }); test.skip('Links in markdown are broken if url contains encoded parameters #79474', function () { - let strIn = 'https://myhost.com/Redirect?url=http%3A%2F%2Fwww.bing.com%3Fsearch%3Dtom'; - let uri1 = URI.parse(strIn); - let strOut = uri1.toString(); - let uri2 = URI.parse(strOut); + const strIn = 'https://myhost.com/Redirect?url=http%3A%2F%2Fwww.bing.com%3Fsearch%3Dtom'; + const uri1 = URI.parse(strIn); + const strOut = uri1.toString(); + const uri2 = URI.parse(strOut); assert.strictEqual(uri1.scheme, uri2.scheme); assert.strictEqual(uri1.authority, uri2.authority); @@ -489,10 +489,10 @@ suite('URI', () => { }); test.skip('Uri#parse can break path-component #45515', function () { - let strIn = 'https://firebasestorage.googleapis.com/v0/b/brewlangerie.appspot.com/o/products%2FzVNZkudXJyq8bPGTXUxx%2FBetterave-Sesame.jpg?alt=media&token=0b2310c4-3ea6-4207-bbde-9c3710ba0437'; - let uri1 = URI.parse(strIn); - let strOut = uri1.toString(); - let uri2 = URI.parse(strOut); + const strIn = 'https://firebasestorage.googleapis.com/v0/b/brewlangerie.appspot.com/o/products%2FzVNZkudXJyq8bPGTXUxx%2FBetterave-Sesame.jpg?alt=media&token=0b2310c4-3ea6-4207-bbde-9c3710ba0437'; + const uri1 = URI.parse(strIn); + const strOut = uri1.toString(); + const uri2 = URI.parse(strOut); assert.strictEqual(uri1.scheme, uri2.scheme); assert.strictEqual(uri1.authority, uri2.authority); @@ -516,9 +516,9 @@ suite('URI', () => { // console.profile(); // let c = 100000; // while (c-- > 0) { - for (let value of values) { - let data = value.toJSON() as UriComponents; - let clone = URI.revive(data); + for (const value of values) { + const data = value.toJSON() as UriComponents; + const clone = URI.revive(data); assert.strictEqual(clone.scheme, value.scheme); assert.strictEqual(clone.authority, value.authority); diff --git a/src/vs/base/test/node/css.build.test.ts b/src/vs/base/test/node/css.build.test.ts new file mode 100644 index 00000000000..9e7323b7f7a --- /dev/null +++ b/src/vs/base/test/node/css.build.test.ts @@ -0,0 +1,313 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as assert from 'assert'; +import { CSSPluginUtilities, rewriteUrls } from 'vs/css.build'; + +suite('CSSPlugin', () => { + + test('Utilities.pathOf', () => { + assert.strictEqual(CSSPluginUtilities.pathOf(''), ''); + assert.strictEqual(CSSPluginUtilities.pathOf('/a'), '/'); + assert.strictEqual(CSSPluginUtilities.pathOf('a/b/c.css'), 'a/b/'); + assert.strictEqual(CSSPluginUtilities.pathOf('a'), ''); + assert.strictEqual(CSSPluginUtilities.pathOf('a.com/a.css'), 'a.com/'); + assert.strictEqual(CSSPluginUtilities.pathOf('http://a.com/a.css'), 'http://a.com/'); + assert.strictEqual(CSSPluginUtilities.pathOf('https://a.com/a.css'), 'https://a.com/'); + assert.strictEqual(CSSPluginUtilities.pathOf('http://a.com/a/b/c.css'), 'http://a.com/a/b/'); + assert.strictEqual(CSSPluginUtilities.pathOf('https://a.com/a/b/c.css'), 'https://a.com/a/b/'); + assert.strictEqual(CSSPluginUtilities.pathOf('/a.css'), '/'); + assert.strictEqual(CSSPluginUtilities.pathOf('/a/b/c.css'), '/a/b/'); + }); + + test('Utilities.joinPaths', () => { + function mytest(a: string, b: string, expected: string) { + assert.strictEqual(CSSPluginUtilities.joinPaths(a, b), expected, '<' + a + '> + <' + b + '> = <' + expected + '>'); + } + mytest('', 'a.css', 'a.css'); + mytest('', './a.css', 'a.css'); + mytest('', '././././a.css', 'a.css'); + mytest('', './../a.css', '../a.css'); + mytest('', '../../a.css', '../../a.css'); + mytest('', '../../a/b/c.css', '../../a/b/c.css'); + mytest('/', 'a.css', '/a.css'); + mytest('/', './a.css', '/a.css'); + mytest('/', '././././a.css', '/a.css'); + mytest('/', './../a.css', '/a.css'); + mytest('/', '../../a.css', '/a.css'); + mytest('/', '../../a/b/c.css', '/a/b/c.css'); + mytest('x/y/z/', 'a.css', 'x/y/z/a.css'); + mytest('x/y/z/', './a.css', 'x/y/z/a.css'); + mytest('x/y/z/', '././././a.css', 'x/y/z/a.css'); + mytest('x/y/z/', './../a.css', 'x/y/a.css'); + mytest('x/y/z/', '../../a.css', 'x/a.css'); + mytest('x/y/z/', '../../a/b/c.css', 'x/a/b/c.css'); + + mytest('//a.com/', 'a.css', '//a.com/a.css'); + mytest('//a.com/', './a.css', '//a.com/a.css'); + mytest('//a.com/', '././././a.css', '//a.com/a.css'); + mytest('//a.com/', './../a.css', '//a.com/a.css'); + mytest('//a.com/', '../../a.css', '//a.com/a.css'); + mytest('//a.com/', '../../a/b/c.css', '//a.com/a/b/c.css'); + mytest('//a.com/x/y/z/', 'a.css', '//a.com/x/y/z/a.css'); + mytest('//a.com/x/y/z/', './a.css', '//a.com/x/y/z/a.css'); + mytest('//a.com/x/y/z/', '././././a.css', '//a.com/x/y/z/a.css'); + mytest('//a.com/x/y/z/', './../a.css', '//a.com/x/y/a.css'); + mytest('//a.com/x/y/z/', '../../a.css', '//a.com/x/a.css'); + mytest('//a.com/x/y/z/', '../../a/b/c.css', '//a.com/x/a/b/c.css'); + + mytest('http://a.com/', 'a.css', 'http://a.com/a.css'); + mytest('http://a.com/', './a.css', 'http://a.com/a.css'); + mytest('http://a.com/', '././././a.css', 'http://a.com/a.css'); + mytest('http://a.com/', './../a.css', 'http://a.com/a.css'); + mytest('http://a.com/', '../../a.css', 'http://a.com/a.css'); + mytest('http://a.com/', '../../a/b/c.css', 'http://a.com/a/b/c.css'); + mytest('http://a.com/x/y/z/', 'a.css', 'http://a.com/x/y/z/a.css'); + mytest('http://a.com/x/y/z/', './a.css', 'http://a.com/x/y/z/a.css'); + mytest('http://a.com/x/y/z/', '././././a.css', 'http://a.com/x/y/z/a.css'); + mytest('http://a.com/x/y/z/', './../a.css', 'http://a.com/x/y/a.css'); + mytest('http://a.com/x/y/z/', '../../a.css', 'http://a.com/x/a.css'); + mytest('http://a.com/x/y/z/', '../../a/b/c.css', 'http://a.com/x/a/b/c.css'); + + mytest('https://a.com/', 'a.css', 'https://a.com/a.css'); + mytest('https://a.com/', './a.css', 'https://a.com/a.css'); + mytest('https://a.com/', '././././a.css', 'https://a.com/a.css'); + mytest('https://a.com/', './../a.css', 'https://a.com/a.css'); + mytest('https://a.com/', '../../a.css', 'https://a.com/a.css'); + mytest('https://a.com/', '../../a/b/c.css', 'https://a.com/a/b/c.css'); + mytest('https://a.com/x/y/z/', 'a.css', 'https://a.com/x/y/z/a.css'); + mytest('https://a.com/x/y/z/', './a.css', 'https://a.com/x/y/z/a.css'); + mytest('https://a.com/x/y/z/', '././././a.css', 'https://a.com/x/y/z/a.css'); + mytest('https://a.com/x/y/z/', './../a.css', 'https://a.com/x/y/a.css'); + mytest('https://a.com/x/y/z/', '../../a.css', 'https://a.com/x/a.css'); + mytest('https://a.com/x/y/z/', '../../a/b/c.css', 'https://a.com/x/a/b/c.css'); + }); + + test('Utilities.commonPrefix', () => { + function mytest(a: string, b: string, expected: string) { + assert.strictEqual(CSSPluginUtilities.commonPrefix(a, b), expected, 'prefix(<' + a + '>, <' + b + '>) = <' + expected + '>'); + assert.strictEqual(CSSPluginUtilities.commonPrefix(b, a), expected, 'prefix(<' + b + '>, <' + a + '>) = <' + expected + '>'); + } + mytest('', '', ''); + mytest('x', '', ''); + mytest('x', 'x', 'x'); + mytest('aaaa', 'aaaa', 'aaaa'); + mytest('aaaaxyz', 'aaaa', 'aaaa'); + mytest('aaaaxyz', 'aaaatuv', 'aaaa'); + }); + + test('Utilities.commonFolderPrefix', () => { + function mytest(a: string, b: string, expected: string) { + assert.strictEqual(CSSPluginUtilities.commonFolderPrefix(a, b), expected, 'folderPrefix(<' + a + '>, <' + b + '>) = <' + expected + '>'); + assert.strictEqual(CSSPluginUtilities.commonFolderPrefix(b, a), expected, 'folderPrefix(<' + b + '>, <' + a + '>) = <' + expected + '>'); + } + mytest('', '', ''); + mytest('x', '', ''); + mytest('x', 'x', ''); + mytest('aaaa', 'aaaa', ''); + mytest('aaaaxyz', 'aaaa', ''); + mytest('aaaaxyz', 'aaaatuv', ''); + mytest('/', '/', '/'); + mytest('x/', '', ''); + mytest('x/', 'x/', 'x/'); + mytest('aaaa/', 'aaaa/', 'aaaa/'); + mytest('aaaa/axyz', 'aaaa/a', 'aaaa/'); + mytest('aaaa/axyz', 'aaaa/atuv', 'aaaa/'); + }); + + test('Utilities.relativePath', () => { + function mytest(a: string, b: string, expected: string) { + assert.strictEqual(CSSPluginUtilities.relativePath(a, b), expected, 'relativePath(<' + a + '>, <' + b + '>) = <' + expected + '>'); + } + mytest('', '', ''); + mytest('x', '', ''); + mytest('x', 'x', 'x'); + mytest('aaaa', 'aaaa', 'aaaa'); + mytest('aaaaxyz', 'aaaa', 'aaaa'); + mytest('aaaaxyz', 'aaaatuv', 'aaaatuv'); + + mytest('x/y/aaaaxyz', 'x/aaaatuv', '../aaaatuv'); + mytest('x/y/aaaaxyz', 'x/y/aaaatuv', 'aaaatuv'); + mytest('z/t/aaaaxyz', 'x/y/aaaatuv', '../../x/y/aaaatuv'); + mytest('aaaaxyz', 'x/y/aaaatuv', 'x/y/aaaatuv'); + + mytest('a', '/a', '/a'); + mytest('/', '/a', '/a'); + mytest('/a/b/c', '/a/b/c', '/a/b/c'); + mytest('/a/b', '/a/b/c/d', '/a/b/c/d'); + + mytest('a', 'http://a', 'http://a'); + mytest('/', 'http://a', 'http://a'); + mytest('/a/b/c', 'http://a/b/c', 'http://a/b/c'); + mytest('/a/b', 'http://a/b/c/d', 'http://a/b/c/d'); + + mytest('a', 'https://a', 'https://a'); + mytest('/', 'https://a', 'https://a'); + mytest('/a/b/c', 'https://a/b/c', 'https://a/b/c'); + mytest('/a/b', 'https://a/b/c/d', 'https://a/b/c/d'); + + mytest('x/', '', '../'); + mytest('x/', '', '../'); + mytest('x/', 'x/', ''); + mytest('x/a', 'x/a', 'a'); + }); + + test('Utilities.rewriteUrls', () => { + function mytest(originalFile: string, newFile: string, url: string, expected: string) { + assert.strictEqual(rewriteUrls(originalFile, newFile, 'sel { background:url(\'' + url + '\'); }'), 'sel { background:url(' + expected + '); }'); + assert.strictEqual(rewriteUrls(originalFile, newFile, 'sel { background:url(\"' + url + '\"); }'), 'sel { background:url(' + expected + '); }'); + assert.strictEqual(rewriteUrls(originalFile, newFile, 'sel { background:url(' + url + '); }'), 'sel { background:url(' + expected + '); }'); + } + + // img/img.png + mytest('a.css', 'b.css', 'img/img.png', 'img/img.png'); + mytest('a.css', 't/b.css', 'img/img.png', '../img/img.png'); + mytest('a.css', 'x/y/b.css', 'img/img.png', '../../img/img.png'); + mytest('x/a.css', 'b.css', 'img/img.png', 'x/img/img.png'); + mytest('x/y/a.css', 'b.css', 'img/img.png', 'x/y/img/img.png'); + mytest('x/y/a.css', 't/u/b.css', 'img/img.png', '../../x/y/img/img.png'); + mytest('x/y/a.css', 'x/u/b.css', 'img/img.png', '../y/img/img.png'); + mytest('x/y/a.css', 'x/y/b.css', 'img/img.png', 'img/img.png'); + mytest('/a.css', 'b.css', 'img/img.png', '/img/img.png'); + mytest('/a.css', 'x/b.css', 'img/img.png', '/img/img.png'); + mytest('/a.css', 'x/y/b.css', 'img/img.png', '/img/img.png'); + mytest('/x/a.css', 'b.css', 'img/img.png', '/x/img/img.png'); + mytest('/x/a.css', 'x/b.css', 'img/img.png', '/x/img/img.png'); + mytest('/x/a.css', 'x/y/b.css', 'img/img.png', '/x/img/img.png'); + mytest('/x/y/a.css', 'b.css', 'img/img.png', '/x/y/img/img.png'); + mytest('/x/y/a.css', 'x/b.css', 'img/img.png', '/x/y/img/img.png'); + mytest('/x/y/a.css', 'x/y/b.css', 'img/img.png', '/x/y/img/img.png'); + mytest('/a.css', '/b.css', 'img/img.png', '/img/img.png'); + mytest('/a.css', '/b.css', 'img/img.png', '/img/img.png'); + mytest('/x/a.css', '/b.css', 'img/img.png', '/x/img/img.png'); + mytest('/x/a.css', '/x/b.css', 'img/img.png', '/x/img/img.png'); + mytest('http://www.example.com/x/y/a.css', 'b.css', 'img/img.png', 'http://www.example.com/x/y/img/img.png'); + mytest('http://www.example.com/x/y/a.css', 'http://www.example2.com/b.css', 'img/img.png', 'http://www.example.com/x/y/img/img.png'); + mytest('https://www.example.com/x/y/a.css', 'b.css', 'img/img.png', 'https://www.example.com/x/y/img/img.png'); + + // ../img/img.png + mytest('a.css', 'b.css', '../img/img.png', '../img/img.png'); + mytest('a.css', 't/b.css', '../img/img.png', '../../img/img.png'); + mytest('a.css', 'x/y/b.css', '../img/img.png', '../../../img/img.png'); + mytest('x/a.css', 'b.css', '../img/img.png', 'img/img.png'); + mytest('x/y/a.css', 'b.css', '../img/img.png', 'x/img/img.png'); + mytest('x/y/a.css', 't/u/b.css', '../img/img.png', '../../x/img/img.png'); + mytest('x/y/a.css', 'x/u/b.css', '../img/img.png', '../img/img.png'); + mytest('x/y/a.css', 'x/y/b.css', '../img/img.png', '../img/img.png'); + mytest('/a.css', 'b.css', '../img/img.png', '/img/img.png'); + mytest('/a.css', 'x/b.css', '../img/img.png', '/img/img.png'); + mytest('/a.css', 'x/y/b.css', '../img/img.png', '/img/img.png'); + mytest('/x/a.css', 'b.css', '../img/img.png', '/img/img.png'); + mytest('/x/a.css', 'x/b.css', '../img/img.png', '/img/img.png'); + mytest('/x/a.css', 'x/y/b.css', '../img/img.png', '/img/img.png'); + mytest('/x/y/a.css', 'b.css', '../img/img.png', '/x/img/img.png'); + mytest('/x/y/a.css', 'x/b.css', '../img/img.png', '/x/img/img.png'); + mytest('/x/y/a.css', 'x/y/b.css', '../img/img.png', '/x/img/img.png'); + mytest('/a.css', '/b.css', '../img/img.png', '/img/img.png'); + mytest('/a.css', '/b.css', '../img/img.png', '/img/img.png'); + mytest('/x/a.css', '/b.css', '../img/img.png', '/img/img.png'); + mytest('/x/a.css', '/x/b.css', '../img/img.png', '/img/img.png'); + mytest('http://www.example.com/x/y/a.css', 'b.css', '../img/img.png', 'http://www.example.com/x/img/img.png'); + mytest('http://www.example.com/x/y/a.css', 'http://www.example2.com/b.css', '../img/img.png', 'http://www.example.com/x/img/img.png'); + mytest('https://www.example.com/x/y/a.css', 'b.css', '../img/img.png', 'https://www.example.com/x/img/img.png'); + + // /img/img.png + mytest('a.css', 'b.css', '/img/img.png', '/img/img.png'); + mytest('a.css', 't/b.css', '/img/img.png', '/img/img.png'); + mytest('a.css', 'x/y/b.css', '/img/img.png', '/img/img.png'); + mytest('x/a.css', 'b.css', '/img/img.png', '/img/img.png'); + mytest('x/y/a.css', 'b.css', '/img/img.png', '/img/img.png'); + mytest('x/y/a.css', 't/u/b.css', '/img/img.png', '/img/img.png'); + mytest('x/y/a.css', 'x/u/b.css', '/img/img.png', '/img/img.png'); + mytest('x/y/a.css', 'x/y/b.css', '/img/img.png', '/img/img.png'); + mytest('/a.css', 'b.css', '/img/img.png', '/img/img.png'); + mytest('/a.css', 'x/b.css', '/img/img.png', '/img/img.png'); + mytest('/a.css', 'x/y/b.css', '/img/img.png', '/img/img.png'); + mytest('/x/a.css', 'b.css', '/img/img.png', '/img/img.png'); + mytest('/x/a.css', 'x/b.css', '/img/img.png', '/img/img.png'); + mytest('/x/a.css', 'x/y/b.css', '/img/img.png', '/img/img.png'); + mytest('/x/y/a.css', 'b.css', '/img/img.png', '/img/img.png'); + mytest('/x/y/a.css', 'x/b.css', '/img/img.png', '/img/img.png'); + mytest('/x/y/a.css', 'x/y/b.css', '/img/img.png', '/img/img.png'); + mytest('/a.css', '/b.css', '/img/img.png', '/img/img.png'); + mytest('/a.css', '/b.css', '/img/img.png', '/img/img.png'); + mytest('/x/a.css', '/b.css', '/img/img.png', '/img/img.png'); + mytest('/x/a.css', '/x/b.css', '/img/img.png', '/img/img.png'); + mytest('http://www.example.com/x/y/a.css', 'b.css', '/img/img.png', 'http://www.example.com/img/img.png'); + mytest('http://www.example.com/x/y/a.css', 'http://www.example.com/x/y/b.css', '/img/img.png', 'http://www.example.com/img/img.png'); + mytest('https://www.example.com/x/y/a.css', 'b.css', '/img/img.png', 'https://www.example.com/img/img.png'); + + // http://example.com/img/img.png + mytest('a.css', 'b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('a.css', 't/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('a.css', 'x/y/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('x/a.css', 'b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('x/y/a.css', 'b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('x/y/a.css', 't/u/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('x/y/a.css', 'x/u/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('x/y/a.css', 'x/y/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('/a.css', 'b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('/a.css', 'x/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('/a.css', 'x/y/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('/x/a.css', 'b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('/x/a.css', 'x/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('/x/a.css', 'x/y/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('/x/y/a.css', 'b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('/x/y/a.css', 'x/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('/x/y/a.css', 'x/y/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('/a.css', '/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('/a.css', '/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('/x/a.css', '/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('/x/a.css', '/x/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('http://www.example.com/x/y/a.css', 'b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('http://www.example.com/x/y/a.css', 'http://www.example.com/x/y/b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + mytest('https://www.example.com/x/y/a.css', 'b.css', 'http://example.com/img/img.png', 'http://example.com/img/img.png'); + + + }); + + test('Utilities.rewriteUrls - quotes and spaces', () => { + assert.strictEqual(rewriteUrls('x/y/a.css', 't/u/b.css', 'sel { background:url(\'../img/img.png\'); }'), 'sel { background:url(../../x/img/img.png); }'); + assert.strictEqual(rewriteUrls('x/y/a.css', 't/u/b.css', 'sel { background:url(\t\'../img/img.png\'); }'), 'sel { background:url(../../x/img/img.png); }'); + assert.strictEqual(rewriteUrls('x/y/a.css', 't/u/b.css', 'sel { background:url( \'../img/img.png\'); }'), 'sel { background:url(../../x/img/img.png); }'); + assert.strictEqual(rewriteUrls('x/y/a.css', 't/u/b.css', 'sel { background:url(\'../img/img.png\'\t); }'), 'sel { background:url(../../x/img/img.png); }'); + assert.strictEqual(rewriteUrls('x/y/a.css', 't/u/b.css', 'sel { background:url(\'../img/img.png\' ); }'), 'sel { background:url(../../x/img/img.png); }'); + assert.strictEqual(rewriteUrls('x/y/a.css', 't/u/b.css', 'sel { background:url( \t \'../img/img.png\' \t); }'), 'sel { background:url(../../x/img/img.png); }'); + }); + + test('Bug 9601 - css should ignore data urls', () => { + const dataUrl = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAACHmlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iPgogICAgICAgICA8ZGM6c3ViamVjdD4KICAgICAgICAgICAgPHJkZjpCYWcvPgogICAgICAgICA8L2RjOnN1YmplY3Q+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iPgogICAgICAgICA8eG1wOkNyZWF0b3JUb29sPkFkb2JlIEltYWdlUmVhZHk8L3htcDpDcmVhdG9yVG9vbD4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+ClC8oVQAAAGnSURBVDiNrZMxTxNxGMZ///9dZWns9a4dTHSABFiuCU5dGt2d9BsQls6GD2LCd2AiQQfixKIJE0ObdKIUSvDa5uLZihP0Sh+HOw3ipOUZ3zzvL2+e932NJBaRe7/Q8Uw5eMRrzXllDU8A5mJkLB+/TflQ+67JXb+5O0FUNS9deLckns/tn2A7hxtDawZvn37Vp78AX8rmxZLDewf89HGJ+fgKCrkrBeuXKPy44hbGN7e8eTbRZwALcFE2nuOy48j6zmaTYP8Qtxaia9A1uLWQYP8QZ7OJI+s7LjsXZeMBIIlLn61xgEbLnqadtiQp7Z0orq8rrq8r7Z1IkqadtkbLnsYBuvTZkpQBhgF7SRVFJRQ3QqW9bgY5P1V6fpoDu4oboaISSqpoGLD3GzAIOEqqaFBBURHF9TWlZxlEktKzruL6mqJi5kmqaBBwJIl7Wf+7LICBIYBSKGyE+LsHuCurzPo9Zv0e7soq/u4BhY0Qpfn68p6HCbHv4Q0qtBPfarLd1LR1nAVWzDNphJq2jjXZbirxrQYV2n0PT9Lih/Rwp/xLCz3T/+gnd2VVRJs/vngAAAAASUVORK5CYII='; + + function mytest(originalFile: string, newFile: string) { + assert.strictEqual(rewriteUrls(originalFile, newFile, 'sel { background:url(' + dataUrl + '); }'), 'sel { background:url(' + dataUrl + '); }'); + assert.strictEqual(rewriteUrls(originalFile, newFile, 'sel { background:url( \t' + dataUrl + '\t ); }'), 'sel { background:url(' + dataUrl + '); }'); + } + + mytest('a.css', 'b.css'); + mytest('a.css', 't/b.css'); + mytest('a.css', 'x/y/b.css'); + mytest('x/a.css', 'b.css'); + mytest('x/y/a.css', 'b.css'); + mytest('x/y/a.css', 't/u/b.css'); + mytest('x/y/a.css', 'x/u/b.css'); + mytest('x/y/a.css', 'x/y/b.css'); + mytest('/a.css', 'b.css'); + mytest('/a.css', 'x/b.css'); + mytest('/a.css', 'x/y/b.css'); + mytest('/x/a.css', 'b.css'); + mytest('/x/a.css', 'x/b.css'); + mytest('/x/a.css', 'x/y/b.css'); + mytest('/x/y/a.css', 'b.css'); + mytest('/x/y/a.css', 'x/b.css'); + mytest('/x/y/a.css', 'x/y/b.css'); + mytest('/a.css', '/b.css'); + mytest('/a.css', '/b.css'); + mytest('/x/a.css', '/b.css'); + mytest('/x/a.css', '/x/b.css'); + mytest('http://www.example.com/x/y/a.css', 'b.css'); + mytest('http://www.example.com/x/y/a.css', 'http://www.example.com/x/y/b.css'); + mytest('https://www.example.com/x/y/a.css', 'b.css'); + }); +}); diff --git a/src/vs/base/test/node/decoder.test.ts b/src/vs/base/test/node/decoder.test.ts deleted file mode 100644 index aa2e867c741..00000000000 --- a/src/vs/base/test/node/decoder.test.ts +++ /dev/null @@ -1,22 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import * as assert from 'assert'; -import { LineDecoder } from 'vs/base/node/decoder'; - -suite('Decoder', () => { - - test('decoding', () => { - const lineDecoder = new LineDecoder(); - let res = lineDecoder.write(Buffer.from('hello')); - assert.strictEqual(res.length, 0); - - res = lineDecoder.write(Buffer.from('\nworld')); - assert.strictEqual(res[0], 'hello'); - assert.strictEqual(res.length, 1); - - assert.strictEqual(lineDecoder.end(), 'world'); - }); -}); diff --git a/src/vs/base/test/node/pfs/pfs.test.ts b/src/vs/base/test/node/pfs/pfs.test.ts index e45782e236f..b4661751c0c 100644 --- a/src/vs/base/test/node/pfs/pfs.test.ts +++ b/src/vs/base/test/node/pfs/pfs.test.ts @@ -11,9 +11,11 @@ import { VSBuffer } from 'vs/base/common/buffer'; import { randomPath } from 'vs/base/common/extpath'; import { join, sep } from 'vs/base/common/path'; import { isWindows } from 'vs/base/common/platform'; -import { Promises, RimRafMode, rimrafSync, SymlinkSupport, writeFileSync } from 'vs/base/node/pfs'; +import { configureFlushOnWrite, Promises, RimRafMode, rimrafSync, SymlinkSupport, writeFileSync } from 'vs/base/node/pfs'; import { flakySuite, getPathFromAmdModule, getRandomTestPath } from 'vs/base/test/node/testUtils'; +configureFlushOnWrite(false); // speed up all unit tests by disabling flush on write + flakySuite('PFS', function () { let testDir: string; @@ -88,6 +90,16 @@ flakySuite('PFS', function () { assert.ok(!fs.existsSync(testDir)); }); + test('rimraf - path does not exist - move', async () => { + const nonExistingDir = join(testDir, 'unknown-move'); + await Promises.rm(nonExistingDir, RimRafMode.MOVE); + }); + + test('rimraf - path does not exist - unlink', async () => { + const nonExistingDir = join(testDir, 'unknown-unlink'); + await Promises.rm(nonExistingDir, RimRafMode.UNLINK); + }); + test('rimraf - recursive folder structure - unlink', async () => { fs.writeFileSync(join(testDir, 'somefile.txt'), 'Contents'); fs.writeFileSync(join(testDir, 'someOtherFile.txt'), 'Contents'); @@ -368,24 +380,36 @@ flakySuite('PFS', function () { const smallData = 'Hello World'; const bigData = (new Array(100 * 1024)).join('Large String\n'); - return testWriteFileAndFlush(smallData, smallData, bigData, bigData); + return testWriteFile(smallData, smallData, bigData, bigData); + }); + + test('writeFile (string) - flush on write', async () => { + configureFlushOnWrite(true); + try { + const smallData = 'Hello World'; + const bigData = (new Array(100 * 1024)).join('Large String\n'); + + return await testWriteFile(smallData, smallData, bigData, bigData); + } finally { + configureFlushOnWrite(false); + } }); test('writeFile (Buffer)', async () => { const smallData = 'Hello World'; const bigData = (new Array(100 * 1024)).join('Large String\n'); - return testWriteFileAndFlush(Buffer.from(smallData), smallData, Buffer.from(bigData), bigData); + return testWriteFile(Buffer.from(smallData), smallData, Buffer.from(bigData), bigData); }); test('writeFile (UInt8Array)', async () => { const smallData = 'Hello World'; const bigData = (new Array(100 * 1024)).join('Large String\n'); - return testWriteFileAndFlush(VSBuffer.fromString(smallData).buffer, smallData, VSBuffer.fromString(bigData).buffer, bigData); + return testWriteFile(VSBuffer.fromString(smallData).buffer, smallData, VSBuffer.fromString(bigData).buffer, bigData); }); - async function testWriteFileAndFlush( + async function testWriteFile( smallData: string | Buffer | Uint8Array, smallDataValue: string, bigData: string | Buffer | Uint8Array, diff --git a/src/vs/base/test/node/uri.test.perf.ts b/src/vs/base/test/node/uri.test.perf.ts index e64621b1eb8..3a96440e5df 100644 --- a/src/vs/base/test/node/uri.test.perf.ts +++ b/src/vs/base/test/node/uri.test.perf.ts @@ -13,18 +13,18 @@ suite('URI - perf', function () { let manyFileUris: URI[]; setup(function () { manyFileUris = []; - let data = readFileSync(getPathFromAmdModule(require, './uri.test.data.txt')).toString(); - let lines = data.split('\n'); - for (let line of lines) { + const data = readFileSync(getPathFromAmdModule(require, './uri.test.data.txt')).toString(); + const lines = data.split('\n'); + for (const line of lines) { manyFileUris.push(URI.file(line)); } }); function perfTest(name: string, callback: Function) { test(name, _done => { - let t1 = Date.now(); + const t1 = Date.now(); callback(); - let d = Date.now() - t1; + const d = Date.now() - t1; console.log(`${name} took ${d}ms (${(d / manyFileUris.length).toPrecision(3)} ms/uri)`); _done(); }); @@ -32,28 +32,28 @@ suite('URI - perf', function () { perfTest('toString', function () { for (const uri of manyFileUris) { - let data = uri.toString(); + const data = uri.toString(); assert.ok(data); } }); perfTest('toString(skipEncoding)', function () { for (const uri of manyFileUris) { - let data = uri.toString(true); + const data = uri.toString(true); assert.ok(data); } }); perfTest('fsPath', function () { for (const uri of manyFileUris) { - let data = uri.fsPath; + const data = uri.fsPath; assert.ok(data); } }); perfTest('toJSON', function () { for (const uri of manyFileUris) { - let data = uri.toJSON(); + const data = uri.toJSON(); assert.ok(data); } }); diff --git a/src/vs/base/worker/workerMain.ts b/src/vs/base/worker/workerMain.ts index ec81ce66c0f..9b4656b31c4 100644 --- a/src/vs/base/worker/workerMain.ts +++ b/src/vs/base/worker/workerMain.ts @@ -17,7 +17,8 @@ // see https://github.com/w3c/webappsec-trusted-types/wiki/Trusted-Types-for-function-constructor const fnArgs = args.slice(0, -1).join(','); const fnBody = args.pop()!.toString(); - const body = `(function anonymous(${fnArgs}) {\n${fnBody}\n})`; + // Do not add a new line to fnBody, as this will confuse source maps. + const body = `(function anonymous(${fnArgs}) { ${fnBody}\n})`; return body; } }) @@ -76,17 +77,21 @@ }); } - const loadCode = function (moduleId: string) { + function configureAMDLoader() { + require.config({ + baseUrl: monacoBaseUrl, + catchError: true, + trustedTypesPolicy, + amdModulesPattern: /^vs\// + }); + } + + function loadCode(moduleId: string) { loadAMDLoader().then(() => { - require.config({ - baseUrl: monacoBaseUrl, - catchError: true, - trustedTypesPolicy, - amdModulesPattern: /^vs\// - }); + configureAMDLoader(); require([moduleId], function (ws) { setTimeout(function () { - let messageHandler = ws.create((msg: any, transfer?: Transferable[]) => { + const messageHandler = ws.create((msg: any, transfer?: Transferable[]) => { (self).postMessage(msg, transfer); }, null); @@ -97,10 +102,17 @@ }, 0); }); }); - }; + } + + // If the loader is already defined, configure it immediately + // This helps in the bundled case, where we must load nls files + // and they need a correct baseUrl to be loaded. + if (typeof (self).define === 'function' && (self).define.amd) { + configureAMDLoader(); + } let isFirstMessage = true; - let beforeReadyMessages: MessageEvent[] = []; + const beforeReadyMessages: MessageEvent[] = []; self.onmessage = (message: MessageEvent) => { if (!isFirstMessage) { beforeReadyMessages.push(message); diff --git a/src/vs/code/browser/workbench/workbench-dev.html b/src/vs/code/browser/workbench/workbench-dev.html index 1c36a7a0c72..be6d30bfb98 100644 --- a/src/vs/code/browser/workbench/workbench-dev.html +++ b/src/vs/code/browser/workbench/workbench-dev.html @@ -3,7 +3,7 @@ @@ -28,6 +28,7 @@ + @@ -55,7 +56,6 @@ paths: self.webPackagePaths }); - diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html index d8914408e4a..a41b5dbf7bd 100644 --- a/src/vs/code/browser/workbench/workbench.html +++ b/src/vs/code/browser/workbench/workbench.html @@ -43,13 +43,13 @@ // Set up nls if the user is not using the default language (English) const nlsConfig = {}; - const locale = navigator.language; + const locale = window.localStorage.getItem('vscode.nls.locale') || navigator.language; if (!locale.startsWith('en')) { nlsConfig['vs/nls'] = { availableLanguages: { '*': locale }, - baseUrl: '{{WORKBENCH_NLS_BASE_URL}}' + translationServiceUrl: '{{WORKBENCH_NLS_BASE_URL}}' }; } @@ -58,7 +58,10 @@ recordStats: true, trustedTypesPolicy: window.trustedTypes?.createPolicy('amdLoader', { createScriptURL(value) { - return value; + if(value.startsWith(window.location.origin)) { + return value; + } + throw new Error(`Invalid script url: ${value}`) } }), paths: self.webPackagePaths, diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts index cad7de3f9ed..9f34c85cc2d 100644 --- a/src/vs/code/browser/workbench/workbench.ts +++ b/src/vs/code/browser/workbench/workbench.ts @@ -14,9 +14,13 @@ import { URI, UriComponents } from 'vs/base/common/uri'; import { request } from 'vs/base/parts/request/browser/request'; import product from 'vs/platform/product/common/product'; import { isFolderToOpen, isWorkspaceToOpen } from 'vs/platform/window/common/window'; -import { create, ICredentialsProvider, IURLCallbackProvider, IWorkbenchConstructionOptions, IWorkspace, IWorkspaceProvider } from 'vs/workbench/workbench.web.main'; +import { create } from 'vs/workbench/workbench.web.main'; import { posix } from 'vs/base/common/path'; import { ltrim } from 'vs/base/common/strings'; +import type { ICredentialsProvider } from 'vs/platform/credentials/common/credentials'; +import type { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService'; +import type { IWorkbenchConstructionOptions } from 'vs/workbench/browser/web.api'; +import type { IWorkspace, IWorkspaceProvider } from 'vs/workbench/services/host/browser/browserHostService'; interface ICredential { service: string; diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/extensionsCleaner.ts b/src/vs/code/electron-browser/sharedProcess/contrib/extensionsCleaner.ts index f26355d5692..7da094c5965 100644 --- a/src/vs/code/electron-browser/sharedProcess/contrib/extensionsCleaner.ts +++ b/src/vs/code/electron-browser/sharedProcess/contrib/extensionsCleaner.ts @@ -3,27 +3,184 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Disposable } from 'vs/base/common/lifecycle'; -import { IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement'; +import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle'; +import { URI } from 'vs/base/common/uri'; +import { IExtensionGalleryService, IExtensionIdentifier, IGlobalExtensionEnablementService, DidUninstallExtensionEvent, InstallExtensionResult, UninstallOptions } from 'vs/platform/extensionManagement/common/extensionManagement'; +import { getIdAndVersion } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; +import { IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService'; import { ExtensionStorageService, IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage'; import { migrateUnsupportedExtensions } from 'vs/platform/extensionManagement/common/unsupportedExtensionsMigration'; -import { ExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService'; +import { INativeServerExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService'; +import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions'; +import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ILogService } from 'vs/platform/log/common/log'; import { IStorageService } from 'vs/platform/storage/common/storage'; +import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'; +import { DidChangeProfilesEvent, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile'; + +const uninstalOptions: UninstallOptions = { versionOnly: true, donotIncludePack: true, donotCheckDependents: true }; export class ExtensionsCleaner extends Disposable { constructor( - @IExtensionManagementService extensionManagementService: ExtensionManagementService, + @INativeServerExtensionManagementService extensionManagementService: INativeServerExtensionManagementService, + @IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService, @IExtensionGalleryService extensionGalleryService: IExtensionGalleryService, @IExtensionStorageService extensionStorageService: IExtensionStorageService, @IGlobalExtensionEnablementService extensionEnablementService: IGlobalExtensionEnablementService, + @IInstantiationService instantiationService: IInstantiationService, @IStorageService storageService: IStorageService, @ILogService logService: ILogService, ) { super(); - extensionManagementService.removeDeprecatedExtensions(); + + extensionManagementService.removeUninstalledExtensions(this.userDataProfilesService.profiles.length === 1); migrateUnsupportedExtensions(extensionManagementService, extensionGalleryService, extensionStorageService, extensionEnablementService, logService); ExtensionStorageService.removeOutdatedExtensionVersions(extensionManagementService, storageService); + this._register(instantiationService.createInstance(ProfileExtensionsCleaner)); + } +} + +class ProfileExtensionsCleaner extends Disposable { + + private profileExtensionsLocations = new Map; + + private readonly profileModeDisposables = this._register(new MutableDisposable()); + + constructor( + @INativeServerExtensionManagementService private readonly extensionManagementService: INativeServerExtensionManagementService, + @IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService, + @IExtensionsProfileScannerService private readonly extensionsProfileScannerService: IExtensionsProfileScannerService, + @IUriIdentityService private readonly uriIdentityService: IUriIdentityService, + @ILogService private readonly logService: ILogService, + ) { + super(); + this.onDidChangeProfiles({ added: this.userDataProfilesService.profiles, removed: [], all: this.userDataProfilesService.profiles }); + } + + private async onDidChangeProfiles({ added, removed, all }: Omit): Promise { + try { + await Promise.all(removed.map(profile => profile.extensionsResource ? this.removeExtensionsFromProfile(profile.extensionsResource) : Promise.resolve())); + } catch (error) { + this.logService.error(error); + } + + if (all.length === 1) { + // Exit profile mode + this.profileModeDisposables.clear(); + // Listen for entering into profile mode + const disposable = this._register(this.userDataProfilesService.onDidChangeProfiles(() => { + disposable.dispose(); + this.onDidChangeProfiles({ added: this.userDataProfilesService.profiles, removed: [], all: this.userDataProfilesService.profiles }); + })); + return; + } + + try { + if (added.length) { + await Promise.all(added.map(profile => profile.extensionsResource ? this.populateExtensionsFromProfile(profile.extensionsResource) : Promise.resolve())); + // Enter profile mode + if (!this.profileModeDisposables.value) { + this.profileModeDisposables.value = new DisposableStore(); + this.profileModeDisposables.value.add(toDisposable(() => this.profileExtensionsLocations.clear())); + this.profileModeDisposables.value.add(this.userDataProfilesService.onDidChangeProfiles(e => this.onDidChangeProfiles(e))); + this.profileModeDisposables.value.add(this.extensionManagementService.onDidInstallExtensions(e => this.onDidInstallExtensions(e))); + this.profileModeDisposables.value.add(this.extensionManagementService.onDidUninstallExtension(e => this.onDidUninstallExtension(e))); + await this.uninstallExtensionsNotInProfiles(); + } + } + } catch (error) { + this.logService.error(error); + } + } + + private async uninstallExtensionsNotInProfiles(): Promise { + const installed = await this.extensionManagementService.getAllUserInstalled(); + const toUninstall = installed.filter(installedExtension => installedExtension.installedTimestamp /* Installed by VS Code */ && !this.profileExtensionsLocations.has(this.getKey(installedExtension.identifier, installedExtension.manifest.version))); + if (toUninstall.length) { + await Promise.all(toUninstall.map(extension => this.extensionManagementService.uninstall(extension, uninstalOptions))); + } + } + + private async onDidInstallExtensions(installedExtensions: readonly InstallExtensionResult[]): Promise { + for (const { local, profileLocation } of installedExtensions) { + if (!local || !profileLocation) { + continue; + } + this.addExtensionWithKey(this.getKey(local.identifier, local.manifest.version), profileLocation); + } + } + + private async onDidUninstallExtension(e: DidUninstallExtensionEvent): Promise { + if (!e.profileLocation || !e.version) { + return; + } + if (this.removeExtensionWithKey(this.getKey(e.identifier, e.version), e.profileLocation)) { + await this.uninstallExtensions([{ identifier: e.identifier, version: e.version }]); + } + } + + private async populateExtensionsFromProfile(extensionsProfileLocation: URI): Promise { + const extensions = await this.extensionsProfileScannerService.scanProfileExtensions(extensionsProfileLocation); + for (const extension of extensions) { + this.addExtensionWithKey(this.getKey(extension.identifier, extension.version), extensionsProfileLocation); + } + } + + private async removeExtensionsFromProfile(removedProfile: URI): Promise { + const extensionsToRemove: { identifier: IExtensionIdentifier; version: string }[] = []; + for (const key of [...this.profileExtensionsLocations.keys()]) { + if (!this.removeExtensionWithKey(key, removedProfile)) { + continue; + } + const extensionToRemove = this.fromKey(key); + if (extensionToRemove) { + extensionsToRemove.push(extensionToRemove); + } + } + if (extensionsToRemove.length) { + await this.uninstallExtensions(extensionsToRemove); + } + } + + private addExtensionWithKey(key: string, extensionsProfileLocation: URI): void { + let locations = this.profileExtensionsLocations.get(key); + if (!locations) { + locations = []; + this.profileExtensionsLocations.set(key, locations); + } + locations.push(extensionsProfileLocation); + } + + private removeExtensionWithKey(key: string, profileLocation: URI): boolean { + const profiles = this.profileExtensionsLocations.get(key); + if (profiles) { + const index = profiles.findIndex(profile => this.uriIdentityService.extUri.isEqual(profile, profileLocation)); + if (index > -1) { + profiles.splice(index, 1); + } + } + if (!profiles?.length) { + this.profileExtensionsLocations.delete(key); + return true; + } + return false; + } + + private async uninstallExtensions(extensionsToRemove: { identifier: IExtensionIdentifier; version: string }[]): Promise { + const installed = await this.extensionManagementService.getAllUserInstalled(); + const toUninstall = installed.filter(installedExtension => installedExtension.installedTimestamp /* Installed by VS Code */ && extensionsToRemove.some(e => this.getKey(installedExtension.identifier, installedExtension.manifest.version) === this.getKey(e.identifier, e.version))); + if (toUninstall.length) { + await Promise.all(toUninstall.map(extension => this.extensionManagementService.uninstall(extension, uninstalOptions))); + } + } + + private getKey(identifier: IExtensionIdentifier, version: string): string { + return `${ExtensionIdentifier.toKey(identifier.id)}@${version}`; + } + + private fromKey(key: string): { identifier: IExtensionIdentifier; version: string } | undefined { + const [id, version] = getIdAndVersion(key); + return version ? { identifier: { id }, version } : undefined; } } diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts b/src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts index d0bd14292f4..68d2cc16661 100644 --- a/src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts +++ b/src/vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner.ts @@ -59,7 +59,7 @@ export class LanguagePackCachedDataCleaner extends Disposable { try { const installed: IStringDictionary = Object.create(null); const metaData: ILanguagePackFile = JSON.parse(await Promises.readFile(join(this.environmentService.userDataPath, 'languagepacks.json'), 'utf8')); - for (let locale of Object.keys(metaData)) { + for (const locale of Object.keys(metaData)) { const entry = metaData[locale]; installed[`${entry.hash}.${locale}`] = true; } diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner.ts b/src/vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner.ts index 56eb3683002..1f55a52057a 100644 --- a/src/vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner.ts +++ b/src/vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner.ts @@ -8,22 +8,21 @@ import { onUnexpectedError } from 'vs/base/common/errors'; import { Disposable } from 'vs/base/common/lifecycle'; import { join } from 'vs/base/common/path'; import { Promises } from 'vs/base/node/pfs'; -import { IBackupWorkspacesFormat } from 'vs/platform/backup/node/backup'; import { INativeEnvironmentService } from 'vs/platform/environment/common/environment'; +import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services'; import { ILogService } from 'vs/platform/log/common/log'; +import { INativeHostService } from 'vs/platform/native/electron-sandbox/native'; +import { StorageClient } from 'vs/platform/storage/common/storageIpc'; +import { EXTENSION_DEVELOPMENT_EMPTY_WINDOW_WORKSPACE } from 'vs/platform/workspace/common/workspace'; +import { NON_EMPTY_WORKSPACE_ID_LENGTH } from 'vs/platform/workspaces/node/workspaces'; -export class StorageDataCleaner extends Disposable { - - // Workspace/Folder storage names are MD5 hashes (128bits / 4 due to hex presentation) - private static readonly NON_EMPTY_WORKSPACE_ID_LENGTH = 128 / 4; - - // Reserved empty window workspace storage name when in extension development - private static readonly EXTENSION_DEV_EMPTY_WINDOW_ID = 'ext-dev'; +export class UnusedWorkspaceStorageDataCleaner extends Disposable { constructor( - private readonly backupWorkspacesPath: string, @INativeEnvironmentService private readonly environmentService: INativeEnvironmentService, - @ILogService private readonly logService: ILogService + @ILogService private readonly logService: ILogService, + @INativeHostService private readonly nativeHostService: INativeHostService, + @IMainProcessService private readonly mainProcessService: IMainProcessService ) { super(); @@ -34,31 +33,36 @@ export class StorageDataCleaner extends Disposable { } private async cleanUpStorage(): Promise { - this.logService.trace('[storage cleanup]: Starting to clean up storage folders.'); + this.logService.trace('[storage cleanup]: Starting to clean up workspace storage folders for unused empty workspaces.'); try { - - // Leverage the backup workspace file to find out which empty workspace is currently in use to - // determine which empty workspace storage can safely be deleted - const contents = await Promises.readFile(this.backupWorkspacesPath, 'utf8'); - - const workspaces = JSON.parse(contents) as IBackupWorkspacesFormat; - const emptyWorkspaces = workspaces.emptyWorkspaceInfos.map(emptyWorkspace => emptyWorkspace.backupFolder); - - // Read all workspace storage folders that exist & cleanup unused const workspaceStorageFolders = await Promises.readdir(this.environmentService.workspaceStorageHome.fsPath); + const storageClient = new StorageClient(this.mainProcessService.getChannel('storage')); + await Promise.all(workspaceStorageFolders.map(async workspaceStorageFolder => { - if ( - workspaceStorageFolder.length === StorageDataCleaner.NON_EMPTY_WORKSPACE_ID_LENGTH || // keep non-empty workspaces - workspaceStorageFolder === StorageDataCleaner.EXTENSION_DEV_EMPTY_WINDOW_ID || // keep empty extension dev workspaces - emptyWorkspaces.indexOf(workspaceStorageFolder) >= 0 // keep empty workspaces that are in use - ) { - return; + const workspaceStoragePath = join(this.environmentService.workspaceStorageHome.fsPath, workspaceStorageFolder); + + if (workspaceStorageFolder.length === NON_EMPTY_WORKSPACE_ID_LENGTH) { + return; // keep workspace storage for folders/workspaces that can be accessed still } - this.logService.trace(`[storage cleanup]: Deleting workspace storage folder ${workspaceStorageFolder}.`); + if (workspaceStorageFolder === EXTENSION_DEVELOPMENT_EMPTY_WINDOW_WORKSPACE.id) { + return; // keep workspace storage for empty extension development workspaces + } - await Promises.rm(join(this.environmentService.workspaceStorageHome.fsPath, workspaceStorageFolder)); + const windows = await this.nativeHostService.getWindows(); + if (windows.some(window => window.workspace?.id === workspaceStorageFolder)) { + return; // keep workspace storage for empty workspaces opened as window + } + + const isStorageUsed = await storageClient.isUsed(workspaceStoragePath); + if (isStorageUsed) { + return; // keep workspace storage for empty workspaces that are in use + } + + this.logService.trace(`[storage cleanup]: Deleting workspace storage folder ${workspaceStorageFolder} as it seems to be an unused empty workspace.`); + + await Promises.rm(workspaceStoragePath); })); } catch (error) { onUnexpectedError(error); diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/userDataProfilesCleaner.ts b/src/vs/code/electron-browser/sharedProcess/contrib/userDataProfilesCleaner.ts new file mode 100644 index 00000000000..37c57771e24 --- /dev/null +++ b/src/vs/code/electron-browser/sharedProcess/contrib/userDataProfilesCleaner.ts @@ -0,0 +1,22 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { RunOnceScheduler } from 'vs/base/common/async'; +import { Disposable } from 'vs/base/common/lifecycle'; +import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile'; + +export class UserDataProfilesCleaner extends Disposable { + + constructor( + @IUserDataProfilesService userDataProfilesService: IUserDataProfilesService + ) { + super(); + + const scheduler = this._register(new RunOnceScheduler(() => { + userDataProfilesService.cleanUp(); + }, 10 * 1000 /* after 10s */)); + scheduler.schedule(); + } +} diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcess-dev.html b/src/vs/code/electron-browser/sharedProcess/sharedProcess-dev.html new file mode 100644 index 00000000000..4bd9c876659 --- /dev/null +++ b/src/vs/code/electron-browser/sharedProcess/sharedProcess-dev.html @@ -0,0 +1,18 @@ + + + + + + + + + + Shared Process + + + + + + + + diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcess.html b/src/vs/code/electron-browser/sharedProcess/sharedProcess.html index 07fd9bd0478..d1b5812fa76 100644 --- a/src/vs/code/electron-browser/sharedProcess/sharedProcess.html +++ b/src/vs/code/electron-browser/sharedProcess/sharedProcess.html @@ -1,22 +1,15 @@ + + + + - - - - - - - Shared Process - - - - - - - - - + + Shared Process + + + diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js index c9651466d39..1383bc8331e 100644 --- a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js +++ b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js @@ -7,12 +7,8 @@ (function () { 'use strict'; - const bootstrap = bootstrapLib(); const bootstrapWindow = bootstrapWindowLib(); - // Avoid Monkey Patches from Application Insights - bootstrap.avoidMonkeyPatchFromAppInsights(); - // Load shared process into window bootstrapWindow.load(['vs/code/electron-browser/sharedProcess/sharedProcessMain'], function (sharedProcess, configuration) { return sharedProcess.main(configuration); @@ -26,14 +22,6 @@ } ); - /** - * @returns {{ avoidMonkeyPatchFromAppInsights: () => void; }} - */ - function bootstrapLib() { - // @ts-ignore (defined in bootstrap.js) - return window.MonacoBootstrap; - } - /** * @typedef {import('../../../base/parts/sandbox/common/sandboxTypes').ISandboxConfiguration} ISandboxConfiguration * diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts index 3d5d20b8c71..f5bd9adc5a7 100644 --- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts +++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts @@ -18,7 +18,7 @@ import { ExtensionsCleaner } from 'vs/code/electron-browser/sharedProcess/contri import { LanguagePackCachedDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/languagePackCachedDataCleaner'; import { LocalizationsUpdater } from 'vs/code/electron-browser/sharedProcess/contrib/localizationsUpdater'; import { LogsDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/logsDataCleaner'; -import { StorageDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner'; +import { UnusedWorkspaceStorageDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner'; import { IChecksumService } from 'vs/platform/checksum/common/checksumService'; import { ChecksumService } from 'vs/platform/checksum/node/checksumService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; @@ -32,9 +32,10 @@ import { SharedProcessEnvironmentService } from 'vs/platform/sharedProcess/node/ import { GlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService'; import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService'; import { IExtensionGalleryService, IExtensionManagementService, IExtensionTipsService, IGlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement'; +import { ExtensionSignatureVerificationService, IExtensionSignatureVerificationService } from 'vs/platform/extensionManagement/node/extensionSignatureVerificationService'; import { ExtensionManagementChannel, ExtensionTipsChannel } from 'vs/platform/extensionManagement/common/extensionManagementIpc'; import { ExtensionTipsService } from 'vs/platform/extensionManagement/electron-sandbox/extensionTipsService'; -import { ExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService'; +import { ExtensionManagementService, INativeServerExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService'; import { IExtensionRecommendationNotificationService } from 'vs/platform/extensionRecommendations/common/extensionRecommendations'; import { ExtensionRecommendationNotificationServiceChannelClient } from 'vs/platform/extensionRecommendations/electron-sandbox/extensionRecommendationsIpc'; import { IFileService } from 'vs/platform/files/common/files'; @@ -49,11 +50,10 @@ import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/services'; import { ILanguagePackService } from 'vs/platform/languagePacks/common/languagePacks'; import { NativeLanguagePackService } from 'vs/platform/languagePacks/node/languagePacks'; import { ConsoleLogger, ILoggerService, ILogService, MultiplexLogService } from 'vs/platform/log/common/log'; -import { FollowerLogService, LoggerChannelClient, LogLevelChannelClient } from 'vs/platform/log/common/logIpc'; +import { FollowerLogService, LoggerChannelClient, LogLevelChannel, LogLevelChannelClient } from 'vs/platform/log/common/logIpc'; import { INativeHostService } from 'vs/platform/native/electron-sandbox/native'; import product from 'vs/platform/product/common/product'; import { IProductService } from 'vs/platform/product/common/productService'; -import { RequestService } from 'vs/platform/request/browser/requestService'; import { IRequestService } from 'vs/platform/request/common/request'; import { ISharedProcessConfiguration } from 'vs/platform/sharedProcess/node/sharedProcess'; import { IStorageService } from 'vs/platform/storage/common/storage'; @@ -63,15 +63,14 @@ import { ICustomEndpointTelemetryService, ITelemetryService } from 'vs/platform/ import { TelemetryAppenderChannel } from 'vs/platform/telemetry/common/telemetryIpc'; import { TelemetryLogAppender } from 'vs/platform/telemetry/common/telemetryLogAppender'; import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService'; -import { supportsTelemetry, ITelemetryAppender, NullAppender, NullTelemetryService, getPiiPathsFromEnvironment } from 'vs/platform/telemetry/common/telemetryUtils'; -import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender'; +import { supportsTelemetry, ITelemetryAppender, NullAppender, NullTelemetryService, getPiiPathsFromEnvironment, isInternalTelemetry } from 'vs/platform/telemetry/common/telemetryUtils'; import { CustomEndpointTelemetryService } from 'vs/platform/telemetry/node/customEndpointTelemetryService'; import { LocalReconnectConstants, TerminalIpcChannels, TerminalSettingId } from 'vs/platform/terminal/common/terminal'; import { ILocalPtyService } from 'vs/platform/terminal/electron-sandbox/terminal'; import { PtyHostService } from 'vs/platform/terminal/node/ptyHostService'; import { ExtensionStorageService, IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage'; import { IgnoredExtensionsManagementService, IIgnoredExtensionsManagementService } from 'vs/platform/userDataSync/common/ignoredExtensions'; -import { IUserDataSyncBackupStoreService, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, IUserDataSyncUtilService, registerConfiguration as registerUserDataSyncConfiguration } from 'vs/platform/userDataSync/common/userDataSync'; +import { IUserDataSyncBackupStoreService, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, IUserDataSyncUtilService, registerConfiguration as registerUserDataSyncConfiguration, IUserDataSyncResourceProviderService } from 'vs/platform/userDataSync/common/userDataSync'; import { IUserDataSyncAccountService, UserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount'; import { UserDataSyncBackupStoreService } from 'vs/platform/userDataSync/common/userDataSyncBackupStoreService'; import { UserDataAutoSyncChannel, UserDataSyncAccountServiceChannel, UserDataSyncMachinesServiceChannel, UserDataSyncStoreManagementServiceChannel, UserDataSyncUtilServiceClient } from 'vs/platform/userDataSync/common/userDataSyncIpc'; @@ -82,6 +81,8 @@ import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyn import { UserDataSyncChannel } from 'vs/platform/userDataSync/common/userDataSyncServiceIpc'; import { UserDataSyncStoreManagementService, UserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSyncStoreService'; import { UserDataAutoSyncService } from 'vs/platform/userDataSync/electron-sandbox/userDataAutoSyncService'; +import { UserDataSyncProfilesStorageService } from 'vs/platform/userDataSync/electron-sandbox/userDataSyncProfilesStorageService'; +import { IUserDataSyncProfilesStorageService } from 'vs/platform/userDataSync/common/userDataSyncProfilesStorageService'; import { ActiveWindowManager } from 'vs/platform/windows/node/windowTracker'; import { ISignService } from 'vs/platform/sign/common/sign'; import { SignService } from 'vs/platform/sign/node/signService'; @@ -100,8 +101,18 @@ import { InspectProfilingService as V8InspectProfilingService } from 'vs/platfor import { IV8InspectProfilingService } from 'vs/platform/profiling/common/profiling'; import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService'; import { ExtensionsScannerService } from 'vs/platform/extensionManagement/node/extensionsScannerService'; +import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile'; +import { ExtensionsProfileScannerService, IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService'; import { PolicyChannelClient } from 'vs/platform/policy/common/policyIpc'; import { IPolicyService, NullPolicyService } from 'vs/platform/policy/common/policy'; +import { UserDataProfilesNativeService } from 'vs/platform/userDataProfile/electron-sandbox/userDataProfile'; +import { SharedProcessRequestService } from 'vs/platform/request/electron-browser/sharedProcessRequestService'; +import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender'; +import { UserDataProfilesCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/userDataProfilesCleaner'; +import { RemoteTunnelService } from 'vs/platform/remoteTunnel/electron-browser/remoteTunnelService'; +import { IRemoteTunnelService } from 'vs/platform/remoteTunnel/common/remoteTunnel'; +import { ISharedProcessLifecycleService, SharedProcessLifecycleService } from 'vs/platform/lifecycle/electron-browser/sharedProcessLifecycleService'; +import { UserDataSyncResourceProviderService } from 'vs/platform/userDataSync/common/userDataSyncResourceProvider'; class SharedProcessMain extends Disposable { @@ -109,6 +120,8 @@ class SharedProcessMain extends Disposable { private sharedProcessWorkerService: ISharedProcessWorkerService | undefined = undefined; + private lifecycleService: SharedProcessLifecycleService | undefined = undefined; + constructor(private configuration: ISharedProcessConfiguration) { super(); @@ -118,7 +131,14 @@ class SharedProcessMain extends Disposable { private registerListeners(): void { // Shared process lifecycle - const onExit = () => this.dispose(); + const onExit = async () => { + if (this.lifecycleService) { + await this.lifecycleService.fireOnWillShutdown(); + this.lifecycleService.dispose(); + this.lifecycleService = undefined; + } + this.dispose(); + }; process.once('exit', onExit); ipcRenderer.once('vscode:electron-main->shared-process=exit', onExit); @@ -129,7 +149,7 @@ class SharedProcessMain extends Disposable { // application is shutting down anyways. // const eventName = 'vscode:electron-main->shared-process=disposeWorker'; - const onDisposeWorker = (event: unknown, configuration: ISharedProcessWorkerConfiguration) => this.onDisposeWorker(configuration); + const onDisposeWorker = (event: unknown, configuration: ISharedProcessWorkerConfiguration) => { this.onDisposeWorker(configuration); }; ipcRenderer.on(eventName, onDisposeWorker); this._register(toDisposable(() => ipcRenderer.removeListener(eventName, onDisposeWorker))); } @@ -163,16 +183,19 @@ class SharedProcessMain extends Disposable { this._register(combinedDisposable( instantiationService.createInstance(CodeCacheCleaner, this.configuration.codeCachePath), instantiationService.createInstance(LanguagePackCachedDataCleaner), - instantiationService.createInstance(StorageDataCleaner, this.configuration.backupWorkspacesPath), + instantiationService.createInstance(UnusedWorkspaceStorageDataCleaner), instantiationService.createInstance(LogsDataCleaner), instantiationService.createInstance(LocalizationsUpdater), - instantiationService.createInstance(ExtensionsCleaner) + instantiationService.createInstance(ExtensionsCleaner), + instantiationService.createInstance(UserDataProfilesCleaner) )); } private async initServices(): Promise { const services = new ServiceCollection(); + // Lifecycle + // Product const productService = { _serviceBrand: undefined, ...product }; services.set(IProductService, productService); @@ -204,6 +227,10 @@ class SharedProcessMain extends Disposable { const logService = this._register(new FollowerLogService(logLevelClient, multiplexLogger)); services.set(ILogService, logService); + // Lifecycle + this.lifecycleService = new SharedProcessLifecycleService(logService); + services.set(ISharedProcessLifecycleService, this.lifecycleService); + // Worker this.sharedProcessWorkerService = new SharedProcessWorkerService(logService); services.set(ISharedProcessWorkerService, this.sharedProcessWorkerService); @@ -227,12 +254,16 @@ class SharedProcessMain extends Disposable { )); fileService.registerProvider(Schemas.vscodeUserData, userDataFileSystemProvider); + // User Data Profiles + const userDataProfilesService = this._register(new UserDataProfilesNativeService(this.configuration.profiles, mainProcessService, environmentService)); + services.set(IUserDataProfilesService, userDataProfilesService); + // Configuration - const configurationService = this._register(new ConfigurationService(environmentService.settingsResource, fileService, policyService, logService)); + const configurationService = this._register(new ConfigurationService(userDataProfilesService.defaultProfile.settingsResource, fileService, policyService, logService)); services.set(IConfigurationService, configurationService); // Storage (global access only) - const storageService = new NativeStorageService(undefined, mainProcessService, environmentService); + const storageService = new NativeStorageService(undefined, { defaultProfile: userDataProfilesService.defaultProfile, currentProfile: userDataProfilesService.defaultProfile }, mainProcessService, environmentService); services.set(IStorageService, storageService); this._register(toDisposable(() => storageService.flush())); @@ -246,20 +277,20 @@ class SharedProcessMain extends Disposable { services.set(IUriIdentityService, new UriIdentityService(fileService)); // Request - services.set(IRequestService, new SyncDescriptor(RequestService)); + services.set(IRequestService, new SharedProcessRequestService(mainProcessService, configurationService, logService)); // Checksum - services.set(IChecksumService, new SyncDescriptor(ChecksumService)); + services.set(IChecksumService, new SyncDescriptor(ChecksumService, undefined, false /* proxied to other processes */)); // V8 Inspect profiler - services.set(IV8InspectProfilingService, new SyncDescriptor(V8InspectProfilingService)); + services.set(IV8InspectProfilingService, new SyncDescriptor(V8InspectProfilingService, undefined, false /* proxied to other processes */)); // Native Host const nativeHostService = ProxyChannel.toService(mainProcessService.getChannel('nativeHost'), { context: this.configuration.windowId }); services.set(INativeHostService, nativeHostService); // Download - services.set(IDownloadService, new SyncDescriptor(DownloadService)); + services.set(IDownloadService, new SyncDescriptor(DownloadService, undefined, true)); // Extension recommendations const activeWindowManager = this._register(new ActiveWindowManager(nativeHostService)); @@ -269,21 +300,20 @@ class SharedProcessMain extends Disposable { // Telemetry let telemetryService: ITelemetryService; const appenders: ITelemetryAppender[] = []; + const internalTelemetry = isInternalTelemetry(productService, configurationService); if (supportsTelemetry(productService, environmentService)) { const logAppender = new TelemetryLogAppender(loggerService, environmentService); appenders.push(logAppender); const { installSourcePath } = environmentService; - - // Application Insights - if (productService.aiConfig && productService.aiConfig.asimovKey) { - const appInsightsAppender = new AppInsightsAppender('monacoworkbench', null, productService.aiConfig.asimovKey); - this._register(toDisposable(() => appInsightsAppender.flush())); // Ensure the AI appender is disposed so that it flushes remaining data - appenders.push(appInsightsAppender); + if (productService.aiConfig?.ariaKey) { + const collectorAppender = new OneDataSystemAppender(internalTelemetry, 'monacoworkbench', null, productService.aiConfig.ariaKey); + this._register(toDisposable(() => collectorAppender.flush())); // Ensure the 1DS appender is disposed so that it flushes remaining data + appenders.push(collectorAppender); } telemetryService = new TelemetryService({ appenders, - commonProperties: resolveCommonProperties(fileService, release(), hostname(), process.arch, productService.commit, productService.version, this.configuration.machineId, productService.msftInternalDomains, installSourcePath), + commonProperties: resolveCommonProperties(fileService, release(), hostname(), process.arch, productService.commit, productService.version, this.configuration.machineId, internalTelemetry, installSourcePath), sendErrorTelemetry: true, piiPaths: getPiiPathsFromEnvironment(environmentService), }, configurationService, productService); @@ -301,34 +331,40 @@ class SharedProcessMain extends Disposable { services.set(ICustomEndpointTelemetryService, customEndpointTelemetryService); // Extension Management - services.set(IExtensionsScannerService, new SyncDescriptor(ExtensionsScannerService)); - services.set(IExtensionManagementService, new SyncDescriptor(ExtensionManagementService)); + services.set(IExtensionsProfileScannerService, new SyncDescriptor(ExtensionsProfileScannerService, undefined, true)); + services.set(IExtensionsScannerService, new SyncDescriptor(ExtensionsScannerService, undefined, true)); + services.set(IExtensionSignatureVerificationService, new SyncDescriptor(ExtensionSignatureVerificationService, undefined, true)); + services.set(INativeServerExtensionManagementService, new SyncDescriptor(ExtensionManagementService, undefined, true)); // Extension Gallery - services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryService)); + services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryService, undefined, true)); // Extension Tips - services.set(IExtensionTipsService, new SyncDescriptor(ExtensionTipsService)); + services.set(IExtensionTipsService, new SyncDescriptor(ExtensionTipsService, undefined, false /* Eagerly scans and computes exe based recommendations */)); // Localizations - services.set(ILanguagePackService, new SyncDescriptor(NativeLanguagePackService)); + services.set(ILanguagePackService, new SyncDescriptor(NativeLanguagePackService, undefined, false /* proxied to other processes */)); // Diagnostics - services.set(IDiagnosticsService, new SyncDescriptor(DiagnosticsService)); + services.set(IDiagnosticsService, new SyncDescriptor(DiagnosticsService, undefined, false /* proxied to other processes */)); // Settings Sync - services.set(IUserDataSyncAccountService, new SyncDescriptor(UserDataSyncAccountService)); - services.set(IUserDataSyncLogService, new SyncDescriptor(UserDataSyncLogService)); + services.set(IUserDataSyncAccountService, new SyncDescriptor(UserDataSyncAccountService, undefined, true)); + services.set(IUserDataSyncLogService, new SyncDescriptor(UserDataSyncLogService, undefined, true)); services.set(IUserDataSyncUtilService, new UserDataSyncUtilServiceClient(this.server.getChannel('userDataSyncUtil', client => client.ctx !== 'main'))); - services.set(IGlobalExtensionEnablementService, new SyncDescriptor(GlobalExtensionEnablementService)); - services.set(IIgnoredExtensionsManagementService, new SyncDescriptor(IgnoredExtensionsManagementService)); + services.set(IGlobalExtensionEnablementService, new SyncDescriptor(GlobalExtensionEnablementService, undefined, false /* Eagerly resets installed extensions */)); + services.set(IIgnoredExtensionsManagementService, new SyncDescriptor(IgnoredExtensionsManagementService, undefined, true)); services.set(IExtensionStorageService, new SyncDescriptor(ExtensionStorageService)); - services.set(IUserDataSyncStoreManagementService, new SyncDescriptor(UserDataSyncStoreManagementService)); - services.set(IUserDataSyncStoreService, new SyncDescriptor(UserDataSyncStoreService)); - services.set(IUserDataSyncMachinesService, new SyncDescriptor(UserDataSyncMachinesService)); - services.set(IUserDataSyncBackupStoreService, new SyncDescriptor(UserDataSyncBackupStoreService)); - services.set(IUserDataSyncEnablementService, new SyncDescriptor(UserDataSyncEnablementService)); - services.set(IUserDataSyncService, new SyncDescriptor(UserDataSyncService)); + services.set(IUserDataSyncStoreManagementService, new SyncDescriptor(UserDataSyncStoreManagementService, undefined, true)); + services.set(IUserDataSyncStoreService, new SyncDescriptor(UserDataSyncStoreService, undefined, true)); + services.set(IUserDataSyncMachinesService, new SyncDescriptor(UserDataSyncMachinesService, undefined, true)); + services.set(IUserDataSyncBackupStoreService, new SyncDescriptor(UserDataSyncBackupStoreService, undefined, false /* Eagerly cleans up old backups */)); + services.set(IUserDataSyncEnablementService, new SyncDescriptor(UserDataSyncEnablementService, undefined, true)); + services.set(IUserDataSyncService, new SyncDescriptor(UserDataSyncService, undefined, false /* Initializes the Sync State */)); + services.set(IUserDataSyncProfilesStorageService, new SyncDescriptor(UserDataSyncProfilesStorageService, undefined, true)); + services.set(IUserDataSyncResourceProviderService, new SyncDescriptor(UserDataSyncResourceProviderService, undefined, true)); + + // Terminal const ptyHostService = new PtyHostService({ graceTime: LocalReconnectConstants.GraceTime, @@ -341,21 +377,27 @@ class SharedProcessMain extends Disposable { ); ptyHostService.initialize(); - // Terminal services.set(ILocalPtyService, this._register(ptyHostService)); // Signing - services.set(ISignService, new SyncDescriptor(SignService)); + services.set(ISignService, new SyncDescriptor(SignService, undefined, false /* proxied to other processes */)); // Tunnel services.set(ISharedTunnelsService, new SyncDescriptor(SharedTunnelsService)); services.set(ISharedProcessTunnelService, new SyncDescriptor(SharedProcessTunnelService)); + // Remote Tunnel + services.set(IRemoteTunnelService, new SyncDescriptor(RemoteTunnelService)); + return new InstantiationService(services); } private initChannels(accessor: ServicesAccessor): void { + // Log Level + const logLevelChannel = new LogLevelChannel(accessor.get(ILogService), accessor.get(ILoggerService)); + this.server.registerChannel('logLevel', logLevelChannel); + // Extensions Management const channel = new ExtensionManagementChannel(accessor.get(IExtensionManagementService), () => null); this.server.registerChannel('extensions', channel); @@ -394,7 +436,7 @@ class SharedProcessMain extends Disposable { const userDataSyncStoreManagementChannel = new UserDataSyncStoreManagementServiceChannel(accessor.get(IUserDataSyncStoreManagementService)); this.server.registerChannel('userDataSyncStoreManagement', userDataSyncStoreManagementChannel); - const userDataSyncChannel = new UserDataSyncChannel(accessor.get(IUserDataSyncService), accessor.get(ILogService)); + const userDataSyncChannel = new UserDataSyncChannel(accessor.get(IUserDataSyncService), accessor.get(IUserDataProfilesService), accessor.get(ILogService)); this.server.registerChannel('userDataSync', userDataSyncChannel); const userDataAutoSync = this._register(accessor.get(IInstantiationService).createInstance(UserDataAutoSyncService)); @@ -413,6 +455,11 @@ class SharedProcessMain extends Disposable { // Worker const sharedProcessWorkerChannel = ProxyChannel.fromService(accessor.get(ISharedProcessWorkerService)); this.server.registerChannel(ipcSharedProcessWorkerChannelName, sharedProcessWorkerChannel); + + // Remote Tunnel + const remoteTunnelChannel = ProxyChannel.fromService(accessor.get(IRemoteTunnelService)); + this.server.registerChannel('remoteTunnel', remoteTunnelChannel); + } private registerErrorHandler(logService: ILogService): void { diff --git a/src/vs/code/electron-browser/workbench/workbench.js b/src/vs/code/electron-browser/workbench/workbench.js deleted file mode 100644 index 7ceef489fcc..00000000000 --- a/src/vs/code/electron-browser/workbench/workbench.js +++ /dev/null @@ -1,213 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -/// - -//@ts-check -(function () { - 'use strict'; - - const bootstrapWindow = bootstrapWindowLib(); - - // Add a perf entry right from the top - performance.mark('code/didStartRenderer'); - - // Load workbench main JS, CSS and NLS all in parallel. This is an - // optimization to prevent a waterfall of loading to happen, because - // we know for a fact that workbench.desktop.main will depend on - // the related CSS and NLS counterparts. - bootstrapWindow.load([ - 'vs/workbench/workbench.desktop.main', - 'vs/nls!vs/workbench/workbench.desktop.main', - 'vs/css!vs/workbench/workbench.desktop.main' - ], - function (_, configuration) { - - // Mark start of workbench - performance.mark('code/didLoadWorkbenchMain'); - - // @ts-ignore - return require('vs/workbench/electron-sandbox/desktop.main').main(configuration); - }, - { - configureDeveloperSettings: function (windowConfig) { - return { - // disable automated devtools opening on error when running extension tests - // as this can lead to nondeterministic test execution (devtools steals focus) - forceDisableShowDevtoolsOnError: typeof windowConfig.extensionTestsPath === 'string', - // enable devtools keybindings in extension development window - forceEnableDeveloperKeybindings: Array.isArray(windowConfig.extensionDevelopmentPath) && windowConfig.extensionDevelopmentPath.length > 0, - removeDeveloperKeybindingsAfterLoad: true - }; - }, - canModifyDOM: function (windowConfig) { - showSplash(windowConfig); - }, - beforeLoaderConfig: function (loaderConfig) { - loaderConfig.recordStats = true; - }, - beforeRequire: function () { - performance.mark('code/willLoadWorkbenchMain'); - - // It looks like browsers only lazily enable - // the element when needed. Since we - // leverage canvas elements in our code in many - // locations, we try to help the browser to - // initialize canvas when it is idle, right - // before we wait for the scripts to be loaded. - // @ts-ignore - window.requestIdleCallback(() => { - const canvas = document.createElement('canvas'); - const context = canvas.getContext('2d'); - context.clearRect(0, 0, canvas.width, canvas.height); - canvas.remove(); - }, { timeout: 50 }); - } - } - ); - - //#region Helpers - - /** - * @typedef {import('../../../platform/window/common/window').INativeWindowConfiguration} INativeWindowConfiguration - * @typedef {import('../../../platform/environment/common/argv').NativeParsedArgs} NativeParsedArgs - * - * @returns {{ - * load: ( - * modules: string[], - * resultCallback: (result, configuration: INativeWindowConfiguration & NativeParsedArgs) => unknown, - * options?: { - * configureDeveloperSettings?: (config: INativeWindowConfiguration & NativeParsedArgs) => { - * forceDisableShowDevtoolsOnError?: boolean, - * forceEnableDeveloperKeybindings?: boolean, - * disallowReloadKeybinding?: boolean, - * removeDeveloperKeybindingsAfterLoad?: boolean - * }, - * canModifyDOM?: (config: INativeWindowConfiguration & NativeParsedArgs) => void, - * beforeLoaderConfig?: (loaderConfig: object) => void, - * beforeRequire?: () => void - * } - * ) => Promise - * }} - */ - function bootstrapWindowLib() { - // @ts-ignore (defined in bootstrap-window.js) - return window.MonacoBootstrapWindow; - } - - /** - * @param {INativeWindowConfiguration & NativeParsedArgs} configuration - */ - function showSplash(configuration) { - performance.mark('code/willShowPartsSplash'); - - let data = configuration.partsSplash; - - if (data) { - // high contrast mode has been turned by the OS -> ignore stored colors and layouts - if (configuration.autoDetectHighContrast && configuration.colorScheme.highContrast) { - if ((configuration.colorScheme.dark && data.baseTheme !== 'hc-black') || (!configuration.colorScheme.dark && data.baseTheme !== 'hc-light')) { - data = undefined; - } - } else if (configuration.autoDetectColorScheme) { - // OS color scheme is tracked and has changed - if ((configuration.colorScheme.dark && data.baseTheme !== 'vs-dark') || (!configuration.colorScheme.dark && data.baseTheme !== 'vs')) { - data = undefined; - } - } - } - - // developing an extension -> ignore stored layouts - if (data && configuration.extensionDevelopmentPath) { - data.layoutInfo = undefined; - } - - // minimal color configuration (works with or without persisted data) - let baseTheme, shellBackground, shellForeground; - if (data) { - baseTheme = data.baseTheme; - shellBackground = data.colorInfo.editorBackground; - shellForeground = data.colorInfo.foreground; - } else if (configuration.autoDetectHighContrast && configuration.colorScheme.highContrast) { - if (configuration.colorScheme.dark) { - baseTheme = 'hc-black'; - shellBackground = '#000000'; - shellForeground = '#FFFFFF'; - } else { - baseTheme = 'hc-light'; - shellBackground = '#FFFFFF'; - shellForeground = '#000000'; - } - } else if (configuration.autoDetectColorScheme) { - if (configuration.colorScheme.dark) { - baseTheme = 'vs-dark'; - shellBackground = '#1E1E1E'; - shellForeground = '#CCCCCC'; - } else { - baseTheme = 'vs'; - shellBackground = '#FFFFFF'; - shellForeground = '#000000'; - } - } - - const style = document.createElement('style'); - style.className = 'initialShellColors'; - document.head.appendChild(style); - style.textContent = `body { background-color: ${shellBackground}; color: ${shellForeground}; margin: 0; padding: 0; }`; - - // restore parts if possible (we might not always store layout info) - if (data?.layoutInfo) { - const { layoutInfo, colorInfo } = data; - - const splash = document.createElement('div'); - splash.id = 'monaco-parts-splash'; - splash.className = baseTheme; - - if (layoutInfo.windowBorder) { - splash.style.position = 'relative'; - splash.style.height = 'calc(100vh - 2px)'; - splash.style.width = 'calc(100vw - 2px)'; - splash.style.border = '1px solid var(--window-border-color)'; - splash.style.setProperty('--window-border-color', colorInfo.windowBorder); - - if (layoutInfo.windowBorderRadius) { - splash.style.borderRadius = layoutInfo.windowBorderRadius; - } - } - - // ensure there is enough space - layoutInfo.sideBarWidth = Math.min(layoutInfo.sideBarWidth, window.innerWidth - (layoutInfo.activityBarWidth + layoutInfo.editorPartMinWidth)); - - // part: title - const titleDiv = document.createElement('div'); - titleDiv.setAttribute('style', `position: absolute; width: 100%; left: 0; top: 0; height: ${layoutInfo.titleBarHeight}px; background-color: ${colorInfo.titleBarBackground}; -webkit-app-region: drag;`); - splash.appendChild(titleDiv); - - // part: activity bar - const activityDiv = document.createElement('div'); - activityDiv.setAttribute('style', `position: absolute; height: calc(100% - ${layoutInfo.titleBarHeight}px); top: ${layoutInfo.titleBarHeight}px; ${layoutInfo.sideBarSide}: 0; width: ${layoutInfo.activityBarWidth}px; background-color: ${colorInfo.activityBarBackground};`); - splash.appendChild(activityDiv); - - // part: side bar (only when opening workspace/folder) - // folder or workspace -> status bar color, sidebar - if (configuration.workspace) { - const sideDiv = document.createElement('div'); - sideDiv.setAttribute('style', `position: absolute; height: calc(100% - ${layoutInfo.titleBarHeight}px); top: ${layoutInfo.titleBarHeight}px; ${layoutInfo.sideBarSide}: ${layoutInfo.activityBarWidth}px; width: ${layoutInfo.sideBarWidth}px; background-color: ${colorInfo.sideBarBackground};`); - splash.appendChild(sideDiv); - } - - // part: statusbar - const statusDiv = document.createElement('div'); - statusDiv.setAttribute('style', `position: absolute; width: 100%; bottom: 0; left: 0; height: ${layoutInfo.statusBarHeight}px; background-color: ${configuration.workspace ? colorInfo.statusBarBackground : colorInfo.statusBarNoFolderBackground};`); - splash.appendChild(statusDiv); - - document.body.appendChild(splash); - } - - performance.mark('code/didShowPartsSplash'); - } - - //#endregion -}()); diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index eb752810e1c..b8e21690c1e 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -3,14 +3,13 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { app, BrowserWindow, contentTracing, dialog, protocol, session, Session, systemPreferences, WebFrameMain } from 'electron'; +import { app, BrowserWindow, dialog, protocol, session, Session, systemPreferences, WebFrameMain } from 'electron'; import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain'; -import { statSync } from 'fs'; import { hostname, release } from 'os'; import { VSBuffer } from 'vs/base/common/buffer'; import { toErrorMessage } from 'vs/base/common/errorMessage'; import { onUnexpectedError, setUnexpectedErrorHandler } from 'vs/base/common/errors'; -import { isEqualOrParent, randomPath } from 'vs/base/common/extpath'; +import { isEqualOrParent } from 'vs/base/common/extpath'; import { once } from 'vs/base/common/functional'; import { stripComments } from 'vs/base/common/json'; import { getPathLabel, mnemonicButtonLabel } from 'vs/base/common/labels'; @@ -18,7 +17,7 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { Schemas } from 'vs/base/common/network'; import { isAbsolute, join, posix } from 'vs/base/common/path'; import { IProcessEnvironment, isLinux, isLinuxSnap, isMacintosh, isWindows, OS } from 'vs/base/common/platform'; -import { assertType, withNullAsUndefined } from 'vs/base/common/types'; +import { assertType } from 'vs/base/common/types'; import { URI } from 'vs/base/common/uri'; import { generateUuid } from 'vs/base/common/uuid'; import { getMachineId } from 'vs/base/node/id'; @@ -70,12 +69,12 @@ import { SharedProcess } from 'vs/platform/sharedProcess/electron-main/sharedPro import { ISignService } from 'vs/platform/sign/common/sign'; import { IStateMainService } from 'vs/platform/state/electron-main/state'; import { StorageDatabaseChannel } from 'vs/platform/storage/electron-main/storageIpc'; -import { GlobalStorageMainService, IGlobalStorageMainService, IStorageMainService, StorageMainService } from 'vs/platform/storage/electron-main/storageMainService'; +import { ApplicationStorageMainService, IApplicationStorageMainService, IStorageMainService, StorageMainService } from 'vs/platform/storage/electron-main/storageMainService'; import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties'; import { ITelemetryService, machineIdKey, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry'; import { TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc'; import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService'; -import { getPiiPathsFromEnvironment, getTelemetryLevel, NullTelemetryService, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils'; +import { getPiiPathsFromEnvironment, getTelemetryLevel, isInternalTelemetry, NullTelemetryService, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils'; import { IUpdateService } from 'vs/platform/update/common/update'; import { UpdateChannel } from 'vs/platform/update/common/updateIpc'; import { DarwinUpdateService } from 'vs/platform/update/electron-main/updateService.darwin'; @@ -101,6 +100,16 @@ import { IWorkspacesManagementMainService, WorkspacesManagementMainService } fro import { CredentialsNativeMainService } from 'vs/platform/credentials/electron-main/credentialsMainService'; import { IPolicyService } from 'vs/platform/policy/common/policy'; import { PolicyChannel } from 'vs/platform/policy/common/policyIpc'; +import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile'; +import { DefaultExtensionsProfileInitHandler } from 'vs/platform/extensionManagement/electron-main/defaultExtensionsProfileInit'; +import { RequestChannel } from 'vs/platform/request/common/requestIpc'; +import { IRequestService } from 'vs/platform/request/common/request'; +import { ExtensionsProfileScannerService, IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService'; +import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService'; +import { ExtensionsScannerService } from 'vs/platform/extensionManagement/node/extensionsScannerService'; +import { UserDataTransientProfilesHandler } from 'vs/platform/userDataProfile/electron-main/userDataTransientProfilesHandler'; +import { ProfileStorageChangesListenerChannel } from 'vs/platform/userDataSync/electron-main/userDataSyncProfilesStorageIpc'; +import { Promises, RunOnceScheduler, runWhenIdle } from 'vs/base/common/async'; /** * The main VS Code application. There will only ever be one instance, @@ -121,7 +130,8 @@ export class CodeApplication extends Disposable { @IConfigurationService private readonly configurationService: IConfigurationService, @IStateMainService private readonly stateMainService: IStateMainService, @IFileService private readonly fileService: IFileService, - @IProductService private readonly productService: IProductService + @IProductService private readonly productService: IProductService, + @IUserDataProfilesMainService private readonly userDataProfilesMainService: IUserDataProfilesMainService, ) { super(); @@ -316,12 +326,12 @@ export class CodeApplication extends Disposable { }); // macOS dock activate - app.on('activate', (event, hasVisibleWindows) => { + app.on('activate', async (event, hasVisibleWindows) => { this.logService.trace('app#activate'); // Mac only event: open new window when we get activated if (!hasVisibleWindows) { - this.windowsMainService?.openEmptyWindow({ context: OpenContext.DOCK }); + await this.windowsMainService?.openEmptyWindow({ context: OpenContext.DOCK }); } }); @@ -353,7 +363,7 @@ export class CodeApplication extends Disposable { event.preventDefault(); // Keep in array because more might come! - macOpenFileURIs.push(this.getWindowOpenableFromPathSync(path)); + macOpenFileURIs.push(hasWorkspaceFileExtension(path) ? { workspaceUri: URI.file(path) } : { fileUri: URI.file(path) }); // Clear previous handler if any if (runningTimeout !== undefined) { @@ -362,8 +372,8 @@ export class CodeApplication extends Disposable { } // Handle paths delayed in case more are coming! - runningTimeout = setTimeout(() => { - this.windowsMainService?.open({ + runningTimeout = setTimeout(async () => { + await this.windowsMainService?.open({ context: OpenContext.DOCK /* can also be opening from finder while app is running */, cli: this.environmentMainService.args, urisToOpen: macOpenFileURIs, @@ -376,8 +386,8 @@ export class CodeApplication extends Disposable { }, 100); }); - app.on('new-window-for-tab', () => { - this.windowsMainService?.openEmptyWindow({ context: OpenContext.DESKTOP }); //macOS native tab "+" button + app.on('new-window-for-tab', async () => { + await this.windowsMainService?.openEmptyWindow({ context: OpenContext.DESKTOP }); //macOS native tab "+" button }); //#region Bootstrap IPC Handlers @@ -524,22 +534,35 @@ export class CodeApplication extends Disposable { // Services const appInstantiationService = await this.initServices(machineId, sharedProcess, sharedProcessReady); - // Setup Auth Handler - this._register(appInstantiationService.createInstance(ProxyAuthHandler)); + // Setup Handlers + this.setUpHandlers(appInstantiationService); // Init Channels appInstantiationService.invokeFunction(accessor => this.initChannels(accessor, mainProcessElectronServer, sharedProcessClient)); // Open Windows - const windows = appInstantiationService.invokeFunction(accessor => this.openFirstWindow(accessor, mainProcessElectronServer)); + await appInstantiationService.invokeFunction(accessor => this.openFirstWindow(accessor, mainProcessElectronServer)); // Post Open Windows Tasks appInstantiationService.invokeFunction(accessor => this.afterWindowOpen(accessor, sharedProcess)); - // Tracing: Stop tracing after windows are ready if enabled - if (this.environmentMainService.args.trace) { - appInstantiationService.invokeFunction(accessor => this.stopTracingEventually(accessor, windows)); - } + // Set lifecycle phase to `Eventually` after a short delay and when idle (min 2.5sec, max 5sec) + const eventuallyPhaseScheduler = this._register(new RunOnceScheduler(() => { + this._register(runWhenIdle(() => this.lifecycleMainService.phase = LifecycleMainPhase.Eventually, 2500)); + }, 2500)); + eventuallyPhaseScheduler.schedule(); + } + + private setUpHandlers(instantiationService: IInstantiationService): void { + + // Auth Handler + this._register(instantiationService.createInstance(ProxyAuthHandler)); + + // Default Extensions Profile Init Handler + this._register(instantiationService.createInstance(DefaultExtensionsProfileInitHandler)); + + // Transient profiles handler + this._register(instantiationService.createInstance(UserDataTransientProfilesHandler)); } private async resolveMachineId(): Promise { @@ -601,16 +624,17 @@ export class CodeApplication extends Disposable { } // Windows - services.set(IWindowsMainService, new SyncDescriptor(WindowsMainService, [machineId, this.userEnv])); + services.set(IWindowsMainService, new SyncDescriptor(WindowsMainService, [machineId, this.userEnv], false)); // Dialogs - services.set(IDialogMainService, new SyncDescriptor(DialogMainService)); + const dialogMainService = new DialogMainService(this.logService); + services.set(IDialogMainService, dialogMainService); // Launch - services.set(ILaunchMainService, new SyncDescriptor(LaunchMainService)); + services.set(ILaunchMainService, new SyncDescriptor(LaunchMainService, undefined, false /* proxied to other processes */)); // Diagnostics - services.set(IDiagnosticsMainService, new SyncDescriptor(DiagnosticsMainService)); + services.set(IDiagnosticsMainService, new SyncDescriptor(DiagnosticsMainService, undefined, false /* proxied to other processes */)); services.set(IDiagnosticsService, ProxyChannel.toService(getDelayedChannel(sharedProcessReady.then(client => client.getChannel('diagnostics'))))); // Issues @@ -623,7 +647,7 @@ export class CodeApplication extends Disposable { services.set(IKeyboardLayoutMainService, new SyncDescriptor(KeyboardLayoutMainService)); // Native Host - services.set(INativeHostMainService, new SyncDescriptor(NativeHostMainService, [sharedProcess])); + services.set(INativeHostMainService, new SyncDescriptor(NativeHostMainService, [sharedProcess], false /* proxied to other processes */)); // Credentials services.set(ICredentialsMainService, new SyncDescriptor(CredentialsNativeMainService)); @@ -631,10 +655,6 @@ export class CodeApplication extends Disposable { // Webview Manager services.set(IWebviewManagerService, new SyncDescriptor(WebviewMainService)); - // Workspaces - services.set(IWorkspacesService, new SyncDescriptor(WorkspacesMainService)); - services.set(IWorkspacesManagementMainService, new SyncDescriptor(WorkspacesManagementMainService)); - services.set(IWorkspacesHistoryMainService, new SyncDescriptor(WorkspacesHistoryMainService)); // Menubar services.set(IMenubarMainService, new SyncDescriptor(MenubarMainService)); @@ -647,7 +667,7 @@ export class CodeApplication extends Disposable { // Storage services.set(IStorageMainService, new SyncDescriptor(StorageMainService)); - services.set(IGlobalStorageMainService, new SyncDescriptor(GlobalStorageMainService)); + services.set(IApplicationStorageMainService, new SyncDescriptor(ApplicationStorageMainService)); // External terminal if (isWindows) { @@ -659,27 +679,41 @@ export class CodeApplication extends Disposable { } // Backups - const backupMainService = new BackupMainService(this.environmentMainService, this.configurationService, this.logService); + const backupMainService = new BackupMainService(this.environmentMainService, this.configurationService, this.logService, this.stateMainService); services.set(IBackupMainService, backupMainService); + // Workspaces + const workspacesManagementMainService = new WorkspacesManagementMainService(this.environmentMainService, this.logService, this.userDataProfilesMainService, backupMainService, dialogMainService, this.productService); + services.set(IWorkspacesManagementMainService, workspacesManagementMainService); + services.set(IWorkspacesService, new SyncDescriptor(WorkspacesMainService, undefined, false /* proxied to other processes */)); + services.set(IWorkspacesHistoryMainService, new SyncDescriptor(WorkspacesHistoryMainService, undefined, false)); + // URL handling - services.set(IURLService, new SyncDescriptor(NativeURLService)); + services.set(IURLService, new SyncDescriptor(NativeURLService, undefined, false /* proxied to other processes */)); // Telemetry if (supportsTelemetry(this.productService, this.environmentMainService)) { + const isInternal = isInternalTelemetry(this.productService, this.configurationService); const channel = getDelayedChannel(sharedProcessReady.then(client => client.getChannel('telemetryAppender'))); const appender = new TelemetryAppenderClient(channel); - const commonProperties = resolveCommonProperties(this.fileService, release(), hostname(), process.arch, this.productService.commit, this.productService.version, machineId, this.productService.msftInternalDomains, this.environmentMainService.installSourcePath); + const commonProperties = resolveCommonProperties(this.fileService, release(), hostname(), process.arch, this.productService.commit, this.productService.version, machineId, isInternal, this.environmentMainService.installSourcePath); const piiPaths = getPiiPathsFromEnvironment(this.environmentMainService); const config: ITelemetryServiceConfig = { appenders: [appender], commonProperties, piiPaths, sendErrorTelemetry: true }; - services.set(ITelemetryService, new SyncDescriptor(TelemetryService, [config])); + services.set(ITelemetryService, new SyncDescriptor(TelemetryService, [config], false)); } else { services.set(ITelemetryService, NullTelemetryService); } + // Default Extensions Profile Init + services.set(IExtensionsProfileScannerService, new SyncDescriptor(ExtensionsProfileScannerService, undefined, true)); + services.set(IExtensionsScannerService, new SyncDescriptor(ExtensionsScannerService, undefined, true)); + // Init services that require it - await backupMainService.initialize(); + await Promises.settled([ + backupMainService.initialize(), + workspacesManagementMainService.initialize() + ]); return this.mainInstantiationService.createChild(services); } @@ -709,6 +743,15 @@ export class CodeApplication extends Disposable { mainProcessElectronServer.registerChannel(LOCAL_FILE_SYSTEM_CHANNEL_NAME, fileSystemProviderChannel); sharedProcessClient.then(client => client.registerChannel(LOCAL_FILE_SYSTEM_CHANNEL_NAME, fileSystemProviderChannel)); + // User Data Profiles + const userDataProfilesService = ProxyChannel.fromService(accessor.get(IUserDataProfilesMainService)); + mainProcessElectronServer.registerChannel('userDataProfiles', userDataProfilesService); + sharedProcessClient.then(client => client.registerChannel('userDataProfiles', userDataProfilesService)); + + // Request + const requestService = new RequestChannel(accessor.get(IRequestService)); + sharedProcessClient.then(client => client.registerChannel('request', requestService)); + // Update const updateChannel = new UpdateChannel(accessor.get(IUpdateService)); mainProcessElectronServer.registerChannel('update', updateChannel); @@ -764,12 +807,16 @@ export class CodeApplication extends Disposable { mainProcessElectronServer.registerChannel('storage', storageChannel); sharedProcessClient.then(client => client.registerChannel('storage', storageChannel)); + // Profile Storage Changes Listener (shared process) + const profileStorageListener = this._register(new ProfileStorageChangesListenerChannel(accessor.get(IStorageMainService), accessor.get(IUserDataProfilesMainService), this.logService)); + sharedProcessClient.then(client => client.registerChannel('profileStorageListener', profileStorageListener)); + // External Terminal const externalTerminalChannel = ProxyChannel.fromService(accessor.get(IExternalTerminalMainService)); mainProcessElectronServer.registerChannel('externalTerminal', externalTerminalChannel); // Log Level (main & shared process) - const logLevelChannel = new LogLevelChannel(accessor.get(ILogService)); + const logLevelChannel = new LogLevelChannel(accessor.get(ILogService), accessor.get(ILoggerService)); mainProcessElectronServer.registerChannel('logLevel', logLevelChannel); sharedProcessClient.then(client => client.registerChannel('logLevel', logLevelChannel)); @@ -779,7 +826,7 @@ export class CodeApplication extends Disposable { sharedProcessClient.then(client => client.registerChannel('logger', loggerChannel)); // Extension Host Debug Broadcasting - const electronExtensionHostDebugBroadcastChannel = new ElectronExtensionHostDebugBroadcastChannel(accessor.get(IWindowsMainService)); + const electronExtensionHostDebugBroadcastChannel = new ElectronExtensionHostDebugBroadcastChannel(accessor.get(IWindowsMainService), accessor.get(IUserDataProfilesMainService)); mainProcessElectronServer.registerChannel('extensionhostdebugservice', electronExtensionHostDebugBroadcastChannel); // Extension Host Starter @@ -787,7 +834,7 @@ export class CodeApplication extends Disposable { mainProcessElectronServer.registerChannel(ipcExtensionHostStarterChannelName, extensionHostStarterChannel); } - private openFirstWindow(accessor: ServicesAccessor, mainProcessElectronServer: ElectronIPCServer): ICodeWindow[] { + private async openFirstWindow(accessor: ServicesAccessor, mainProcessElectronServer: ElectronIPCServer): Promise { const windowsMainService = this.windowsMainService = accessor.get(IWindowsMainService); const urlService = accessor.get(IURLService); const nativeHostMainService = accessor.get(INativeHostMainService); @@ -871,11 +918,19 @@ export class CodeApplication extends Disposable { // or if no window is open (macOS only) shouldOpenInNewWindow ||= isMacintosh && windowsMainService.getWindowCount() === 0; + // Pass along whether the application is being opened via a Continue On flow + const continueOn = params.get('continueOn'); + if (continueOn !== null) { + environmentService.continueOn = continueOn ?? undefined; + params.delete('continueOn'); + uri = uri.with({ query: params.toString() }); + } + // Check for URIs to open in window const windowOpenableFromProtocolLink = app.getWindowOpenableFromProtocolLink(uri); logService.trace('app#handleURL: windowOpenableFromProtocolLink = ', windowOpenableFromProtocolLink); if (windowOpenableFromProtocolLink) { - const [window] = windowsMainService.open({ + const [window] = await windowsMainService.open({ context: OpenContext.API, cli: { ...environmentService.args }, urisToOpen: [windowOpenableFromProtocolLink], @@ -890,7 +945,7 @@ export class CodeApplication extends Disposable { } if (shouldOpenInNewWindow) { - const [window] = windowsMainService.open({ + const [window] = await windowsMainService.open({ context: OpenContext.API, cli: { ...environmentService.args }, forceNewWindow: true, @@ -947,31 +1002,39 @@ export class CodeApplication extends Disposable { }); } - // new window if "-n" - if (args['new-window'] && !hasCliArgs && !hasFolderURIs && !hasFileURIs) { - return windowsMainService.open({ - context, - cli: args, - forceNewWindow: true, - forceEmpty: true, - noRecentEntry, - waitMarkerFileURI, - initialStartup: true, - remoteAuthority - }); - } + // Ensure profile exists when passed in from CLI + const profile = await this.userDataProfilesMainService.checkAndCreateProfileFromCli(this.environmentMainService.args); - // mac: open-file event received on startup - if (macOpenFiles.length && !hasCliArgs && !hasFolderURIs && !hasFileURIs) { - return windowsMainService.open({ - context: OpenContext.DOCK, - cli: args, - urisToOpen: macOpenFiles.map(file => this.getWindowOpenableFromPathSync(file)), - noRecentEntry, - waitMarkerFileURI, - initialStartup: true, - // remoteAuthority: will be determined based on macOpenFiles - }); + // Start without file/folder arguments + if (!hasCliArgs && !hasFolderURIs && !hasFileURIs) { + + // Force new window + if (args['new-window'] || profile) { + return windowsMainService.open({ + context, + cli: args, + forceNewWindow: true, + forceEmpty: true, + noRecentEntry, + waitMarkerFileURI, + initialStartup: true, + remoteAuthority, + profile + }); + } + + // mac: open-file event received on startup + if (macOpenFiles.length) { + return windowsMainService.open({ + context: OpenContext.DOCK, + cli: args, + urisToOpen: macOpenFiles.map(path => (hasWorkspaceFileExtension(path) ? { workspaceUri: URI.file(path) } : { fileUri: URI.file(path) })), + noRecentEntry, + waitMarkerFileURI, + initialStartup: true, + // remoteAuthority: will be determined based on macOpenFiles + }); + } } // default: read paths from cli @@ -980,11 +1043,13 @@ export class CodeApplication extends Disposable { cli: args, forceNewWindow: args['new-window'] || (!hasCliArgs && args['unity-launch']), diffMode: args.diff, + mergeMode: args.merge, noRecentEntry, waitMarkerFileURI, gotoLineMode: args.goto, initialStartup: true, - remoteAuthority + remoteAuthority, + profile }); } @@ -1055,32 +1120,59 @@ export class CodeApplication extends Disposable { return undefined; } - private getWindowOpenableFromPathSync(path: string): IWindowOpenable { - try { - const fileStat = statSync(path); - if (fileStat.isDirectory()) { - return { folderUri: URI.file(path) }; - } - - if (hasWorkspaceFileExtension(path)) { - return { workspaceUri: URI.file(path) }; - } - } catch (error) { - // ignore errors - } - - return { fileUri: URI.file(path) }; - } - - private async afterWindowOpen(accessor: ServicesAccessor, sharedProcess: SharedProcess): Promise { + private afterWindowOpen(accessor: ServicesAccessor, sharedProcess: SharedProcess): void { + const telemetryService = accessor.get(ITelemetryService); + const updateService = accessor.get(IUpdateService); // Signal phase: after window open this.lifecycleMainService.phase = LifecycleMainPhase.AfterWindowOpen; // Observe shared process for errors + this.handleSharedProcessErrors(telemetryService, sharedProcess); + + // Windows: mutex + this.installMutex(); + + // Remote Authorities + protocol.registerHttpProtocol(Schemas.vscodeRemoteResource, (request, callback) => { + callback({ + url: request.url.replace(/^vscode-remote-resource:/, 'http:'), + method: request.method + }); + }); + + // Initialize update service + if (updateService instanceof Win32UpdateService || updateService instanceof LinuxUpdateService || updateService instanceof DarwinUpdateService) { + updateService.initialize(); + } + + // Start to fetch shell environment (if needed) after window has opened + // Since this operation can take a long time, we want to warm it up while + // the window is opening. + // We also show an error to the user in case this fails. + this.resolveShellEnvironment(this.environmentMainService.args, process.env, true); + + // Crash reporter + this.updateCrashReporterEnablement(); + } + + private async installMutex(): Promise { + const win32MutexName = this.productService.win32MutexName; + if (isWindows && win32MutexName) { + try { + const WindowsMutex = await import('windows-mutex'); + const mutex = new WindowsMutex.Mutex(win32MutexName); + once(this.lifecycleMainService.onWillShutdown)(() => mutex.release()); + } catch (error) { + this.logService.error(error); + } + } + } + + private handleSharedProcessErrors(telemetryService: ITelemetryService, sharedProcess: SharedProcess): void { let willShutdown = false; once(this.lifecycleMainService.onWillShutdown)(() => willShutdown = true); - const telemetryService = accessor.get(ITelemetryService); + this._register(sharedProcess.onDidError(({ type, details }) => { // Logging @@ -1089,8 +1181,8 @@ export class CodeApplication extends Disposable { case WindowError.UNRESPONSIVE: message = 'SharedProcess: detected unresponsive window'; break; - case WindowError.CRASHED: - message = `SharedProcess: crashed (detail: ${details?.reason ?? ''}, code: ${details?.exitCode ?? ''})`; + case WindowError.PROCESS_GONE: + message = `SharedProcess: renderer process gone (detail: ${details?.reason ?? ''}, code: ${details?.exitCode ?? ''})`; break; case WindowError.LOAD: message = `SharedProcess: failed to load (detail: ${details?.reason ?? ''}, code: ${details?.exitCode ?? ''})`; @@ -1124,67 +1216,6 @@ export class CodeApplication extends Disposable { shuttingdown: willShutdown }); })); - - // Windows: install mutex - const win32MutexName = this.productService.win32MutexName; - if (isWindows && win32MutexName) { - try { - const WindowsMutex = (require.__$__nodeRequire('windows-mutex') as typeof import('windows-mutex')).Mutex; - const mutex = new WindowsMutex(win32MutexName); - once(this.lifecycleMainService.onWillShutdown)(() => mutex.release()); - } catch (error) { - this.logService.error(error); - } - } - - // Remote Authorities - protocol.registerHttpProtocol(Schemas.vscodeRemoteResource, (request, callback) => { - callback({ - url: request.url.replace(/^vscode-remote-resource:/, 'http:'), - method: request.method - }); - }); - - // Initialize update service - const updateService = accessor.get(IUpdateService); - if (updateService instanceof Win32UpdateService || updateService instanceof LinuxUpdateService || updateService instanceof DarwinUpdateService) { - updateService.initialize(); - } - - // Start to fetch shell environment (if needed) after window has opened - // Since this operation can take a long time, we want to warm it up while - // the window is opening. - // We also show an error to the user in case this fails. - this.resolveShellEnvironment(this.environmentMainService.args, process.env, true); - - // If enable-crash-reporter argv is undefined then this is a fresh start, - // based on telemetry.enableCrashreporter settings, generate a UUID which - // will be used as crash reporter id and also update the json file. - try { - const argvContent = await this.fileService.readFile(this.environmentMainService.argvResource); - const argvString = argvContent.value.toString(); - const argvJSON = JSON.parse(stripComments(argvString)); - if (argvJSON['enable-crash-reporter'] === undefined) { - const telemetryLevel = getTelemetryLevel(this.configurationService); - const enableCrashReporter = telemetryLevel >= TelemetryLevel.CRASH; - const additionalArgvContent = [ - '', - ' // Allows to disable crash reporting.', - ' // Should restart the app if the value is changed.', - ` "enable-crash-reporter": ${enableCrashReporter},`, - '', - ' // Unique id used for correlating crash reports sent from this instance.', - ' // Do not edit this value.', - ` "crash-reporter-id": "${generateUuid()}"`, - '}' - ]; - const newArgvString = argvString.substring(0, argvString.length - 2).concat(',\n', additionalArgvContent.join('\n')); - - await this.fileService.writeFile(this.environmentMainService.argvResource, VSBuffer.fromString(newArgvString)); - } - } catch (error) { - this.logService.error(error); - } } private async resolveShellEnvironment(args: NativeParsedArgs, env: IProcessEnvironment, notifyOnError: boolean): Promise { @@ -1202,44 +1233,46 @@ export class CodeApplication extends Disposable { return {}; } - private stopTracingEventually(accessor: ServicesAccessor, windows: ICodeWindow[]): void { - this.logService.info('Tracing: waiting for windows to get ready...'); + private async updateCrashReporterEnablement(): Promise { - const dialogMainService = accessor.get(IDialogMainService); + // If enable-crash-reporter argv is undefined then this is a fresh start, + // based on `telemetry.enableCrashreporter` settings, generate a UUID which + // will be used as crash reporter id and also update the json file. - let recordingStopped = false; - const stopRecording = async (timeout: boolean) => { - if (recordingStopped) { - return; + try { + const argvContent = await this.fileService.readFile(this.environmentMainService.argvResource); + const argvString = argvContent.value.toString(); + const argvJSON = JSON.parse(stripComments(argvString)); + const telemetryLevel = getTelemetryLevel(this.configurationService); + const enableCrashReporter = telemetryLevel >= TelemetryLevel.CRASH; + + // Initial startup + if (argvJSON['enable-crash-reporter'] === undefined) { + const additionalArgvContent = [ + '', + ' // Allows to disable crash reporting.', + ' // Should restart the app if the value is changed.', + ` "enable-crash-reporter": ${enableCrashReporter},`, + '', + ' // Unique id used for correlating crash reports sent from this instance.', + ' // Do not edit this value.', + ` "crash-reporter-id": "${generateUuid()}"`, + '}' + ]; + const newArgvString = argvString.substring(0, argvString.length - 2).concat(',\n', additionalArgvContent.join('\n')); + + await this.fileService.writeFile(this.environmentMainService.argvResource, VSBuffer.fromString(newArgvString)); } - recordingStopped = true; // only once - - const path = await contentTracing.stopRecording(`${randomPath(this.environmentMainService.userHome.fsPath, this.productService.applicationName)}.trace.txt`); - - if (!timeout) { - dialogMainService.showMessageBox({ - title: this.productService.nameLong, - type: 'info', - message: localize('trace.message', "Successfully created trace."), - detail: localize('trace.detail', "Please create an issue and manually attach the following file:\n{0}", path), - buttons: [mnemonicButtonLabel(localize({ key: 'trace.ok', comment: ['&& denotes a mnemonic'] }, "&&OK"))], - defaultId: 0, - noLink: true - }, withNullAsUndefined(BrowserWindow.getFocusedWindow())); - } else { - this.logService.info(`Tracing: data recorded (after 30s timeout) to ${path}`); + // Subsequent startup: update crash reporter value if changed + else { + const newArgvString = argvString.replace(/"enable-crash-reporter": .*,/, `"enable-crash-reporter": ${enableCrashReporter},`); + if (newArgvString !== argvString) { + await this.fileService.writeFile(this.environmentMainService.argvResource, VSBuffer.fromString(newArgvString)); + } } - }; - - // Wait up to 30s before creating the trace anyways - const timeoutHandle = setTimeout(() => stopRecording(true), 30000); - - // Wait for all windows to get ready and stop tracing then - Promise.all(windows.map(window => window.ready())).then(() => { - clearTimeout(timeoutHandle); - stopRecording(false); - }); + } catch (error) { + this.logService.error(error); + } } } - diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index cfa944e76c8..ca1cdec6ac2 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -34,7 +34,7 @@ import { DiagnosticsService } from 'vs/platform/diagnostics/node/diagnosticsServ import { NativeParsedArgs } from 'vs/platform/environment/common/argv'; import { EnvironmentMainService, IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService'; import { addArg, parseMainProcessArgv } from 'vs/platform/environment/node/argvHelper'; -import { createWaitMarkerFile } from 'vs/platform/environment/node/wait'; +import { createWaitMarkerFileSync } from 'vs/platform/environment/node/wait'; import { IFileService } from 'vs/platform/files/common/files'; import { FileService } from 'vs/platform/files/common/fileService'; import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider'; @@ -47,7 +47,6 @@ import { ILifecycleMainService, LifecycleMainService } from 'vs/platform/lifecyc import { BufferLogService } from 'vs/platform/log/common/bufferLog'; import { ConsoleMainLogger, getLogLevel, ILoggerService, ILogService, MultiplexLogService } from 'vs/platform/log/common/log'; import { LoggerService } from 'vs/platform/log/node/loggerService'; -import { SpdLogLogger } from 'vs/platform/log/node/spdlogLog'; import product from 'vs/platform/product/common/product'; import { IProductService } from 'vs/platform/product/common/productService'; import { IProtocolMainService } from 'vs/platform/protocol/electron-main/protocol'; @@ -62,10 +61,14 @@ import { IStateMainService } from 'vs/platform/state/electron-main/state'; import { StateMainService } from 'vs/platform/state/electron-main/stateMainService'; import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils'; import { IThemeMainService, ThemeMainService } from 'vs/platform/theme/electron-main/themeMainService'; +import { IUserDataProfilesMainService, UserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile'; import { IPolicyService, NullPolicyService } from 'vs/platform/policy/common/policy'; import { NativePolicyService } from 'vs/platform/policy/node/nativePolicyService'; import { FilePolicyService } from 'vs/platform/policy/common/filePolicyService'; import { DisposableStore } from 'vs/base/common/lifecycle'; +import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'; +import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService'; +import { PROFILES_ENABLEMENT_CONFIG } from 'vs/platform/userDataProfile/common/userDataProfile'; /** * The main VS Code entry point. @@ -93,13 +96,13 @@ class CodeMain { setUnexpectedErrorHandler(err => console.error(err)); // Create services - const [instantiationService, instanceEnvironment, environmentMainService, policyService, configurationService, stateMainService, bufferLogService, productService] = this.createServices(); + const [instantiationService, instanceEnvironment, environmentMainService, configurationService, stateMainService, bufferLogService, productService, userDataProfilesMainService] = this.createServices(); try { // Init services try { - await this.initServices(environmentMainService, policyService, configurationService, stateMainService); + await this.initServices(environmentMainService, userDataProfilesMainService, configurationService, stateMainService, productService); } catch (error) { // Show a dialog for errors that can be resolved by the user @@ -113,6 +116,7 @@ class CodeMain { const logService = accessor.get(ILogService); const lifecycleMainService = accessor.get(ILifecycleMainService); const fileService = accessor.get(IFileService); + const loggerService = accessor.get(ILoggerService); // Create the main IPC server by trying to be the server // If this throws an error it means we are not the first @@ -125,7 +129,7 @@ class CodeMain { }); // Delay creation of spdlog for perf reasons (https://github.com/microsoft/vscode/issues/72906) - bufferLogService.logger = new SpdLogLogger('main', join(environmentMainService.logsPath, 'main.log'), true, false, bufferLogService.getLevel()); + bufferLogService.logger = loggerService.createLogger(URI.file(join(environmentMainService.logsPath, 'main.log')), { name: 'main' }); // Lifecycle once(lifecycleMainService.onWillShutdown)(evt => { @@ -141,7 +145,7 @@ class CodeMain { } } - private createServices(): [IInstantiationService, IProcessEnvironment, IEnvironmentMainService, IPolicyService, ConfigurationService, StateMainService, BufferLogService, IProductService] { + private createServices(): [IInstantiationService, IProcessEnvironment, IEnvironmentMainService, ConfigurationService, StateMainService, BufferLogService, IProductService, UserDataProfilesMainService] { const services = new ServiceCollection(); const disposables = new DisposableStore(); process.once('exit', () => disposables.dispose()); @@ -168,8 +172,20 @@ class CodeMain { const diskFileSystemProvider = new DiskFileSystemProvider(logService); fileService.registerProvider(Schemas.file, diskFileSystemProvider); + // URI Identity + const uriIdentityService = new UriIdentityService(fileService); + services.set(IUriIdentityService, uriIdentityService); + // Logger - services.set(ILoggerService, new LoggerService(logService, fileService)); + services.set(ILoggerService, new LoggerService(logService)); + + // State + const stateMainService = new StateMainService(environmentMainService, logService, fileService); + services.set(IStateMainService, stateMainService); + + // User Data Profiles + const userDataProfilesMainService = new UserDataProfilesMainService(stateMainService, uriIdentityService, environmentMainService, fileService, logService); + services.set(IUserDataProfilesMainService, userDataProfilesMainService); // Policy const policyService = isWindows && productService.win32RegValueName ? disposables.add(new NativePolicyService(productService.win32RegValueName)) @@ -178,32 +194,28 @@ class CodeMain { services.set(IPolicyService, policyService); // Configuration - const configurationService = new ConfigurationService(environmentMainService.settingsResource, fileService, policyService, logService); + const configurationService = new ConfigurationService(userDataProfilesMainService.defaultProfile.settingsResource, fileService, policyService, logService); services.set(IConfigurationService, configurationService); // Lifecycle - services.set(ILifecycleMainService, new SyncDescriptor(LifecycleMainService)); - - // State - const stateMainService = new StateMainService(environmentMainService, logService, fileService); - services.set(IStateMainService, stateMainService); + services.set(ILifecycleMainService, new SyncDescriptor(LifecycleMainService, undefined, false)); // Request - services.set(IRequestService, new SyncDescriptor(RequestMainService)); + services.set(IRequestService, new SyncDescriptor(RequestMainService, undefined, true)); // Themes services.set(IThemeMainService, new SyncDescriptor(ThemeMainService)); // Signing - services.set(ISignService, new SyncDescriptor(SignService)); + services.set(ISignService, new SyncDescriptor(SignService, undefined, false /* proxied to other processes */)); // Tunnel services.set(ITunnelService, new SyncDescriptor(TunnelService)); - // Protocol - services.set(IProtocolMainService, new SyncDescriptor(ProtocolMainService)); + // Protocol (instantiated early and not using sync descriptor for security reasons) + services.set(IProtocolMainService, new ProtocolMainService(environmentMainService, userDataProfilesMainService, logService)); - return [new InstantiationService(services, true), instanceEnvironment, environmentMainService, policyService, configurationService, stateMainService, bufferLogService, productService]; + return [new InstantiationService(services, true), instanceEnvironment, environmentMainService, configurationService, stateMainService, bufferLogService, productService, userDataProfilesMainService]; } private patchEnvironment(environmentMainService: IEnvironmentMainService): IProcessEnvironment { @@ -223,26 +235,28 @@ class CodeMain { return instanceEnvironment; } - private initServices(environmentMainService: IEnvironmentMainService, policyService: IPolicyService, configurationService: ConfigurationService, stateMainService: StateMainService): Promise { - return Promises.settled([ + private async initServices(environmentMainService: IEnvironmentMainService, userDataProfilesMainService: UserDataProfilesMainService, configurationService: ConfigurationService, stateMainService: StateMainService, productService: IProductService): Promise { + await Promises.settled([ // Environment service (paths) Promise.all([ environmentMainService.extensionsPath, environmentMainService.codeCachePath, environmentMainService.logsPath, - environmentMainService.globalStorageHome.fsPath, + userDataProfilesMainService.defaultProfile.globalStorageHome.fsPath, environmentMainService.workspaceStorageHome.fsPath, environmentMainService.localHistoryHome.fsPath, environmentMainService.backupHome ].map(path => path ? FSPromises.mkdir(path, { recursive: true }) : undefined)), - // Configuration service - configurationService.initialize(), - // State service - stateMainService.init() + stateMainService.init(), + + // Configuration service + configurationService.initialize() ]); + + userDataProfilesMainService.setEnablement(productService.quality !== 'stable' || configurationService.getValue(PROFILES_ENABLEMENT_CONFIG)); } private async claimInstance(logService: ILogService, environmentMainService: IEnvironmentMainService, lifecycleMainService: ILifecycleMainService, instantiationService: IInstantiationService, productService: IProductService, retry: boolean): Promise { @@ -332,9 +346,9 @@ class CodeMain { if (environmentMainService.args.status) { return instantiationService.invokeFunction(async () => { const diagnosticsService = new DiagnosticsService(NullTelemetryService, productService); - const mainProcessInfo = await otherInstanceLaunchMainService.getMainProcessInfo(); + const mainDiagnostics = await otherInstanceDiagnosticsMainService.getMainDiagnostics(); const remoteDiagnostics = await otherInstanceDiagnosticsMainService.getRemoteDiagnostics({ includeProcesses: true, includeWorkspaceMetadata: true }); - const diagnostics = await diagnosticsService.getDiagnostics(mainProcessInfo, remoteDiagnostics); + const diagnostics = await diagnosticsService.getDiagnostics(mainDiagnostics, remoteDiagnostics); console.log(diagnostics); throw new ExpectedError(); @@ -455,8 +469,9 @@ class CodeMain { // // Note: we are not doing this if the wait marker has been already // added as argument. This can happen if Code was started from CLI. + if (args.wait && !args.waitMarkerFilePath) { - const waitMarkerFilePath = createWaitMarkerFile(args.verbose); + const waitMarkerFilePath = createWaitMarkerFileSync(args.verbose); if (waitMarkerFilePath) { addArg(process.argv, '--waitMarkerFilePath', waitMarkerFilePath); args.waitMarkerFilePath = waitMarkerFilePath; diff --git a/src/vs/code/electron-sandbox/issue/issueReporter-dev.html b/src/vs/code/electron-sandbox/issue/issueReporter-dev.html new file mode 100644 index 00000000000..847f987ecc8 --- /dev/null +++ b/src/vs/code/electron-sandbox/issue/issueReporter-dev.html @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/vs/code/electron-sandbox/issue/issueReporter.html b/src/vs/code/electron-sandbox/issue/issueReporter.html index 3a0cb4be742..2f76d13ff86 100644 --- a/src/vs/code/electron-sandbox/issue/issueReporter.html +++ b/src/vs/code/electron-sandbox/issue/issueReporter.html @@ -10,14 +10,10 @@ } + - - - - - - + diff --git a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts index ff591f90b72..33e66bedc76 100644 --- a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts +++ b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts @@ -27,7 +27,9 @@ import { INativeHostService } from 'vs/platform/native/electron-sandbox/native'; import { NativeHostService } from 'vs/platform/native/electron-sandbox/nativeHostService'; import { applyZoom, zoomIn, zoomOut } from 'vs/platform/window/electron-sandbox/window'; -const MAX_URL_LENGTH = 2045; +// GitHub has let us know that we could up our limit here to 8k. We chose 7500 to play it safe. +// ref https://github.com/microsoft/vscode/issues/159191 +const MAX_URL_LENGTH = 7500; interface SearchResult { html_url: string; @@ -71,8 +73,9 @@ export class IssueReporter extends Disposable { const mainProcessService = new ElectronIPCMainProcessService(configuration.windowId); this.nativeHostService = new NativeHostService(configuration.windowId, mainProcessService) as INativeHostService; - const targetExtension = configuration.data.extensionId ? configuration.data.enabledExtensions.find(extension => extension.id === configuration.data.extensionId) : undefined; + const targetExtension = configuration.data.extensionId ? configuration.data.enabledExtensions.find(extension => extension.id.toLocaleLowerCase() === configuration.data.extensionId?.toLocaleLowerCase()) : undefined; this.issueReporterModel = new IssueReporterModel({ + ...configuration.data, issueType: configuration.data.issueType || IssueType.Bug, versionInfo: { vscodeVersion: `${configuration.product.nameShort} ${!!configuration.product.darwinUniversalAssetId ? `${configuration.product.version} (Universal)` : configuration.product.version} (${configuration.product.commit || 'Commit unknown'}, ${configuration.product.date || 'Date unknown'})`, @@ -80,7 +83,7 @@ export class IssueReporter extends Disposable { }, extensionsDisabled: !!configuration.disableExtensions, fileOnExtension: configuration.data.extensionId ? !targetExtension?.isBuiltin : undefined, - selectedExtension: targetExtension, + selectedExtension: targetExtension }); const issueReporterElement = this.getElementById('issue-reporter'); @@ -140,6 +143,7 @@ export class IssueReporter extends Disposable { this.handleExtensionData(configuration.data.enabledExtensions); this.updateExperimentsInfo(configuration.data.experiments); this.updateRestrictedMode(configuration.data.restrictedMode); + this.updateUnsupportedMode(configuration.data.isUnsupported); } render(): void { @@ -150,14 +154,10 @@ export class IssueReporter extends Disposable { const { fileOnExtension } = this.issueReporterModel.getData(); if (fileOnExtension) { const issueTitle = document.getElementById('issue-title'); - if (issueTitle) { - issueTitle.focus(); - } + issueTitle?.focus(); } else { const issueType = document.getElementById('issue-type'); - if (issueType) { - issueType.focus(); - } + issueType?.focus(); } } @@ -729,7 +729,7 @@ export class IssueReporter extends Disposable { } else if (!fileOnMarketplace) { show(extensionsBlock); } - reset(descriptionTitle, localize('stepsToReproduce', "Steps to Reproduce"), $('span.required-input', undefined, '*')); + reset(descriptionTitle, localize('stepsToReproduce', "Steps to Reproduce") + ' ', $('span.required-input', undefined, '*')); reset(descriptionSubtitle, localize('bugDescription', "Share the steps needed to reliably reproduce the problem. Please include actual and expected results. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.")); } else if (issueType === IssueType.PerformanceIssue) { show(problemSource); @@ -748,10 +748,10 @@ export class IssueReporter extends Disposable { show(extensionsBlock); } - reset(descriptionTitle, localize('stepsToReproduce', "Steps to Reproduce"), $('span.required-input', undefined, '*')); + reset(descriptionTitle, localize('stepsToReproduce', "Steps to Reproduce") + ' ', $('span.required-input', undefined, '*')); reset(descriptionSubtitle, localize('performanceIssueDesciption', "When did this performance issue happen? Does it occur on startup or after a specific series of actions? We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.")); } else if (issueType === IssueType.FeatureRequest) { - reset(descriptionTitle, localize('description', "Description"), $('span.required-input', undefined, '*')); + reset(descriptionTitle, localize('description', "Description") + ' ', $('span.required-input', undefined, '*')); reset(descriptionSubtitle, localize('featureRequestDescription', "Please describe the feature you would like to see. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.")); show(problemSource); @@ -1154,6 +1154,10 @@ export class IssueReporter extends Disposable { this.issueReporterModel.update({ restrictedMode }); } + private updateUnsupportedMode(isUnsupported: boolean) { + this.issueReporterModel.update({ isUnsupported }); + } + private updateExperimentsInfo(experimentInfo: string | undefined) { this.issueReporterModel.update({ experimentInfo }); const target = document.querySelector('.block-experiments .block-info'); @@ -1197,21 +1201,15 @@ export class IssueReporter extends Disposable { private addEventListener(elementId: string, eventType: string, handler: (event: Event) => void): void { const element = this.getElementById(elementId); - if (element) { - element.addEventListener(eventType, handler); - } + element?.addEventListener(eventType, handler); } } // helper functions function hide(el: Element | undefined | null) { - if (el) { - el.classList.add('hidden'); - } + el?.classList.add('hidden'); } function show(el: Element | undefined | null) { - if (el) { - el.classList.remove('hidden'); - } + el?.classList.remove('hidden'); } diff --git a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts index 37a1a40beb0..a58acca2f5a 100644 --- a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts +++ b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts @@ -33,6 +33,8 @@ export interface IssueReporterData { filterResultCount?: number; experimentInfo?: string; restrictedMode?: boolean; + isUnsupported?: boolean; + isSandboxed?: boolean; } export class IssueReporterModel { @@ -61,14 +63,22 @@ export class IssueReporterModel { } serialize(): string { + const modes = []; + if (this._data.restrictedMode) { + modes.push('Restricted'); + } + if (this._data.isUnsupported) { + modes.push('Unsupported'); + } return ` -Issue Type: ${this.getIssueTypeTitle()} +Type: ${this.getIssueTypeTitle()} ${this._data.issueDescription} ${this.getExtensionVersion()} VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion} OS version: ${this._data.versionInfo && this._data.versionInfo.os} -Restricted Mode: ${this._data.restrictedMode ? 'Yes' : 'No'} +Modes:${modes.length ? ' ' + modes.join(', ') : ''} +Sandboxed: ${this._data.isSandboxed ? 'Yes' : 'No'} ${this.getRemoteOSes()} ${this.getInfos()} `; diff --git a/src/vs/code/electron-sandbox/issue/issueReporterPage.ts b/src/vs/code/electron-sandbox/issue/issueReporterPage.ts index 99e6cc82420..6467d66bd36 100644 --- a/src/vs/code/electron-sandbox/issue/issueReporterPage.ts +++ b/src/vs/code/electron-sandbox/issue/issueReporterPage.ts @@ -11,11 +11,23 @@ const sendProcessInfoLabel = escape(localize('sendProcessInfo', "Include my curr const sendWorkspaceInfoLabel = escape(localize('sendWorkspaceInfo', "Include my workspace metadata")); const sendExtensionsLabel = escape(localize('sendExtensions', "Include my enabled extensions")); const sendExperimentsLabel = escape(localize('sendExperiments', "Include A/B experiment info")); +const reviewGuidanceLabel = localize( // intentionally not escaped because of its embedded tags + { + key: 'reviewGuidanceLabel', + comment: [ + '{Locked=""}', + '{Locked=""}' + ] + }, + 'Before you report an issue here please review the guidance we provide.' +); export default (): string => `
        +
        ${reviewGuidanceLabel}
        +
        @@ -25,7 +37,7 @@ export default (): string => `
        - + diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.html b/src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.html new file mode 100644 index 00000000000..f6d8aa51604 --- /dev/null +++ b/src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.html @@ -0,0 +1,18 @@ + + + + + + + + + +
        + + + + + + + + diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorer.html b/src/vs/code/electron-sandbox/processExplorer/processExplorer.html index 73d89eac31d..0eb6357a976 100644 --- a/src/vs/code/electron-sandbox/processExplorer/processExplorer.html +++ b/src/vs/code/electron-sandbox/processExplorer/processExplorer.html @@ -5,15 +5,11 @@ +
        - - - - - - + diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts b/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts index 8e756e829d9..2fcf59e3ae0 100644 --- a/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts +++ b/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts @@ -257,6 +257,7 @@ class ProcessExplorer { await this.createProcessTree(processRoots); } else { this.tree.setInput({ processes: { processRoots } }); + this.tree.layout(window.innerHeight, window.innerWidth); } this.requestProcessList(0); @@ -342,6 +343,13 @@ class ProcessExplorer { this.showContextMenu(e.element, true); } }); + + container.style.height = `${window.innerHeight}px`; + + window.addEventListener('resize', () => { + container.style.height = `${window.innerHeight}px`; + this.tree?.layout(window.innerHeight, window.innerWidth); + }); } private isDebuggable(cmd: string): boolean { @@ -416,6 +424,47 @@ class ProcessExplorer { content.push(`.monaco-list-row:hover { outline: 1px dashed ${styles.listHoverOutline}; outline-offset: -1px; }`); } + // Scrollbars + if (styles.scrollbarShadowColor) { + content.push(` + .monaco-scrollable-element > .shadow.top { + box-shadow: ${styles.scrollbarShadowColor} 0 6px 6px -6px inset; + } + + .monaco-scrollable-element > .shadow.left { + box-shadow: ${styles.scrollbarShadowColor} 6px 0 6px -6px inset; + } + + .monaco-scrollable-element > .shadow.top.left { + box-shadow: ${styles.scrollbarShadowColor} 6px 6px 6px -6px inset; + } + `); + } + + if (styles.scrollbarSliderBackgroundColor) { + content.push(` + .monaco-scrollable-element > .scrollbar > .slider { + background: ${styles.scrollbarSliderBackgroundColor}; + } + `); + } + + if (styles.scrollbarSliderHoverBackgroundColor) { + content.push(` + .monaco-scrollable-element > .scrollbar > .slider:hover { + background: ${styles.scrollbarSliderHoverBackgroundColor}; + } + `); + } + + if (styles.scrollbarSliderActiveBackgroundColor) { + content.push(` + .monaco-scrollable-element > .scrollbar > .slider.active { + background: ${styles.scrollbarSliderActiveBackgroundColor}; + } + `); + } + styleElement.textContent = content.join('\n'); if (styles.color) { diff --git a/src/vs/code/electron-browser/workbench/workbench.html b/src/vs/code/electron-sandbox/workbench/workbench-dev.html similarity index 75% rename from src/vs/code/electron-browser/workbench/workbench.html rename to src/vs/code/electron-sandbox/workbench/workbench-dev.html index 47066f520be..cccf92b4e6d 100644 --- a/src/vs/code/electron-browser/workbench/workbench.html +++ b/src/vs/code/electron-sandbox/workbench/workbench-dev.html @@ -4,16 +4,15 @@ - + + - + - - diff --git a/src/vs/code/electron-sandbox/workbench/workbench.html b/src/vs/code/electron-sandbox/workbench/workbench.html index 47066f520be..ffee5aca3fb 100644 --- a/src/vs/code/electron-sandbox/workbench/workbench.html +++ b/src/vs/code/electron-sandbox/workbench/workbench.html @@ -4,16 +4,12 @@ - + + - - - - - - + diff --git a/src/vs/code/electron-sandbox/workbench/workbench.js b/src/vs/code/electron-sandbox/workbench/workbench.js index e271fdf1bf4..c8e4431d6db 100644 --- a/src/vs/code/electron-sandbox/workbench/workbench.js +++ b/src/vs/code/electron-sandbox/workbench/workbench.js @@ -16,10 +16,10 @@ // Load workbench main JS, CSS and NLS all in parallel. This is an // optimization to prevent a waterfall of loading to happen, because - // we know for a fact that workbench.desktop.sandbox.main will depend on + // we know for a fact that workbench.desktop.main will depend on // the related CSS and NLS counterparts. bootstrapWindow.load([ - 'vs/workbench/workbench.desktop.sandbox.main', + 'vs/workbench/workbench.desktop.main', 'vs/nls!vs/workbench/workbench.desktop.main', 'vs/css!vs/workbench/workbench.desktop.main' ], @@ -36,7 +36,7 @@ return { // disable automated devtools opening on error when running extension tests // as this can lead to nondeterministic test execution (devtools steals focus) - forceDisableShowDevtoolsOnError: typeof windowConfig.extensionTestsPath === 'string', + forceDisableShowDevtoolsOnError: typeof windowConfig.extensionTestsPath === 'string' || windowConfig['enable-smoke-test-driver'] === true, // enable devtools keybindings in extension development window forceEnableDeveloperKeybindings: Array.isArray(windowConfig.extensionDevelopmentPath) && windowConfig.extensionDevelopmentPath.length > 0, removeDeveloperKeybindingsAfterLoad: true @@ -61,7 +61,7 @@ window.requestIdleCallback(() => { const canvas = document.createElement('canvas'); const context = canvas.getContext('2d'); - context.clearRect(0, 0, canvas.width, canvas.height); + context?.clearRect(0, 0, canvas.width, canvas.height); canvas.remove(); }, { timeout: 50 }); } diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts index 49f1f4cf4cb..bd7acdf794c 100644 --- a/src/vs/code/node/cli.ts +++ b/src/vs/code/node/cli.ts @@ -8,7 +8,7 @@ import { chmodSync, existsSync, readFileSync, statSync, truncateSync, unlinkSync import { homedir, release, tmpdir } from 'os'; import type { ProfilingSession, Target } from 'v8-inspect-profiler'; import { Event } from 'vs/base/common/event'; -import { isAbsolute, resolve } from 'vs/base/common/path'; +import { isAbsolute, resolve, join, dirname } from 'vs/base/common/path'; import { IProcessEnvironment, isMacintosh, isWindows } from 'vs/base/common/platform'; import { randomPort } from 'vs/base/common/ports'; import { isString } from 'vs/base/common/types'; @@ -19,11 +19,12 @@ import { NativeParsedArgs } from 'vs/platform/environment/common/argv'; import { buildHelpMessage, buildVersionMessage, OPTIONS } from 'vs/platform/environment/node/argv'; import { addArg, parseCLIProcessArgv } from 'vs/platform/environment/node/argvHelper'; import { getStdinFilePath, hasStdinWithoutTty, readFromStdin, stdinDataListener } from 'vs/platform/environment/node/stdin'; -import { createWaitMarkerFile } from 'vs/platform/environment/node/wait'; +import { createWaitMarkerFileSync } from 'vs/platform/environment/node/wait'; import product from 'vs/platform/product/common/product'; import { CancellationTokenSource } from 'vs/base/common/cancellation'; import { randomPath } from 'vs/base/common/extpath'; import { Utils } from 'vs/platform/profiling/common/profiling'; +import { FileAccess } from 'vs/base/common/network'; function shouldSpawnCliProcess(argv: NativeParsedArgs): boolean { return !!argv['install-source'] @@ -48,6 +49,35 @@ export async function main(argv: string[]): Promise { return; } + if (args.tunnel) { + if (!product.tunnelApplicationName) { + console.error(`'tunnel' command not supported in ${product.applicationName}`); + return; + } + return new Promise((resolve, reject) => { + let tunnelProcess; + if (process.env['VSCODE_DEV']) { + tunnelProcess = spawn('cargo', ['run', '--', 'tunnel', ...argv.slice(5)], { cwd: join(getAppRoot(), 'cli') }); + } else { + const appPath = process.platform === 'darwin' + // ./Contents/MacOS/Electron => ./Contents/Resources/app/bin/code-tunnel-insiders + ? join(dirname(dirname(process.execPath)), 'Resources', 'app') + : dirname(process.execPath); + const tunnelCommand = join(appPath, 'bin', `${product.tunnelApplicationName}${isWindows ? '.exe' : ''}`); + const tunnelArgs = argv.slice(3); + tunnelProcess = spawn(tunnelCommand, ['tunnel', ...tunnelArgs]); + } + tunnelProcess.stdout.on('data', data => { + console.log(data.toString()); + }); + tunnelProcess.stderr.on('data', data => { + console.error(data.toString()); + }); + tunnelProcess.on('exit', resolve); + tunnelProcess.on('error', reject); + }); + } + // Help if (args.help) { const executable = `${product.applicationName}${isWindows ? '.exe' : ''}`; @@ -59,6 +89,23 @@ export async function main(argv: string[]): Promise { console.log(buildVersionMessage(product.version, product.commit)); } + // Shell integration + else if (args['locate-shell-integration-path']) { + let file: string; + switch (args['locate-shell-integration-path']) { + // Usage: `[[ "$TERM_PROGRAM" == "vscode" ]] && . "$(code --locate-shell-integration-path bash)"` + case 'bash': file = 'shellIntegration-bash.sh'; break; + // Usage: `if ($env:TERM_PROGRAM -eq "vscode") { . "$(code --locate-shell-integration-path pwsh)" }` + case 'pwsh': file = 'shellIntegration.ps1'; break; + // Usage: `[[ "$TERM_PROGRAM" == "vscode" ]] && . "$(code --locate-shell-integration-path zsh)"` + case 'zsh': file = 'shellIntegration-rc.zsh'; break; + // Usage: `string match -q "$TERM_PROGRAM" "vscode"; and . (code --locate-shell-integration-path fish)` + case 'fish': file = 'shellIntegration.fish'; break; + default: throw new Error('Error using --locate-shell-integration-path: Invalid shell type'); + } + console.log(join(getAppRoot(), 'out', 'vs', 'workbench', 'contrib', 'terminal', 'browser', 'media', file)); + } + // Extensions Management else if (shouldSpawnCliProcess(args)) { const cli = await new Promise((resolve, reject) => require(['vs/code/node/cliProcessMain'], resolve, reject)); @@ -162,7 +209,7 @@ export async function main(argv: string[]): Promise { // returns a file path where stdin input is written into (write in progress). try { - readFromStdin(stdinFilePath, !!verbose); // throws error if file can not be written + await readFromStdin(stdinFilePath, !!verbose); // throws error if file can not be written // Make sure to open tmp file addArg(argv, stdinFilePath); @@ -201,7 +248,7 @@ export async function main(argv: string[]): Promise { // is closed and then exit the waiting process. let waitMarkerFilePath: string | undefined; if (args.wait) { - waitMarkerFilePath = createWaitMarkerFile(verbose); + waitMarkerFilePath = createWaitMarkerFileSync(verbose); if (waitMarkerFilePath) { addArg(argv, '--waitMarkerFilePath', waitMarkerFilePath); } @@ -286,7 +333,7 @@ export async function main(argv: string[]): Promise { return; } let suffix = ''; - let result = await session.stop(); + const result = await session.stop(); if (!process.env['VSCODE_DEV']) { // when running from a not-development-build we remove // absolute filenames because we don't want to reveal anything @@ -315,7 +362,7 @@ export async function main(argv: string[]): Promise { return false; } if (target.type === 'page') { - return target.url.indexOf('workbench/workbench.html') > 0; + return target.url.indexOf('workbench/workbench.html') > 0 || target.url.indexOf('workbench/workbench-dev.html') > 0; } else { return true; } @@ -448,6 +495,10 @@ export async function main(argv: string[]): Promise { } } +function getAppRoot() { + return dirname(FileAccess.asFileUri('', require).fsPath); +} + function eventuallyExit(code: number): void { setTimeout(() => process.exit(code), 0); } diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts index 32d5fb9c6a3..6c65566f766 100644 --- a/src/vs/code/node/cliProcessMain.ts +++ b/src/vs/code/node/cliProcessMain.ts @@ -13,7 +13,6 @@ import { Schemas } from 'vs/base/common/network'; import { isAbsolute, join } from 'vs/base/common/path'; import { isWindows } from 'vs/base/common/platform'; import { cwd } from 'vs/base/common/process'; -import { joinPath } from 'vs/base/common/resources'; import { URI } from 'vs/base/common/uri'; import { Promises } from 'vs/base/node/pfs'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; @@ -24,10 +23,12 @@ import { NativeParsedArgs } from 'vs/platform/environment/common/argv'; import { INativeEnvironmentService } from 'vs/platform/environment/common/environment'; import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService'; import { ExtensionGalleryServiceWithNoStorageService } from 'vs/platform/extensionManagement/common/extensionGalleryService'; -import { IExtensionGalleryService, IExtensionManagementCLIService, IExtensionManagementService, InstallOptions } from 'vs/platform/extensionManagement/common/extensionManagement'; -import { ExtensionManagementCLIService } from 'vs/platform/extensionManagement/common/extensionManagementCLIService'; +import { IExtensionGalleryService, InstallOptions } from 'vs/platform/extensionManagement/common/extensionManagement'; +import { ExtensionSignatureVerificationService, IExtensionSignatureVerificationService } from 'vs/platform/extensionManagement/node/extensionSignatureVerificationService'; +import { ExtensionManagementCLI } from 'vs/platform/extensionManagement/common/extensionManagementCLI'; +import { ExtensionsProfileScannerService, IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService'; import { IExtensionsScannerService } from 'vs/platform/extensionManagement/common/extensionsScannerService'; -import { ExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService'; +import { ExtensionManagementService, INativeServerExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService'; import { ExtensionsScannerService } from 'vs/platform/extensionManagement/node/extensionsScannerService'; import { IFileService } from 'vs/platform/files/common/files'; import { FileService } from 'vs/platform/files/common/fileService'; @@ -47,14 +48,18 @@ import product from 'vs/platform/product/common/product'; import { IProductService } from 'vs/platform/product/common/productService'; import { IRequestService } from 'vs/platform/request/common/request'; import { RequestService } from 'vs/platform/request/node/requestService'; +import { IStateService } from 'vs/platform/state/node/state'; +import { StateService } from 'vs/platform/state/node/stateService'; import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProperties'; import { ITelemetryService, machineIdKey } from 'vs/platform/telemetry/common/telemetry'; import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService'; -import { supportsTelemetry, NullTelemetryService, getPiiPathsFromEnvironment } from 'vs/platform/telemetry/common/telemetryUtils'; -import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender'; +import { supportsTelemetry, NullTelemetryService, getPiiPathsFromEnvironment, isInternalTelemetry } from 'vs/platform/telemetry/common/telemetryUtils'; +import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender'; import { buildTelemetryMessage } from 'vs/platform/telemetry/node/telemetry'; import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity'; import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService'; +import { IUserDataProfilesService, PROFILES_ENABLEMENT_CONFIG } from 'vs/platform/userDataProfile/common/userDataProfile'; +import { UserDataProfilesService } from 'vs/platform/userDataProfile/node/userDataProfile'; class CliMain extends Disposable { @@ -81,7 +86,7 @@ class CliMain extends Disposable { const logService = accessor.get(ILogService); const fileService = accessor.get(IFileService); const environmentService = accessor.get(INativeEnvironmentService); - const extensionManagementCLIService = accessor.get(IExtensionManagementCLIService); + const userDataProfilesService = accessor.get(IUserDataProfilesService); // Log info logService.info('CLI main', this.argv); @@ -90,7 +95,7 @@ class CliMain extends Disposable { this.registerErrorHandler(logService); // Run based on argv - await this.doRun(environmentService, extensionManagementCLIService, fileService); + await this.doRun(environmentService, fileService, userDataProfilesService, instantiationService); // Flush the remaining data in AI adapter (with 1s timeout) await Promise.all(appenders.map(a => { @@ -100,7 +105,7 @@ class CliMain extends Disposable { }); } - private async initServices(): Promise<[IInstantiationService, AppInsightsAppender[]]> { + private async initServices(): Promise<[IInstantiationService, OneDataSystemAppender[]]> { const services = new ServiceCollection(); // Product @@ -112,7 +117,10 @@ class CliMain extends Disposable { services.set(INativeEnvironmentService, environmentService); // Init folders - await Promise.all([environmentService.appSettingsHome.fsPath, environmentService.extensionsPath].map(path => path ? Promises.mkdir(path, { recursive: true }) : undefined)); + await Promise.all([ + environmentService.appSettingsHome.fsPath, + environmentService.extensionsPath + ].map(path => path ? Promises.mkdir(path, { recursive: true }) : undefined)); // Log const logLevel = getLogLevel(environmentService); @@ -132,6 +140,18 @@ class CliMain extends Disposable { const diskFileSystemProvider = this._register(new DiskFileSystemProvider(logService)); fileService.registerProvider(Schemas.file, diskFileSystemProvider); + // State + const stateService = new StateService(environmentService, logService, fileService); + services.set(IStateService, stateService); + + // Uri Identity + const uriIdentityService = new UriIdentityService(fileService); + services.set(IUriIdentityService, uriIdentityService); + + // User Data Profiles + const userDataProfilesService = new UserDataProfilesService(stateService, uriIdentityService, environmentService, fileService, logService); + services.set(IUserDataProfilesService, userDataProfilesService); + // Policy const policyService = isWindows && productService.win32RegValueName ? this._register(new NativePolicyService(productService.win32RegValueName)) : environmentService.policyFile ? this._register(new FilePolicyService(environmentService.policyFile, fileService, logService)) @@ -139,35 +159,42 @@ class CliMain extends Disposable { services.set(IPolicyService, policyService); // Configuration - const configurationService = this._register(new ConfigurationService(environmentService.settingsResource, fileService, policyService, logService)); + const configurationService = this._register(new ConfigurationService(userDataProfilesService.defaultProfile.settingsResource, fileService, policyService, logService)); services.set(IConfigurationService, configurationService); - // Init config - await configurationService.initialize(); + // Initialize + await Promise.all([ + stateService.init(), + configurationService.initialize() + ]); + + userDataProfilesService.setEnablement(productService.quality !== 'stable' || configurationService.getValue(PROFILES_ENABLEMENT_CONFIG)); // URI Identity services.set(IUriIdentityService, new UriIdentityService(fileService)); // Request - services.set(IRequestService, new SyncDescriptor(RequestService)); + services.set(IRequestService, new SyncDescriptor(RequestService, undefined, true)); // Download Service - services.set(IDownloadService, new SyncDescriptor(DownloadService)); + services.set(IDownloadService, new SyncDescriptor(DownloadService, undefined, true)); // Extensions - services.set(IExtensionsScannerService, new SyncDescriptor(ExtensionsScannerService)); - services.set(IExtensionManagementService, new SyncDescriptor(ExtensionManagementService)); - services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryServiceWithNoStorageService)); - services.set(IExtensionManagementCLIService, new SyncDescriptor(ExtensionManagementCLIService)); + services.set(IExtensionsProfileScannerService, new SyncDescriptor(ExtensionsProfileScannerService, undefined, true)); + services.set(IExtensionsScannerService, new SyncDescriptor(ExtensionsScannerService, undefined, true)); + services.set(IExtensionSignatureVerificationService, new SyncDescriptor(ExtensionSignatureVerificationService, undefined, true)); + services.set(INativeServerExtensionManagementService, new SyncDescriptor(ExtensionManagementService, undefined, true)); + services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryServiceWithNoStorageService, undefined, true)); // Localizations - services.set(ILanguagePackService, new SyncDescriptor(NativeLanguagePackService)); + services.set(ILanguagePackService, new SyncDescriptor(NativeLanguagePackService, undefined, false)); // Telemetry - const appenders: AppInsightsAppender[] = []; + const appenders: OneDataSystemAppender[] = []; + const isInternal = isInternalTelemetry(productService, configurationService); if (supportsTelemetry(productService, environmentService)) { - if (productService.aiConfig && productService.aiConfig.asimovKey) { - appenders.push(new AppInsightsAppender('monacoworkbench', null, productService.aiConfig.asimovKey)); + if (productService.aiConfig && productService.aiConfig.ariaKey) { + appenders.push(new OneDataSystemAppender(isInternal, 'monacoworkbench', null, productService.aiConfig.ariaKey)); } const { installSourcePath } = environmentService; @@ -178,7 +205,7 @@ class CliMain extends Disposable { commonProperties: (async () => { let machineId: string | undefined = undefined; try { - const storageContents = await Promises.readFile(joinPath(environmentService.globalStorageHome, 'storage.json').fsPath); + const storageContents = await Promises.readFile(environmentService.stateResource.fsPath); machineId = JSON.parse(storageContents.toString())[machineIdKey]; } catch (error) { if (error.code !== 'ENOENT') { @@ -186,12 +213,12 @@ class CliMain extends Disposable { } } - return resolveCommonProperties(fileService, release(), hostname(), process.arch, productService.commit, productService.version, machineId, productService.msftInternalDomains, installSourcePath); + return resolveCommonProperties(fileService, release(), hostname(), process.arch, productService.commit, productService.version, machineId, isInternal, installSourcePath); })(), piiPaths: getPiiPathsFromEnvironment(environmentService) }; - services.set(ITelemetryService, new SyncDescriptor(TelemetryService, [config])); + services.set(ITelemetryService, new SyncDescriptor(TelemetryService, [config], false)); } else { services.set(ITelemetryService, NullTelemetryService); @@ -217,7 +244,8 @@ class CliMain extends Disposable { process.on('unhandledRejection', (reason: unknown) => onUnexpectedError(reason)); } - private async doRun(environmentService: INativeEnvironmentService, extensionManagementCLIService: IExtensionManagementCLIService, fileService: IFileService): Promise { + private async doRun(environmentService: INativeEnvironmentService, fileService: IFileService, userDataProfilesService: IUserDataProfilesService, instantiationService: IInstantiationService): Promise { + const profileLocation = environmentService.args.profile ? userDataProfilesService.profiles.find(p => p.name === environmentService.args.profile)?.extensionsResource : userDataProfilesService.defaultProfile.extensionsResource; // Install Source if (this.argv['install-source']) { @@ -226,23 +254,23 @@ class CliMain extends Disposable { // List Extensions if (this.argv['list-extensions']) { - return extensionManagementCLIService.listExtensions(!!this.argv['show-versions'], this.argv['category']); + return instantiationService.createInstance(ExtensionManagementCLI).listExtensions(!!this.argv['show-versions'], this.argv['category'], profileLocation); } // Install Extension else if (this.argv['install-extension'] || this.argv['install-builtin-extension']) { - const installOptions: InstallOptions = { isMachineScoped: !!this.argv['do-not-sync'], installPreReleaseVersion: !!this.argv['pre-release'] }; - return extensionManagementCLIService.installExtensions(this.asExtensionIdOrVSIX(this.argv['install-extension'] || []), this.argv['install-builtin-extension'] || [], installOptions, !!this.argv['force']); + const installOptions: InstallOptions = { isMachineScoped: !!this.argv['do-not-sync'], installPreReleaseVersion: !!this.argv['pre-release'], profileLocation }; + return instantiationService.createInstance(ExtensionManagementCLI).installExtensions(this.asExtensionIdOrVSIX(this.argv['install-extension'] || []), this.argv['install-builtin-extension'] || [], installOptions, !!this.argv['force']); } // Uninstall Extension else if (this.argv['uninstall-extension']) { - return extensionManagementCLIService.uninstallExtensions(this.asExtensionIdOrVSIX(this.argv['uninstall-extension']), !!this.argv['force']); + return instantiationService.createInstance(ExtensionManagementCLI).uninstallExtensions(this.asExtensionIdOrVSIX(this.argv['uninstall-extension']), !!this.argv['force'], profileLocation); } // Locate Extension else if (this.argv['locate-extension']) { - return extensionManagementCLIService.locateExtension(this.argv['locate-extension']); + return instantiationService.createInstance(ExtensionManagementCLI).locateExtension(this.argv['locate-extension']); } // Telemetry diff --git a/src/vs/code/test/electron-sandbox/issue/testReporterModel.test.ts b/src/vs/code/test/electron-sandbox/issue/testReporterModel.test.ts index 87bca75fedf..aa0fac7bf0d 100644 --- a/src/vs/code/test/electron-sandbox/issue/testReporterModel.test.ts +++ b/src/vs/code/test/electron-sandbox/issue/testReporterModel.test.ts @@ -27,13 +27,14 @@ suite('IssueReporter', () => { const issueReporterModel = new IssueReporterModel({}); assert.strictEqual(issueReporterModel.serialize(), ` -Issue Type: Bug +Type: Bug undefined VS Code version: undefined OS version: undefined -Restricted Mode: No +Modes: +Sandboxed: No Extensions: none `); @@ -58,13 +59,14 @@ Extensions: none }); assert.strictEqual(issueReporterModel.serialize(), ` -Issue Type: Bug +Type: Bug undefined VS Code version: undefined OS version: undefined -Restricted Mode: No +Modes: +Sandboxed: No
        System Info @@ -102,13 +104,14 @@ Restricted Mode: No }); assert.strictEqual(issueReporterModel.serialize(), ` -Issue Type: Bug +Type: Bug undefined VS Code version: undefined OS version: undefined -Restricted Mode: No +Modes: +Sandboxed: No
        System Info @@ -157,13 +160,14 @@ vsins829:30139715 }); assert.strictEqual(issueReporterModel.serialize(), ` -Issue Type: Bug +Type: Bug undefined VS Code version: undefined OS version: undefined -Restricted Mode: No +Modes: +Sandboxed: No
        System Info @@ -214,13 +218,14 @@ Restricted Mode: No }); assert.strictEqual(issueReporterModel.serialize(), ` -Issue Type: Bug +Type: Bug undefined VS Code version: undefined OS version: undefined -Restricted Mode: No +Modes: +Sandboxed: No Remote OS version: Linux x64 4.18.0
        @@ -263,13 +268,14 @@ Remote OS version: Linux x64 4.18.0 }); assert.strictEqual(issueReporterModel.serialize(), ` -Issue Type: Bug +Type: Bug undefined VS Code version: undefined OS version: undefined -Restricted Mode: No +Modes: +Sandboxed: No
        System Info @@ -287,6 +293,25 @@ Restricted Mode: No `); }); + test('should supply mode if applicable', () => { + const issueReporterModel = new IssueReporterModel({ + isUnsupported: true, + restrictedMode: true + }); + assert.strictEqual(issueReporterModel.serialize(), + ` +Type: Bug + +undefined + +VS Code version: undefined +OS version: undefined +Modes: Restricted, Unsupported +Sandboxed: No + +Extensions: none +`); + }); test('should normalize GitHub urls', () => { [ 'https://github.com/repo', diff --git a/src/vs/css.build.js b/src/vs/css.build.js deleted file mode 100644 index c8875859684..00000000000 --- a/src/vs/css.build.js +++ /dev/null @@ -1,359 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -/*--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------- - * Please make sure to make edits in the .ts file at https://github.com/microsoft/vscode-loader/ - *--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------*/ -'use strict'; -var _cssPluginGlobal = this; -var CSSBuildLoaderPlugin; -(function (CSSBuildLoaderPlugin) { - var global = (_cssPluginGlobal || {}); - var BrowserCSSLoader = /** @class */ (function () { - function BrowserCSSLoader() { - this._pendingLoads = 0; - } - BrowserCSSLoader.prototype.attachListeners = function (name, linkNode, callback, errorback) { - var unbind = function () { - linkNode.removeEventListener('load', loadEventListener); - linkNode.removeEventListener('error', errorEventListener); - }; - var loadEventListener = function (e) { - unbind(); - callback(); - }; - var errorEventListener = function (e) { - unbind(); - errorback(e); - }; - linkNode.addEventListener('load', loadEventListener); - linkNode.addEventListener('error', errorEventListener); - }; - BrowserCSSLoader.prototype._onLoad = function (name, callback) { - this._pendingLoads--; - callback(); - }; - BrowserCSSLoader.prototype._onLoadError = function (name, errorback, err) { - this._pendingLoads--; - errorback(err); - }; - BrowserCSSLoader.prototype._insertLinkNode = function (linkNode) { - this._pendingLoads++; - var head = document.head || document.getElementsByTagName('head')[0]; - var other = head.getElementsByTagName('link') || head.getElementsByTagName('script'); - if (other.length > 0) { - head.insertBefore(linkNode, other[other.length - 1]); - } - else { - head.appendChild(linkNode); - } - }; - BrowserCSSLoader.prototype.createLinkTag = function (name, cssUrl, externalCallback, externalErrorback) { - var _this = this; - var linkNode = document.createElement('link'); - linkNode.setAttribute('rel', 'stylesheet'); - linkNode.setAttribute('type', 'text/css'); - linkNode.setAttribute('data-name', name); - var callback = function () { return _this._onLoad(name, externalCallback); }; - var errorback = function (err) { return _this._onLoadError(name, externalErrorback, err); }; - this.attachListeners(name, linkNode, callback, errorback); - linkNode.setAttribute('href', cssUrl); - return linkNode; - }; - BrowserCSSLoader.prototype._linkTagExists = function (name, cssUrl) { - var i, len, nameAttr, hrefAttr, links = document.getElementsByTagName('link'); - for (i = 0, len = links.length; i < len; i++) { - nameAttr = links[i].getAttribute('data-name'); - hrefAttr = links[i].getAttribute('href'); - if (nameAttr === name || hrefAttr === cssUrl) { - return true; - } - } - return false; - }; - BrowserCSSLoader.prototype.load = function (name, cssUrl, externalCallback, externalErrorback) { - if (this._linkTagExists(name, cssUrl)) { - externalCallback(); - return; - } - var linkNode = this.createLinkTag(name, cssUrl, externalCallback, externalErrorback); - this._insertLinkNode(linkNode); - }; - return BrowserCSSLoader; - }()); - var NodeCSSLoader = /** @class */ (function () { - function NodeCSSLoader() { - this.fs = require.nodeRequire('fs'); - } - NodeCSSLoader.prototype.load = function (name, cssUrl, externalCallback, externalErrorback) { - var contents = this.fs.readFileSync(cssUrl, 'utf8'); - // Remove BOM - if (contents.charCodeAt(0) === NodeCSSLoader.BOM_CHAR_CODE) { - contents = contents.substring(1); - } - externalCallback(contents); - }; - NodeCSSLoader.BOM_CHAR_CODE = 65279; - return NodeCSSLoader; - }()); - // ------------------------------ Finally, the plugin - var CSSPlugin = /** @class */ (function () { - function CSSPlugin(cssLoader) { - this.cssLoader = cssLoader; - } - CSSPlugin.prototype.load = function (name, req, load, config) { - config = config || {}; - var myConfig = config['vs/css'] || {}; - global.inlineResources = myConfig.inlineResources; - global.inlineResourcesLimit = myConfig.inlineResourcesLimit || 5000; - var cssUrl = req.toUrl(name + '.css'); - this.cssLoader.load(name, cssUrl, function (contents) { - // Contents has the CSS file contents if we are in a build - if (config.isBuild) { - CSSPlugin.BUILD_MAP[name] = contents; - CSSPlugin.BUILD_PATH_MAP[name] = cssUrl; - } - load({}); - }, function (err) { - if (typeof load.error === 'function') { - load.error('Could not find ' + cssUrl + ' or it was empty'); - } - }); - }; - CSSPlugin.prototype.write = function (pluginName, moduleName, write) { - // getEntryPoint is a Monaco extension to r.js - var entryPoint = write.getEntryPoint(); - // r.js destroys the context of this plugin between calling 'write' and 'writeFile' - // so the only option at this point is to leak the data to a global - global.cssPluginEntryPoints = global.cssPluginEntryPoints || {}; - global.cssPluginEntryPoints[entryPoint] = global.cssPluginEntryPoints[entryPoint] || []; - global.cssPluginEntryPoints[entryPoint].push({ - moduleName: moduleName, - contents: CSSPlugin.BUILD_MAP[moduleName], - fsPath: CSSPlugin.BUILD_PATH_MAP[moduleName], - }); - write.asModule(pluginName + '!' + moduleName, 'define([\'vs/css!' + entryPoint + '\'], {});'); - }; - CSSPlugin.prototype.writeFile = function (pluginName, moduleName, req, write, config) { - if (global.cssPluginEntryPoints && global.cssPluginEntryPoints.hasOwnProperty(moduleName)) { - var fileName = req.toUrl(moduleName + '.css'); - var contents = [ - '/*---------------------------------------------------------', - ' * Copyright (c) Microsoft Corporation. All rights reserved.', - ' *--------------------------------------------------------*/' - ], entries = global.cssPluginEntryPoints[moduleName]; - for (var i = 0; i < entries.length; i++) { - if (global.inlineResources) { - contents.push(Utilities.rewriteOrInlineUrls(entries[i].fsPath, entries[i].moduleName, moduleName, entries[i].contents, global.inlineResources === 'base64', global.inlineResourcesLimit)); - } - else { - contents.push(Utilities.rewriteUrls(entries[i].moduleName, moduleName, entries[i].contents)); - } - } - write(fileName, contents.join('\r\n')); - } - }; - CSSPlugin.prototype.getInlinedResources = function () { - return global.cssInlinedResources || []; - }; - CSSPlugin.BUILD_MAP = {}; - CSSPlugin.BUILD_PATH_MAP = {}; - return CSSPlugin; - }()); - CSSBuildLoaderPlugin.CSSPlugin = CSSPlugin; - var Utilities = /** @class */ (function () { - function Utilities() { - } - Utilities.startsWith = function (haystack, needle) { - return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle; - }; - /** - * Find the path of a file. - */ - Utilities.pathOf = function (filename) { - var lastSlash = filename.lastIndexOf('/'); - if (lastSlash !== -1) { - return filename.substr(0, lastSlash + 1); - } - else { - return ''; - } - }; - /** - * A conceptual a + b for paths. - * Takes into account if `a` contains a protocol. - * Also normalizes the result: e.g.: a/b/ + ../c => a/c - */ - Utilities.joinPaths = function (a, b) { - function findSlashIndexAfterPrefix(haystack, prefix) { - if (Utilities.startsWith(haystack, prefix)) { - return Math.max(prefix.length, haystack.indexOf('/', prefix.length)); - } - return 0; - } - var aPathStartIndex = 0; - aPathStartIndex = aPathStartIndex || findSlashIndexAfterPrefix(a, '//'); - aPathStartIndex = aPathStartIndex || findSlashIndexAfterPrefix(a, 'http://'); - aPathStartIndex = aPathStartIndex || findSlashIndexAfterPrefix(a, 'https://'); - function pushPiece(pieces, piece) { - if (piece === './') { - // Ignore - return; - } - if (piece === '../') { - var prevPiece = (pieces.length > 0 ? pieces[pieces.length - 1] : null); - if (prevPiece && prevPiece === '/') { - // Ignore - return; - } - if (prevPiece && prevPiece !== '../') { - // Pop - pieces.pop(); - return; - } - } - // Push - pieces.push(piece); - } - function push(pieces, path) { - while (path.length > 0) { - var slashIndex = path.indexOf('/'); - var piece = (slashIndex >= 0 ? path.substring(0, slashIndex + 1) : path); - path = (slashIndex >= 0 ? path.substring(slashIndex + 1) : ''); - pushPiece(pieces, piece); - } - } - var pieces = []; - push(pieces, a.substr(aPathStartIndex)); - if (b.length > 0 && b.charAt(0) === '/') { - pieces = []; - } - push(pieces, b); - return a.substring(0, aPathStartIndex) + pieces.join(''); - }; - Utilities.commonPrefix = function (str1, str2) { - var len = Math.min(str1.length, str2.length); - for (var i = 0; i < len; i++) { - if (str1.charCodeAt(i) !== str2.charCodeAt(i)) { - break; - } - } - return str1.substring(0, i); - }; - Utilities.commonFolderPrefix = function (fromPath, toPath) { - var prefix = Utilities.commonPrefix(fromPath, toPath); - var slashIndex = prefix.lastIndexOf('/'); - if (slashIndex === -1) { - return ''; - } - return prefix.substring(0, slashIndex + 1); - }; - Utilities.relativePath = function (fromPath, toPath) { - if (Utilities.startsWith(toPath, '/') || Utilities.startsWith(toPath, 'http://') || Utilities.startsWith(toPath, 'https://')) { - return toPath; - } - // Ignore common folder prefix - var prefix = Utilities.commonFolderPrefix(fromPath, toPath); - fromPath = fromPath.substr(prefix.length); - toPath = toPath.substr(prefix.length); - var upCount = fromPath.split('/').length; - var result = ''; - for (var i = 1; i < upCount; i++) { - result += '../'; - } - return result + toPath; - }; - Utilities._replaceURL = function (contents, replacer) { - // Use ")" as the terminator as quotes are oftentimes not used at all - return contents.replace(/url\(\s*([^\)]+)\s*\)?/g, function (_) { - var matches = []; - for (var _i = 1; _i < arguments.length; _i++) { - matches[_i - 1] = arguments[_i]; - } - var url = matches[0]; - // Eliminate starting quotes (the initial whitespace is not captured) - if (url.charAt(0) === '"' || url.charAt(0) === '\'') { - url = url.substring(1); - } - // The ending whitespace is captured - while (url.length > 0 && (url.charAt(url.length - 1) === ' ' || url.charAt(url.length - 1) === '\t')) { - url = url.substring(0, url.length - 1); - } - // Eliminate ending quotes - if (url.charAt(url.length - 1) === '"' || url.charAt(url.length - 1) === '\'') { - url = url.substring(0, url.length - 1); - } - if (!Utilities.startsWith(url, 'data:') && !Utilities.startsWith(url, 'http://') && !Utilities.startsWith(url, 'https://')) { - url = replacer(url); - } - return 'url(' + url + ')'; - }); - }; - Utilities.rewriteUrls = function (originalFile, newFile, contents) { - return this._replaceURL(contents, function (url) { - var absoluteUrl = Utilities.joinPaths(Utilities.pathOf(originalFile), url); - return Utilities.relativePath(newFile, absoluteUrl); - }); - }; - Utilities.rewriteOrInlineUrls = function (originalFileFSPath, originalFile, newFile, contents, forceBase64, inlineByteLimit) { - var fs = require.nodeRequire('fs'); - var path = require.nodeRequire('path'); - return this._replaceURL(contents, function (url) { - if (/\.(svg|png)$/.test(url)) { - var fsPath = path.join(path.dirname(originalFileFSPath), url); - var fileContents = fs.readFileSync(fsPath); - if (fileContents.length < inlineByteLimit) { - global.cssInlinedResources = global.cssInlinedResources || []; - var normalizedFSPath = fsPath.replace(/\\/g, '/'); - if (global.cssInlinedResources.indexOf(normalizedFSPath) >= 0) { - // console.warn('CSS INLINING IMAGE AT ' + fsPath + ' MORE THAN ONCE. CONSIDER CONSOLIDATING CSS RULES'); - } - global.cssInlinedResources.push(normalizedFSPath); - var MIME = /\.svg$/.test(url) ? 'image/svg+xml' : 'image/png'; - var DATA = ';base64,' + fileContents.toString('base64'); - if (!forceBase64 && /\.svg$/.test(url)) { - // .svg => url encode as explained at https://codepen.io/tigt/post/optimizing-svgs-in-data-uris - var newText = fileContents.toString() - .replace(/"/g, '\'') - .replace(/%/g, '%25') - .replace(//g, '%3E') - .replace(/&/g, '%26') - .replace(/#/g, '%23') - .replace(/\s+/g, ' '); - var encodedData = ',' + newText; - if (encodedData.length < DATA.length) { - DATA = encodedData; - } - } - return '"data:' + MIME + DATA + '"'; - } - } - var absoluteUrl = Utilities.joinPaths(Utilities.pathOf(originalFile), url); - return Utilities.relativePath(newFile, absoluteUrl); - }); - }; - return Utilities; - }()); - CSSBuildLoaderPlugin.Utilities = Utilities; - (function () { - var cssLoader = null; - var isElectron = (typeof process !== 'undefined' && typeof process.versions !== 'undefined' && typeof process.versions['electron'] !== 'undefined'); - if (typeof process !== 'undefined' && process.versions && !!process.versions.node && !isElectron) { - cssLoader = new NodeCSSLoader(); - } - else { - cssLoader = new BrowserCSSLoader(); - } - define('vs/css', new CSSPlugin(cssLoader)); - })(); -})(CSSBuildLoaderPlugin || (CSSBuildLoaderPlugin = {})); diff --git a/src/vs/css.build.ts b/src/vs/css.build.ts new file mode 100644 index 00000000000..d4b3fcc96b2 --- /dev/null +++ b/src/vs/css.build.ts @@ -0,0 +1,304 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +interface ICSSPluginConfig { + inlineResources?: boolean | 'base64'; + inlineResourcesLimit?: number; +} + +interface ICSSEntryPointData { + moduleName: string; + contents: string; + fsPath: string; +} + +// This file gets compiled also with the standalone editor, +// so we cannot depend on types from node.d.ts +interface INodeFS { + readFileSync(path: string, encoding: 'utf8'): string; + readFileSync(path: string): INodeBuffer; +} +interface INodeBuffer { + length: number; + toString(encoding?: 'base64'): string; +} +interface INodePath { + dirname(p: string): string; + join(...paths: string[]): string; +} + +const nodeReq = (module: string): T | undefined => { + if (typeof (require).__$__nodeRequire === 'function') { + return (require).__$__nodeRequire(module); + } + return undefined; +}; + +const fs = nodeReq('fs'); +const path = nodeReq('path'); + +let inlineResources: boolean | 'base64' = false; +let inlineResourcesLimit: number = 5000; + +const contentsMap: { [moduleName: string]: string } = {}; +const pathMap: { [moduleName: string]: string } = {}; +const entryPoints: { [entryPoint: string]: ICSSEntryPointData[] } = {}; +const inlinedResources: string[] = []; + +/** + * Invoked by the loader at build-time + */ +export function load(name: string, req: AMDLoader.IRelativeRequire, load: AMDLoader.IPluginLoadCallback, config: AMDLoader.IConfigurationOptions): void { + if (!fs) { + throw new Error(`Cannot load files without 'fs'!`); + } + config = config || {}; + const myConfig = (config['vs/css'] || {}); + inlineResources = (typeof myConfig.inlineResources === 'undefined' ? false : myConfig.inlineResources); + inlineResourcesLimit = (myConfig.inlineResourcesLimit || 5000); + const cssUrl = req.toUrl(name + '.css'); + let contents = fs.readFileSync(cssUrl, 'utf8'); + if (contents.charCodeAt(0) === 65279 /* BOM */) { + // Remove BOM + contents = contents.substring(1); + } + if (config.isBuild) { + contentsMap[name] = contents; + pathMap[name] = cssUrl; + } + load({}); +} + +/** + * Invoked by the loader at build-time + */ +export function write(pluginName: string, moduleName: string, write: AMDLoader.IPluginWriteCallback): void { + const entryPoint = write.getEntryPoint(); + + entryPoints[entryPoint] = entryPoints[entryPoint] || []; + entryPoints[entryPoint].push({ + moduleName: moduleName, + contents: contentsMap[moduleName], + fsPath: pathMap[moduleName], + }); + + write.asModule(pluginName + '!' + moduleName, + 'define([\'vs/css!' + entryPoint + '\'], {});' + ); +} + +/** + * Invoked by the loader at build-time + */ +export function writeFile(pluginName: string, moduleName: string, req: AMDLoader.IRelativeRequire, write: AMDLoader.IPluginWriteFileCallback, config: AMDLoader.IConfigurationOptions): void { + if (entryPoints && entryPoints.hasOwnProperty(moduleName)) { + const fileName = req.toUrl(moduleName + '.css'); + const contents = [ + '/*---------------------------------------------------------', + ' * Copyright (c) Microsoft Corporation. All rights reserved.', + ' *--------------------------------------------------------*/' + ], + entries = entryPoints[moduleName]; + for (let i = 0; i < entries.length; i++) { + if (inlineResources) { + contents.push(rewriteOrInlineUrls(entries[i].fsPath, entries[i].moduleName, moduleName, entries[i].contents, inlineResources === 'base64', inlineResourcesLimit)); + } else { + contents.push(rewriteUrls(entries[i].moduleName, moduleName, entries[i].contents)); + } + } + write(fileName, contents.join('\r\n')); + } +} + +export function getInlinedResources(): string[] { + return inlinedResources || []; +} + +function rewriteOrInlineUrls(originalFileFSPath: string, originalFile: string, newFile: string, contents: string, forceBase64: boolean, inlineByteLimit: number): string { + if (!fs || !path) { + throw new Error(`Cannot rewrite or inline urls without 'fs' or 'path'!`); + } + return CSSPluginUtilities.replaceURL(contents, (url) => { + if (/\.(svg|png)$/.test(url)) { + const fsPath = path.join(path.dirname(originalFileFSPath), url); + const fileContents = fs.readFileSync(fsPath); + + if (fileContents.length < inlineByteLimit) { + const normalizedFSPath = fsPath.replace(/\\/g, '/'); + inlinedResources.push(normalizedFSPath); + + const MIME = /\.svg$/.test(url) ? 'image/svg+xml' : 'image/png'; + let DATA = ';base64,' + fileContents.toString('base64'); + + if (!forceBase64 && /\.svg$/.test(url)) { + // .svg => url encode as explained at https://codepen.io/tigt/post/optimizing-svgs-in-data-uris + const newText = fileContents.toString() + .replace(/"/g, '\'') + .replace(/%/g, '%25') + .replace(//g, '%3E') + .replace(/&/g, '%26') + .replace(/#/g, '%23') + .replace(/\s+/g, ' '); + const encodedData = ',' + newText; + if (encodedData.length < DATA.length) { + DATA = encodedData; + } + } + return '"data:' + MIME + DATA + '"'; + } + } + + const absoluteUrl = CSSPluginUtilities.joinPaths(CSSPluginUtilities.pathOf(originalFile), url); + return CSSPluginUtilities.relativePath(newFile, absoluteUrl); + }); +} + +export function rewriteUrls(originalFile: string, newFile: string, contents: string): string { + return CSSPluginUtilities.replaceURL(contents, (url) => { + const absoluteUrl = CSSPluginUtilities.joinPaths(CSSPluginUtilities.pathOf(originalFile), url); + return CSSPluginUtilities.relativePath(newFile, absoluteUrl); + }); +} + +export class CSSPluginUtilities { + + public static startsWith(haystack: string, needle: string): boolean { + return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle; + } + + /** + * Find the path of a file. + */ + public static pathOf(filename: string): string { + const lastSlash = filename.lastIndexOf('/'); + if (lastSlash !== -1) { + return filename.substr(0, lastSlash + 1); + } else { + return ''; + } + } + + /** + * A conceptual a + b for paths. + * Takes into account if `a` contains a protocol. + * Also normalizes the result: e.g.: a/b/ + ../c => a/c + */ + public static joinPaths(a: string, b: string): string { + + function findSlashIndexAfterPrefix(haystack: string, prefix: string): number { + if (CSSPluginUtilities.startsWith(haystack, prefix)) { + return Math.max(prefix.length, haystack.indexOf('/', prefix.length)); + } + return 0; + } + + let aPathStartIndex = 0; + aPathStartIndex = aPathStartIndex || findSlashIndexAfterPrefix(a, '//'); + aPathStartIndex = aPathStartIndex || findSlashIndexAfterPrefix(a, 'http://'); + aPathStartIndex = aPathStartIndex || findSlashIndexAfterPrefix(a, 'https://'); + + function pushPiece(pieces: string[], piece: string): void { + if (piece === './') { + // Ignore + return; + } + if (piece === '../') { + const prevPiece = (pieces.length > 0 ? pieces[pieces.length - 1] : null); + if (prevPiece && prevPiece === '/') { + // Ignore + return; + } + if (prevPiece && prevPiece !== '../') { + // Pop + pieces.pop(); + return; + } + } + // Push + pieces.push(piece); + } + + function push(pieces: string[], path: string): void { + while (path.length > 0) { + const slashIndex = path.indexOf('/'); + const piece = (slashIndex >= 0 ? path.substring(0, slashIndex + 1) : path); + path = (slashIndex >= 0 ? path.substring(slashIndex + 1) : ''); + pushPiece(pieces, piece); + } + } + + let pieces: string[] = []; + push(pieces, a.substr(aPathStartIndex)); + if (b.length > 0 && b.charAt(0) === '/') { + pieces = []; + } + push(pieces, b); + + return a.substring(0, aPathStartIndex) + pieces.join(''); + } + + public static commonPrefix(str1: string, str2: string): string { + const len = Math.min(str1.length, str2.length); + for (let i = 0; i < len; i++) { + if (str1.charCodeAt(i) !== str2.charCodeAt(i)) { + return str1.substring(0, i); + } + } + return str1.substring(0, len); + } + + public static commonFolderPrefix(fromPath: string, toPath: string): string { + const prefix = CSSPluginUtilities.commonPrefix(fromPath, toPath); + const slashIndex = prefix.lastIndexOf('/'); + if (slashIndex === -1) { + return ''; + } + return prefix.substring(0, slashIndex + 1); + } + + public static relativePath(fromPath: string, toPath: string): string { + if (CSSPluginUtilities.startsWith(toPath, '/') || CSSPluginUtilities.startsWith(toPath, 'http://') || CSSPluginUtilities.startsWith(toPath, 'https://')) { + return toPath; + } + + // Ignore common folder prefix + const prefix = CSSPluginUtilities.commonFolderPrefix(fromPath, toPath); + fromPath = fromPath.substr(prefix.length); + toPath = toPath.substr(prefix.length); + + const upCount = fromPath.split('/').length; + let result = ''; + for (let i = 1; i < upCount; i++) { + result += '../'; + } + return result + toPath; + } + + public static replaceURL(contents: string, replacer: (url: string) => string): string { + // Use ")" as the terminator as quotes are oftentimes not used at all + return contents.replace(/url\(\s*([^\)]+)\s*\)?/g, (_: string, ...matches: string[]) => { + let url = matches[0]; + // Eliminate starting quotes (the initial whitespace is not captured) + if (url.charAt(0) === '"' || url.charAt(0) === '\'') { + url = url.substring(1); + } + // The ending whitespace is captured + while (url.length > 0 && (url.charAt(url.length - 1) === ' ' || url.charAt(url.length - 1) === '\t')) { + url = url.substring(0, url.length - 1); + } + // Eliminate ending quotes + if (url.charAt(url.length - 1) === '"' || url.charAt(url.length - 1) === '\'') { + url = url.substring(0, url.length - 1); + } + + if (!CSSPluginUtilities.startsWith(url, 'data:') && !CSSPluginUtilities.startsWith(url, 'http://') && !CSSPluginUtilities.startsWith(url, 'https://')) { + url = replacer(url); + } + + return 'url(' + url + ')'; + }); + } +} diff --git a/src/vs/css.js b/src/vs/css.js deleted file mode 100644 index 8a0f9912902..00000000000 --- a/src/vs/css.js +++ /dev/null @@ -1,111 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -/*--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------- - * Please make sure to make edits in the .ts file at https://github.com/microsoft/vscode-loader/ - *--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------- - *--------------------------------------------------------------------------------------------*/ -'use strict'; -var CSSLoaderPlugin; -(function (CSSLoaderPlugin) { - var BrowserCSSLoader = /** @class */ (function () { - function BrowserCSSLoader() { - this._pendingLoads = 0; - } - BrowserCSSLoader.prototype.attachListeners = function (name, linkNode, callback, errorback) { - var unbind = function () { - linkNode.removeEventListener('load', loadEventListener); - linkNode.removeEventListener('error', errorEventListener); - }; - var loadEventListener = function (e) { - unbind(); - callback(); - }; - var errorEventListener = function (e) { - unbind(); - errorback(e); - }; - linkNode.addEventListener('load', loadEventListener); - linkNode.addEventListener('error', errorEventListener); - }; - BrowserCSSLoader.prototype._onLoad = function (name, callback) { - this._pendingLoads--; - callback(); - }; - BrowserCSSLoader.prototype._onLoadError = function (name, errorback, err) { - this._pendingLoads--; - errorback(err); - }; - BrowserCSSLoader.prototype._insertLinkNode = function (linkNode) { - this._pendingLoads++; - var head = document.head || document.getElementsByTagName('head')[0]; - head.appendChild(linkNode); - }; - BrowserCSSLoader.prototype.createLinkTag = function (name, cssUrl, externalCallback, externalErrorback) { - var _this = this; - var linkNode = document.createElement('link'); - linkNode.setAttribute('rel', 'stylesheet'); - linkNode.setAttribute('type', 'text/css'); - linkNode.setAttribute('data-name', name); - var callback = function () { return _this._onLoad(name, externalCallback); }; - var errorback = function (err) { return _this._onLoadError(name, externalErrorback, err); }; - this.attachListeners(name, linkNode, callback, errorback); - linkNode.setAttribute('href', cssUrl); - return linkNode; - }; - BrowserCSSLoader.prototype._linkTagExists = function (name, cssUrl) { - var i, len, nameAttr, hrefAttr, links = document.getElementsByTagName('link'); - for (i = 0, len = links.length; i < len; i++) { - nameAttr = links[i].getAttribute('data-name'); - hrefAttr = links[i].getAttribute('href'); - if (nameAttr === name || hrefAttr === cssUrl) { - return true; - } - } - return false; - }; - BrowserCSSLoader.prototype.load = function (name, cssUrl, externalCallback, externalErrorback) { - if (this._linkTagExists(name, cssUrl)) { - externalCallback(); - return; - } - var linkNode = this.createLinkTag(name, cssUrl, externalCallback, externalErrorback); - this._insertLinkNode(linkNode); - }; - return BrowserCSSLoader; - }()); - // ------------------------------ Finally, the plugin - var CSSPlugin = /** @class */ (function () { - function CSSPlugin() { - this._cssLoader = new BrowserCSSLoader(); - } - CSSPlugin.prototype.load = function (name, req, load, config) { - config = config || {}; - var cssConfig = config['vs/css'] || {}; - if (cssConfig.disabled) { - // the plugin is asked to not create any style sheets - load({}); - return; - } - var cssUrl = req.toUrl(name + '.css'); - this._cssLoader.load(name, cssUrl, function (contents) { - load({}); - }, function (err) { - if (typeof load.error === 'function') { - load.error('Could not find ' + cssUrl + ' or it was empty'); - } - }); - }; - return CSSPlugin; - }()); - CSSLoaderPlugin.CSSPlugin = CSSPlugin; - define('vs/css', new CSSPlugin()); -})(CSSLoaderPlugin || (CSSLoaderPlugin = {})); diff --git a/src/vs/css.ts b/src/vs/css.ts new file mode 100644 index 00000000000..4a5ea48d174 --- /dev/null +++ b/src/vs/css.ts @@ -0,0 +1,81 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +interface ICSSPluginConfig { + disabled?: boolean; +} + +/** + * Invoked by the loader at run-time + */ +export function load(name: string, req: AMDLoader.IRelativeRequire, load: AMDLoader.IPluginLoadCallback, config: AMDLoader.IConfigurationOptions): void { + config = config || {}; + const cssConfig = (config['vs/css'] || {}); + + if (cssConfig.disabled) { + // the plugin is asked to not create any style sheets + load({}); + return; + } + + const cssUrl = req.toUrl(name + '.css'); + loadCSS(name, cssUrl, () => { + load({}); + }, (err: any) => { + if (typeof load.error === 'function') { + load.error('Could not find ' + cssUrl + '.'); + } + }); +} + +function loadCSS(name: string, cssUrl: string, callback: () => void, errorback: (err: any) => void): void { + if (linkTagExists(name, cssUrl)) { + callback(); + return; + } + createLinkTag(name, cssUrl, callback, errorback); +} + +function linkTagExists(name: string, cssUrl: string): boolean { + const links = document.getElementsByTagName('link'); + for (let i = 0, len = links.length; i < len; i++) { + const nameAttr = links[i].getAttribute('data-name'); + const hrefAttr = links[i].getAttribute('href'); + if (nameAttr === name || hrefAttr === cssUrl) { + return true; + } + } + return false; +} + +function createLinkTag(name: string, cssUrl: string, callback: () => void, errorback: (err: any) => void): void { + const linkNode = document.createElement('link'); + linkNode.setAttribute('rel', 'stylesheet'); + linkNode.setAttribute('type', 'text/css'); + linkNode.setAttribute('data-name', name); + + attachListeners(name, linkNode, callback, errorback); + linkNode.setAttribute('href', cssUrl); + + const head = document.head || document.getElementsByTagName('head')[0]; + head.appendChild(linkNode); +} + +function attachListeners(name: string, linkNode: HTMLLinkElement, callback: () => void, errorback: (err: any) => void): void { + const unbind = () => { + linkNode.removeEventListener('load', loadEventListener); + linkNode.removeEventListener('error', errorEventListener); + }; + const loadEventListener = (e: any) => { + unbind(); + callback(); + }; + const errorEventListener = (e: any) => { + unbind(); + errorback(e); + }; + linkNode.addEventListener('load', loadEventListener); + linkNode.addEventListener('error', errorEventListener); +} diff --git a/src/vs/editor/browser/config/domFontInfo.ts b/src/vs/editor/browser/config/domFontInfo.ts index 96c7021e53b..75982616f0c 100644 --- a/src/vs/editor/browser/config/domFontInfo.ts +++ b/src/vs/editor/browser/config/domFontInfo.ts @@ -3,21 +3,19 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as browser from 'vs/base/browser/browser'; import { FastDomNode } from 'vs/base/browser/fastDomNode'; -import { EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions'; import { BareFontInfo } from 'vs/editor/common/config/fontInfo'; export function applyFontInfo(domNode: FastDomNode | HTMLElement, fontInfo: BareFontInfo): void { if (domNode instanceof FastDomNode) { - domNode.setFontFamily(fontInfo.getMassagedFontFamily(browser.isSafari ? EDITOR_FONT_DEFAULTS.fontFamily : null)); + domNode.setFontFamily(fontInfo.getMassagedFontFamily()); domNode.setFontWeight(fontInfo.fontWeight); domNode.setFontSize(fontInfo.fontSize); domNode.setFontFeatureSettings(fontInfo.fontFeatureSettings); domNode.setLineHeight(fontInfo.lineHeight); domNode.setLetterSpacing(fontInfo.letterSpacing); } else { - domNode.style.fontFamily = fontInfo.getMassagedFontFamily(browser.isSafari ? EDITOR_FONT_DEFAULTS.fontFamily : null); + domNode.style.fontFamily = fontInfo.getMassagedFontFamily(); domNode.style.fontWeight = fontInfo.fontWeight; domNode.style.fontSize = fontInfo.fontSize + 'px'; domNode.style.fontFeatureSettings = fontInfo.fontFeatureSettings; diff --git a/src/vs/editor/browser/config/fontMeasurements.ts b/src/vs/editor/browser/config/fontMeasurements.ts index 39e1737cd33..00dde46dcc9 100644 --- a/src/vs/editor/browser/config/fontMeasurements.ts +++ b/src/vs/editor/browser/config/fontMeasurements.ts @@ -149,9 +149,7 @@ class FontMeasurementsImpl extends Disposable { private _createRequest(chr: string, type: CharWidthRequestType, all: CharWidthRequest[], monospace: CharWidthRequest[] | null): CharWidthRequest { const result = new CharWidthRequest(chr, type); all.push(result); - if (monospace) { - monospace.push(result); - } + monospace?.push(result); return result; } diff --git a/src/vs/editor/browser/config/migrateOptions.ts b/src/vs/editor/browser/config/migrateOptions.ts index 49d6a503a84..84abd167ef6 100644 --- a/src/vs/editor/browser/config/migrateOptions.ts +++ b/src/vs/editor/browser/config/migrateOptions.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { forEach } from 'vs/base/common/collections'; import { IEditorOptions } from 'vs/editor/common/config/editorOptions'; export interface ISettingsReader { @@ -152,14 +151,14 @@ const suggestFilteredTypesMapping: Record = { registerEditorSettingMigration('suggest.filteredTypes', (value, read, write) => { if (value && typeof value === 'object') { - forEach(suggestFilteredTypesMapping, entry => { - const v = value[entry.key]; + for (const entry of Object.entries(suggestFilteredTypesMapping)) { + const v = value[entry[0]]; if (v === false) { - if (typeof read(`suggest.${entry.value}`) === 'undefined') { - write(`suggest.${entry.value}`, false); + if (typeof read(`suggest.${entry[1]}`) === 'undefined') { + write(`suggest.${entry[1]}`, false); } } - }); + } write('suggest.filteredTypes', undefined); } }); @@ -171,3 +170,23 @@ registerEditorSettingMigration('quickSuggestions', (input, read, write) => { write('quickSuggestions', newValue); } }); + +// Sticky Scroll + +registerEditorSettingMigration('experimental.stickyScroll.enabled', (value, read, write) => { + if (typeof value === 'boolean') { + write('experimental.stickyScroll.enabled', undefined); + if (typeof read('stickyScroll.enabled') === 'undefined') { + write('stickyScroll.enabled', value); + } + } +}); + +registerEditorSettingMigration('experimental.stickyScroll.maxLineCount', (value, read, write) => { + if (typeof value === 'number') { + write('experimental.stickyScroll.maxLineCount', undefined); + if (typeof read('stickyScroll.maxLineCount') === 'undefined') { + write('stickyScroll.maxLineCount', value); + } + } +}); diff --git a/src/vs/editor/browser/controller/mouseHandler.ts b/src/vs/editor/browser/controller/mouseHandler.ts index 29fa0e33b6a..bf3f85382cb 100644 --- a/src/vs/editor/browser/controller/mouseHandler.ts +++ b/src/vs/editor/browser/controller/mouseHandler.ts @@ -5,12 +5,11 @@ import * as dom from 'vs/base/browser/dom'; import { StandardWheelEvent, IMouseWheelEvent } from 'vs/base/browser/mouseEvent'; -import { TimeoutTimer } from 'vs/base/common/async'; -import { Disposable } from 'vs/base/common/lifecycle'; +import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; import * as platform from 'vs/base/common/platform'; import { HitTestContext, MouseTarget, MouseTargetFactory, PointerHandlerLastRenderData } from 'vs/editor/browser/controller/mouseTarget'; -import { IMouseTarget, IMouseTargetViewZoneData, MouseTargetType } from 'vs/editor/browser/editorBrowser'; -import { ClientCoordinates, EditorMouseEvent, EditorMouseEventFactory, GlobalEditorPointerMoveMonitor, createEditorPagePosition, createCoordinatesRelativeToEditor } from 'vs/editor/browser/editorDom'; +import { IMouseTarget, IMouseTargetOutsideEditor, IMouseTargetViewZoneData, MouseTargetType } from 'vs/editor/browser/editorBrowser'; +import { ClientCoordinates, EditorMouseEvent, EditorMouseEventFactory, GlobalEditorPointerMoveMonitor, createEditorPagePosition, createCoordinatesRelativeToEditor, PageCoordinates } from 'vs/editor/browser/editorDom'; import { ViewController } from 'vs/editor/browser/view/viewController'; import { EditorZoom } from 'vs/editor/common/config/editorZoom'; import { Position } from 'vs/editor/common/core/position'; @@ -20,6 +19,7 @@ import { ViewContext } from 'vs/editor/common/viewModel/viewContext'; import * as viewEvents from 'vs/editor/common/viewEvents'; import { ViewEventHandler } from 'vs/editor/common/viewEventHandler'; import { EditorOption } from 'vs/editor/common/config/editorOptions'; +import { NavigationCommandRevealType } from 'vs/editor/browser/coreCommands'; export interface IPointerHandlerHelper { viewDomNode: HTMLElement; @@ -34,6 +34,11 @@ export interface IPointerHandlerHelper { */ getLastRenderData(): PointerHandlerLastRenderData; + /** + * Render right now + */ + renderNow(): void; + shouldSuppressMouseDownOnViewZone(viewZoneId: string): boolean; shouldSuppressMouseDownOnWidget(widgetId: string): boolean; @@ -55,6 +60,7 @@ export class MouseHandler extends ViewEventHandler { protected readonly _mouseDownOperation: MouseDownOperation; private lastMouseLeaveTime: number; private _height: number; + private _mouseLeaveMonitor: IDisposable | null = null; constructor(context: ViewContext, viewController: ViewController, viewHelper: IPointerHandlerHelper) { super(); @@ -68,6 +74,7 @@ export class MouseHandler extends ViewEventHandler { this._context, this.viewController, this.viewHelper, + this.mouseTargetFactory, (e, testEventTarget) => this._createMouseTarget(e, testEventTarget), (e) => this._getMouseColumn(e) )); @@ -79,7 +86,25 @@ export class MouseHandler extends ViewEventHandler { this._register(mouseEvents.onContextMenu(this.viewHelper.viewDomNode, (e) => this._onContextMenu(e, true))); - this._register(mouseEvents.onMouseMove(this.viewHelper.viewDomNode, (e) => this._onMouseMove(e))); + this._register(mouseEvents.onMouseMove(this.viewHelper.viewDomNode, (e) => { + this._onMouseMove(e); + + // See https://github.com/microsoft/vscode/issues/138789 + // When moving the mouse really quickly, the browser sometimes forgets to + // send us a `mouseleave` or `mouseout` event. We therefore install here + // a global `mousemove` listener to manually recover if the mouse goes outside + // the editor. As soon as the mouse leaves outside of the editor, we + // remove this listener + + if (!this._mouseLeaveMonitor) { + this._mouseLeaveMonitor = dom.addDisposableListener(document, 'mousemove', (e) => { + if (!this.viewHelper.viewDomNode.contains(e.target as Node | null)) { + // went outside the editor! + this._onMouseLeave(new EditorMouseEvent(e, false, this.viewHelper.viewDomNode)); + } + }); + } + })); this._register(mouseEvents.onMouseUp(this.viewHelper.viewDomNode, (e) => this._onMouseUp(e))); @@ -132,6 +157,10 @@ export class MouseHandler extends ViewEventHandler { public override dispose(): void { this._context.removeEventHandler(this); + if (this._mouseLeaveMonitor) { + this._mouseLeaveMonitor.dispose(); + this._mouseLeaveMonitor = null; + } super.dispose(); } @@ -154,10 +183,6 @@ export class MouseHandler extends ViewEventHandler { public override onFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean { return false; } - public override onScrollChanged(e: viewEvents.ViewScrollChangedEvent): boolean { - this._mouseDownOperation.onScrollChanged(); - return false; - } // --- end event handlers public getTargetAtClientPoint(clientX: number, clientY: number): IMouseTarget | null { @@ -220,6 +245,10 @@ export class MouseHandler extends ViewEventHandler { } public _onMouseLeave(e: EditorMouseEvent): void { + if (this._mouseLeaveMonitor) { + this._mouseLeaveMonitor.dispose(); + this._mouseLeaveMonitor = null; + } this.lastMouseLeaveTime = (new Date()).getTime(); this.viewController.emitMouseLeave({ event: e, @@ -286,14 +315,11 @@ export class MouseHandler extends ViewEventHandler { class MouseDownOperation extends Disposable { - private readonly _context: ViewContext; - private readonly _viewController: ViewController; - private readonly _viewHelper: IPointerHandlerHelper; private readonly _createMouseTarget: (e: EditorMouseEvent, testEventTarget: boolean) => IMouseTarget; private readonly _getMouseColumn: (e: EditorMouseEvent) => number; private readonly _mouseMoveMonitor: GlobalEditorPointerMoveMonitor; - private readonly _onScrollTimeout: TimeoutTimer; + private readonly _topBottomDragScrolling: TopBottomDragScrolling; private readonly _mouseState: MouseDownState; private _currentSelection: Selection; @@ -301,21 +327,24 @@ class MouseDownOperation extends Disposable { private _lastMouseEvent: EditorMouseEvent | null; constructor( - context: ViewContext, - viewController: ViewController, - viewHelper: IPointerHandlerHelper, + private readonly _context: ViewContext, + private readonly _viewController: ViewController, + private readonly _viewHelper: IPointerHandlerHelper, + private readonly _mouseTargetFactory: MouseTargetFactory, createMouseTarget: (e: EditorMouseEvent, testEventTarget: boolean) => IMouseTarget, getMouseColumn: (e: EditorMouseEvent) => number ) { super(); - this._context = context; - this._viewController = viewController; - this._viewHelper = viewHelper; this._createMouseTarget = createMouseTarget; this._getMouseColumn = getMouseColumn; this._mouseMoveMonitor = this._register(new GlobalEditorPointerMoveMonitor(this._viewHelper.viewDomNode)); - this._onScrollTimeout = this._register(new TimeoutTimer()); + this._topBottomDragScrolling = this._register(new TopBottomDragScrolling( + this._context, + this._viewHelper, + this._mouseTargetFactory, + (position, inSelectionMode, revealType) => this._dispatchMouse(position, inSelectionMode, revealType) + )); this._mouseState = new MouseDownState(); this._currentSelection = new Selection(1, 1, 1, 1); @@ -347,7 +376,12 @@ class MouseDownOperation extends Disposable { target: position }); } else { - this._dispatchMouse(position, true); + if (position.type === MouseTargetType.OUTSIDE_EDITOR && (position.outsidePosition === 'above' || position.outsidePosition === 'below')) { + this._topBottomDragScrolling.start(position, e); + } else { + this._topBottomDragScrolling.stop(); + this._dispatchMouse(position, true, NavigationCommandRevealType.Minimal); + } } } @@ -409,7 +443,7 @@ class MouseDownOperation extends Disposable { } this._mouseState.isDragAndDrop = false; - this._dispatchMouse(position, e.shiftKey); + this._dispatchMouse(position, e.shiftKey, NavigationCommandRevealType.Minimal); if (!this._isActive) { this._isActive = true; @@ -425,7 +459,7 @@ class MouseDownOperation extends Disposable { private _stop(): void { this._isActive = false; - this._onScrollTimeout.cancel(); + this._topBottomDragScrolling.stop(); } public onHeightChanged(): void { @@ -436,27 +470,6 @@ class MouseDownOperation extends Disposable { this._mouseMoveMonitor.stopMonitoring(); } - public onScrollChanged(): void { - if (!this._isActive) { - return; - } - this._onScrollTimeout.setIfNotSet(() => { - if (!this._lastMouseEvent) { - return; - } - const position = this._findMousePosition(this._lastMouseEvent, false); - if (!position) { - // Ignoring because position is unknown - return; - } - if (this._mouseState.isDragAndDrop) { - // Ignoring because users are dragging the text - return; - } - this._dispatchMouse(position, true); - }, 10); - } - public onCursorStateChanged(e: viewEvents.ViewCursorStateChangedEvent): void { this._currentSelection = e.selections[0]; } @@ -469,41 +482,45 @@ class MouseDownOperation extends Disposable { const mouseColumn = this._getMouseColumn(e); if (e.posy < editorContent.y) { - const verticalOffset = Math.max(viewLayout.getCurrentScrollTop() - (editorContent.y - e.posy), 0); + const outsideDistance = editorContent.y - e.posy; + const verticalOffset = Math.max(viewLayout.getCurrentScrollTop() - outsideDistance, 0); const viewZoneData = HitTestContext.getZoneAtCoord(this._context, verticalOffset); if (viewZoneData) { const newPosition = this._helpPositionJumpOverViewZone(viewZoneData); if (newPosition) { - return MouseTarget.createOutsideEditor(mouseColumn, newPosition); + return MouseTarget.createOutsideEditor(mouseColumn, newPosition, 'above', outsideDistance); } } const aboveLineNumber = viewLayout.getLineNumberAtVerticalOffset(verticalOffset); - return MouseTarget.createOutsideEditor(mouseColumn, new Position(aboveLineNumber, 1)); + return MouseTarget.createOutsideEditor(mouseColumn, new Position(aboveLineNumber, 1), 'above', outsideDistance); } if (e.posy > editorContent.y + editorContent.height) { + const outsideDistance = e.posy - editorContent.y - editorContent.height; const verticalOffset = viewLayout.getCurrentScrollTop() + e.relativePos.y; const viewZoneData = HitTestContext.getZoneAtCoord(this._context, verticalOffset); if (viewZoneData) { const newPosition = this._helpPositionJumpOverViewZone(viewZoneData); if (newPosition) { - return MouseTarget.createOutsideEditor(mouseColumn, newPosition); + return MouseTarget.createOutsideEditor(mouseColumn, newPosition, 'below', outsideDistance); } } const belowLineNumber = viewLayout.getLineNumberAtVerticalOffset(verticalOffset); - return MouseTarget.createOutsideEditor(mouseColumn, new Position(belowLineNumber, model.getLineMaxColumn(belowLineNumber))); + return MouseTarget.createOutsideEditor(mouseColumn, new Position(belowLineNumber, model.getLineMaxColumn(belowLineNumber)), 'below', outsideDistance); } const possibleLineNumber = viewLayout.getLineNumberAtVerticalOffset(viewLayout.getCurrentScrollTop() + e.relativePos.y); if (e.posx < editorContent.x) { - return MouseTarget.createOutsideEditor(mouseColumn, new Position(possibleLineNumber, 1)); + const outsideDistance = editorContent.x - e.posx; + return MouseTarget.createOutsideEditor(mouseColumn, new Position(possibleLineNumber, 1), 'left', outsideDistance); } if (e.posx > editorContent.x + editorContent.width) { - return MouseTarget.createOutsideEditor(mouseColumn, new Position(possibleLineNumber, model.getLineMaxColumn(possibleLineNumber))); + const outsideDistance = e.posx - editorContent.x - editorContent.width; + return MouseTarget.createOutsideEditor(mouseColumn, new Position(possibleLineNumber, model.getLineMaxColumn(possibleLineNumber)), 'right', outsideDistance); } return null; @@ -547,7 +564,7 @@ class MouseDownOperation extends Disposable { return null; } - private _dispatchMouse(position: IMouseTarget, inSelectionMode: boolean): void { + private _dispatchMouse(position: IMouseTarget, inSelectionMode: boolean, revealType: NavigationCommandRevealType): void { if (!position.position) { return; } @@ -555,6 +572,7 @@ class MouseDownOperation extends Disposable { position: position.position, mouseColumn: position.mouseColumn, startedOnLineNumbers: this._mouseState.startedOnLineNumbers, + revealType, inSelectionMode: inSelectionMode, mouseDownCount: this._mouseState.count, @@ -571,6 +589,134 @@ class MouseDownOperation extends Disposable { } } +class TopBottomDragScrolling extends Disposable { + + private _operation: TopBottomDragScrollingOperation | null; + + constructor( + private readonly _context: ViewContext, + private readonly _viewHelper: IPointerHandlerHelper, + private readonly _mouseTargetFactory: MouseTargetFactory, + private readonly _dispatchMouse: (position: IMouseTarget, inSelectionMode: boolean, revealType: NavigationCommandRevealType) => void, + ) { + super(); + this._operation = null; + } + + public override dispose(): void { + super.dispose(); + this.stop(); + } + + public start(position: IMouseTargetOutsideEditor, mouseEvent: EditorMouseEvent): void { + if (this._operation) { + this._operation.setPosition(position, mouseEvent); + } else { + this._operation = new TopBottomDragScrollingOperation(this._context, this._viewHelper, this._mouseTargetFactory, this._dispatchMouse, position, mouseEvent); + } + } + + public stop(): void { + if (this._operation) { + this._operation.dispose(); + this._operation = null; + } + } +} + +class TopBottomDragScrollingOperation extends Disposable { + + private _position: IMouseTargetOutsideEditor; + private _mouseEvent: EditorMouseEvent; + private _lastTime: number; + private _animationFrameDisposable: IDisposable; + + constructor( + private readonly _context: ViewContext, + private readonly _viewHelper: IPointerHandlerHelper, + private readonly _mouseTargetFactory: MouseTargetFactory, + private readonly _dispatchMouse: (position: IMouseTarget, inSelectionMode: boolean, revealType: NavigationCommandRevealType) => void, + position: IMouseTargetOutsideEditor, + mouseEvent: EditorMouseEvent + ) { + super(); + this._position = position; + this._mouseEvent = mouseEvent; + this._lastTime = Date.now(); + this._animationFrameDisposable = dom.scheduleAtNextAnimationFrame(() => this._execute()); + } + + public override dispose(): void { + this._animationFrameDisposable.dispose(); + } + + public setPosition(position: IMouseTargetOutsideEditor, mouseEvent: EditorMouseEvent): void { + this._position = position; + this._mouseEvent = mouseEvent; + } + + /** + * update internal state and return elapsed ms since last time + */ + private _tick(): number { + const now = Date.now(); + const elapsed = now - this._lastTime; + this._lastTime = now; + return elapsed; + } + + /** + * get the number of lines per second to auto-scroll + */ + private _getScrollSpeed(): number { + const lineHeight = this._context.configuration.options.get(EditorOption.lineHeight); + const viewportInLines = this._context.configuration.options.get(EditorOption.layoutInfo).height / lineHeight; + const outsideDistanceInLines = this._position.outsideDistance / lineHeight; + + if (outsideDistanceInLines <= 1.5) { + return Math.max(30, viewportInLines * (1 + outsideDistanceInLines)); + } + if (outsideDistanceInLines <= 3) { + return Math.max(60, viewportInLines * (2 + outsideDistanceInLines)); + } + return Math.max(200, viewportInLines * (7 + outsideDistanceInLines)); + } + + private _execute(): void { + const lineHeight = this._context.configuration.options.get(EditorOption.lineHeight); + const scrollSpeedInLines = this._getScrollSpeed(); + const elapsed = this._tick(); + const scrollInPixels = scrollSpeedInLines * (elapsed / 1000) * lineHeight; + const scrollValue = (this._position.outsidePosition === 'above' ? -scrollInPixels : scrollInPixels); + + this._context.viewModel.viewLayout.deltaScrollNow(0, scrollValue); + this._viewHelper.renderNow(); + + const viewportData = this._context.viewLayout.getLinesViewportData(); + const edgeLineNumber = (this._position.outsidePosition === 'above' ? viewportData.startLineNumber : viewportData.endLineNumber); + + // First, try to find a position that matches the horizontal position of the mouse + let mouseTarget: IMouseTarget; + { + const editorPos = createEditorPagePosition(this._viewHelper.viewDomNode); + const horizontalScrollbarHeight = this._context.configuration.options.get(EditorOption.layoutInfo).horizontalScrollbarHeight; + const pos = new PageCoordinates(this._mouseEvent.pos.x, editorPos.y + editorPos.height - horizontalScrollbarHeight - 0.1); + const relativePos = createCoordinatesRelativeToEditor(this._viewHelper.viewDomNode, editorPos, pos); + mouseTarget = this._mouseTargetFactory.createMouseTarget(this._viewHelper.getLastRenderData(), editorPos, pos, relativePos, null); + } + if (!mouseTarget.position || mouseTarget.position.lineNumber !== edgeLineNumber) { + if (this._position.outsidePosition === 'above') { + mouseTarget = MouseTarget.createOutsideEditor(this._position.mouseColumn, new Position(edgeLineNumber, 1), 'above', this._position.outsideDistance); + } else { + mouseTarget = MouseTarget.createOutsideEditor(this._position.mouseColumn, new Position(edgeLineNumber, this._context.viewModel.getLineMaxColumn(edgeLineNumber)), 'below', this._position.outsideDistance); + } + } + + this._dispatchMouse(mouseTarget, true, NavigationCommandRevealType.None); + this._animationFrameDisposable = dom.scheduleAtNextAnimationFrame(() => this._execute()); + } +} + class MouseDownState { private static readonly CLEAR_MOUSE_DOWN_COUNT_TIME = 400; // ms diff --git a/src/vs/editor/browser/controller/mouseTarget.ts b/src/vs/editor/browser/controller/mouseTarget.ts index 08edad1d7fd..90979f1027a 100644 --- a/src/vs/editor/browser/controller/mouseTarget.ts +++ b/src/vs/editor/browser/controller/mouseTarget.ts @@ -99,8 +99,8 @@ export class MouseTarget { public static createOverlayWidget(element: Element | null, mouseColumn: number, detail: string): IMouseTargetOverlayWidget { return { type: MouseTargetType.OVERLAY_WIDGET, element, mouseColumn, position: null, range: null, detail }; } - public static createOutsideEditor(mouseColumn: number, position: Position): IMouseTargetOutsideEditor { - return { type: MouseTargetType.OUTSIDE_EDITOR, element: null, mouseColumn, position, range: this._deduceRage(position) }; + public static createOutsideEditor(mouseColumn: number, position: Position, outsidePosition: 'above' | 'below' | 'left' | 'right', outsideDistance: number): IMouseTargetOutsideEditor { + return { type: MouseTargetType.OUTSIDE_EDITOR, element: null, mouseColumn, position, range: this._deduceRage(position), outsidePosition, outsideDistance }; } private static _typeToString(type: MouseTargetType): string { @@ -823,7 +823,21 @@ export class MouseTargetFactory { const curr = points[i]; if (prev.offset <= request.mouseContentHorizontalOffset && request.mouseContentHorizontalOffset <= curr.offset) { const rng = new EditorRange(lineNumber, prev.column, lineNumber, curr.column); - return request.fulfillContentText(pos, rng, { mightBeForeignElement: !mouseIsOverSpanNode || !!injectedText, injectedText }); + + // See https://github.com/microsoft/vscode/issues/152819 + // Due to the use of zwj, the browser's hit test result is skewed towards the left + // Here we try to correct that if the mouse horizontal offset is closer to the right than the left + + const prevDelta = Math.abs(prev.offset - request.mouseContentHorizontalOffset); + const nextDelta = Math.abs(curr.offset - request.mouseContentHorizontalOffset); + + const resultPos = ( + prevDelta < nextDelta + ? new Position(lineNumber, prev.column) + : new Position(lineNumber, curr.column) + ); + + return request.fulfillContentText(resultPos, rng, { mightBeForeignElement: !mouseIsOverSpanNode || !!injectedText, injectedText }); } } return request.fulfillContentText(pos, null, { mightBeForeignElement: !mouseIsOverSpanNode || !!injectedText, injectedText }); @@ -837,22 +851,31 @@ export class MouseTargetFactory { // In Chrome, especially on Linux it is possible to click between lines, // so try to adjust the `hity` below so that it lands in the center of a line const lineNumber = ctx.getLineNumberAtVerticalOffset(request.mouseVerticalOffset); - const lineVerticalOffset = ctx.getVerticalOffsetForLineNumber(lineNumber); - const lineCenteredVerticalOffset = lineVerticalOffset + Math.floor(ctx.lineHeight / 2); - let adjustedPageY = request.pos.y + (lineCenteredVerticalOffset - request.mouseVerticalOffset); + const lineStartVerticalOffset = ctx.getVerticalOffsetForLineNumber(lineNumber); + const lineEndVerticalOffset = lineStartVerticalOffset + ctx.lineHeight; - if (adjustedPageY <= request.editorPos.y) { - adjustedPageY = request.editorPos.y + 1; - } - if (adjustedPageY >= request.editorPos.y + request.editorPos.height) { - adjustedPageY = request.editorPos.y + request.editorPos.height - 1; - } + const isBelowLastLine = ( + lineNumber === ctx.viewModel.getLineCount() + && request.mouseVerticalOffset > lineEndVerticalOffset + ); - const adjustedPage = new PageCoordinates(request.pos.x, adjustedPageY); + if (!isBelowLastLine) { + const lineCenteredVerticalOffset = Math.floor((lineStartVerticalOffset + lineEndVerticalOffset) / 2); + let adjustedPageY = request.pos.y + (lineCenteredVerticalOffset - request.mouseVerticalOffset); - const r = this._actualDoHitTestWithCaretRangeFromPoint(ctx, adjustedPage.toClientCoordinates()); - if (r.type === HitTestResultType.Content) { - return r; + if (adjustedPageY <= request.editorPos.y) { + adjustedPageY = request.editorPos.y + 1; + } + if (adjustedPageY >= request.editorPos.y + request.editorPos.height) { + adjustedPageY = request.editorPos.y + request.editorPos.height - 1; + } + + const adjustedPage = new PageCoordinates(request.pos.x, adjustedPageY); + + const r = this._actualDoHitTestWithCaretRangeFromPoint(ctx, adjustedPage.toClientCoordinates()); + if (r.type === HitTestResultType.Content) { + return r; + } } // Also try to hit test without the adjustment (for the edge cases that we are near the top or bottom) diff --git a/src/vs/editor/browser/controller/pointerHandler.ts b/src/vs/editor/browser/controller/pointerHandler.ts index 1fd1525a4c2..25155f1336d 100644 --- a/src/vs/editor/browser/controller/pointerHandler.ts +++ b/src/vs/editor/browser/controller/pointerHandler.ts @@ -14,6 +14,7 @@ import { ViewController } from 'vs/editor/browser/view/viewController'; import { ViewContext } from 'vs/editor/common/viewModel/viewContext'; import { BrowserFeatures } from 'vs/base/browser/canIUse'; import { TextAreaSyntethicEvents } from 'vs/editor/browser/controller/textAreaInput'; +import { NavigationCommandRevealType } from 'vs/editor/browser/coreCommands'; /** * Currently only tested on iOS 13/ iPadOS. @@ -66,6 +67,7 @@ export class PointerEventHandler extends MouseHandler { position: target.position, mouseColumn: target.position.column, startedOnLineNumbers: false, + revealType: NavigationCommandRevealType.Minimal, mouseDownCount: event.tapCount, inSelectionMode: false, altKey: false, @@ -120,7 +122,7 @@ class TouchHandler extends MouseHandler { event.initEvent(TextAreaSyntethicEvents.Tap, false, true); this.viewHelper.dispatchTextAreaEvent(event); - this.viewController.moveTo(target.position); + this.viewController.moveTo(target.position, NavigationCommandRevealType.Minimal); } } diff --git a/src/vs/editor/browser/controller/textAreaHandler.css b/src/vs/editor/browser/controller/textAreaHandler.css index 19036f1115f..204bd2c0f9a 100644 --- a/src/vs/editor/browser/controller/textAreaHandler.css +++ b/src/vs/editor/browser/controller/textAreaHandler.css @@ -15,6 +15,7 @@ overflow: hidden; color: transparent; background-color: transparent; + z-index: -10; } /*.monaco-editor .inputarea { position: fixed !important; @@ -28,6 +29,7 @@ background: white !important; line-height: 15px !important; font-size: 14px !important; + z-index: 10 !important; }*/ .monaco-editor .inputarea.ime-input { z-index: 10; diff --git a/src/vs/editor/browser/controller/textAreaHandler.ts b/src/vs/editor/browser/controller/textAreaHandler.ts index ffbe3b55882..9f85d16df68 100644 --- a/src/vs/editor/browser/controller/textAreaHandler.ts +++ b/src/vs/editor/browser/controller/textAreaHandler.ts @@ -18,7 +18,7 @@ import { PartFingerprint, PartFingerprints, ViewPart } from 'vs/editor/browser/v import { LineNumbersOverlay } from 'vs/editor/browser/viewParts/lineNumbers/lineNumbers'; import { Margin } from 'vs/editor/browser/viewParts/margin/margin'; import { RenderLineNumbersType, EditorOption, IComputedEditorOptions, EditorOptions } from 'vs/editor/common/config/editorOptions'; -import { BareFontInfo } from 'vs/editor/common/config/fontInfo'; +import { FontInfo } from 'vs/editor/common/config/fontInfo'; import { WordCharacterClass, getMapForWordSeparators } from 'vs/editor/common/core/wordCharacterClassifier'; import { Position } from 'vs/editor/common/core/position'; import { Range } from 'vs/editor/common/core/range'; @@ -34,6 +34,7 @@ import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'vs/base/browser/ui/mouseCursor import { TokenizationRegistry } from 'vs/editor/common/languages'; import { ColorId, ITokenPresentation } from 'vs/editor/common/encodedTokenAttributes'; import { Color } from 'vs/base/common/color'; +import { TimeoutTimer } from 'vs/base/common/async'; export interface IVisibleRangeProvider { visibleRangeForPosition(position: Position): HorizontalPosition | null; @@ -112,10 +113,13 @@ export class TextAreaHandler extends ViewPart { private _accessibilitySupport!: AccessibilitySupport; private _accessibilityPageSize!: number; + private _accessibilityWriteTimer: TimeoutTimer; + private _textAreaWrapping!: boolean; + private _textAreaWidth!: number; private _contentLeft: number; private _contentWidth: number; private _contentHeight: number; - private _fontInfo: BareFontInfo; + private _fontInfo: FontInfo; private _lineHeight: number; private _emptySelectionClipboard: boolean; private _copyWithSyntaxHighlighting: boolean; @@ -149,6 +153,7 @@ export class TextAreaHandler extends ViewPart { const layoutInfo = options.get(EditorOption.layoutInfo); this._setAccessibilityOptions(options); + this._accessibilityWriteTimer = this._register(new TimeoutTimer()); this._contentLeft = layoutInfo.contentLeft; this._contentWidth = layoutInfo.contentWidth; this._contentHeight = layoutInfo.height; @@ -166,7 +171,9 @@ export class TextAreaHandler extends ViewPart { this.textArea = createFastDomNode(document.createElement('textarea')); PartFingerprints.write(this.textArea, PartFingerprint.TextArea); this.textArea.setClassName(`inputarea ${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`); - this.textArea.setAttribute('wrap', 'off'); + this.textArea.setAttribute('wrap', this._textAreaWrapping && !this._visibleTextArea ? 'on' : 'off'); + const { tabSize } = this._context.viewModel.model.getOptions(); + this.textArea.domNode.style.tabSize = `${tabSize * this._fontInfo.spaceWidth}px`; this.textArea.setAttribute('autocorrect', 'off'); this.textArea.setAttribute('autocapitalize', 'off'); this.textArea.setAttribute('autocomplete', 'off'); @@ -195,6 +202,12 @@ export class TextAreaHandler extends ViewPart { }, getValueInRange: (range: Range, eol: EndOfLinePreference): string => { return this._context.viewModel.getValueInRange(range, eol); + }, + getValueLengthInRange: (range: Range, eol: EndOfLinePreference): number => { + return this._context.viewModel.getValueLengthInRange(range, eol); + }, + modifyPosition: (position: Position, offset: number): Position => { + return this._context.viewModel.modifyPosition(position, offset); } }; @@ -224,7 +237,7 @@ export class TextAreaHandler extends ViewPart { mode }; }, - getScreenReaderContent: (currentState: TextAreaState): TextAreaState => { + getScreenReaderContent: (): TextAreaState => { if (this._accessibilitySupport === AccessibilitySupport.Disabled) { // We know for a fact that a screen reader is not attached // On OSX, we write the character before the cursor to allow for "long-press" composition @@ -239,16 +252,25 @@ export class TextAreaHandler extends ViewPart { } if (textBefore.length > 0) { - return new TextAreaState(textBefore, textBefore.length, textBefore.length, position, position); + return new TextAreaState(textBefore, textBefore.length, textBefore.length, Range.fromPositions(position), 0); } } + // on macOS, write current selection into textarea will allow system text services pick selected text, + // but we still want to limit the amount of text given Chromium handles very poorly text even of a few + // thousand chars + // (https://github.com/microsoft/vscode/issues/27799) + const LIMIT_CHARS = 500; + if (platform.isMacintosh && !selection.isEmpty() && simpleModel.getValueLengthInRange(selection, EndOfLinePreference.TextDefined) < LIMIT_CHARS) { + const text = simpleModel.getValueInRange(selection, EndOfLinePreference.TextDefined); + return new TextAreaState(text, 0, text.length, selection, 0); + } // on Safari, document.execCommand('cut') and document.execCommand('copy') will just not work // if the textarea has no content selected. So if there is an editor selection, ensure something // is selected in the textarea. if (browser.isSafari && !selection.isEmpty()) { const placeholderText = 'vscode-placeholder'; - return new TextAreaState(placeholderText, 0, placeholderText.length, null, null); + return new TextAreaState(placeholderText, 0, placeholderText.length, null, undefined); } return TextAreaState.EMPTY; @@ -264,13 +286,13 @@ export class TextAreaHandler extends ViewPart { const position = selection.getStartPosition(); const [wordAtPosition, positionOffsetInWord] = this._getAndroidWordAtPosition(position); if (wordAtPosition.length > 0) { - return new TextAreaState(wordAtPosition, positionOffsetInWord, positionOffsetInWord, position, position); + return new TextAreaState(wordAtPosition, positionOffsetInWord, positionOffsetInWord, Range.fromPositions(position), 0); } } return TextAreaState.EMPTY; } - return PagedScreenReaderStrategy.fromEditorSelection(currentState, simpleModel, this._selections[0], this._accessibilityPageSize, this._accessibilitySupport === AccessibilitySupport.Unknown); + return PagedScreenReaderStrategy.fromEditorSelection(simpleModel, this._selections[0], this._accessibilityPageSize, this._accessibilitySupport === AccessibilitySupport.Unknown); }, deduceModelPosition: (viewAnchorPosition: Position, deltaOffset: number, lineFeedCnt: number): Position => { @@ -361,7 +383,8 @@ export class TextAreaHandler extends ViewPart { const visibleBeforeCharCount = Math.min(startModelPosition.column - 1, desiredVisibleBeforeCharCount); const distanceToModelLineStart = startModelPosition.column - 1 - visibleBeforeCharCount; const hiddenLineTextBefore = lineTextBeforeSelection.substring(0, lineTextBeforeSelection.length - visibleBeforeCharCount); - const widthOfHiddenTextBefore = measureText(hiddenLineTextBefore, this._fontInfo); + const { tabSize } = this._context.viewModel.model.getOptions(); + const widthOfHiddenTextBefore = measureText(hiddenLineTextBefore, this._fontInfo, tabSize); return { distanceToModelLineStart, widthOfHiddenTextBefore }; })(); @@ -398,6 +421,9 @@ export class TextAreaHandler extends ViewPart { distanceToModelLineEnd, ); + // We turn off wrapping if the