diff --git a/.eslintplugin/code-ensure-no-disposables-leak-in-test.ts b/.eslintplugin/code-ensure-no-disposables-leak-in-test.ts new file mode 100644 index 00000000000..ae3089036a6 --- /dev/null +++ b/.eslintplugin/code-ensure-no-disposables-leak-in-test.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 * as eslint from 'eslint'; +import { Node } from 'estree'; + +export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rule.RuleModule { + + readonly meta: eslint.Rule.RuleMetaData = { + type: 'problem', + messages: { + ensure: 'Suites should include a call to `ensureNoDisposablesAreLeakedInTestSuite()` to ensure no disposables are leaked in tests.' + } + }; + + create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener { + const config = <{ exclude: string[] }>context.options[0]; + + const needle = context.getFilename().replace(/\\/g, '/'); + if (config.exclude.some((e) => needle.endsWith(e))) { + return {}; + } + + return { + [`Program > ExpressionStatement > CallExpression[callee.name='suite']`]: (node: Node) => { + const src = context.getSourceCode().getText(node) + if (!src.includes('ensureNoDisposablesAreLeakedInTestSuite(')) { + context.report({ + node, + messageId: 'ensure', + }); + } + }, + }; + } +}; diff --git a/.eslintplugin/code-must-use-super-dispose.ts b/.eslintplugin/code-must-use-super-dispose.ts new file mode 100644 index 00000000000..4f7f964699f --- /dev/null +++ b/.eslintplugin/code-must-use-super-dispose.ts @@ -0,0 +1,33 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as eslint from 'eslint'; + +export = new class NoAsyncSuite implements eslint.Rule.RuleModule { + + create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener { + function doesCallSuperDispose(node: any) { + + if (!node.override) { + return; + } + + const body = context.getSourceCode().getText(node) + + if (body.includes('super.dispose')) { + return; + } + + context.report({ + node, + message: 'dispose() should call super.dispose()' + }); + } + + return { + ['MethodDefinition[override][key.name="dispose"]']: doesCallSuperDispose, + }; + } +}; diff --git a/.eslintrc.json b/.eslintrc.json index 68ec2cf473f..1235b1328e4 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -73,6 +73,7 @@ "local/code-no-nls-in-standalone-editor": "warn", "local/code-no-standalone-editor": "warn", "local/code-no-unexternalized-strings": "warn", + "local/code-must-use-super-dispose": "warn", "local/code-declare-service-brand": "warn", "local/code-layering": [ "warn", @@ -119,6 +120,7 @@ "**/*.test.ts" ], "rules": { + "local/code-must-use-super-dispose": "off", "local/code-no-test-only": "error", "local/code-no-test-async-suite": "warn", "local/code-no-unexternalized-strings": "off", @@ -128,13 +130,153 @@ { "message": "Expression must be awaited", "functions": [ - "assertSnapshot" + "assertSnapshot", + "assertHeap" ] } ] ] } }, + { + "files": [ + "src/vs/**/*.test.ts" + ], + "rules": { + "local/code-ensure-no-disposables-leak-in-test": [ + "warn", + { + // Files should (only) be removed from the list they adopt the leak detector + "exclude": [ + "src/vs/base/parts/sandbox/test/electron-sandbox/globals.test.ts", + "src/vs/base/test/browser/browser.test.ts", + "src/vs/base/test/browser/comparers.test.ts", + "src/vs/base/test/browser/hash.test.ts", + "src/vs/base/test/browser/indexedDB.test.ts", + "src/vs/base/test/browser/ui/menu/menubar.test.ts", + "src/vs/base/test/browser/ui/scrollbar/scrollableElement.test.ts", + "src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts", + "src/vs/base/test/common/arrays.test.ts", + "src/vs/base/test/common/arraysFind.test.ts", + "src/vs/base/test/common/cache.test.ts", + "src/vs/base/test/common/charCode.test.ts", + "src/vs/base/test/common/collections.test.ts", + "src/vs/base/test/common/color.test.ts", + "src/vs/base/test/common/decorators.test.ts", + "src/vs/base/test/common/diff/diff.test.ts", + "src/vs/base/test/common/errors.test.ts", + "src/vs/base/test/common/filters.perf.test.ts", + "src/vs/base/test/common/filters.test.ts", + "src/vs/base/test/common/iconLabels.test.ts", + "src/vs/base/test/common/iterator.test.ts", + "src/vs/base/test/common/json.test.ts", + "src/vs/base/test/common/jsonEdit.test.ts", + "src/vs/base/test/common/jsonFormatter.test.ts", + "src/vs/base/test/common/keybindings.test.ts", + "src/vs/base/test/common/keyCodes.test.ts", + "src/vs/base/test/common/linkedList.test.ts", + "src/vs/base/test/common/linkedText.test.ts", + "src/vs/base/test/common/map.test.ts", + "src/vs/base/test/common/markdownString.test.ts", + "src/vs/base/test/common/marshalling.test.ts", + "src/vs/base/test/common/network.test.ts", + "src/vs/base/test/common/observable.test.ts", + "src/vs/base/test/common/path.test.ts", + "src/vs/base/test/common/resources.test.ts", + "src/vs/base/test/common/resourceTree.test.ts", + "src/vs/base/test/common/scrollable.test.ts", + "src/vs/base/test/common/skipList.test.ts", + "src/vs/base/test/common/stripComments.test.ts", + "src/vs/base/test/common/ternarySearchtree.test.ts", + "src/vs/base/test/common/types.test.ts", + "src/vs/base/test/common/uri.test.ts", + "src/vs/base/test/common/uuid.test.ts", + "src/vs/base/test/node/crypto.test.ts", + "src/vs/base/test/node/css.build.test.ts", + "src/vs/base/test/node/id.test.ts", + "src/vs/base/test/node/snapshot.test.ts", + "src/vs/editor/contrib/codeAction/test/browser/codeActionKeybindingResolver.test.ts", + "src/vs/editor/contrib/codeAction/test/browser/codeActionModel.test.ts", + "src/vs/editor/contrib/dropOrPasteInto/test/browser/editSort.test.ts", + "src/vs/editor/contrib/folding/test/browser/foldingModel.test.ts", + "src/vs/editor/contrib/folding/test/browser/foldingRanges.test.ts", + "src/vs/editor/contrib/folding/test/browser/indentFold.test.ts", + "src/vs/editor/contrib/folding/test/browser/indentRangeProvider.test.ts", + "src/vs/editor/contrib/gotoSymbol/test/browser/referencesModel.test.ts", + "src/vs/editor/contrib/smartSelect/test/browser/smartSelect.test.ts", + "src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts", + "src/vs/editor/contrib/snippet/test/browser/snippetSession.test.ts", + "src/vs/editor/contrib/snippet/test/browser/snippetVariables.test.ts", + "src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts", + "src/vs/editor/contrib/suggest/test/browser/suggestMemory.test.ts", + "src/vs/editor/test/common/services/languageService.test.ts", + "src/vs/editor/test/node/classification/typescript.test.ts", + "src/vs/editor/test/node/diffing/defaultLinesDiffComputer.test.ts", + "src/vs/editor/test/node/diffing/fixtures.test.ts", + "src/vs/platform/configuration/test/common/configuration.test.ts", + "src/vs/platform/configuration/test/common/configurationModels.test.ts", + "src/vs/platform/configuration/test/common/configurationRegistry.test.ts", + "src/vs/platform/contextkey/test/common/contextkey.test.ts", + "src/vs/platform/contextkey/test/common/parser.test.ts", + "src/vs/platform/contextkey/test/common/scanner.test.ts", + "src/vs/platform/extensionManagement/test/common/extensionManagement.test.ts", + "src/vs/platform/extensions/test/common/extensionValidator.test.ts", + "src/vs/platform/instantiation/test/common/graph.test.ts", + "src/vs/platform/instantiation/test/common/instantiationService.test.ts", + "src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts", + "src/vs/platform/keybinding/test/common/keybindingLabels.test.ts", + "src/vs/platform/keybinding/test/common/keybindingResolver.test.ts", + "src/vs/platform/markers/test/common/markerService.test.ts", + "src/vs/platform/opener/test/common/opener.test.ts", + "src/vs/platform/progress/test/common/progress.test.ts", + "src/vs/platform/registry/test/common/platform.test.ts", + "src/vs/platform/remote/test/common/remoteHosts.test.ts", + "src/vs/platform/telemetry/test/browser/1dsAppender.test.ts", + "src/vs/platform/userDataSync/test/common/extensionsMerge.test.ts", + "src/vs/platform/userDataSync/test/common/globalStateMerge.test.ts", + "src/vs/platform/userDataSync/test/common/settingsMerge.test.ts", + "src/vs/platform/userDataSync/test/common/userDataProfilesManifestMerge.test.ts", + "src/vs/platform/workspace/test/common/workspace.test.ts", + "src/vs/platform/workspaces/test/electron-main/workspaces.test.ts", + "src/vs/server/test/node/serverConnectionToken.test.ts", + "src/vs/workbench/api/test/browser/extHostApiCommands.test.ts", + "src/vs/workbench/api/test/browser/extHostBulkEdits.test.ts", + "src/vs/workbench/api/test/browser/extHostDocumentSaveParticipant.test.ts", + "src/vs/workbench/api/test/browser/extHostTextEditor.test.ts", + "src/vs/workbench/api/test/browser/extHostTypeConverter.test.ts", + "src/vs/workbench/api/test/browser/extHostWorkspace.test.ts", + "src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts", + "src/vs/workbench/api/test/browser/mainThreadDocuments.test.ts", + "src/vs/workbench/api/test/common/extHostExtensionActivator.test.ts", + "src/vs/workbench/api/test/node/extHostTunnelService.test.ts", + "src/vs/workbench/contrib/bulkEdit/test/browser/bulkCellEdits.test.ts", + "src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts", + "src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts", + "src/vs/workbench/contrib/extensions/test/common/extensionQuery.test.ts", + "src/vs/workbench/contrib/extensions/test/electron-sandbox/extension.test.ts", + "src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts", + "src/vs/workbench/contrib/notebook/test/browser/notebookExecutionStateService.test.ts", + "src/vs/workbench/contrib/snippets/test/browser/snippetFile.test.ts", + "src/vs/workbench/contrib/snippets/test/browser/snippetsRegistry.test.ts", + "src/vs/workbench/contrib/snippets/test/browser/snippetsRewrite.test.ts", + "src/vs/workbench/contrib/tasks/test/common/problemMatcher.test.ts", + "src/vs/workbench/contrib/tasks/test/common/taskConfiguration.test.ts", + "src/vs/workbench/services/commands/test/common/commandService.test.ts", + "src/vs/workbench/services/configuration/test/common/configurationModels.test.ts", + "src/vs/workbench/services/extensions/test/common/extensionDescriptionRegistry.test.ts", + "src/vs/workbench/services/keybinding/test/browser/keybindingIO.test.ts", + "src/vs/workbench/services/keybinding/test/node/fallbackKeyboardMapper.test.ts", + "src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts", + "src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts", + "src/vs/workbench/services/telemetry/test/browser/commonProperties.test.ts", + "src/vs/workbench/services/themes/test/node/tokenStyleResolving.test.ts", + "src/vs/workbench/services/userActivity/test/browser/domActivityTracker.test.ts", + "src/vs/workbench/test/browser/quickAccess.test.ts" + ] + } + ] + } + }, { "files": [ "**/vscode.d.ts", @@ -258,7 +400,7 @@ }, { "files": [ - "src/**/{browser,electron-sandbox}/*.ts" + "src/**/{browser,electron-sandbox}/**/*.ts" ], "rules": { "local/code-no-global-document-listener": "warn", diff --git a/.github/classifier.json b/.github/classifier.json index 21b8d51cd6c..44514039e1e 100644 --- a/.github/classifier.json +++ b/.github/classifier.json @@ -39,7 +39,7 @@ "editor-autoindent": {"assign": ["rebornix"]}, "editor-bracket-matching": {"assign": ["hediet"]}, "editor-clipboard": {"assign": ["alexdima", "rebornix"]}, - "editor-code-actions": {"assign": ["mjbvz"]}, + "editor-code-actions": {"assign": ["mjbvz", "justschen"]}, "editor-color-picker": {"assign": ["aiday-mar"]}, "editor-columnselect": {"assign": ["alexdima"]}, "editor-commands": {"assign": ["alexdima"]}, @@ -111,7 +111,7 @@ "interactive-window": {"assign": ["amunger", "rebornix"]}, "ipc": {"assign": ["joaomoreno"]}, "issue-bot": {"assign": ["chrmarti"]}, - "issue-reporter": {"assign": ["TylerLeonhardt"]}, + "issue-reporter": {"assign": ["justschen"]}, "javascript": {"assign": ["mjbvz"]}, "json": {"assign": ["aeschli"]}, "json-sorting": {"assign": ["aiday-mar"]}, @@ -253,6 +253,7 @@ "tokenization": {"assign": ["alexdima"]}, "touch/pointer": {"assign": []}, "trackpad/scroll": {"assign": []}, + "tree-sticky-scroll": {"assign": ["benibenj"]}, "tree-views": {"assign": ["alexr00"]}, "tree-widget": {"assign": ["joaomoreno"]}, "typehierarchy": {"assign": ["jrieken"]}, @@ -272,6 +273,7 @@ "webview": {"assign": ["mjbvz"]}, "webview-views": {"assign": ["mjbvz"]}, "workbench-actions": {"assign": ["bpasero"]}, + "workbench-auxwindow": {"assign": ["bpasero"]}, "workbench-banner": {"assign": ["lszomoru", "sbatten"]}, "workbench-cli": {"assign": ["bpasero"]}, "workbench-diagnostics": {"assign": ["Tyriar"]}, diff --git a/.github/commands.json b/.github/commands.json index ea5f8bc38e1..7b04c7475d7 100644 --- a/.github/commands.json +++ b/.github/commands.json @@ -58,6 +58,13 @@ "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!" }, + { + "type": "label", + "name": "wont-fix", + "action": "close", + "reason": "not_planned", + "comment": "We closed this issue because we [don't plan to address it](https://github.com/microsoft/vscode/wiki/Issue-Grooming#wont-fix-bugs).\n\nThanks for your understanding, and happy coding!" + }, { "type": "comment", "name": "causedByExtension", diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index 3fd6daf0048..92c75ebdd9a 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -29,7 +29,7 @@ jobs: sudo update-rc.d xvfb defaults sudo service xvfb start - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: .nvmrc @@ -81,7 +81,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: .nvmrc @@ -143,7 +143,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: .nvmrc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a598efa9f37..b75e45b49c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: .nvmrc @@ -113,7 +113,7 @@ jobs: sudo update-rc.d xvfb defaults sudo service xvfb start - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: .nvmrc @@ -184,7 +184,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: .nvmrc @@ -256,7 +256,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: .nvmrc diff --git a/.github/workflows/monaco-editor.yml b/.github/workflows/monaco-editor.yml index 54012f54e78..c62fd2b2697 100644 --- a/.github/workflows/monaco-editor.yml +++ b/.github/workflows/monaco-editor.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: .nvmrc @@ -65,8 +65,8 @@ jobs: - name: Run Monaco Editor Checks run: yarn monaco-compile-check - - name: Editor Distro & ESM Bundle - run: yarn gulp editor-esm-bundle + - name: Editor Distro & ESM + run: yarn gulp editor-esm - name: Editor ESM sources check working-directory: ./test/monaco diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml index ab1559d8fa6..d463a0e2eca 100644 --- a/.github/workflows/telemetry.yml +++ b/.github/workflows/telemetry.yml @@ -9,7 +9,7 @@ jobs: steps: - uses: 'actions/checkout@v4' - - uses: 'actions/setup-node@v3' + - uses: 'actions/setup-node@v4' with: node-version: 'lts/*' diff --git a/.vscode-test.js b/.vscode-test.js index 6846ca522f6..f2db8d695fe 100644 --- a/.vscode-test.js +++ b/.vscode-test.js @@ -31,6 +31,16 @@ const extensions = [ workspaceFolder: path.join(os.tmpdir(), `nbout-${Math.floor(Math.random() * 100000)}`), mocha: { timeout: 60_000 } }, + { + label: 'vscode-colorize-tests', + workspaceFolder: `extensions/vscode-colorize-tests/test`, + mocha: { timeout: 60_000 } + }, + { + label: 'configuration-editing', + workspaceFolder: path.join(os.tmpdir(), `confeditout-${Math.floor(Math.random() * 100000)}`), + mocha: { timeout: 60_000 } + }, { label: 'github-authentication', workspaceFolder: path.join(os.tmpdir(), `msft-auth-${Math.floor(Math.random() * 100000)}`), diff --git a/.vscode/notebooks/endgame.github-issues b/.vscode/notebooks/endgame.github-issues index 7545ace624b..9743e647077 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/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"November 2023\"\n" + "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"November 2023 Recovery 1\"\n" }, { "kind": 1, @@ -142,6 +142,11 @@ { "kind": 2, "language": "github-issues", - "value": "$REPOS $MILESTONE is:open label:candidate\n" + "value": "$REPOS $MILESTONE is:issue is:open label:candidate\n" + }, + { + "kind": 2, + "language": "github-issues", + "value": "" } ] \ No newline at end of file diff --git a/.vscode/notebooks/grooming.github-issues b/.vscode/notebooks/grooming.github-issues new file mode 100644 index 00000000000..694862806ed --- /dev/null +++ b/.vscode/notebooks/grooming.github-issues @@ -0,0 +1,52 @@ +[ + { + "kind": 1, + "language": "markdown", + "value": "#### Config\n" + }, + { + "kind": 2, + "language": "github-issues", + "value": "// list of repos we work in\r\n$repos=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\r\n" + }, + { + "kind": 1, + "language": "markdown", + "value": "#### Missing Type label\r\n" + }, + { + "kind": 2, + "language": "github-issues", + "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 -label:engineering -label:endgame-plan\r\n" + }, + { + "kind": 1, + "language": "markdown", + "value": "#### Missing Area Label\r\n\r\nFeature area labels are light or strong blue (`1d76db` or `c5def5`) and they denote a specific feature or feature area, like `editor-clipboard` or `file-explorer`\r\n" + }, + { + "kind": 2, + "language": "github-issues", + "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:cloud-changes -label:code-lens -label:command-center -label:comments -label:config -label:containers -label:context-keys -label:continue-working-on -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -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-widgets -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:emmet-parse -label:error-list -label:extension-activation -label:extension-host -label:extension-prerelease -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-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:html -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:native-file-dialog -label:network -label:notebook -label:notebook-accessibility -label:notebook-api -label:notebook-builtin-renderers -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-commands -label:notebook-commenting -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-math -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-rendering -label:notebook-serialization -label:notebook-serverless-web -label:notebook-statusbar -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:notebook-sticky-scroll -label:notebook-format -label:notebook-code-actions -label:open-editors -label:opener -label:outline -label:output -label:packaging -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:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -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-widget -label:ssh -label:suggest -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-sticky-scroll -label:terminal-tabs -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-banner -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-fonts -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-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:inline-chat -label:panel-chat -label:quick-chat -label:audio-cue -label:tasks -label:error-list -label:winget -label:tree-views -label:freeze-slow-crash-leak -label:engineering" + }, + { + "kind": 1, + "language": "markdown", + "value": "### Missing Milestone\r\n" + }, + { + "kind": 2, + "language": "github-issues", + "value": "$repos assignee:@me is:open type:issue no:milestone -label:info-needed -label:triage-needed\r\n" + }, + { + "kind": 1, + "language": "markdown", + "value": "#### Not Actionable\r\n" + }, + { + "kind": 2, + "language": "github-issues", + "value": "$repos assignee:@me is:open label:\"info-needed\"\r\n" + } +] \ No newline at end of file diff --git a/.vscode/notebooks/my-endgame.github-issues b/.vscode/notebooks/my-endgame.github-issues index 04195d1b264..5278439e57a 100644 --- a/.vscode/notebooks/my-endgame.github-issues +++ b/.vscode/notebooks/my-endgame.github-issues @@ -157,7 +157,7 @@ { "kind": 2, "language": "github-issues", - "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: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 -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:paulacamargo25 -author:ulugbekna -author:aiday-mar\n" + "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: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 -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:paulacamargo25 -author:ulugbekna -author:aiday-mar -author:daviddossett\n" }, { "kind": 1, diff --git a/.vscode/notebooks/my-work.github-issues b/.vscode/notebooks/my-work.github-issues index 42bf5aee57d..c6e8ee4b20e 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/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n// current milestone name\n$milestone=milestone:\"November 2023\"\n" + "value": "// list of repos we work in\r\n$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\r\n\r\n// current milestone name\r\n$MILESTONE=milestone:\"December / January 2024\"\r\n" }, { "kind": 1, @@ -17,7 +17,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repos $milestone assignee:@me is:open\n" + "value": "$REPOS $MILESTONE assignee:@me is:open\r\n" }, { "kind": 1, @@ -32,7 +32,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repos assignee:@me is:open label:bug\n" + "value": "$REPOS assignee:@me is:open label:bug\r\n" }, { "kind": 1, @@ -42,7 +42,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repos assignee:@me is:open label:debt,engineering\n" + "value": "$REPOS assignee:@me is:open label:debt,engineering\r\n" }, { "kind": 1, @@ -52,7 +52,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repos assignee:@me is:open label:perf,perf-startup,perf-bloat,freeze-slow-crash-leak\n" + "value": "$REPOS assignee:@me is:open label:perf,perf-startup,perf-bloat,freeze-slow-crash-leak\r\n" }, { "kind": 1, @@ -62,12 +62,12 @@ { "kind": 2, "language": "github-issues", - "value": "$repos assignee:@me is:open label:feature-request milestone:Backlog sort:reactions-+1-desc\n" + "value": "$REPOS assignee:@me is:open label:feature-request milestone:Backlog sort:reactions-+1-desc\r\n" }, { "kind": 2, "language": "github-issues", - "value": "$repos assignee:@me is:open milestone:\"Backlog Candidates\"\n" + "value": "$REPOS assignee:@me is:open milestone:\"Backlog Candidates\"\r\n" }, { "kind": 1, @@ -82,7 +82,7 @@ { "kind": 2, "language": "github-issues", - "value": "repo:microsoft/vscode is:open assignee:@me label:triage-needed\n" + "value": "repo:microsoft/vscode is:open assignee:@me label:triage-needed\r\n" }, { "kind": 1, @@ -92,7 +92,7 @@ { "kind": 2, "language": "github-issues", - "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 -label:engineering\n" + "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 -label:engineering\r\n" }, { "kind": 1, @@ -102,7 +102,7 @@ { "kind": 2, "language": "github-issues", - "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:cloud-changes -label:code-lens -label:command-center -label:comments -label:config -label:containers -label:context-keys -label:continue-working-on -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -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-sorting -label:editor-sticky-scroll -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:emmet-parse -label:error-list -label:extension-activation -label:extension-host -label:extension-prerelease -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-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:html -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keybindings-json -label:keyboard-layout -label:L10N -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:native-file-dialog -label:network -label:notebook -label:notebook-api -label:notebook-builtin-renderers -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-commenting -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-math -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-rendering -label:notebook-serialization -label:notebook-serverless-web -label:notebook-statusbar -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:open-editors -label:opener -label:outline -label:output -label:packaging -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:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -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-widget -label:ssh -label:suggest -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-tabs -label:terminal-winpty -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-banner -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-fonts -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-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:inline-chat\n" + "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:command-center -label:comments -label:config -label:context-keys -label:custom-editors -label:debug -label:debug-console -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -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-sorting -label:editor-sticky-scroll -label:editor-sticky-scroll-decorations -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet-parse -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extension-signature -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:icon-brand -label:icons-product -label:icons-widget -label:inlay-hints -label:inline-chat -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:javascript -label:json -label:json-sorting -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:multi-monitor -label:native-file-dialog -label:network -label:notebook -label:notebook-accessibility -label:notebook-api -label:notebook-builtin-renderers -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-commands -label:notebook-commenting -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-math -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-rendering -label:notebook-serialization -label:notebook-serverless-web -label:notebook-statusbar -label:notebook-sticky-scroll -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:panel-chat -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:quickpick-chat -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-desktop -label:remote-explorer -label:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-search -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:system-context-menu -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-tabs -label:terminal-winpty -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:unc -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-documents -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-auxwindow -label:workbench-banner -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-fonts -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-voice -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:error-list -label:winget" }, { "kind": 1, @@ -112,7 +112,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repos assignee:@me is:open type:issue no:milestone -label:info-needed -label:triage-needed\n" + "value": "$REPOS assignee:@me is:open type:issue no:milestone -label:info-needed -label:triage-needed\r\n" }, { "kind": 1, @@ -122,7 +122,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repos assignee:@me is:open label:\"info-needed\"\n" + "value": "$REPOS assignee:@me is:open label:\"info-needed\"\r\n" }, { "kind": 1, @@ -137,7 +137,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repos author:@me is:open is:pr review:approved\n" + "value": "$REPOS author:@me is:open is:pr review:approved\r\n" }, { "kind": 1, @@ -147,7 +147,7 @@ { "kind": 2, "language": "github-issues", - "value": "$repos author:@me is:open is:pr review:required\n" + "value": "$REPOS author:@me is:open is:pr review:required\r\n" }, { "kind": 1, @@ -157,6 +157,6 @@ { "kind": 2, "language": "github-issues", - "value": "$repos author:@me is:open is:pr review:changes_requested\n" + "value": "$REPOS author:@me is:open is:pr review:changes_requested\r\n" } ] \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index e525b17dbb3..bdbb92f271b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -165,13 +165,9 @@ "src/vs/workbench/workbench.web.main.ts", "src/vs/workbench/api/common/extHostTypes.ts" ], - - // Temporarily enabled for self-hosting - "terminal.integrated.enableStickyScroll": true, - - // Temporarily enabled for self-hosting - "scm.experimental.showSyncInformation": { - "incoming": false, - "outgoing": false - } + "[github-issues]": { + "editor.wordWrap": "on" + }, + "css.format.spaceAroundSelectorSeparator": true, + "inlineChat.mode": "live", } diff --git a/.yarnrc b/.yarnrc index bb7778b5a27..c7befdb5fa1 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1,5 +1,5 @@ disturl "https://electronjs.org/headers" -target "25.9.2" -ms_build_id "24603566" +target "27.1.3" +ms_build_id "25612240" runtime "electron" build_from_source "true" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 42b369c7ecf..6bece0ef03f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,8 @@ There are several ways in which you can contribute, beyond writing code. The goa ## Asking Questions -Have a question? Instead of opening an issue, please ask on [Stack Overflow](https://stackoverflow.com/questions/tagged/vscode) using the tag `vscode`. + +Have a question? Instead of opening an issue, please ask on [Stack Overflow](https://stackoverflow.com/questions/tagged/visual-studio-code) using the tag `visual-studio-code`. The active community will be eager to assist you. Your well-worded question will serve as a resource to others searching for help. diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 44d08f0dc19..4fd1d6a460b 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -545,33 +545,6 @@ to the base-name name of the original file, and an extension of txt, html, or si --------------------------------------------------------- -freebroccolo/atom-language-swift 0.0.0 - MIT -https://github.com/freebroccolo/atom-language-swift - -The MIT License (MIT) - -Copyright (c) 2014 Darin Morrison - -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. ---------------------------------------------------------- - ---------------------------------------------------------- - HTML 5.1 W3C Working Draft 08 October 2015 - W3C Document License http://www.w3.org/TR/2015/WD-html51-20151008/ @@ -901,6 +874,22 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI --------------------------------------------------------- +jtbandes/swift-tmlanguage - MIT +https://github.com/jtbandes/swift-tmlanguage + +The MIT License (MIT) + +Copyright 2023 Jacob Bandes-Storch + +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. +--------------------------------------------------------- + +--------------------------------------------------------- + JuliaEditorSupport/atom-language-julia 0.22.1 - MIT https://github.com/JuliaEditorSupport/atom-language-julia diff --git a/build/.cachesalt b/build/.cachesalt index 1aad2ab5206..a8a329ac0b8 100644 --- a/build/.cachesalt +++ b/build/.cachesalt @@ -1 +1 @@ -2023-09-06T09:54:45.225Z +2023-12-07T16:21:36.646Z diff --git a/build/.gitignore b/build/.gitignore index 5a8136bb884..7cc357379e5 100644 --- a/build/.gitignore +++ b/build/.gitignore @@ -1 +1,2 @@ .yarnrc +*.js.map diff --git a/build/azure-pipelines/cli/cli-compile-and-publish.yml b/build/azure-pipelines/cli/cli-compile-and-publish.yml index 05ad5538d87..4f0623b84fc 100644 --- a/build/azure-pipelines/cli/cli-compile-and-publish.yml +++ b/build/azure-pipelines/cli/cli-compile-and-publish.yml @@ -38,14 +38,45 @@ steps: ${{ pair.key }}: ${{ pair.value }} - ${{ else }}: - - 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 - VSCODE_CLI_COMMIT: $(Build.SourceVersion) - ${{ each pair in parameters.VSCODE_CLI_ENV }}: - ${{ pair.key }}: ${{ pair.value }} + - ${{ if contains(parameters.VSCODE_CLI_TARGET, '-linux-') }}: + - script: | + set -e + if [ -n "$SYSROOT_ARCH" ]; then + export VSCODE_SYSROOT_DIR=$(Build.SourcesDirectory)/.build/sysroots + node -e '(async () => { const { getVSCodeSysroot } = require("../build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()' + if [ "$SYSROOT_ARCH" == "arm64" ]; then + export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER="$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc" + export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-C link-arg=--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot" + export CC_aarch64_unknown_linux_gnu="$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc --sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot" + elif [ "$SYSROOT_ARCH" == "amd64" ]; then + export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER="$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-gcc" + export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-C link-arg=--sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -C link-arg=-L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu" + export CC_x86_64_unknown_linux_gnu="$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-gcc --sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot" + elif [ "$SYSROOT_ARCH" == "armhf" ]; then + export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER="$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc" + export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUSTFLAGS="-C link-arg=--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot" + export CC_armv7_unknown_linux_gnueabihf="$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc --sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot" + fi + fi + 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 + VSCODE_CLI_COMMIT: $(Build.SourceVersion) + GITHUB_TOKEN: "$(github-distro-mixin-password)" + ${{ each pair in parameters.VSCODE_CLI_ENV }}: + ${{ pair.key }}: ${{ pair.value }} + + - ${{ else }}: + - 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 + VSCODE_CLI_COMMIT: $(Build.SourceVersion) + ${{ each pair in parameters.VSCODE_CLI_ENV }}: + ${{ pair.key }}: ${{ pair.value }} - ${{ if contains(parameters.VSCODE_CLI_TARGET, '-windows-') }}: - powershell: | diff --git a/build/azure-pipelines/cli/cli-darwin-sign.yml b/build/azure-pipelines/cli/cli-darwin-sign.yml index b4cfdc8f10f..925d8435dae 100644 --- a/build/azure-pipelines/cli/cli-darwin-sign.yml +++ b/build/azure-pipelines/cli/cli-darwin-sign.yml @@ -26,10 +26,10 @@ steps: artifact: ${{ target }} path: $(Build.ArtifactStagingDirectory)/pkg/${{ target }} - - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll darwin-sign $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Build.ArtifactStagingDirectory)/pkg "*.zip" + - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll sign-darwin $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Build.ArtifactStagingDirectory)/pkg "*.zip" displayName: Codesign - - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll darwin-notarize $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Build.ArtifactStagingDirectory)/pkg "*.zip" + - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll notarize-darwin $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Build.ArtifactStagingDirectory)/pkg "*.zip" displayName: Notarize - ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}: diff --git a/build/azure-pipelines/cli/cli-win32-sign.yml b/build/azure-pipelines/cli/cli-win32-sign.yml index 2880eafb85d..10d305b92b3 100644 --- a/build/azure-pipelines/cli/cli-win32-sign.yml +++ b/build/azure-pipelines/cli/cli-win32-sign.yml @@ -42,8 +42,8 @@ steps: echo "##vso[task.setvariable variable=EsrpCliDllPath]$EsrpCliDllPath" displayName: Find ESRP CLI - - powershell: node build\azure-pipelines\common\sign $env:EsrpCliDllPath windows $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Build.ArtifactStagingDirectory)/sign "*.exe" - displayName: Codesign executable + - powershell: node build\azure-pipelines\common\sign $env:EsrpCliDllPath sign-windows $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Build.ArtifactStagingDirectory)/sign "*.exe" + displayName: Codesign - ${{ each target in parameters.VSCODE_CLI_ARTIFACTS }}: - powershell: | diff --git a/build/azure-pipelines/common/computeBuiltInDepsCacheKey.js b/build/azure-pipelines/common/computeBuiltInDepsCacheKey.js index 989179bd075..fa230bb6849 100644 --- a/build/azure-pipelines/common/computeBuiltInDepsCacheKey.js +++ b/build/azure-pipelines/common/computeBuiltInDepsCacheKey.js @@ -13,4 +13,4 @@ for (const ext of productjson.builtInExtensions) { shasum.update(`${ext.name}@${ext.version}`); } process.stdout.write(shasum.digest('hex')); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcHV0ZUJ1aWx0SW5EZXBzQ2FjaGVLZXkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjb21wdXRlQnVpbHRJbkRlcHNDYWNoZUtleS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7O0FBRWhHLHlCQUF5QjtBQUN6Qiw2QkFBNkI7QUFDN0IsaUNBQWlDO0FBRWpDLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSx1QkFBdUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7QUFDdkcsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUV6QyxLQUFLLE1BQU0sR0FBRyxJQUFJLFdBQVcsQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO0lBQ2pELE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBRyxHQUFHLENBQUMsSUFBSSxJQUFJLEdBQUcsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0FBQzdDLENBQUM7QUFFRCxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMifQ== \ No newline at end of file +//# sourceMappingURL=computeBuiltInDepsCacheKey.js.map \ No newline at end of file diff --git a/build/azure-pipelines/common/computeNodeModulesCacheKey.js b/build/azure-pipelines/common/computeNodeModulesCacheKey.js index ac65c35add9..535cb7efd98 100644 --- a/build/azure-pipelines/common/computeNodeModulesCacheKey.js +++ b/build/azure-pipelines/common/computeNodeModulesCacheKey.js @@ -33,4 +33,4 @@ for (let i = 2; i < process.argv.length; i++) { shasum.update(process.argv[i]); } process.stdout.write(shasum.digest('hex')); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcHV0ZU5vZGVNb2R1bGVzQ2FjaGVLZXkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjb21wdXRlTm9kZU1vZHVsZXNDYWNoZUtleS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7O0FBRWhHLHlCQUF5QjtBQUN6Qiw2QkFBNkI7QUFDN0IsaUNBQWlDO0FBQ2pDLE1BQU0sRUFBRSxJQUFJLEVBQUUsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztBQUUzQyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxXQUFXLENBQUMsQ0FBQztBQUUvQyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBRXpDLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNwRSxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQzNELE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUVsRSwyQ0FBMkM7QUFDM0MsS0FBSyxNQUFNLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQztJQUN4QixNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsY0FBYyxDQUFDLENBQUM7SUFDN0QsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLGVBQWUsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDNUUsTUFBTSwyQkFBMkIsR0FBRztRQUNuQyxZQUFZLEVBQUUsV0FBVyxDQUFDLFlBQVk7UUFDdEMsZUFBZSxFQUFFLFdBQVcsQ0FBQyxlQUFlO1FBQzVDLG9CQUFvQixFQUFFLFdBQVcsQ0FBQyxvQkFBb0I7UUFDdEQsV0FBVyxFQUFFLFdBQVcsQ0FBQyxXQUFXO1FBQ3BDLE1BQU0sRUFBRSxXQUFXLENBQUMsTUFBTTtLQUMxQixDQUFDO0lBQ0YsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLDJCQUEyQixDQUFDLENBQUMsQ0FBQztJQUUzRCxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDdkQsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7QUFDOUMsQ0FBQztBQUVELHVDQUF1QztBQUN2QyxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUM5QyxNQUFNLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNoQyxDQUFDO0FBRUQsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDIn0= \ No newline at end of file +//# sourceMappingURL=computeNodeModulesCacheKey.js.map \ No newline at end of file diff --git a/build/azure-pipelines/common/createAsset.js b/build/azure-pipelines/common/createAsset.js deleted file mode 100644 index 5128f607b6a..00000000000 --- a/build/azure-pipelines/common/createAsset.js +++ /dev/null @@ -1,243 +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 }); -const fs = require("fs"); -const crypto = require("crypto"); -const storage_blob_1 = require("@azure/storage-blob"); -const mime = require("mime"); -const cosmos_1 = require("@azure/cosmos"); -const identity_1 = require("@azure/identity"); -const retry_1 = require("./retry"); -if (process.argv.length !== 8) { - console.error('Usage: node createAsset.js PRODUCT OS ARCH TYPE NAME FILE'); - process.exit(-1); -} -// Contains all of the logic for mapping details to our actual product names in CosmosDB -function getPlatform(product, os, arch, type) { - switch (os) { - case 'win32': - switch (product) { - case 'client': { - switch (type) { - case 'archive': - return `win32-${arch}-archive`; - case 'setup': - return `win32-${arch}`; - case 'user-setup': - return `win32-${arch}-user`; - default: - throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); - } - } - case 'server': - if (arch === 'arm64') { - throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); - } - return `server-win32-${arch}`; - case 'web': - if (arch === 'arm64') { - throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); - } - return `server-win32-${arch}-web`; - case 'cli': - return `cli-win32-${arch}`; - default: - throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); - } - case 'alpine': - switch (product) { - case 'server': - 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}`); - } - case 'linux': - switch (type) { - case 'snap': - return `linux-snap-${arch}`; - case 'archive-unsigned': - switch (product) { - case 'client': - return `linux-${arch}`; - case 'server': - return `server-linux-${arch}`; - case 'web': - return arch === 'standalone' ? 'web-standalone' : `server-linux-${arch}-web`; - default: - throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); - } - case 'deb-package': - 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}`); - } - case 'darwin': - switch (product) { - case 'client': - if (arch === 'x64') { - return 'darwin'; - } - return `darwin-${arch}`; - case 'server': - if (arch === 'x64') { - return 'server-darwin'; - } - return `server-darwin-${arch}`; - case 'web': - if (arch === 'x64') { - return 'server-darwin-web'; - } - return `server-darwin-${arch}-web`; - case 'cli': - return `cli-darwin-${arch}`; - default: - throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); - } - default: - throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); - } -} -// Contains all of the logic for mapping types to our actual types in CosmosDB -function getRealType(type) { - switch (type) { - case 'user-setup': - return 'setup'; - case 'deb-package': - case 'rpm-package': - return 'package'; - default: - return type; - } -} -function hashStream(hashName, stream) { - return new Promise((c, e) => { - const shasum = crypto.createHash(hashName); - stream - .on('data', shasum.update.bind(shasum)) - .on('error', e) - .on('close', () => c(shasum.digest('hex'))); - }); -} -function getEnv(name) { - const result = process.env[name]; - if (typeof result === 'undefined') { - throw new Error('Missing env: ' + name); - } - return result; -} -async function main() { - const [, , product, os, arch, unprocessedType, fileName, filePath] = process.argv; - // getPlatform needs the unprocessedType - const platform = getPlatform(product, os, arch, unprocessedType); - const type = getRealType(unprocessedType); - const quality = getEnv('VSCODE_QUALITY'); - const commit = getEnv('BUILD_SOURCEVERSION'); - console.log('Creating asset...'); - const stat = await new Promise((c, e) => fs.stat(filePath, (err, stat) => err ? e(err) : c(stat))); - const size = stat.size; - console.log('Size:', size); - const stream = fs.createReadStream(filePath); - const [sha1hash, sha256hash] = await Promise.all([hashStream('sha1', stream), hashStream('sha256', stream)]); - console.log('SHA1:', sha1hash); - console.log('SHA256:', sha256hash); - const blobName = commit + '/' + fileName; - const storagePipelineOptions = { retryOptions: { retryPolicyType: storage_blob_1.StorageRetryPolicyType.EXPONENTIAL, maxTries: 6, tryTimeoutInMs: 10 * 60 * 1000 } }; - const credential = new identity_1.ClientSecretCredential(process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], process.env['AZURE_CLIENT_SECRET']); - 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 blobOptions = { - blobHTTPHeaders: { - blobContentType: mime.lookup(filePath), - blobContentDisposition: `attachment; filename="${fileName}"`, - blobCacheControl: 'max-age=31536000, public' - } - }; - const uploadPromises = []; - uploadPromises.push((async () => { - console.log(`Checking for blob in Azure...`); - if (await (0, retry_1.retry)(() => blobClient.exists())) { - throw new Error(`Blob ${quality}, ${blobName} already exists, not publishing again.`); - } - else { - await (0, retry_1.retry)(async (attempt) => { - console.log(`Uploading blobs to Azure storage (attempt ${attempt})...`); - 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((async () => { - console.log(`Checking for blob in Mooncake Azure...`); - if (await (0, retry_1.retry)(() => mooncakeBlobClient.exists())) { - throw new Error(`Mooncake Blob ${quality}, ${blobName} already exists, not publishing again.`); - } - else { - await (0, retry_1.retry)(async (attempt) => { - console.log(`Uploading blobs to Mooncake Azure storage (attempt ${attempt})...`); - await mooncakeBlobClient.uploadFile(filePath, blobOptions); - console.log('Blob successfully uploaded to Mooncake Azure storage.'); - }); - } - })()); - } - const promiseResults = await Promise.allSettled(uploadPromises); - const rejectedPromiseResults = promiseResults.filter(result => result.status === 'rejected'); - if (rejectedPromiseResults.length === 0) { - console.log('All blobs successfully uploaded.'); - } - else if (rejectedPromiseResults[0]?.reason?.message?.includes('already exists')) { - console.warn(rejectedPromiseResults[0].reason.message); - console.log('Some blobs successfully uploaded.'); - } - else { - // eslint-disable-next-line no-throw-literal - throw rejectedPromiseResults[0]?.reason; - } - const assetUrl = `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`; - const blobPath = new URL(assetUrl).pathname; - const mooncakeUrl = `${process.env['MOONCAKE_CDN_URL']}${blobPath}`; - const asset = { - platform, - type, - url: assetUrl, - hash: sha1hash, - mooncakeUrl, - sha256hash, - size - }; - // Remove this if we ever need to rollback fast updates for windows - if (/win32/.test(platform)) { - asset.supportsFastUpdate = true; - } - console.log('Asset:', JSON.stringify(asset, null, ' ')); - const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], aadCredentials: credential }); - const scripts = client.database('builds').container(quality).scripts; - await (0, retry_1.retry)(() => scripts.storedProcedure('createAsset').execute('', [commit, asset, true])); - console.log(` Done ✔️`); -} -main().then(() => { - console.log('Asset successfully created'); - process.exit(0); -}, err => { - console.error(err); - process.exit(1); -}); -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"createAsset.js","sourceRoot":"","sources":["createAsset.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/build/azure-pipelines/common/createAsset.ts b/build/azure-pipelines/common/createAsset.ts deleted file mode 100644 index ee08d4ae6a5..00000000000 --- a/build/azure-pipelines/common/createAsset.ts +++ /dev/null @@ -1,283 +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 fs from 'fs'; -import { Readable } from 'stream'; -import * as crypto from 'crypto'; -import { BlobServiceClient, BlockBlobParallelUploadOptions, StoragePipelineOptions, StorageRetryPolicyType } from '@azure/storage-blob'; -import * as mime from 'mime'; -import { CosmosClient } from '@azure/cosmos'; -import { ClientSecretCredential } from '@azure/identity'; -import { retry } from './retry'; - -interface Asset { - platform: string; - type: string; - url: string; - mooncakeUrl?: string; - hash: string; - sha256hash: string; - size: number; - supportsFastUpdate?: boolean; -} - -if (process.argv.length !== 8) { - console.error('Usage: node createAsset.js PRODUCT OS ARCH TYPE NAME FILE'); - process.exit(-1); -} - -// Contains all of the logic for mapping details to our actual product names in CosmosDB -function getPlatform(product: string, os: string, arch: string, type: string): string { - switch (os) { - case 'win32': - switch (product) { - case 'client': { - switch (type) { - case 'archive': - return `win32-${arch}-archive`; - case 'setup': - return `win32-${arch}`; - case 'user-setup': - return `win32-${arch}-user`; - default: - throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); - } - } - case 'server': - if (arch === 'arm64') { - throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); - } - return `server-win32-${arch}`; - case 'web': - if (arch === 'arm64') { - throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); - } - return `server-win32-${arch}-web`; - case 'cli': - return `cli-win32-${arch}`; - default: - throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); - } - case 'alpine': - switch (product) { - case 'server': - 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}`); - } - case 'linux': - switch (type) { - case 'snap': - return `linux-snap-${arch}`; - case 'archive-unsigned': - switch (product) { - case 'client': - return `linux-${arch}`; - case 'server': - return `server-linux-${arch}`; - case 'web': - return arch === 'standalone' ? 'web-standalone' : `server-linux-${arch}-web`; - default: - throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); - } - case 'deb-package': - 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}`); - } - case 'darwin': - switch (product) { - case 'client': - if (arch === 'x64') { - return 'darwin'; - } - return `darwin-${arch}`; - case 'server': - if (arch === 'x64') { - return 'server-darwin'; - } - return `server-darwin-${arch}`; - case 'web': - if (arch === 'x64') { - return 'server-darwin-web'; - } - return `server-darwin-${arch}-web`; - case 'cli': - return `cli-darwin-${arch}`; - default: - throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); - } - default: - throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); - } -} - -// Contains all of the logic for mapping types to our actual types in CosmosDB -function getRealType(type: string) { - switch (type) { - case 'user-setup': - return 'setup'; - case 'deb-package': - case 'rpm-package': - return 'package'; - default: - return type; - } -} - -function hashStream(hashName: string, stream: Readable): Promise { - return new Promise((c, e) => { - const shasum = crypto.createHash(hashName); - - stream - .on('data', shasum.update.bind(shasum)) - .on('error', e) - .on('close', () => c(shasum.digest('hex'))); - }); -} - -function getEnv(name: string): string { - const result = process.env[name]; - - if (typeof result === 'undefined') { - throw new Error('Missing env: ' + name); - } - - return result; -} - -async function main(): Promise { - const [, , product, os, arch, unprocessedType, fileName, filePath] = process.argv; - // getPlatform needs the unprocessedType - const platform = getPlatform(product, os, arch, unprocessedType); - const type = getRealType(unprocessedType); - const quality = getEnv('VSCODE_QUALITY'); - const commit = getEnv('BUILD_SOURCEVERSION'); - - console.log('Creating asset...'); - - const stat = await new Promise((c, e) => fs.stat(filePath, (err, stat) => err ? e(err) : c(stat))); - const size = stat.size; - - console.log('Size:', size); - - const stream = fs.createReadStream(filePath); - const [sha1hash, sha256hash] = await Promise.all([hashStream('sha1', stream), hashStream('sha256', stream)]); - - console.log('SHA1:', sha1hash); - console.log('SHA256:', sha256hash); - - const blobName = commit + '/' + fileName; - - const storagePipelineOptions: StoragePipelineOptions = { retryOptions: { retryPolicyType: StorageRetryPolicyType.EXPONENTIAL, maxTries: 6, tryTimeoutInMs: 10 * 60 * 1000 } }; - - const credential = new ClientSecretCredential(process.env['AZURE_TENANT_ID']!, process.env['AZURE_CLIENT_ID']!, process.env['AZURE_CLIENT_SECRET']!); - const blobServiceClient = new BlobServiceClient(`https://vscode.blob.core.windows.net`, credential, storagePipelineOptions); - const containerClient = blobServiceClient.getContainerClient(quality); - const blobClient = containerClient.getBlockBlobClient(blobName); - - const blobOptions: BlockBlobParallelUploadOptions = { - blobHTTPHeaders: { - blobContentType: mime.lookup(filePath), - blobContentDisposition: `attachment; filename="${fileName}"`, - blobCacheControl: 'max-age=31536000, public' - } - }; - - const uploadPromises: Promise[] = []; - - uploadPromises.push((async () => { - console.log(`Checking for blob in Azure...`); - - if (await retry(() => blobClient.exists())) { - throw new Error(`Blob ${quality}, ${blobName} already exists, not publishing again.`); - } else { - await retry(async (attempt) => { - console.log(`Uploading blobs to Azure storage (attempt ${attempt})...`); - 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 ClientSecretCredential(process.env['AZURE_MOONCAKE_TENANT_ID']!, process.env['AZURE_MOONCAKE_CLIENT_ID']!, process.env['AZURE_MOONCAKE_CLIENT_SECRET']!); - const mooncakeBlobServiceClient = new BlobServiceClient(`https://vscode.blob.core.chinacloudapi.cn`, mooncakeCredential, storagePipelineOptions); - const mooncakeContainerClient = mooncakeBlobServiceClient.getContainerClient(quality); - const mooncakeBlobClient = mooncakeContainerClient.getBlockBlobClient(blobName); - - uploadPromises.push((async () => { - console.log(`Checking for blob in Mooncake Azure...`); - - if (await retry(() => mooncakeBlobClient.exists())) { - throw new Error(`Mooncake Blob ${quality}, ${blobName} already exists, not publishing again.`); - } else { - await retry(async (attempt) => { - console.log(`Uploading blobs to Mooncake Azure storage (attempt ${attempt})...`); - await mooncakeBlobClient.uploadFile(filePath, blobOptions); - console.log('Blob successfully uploaded to Mooncake Azure storage.'); - }); - } - })()); - } - - const promiseResults = await Promise.allSettled(uploadPromises); - const rejectedPromiseResults = promiseResults.filter(result => result.status === 'rejected') as PromiseRejectedResult[]; - - if (rejectedPromiseResults.length === 0) { - console.log('All blobs successfully uploaded.'); - } else if (rejectedPromiseResults[0]?.reason?.message?.includes('already exists')) { - console.warn(rejectedPromiseResults[0].reason.message); - console.log('Some blobs successfully uploaded.'); - } else { - // eslint-disable-next-line no-throw-literal - throw rejectedPromiseResults[0]?.reason; - } - - const assetUrl = `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`; - const blobPath = new URL(assetUrl).pathname; - const mooncakeUrl = `${process.env['MOONCAKE_CDN_URL']}${blobPath}`; - - const asset: Asset = { - platform, - type, - url: assetUrl, - hash: sha1hash, - mooncakeUrl, - sha256hash, - size - }; - - // Remove this if we ever need to rollback fast updates for windows - if (/win32/.test(platform)) { - asset.supportsFastUpdate = true; - } - - console.log('Asset:', JSON.stringify(asset, null, ' ')); - - const client = new CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT']!, aadCredentials: credential }); - const scripts = client.database('builds').container(quality).scripts; - await retry(() => scripts.storedProcedure('createAsset').execute('', [commit, asset, true])); - - console.log(` Done ✔️`); -} - -main().then(() => { - console.log('Asset successfully created'); - process.exit(0); -}, err => { - console.error(err); - process.exit(1); -}); diff --git a/build/azure-pipelines/common/createBuild.js b/build/azure-pipelines/common/createBuild.js index 63f22ea6001..29c3448edc1 100644 --- a/build/azure-pipelines/common/createBuild.js +++ b/build/azure-pipelines/common/createBuild.js @@ -52,4 +52,4 @@ main().then(() => { console.error(err); process.exit(1); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlQnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjcmVhdGVCdWlsZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7O0FBRWhHLDhDQUF5RDtBQUN6RCwwQ0FBNkM7QUFDN0MsbUNBQWdDO0FBRWhDLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7SUFDL0IsT0FBTyxDQUFDLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO0lBQ3BELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNsQixDQUFDO0FBRUQsU0FBUyxNQUFNLENBQUMsSUFBWTtJQUMzQixNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRWpDLElBQUksT0FBTyxNQUFNLEtBQUssV0FBVyxFQUFFLENBQUM7UUFDbkMsTUFBTSxJQUFJLEtBQUssQ0FBQyxlQUFlLEdBQUcsSUFBSSxDQUFDLENBQUM7SUFDekMsQ0FBQztJQUVELE9BQU8sTUFBTSxDQUFDO0FBQ2YsQ0FBQztBQUVELEtBQUssVUFBVSxJQUFJO0lBQ2xCLE1BQU0sQ0FBQyxFQUFFLEFBQUQsRUFBRyxRQUFRLENBQUMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDO0lBQ3BDLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQ3pDLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0lBQzdDLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQzFDLE1BQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0lBQ2xELE1BQU0sT0FBTyxHQUFHLFFBQVEsR0FBRyxDQUFDLE9BQU8sS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBRXZFLE9BQU8sQ0FBQyxHQUFHLENBQUMsbUJBQW1CLENBQUMsQ0FBQztJQUNqQyxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUNqQyxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUNqQyxPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUUvQixNQUFNLEtBQUssR0FBRztRQUNiLEVBQUUsRUFBRSxNQUFNO1FBQ1YsU0FBUyxFQUFFLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRTtRQUNqQyxPQUFPO1FBQ1AsVUFBVSxFQUFFLEtBQUs7UUFDakIsT0FBTyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsc0JBQXNCLENBQUMsRUFBRSxXQUFXLEVBQUUsS0FBSyxNQUFNO1FBQ3RFLFlBQVk7UUFDWixRQUFRO1FBQ1IsTUFBTSxFQUFFLEVBQUU7UUFDVixPQUFPLEVBQUUsRUFBRTtLQUNYLENBQUM7SUFFRixNQUFNLGNBQWMsR0FBRyxJQUFJLGlDQUFzQixDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUUsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFFLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBRSxDQUFDLENBQUM7SUFDekosTUFBTSxNQUFNLEdBQUcsSUFBSSxxQkFBWSxDQUFDLEVBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsMkJBQTJCLENBQUUsRUFBRSxjQUFjLEVBQUUsQ0FBQyxDQUFDO0lBQ3pHLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLE9BQU8sQ0FBQztJQUNyRSxNQUFNLElBQUEsYUFBSyxFQUFDLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLEVBQUUsR0FBRyxLQUFLLEVBQUUsYUFBYSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQzFHLENBQUM7QUFFRCxJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFO0lBQ2hCLE9BQU8sQ0FBQyxHQUFHLENBQUMsNEJBQTRCLENBQUMsQ0FBQztJQUMxQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2pCLENBQUMsRUFBRSxHQUFHLENBQUMsRUFBRTtJQUNSLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDbkIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNqQixDQUFDLENBQUMsQ0FBQyJ9 \ No newline at end of file +//# sourceMappingURL=createBuild.js.map \ No newline at end of file diff --git a/build/azure-pipelines/common/installPlaywright.js b/build/azure-pipelines/common/installPlaywright.js index 8b4214dd5f6..4f25e5b5712 100644 --- a/build/azure-pipelines/common/installPlaywright.js +++ b/build/azure-pipelines/common/installPlaywright.js @@ -9,4 +9,4 @@ async function install() { await installDefaultBrowsersForNpmInstall(); } install(); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdGFsbFBsYXl3cmlnaHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbnN0YWxsUGxheXdyaWdodC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7QUFFaEcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEdBQUMsWUFBWSxDQUFDLENBQUMsaUZBQWlGO0FBRWpILE1BQU0sRUFBRSxtQ0FBbUMsRUFBRSxHQUFHLE9BQU8sQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO0FBRXRGLEtBQUssVUFBVSxPQUFPO0lBQ3JCLE1BQU0sbUNBQW1DLEVBQUUsQ0FBQztBQUM3QyxDQUFDO0FBRUQsT0FBTyxFQUFFLENBQUMifQ== \ No newline at end of file +//# sourceMappingURL=installPlaywright.js.map \ No newline at end of file diff --git a/build/azure-pipelines/common/listNodeModules.js b/build/azure-pipelines/common/listNodeModules.js index dae243a211f..aaa44c51a12 100644 --- a/build/azure-pipelines/common/listNodeModules.js +++ b/build/azure-pipelines/common/listNodeModules.js @@ -38,4 +38,4 @@ function findNodeModulesFiles(location, inNodeModules, result) { const result = []; findNodeModulesFiles('', false, result); fs.writeFileSync(process.argv[2], result.join('\n') + '\n'); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlzdE5vZGVNb2R1bGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibGlzdE5vZGVNb2R1bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7QUFFaEcseUJBQXlCO0FBQ3pCLDZCQUE2QjtBQUU3QixJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO0lBQy9CLE9BQU8sQ0FBQyxLQUFLLENBQUMsNENBQTRDLENBQUMsQ0FBQztJQUM1RCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDbEIsQ0FBQztBQUVELE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLFdBQVcsQ0FBQyxDQUFDO0FBRS9DLFNBQVMsb0JBQW9CLENBQUMsUUFBZ0IsRUFBRSxhQUFzQixFQUFFLE1BQWdCO0lBQ3ZGLE1BQU0sT0FBTyxHQUFHLEVBQUUsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztJQUMxRCxLQUFLLE1BQU0sS0FBSyxJQUFJLE9BQU8sRUFBRSxDQUFDO1FBQzdCLE1BQU0sU0FBUyxHQUFHLEdBQUcsUUFBUSxJQUFJLEtBQUssRUFBRSxDQUFDO1FBRXpDLElBQUksNENBQTRDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUM7WUFDbEUsU0FBUztRQUNWLENBQUM7UUFFRCxJQUFJLElBQWMsQ0FBQztRQUNuQixJQUFJLENBQUM7WUFDSixJQUFJLEdBQUcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDO1FBQ2hELENBQUM7UUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1lBQ2QsU0FBUztRQUNWLENBQUM7UUFFRCxJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDO1lBQ3hCLG9CQUFvQixDQUFDLFNBQVMsRUFBRSxhQUFhLElBQUksQ0FBQyxLQUFLLEtBQUssY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDdEYsQ0FBQzthQUFNLENBQUM7WUFDUCxJQUFJLGFBQWEsRUFBRSxDQUFDO2dCQUNuQixNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNsQyxDQUFDO1FBQ0YsQ0FBQztJQUNGLENBQUM7QUFDRixDQUFDO0FBRUQsTUFBTSxNQUFNLEdBQWEsRUFBRSxDQUFDO0FBQzVCLG9CQUFvQixDQUFDLEVBQUUsRUFBRSxLQUFLLEVBQUUsTUFBTSxDQUFDLENBQUM7QUFDeEMsRUFBRSxDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUMifQ== \ No newline at end of file +//# sourceMappingURL=listNodeModules.js.map \ No newline at end of file diff --git a/build/azure-pipelines/common/publish.js b/build/azure-pipelines/common/publish.js new file mode 100644 index 00000000000..d035de8bb84 --- /dev/null +++ b/build/azure-pipelines/common/publish.js @@ -0,0 +1,616 @@ +"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 stream_1 = require("stream"); +const promises_1 = require("node:stream/promises"); +const yauzl = require("yauzl"); +const crypto = require("crypto"); +const retry_1 = require("./retry"); +const cosmos_1 = require("@azure/cosmos"); +const identity_1 = require("@azure/identity"); +const cp = require("child_process"); +const os = require("os"); +const node_worker_threads_1 = require("node:worker_threads"); +function e(name) { + const result = process.env[name]; + if (typeof result !== 'string') { + throw new Error(`Missing env: ${name}`); + } + return result; +} +class Temp { + _files = []; + tmpNameSync() { + const file = path.join(os.tmpdir(), crypto.randomBytes(20).toString('hex')); + this._files.push(file); + return file; + } + dispose() { + for (const file of this._files) { + try { + fs.unlinkSync(file); + } + catch (err) { + // noop + } + } + } +} +class ProvisionService { + log; + accessToken; + constructor(log, accessToken) { + this.log = log; + this.accessToken = accessToken; + } + async provision(releaseId, fileId, fileName) { + const body = JSON.stringify({ + ReleaseId: releaseId, + PortalName: 'VSCode', + PublisherCode: 'VSCode', + ProvisionedFilesCollection: [{ + PublisherKey: fileId, + IsStaticFriendlyFileName: true, + FriendlyFileName: fileName, + MaxTTL: '1440', + CdnMappings: ['ECN'] + }] + }); + this.log(`Provisioning ${fileName} (releaseId: ${releaseId}, fileId: ${fileId})...`); + const res = await (0, retry_1.retry)(() => this.request('POST', '/api/v2/ProvisionedFiles/CreateProvisionedFiles', { body })); + if (!res.IsSuccess) { + throw new Error(`Failed to submit provisioning request: ${JSON.stringify(res.ErrorDetails)}`); + } + this.log(`Successfully provisioned ${fileName}`); + } + async request(method, url, options) { + const opts = { + method, + body: options?.body, + headers: { + Authorization: `Bearer ${this.accessToken}`, + 'Content-Type': 'application/json' + } + }; + const res = await fetch(`https://dsprovisionapi.microsoft.com${url}`, opts); + if (!res.ok || res.status < 200 || res.status >= 500) { + throw new Error(`Unexpected status code: ${res.status}`); + } + return await res.json(); + } +} +function hashStream(hashName, stream) { + return new Promise((c, e) => { + const shasum = crypto.createHash(hashName); + stream + .on('data', shasum.update.bind(shasum)) + .on('error', e) + .on('close', () => c(shasum.digest('hex'))); + }); +} +class ESRPClient { + log; + tmp; + authPath; + constructor(log, tmp, tenantId, clientId, authCertSubjectName, requestSigningCertSubjectName) { + this.log = log; + this.tmp = tmp; + this.authPath = this.tmp.tmpNameSync(); + fs.writeFileSync(this.authPath, JSON.stringify({ + Version: '1.0.0', + AuthenticationType: 'AAD_CERT', + TenantId: tenantId, + ClientId: clientId, + AuthCert: { + SubjectName: authCertSubjectName, + StoreLocation: 'LocalMachine', + StoreName: 'My', + SendX5c: 'true' + }, + RequestSigningCert: { + SubjectName: requestSigningCertSubjectName, + StoreLocation: 'LocalMachine', + StoreName: 'My' + } + })); + } + async release(version, filePath) { + this.log(`Submitting release for ${version}: ${filePath}`); + const submitReleaseResult = await this.SubmitRelease(version, filePath); + if (submitReleaseResult.submissionResponse.statusCode !== 'pass') { + throw new Error(`Unexpected status code: ${submitReleaseResult.submissionResponse.statusCode}`); + } + const releaseId = submitReleaseResult.submissionResponse.operationId; + this.log(`Successfully submitted release ${releaseId}. Polling for completion...`); + let details; + // Poll every 5 seconds, wait 60 minutes max -> poll 60/5*60=720 times + for (let i = 0; i < 720; i++) { + details = await this.ReleaseDetails(releaseId); + if (details.releaseDetails[0].statusCode === 'pass') { + break; + } + else if (details.releaseDetails[0].statusCode !== 'inprogress') { + throw new Error(`Failed to submit release: ${JSON.stringify(details)}`); + } + await new Promise(c => setTimeout(c, 5000)); + } + if (details.releaseDetails[0].statusCode !== 'pass') { + throw new Error(`Timed out waiting for release ${releaseId}: ${JSON.stringify(details)}`); + } + const fileId = details.releaseDetails[0].fileDetails[0].publisherKey; + this.log('Release completed successfully with fileId: ', fileId); + return { releaseId, fileId }; + } + async SubmitRelease(version, filePath) { + const policyPath = this.tmp.tmpNameSync(); + fs.writeFileSync(policyPath, JSON.stringify({ + Version: '1.0.0', + Audience: 'InternalLimited', + Intent: 'distribution', + ContentType: 'InstallPackage' + })); + const inputPath = this.tmp.tmpNameSync(); + const size = fs.statSync(filePath).size; + const istream = fs.createReadStream(filePath); + const sha256 = await hashStream('sha256', istream); + fs.writeFileSync(inputPath, JSON.stringify({ + Version: '1.0.0', + ReleaseInfo: { + ReleaseMetadata: { + Title: 'VS Code', + Properties: { + ReleaseContentType: 'InstallPackage' + }, + MinimumNumberOfApprovers: 1 + }, + ProductInfo: { + Name: 'VS Code', + Version: version, + Description: path.basename(filePath, path.extname(filePath)), + }, + Owners: [ + { + Owner: { + UserPrincipalName: 'jomo@microsoft.com' + } + } + ], + Approvers: [ + { + Approver: { + UserPrincipalName: 'jomo@microsoft.com' + }, + IsAutoApproved: true, + IsMandatory: false + } + ], + AccessPermissions: { + MainPublisher: 'VSCode', + ChannelDownloadEntityDetails: { + Consumer: ['VSCode'] + } + }, + CreatedBy: { + UserPrincipalName: 'jomo@microsoft.com' + } + }, + ReleaseBatches: [ + { + ReleaseRequestFiles: [ + { + SizeInBytes: size, + SourceHash: sha256, + HashType: 'SHA256', + SourceLocation: path.basename(filePath) + } + ], + SourceLocationType: 'UNC', + SourceRootDirectory: path.dirname(filePath), + DestinationLocationType: 'AzureBlob' + } + ] + })); + const outputPath = this.tmp.tmpNameSync(); + cp.execSync(`ESRPClient SubmitRelease -a ${this.authPath} -p ${policyPath} -i ${inputPath} -o ${outputPath}`, { stdio: 'inherit' }); + const output = fs.readFileSync(outputPath, 'utf8'); + return JSON.parse(output); + } + async ReleaseDetails(releaseId) { + const inputPath = this.tmp.tmpNameSync(); + fs.writeFileSync(inputPath, JSON.stringify({ + Version: '1.0.0', + OperationIds: [releaseId] + })); + const outputPath = this.tmp.tmpNameSync(); + cp.execSync(`ESRPClient ReleaseDetails -a ${this.authPath} -i ${inputPath} -o ${outputPath}`, { stdio: 'inherit' }); + const output = fs.readFileSync(outputPath, 'utf8'); + return JSON.parse(output); + } +} +async function releaseAndProvision(log, releaseTenantId, releaseClientId, releaseAuthCertSubjectName, releaseRequestSigningCertSubjectName, provisionTenantId, provisionAADUsername, provisionAADPassword, version, quality, filePath) { + const fileName = `${quality}/${version}/${path.basename(filePath)}`; + const result = `${e('PRSS_CDN_URL')}/${fileName}`; + const res = await (0, retry_1.retry)(() => fetch(result)); + if (res.status === 200) { + log(`Already released and provisioned: ${result}`); + return result; + } + const tmp = new Temp(); + process.on('exit', () => tmp.dispose()); + const esrpclient = new ESRPClient(log, tmp, releaseTenantId, releaseClientId, releaseAuthCertSubjectName, releaseRequestSigningCertSubjectName); + const release = await esrpclient.release(version, filePath); + const credential = new identity_1.ClientSecretCredential(provisionTenantId, provisionAADUsername, provisionAADPassword); + const accessToken = await credential.getToken(['https://microsoft.onmicrosoft.com/DS.Provisioning.WebApi/.default']); + const service = new ProvisionService(log, accessToken.token); + await service.provision(release.releaseId, release.fileId, fileName); + return result; +} +class State { + statePath; + set = new Set(); + constructor() { + const pipelineWorkspacePath = e('PIPELINE_WORKSPACE'); + const previousState = fs.readdirSync(pipelineWorkspacePath) + .map(name => /^artifacts_processed_(\d+)$/.exec(name)) + .filter((match) => !!match) + .map(match => ({ name: match[0], attempt: Number(match[1]) })) + .sort((a, b) => b.attempt - a.attempt)[0]; + if (previousState) { + const previousStatePath = path.join(pipelineWorkspacePath, previousState.name, previousState.name + '.txt'); + fs.readFileSync(previousStatePath, 'utf8').split(/\n/).filter(name => !!name).forEach(name => this.set.add(name)); + } + const stageAttempt = e('SYSTEM_STAGEATTEMPT'); + this.statePath = path.join(pipelineWorkspacePath, `artifacts_processed_${stageAttempt}`, `artifacts_processed_${stageAttempt}.txt`); + fs.mkdirSync(path.dirname(this.statePath), { recursive: true }); + fs.writeFileSync(this.statePath, [...this.set.values()].map(name => `${name}\n`).join('')); + } + get size() { + return this.set.size; + } + has(name) { + return this.set.has(name); + } + add(name) { + this.set.add(name); + fs.appendFileSync(this.statePath, `${name}\n`); + } + [Symbol.iterator]() { + return this.set[Symbol.iterator](); + } +} +const azdoFetchOptions = { + headers: { + // Pretend we're a web browser to avoid download rate limits + 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36 Edg/119.0.0.0', + 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7', + 'Accept-Encoding': 'gzip, deflate, br', + 'Accept-Language': 'en-US,en;q=0.9', + 'Referer': 'https://dev.azure.com', + Authorization: `Bearer ${e('SYSTEM_ACCESSTOKEN')}` + } +}; +async function requestAZDOAPI(path) { + const abortController = new AbortController(); + const timeout = setTimeout(() => abortController.abort(), 2 * 60 * 1000); + try { + const res = await fetch(`${e('BUILDS_API_URL')}${path}?api-version=6.0`, { ...azdoFetchOptions, signal: abortController.signal }); + if (!res.ok) { + throw new Error(`Unexpected status code: ${res.status}`); + } + return await res.json(); + } + finally { + clearTimeout(timeout); + } +} +async function getPipelineArtifacts() { + const result = await requestAZDOAPI('artifacts'); + return result.value.filter(a => /^vscode_/.test(a.name) && !/sbom$/.test(a.name)); +} +async function getPipelineTimeline() { + return await requestAZDOAPI('timeline'); +} +async function downloadArtifact(artifact, downloadPath) { + const abortController = new AbortController(); + const timeout = setTimeout(() => abortController.abort(), 4 * 60 * 1000); + try { + const res = await fetch(artifact.resource.downloadUrl, { ...azdoFetchOptions, signal: abortController.signal }); + if (!res.ok) { + throw new Error(`Unexpected status code: ${res.status}`); + } + await (0, promises_1.pipeline)(stream_1.Readable.fromWeb(res.body), fs.createWriteStream(downloadPath)); + } + finally { + clearTimeout(timeout); + } +} +async function unzip(packagePath, outputPath) { + return new Promise((resolve, reject) => { + yauzl.open(packagePath, { lazyEntries: true }, (err, zipfile) => { + if (err) { + return reject(err); + } + zipfile.on('entry', entry => { + if (/\/$/.test(entry.fileName)) { + zipfile.readEntry(); + } + else { + zipfile.openReadStream(entry, (err, istream) => { + if (err) { + return reject(err); + } + const filePath = path.join(outputPath, entry.fileName); + fs.mkdirSync(path.dirname(filePath), { recursive: true }); + const ostream = fs.createWriteStream(filePath); + ostream.on('finish', () => { + zipfile.close(); + resolve(filePath); + }); + istream?.on('error', err => reject(err)); + istream.pipe(ostream); + }); + } + }); + zipfile.readEntry(); + }); + }); +} +// Contains all of the logic for mapping details to our actual product names in CosmosDB +function getPlatform(product, os, arch, type) { + switch (os) { + case 'win32': + switch (product) { + case 'client': { + switch (type) { + case 'archive': + return `win32-${arch}-archive`; + case 'setup': + return `win32-${arch}`; + case 'user-setup': + return `win32-${arch}-user`; + default: + throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); + } + } + case 'server': + if (arch === 'arm64') { + throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); + } + return `server-win32-${arch}`; + case 'web': + if (arch === 'arm64') { + throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); + } + return `server-win32-${arch}-web`; + case 'cli': + return `cli-win32-${arch}`; + default: + throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); + } + case 'alpine': + switch (product) { + case 'server': + 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}`); + } + case 'linux': + switch (type) { + case 'snap': + return `linux-snap-${arch}`; + case 'archive-unsigned': + switch (product) { + case 'client': + return `linux-${arch}`; + case 'server': + return `server-linux-${arch}`; + case 'web': + return arch === 'standalone' ? 'web-standalone' : `server-linux-${arch}-web`; + default: + throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); + } + case 'deb-package': + 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}`); + } + case 'darwin': + switch (product) { + case 'client': + if (arch === 'x64') { + return 'darwin'; + } + return `darwin-${arch}`; + case 'server': + if (arch === 'x64') { + return 'server-darwin'; + } + return `server-darwin-${arch}`; + case 'web': + if (arch === 'x64') { + return 'server-darwin-web'; + } + return `server-darwin-${arch}-web`; + case 'cli': + return `cli-darwin-${arch}`; + default: + throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); + } + default: + throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); + } +} +// Contains all of the logic for mapping types to our actual types in CosmosDB +function getRealType(type) { + switch (type) { + case 'user-setup': + return 'setup'; + case 'deb-package': + case 'rpm-package': + return 'package'; + default: + return type; + } +} +async function processArtifact(artifact, artifactFilePath) { + const log = (...args) => console.log(`[${artifact.name}]`, ...args); + const match = /^vscode_(?[^_]+)_(?[^_]+)_(?[^_]+)_(?[^_]+)$/.exec(artifact.name); + if (!match) { + throw new Error(`Invalid artifact name: ${artifact.name}`); + } + // getPlatform needs the unprocessedType + const quality = e('VSCODE_QUALITY'); + const commit = e('BUILD_SOURCEVERSION'); + const { product, os, arch, unprocessedType } = match.groups; + const platform = getPlatform(product, os, arch, unprocessedType); + const type = getRealType(unprocessedType); + const size = fs.statSync(artifactFilePath).size; + const stream = fs.createReadStream(artifactFilePath); + const [hash, sha256hash] = await Promise.all([hashStream('sha1', stream), hashStream('sha256', stream)]); // CodeQL [SM04514] Using SHA1 only for legacy reasons, we are actually only respecting SHA256 + const url = await releaseAndProvision(log, e('RELEASE_TENANT_ID'), e('RELEASE_CLIENT_ID'), e('RELEASE_AUTH_CERT_SUBJECT_NAME'), e('RELEASE_REQUEST_SIGNING_CERT_SUBJECT_NAME'), e('PROVISION_TENANT_ID'), e('PROVISION_AAD_USERNAME'), e('PROVISION_AAD_PASSWORD'), commit, quality, artifactFilePath); + const asset = { platform, type, url, hash, sha256hash, size, supportsFastUpdate: true }; + log('Creating asset...', JSON.stringify(asset)); + await (0, retry_1.retry)(async (attempt) => { + log(`Creating asset in Cosmos DB (attempt ${attempt})...`); + const aadCredentials = new identity_1.ClientSecretCredential(e('AZURE_TENANT_ID'), e('AZURE_CLIENT_ID'), e('AZURE_CLIENT_SECRET')); + const client = new cosmos_1.CosmosClient({ endpoint: e('AZURE_DOCUMENTDB_ENDPOINT'), aadCredentials }); + const scripts = client.database('builds').container(quality).scripts; + await scripts.storedProcedure('createAsset').execute('', [commit, asset, true]); + }); + log('Asset successfully created'); +} +// It is VERY important that we don't download artifacts too much too fast from AZDO. +// AZDO throttles us SEVERELY if we do. Not just that, but they also close open +// sockets, so the whole things turns to a grinding halt. So, downloading and extracting +// happens serially in the main thread, making the downloads are spaced out +// properly. For each extracted artifact, we spawn a worker thread to upload it to +// the CDN and finally update the build in Cosmos DB. +async function main() { + if (!node_worker_threads_1.isMainThread) { + const { artifact, artifactFilePath } = node_worker_threads_1.workerData; + await processArtifact(artifact, artifactFilePath); + return; + } + const done = new State(); + const processing = new Set(); + for (const name of done) { + console.log(`\u2705 ${name}`); + } + const stages = new Set(['Compile', 'CompileCLI']); + if (e('VSCODE_BUILD_STAGE_WINDOWS') === 'True') { + stages.add('Windows'); + } + if (e('VSCODE_BUILD_STAGE_LINUX') === 'True') { + stages.add('Linux'); + } + if (e('VSCODE_BUILD_STAGE_ALPINE') === 'True') { + stages.add('Alpine'); + } + if (e('VSCODE_BUILD_STAGE_MACOS') === 'True') { + stages.add('macOS'); + } + if (e('VSCODE_BUILD_STAGE_WEB') === 'True') { + stages.add('Web'); + } + let resultPromise = Promise.resolve([]); + const operations = []; + while (true) { + const [timeline, artifacts] = await Promise.all([(0, retry_1.retry)(() => getPipelineTimeline()), (0, retry_1.retry)(() => getPipelineArtifacts())]); + const stagesCompleted = new Set(timeline.records.filter(r => r.type === 'Stage' && r.state === 'completed' && stages.has(r.name)).map(r => r.name)); + const stagesInProgress = [...stages].filter(s => !stagesCompleted.has(s)); + const artifactsInProgress = artifacts.filter(a => processing.has(a.name)); + if (stagesInProgress.length === 0 && artifacts.length === done.size + processing.size) { + break; + } + else if (stagesInProgress.length > 0) { + console.log('Stages in progress:', stagesInProgress.join(', ')); + } + else if (artifactsInProgress.length > 0) { + console.log('Artifacts in progress:', artifactsInProgress.map(a => a.name).join(', ')); + } + else { + console.log(`Waiting for a total of ${artifacts.length}, ${done.size} done, ${processing.size} in progress...`); + } + for (const artifact of artifacts) { + if (done.has(artifact.name) || processing.has(artifact.name)) { + continue; + } + console.log(`[${artifact.name}] Found new artifact`); + const artifactZipPath = path.join(e('AGENT_TEMPDIRECTORY'), `${artifact.name}.zip`); + await (0, retry_1.retry)(async (attempt) => { + const start = Date.now(); + console.log(`[${artifact.name}] Downloading (attempt ${attempt})...`); + await downloadArtifact(artifact, artifactZipPath); + const archiveSize = fs.statSync(artifactZipPath).size; + const downloadDurationS = (Date.now() - start) / 1000; + const downloadSpeedKBS = Math.round((archiveSize / 1024) / downloadDurationS); + console.log(`[${artifact.name}] Successfully downloaded after ${Math.floor(downloadDurationS)} seconds(${downloadSpeedKBS} KB/s).`); + }); + const artifactFilePath = await unzip(artifactZipPath, e('AGENT_TEMPDIRECTORY')); + const artifactSize = fs.statSync(artifactFilePath).size; + if (artifactSize !== Number(artifact.resource.properties.artifactsize)) { + console.log(`[${artifact.name}] Artifact size mismatch.Expected ${artifact.resource.properties.artifactsize}. Actual ${artifactSize} `); + throw new Error(`Artifact size mismatch.`); + } + processing.add(artifact.name); + const promise = new Promise((resolve, reject) => { + const worker = new node_worker_threads_1.Worker(__filename, { workerData: { artifact, artifactFilePath } }); + worker.on('error', reject); + worker.on('exit', code => { + if (code === 0) { + resolve(); + } + else { + reject(new Error(`[${artifact.name}] Worker stopped with exit code ${code}`)); + } + }); + }); + const operation = promise.then(() => { + processing.delete(artifact.name); + done.add(artifact.name); + console.log(`\u2705 ${artifact.name} `); + }); + operations.push({ name: artifact.name, operation }); + resultPromise = Promise.allSettled(operations.map(o => o.operation)); + } + await new Promise(c => setTimeout(c, 10000)); + } + console.log(`Found all ${done.size + processing.size} artifacts, waiting for ${processing.size} artifacts to finish publishing...`); + const artifactsInProgress = operations.filter(o => processing.has(o.name)); + if (artifactsInProgress.length > 0) { + console.log('Artifacts in progress:', artifactsInProgress.map(a => a.name).join(', ')); + } + const results = await resultPromise; + for (let i = 0; i < operations.length; i++) { + const result = results[i]; + if (result.status === 'rejected') { + console.error(`[${operations[i].name}]`, result.reason); + } + } + if (results.some(r => r.status === 'rejected')) { + throw new Error('Some artifacts failed to publish'); + } + console.log(`All ${done.size} artifacts published!`); +} +if (require.main === module) { + main().then(() => { + process.exit(0); + }, err => { + console.error(err); + process.exit(1); + }); +} +//# sourceMappingURL=publish.js.map \ No newline at end of file diff --git a/build/azure-pipelines/common/publish.ts b/build/azure-pipelines/common/publish.ts new file mode 100644 index 00000000000..6b20492c87c --- /dev/null +++ b/build/azure-pipelines/common/publish.ts @@ -0,0 +1,805 @@ +/*--------------------------------------------------------------------------------------------- + * 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 { Readable } from 'stream'; +import type { ReadableStream } from 'stream/web'; +import { pipeline } from 'node:stream/promises'; +import * as yauzl from 'yauzl'; +import * as crypto from 'crypto'; +import { retry } from './retry'; +import { CosmosClient } from '@azure/cosmos'; +import { ClientSecretCredential } from '@azure/identity'; +import * as cp from 'child_process'; +import * as os from 'os'; +import { Worker, isMainThread, workerData } from 'node:worker_threads'; + +function e(name: string): string { + const result = process.env[name]; + + if (typeof result !== 'string') { + throw new Error(`Missing env: ${name}`); + } + + return result; +} + +class Temp { + private _files: string[] = []; + + tmpNameSync(): string { + const file = path.join(os.tmpdir(), crypto.randomBytes(20).toString('hex')); + this._files.push(file); + return file; + } + + dispose(): void { + for (const file of this._files) { + try { + fs.unlinkSync(file); + } catch (err) { + // noop + } + } + } +} + +interface RequestOptions { + readonly body?: string; +} + +interface CreateProvisionedFilesSuccessResponse { + IsSuccess: true; + ErrorDetails: null; +} + +interface CreateProvisionedFilesErrorResponse { + IsSuccess: false; + ErrorDetails: { + Code: string; + Category: string; + Message: string; + CanRetry: boolean; + AdditionalProperties: Record; + }; +} + +type CreateProvisionedFilesResponse = CreateProvisionedFilesSuccessResponse | CreateProvisionedFilesErrorResponse; + +class ProvisionService { + + constructor( + private readonly log: (...args: any[]) => void, + private readonly accessToken: string + ) { } + + async provision(releaseId: string, fileId: string, fileName: string) { + const body = JSON.stringify({ + ReleaseId: releaseId, + PortalName: 'VSCode', + PublisherCode: 'VSCode', + ProvisionedFilesCollection: [{ + PublisherKey: fileId, + IsStaticFriendlyFileName: true, + FriendlyFileName: fileName, + MaxTTL: '1440', + CdnMappings: ['ECN'] + }] + }); + + this.log(`Provisioning ${fileName} (releaseId: ${releaseId}, fileId: ${fileId})...`); + const res = await retry(() => this.request('POST', '/api/v2/ProvisionedFiles/CreateProvisionedFiles', { body })); + + if (!res.IsSuccess) { + throw new Error(`Failed to submit provisioning request: ${JSON.stringify(res.ErrorDetails)}`); + } + + this.log(`Successfully provisioned ${fileName}`); + } + + private async request(method: string, url: string, options?: RequestOptions): Promise { + const opts: RequestInit = { + method, + body: options?.body, + headers: { + Authorization: `Bearer ${this.accessToken}`, + 'Content-Type': 'application/json' + } + }; + + const res = await fetch(`https://dsprovisionapi.microsoft.com${url}`, opts); + + if (!res.ok || res.status < 200 || res.status >= 500) { + throw new Error(`Unexpected status code: ${res.status}`); + } + + return await res.json(); + } +} + +function hashStream(hashName: string, stream: Readable): Promise { + return new Promise((c, e) => { + const shasum = crypto.createHash(hashName); + + stream + .on('data', shasum.update.bind(shasum)) + .on('error', e) + .on('close', () => c(shasum.digest('hex'))); + }); +} + +interface Release { + readonly releaseId: string; + readonly fileId: string; +} + +interface SubmitReleaseResult { + submissionResponse: { + operationId: string; + statusCode: string; + }; +} + +interface ReleaseDetailsResult { + releaseDetails: [{ + fileDetails: [{ publisherKey: string }]; + statusCode: 'inprogress' | 'pass'; + }]; +} + +class ESRPClient { + + private readonly authPath: string; + + constructor( + private readonly log: (...args: any[]) => void, + private readonly tmp: Temp, + tenantId: string, + clientId: string, + authCertSubjectName: string, + requestSigningCertSubjectName: string, + ) { + this.authPath = this.tmp.tmpNameSync(); + fs.writeFileSync(this.authPath, JSON.stringify({ + Version: '1.0.0', + AuthenticationType: 'AAD_CERT', + TenantId: tenantId, + ClientId: clientId, + AuthCert: { + SubjectName: authCertSubjectName, + StoreLocation: 'LocalMachine', + StoreName: 'My', + SendX5c: 'true' + }, + RequestSigningCert: { + SubjectName: requestSigningCertSubjectName, + StoreLocation: 'LocalMachine', + StoreName: 'My' + } + })); + } + + async release( + version: string, + filePath: string + ): Promise { + this.log(`Submitting release for ${version}: ${filePath}`); + const submitReleaseResult = await this.SubmitRelease(version, filePath); + + if (submitReleaseResult.submissionResponse.statusCode !== 'pass') { + throw new Error(`Unexpected status code: ${submitReleaseResult.submissionResponse.statusCode}`); + } + + const releaseId = submitReleaseResult.submissionResponse.operationId; + this.log(`Successfully submitted release ${releaseId}. Polling for completion...`); + + let details!: ReleaseDetailsResult; + + // Poll every 5 seconds, wait 60 minutes max -> poll 60/5*60=720 times + for (let i = 0; i < 720; i++) { + details = await this.ReleaseDetails(releaseId); + + if (details.releaseDetails[0].statusCode === 'pass') { + break; + } else if (details.releaseDetails[0].statusCode !== 'inprogress') { + throw new Error(`Failed to submit release: ${JSON.stringify(details)}`); + } + + await new Promise(c => setTimeout(c, 5000)); + } + + if (details.releaseDetails[0].statusCode !== 'pass') { + throw new Error(`Timed out waiting for release ${releaseId}: ${JSON.stringify(details)}`); + } + + const fileId = details.releaseDetails[0].fileDetails[0].publisherKey; + this.log('Release completed successfully with fileId: ', fileId); + + return { releaseId, fileId }; + } + + private async SubmitRelease( + version: string, + filePath: string + ): Promise { + const policyPath = this.tmp.tmpNameSync(); + fs.writeFileSync(policyPath, JSON.stringify({ + Version: '1.0.0', + Audience: 'InternalLimited', + Intent: 'distribution', + ContentType: 'InstallPackage' + })); + + const inputPath = this.tmp.tmpNameSync(); + const size = fs.statSync(filePath).size; + const istream = fs.createReadStream(filePath); + const sha256 = await hashStream('sha256', istream); + fs.writeFileSync(inputPath, JSON.stringify({ + Version: '1.0.0', + ReleaseInfo: { + ReleaseMetadata: { + Title: 'VS Code', + Properties: { + ReleaseContentType: 'InstallPackage' + }, + MinimumNumberOfApprovers: 1 + }, + ProductInfo: { + Name: 'VS Code', + Version: version, + Description: path.basename(filePath, path.extname(filePath)), + }, + Owners: [ + { + Owner: { + UserPrincipalName: 'jomo@microsoft.com' + } + } + ], + Approvers: [ + { + Approver: { + UserPrincipalName: 'jomo@microsoft.com' + }, + IsAutoApproved: true, + IsMandatory: false + } + ], + AccessPermissions: { + MainPublisher: 'VSCode', + ChannelDownloadEntityDetails: { + Consumer: ['VSCode'] + } + }, + CreatedBy: { + UserPrincipalName: 'jomo@microsoft.com' + } + }, + ReleaseBatches: [ + { + ReleaseRequestFiles: [ + { + SizeInBytes: size, + SourceHash: sha256, + HashType: 'SHA256', + SourceLocation: path.basename(filePath) + } + ], + SourceLocationType: 'UNC', + SourceRootDirectory: path.dirname(filePath), + DestinationLocationType: 'AzureBlob' + } + ] + })); + + const outputPath = this.tmp.tmpNameSync(); + cp.execSync(`ESRPClient SubmitRelease -a ${this.authPath} -p ${policyPath} -i ${inputPath} -o ${outputPath}`, { stdio: 'inherit' }); + + const output = fs.readFileSync(outputPath, 'utf8'); + return JSON.parse(output) as SubmitReleaseResult; + } + + private async ReleaseDetails( + releaseId: string + ): Promise { + const inputPath = this.tmp.tmpNameSync(); + fs.writeFileSync(inputPath, JSON.stringify({ + Version: '1.0.0', + OperationIds: [releaseId] + })); + + const outputPath = this.tmp.tmpNameSync(); + cp.execSync(`ESRPClient ReleaseDetails -a ${this.authPath} -i ${inputPath} -o ${outputPath}`, { stdio: 'inherit' }); + + const output = fs.readFileSync(outputPath, 'utf8'); + return JSON.parse(output) as ReleaseDetailsResult; + } +} + +async function releaseAndProvision( + log: (...args: any[]) => void, + releaseTenantId: string, + releaseClientId: string, + releaseAuthCertSubjectName: string, + releaseRequestSigningCertSubjectName: string, + provisionTenantId: string, + provisionAADUsername: string, + provisionAADPassword: string, + version: string, + quality: string, + filePath: string +): Promise { + const fileName = `${quality}/${version}/${path.basename(filePath)}`; + const result = `${e('PRSS_CDN_URL')}/${fileName}`; + + const res = await retry(() => fetch(result)); + + if (res.status === 200) { + log(`Already released and provisioned: ${result}`); + return result; + } + + const tmp = new Temp(); + process.on('exit', () => tmp.dispose()); + + const esrpclient = new ESRPClient(log, tmp, releaseTenantId, releaseClientId, releaseAuthCertSubjectName, releaseRequestSigningCertSubjectName); + const release = await esrpclient.release(version, filePath); + + const credential = new ClientSecretCredential(provisionTenantId, provisionAADUsername, provisionAADPassword); + const accessToken = await credential.getToken(['https://microsoft.onmicrosoft.com/DS.Provisioning.WebApi/.default']); + const service = new ProvisionService(log, accessToken.token); + await service.provision(release.releaseId, release.fileId, fileName); + + return result; +} + +class State { + + private statePath: string; + private set = new Set(); + + constructor() { + const pipelineWorkspacePath = e('PIPELINE_WORKSPACE'); + const previousState = fs.readdirSync(pipelineWorkspacePath) + .map(name => /^artifacts_processed_(\d+)$/.exec(name)) + .filter((match): match is RegExpExecArray => !!match) + .map(match => ({ name: match![0], attempt: Number(match![1]) })) + .sort((a, b) => b.attempt - a.attempt)[0]; + + if (previousState) { + const previousStatePath = path.join(pipelineWorkspacePath, previousState.name, previousState.name + '.txt'); + fs.readFileSync(previousStatePath, 'utf8').split(/\n/).filter(name => !!name).forEach(name => this.set.add(name)); + } + + const stageAttempt = e('SYSTEM_STAGEATTEMPT'); + this.statePath = path.join(pipelineWorkspacePath, `artifacts_processed_${stageAttempt}`, `artifacts_processed_${stageAttempt}.txt`); + fs.mkdirSync(path.dirname(this.statePath), { recursive: true }); + fs.writeFileSync(this.statePath, [...this.set.values()].map(name => `${name}\n`).join('')); + } + + get size(): number { + return this.set.size; + } + + has(name: string): boolean { + return this.set.has(name); + } + + add(name: string): void { + this.set.add(name); + fs.appendFileSync(this.statePath, `${name}\n`); + } + + [Symbol.iterator](): IterableIterator { + return this.set[Symbol.iterator](); + } +} + +const azdoFetchOptions = { + headers: { + // Pretend we're a web browser to avoid download rate limits + 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36 Edg/119.0.0.0', + 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7', + 'Accept-Encoding': 'gzip, deflate, br', + 'Accept-Language': 'en-US,en;q=0.9', + 'Referer': 'https://dev.azure.com', + Authorization: `Bearer ${e('SYSTEM_ACCESSTOKEN')}` + } +}; + +async function requestAZDOAPI(path: string): Promise { + const abortController = new AbortController(); + const timeout = setTimeout(() => abortController.abort(), 2 * 60 * 1000); + + try { + const res = await fetch(`${e('BUILDS_API_URL')}${path}?api-version=6.0`, { ...azdoFetchOptions, signal: abortController.signal }); + + if (!res.ok) { + throw new Error(`Unexpected status code: ${res.status}`); + } + + return await res.json(); + } finally { + clearTimeout(timeout); + } +} + +interface Artifact { + readonly name: string; + readonly resource: { + readonly downloadUrl: string; + readonly properties: { + readonly artifactsize: number; + }; + }; +} + +async function getPipelineArtifacts(): Promise { + const result = await requestAZDOAPI<{ readonly value: Artifact[] }>('artifacts'); + return result.value.filter(a => /^vscode_/.test(a.name) && !/sbom$/.test(a.name)); +} + +interface Timeline { + readonly records: { + readonly name: string; + readonly type: string; + readonly state: string; + }[]; +} + +async function getPipelineTimeline(): Promise { + return await requestAZDOAPI('timeline'); +} + +async function downloadArtifact(artifact: Artifact, downloadPath: string): Promise { + const abortController = new AbortController(); + const timeout = setTimeout(() => abortController.abort(), 4 * 60 * 1000); + + try { + const res = await fetch(artifact.resource.downloadUrl, { ...azdoFetchOptions, signal: abortController.signal }); + + if (!res.ok) { + throw new Error(`Unexpected status code: ${res.status}`); + } + + await pipeline(Readable.fromWeb(res.body as ReadableStream), fs.createWriteStream(downloadPath)); + } finally { + clearTimeout(timeout); + } +} + +async function unzip(packagePath: string, outputPath: string): Promise { + return new Promise((resolve, reject) => { + yauzl.open(packagePath, { lazyEntries: true }, (err, zipfile) => { + if (err) { + return reject(err); + } + + zipfile!.on('entry', entry => { + if (/\/$/.test(entry.fileName)) { + zipfile!.readEntry(); + } else { + zipfile!.openReadStream(entry, (err, istream) => { + if (err) { + return reject(err); + } + + const filePath = path.join(outputPath, entry.fileName); + fs.mkdirSync(path.dirname(filePath), { recursive: true }); + + const ostream = fs.createWriteStream(filePath); + ostream.on('finish', () => { + zipfile!.close(); + resolve(filePath); + }); + istream?.on('error', err => reject(err)); + istream!.pipe(ostream); + }); + } + }); + + zipfile!.readEntry(); + }); + }); +} + +interface Asset { + platform: string; + type: string; + url: string; + mooncakeUrl?: string; + prssUrl?: string; + hash: string; + sha256hash: string; + size: number; + supportsFastUpdate?: boolean; +} + +// Contains all of the logic for mapping details to our actual product names in CosmosDB +function getPlatform(product: string, os: string, arch: string, type: string): string { + switch (os) { + case 'win32': + switch (product) { + case 'client': { + switch (type) { + case 'archive': + return `win32-${arch}-archive`; + case 'setup': + return `win32-${arch}`; + case 'user-setup': + return `win32-${arch}-user`; + default: + throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); + } + } + case 'server': + if (arch === 'arm64') { + throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); + } + return `server-win32-${arch}`; + case 'web': + if (arch === 'arm64') { + throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); + } + return `server-win32-${arch}-web`; + case 'cli': + return `cli-win32-${arch}`; + default: + throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); + } + case 'alpine': + switch (product) { + case 'server': + 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}`); + } + case 'linux': + switch (type) { + case 'snap': + return `linux-snap-${arch}`; + case 'archive-unsigned': + switch (product) { + case 'client': + return `linux-${arch}`; + case 'server': + return `server-linux-${arch}`; + case 'web': + return arch === 'standalone' ? 'web-standalone' : `server-linux-${arch}-web`; + default: + throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); + } + case 'deb-package': + 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}`); + } + case 'darwin': + switch (product) { + case 'client': + if (arch === 'x64') { + return 'darwin'; + } + return `darwin-${arch}`; + case 'server': + if (arch === 'x64') { + return 'server-darwin'; + } + return `server-darwin-${arch}`; + case 'web': + if (arch === 'x64') { + return 'server-darwin-web'; + } + return `server-darwin-${arch}-web`; + case 'cli': + return `cli-darwin-${arch}`; + default: + throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); + } + default: + throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`); + } +} + +// Contains all of the logic for mapping types to our actual types in CosmosDB +function getRealType(type: string) { + switch (type) { + case 'user-setup': + return 'setup'; + case 'deb-package': + case 'rpm-package': + return 'package'; + default: + return type; + } +} + +async function processArtifact(artifact: Artifact, artifactFilePath: string): Promise { + const log = (...args: any[]) => console.log(`[${artifact.name}]`, ...args); + const match = /^vscode_(?[^_]+)_(?[^_]+)_(?[^_]+)_(?[^_]+)$/.exec(artifact.name); + + if (!match) { + throw new Error(`Invalid artifact name: ${artifact.name}`); + } + + // getPlatform needs the unprocessedType + const quality = e('VSCODE_QUALITY'); + const commit = e('BUILD_SOURCEVERSION'); + const { product, os, arch, unprocessedType } = match.groups!; + const platform = getPlatform(product, os, arch, unprocessedType); + const type = getRealType(unprocessedType); + const size = fs.statSync(artifactFilePath).size; + const stream = fs.createReadStream(artifactFilePath); + const [hash, sha256hash] = await Promise.all([hashStream('sha1', stream), hashStream('sha256', stream)]); // CodeQL [SM04514] Using SHA1 only for legacy reasons, we are actually only respecting SHA256 + + const url = await releaseAndProvision( + log, + e('RELEASE_TENANT_ID'), + e('RELEASE_CLIENT_ID'), + e('RELEASE_AUTH_CERT_SUBJECT_NAME'), + e('RELEASE_REQUEST_SIGNING_CERT_SUBJECT_NAME'), + e('PROVISION_TENANT_ID'), + e('PROVISION_AAD_USERNAME'), + e('PROVISION_AAD_PASSWORD'), + commit, + quality, + artifactFilePath + ); + + const asset: Asset = { platform, type, url, hash, sha256hash, size, supportsFastUpdate: true }; + log('Creating asset...', JSON.stringify(asset)); + + await retry(async (attempt) => { + log(`Creating asset in Cosmos DB (attempt ${attempt})...`); + const aadCredentials = new ClientSecretCredential(e('AZURE_TENANT_ID'), e('AZURE_CLIENT_ID'), e('AZURE_CLIENT_SECRET')); + const client = new CosmosClient({ endpoint: e('AZURE_DOCUMENTDB_ENDPOINT'), aadCredentials }); + const scripts = client.database('builds').container(quality).scripts; + await scripts.storedProcedure('createAsset').execute('', [commit, asset, true]); + }); + + log('Asset successfully created'); +} + +// It is VERY important that we don't download artifacts too much too fast from AZDO. +// AZDO throttles us SEVERELY if we do. Not just that, but they also close open +// sockets, so the whole things turns to a grinding halt. So, downloading and extracting +// happens serially in the main thread, making the downloads are spaced out +// properly. For each extracted artifact, we spawn a worker thread to upload it to +// the CDN and finally update the build in Cosmos DB. +async function main() { + if (!isMainThread) { + const { artifact, artifactFilePath } = workerData; + await processArtifact(artifact, artifactFilePath); + return; + } + + const done = new State(); + const processing = new Set(); + + for (const name of done) { + console.log(`\u2705 ${name}`); + } + + const stages = new Set(['Compile', 'CompileCLI']); + if (e('VSCODE_BUILD_STAGE_WINDOWS') === 'True') { stages.add('Windows'); } + if (e('VSCODE_BUILD_STAGE_LINUX') === 'True') { stages.add('Linux'); } + if (e('VSCODE_BUILD_STAGE_ALPINE') === 'True') { stages.add('Alpine'); } + if (e('VSCODE_BUILD_STAGE_MACOS') === 'True') { stages.add('macOS'); } + if (e('VSCODE_BUILD_STAGE_WEB') === 'True') { stages.add('Web'); } + + let resultPromise = Promise.resolve[]>([]); + const operations: { name: string; operation: Promise }[] = []; + + while (true) { + const [timeline, artifacts] = await Promise.all([retry(() => getPipelineTimeline()), retry(() => getPipelineArtifacts())]); + const stagesCompleted = new Set(timeline.records.filter(r => r.type === 'Stage' && r.state === 'completed' && stages.has(r.name)).map(r => r.name)); + const stagesInProgress = [...stages].filter(s => !stagesCompleted.has(s)); + const artifactsInProgress = artifacts.filter(a => processing.has(a.name)); + + if (stagesInProgress.length === 0 && artifacts.length === done.size + processing.size) { + break; + } else if (stagesInProgress.length > 0) { + console.log('Stages in progress:', stagesInProgress.join(', ')); + } else if (artifactsInProgress.length > 0) { + console.log('Artifacts in progress:', artifactsInProgress.map(a => a.name).join(', ')); + } else { + console.log(`Waiting for a total of ${artifacts.length}, ${done.size} done, ${processing.size} in progress...`); + } + + for (const artifact of artifacts) { + if (done.has(artifact.name) || processing.has(artifact.name)) { + continue; + } + + console.log(`[${artifact.name}] Found new artifact`); + + const artifactZipPath = path.join(e('AGENT_TEMPDIRECTORY'), `${artifact.name}.zip`); + + await retry(async (attempt) => { + const start = Date.now(); + console.log(`[${artifact.name}] Downloading (attempt ${attempt})...`); + await downloadArtifact(artifact, artifactZipPath); + const archiveSize = fs.statSync(artifactZipPath).size; + const downloadDurationS = (Date.now() - start) / 1000; + const downloadSpeedKBS = Math.round((archiveSize / 1024) / downloadDurationS); + console.log(`[${artifact.name}] Successfully downloaded after ${Math.floor(downloadDurationS)} seconds(${downloadSpeedKBS} KB/s).`); + }); + + const artifactFilePath = await unzip(artifactZipPath, e('AGENT_TEMPDIRECTORY')); + const artifactSize = fs.statSync(artifactFilePath).size; + + if (artifactSize !== Number(artifact.resource.properties.artifactsize)) { + console.log(`[${artifact.name}] Artifact size mismatch.Expected ${artifact.resource.properties.artifactsize}. Actual ${artifactSize} `); + throw new Error(`Artifact size mismatch.`); + } + + processing.add(artifact.name); + const promise = new Promise((resolve, reject) => { + const worker = new Worker(__filename, { workerData: { artifact, artifactFilePath } }); + worker.on('error', reject); + worker.on('exit', code => { + if (code === 0) { + resolve(); + } else { + reject(new Error(`[${artifact.name}] Worker stopped with exit code ${code}`)); + } + }); + }); + + const operation = promise.then(() => { + processing.delete(artifact.name); + done.add(artifact.name); + console.log(`\u2705 ${artifact.name} `); + }); + + operations.push({ name: artifact.name, operation }); + resultPromise = Promise.allSettled(operations.map(o => o.operation)); + } + + await new Promise(c => setTimeout(c, 10_000)); + } + + console.log(`Found all ${done.size + processing.size} artifacts, waiting for ${processing.size} artifacts to finish publishing...`); + + const artifactsInProgress = operations.filter(o => processing.has(o.name)); + + if (artifactsInProgress.length > 0) { + console.log('Artifacts in progress:', artifactsInProgress.map(a => a.name).join(', ')); + } + + const results = await resultPromise; + + for (let i = 0; i < operations.length; i++) { + const result = results[i]; + + if (result.status === 'rejected') { + console.error(`[${operations[i].name}]`, result.reason); + } + } + + if (results.some(r => r.status === 'rejected')) { + throw new Error('Some artifacts failed to publish'); + } + + console.log(`All ${done.size} artifacts published!`); +} + +if (require.main === module) { + main().then(() => { + process.exit(0); + }, err => { + console.error(err); + process.exit(1); + }); +} diff --git a/build/azure-pipelines/common/releaseBuild.js b/build/azure-pipelines/common/releaseBuild.js index 1d49c6affab..c2aab2075d0 100644 --- a/build/azure-pipelines/common/releaseBuild.js +++ b/build/azure-pipelines/common/releaseBuild.js @@ -54,4 +54,4 @@ main(/^true$/i.test(force)).then(() => { console.error(err); process.exit(1); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVsZWFzZUJ1aWxkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVsZWFzZUJ1aWxkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7QUFFaEcsOENBQXlEO0FBQ3pELDBDQUE2QztBQUM3QyxtQ0FBZ0M7QUFFaEMsU0FBUyxNQUFNLENBQUMsSUFBWTtJQUMzQixNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRWpDLElBQUksT0FBTyxNQUFNLEtBQUssV0FBVyxFQUFFLENBQUM7UUFDbkMsTUFBTSxJQUFJLEtBQUssQ0FBQyxlQUFlLEdBQUcsSUFBSSxDQUFDLENBQUM7SUFDekMsQ0FBQztJQUVELE9BQU8sTUFBTSxDQUFDO0FBQ2YsQ0FBQztBQU9ELFNBQVMsbUJBQW1CLENBQUMsT0FBZTtJQUMzQyxPQUFPO1FBQ04sRUFBRSxFQUFFLE9BQU87UUFDWCxNQUFNLEVBQUUsS0FBSztLQUNiLENBQUM7QUFDSCxDQUFDO0FBRUQsS0FBSyxVQUFVLFNBQVMsQ0FBQyxNQUFvQixFQUFFLE9BQWU7SUFDN0QsTUFBTSxLQUFLLEdBQUcsdUNBQXVDLE9BQU8sR0FBRyxDQUFDO0lBRWhFLE1BQU0sR0FBRyxHQUFHLE1BQU0sTUFBTSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUU5RixJQUFJLEdBQUcsQ0FBQyxTQUFTLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQ2hDLE9BQU8sbUJBQW1CLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDckMsQ0FBQztJQUVELE9BQU8sR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQVcsQ0FBQztBQUNuQyxDQUFDO0FBRUQsS0FBSyxVQUFVLElBQUksQ0FBQyxLQUFjO0lBQ2pDLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0lBQzdDLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBRXpDLE1BQU0sY0FBYyxHQUFHLElBQUksaUNBQXNCLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBRSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUUsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFFLENBQUMsQ0FBQztJQUN6SixNQUFNLE1BQU0sR0FBRyxJQUFJLHFCQUFZLENBQUMsRUFBRSxRQUFRLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQywyQkFBMkIsQ0FBRSxFQUFFLGNBQWMsRUFBRSxDQUFDLENBQUM7SUFFekcsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ1osTUFBTSxNQUFNLEdBQUcsTUFBTSxTQUFTLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBRWhELE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFFdkMsSUFBSSxNQUFNLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDbkIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxvQ0FBb0MsT0FBTyxhQUFhLENBQUMsQ0FBQztZQUN0RSxPQUFPO1FBQ1IsQ0FBQztJQUNGLENBQUM7SUFFRCxPQUFPLENBQUMsR0FBRyxDQUFDLG1CQUFtQixNQUFNLEtBQUssQ0FBQyxDQUFDO0lBRTVDLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLE9BQU8sQ0FBQztJQUNyRSxNQUFNLElBQUEsYUFBSyxFQUFDLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsY0FBYyxDQUFDLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNsRixDQUFDO0FBRUQsTUFBTSxDQUFDLEVBQUUsQUFBRCxFQUFHLEtBQUssQ0FBQyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUM7QUFFakMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7QUFFMUIsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFO0lBQ3JDLE9BQU8sQ0FBQyxHQUFHLENBQUMsNkJBQTZCLENBQUMsQ0FBQztJQUMzQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2pCLENBQUMsRUFBRSxHQUFHLENBQUMsRUFBRTtJQUNSLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDbkIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNqQixDQUFDLENBQUMsQ0FBQyJ9 \ No newline at end of file +//# sourceMappingURL=releaseBuild.js.map \ No newline at end of file diff --git a/build/azure-pipelines/common/retry.js b/build/azure-pipelines/common/retry.js index 843d13539b8..7b90b0cac5b 100644 --- a/build/azure-pipelines/common/retry.js +++ b/build/azure-pipelines/common/retry.js @@ -12,18 +12,17 @@ async function retry(fn) { return await fn(run); } catch (err) { - if (!/ECONNRESET|CredentialUnavailableError|Audience validation failed/i.test(err.message)) { + if (!/fetch failed|terminated|aborted|timeout|TimeoutError|Timeout Error|RestError|Client network socket disconnected|socket hang up|ECONNRESET|CredentialUnavailableError|endpoints_resolution_error|Audience validation failed|end of central directory record signature not found/i.test(err.message)) { throw err; } lastError = err; - const millis = (Math.random() * 200) + (50 * Math.pow(1.5, run)); - console.log(`Request failed, retrying in ${millis}ms...`); // maximum delay is 10th retry: ~3 seconds + const millis = Math.floor((Math.random() * 200) + (50 * Math.pow(1.5, run))); await new Promise(c => setTimeout(c, millis)); } } - console.log(`Too many retries, aborting.`); + console.error(`Too many retries, aborting.`); throw lastError; } exports.retry = retry; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmV0cnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJyZXRyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUV6RixLQUFLLFVBQVUsS0FBSyxDQUFJLEVBQW1DO0lBQ2pFLElBQUksU0FBNEIsQ0FBQztJQUVqQyxLQUFLLElBQUksR0FBRyxHQUFHLENBQUMsRUFBRSxHQUFHLElBQUksRUFBRSxFQUFFLEdBQUcsRUFBRSxFQUFFLENBQUM7UUFDcEMsSUFBSSxDQUFDO1lBQ0osT0FBTyxNQUFNLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN0QixDQUFDO1FBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztZQUNkLElBQUksQ0FBQyxtRUFBbUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7Z0JBQzVGLE1BQU0sR0FBRyxDQUFDO1lBQ1gsQ0FBQztZQUVELFNBQVMsR0FBRyxHQUFHLENBQUM7WUFDaEIsTUFBTSxNQUFNLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQztZQUNqRSxPQUFPLENBQUMsR0FBRyxDQUFDLCtCQUErQixNQUFNLE9BQU8sQ0FBQyxDQUFDO1lBRTFELDBDQUEwQztZQUMxQyxNQUFNLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQy9DLENBQUM7SUFDRixDQUFDO0lBRUQsT0FBTyxDQUFDLEdBQUcsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDO0lBQzNDLE1BQU0sU0FBUyxDQUFDO0FBQ2pCLENBQUM7QUF0QkQsc0JBc0JDIn0= \ No newline at end of file +//# sourceMappingURL=retry.js.map \ No newline at end of file diff --git a/build/azure-pipelines/common/retry.ts b/build/azure-pipelines/common/retry.ts index 9b28b4fd956..9697093c84a 100644 --- a/build/azure-pipelines/common/retry.ts +++ b/build/azure-pipelines/common/retry.ts @@ -10,19 +10,18 @@ export async function retry(fn: (attempt: number) => Promise): Promise try { return await fn(run); } catch (err) { - if (!/ECONNRESET|CredentialUnavailableError|Audience validation failed/i.test(err.message)) { + if (!/fetch failed|terminated|aborted|timeout|TimeoutError|Timeout Error|RestError|Client network socket disconnected|socket hang up|ECONNRESET|CredentialUnavailableError|endpoints_resolution_error|Audience validation failed|end of central directory record signature not found/i.test(err.message)) { throw err; } lastError = err; - const millis = (Math.random() * 200) + (50 * Math.pow(1.5, run)); - console.log(`Request failed, retrying in ${millis}ms...`); // maximum delay is 10th retry: ~3 seconds + const millis = Math.floor((Math.random() * 200) + (50 * Math.pow(1.5, run))); await new Promise(c => setTimeout(c, millis)); } } - console.log(`Too many retries, aborting.`); + console.error(`Too many retries, aborting.`); throw lastError; } diff --git a/build/azure-pipelines/common/sign-win32.js b/build/azure-pipelines/common/sign-win32.js index 8d26aa6d952..da899cd3fc0 100644 --- a/build/azure-pipelines/common/sign-win32.js +++ b/build/azure-pipelines/common/sign-win32.js @@ -8,11 +8,11 @@ const sign_1 = require("./sign"); const path = require("path"); (0, sign_1.main)([ process.env['EsrpCliDllPath'], - 'windows', + 'sign-windows', process.env['ESRPPKI'], process.env['ESRPAADUsername'], process.env['ESRPAADPassword'], path.dirname(process.argv[2]), path.basename(process.argv[2]) ]); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbi13aW4zMi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNpZ24td2luMzIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOztBQUVoRyxpQ0FBOEI7QUFDOUIsNkJBQTZCO0FBRTdCLElBQUEsV0FBSSxFQUFDO0lBQ0osT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBRTtJQUM5QixTQUFTO0lBQ1QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUU7SUFDdkIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBRTtJQUMvQixPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFFO0lBQy9CLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM3QixJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7Q0FDOUIsQ0FBQyxDQUFDIn0= \ No newline at end of file +//# sourceMappingURL=sign-win32.js.map \ No newline at end of file diff --git a/build/azure-pipelines/common/sign-win32.ts b/build/azure-pipelines/common/sign-win32.ts index d5daa875812..76828b42e1e 100644 --- a/build/azure-pipelines/common/sign-win32.ts +++ b/build/azure-pipelines/common/sign-win32.ts @@ -8,7 +8,7 @@ import * as path from 'path'; main([ process.env['EsrpCliDllPath']!, - 'windows', + 'sign-windows', process.env['ESRPPKI']!, process.env['ESRPAADUsername']!, process.env['ESRPAADPassword']!, diff --git a/build/azure-pipelines/common/sign.js b/build/azure-pipelines/common/sign.js index 10b0eff40bd..4dba4765ff6 100644 --- a/build/azure-pipelines/common/sign.js +++ b/build/azure-pipelines/common/sign.js @@ -4,12 +4,12 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ Object.defineProperty(exports, "__esModule", { value: true }); -exports.main = void 0; +exports.main = exports.Temp = void 0; const cp = require("child_process"); const fs = require("fs"); +const crypto = require("crypto"); const path = require("path"); const os = require("os"); -const crypto = require("crypto"); class Temp { _files = []; tmpNameSync() { @@ -28,18 +28,82 @@ class Temp { } } } +exports.Temp = Temp; 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 'pgp': - return '[{ "keyCode": "CP-450779-Pgp", "operationSetCode": "LinuxSign", "parameters": [], "toolName": "sign", "toolVersion": "1.0" }]'; - case 'darwin-sign': - return '[{"keyCode":"CP-401337-Apple","operationSetCode":"MacAppDeveloperSign","parameters":[{"parameterName":"Hardening","parameterValue":"--options=runtime"}],"toolName":"sign","toolVersion":"1.0"}]'; - case 'darwin-notarize': - return '[{"keyCode":"CP-401337-Apple","operationSetCode":"MacAppNotarize","parameters":[],"toolName":"sign","toolVersion":"1.0"}]'; + case 'sign-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 'sign-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 'sign-pgp': + return [{ + keyCode: 'CP-450779-Pgp', + operationSetCode: 'LinuxSign', + parameters: [], + toolName: 'sign', + toolVersion: '1.0' + }]; + case 'sign-darwin': + return [{ + keyCode: 'CP-401337-Apple', + operationSetCode: 'MacAppDeveloperSign', + parameters: [{ parameterName: 'Hardening', parameterValue: '--options=runtime' }], + toolName: 'sign', + toolVersion: '1.0' + }]; + case 'notarize-darwin': + return [{ + keyCode: 'CP-401337-Apple', + operationSetCode: 'MacAppNotarize', + parameters: [], + toolName: 'sign', + toolVersion: '1.0' + }]; default: throw new Error(`Sign type ${type} not found`); } @@ -50,7 +114,7 @@ function main([esrpCliPath, type, cert, username, password, folderPath, pattern] const patternPath = tmp.tmpNameSync(); fs.writeFileSync(patternPath, pattern); const paramsPath = tmp.tmpNameSync(); - fs.writeFileSync(paramsPath, getParams(type)); + fs.writeFileSync(paramsPath, JSON.stringify(getParams(type))); const keyFile = tmp.tmpNameSync(); const key = crypto.randomBytes(32); const iv = crypto.randomBytes(16); @@ -105,4 +169,4 @@ if (require.main === module) { main(process.argv.slice(2)); process.exit(0); } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNpZ24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOzs7QUFFaEcsb0NBQW9DO0FBQ3BDLHlCQUF5QjtBQUN6Qiw2QkFBNkI7QUFDN0IseUJBQXlCO0FBQ3pCLGlDQUFpQztBQUVqQyxNQUFNLElBQUk7SUFDRCxNQUFNLEdBQWEsRUFBRSxDQUFDO0lBRTlCLFdBQVc7UUFDVixNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxNQUFNLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQzVFLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3ZCLE9BQU8sSUFBSSxDQUFDO0lBQ2IsQ0FBQztJQUVELE9BQU87UUFDTixLQUFLLE1BQU0sSUFBSSxJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNoQyxJQUFJLENBQUM7Z0JBQ0osRUFBRSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNyQixDQUFDO1lBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztnQkFDZCxPQUFPO1lBQ1IsQ0FBQztRQUNGLENBQUM7SUFDRixDQUFDO0NBQ0Q7QUFFRCxTQUFTLFNBQVMsQ0FBQyxJQUFZO0lBQzlCLFFBQVEsSUFBSSxFQUFFLENBQUM7UUFDZCxLQUFLLFNBQVM7WUFDYixPQUFPLHdzQkFBd3NCLENBQUM7UUFDanRCLEtBQUssY0FBYztZQUNsQixPQUFPLGltQkFBaW1CLENBQUM7UUFDMW1CLEtBQUssS0FBSztZQUNULE9BQU8sK0hBQStILENBQUM7UUFDeEksS0FBSyxhQUFhO1lBQ2pCLE9BQU8sa01BQWtNLENBQUM7UUFDM00sS0FBSyxpQkFBaUI7WUFDckIsT0FBTywySEFBMkgsQ0FBQztRQUNwSTtZQUNDLE1B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 \ No newline at end of file +//# sourceMappingURL=sign.js.map \ No newline at end of file diff --git a/build/azure-pipelines/common/sign.ts b/build/azure-pipelines/common/sign.ts index 494e89b3e12..28fca31205e 100644 --- a/build/azure-pipelines/common/sign.ts +++ b/build/azure-pipelines/common/sign.ts @@ -5,11 +5,11 @@ import * as cp from 'child_process'; import * as fs from 'fs'; +import * as crypto from 'crypto'; import * as path from 'path'; import * as os from 'os'; -import * as crypto from 'crypto'; -class Temp { +export class Temp { private _files: string[] = []; tmpNameSync(): string { @@ -29,18 +29,92 @@ class Temp { } } -function getParams(type: string): string { +interface Params { + readonly keyCode: string; + readonly operationSetCode: string; + readonly parameters: { + readonly parameterName: string; + readonly parameterValue: string; + }[]; + readonly toolName: string; + readonly toolVersion: string; +} + +function getParams(type: string): Params[] { 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 'pgp': - return '[{ "keyCode": "CP-450779-Pgp", "operationSetCode": "LinuxSign", "parameters": [], "toolName": "sign", "toolVersion": "1.0" }]'; - case 'darwin-sign': - return '[{"keyCode":"CP-401337-Apple","operationSetCode":"MacAppDeveloperSign","parameters":[{"parameterName":"Hardening","parameterValue":"--options=runtime"}],"toolName":"sign","toolVersion":"1.0"}]'; - case 'darwin-notarize': - return '[{"keyCode":"CP-401337-Apple","operationSetCode":"MacAppNotarize","parameters":[],"toolName":"sign","toolVersion":"1.0"}]'; + case 'sign-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 'sign-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 'sign-pgp': + return [{ + keyCode: 'CP-450779-Pgp', + operationSetCode: 'LinuxSign', + parameters: [], + toolName: 'sign', + toolVersion: '1.0' + }]; + case 'sign-darwin': + return [{ + keyCode: 'CP-401337-Apple', + operationSetCode: 'MacAppDeveloperSign', + parameters: [{ parameterName: 'Hardening', parameterValue: '--options=runtime' }], + toolName: 'sign', + toolVersion: '1.0' + }]; + case 'notarize-darwin': + return [{ + keyCode: 'CP-401337-Apple', + operationSetCode: 'MacAppNotarize', + parameters: [], + toolName: 'sign', + toolVersion: '1.0' + }]; default: throw new Error(`Sign type ${type} not found`); } @@ -54,7 +128,7 @@ export function main([esrpCliPath, type, cert, username, password, folderPath, p fs.writeFileSync(patternPath, pattern); const paramsPath = tmp.tmpNameSync(); - fs.writeFileSync(paramsPath, getParams(type)); + fs.writeFileSync(paramsPath, JSON.stringify(getParams(type))); const keyFile = tmp.tmpNameSync(); const key = crypto.randomBytes(32); diff --git a/build/azure-pipelines/darwin/product-build-darwin-sign.yml b/build/azure-pipelines/darwin/product-build-darwin-sign.yml index 59f4821c1f1..3f31ac7bd35 100644 --- a/build/azure-pipelines/darwin/product-build-darwin-sign.yml +++ b/build/azure-pipelines/darwin/product-build-darwin-sign.yml @@ -24,10 +24,10 @@ steps: artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive displayName: Download $(VSCODE_ARCH) artifact - - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll darwin-sign $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive VSCode-darwin-$(VSCODE_ARCH).zip + - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll sign-darwin $(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: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll darwin-notarize $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive VSCode-darwin-$(VSCODE_ARCH).zip + - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll notarize-darwin $(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: unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip -d $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH) diff --git a/build/azure-pipelines/distro/mixin-npm.js b/build/azure-pipelines/distro/mixin-npm.js index 221552bfc3a..0c61bb3dcf4 100644 --- a/build/azure-pipelines/distro/mixin-npm.js +++ b/build/azure-pipelines/distro/mixin-npm.js @@ -32,4 +32,4 @@ function main() { } } main(); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWl4aW4tbnBtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibWl4aW4tbnBtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7QUFFaEcseUJBQXlCO0FBQ3pCLDZCQUE2QjtBQUM3QixNQUFNLEVBQUUsSUFBSSxFQUFFLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUF1QixDQUFDO0FBRWpFLFNBQVMsR0FBRyxDQUFDLEdBQUcsSUFBVztJQUMxQixPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksSUFBSSxJQUFJLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLEVBQUUsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLENBQUMsR0FBRyxFQUFFLFVBQVUsRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDO0FBQ2pHLENBQUM7QUFFRCxTQUFTLEtBQUssQ0FBQyxTQUFpQjtJQUMvQixJQUFJLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxHQUFHLFNBQVMsZUFBZSxDQUFDLEVBQUUsQ0FBQztRQUNqRCxHQUFHLENBQUMscUNBQXFDLFNBQVMsb0JBQW9CLENBQUMsQ0FBQztRQUN4RSxPQUFPO0lBQ1IsQ0FBQztJQUVELEdBQUcsQ0FBQyxzQ0FBc0MsU0FBUyxFQUFFLENBQUMsQ0FBQztJQUV2RCxNQUFNLGlCQUFpQixHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxHQUFHLFNBQVMsZUFBZSxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7SUFDM0YsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxtQkFBbUIsRUFBRSxTQUFTLENBQUMsQ0FBQztJQUVqRSxLQUFLLE1BQU0sVUFBVSxJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBQztRQUN0RSxFQUFFLENBQUMsTUFBTSxDQUFDLEtBQUssVUFBVSxpQkFBaUIsVUFBVSxFQUFFLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQzFGLEVBQUUsQ0FBQyxNQUFNLENBQUMsR0FBRyxTQUFTLGlCQUFpQixVQUFVLEVBQUUsRUFBRSxLQUFLLFVBQVUsaUJBQWlCLFVBQVUsRUFBRSxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ3pKLENBQUM7SUFFRCxHQUFHLENBQUMscUNBQXFDLFNBQVMsS0FBSyxDQUFDLENBQUM7QUFDMUQsQ0FBQztBQUVELFNBQVMsSUFBSTtJQUNaLEdBQUcsQ0FBQyxzQ0FBc0MsQ0FBQyxDQUFDO0lBRTVDLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxzQkFBc0IsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUVwRSxLQUFLLE1BQU0sU0FBUyxJQUFJLFVBQVUsRUFBRSxDQUFDO1FBQ3BDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNsQixDQUFDO0FBQ0YsQ0FBQztBQUVELElBQUksRUFBRSxDQUFDIn0= \ No newline at end of file +//# sourceMappingURL=mixin-npm.js.map \ No newline at end of file diff --git a/build/azure-pipelines/distro/mixin-quality.js b/build/azure-pipelines/distro/mixin-quality.js index 39c91218a64..6e011b5a1e9 100644 --- a/build/azure-pipelines/distro/mixin-quality.js +++ b/build/azure-pipelines/distro/mixin-quality.js @@ -50,4 +50,4 @@ function main() { } } main(); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWl4aW4tcXVhbGl0eS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm1peGluLXF1YWxpdHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOztBQUVoRyx5QkFBeUI7QUFDekIsNkJBQTZCO0FBbUI3QixTQUFTLEdBQUcsQ0FBQyxHQUFHLElBQVc7SUFDMUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLElBQUksSUFBSSxFQUFFLENBQUMsa0JBQWtCLENBQUMsSUFBSSxFQUFFLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxDQUFDLEdBQUcsRUFBRSxVQUFVLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztBQUNqRyxDQUFDO0FBRUQsU0FBUyxJQUFJO0lBQ1osTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBRTlDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNkLE1BQU0sSUFBSSxLQUFLLENBQUMsd0NBQXdDLENBQUMsQ0FBQztJQUMzRCxDQUFDO0lBRUQsR0FBRyxDQUFDLDZCQUE2QixDQUFDLENBQUM7SUFFbkMsTUFBTSxRQUFRLEdBQUcsdUJBQXVCLE9BQU8sRUFBRSxDQUFDO0lBRWxELEtBQUssTUFBTSxJQUFJLElBQUksRUFBRSxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDO1FBQzdDLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzdDLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBRXBELElBQUksT0FBTyxLQUFLLGNBQWMsRUFBRSxDQUFDO1lBQ2hDLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxVQUFVLEVBQUUsTUFBTSxDQUFDLENBQVksQ0FBQztZQUMxRSxN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 \ No newline at end of file +//# sourceMappingURL=mixin-quality.js.map \ No newline at end of file diff --git a/build/azure-pipelines/linux/cli-build-linux.yml b/build/azure-pipelines/linux/cli-build-linux.yml index ae031140e74..a820c588e61 100644 --- a/build/azure-pipelines/linux/cli-build-linux.yml +++ b/build/azure-pipelines/linux/cli-build-linux.yml @@ -39,13 +39,45 @@ steps: tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.11.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl displayName: Extract openssl prebuilt - - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}: - - bash: sudo apt-get install -yq gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf binutils-arm-linux-gnueabihf - displayName: Install arm32 toolchains + - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + - script: node build/setup-npm-registry.js $NPM_REGISTRY + condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Registry - - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}: - - bash: sudo apt-get install -yq gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu - displayName: Install arm64 toolchains + - script: | + set -e + npm config set registry "$NPM_REGISTRY" --location=project + # npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb + # following is a workaround for yarn to send authorization header + # for GET requests to the registry. + echo "always-auth=true" >> .npmrc + yarn config set registry "$NPM_REGISTRY" + condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM & Yarn + + - task: npmAuthenticate@0 + inputs: + workingFile: .npmrc + condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) + displayName: Setup NPM Authentication + + - script: | + set -e + + for i in {1..5}; do # try 5 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 + + - script: | + set -e + mkdir -p $(Build.SourcesDirectory)/.build + displayName: Create .build folder for misc dependencies - template: ../cli/install-rust-posix.yml parameters: @@ -65,9 +97,9 @@ steps: VSCODE_CLI_ARTIFACT: vscode_cli_linux_arm64_cli VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }} 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 + SYSROOT_ARCH: arm64 - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}: - template: ../cli/cli-compile-and-publish.yml @@ -79,6 +111,7 @@ steps: VSCODE_CLI_ENV: OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/lib OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/include + SYSROOT_ARCH: amd64 - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}: - template: ../cli/cli-compile-and-publish.yml @@ -88,6 +121,6 @@ steps: VSCODE_CLI_ARTIFACT: vscode_cli_linux_armhf_cli VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }} 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 + SYSROOT_ARCH: armhf diff --git a/build/azure-pipelines/linux/install.sh b/build/azure-pipelines/linux/install.sh index c8d74687080..16fefd2e754 100755 --- a/build/azure-pipelines/linux/install.sh +++ b/build/azure-pipelines/linux/install.sh @@ -5,9 +5,17 @@ set -e # To workaround the issue of yarn not respecting the registry value from .npmrc yarn config set registry "$NPM_REGISTRY" -if [ -z "$CC" ] || [ -z "$CXX" ]; then +SYSROOT_ARCH=$VSCODE_ARCH +if [ "$SYSROOT_ARCH" == "x64" ]; then + SYSROOT_ARCH="amd64" +fi + +export VSCODE_SYSROOT_DIR=$PWD/.build/sysroots +SYSROOT_ARCH="$SYSROOT_ARCH" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()' + +if [ "$npm_config_arch" == "x64" ]; then # Download clang based on chromium revision used by vscode - curl -s https://raw.githubusercontent.com/chromium/chromium/114.0.5735.199/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux + curl -s https://raw.githubusercontent.com/chromium/chromium/118.0.5993.159/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux # Download libcxx headers and objects from upstream electron releases DEBUG=libcxx-fetcher \ @@ -19,15 +27,30 @@ if [ -z "$CC" ] || [ -z "$CXX" ]; then # Set compiler toolchain # Flags for the client build are based on - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/114.0.5735.199:build/config/arm.gni - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/114.0.5735.199:build/config/compiler/BUILD.gn - # https://source.chromium.org/chromium/chromium/src/+/refs/tags/114.0.5735.199:build/config/c++/BUILD.gn - export CC=$PWD/.build/CR_Clang/bin/clang - export CXX=$PWD/.build/CR_Clang/bin/clang++ - export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr" - export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -L$PWD/.build/libcxx-objects -lc++abi -Wl,--lto-O0" - export VSCODE_REMOTE_CC=$(which gcc) - export VSCODE_REMOTE_CXX=$(which g++) + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/118.0.5993.159:build/config/arm.gni + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/118.0.5993.159:build/config/compiler/BUILD.gn + # https://source.chromium.org/chromium/chromium/src/+/refs/tags/118.0.5993.159:build/config/c++/BUILD.gn + export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu" + export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu" + export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr --sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot" + export LDFLAGS="-stdlib=libc++ --sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -fuse-ld=lld -flto=thin -L$PWD/.build/libcxx-objects -lc++abi -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/lib/x86_64-linux-gnu -Wl,--lto-O0" + # Set compiler toolchain for remote server + export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-gcc + export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-g++ + export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot" + export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/lib/x86_64-linux-gnu" +elif [ "$npm_config_arch" == "arm64" ]; then + # Set compiler toolchain for client native modules and remote server + export CC=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc + export CXX=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-g++ + export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot" + export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/lib/aarch64-linux-gnu" +elif [ "$npm_config_arch" == "arm" ]; then + # Set compiler toolchain for client native modules and remote server + export CC=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc + export CXX=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-g++ + export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot" + export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf" fi for i in {1..5}; do # try 5 times diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml index a8d434b135a..a4b7faa3918 100644 --- a/build/azure-pipelines/linux/product-build-linux.yml +++ b/build/azure-pipelines/linux/product-build-linux.yml @@ -48,13 +48,13 @@ steps: # Start X server sudo apt-get update sudo apt-get install -y pkg-config \ - libxss1 \ dbus \ xvfb \ libgtk-3-0 \ - libgbm1 \ libxkbfile-dev \ - libkrb5-dev + libkrb5-dev \ + libgbm1 \ + rpm 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 @@ -100,17 +100,6 @@ steps: condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) displayName: Setup NPM Authentication - - ${{ if and(ne(parameters.VSCODE_QUALITY, 'oss'), or(eq(parameters.VSCODE_ARCH, 'x64'), eq(parameters.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-$(VSCODE_ARCH) - containerCommand: uname - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - script: | set -e @@ -124,30 +113,62 @@ steps: echo "Yarn failed $i, trying again..." done - docker run -e GITHUB_TOKEN -e npm_config_arch -e NPM_REGISTRY \ - -e VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME -e VSCODE_HOST_MOUNT \ - -e ELECTRON_SKIP_BINARY_DOWNLOAD -e PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD \ - -e VSCODE_SKIP_NODE_VERSION_CHECK \ - -v /mnt/vss/_work/1/s:/home/builduser/vscode -v /mnt/vss/_work/1/s/.build/.netrc:/home/builduser/.netrc \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -u 1000:1000 \ - -w /home/builduser/vscode vscodehub.azurecr.io/vscode-linux-build-agent:bionic-$(VSCODE_ARCH) \ - /bin/bash -c "./build/azure-pipelines/linux/install.sh" - - sudo chown -R $USER:$USER /mnt/vss/_work/1/s + ./build/azure-pipelines/linux/install.sh env: npm_config_arch: $(NPM_ARCH) + VSCODE_ARCH: $(VSCODE_ARCH) NPM_REGISTRY: "$(NPM_REGISTRY)" ELECTRON_SKIP_BINARY_DOWNLOAD: 1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 - VSCODE_SKIP_NODE_VERSION_CHECK: 1 GITHUB_TOKEN: "$(github-distro-mixin-password)" - VSCODE_HOST_MOUNT: "/mnt/vss/_work/1/s" - ${{ if or(eq(parameters.VSCODE_ARCH, 'x64'), eq(parameters.VSCODE_ARCH, 'arm64')) }}: - VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME: vscodehub.azurecr.io/vscode-linux-build-agent:centos7-devtoolset8-$(VSCODE_ARCH) displayName: Install dependencies (non-OSS) condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + - script: | + set -e + + TRIPLE="x86_64-linux-gnu" + if [ "$VSCODE_ARCH" == "arm64" ]; then + TRIPLE="aarch64-linux-gnu" + elif [ "$VSCODE_ARCH" == "armhf" ]; then + TRIPLE="arm-rpi-linux-gnueabihf" + fi + + # Get all files with .node extension from remote/node_modules folder + files=$(find remote/node_modules -name "*.node") + + # Check if any file has dependency of GLIBC > 2.28 or GLIBCXX > 3.4.25 + for file in $files; do + glibc_version="2.28" + glibcxx_version="3.4.25" + while IFS= read -r line; do + if [[ $line == *"GLIBC_"* ]]; then + version=$(echo "$line" | awk '{print $5}' | tr -d '()') + version=${version#*_} + if [[ $(printf "%s\n%s" "$version" "$glibc_version" | sort -V | tail -n1) == "$version" ]]; then + glibc_version=$version + fi + elif [[ $line == *"GLIBCXX_"* ]]; then + version=$(echo "$line" | awk '{print $5}' | tr -d '()') + version=${version#*_} + if [[ $(printf "%s\n%s" "$version" "$glibcxx_version" | sort -V | tail -n1) == "$version" ]]; then + glibcxx_version=$version + fi + fi + done < <("$PWD/.build/sysroots/$TRIPLE/$TRIPLE/bin/objdump" -T "$file") + + if [[ "$glibc_version" != "2.28" ]]; then + echo "Error: File $file has dependency on GLIBC > 2.28" + exit 1 + fi + if [[ "$glibcxx_version" != "3.4.25" ]]; then + echo "Error: File $file has dependency on GLIBCXX > 3.4.25" + exit 1 + fi + done + condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + displayName: Check GLIBC and GLIBCXX dependencies in remote/node_modules + - script: node build/azure-pipelines/distro/mixin-npm condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) displayName: Mixin distro node modules @@ -266,11 +287,6 @@ steps: - ${{ if and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'oss')) }}: - script: | set -e - docker run -v /mnt/vss/_work/1/s:/home/builduser/vscode \ - -v /mnt/vss/_work/1/s/.build/.netrc:/home/builduser/.netrc \ - -v /mnt/vss/_work/1/VSCode-linux-$(VSCODE_ARCH):/home/builduser/VSCode-linux-$(VSCODE_ARCH) \ - -u 1000:1000 \ - -w /home/builduser/vscode vscodehub.azurecr.io/vscode-linux-build-agent:bionic-$(VSCODE_ARCH) \ yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-deb" displayName: Prepare deb package @@ -282,11 +298,6 @@ steps: - script: | set -e - docker run -v /mnt/vss/_work/1/s:/home/builduser/vscode \ - -v /mnt/vss/_work/1/s/.build/.netrc:/home/builduser/.netrc \ - -v /mnt/vss/_work/1/VSCode-linux-$(VSCODE_ARCH):/home/builduser/VSCode-linux-$(VSCODE_ARCH) \ - -u 1000:1000 \ - -w /home/builduser/vscode vscodehub.azurecr.io/vscode-linux-build-agent:bionic-$(VSCODE_ARCH) \ yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-rpm" displayName: Prepare rpm package @@ -313,10 +324,10 @@ steps: continueOnError: true displayName: Download ESRPClient - - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll pgp $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) .build/linux/deb '*.deb' + - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll sign-pgp $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) .build/linux/deb '*.deb' displayName: Codesign deb - - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll pgp $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) .build/linux/rpm '*.rpm' + - script: node build/azure-pipelines/common/sign $(Agent.ToolsDirectory)/esrpclient/*/*/net6.0/esrpcli.dll sign-pgp $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) .build/linux/rpm '*.rpm' displayName: Codesign rpm - script: echo "##vso[task.setvariable variable=ARTIFACT_PREFIX]attempt$(System.JobAttempt)_" diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml index 1b4c2b1bb41..54a37e9b1fa 100644 --- a/build/azure-pipelines/product-build.yml +++ b/build/azure-pipelines/product-build.yml @@ -76,10 +76,6 @@ parameters: displayName: "Publish to builds.code.visualstudio.com" type: boolean default: true - - name: VSCODE_PUBLISH_TO_MOONCAKE - displayName: "Publish to Azure China" - type: boolean - default: true - name: VSCODE_RELEASE displayName: "Release build if successful" type: boolean @@ -116,8 +112,6 @@ variables: value: ${{ in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI') }} - name: VSCODE_PUBLISH value: ${{ and(eq(parameters.VSCODE_PUBLISH, true), eq(variables.VSCODE_CIBUILD, false), eq(parameters.VSCODE_COMPILE_ONLY, false)) }} - - name: VSCODE_PUBLISH_TO_MOONCAKE - value: ${{ eq(parameters.VSCODE_PUBLISH_TO_MOONCAKE, true) }} - name: VSCODE_SCHEDULEDBUILD value: ${{ eq(variables['Build.Reason'], 'Schedule') }} - name: VSCODE_7PM_BUILD @@ -126,12 +120,16 @@ variables: value: ${{ eq(parameters.VSCODE_STEP_ON_IT, true) }} - name: VSCODE_BUILD_MACOS_UNIVERSAL value: ${{ and(eq(parameters.VSCODE_BUILD_MACOS, true), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true), eq(parameters.VSCODE_BUILD_MACOS_UNIVERSAL, true)) }} - - name: AZURE_CDN_URL - value: https://az764295.vo.msecnd.net + - name: PRSS_CDN_URL + value: https://vscode.download.prss.microsoft.com/dbazure/download + - name: PRSS_RELEASE_TENANT_ID + value: 975f013f-7f24-47e8-a7d3-abc4752bf346 + - name: PRSS_RELEASE_CLIENT_ID + value: c24324f7-e65f-4c45-8702-ed2d4c35df99 + - name: PRSS_PROVISION_TENANT_ID + value: 72f988bf-86f1-41af-91ab-2d7cd011db47 - name: AZURE_DOCUMENTDB_ENDPOINT value: https://vscode.documents.azure.com:443/ - - name: MOONCAKE_CDN_URL - value: https://vscode.cdn.azure.cn - name: VSCODE_MIXIN_REPO value: microsoft/vscode-distro - name: skipComponentGovernanceDetection @@ -625,9 +623,8 @@ stages: - ${{ if eq(variables['VSCODE_PUBLISH'], 'true') }}: - stage: Publish - dependsOn: - - Compile - pool: 1es-ubuntu-20.04-x64 + dependsOn: [] + pool: 1es-windows-2019-x64 variables: - name: BUILDS_API_URL value: $(System.CollectionUri)$(System.TeamProject)/_apis/build/builds/$(Build.BuildId)/ diff --git a/build/azure-pipelines/product-publish.ps1 b/build/azure-pipelines/product-publish.ps1 deleted file mode 100644 index fa4bf1aa31e..00000000000 --- a/build/azure-pipelines/product-publish.ps1 +++ /dev/null @@ -1,130 +0,0 @@ -. build/azure-pipelines/win32/exec.ps1 -$ErrorActionPreference = 'Stop' -$ProgressPreference = 'SilentlyContinue' -$ARTIFACT_PROCESSED_WILDCARD_PATH = "$env:PIPELINE_WORKSPACE/artifacts_processed_*/artifacts_processed_*" -$ARTIFACT_PROCESSED_FILE_PATH = "$env:PIPELINE_WORKSPACE/artifacts_processed_$env:SYSTEM_STAGEATTEMPT/artifacts_processed_$env:SYSTEM_STAGEATTEMPT.txt" - -function Get-PipelineArtifact { - param($Name = '*') - try { - $res = Invoke-RestMethod "$($env:BUILDS_API_URL)artifacts?api-version=6.0" -Headers @{ - Authorization = "Bearer $env:SYSTEM_ACCESSTOKEN" - } -MaximumRetryCount 5 -RetryIntervalSec 1 - - if (!$res) { - return - } - - $res.value | Where-Object { $_.name -Like $Name -and $_.name -NotLike "*sbom" } - } catch { - Write-Warning $_ - } -} - -# This set will keep track of which artifacts have already been processed -$set = [System.Collections.Generic.HashSet[string]]::new() - -if (Test-Path $ARTIFACT_PROCESSED_WILDCARD_PATH) { - # Grab the latest artifact_processed text file and load all assets already processed from that. - # This means that the latest artifact_processed_*.txt file has all of the contents of the previous ones. - # Note: The kusto-like syntax only works in PS7+ and only in scripts, not at the REPL. - Get-ChildItem $ARTIFACT_PROCESSED_WILDCARD_PATH - # Sort by file name length first and then Name to make sure we sort numerically. Ex. 12 comes after 9. - | Sort-Object { $_.Name.Length },Name -Bottom 1 - | Get-Content - | ForEach-Object { - $set.Add($_) | Out-Null - Write-Host "Already processed artifact: $_" - } -} - -# Create the artifact file that will be used for this run -New-Item -Path $ARTIFACT_PROCESSED_FILE_PATH -Force | Out-Null - -# Determine which stages we need to watch -$stages = @( - if ($env:VSCODE_BUILD_STAGE_WINDOWS -eq 'True') { 'Windows' } - if ($env:VSCODE_BUILD_STAGE_LINUX -eq 'True') { 'Linux' } - if ($env:VSCODE_BUILD_STAGE_ALPINE -eq 'True') { 'Alpine' } - if ($env:VSCODE_BUILD_STAGE_MACOS -eq 'True') { 'macOS' } - if ($env:VSCODE_BUILD_STAGE_WEB -eq 'True') { 'Web' } -) - -do { - Start-Sleep -Seconds 10 - - $artifacts = Get-PipelineArtifact -Name 'vscode_*' - if (!$artifacts) { - continue - } - - $artifacts | ForEach-Object { - $artifactName = $_.name - - 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 $extractPath -Headers @{ - Authorization = "Bearer $env:SYSTEM_ACCESSTOKEN" - } -MaximumRetryCount 5 -RetryIntervalSec 1 -TimeoutSec 300 | 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 - continue - } - - $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 - @{ - product = $product - os = $os - arch = $arch - type = $type - asset = $asset.Name - } | Format-Table - - exec { node build/azure-pipelines/common/createAsset.js $product $os $arch $type $asset.Name $asset.FullName } - } - - # Mark the artifact as processed. Make sure to keep the previously - # processed artifacts in the file as well, not just from this run. - $artifactName >> $ARTIFACT_PROCESSED_FILE_PATH - } - - # Get the timeline and see if it says the other stage completed - try { - $timeline = Invoke-RestMethod "$($env:BUILDS_API_URL)timeline?api-version=6.0" -Headers @{ - Authorization = "Bearer $env:SYSTEM_ACCESSTOKEN" - } -MaximumRetryCount 5 -RetryIntervalSec 1 - } catch { - Write-Warning $_ - continue - } - - foreach ($stage in $stages) { - $otherStageFinished = $timeline.records | Where-Object { $_.name -eq $stage -and $_.type -eq 'stage' -and $_.state -eq 'completed' } - if (!$otherStageFinished) { - break - } - } - - $artifacts = Get-PipelineArtifact -Name 'vscode_*' - $artifactsStillToProcess = $artifacts.Count -ne $set.Count -} while (!$otherStageFinished -or $artifactsStillToProcess) - -Write-Host "Processed $($set.Count) artifacts." diff --git a/build/azure-pipelines/product-publish.yml b/build/azure-pipelines/product-publish.yml index df6ac09de76..1cf0209aa63 100644 --- a/build/azure-pipelines/product-publish.yml +++ b/build/azure-pipelines/product-publish.yml @@ -5,17 +5,30 @@ steps: versionFilePath: .nvmrc nodejsMirror: https://github.com/joaomoreno/node-mirror/releases/download + - task: SFP.build-tasks.esrpclient-tools-task.EsrpClientTool@2 + displayName: "Use EsrpClient" + - task: AzureKeyVault@1 displayName: "Azure Key Vault: Get Secrets" inputs: azureSubscription: "vscode-builds-subscription" KeyVaultName: vscode-build-secrets - SecretsFilter: "github-distro-mixin-password" + SecretsFilter: "github-distro-mixin-password,esrp-aad-username,esrp-aad-password" + + - task: AzureKeyVault@1 + displayName: "Azure Key Vault: Get Secrets" + inputs: + azureSubscription: "vscode-builds-subscription" + KeyVaultName: vscode-build-packages + SecretsFilter: "vscode-esrp,c24324f7-e65f-4c45-8702-ed2d4c35df99" # allow-any-unicode-next-line - pwsh: Write-Host "##vso[build.addbuildtag]🚀" displayName: Add build tag + - pwsh: node build/npm/setupBuildYarnrc + displayName: Prepare build dependencies + - pwsh: yarn workingDirectory: build displayName: Install build dependencies @@ -36,18 +49,6 @@ steps: Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId" Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey" - - task: AzureCLI@2 - displayName: Fetch Mooncake secrets - inputs: - azureSubscription: "vscode-builds-mooncake-subscription" - scriptType: pscore - scriptLocation: inlineScript - addSpnToEnvironment: true - inlineScript: | - Write-Host "##vso[task.setvariable variable=AZURE_MOONCAKE_TENANT_ID]$env:tenantId" - Write-Host "##vso[task.setvariable variable=AZURE_MOONCAKE_CLIENT_ID]$env:servicePrincipalId" - Write-Host "##vso[task.setvariable variable=AZURE_MOONCAKE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey" - - pwsh: | . build/azure-pipelines/win32/exec.ps1 @@ -65,17 +66,40 @@ steps: AZURE_CLIENT_SECRET: "$(AZURE_CLIENT_SECRET)" displayName: Create build if it hasn't been created before - - pwsh: build/azure-pipelines/product-publish.ps1 + - pwsh: | + $ErrorActionPreference = "Stop" + $CertCollection = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2Collection + $AuthCertBytes = [System.Convert]::FromBase64String("$(vscode-esrp)") + $CertCollection.Import($AuthCertBytes, $null, [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::Exportable -bxor [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::PersistKeySet) + $RequestSigningCertIndex = $CertCollection.Count + $RequestSigningCertBytes = [System.Convert]::FromBase64String("$(c24324f7-e65f-4c45-8702-ed2d4c35df99)") + $CertCollection.Import($RequestSigningCertBytes, $null, [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::Exportable -bxor [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::PersistKeySet) + $CertStore = New-Object System.Security.Cryptography.X509Certificates.X509Store("My","LocalMachine") + $CertStore.Open("ReadWrite") + $CertStore.AddRange($CertCollection) + $CertStore.Close() + $AuthCertSubjectName = $CertCollection[0].Subject + $RequestSigningCertSubjectName = $CertCollection[$RequestSigningCertIndex].Subject + Write-Host "##vso[task.setvariable variable=RELEASE_AUTH_CERT_SUBJECT_NAME]$AuthCertSubjectName" + Write-Host "##vso[task.setvariable variable=RELEASE_REQUEST_SIGNING_CERT_SUBJECT_NAME]$RequestSigningCertSubjectName" + displayName: Import certificates + + - pwsh: node build/azure-pipelines/common/publish.js env: GITHUB_TOKEN: "$(github-distro-mixin-password)" AZURE_TENANT_ID: "$(AZURE_TENANT_ID)" AZURE_CLIENT_ID: "$(AZURE_CLIENT_ID)" AZURE_CLIENT_SECRET: "$(AZURE_CLIENT_SECRET)" - AZURE_MOONCAKE_TENANT_ID: "$(AZURE_MOONCAKE_TENANT_ID)" - AZURE_MOONCAKE_CLIENT_ID: "$(AZURE_MOONCAKE_CLIENT_ID)" - AZURE_MOONCAKE_CLIENT_SECRET: "$(AZURE_MOONCAKE_CLIENT_SECRET)" SYSTEM_ACCESSTOKEN: $(System.AccessToken) + RELEASE_TENANT_ID: "$(PRSS_RELEASE_TENANT_ID)" + RELEASE_CLIENT_ID: "$(PRSS_RELEASE_CLIENT_ID)" + RELEASE_AUTH_CERT_SUBJECT_NAME: "$(RELEASE_AUTH_CERT_SUBJECT_NAME)" + RELEASE_REQUEST_SIGNING_CERT_SUBJECT_NAME: "$(RELEASE_REQUEST_SIGNING_CERT_SUBJECT_NAME)" + PROVISION_TENANT_ID: "$(PRSS_PROVISION_TENANT_ID)" + PROVISION_AAD_USERNAME: "$(esrp-aad-username)" + PROVISION_AAD_PASSWORD: "$(esrp-aad-password)" displayName: Process artifacts + retryCountOnTaskFailure: 3 - publish: $(Pipeline.Workspace)/artifacts_processed_$(System.StageAttempt)/artifacts_processed_$(System.StageAttempt).txt artifact: artifacts_processed_$(System.StageAttempt) @@ -108,6 +132,8 @@ steps: if($didStageFail) { $failedStages += $stage + Write-Host "'$stage' failed!" + Write-Host $didStageFail } else { Write-Host "'$stage' did not fail." } diff --git a/build/azure-pipelines/publish-types/check-version.js b/build/azure-pipelines/publish-types/check-version.js index 8f852436f81..9e93a7fa4c9 100644 --- a/build/azure-pipelines/publish-types/check-version.js +++ b/build/azure-pipelines/publish-types/check-version.js @@ -34,4 +34,4 @@ function isValidTag(t) { } return true; } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2stdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImNoZWNrLXZlcnNpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOztBQUVoRyxvQ0FBb0M7QUFFcEMsSUFBSSxHQUFHLEdBQUcsRUFBRSxDQUFDO0FBQ2IsSUFBSSxDQUFDO0lBQ0osR0FBRyxHQUFHLEVBQUU7U0FDTixRQUFRLENBQUMseURBQXlELENBQUM7U0FDbkUsUUFBUSxFQUFFO1NBQ1YsSUFBSSxFQUFFLENBQUM7SUFFVCxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDdEIsTUFBTSxLQUFLLENBQUMsZUFBZSxHQUFHLEVBQUUsQ0FBQyxDQUFDO0lBQ25DLENBQUM7QUFDRixDQUFDO0FBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztJQUNkLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDbkIsT0FBTyxDQUFDLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO0lBQ3hDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDakIsQ0FBQztBQUVELFNBQVMsVUFBVSxDQUFDLENBQVM7SUFDNUIsSUFBSSxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUMvQixPQUFPLEtBQUssQ0FBQztJQUNkLENBQUM7SUFFRCxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBRXpDLG9DQUFvQztJQUNwQyxJQUFJLEdBQUcsS0FBSyxHQUFHLEVBQUUsQ0FBQztRQUNqQixPQUFPLEtBQUssQ0FBQztJQUNkLENBQUM7SUFFRCxJQUFJLEtBQUssQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLElBQUksS0FBSyxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQzlELE9BQU8sS0FBSyxDQUFDO0lBQ2QsQ0FBQztJQUVELE9BQU8sSUFBSSxDQUFDO0FBQ2IsQ0FBQyJ9 \ No newline at end of file +//# sourceMappingURL=check-version.js.map \ No newline at end of file diff --git a/build/azure-pipelines/publish-types/update-types.js b/build/azure-pipelines/publish-types/update-types.js index 777e4ebe8e1..ed2deded3fc 100644 --- a/build/azure-pipelines/publish-types/update-types.js +++ b/build/azure-pipelines/publish-types/update-types.js @@ -70,4 +70,4 @@ function getNewFileHeader(tag) { ].join('\n'); return header; } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlLXR5cGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsidXBkYXRlLXR5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7QUFFaEcseUJBQXlCO0FBQ3pCLG9DQUFvQztBQUNwQyw2QkFBNkI7QUFFN0IsSUFBSSxHQUFHLEdBQUcsRUFBRSxDQUFDO0FBQ2IsSUFBSSxDQUFDO0lBQ0osR0FBRyxHQUFHLEVBQUU7U0FDTixRQUFRLENBQUMseURBQXlELENBQUM7U0FDbkUsUUFBUSxFQUFFO1NBQ1YsSUFBSSxFQUFFLENBQUM7SUFFVCxNQUFNLE1BQU0sR0FBRyxzREFBc0QsR0FBRyw2QkFBNkIsQ0FBQztJQUN0RyxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSx5Q0FBeUMsQ0FBQyxDQUFDO0lBQ3ZGLEVBQUUsQ0FBQyxRQUFRLENBQUMsUUFBUSxNQUFNLGFBQWEsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUVsRCxhQUFhLENBQUMsT0FBTyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBRTVCLE9BQU8sQ0FBQyxHQUFHLENBQUMsZ0NBQWdDLE9BQU8sRUFBRSxDQUFDLENBQUM7QUFDeEQsQ0FBQztBQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7SUFDZCxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ25CLE9BQU8sQ0FBQyxLQUFLLENBQUMsd0JBQXdCLENBQUMsQ0FBQztJQUN4QyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2pCLENBQUM7QUFFRCxTQUFTLGFBQWEsQ0FBQyxPQUFlLEVBQUUsR0FBVztJQUNsRCxNQUFNLFVBQVUsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLE9BQU8sRUFBRSxPQUFPLENBQUMsQ0FBQztJQUNyRCxNQUFNLFVBQVUsR0FBRyxpQkFBaUIsQ0FBQyxVQUFVLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFFdEQsRUFBRSxDQUFDLGFBQWEsQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7QUFDdkMsQ0FBQztBQUVELFNBQVMsTUFBTSxDQUFDLEdBQVcsRUFBRSxLQUFhO0lBQ3pDLE1BQU0sTUFBTSxHQUFHLElBQUksS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ2hDLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxLQUFLLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNoQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEdBQUcsR0FBRyxDQUFDO0lBQ2pCLENBQUM7SUFDRCxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7QUFDeEIsQ0FBQztBQUVELFNBQVMsbUJBQW1CLENBQUMsR0FBVztJQUN2QyxPQUFPLEdBQUcsQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLEtBQUssQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztBQUNuRSxDQUFDO0FBRUQsU0FBUyxpQkFBaUIsQ0FBQyxPQUFlLEVBQUUsR0FBVztJQUN0RCxNQUFNLFNBQVMsR0FBRztRQUNqQixpR0FBaUc7UUFDakcsK0RBQStEO1FBQy9ELGtHQUFrRztRQUNsRyxrR0FBa0c7S0FDbEcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFYixPQUFPLG1CQUFtQixDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7QUFDckYsQ0FBQztBQUVELFNBQVMsZ0JBQWdCLENBQUMsR0FBVztJQUNwQyxNQUFNLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDdEMsTUFBTSxRQUFRLEdBQUcsR0FBRyxLQUFLLElBQUksS0FBSyxFQUFFLENBQUM7SUFFckMsTUFBTSxNQUFNLEdBQUc7UUFDZCw4Q0FBOEMsUUFBUSxFQUFFO1FBQ3hELGlEQUFpRDtRQUNqRCxzRkFBc0Y7UUFDdEYsb0VBQW9FO1FBQ3BFLEVBQUU7UUFDRixpR0FBaUc7UUFDakcsK0RBQStEO1FBQy9ELHFDQUFxQztRQUNyQyw0RkFBNEY7UUFDNUYsa0dBQWtHO1FBQ2xHLEVBQUU7UUFDRixLQUFLO1FBQ0wsNkNBQTZDLFFBQVEsZ0JBQWdCO1FBQ3JFLCtEQUErRDtRQUMvRCxLQUFLO0tBQ0wsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFYixPQUFPLE1BQU0sQ0FBQztBQUNmLENBQUMifQ== \ No newline at end of file +//# sourceMappingURL=update-types.js.map \ No newline at end of file diff --git a/build/azure-pipelines/upload-cdn.js b/build/azure-pipelines/upload-cdn.js index 458a097f3a7..62247de06bf 100644 --- a/build/azure-pipelines/upload-cdn.js +++ b/build/azure-pipelines/upload-cdn.js @@ -114,4 +114,4 @@ main().catch(err => { console.error(err); process.exit(1); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLWNkbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInVwbG9hZC1jZG4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOztBQUVoRyxtQ0FBbUM7QUFDbkMsK0JBQStCO0FBQy9CLGdDQUFnQztBQUNoQyxzQ0FBc0M7QUFDdEMsa0NBQWtDO0FBQ2xDLDZCQUE2QjtBQUM3Qiw4Q0FBeUQ7QUFDekQsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQUM7QUFFNUMsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0FBQ2xELE1BQU0sVUFBVSxHQUFHLElBQUksaUNBQXNCLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBRSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUUsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFFLENBQUMsQ0FBQztBQUVySixJQUFJLENBQUMsTUFBTSxDQUFDO0lBQ1gsd0JBQXdCLEVBQUUsQ0FBQyxJQUFJLENBQUM7SUFDaEMsa0JBQWtCLEVBQUUsQ0FBQyxlQUFlLENBQUM7Q0FDckMsQ0FBQyxDQUFDO0FBRUgsaUNBQWlDO0FBQ2pDLE1BQU0sbUJBQW1CLEdBQUcsSUFBSSxHQUFHLENBQUM7SUFDbkMsaUJBQWlCO0lBQ2pCLGtCQUFrQjtJQUNsQix1QkFBdUI7SUFDdkIsd0JBQXdCO0lBQ3hCLGtCQUFrQjtJQUNsQixzQkFBc0I7SUFDdEIsaUJBQWlCO0lBQ2pCLHdCQUF3QjtJQUN4QixzQkFBc0I7SUFDdEIsaUJBQWlCO0lBQ2pCLHdCQUF3QjtJQUN4QiwrQkFBK0I7SUFDL0IsdUJBQXVCO0lBQ3ZCLGlCQUFpQjtJQUNqQixxQkFBcUI7SUFDckIsNkJBQTZCO0lBQzdCLDZCQUE2QjtJQUM3Qix3QkFBd0I7SUFDeEIseUJBQXlCO0lBQ3pCLDBCQUEwQjtJQUMxQix1QkFBdUI7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 \ No newline at end of file +//# sourceMappingURL=upload-cdn.js.map \ No newline at end of file diff --git a/build/azure-pipelines/upload-nlsmetadata.js b/build/azure-pipelines/upload-nlsmetadata.js index 0ac3113a57a..34c2005a30f 100644 --- a/build/azure-pipelines/upload-nlsmetadata.js +++ b/build/azure-pipelines/upload-nlsmetadata.js @@ -99,4 +99,4 @@ main().catch(err => { console.error(err); process.exit(1); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLW5sc21ldGFkYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsidXBsb2FkLW5sc21ldGFkYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7QUFFaEcsbUNBQW1DO0FBRW5DLGdDQUFnQztBQUNoQyx5Q0FBeUM7QUFDekMsa0NBQWtDO0FBQ2xDLDhDQUF5RDtBQUN6RCw2QkFBOEI7QUFDOUIsMkJBQWtDO0FBQ2xDLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0FBRTVDLE1BQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMscUJBQXFCLENBQUMsQ0FBQztBQUNsRCxNQUFNLFVBQVUsR0FBRyxJQUFJLGlDQUFzQixDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUUsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFFLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBRSxDQUFDLENBQUM7QUFRckosU0FBUyxJQUFJO0lBQ1osT0FBTyxJQUFJLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUUzQixFQUFFLENBQUMsS0FBSyxDQUNQLEdBQUcsQ0FBQyxHQUFHLENBQUMsc0NBQXNDLEVBQUUsRUFBRSxJQUFJLEVBQUUsb0JBQW9CLEVBQUUsQ0FBQyxFQUMvRSxHQUFHLENBQUMsR0FBRyxDQUFDLHdDQUF3QyxFQUFFLEVBQUUsSUFBSSxFQUFFLG1CQUFtQixFQUFFLENBQUMsRUFDaEYsR0FBRyxDQUFDLEdBQUcsQ0FBQywrQ0FBK0MsRUFBRSxFQUFFLElBQUksRUFBRSxtQkFBbUIsRUFBRSxDQUFDLEVBQ3ZGLEdBQUcsQ0FBQyxHQUFHLENBQUMsdUNBQXVDLEVBQUUsRUFBRSxJQUFJLEVBQUUsbUJBQW1CLEVBQUUsQ0FBQyxDQUFDO2FBQy9FLElBQUksQ0FBQyxLQUFLLENBQUM7WUFDWCxRQUFRLEVB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 \ No newline at end of file +//# sourceMappingURL=upload-nlsmetadata.js.map \ No newline at end of file diff --git a/build/azure-pipelines/upload-sourcemaps.js b/build/azure-pipelines/upload-sourcemaps.js index 4ec17712c57..7cd68398734 100644 --- a/build/azure-pipelines/upload-sourcemaps.js +++ b/build/azure-pipelines/upload-sourcemaps.js @@ -63,4 +63,4 @@ main().catch(err => { console.error(err); process.exit(1); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLXNvdXJjZW1hcHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ1cGxvYWQtc291cmNlbWFwcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7O0FBRWhHLDZCQUE2QjtBQUM3QixtQ0FBbUM7QUFFbkMsZ0NBQWdDO0FBQ2hDLG9DQUFvQztBQUNwQyxhQUFhO0FBQ2IsNENBQTRDO0FBQzVDLDhDQUF5RDtBQUN6RCxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztBQUU1QyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztBQUNuRCxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFDLENBQUM7QUFDbEQsTUFBTSxVQUFVLEdBQUcsSUFBSSxpQ0FBc0IsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFFLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBRSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMscUJBQXFCLENBQUUsQ0FBQyxDQUFDO0FBRXJKLDJEQUEyRDtBQUMzRCxNQUFNLENBQUMsRUFBRSxBQUFELEVBQUcsSUFBSSxFQUFFLElBQUksQ0FBQyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUM7QUFFdEMsU0FBUyxHQUFHLENBQUMsSUFBWSxFQUFFLElBQUksR0FBRyxHQUFHLElBQUksV0FBVztJQUNuRCxPQUFPLEdBQUcsQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLEVBQUUsSUFBSSxFQUFFLENBQUM7U0FDNUIsSUFBSSxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFRLEVBQUUsRUFBRTtRQUM3QixDQUFDLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FBQyxDQUFDLElBQUksU0FBUyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDeEMsT0FBTyxDQUFDLENBQUM7SUFDVixDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ04sQ0FBQztBQUVELFNBQVMsSUFBSTtJQUNaLE1BQU0sT0FBTyxHQUFVLEVBQUUsQ0FBQztJQUUxQiwrQkFBK0I7SUFDL0IsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ1gsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQywwQkFBMEI7UUFDNUQsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUVqQixNQUFNLHNCQUFzQixHQUFzRCxJQUFJLENBQUMseUJBQXlCLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdkgsTUFBTSx5QkFBeUIsR0FBRyxzQkFBc0IsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDM0gsTUFBTSxXQUFXLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyx5QkFBeUIsRUFBRSxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsQ0FBQzthQUNuRSxJQUFJLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSxlQUFlLENBQUMsQ0FBQyxDQUFDO2FBQ3RFLElBQUksQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLGlCQUFpQixPQUFPLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDN0YsT0FBTyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUUxQixNQUFNLGFBQWEsR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsK0JBQStCLEVBQUUscUJBQXFCLENBQUMsRUFBRSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBQzVHLE9BQU8sQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDN0IsQ0FBQztJQUVELDRCQUE0QjtTQUN2QixDQUFDO1FBQ0wsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVELE9BQU8sSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUU7UUFDM0IsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLE9BQU8sQ0FBQzthQUNsQixJQUFJLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxVQUFVLElBQVc7WUFDckMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxRQUFRO1lBQzNELElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3pCLENBQUMsQ0FBQyxDQUFDO2FBQ0YsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUM7WUFDbEIsT0FBTyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMscUJBQXFCO1lBQzFDLFVBQVU7WUFDVixTQUFTLEVBQUUsWUFBWTtZQUN2QixNQUFNLEVBQUUsTUFBTSxHQUFHLEdBQUc7U0FDcEIsQ0FBQyxDQUFDO2FBQ0YsRUFBRSxDQUFDLEtBQUssRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQzthQUNwQixFQUFFLENBQUMsT0FBTyxFQUFFLENBQUMsR0FBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztJQUNyQyxDQUFDLENBQUMsQ0FBQztBQUNKLENBQUM7QUFFRCxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUU7SUFDbEIsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNuQixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2pCLENBQUMsQ0FBQyxDQUFDIn0= \ No newline at end of file +//# sourceMappingURL=upload-sourcemaps.js.map \ No newline at end of file diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index d5d62fa031f..8727c5b5a2b 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -242,11 +242,11 @@ steps: echo "##vso[task.setvariable variable=EsrpCliDllPath]$EsrpCliDllPath" displayName: Find ESRP CLI - - powershell: node build\azure-pipelines\common\sign $env:EsrpCliDllPath windows $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(CodeSigningFolderPath) '*.dll,*.exe,*.node' + - powershell: node build\azure-pipelines\common\sign $env:EsrpCliDllPath sign-windows $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(CodeSigningFolderPath) '*.dll,*.exe,*.node' displayName: Codesign executables and shared libraries - ${{ if eq(parameters.VSCODE_QUALITY, 'insider') }}: - - powershell: node build\azure-pipelines\common\sign $env:EsrpCliDllPath windows-appx $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(CodeSigningFolderPath) '*.appx' + - powershell: node build\azure-pipelines\common\sign $env:EsrpCliDllPath sign-windows-appx $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(CodeSigningFolderPath) '*.appx' displayName: Codesign context menu appx package - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index 07aca726e4e..4726faa51f4 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -2606d6745056d248fe7ba21e6a30467d3ea80d2689c5fa6d2a35acf1b4a72ddd *chromedriver-v25.9.2-darwin-arm64.zip -22a86732b9e6c2afc07021ea0adeb92cdbaaa8751843c0d5170b5e96550685e7 *chromedriver-v25.9.2-darwin-x64.zip -f5f42513bb55c7c1098e669d12488844ca2e63cd0d3a375db2eab517975c130c *chromedriver-v25.9.2-linux-arm64.zip -28a5613f7e4b117a65ec2882b124bf1d388f1c4fb86b228acadc297601faa6fd *chromedriver-v25.9.2-linux-armv7l.zip -7d01d537383df4b1653647e14fb768d27879943596a87b57ae3f171aa2aaf5d1 *chromedriver-v25.9.2-linux-x64.zip -3fac66fe45b4a5dcd9a4784d66bd8087d0dee5fccf06cb3f34e78f8bef3f0f8f *chromedriver-v25.9.2-mas-arm64.zip -a15fc80fac243330f15a7ff7cc834c50c79833e81b871cc45f7239bf1743b4ac *chromedriver-v25.9.2-mas-x64.zip -f0a354e01e277b14422e34f8af9c8c43ae975c6fb69a2e61ef275b6ec919f2ab *chromedriver-v25.9.2-win32-arm64.zip -570a6b5bc485bfea9681c97b79832d5d5bcafdd993c13dc4ab11558e3a27c554 *chromedriver-v25.9.2-win32-ia32.zip -4134f539ac304c65dfca9812b0d3943ea64d886989eba8f62828718b106c4eee *chromedriver-v25.9.2-win32-x64.zip -835418b9274c76503542c986d63bb9d98f071c702170536bdd62c1760589e01e *electron-api.json -fd9f5b1439445acc69441ef66cc47f56c5c0848dec5f6daf91a476073e72a756 *electron-v25.9.2-darwin-arm64-dsym-snapshot.zip -de29ef2a4c7b76281b1cf3ac9e6047a9275cc60167c6cd60509f2eb2a3258842 *electron-v25.9.2-darwin-arm64-dsym.zip -732f51802f2902ca08c3a06a45fe23820b1effbeb3ebd39fcae9fce5a1e0b25d *electron-v25.9.2-darwin-arm64-symbols.zip -ab82efb59077a85fd20264f8ad0dedc4c8b0b2fc9d2948ed9461425faf5e35f6 *electron-v25.9.2-darwin-arm64.zip -fb924b4dd0d781a14114e54fa556ca326c60665b674712c59163e7b44db675d8 *electron-v25.9.2-darwin-x64-dsym-snapshot.zip -197fc3e120e54578658e2f10b5fcec1d2004f1637d4bee116ff1e12b0c5a1429 *electron-v25.9.2-darwin-x64-dsym.zip -57d0a0f55726524ff843a040e516e425c3537a4602ab8c23120433fbc51470fb *electron-v25.9.2-darwin-x64-symbols.zip -0fe310e2ed13a97cd9c28fb0cf806338cd2e720083e6d1b13d60ba4cedb8f295 *electron-v25.9.2-darwin-x64.zip -eb1a31ccd6a89a21538a8b1f0b5d3b77e1fe946b898319e1832cb9dc3abcd753 *electron-v25.9.2-linux-arm64-debug.zip -b5b128bed0a09955ad5bb91fa9f5ab9155a547f787ad580bcd5bf409bb697ff6 *electron-v25.9.2-linux-arm64-symbols.zip -0b2d48a29d79fcd21d72d05fdb7638dd2fd257cf0d4cf9bd32f182b2634de466 *electron-v25.9.2-linux-arm64.zip -eb1a31ccd6a89a21538a8b1f0b5d3b77e1fe946b898319e1832cb9dc3abcd753 *electron-v25.9.2-linux-armv7l-debug.zip -43f1f4c1475335719ba8f1f7f036a084fb22b5faa908bf4f7d30a96d5d9c159d *electron-v25.9.2-linux-armv7l-symbols.zip -4ea3ee3ad41c69454d9a12518eeff1ec5dbd841c8200dc8652e6c0b101d1259c *electron-v25.9.2-linux-armv7l.zip -1a8daf1f9e155d7143d16367e54e4e3b8e9d71ad580b44c8dfba0cb4e7a1c640 *electron-v25.9.2-linux-x64-debug.zip -803f32ca345d8974cc074dc177e06c62f8bcc98d4a39eccb676b7d302b8fc466 *electron-v25.9.2-linux-x64-symbols.zip -aab65a562723e04eadbdee1251a749756b366dc1c5014bcc987c21c0a523fe2f *electron-v25.9.2-linux-x64.zip -fd9f5b1439445acc69441ef66cc47f56c5c0848dec5f6daf91a476073e72a756 *electron-v25.9.2-mas-arm64-dsym-snapshot.zip -0ec88ec7bd2b7cb2e5e6b94f13df7d8c22433637004a473370e0959cb01f78cc *electron-v25.9.2-mas-arm64-dsym.zip -398a0575c1974565af99b6759a74967c0709bc101059542a00bfe64a1210a86f *electron-v25.9.2-mas-arm64-symbols.zip -17f86ad33f9fc2ca5eaac5ef87604e65b1eefba5a51d4ad58e70018fdfb84ac6 *electron-v25.9.2-mas-arm64.zip -db61b29802ee1f598a3e61211a281656f16e70ae84041e6b2b5dd8ecae43cd67 *electron-v25.9.2-mas-x64-dsym-snapshot.zip -2f76620eb7d632335f7620f5d3713af5e59c98bdb0b323269c2319b7164fcaac *electron-v25.9.2-mas-x64-dsym.zip -ea226c8d049e527d84ec5058474fd4e64476e6924fef42b1dbea774925f59064 *electron-v25.9.2-mas-x64-symbols.zip -51b9d192ccb7612211ca9cc8ddb373a86f791d38b369337ad099a133e9d9807a *electron-v25.9.2-mas-x64.zip -53b39857303191ea2f26dda06461e6e612ca0ed799bdf0c26a1a63ff89f7ea1b *electron-v25.9.2-win32-arm64-pdb.zip -49199591c69fbeb68dd57252a3d8525babe79ab98447ad639f2d0c3e63aba4b6 *electron-v25.9.2-win32-arm64-symbols.zip -e7b968fc53cc7a10a4ccb5133af045968479685ebb9617f06817f03667fdd425 *electron-v25.9.2-win32-arm64-toolchain-profile.zip -6abd0a6697d7fe8b6add4d1017a01a0ac756d16da5bfa077bd373a685b529bd8 *electron-v25.9.2-win32-arm64.zip -cc5c67b027c679eb86882c2ec267d38fafcc5127b49e8a060002541253e2b26b *electron-v25.9.2-win32-ia32-pdb.zip -2cd8aab8aa4eadfce90c8ba6565a77689db1efe55b7eaafedede3b08e8c41f53 *electron-v25.9.2-win32-ia32-symbols.zip -e7b968fc53cc7a10a4ccb5133af045968479685ebb9617f06817f03667fdd425 *electron-v25.9.2-win32-ia32-toolchain-profile.zip -ac2aebe7d7b21351256fb3b60219269e75ff33f8c3cfbbca682c3622d1943b94 *electron-v25.9.2-win32-ia32.zip -000b506bab92c92e0ff8428033fc7e1c15049437606794c4bec84a66eb29b6cd *electron-v25.9.2-win32-x64-pdb.zip -fd40d04de0ef4a04dd720505f03a6d209a38387fe05493869f441037aa950e4d *electron-v25.9.2-win32-x64-symbols.zip -e7b968fc53cc7a10a4ccb5133af045968479685ebb9617f06817f03667fdd425 *electron-v25.9.2-win32-x64-toolchain-profile.zip -de3fc45f4fa5572d6dbb4f21580e75d3b6429a6b3b833a962c810e7e199b8573 *electron-v25.9.2-win32-x64.zip -c3f22fbf99713bb44546278ef1456e4fc9a83d33bf038f6752fea12c7a721337 *electron.d.ts -2a088f4c227405783466e456e69154193a730130f5cc39520091abc8993977bc *ffmpeg-v25.9.2-darwin-arm64.zip -4da4197282a9a31379d2194d1072888b9ed3200663e322df2759b971725a2915 *ffmpeg-v25.9.2-darwin-x64.zip -bd52d57ff97fb56ac01a3482af905d04f0d4e9c13c53858c6d9f99957eca82da *ffmpeg-v25.9.2-linux-arm64.zip -9b3d09177fa1e63e2a6beecfa70aeec30aeb5c1873ff21128a68051c4e23f95d *ffmpeg-v25.9.2-linux-armv7l.zip -39c3e411873262873edff4b9f4b5d9973fb3cab8f700d6ff665872dab3b39eb3 *ffmpeg-v25.9.2-linux-x64.zip -861287a6cb0f546c0e39f49a2b28f5575d66fbddb26486584cc7802e84402339 *ffmpeg-v25.9.2-mas-arm64.zip -bcc8315a9e07394510c96ffca20720e3cdb2a4aecc75798bfca8fd60417782aa *ffmpeg-v25.9.2-mas-x64.zip -0ebfe5a72aaf0a9af81ffbcba03763f4baa142c93c31b50ad0145365366f0076 *ffmpeg-v25.9.2-win32-arm64.zip -d8e7ea1268145d3481a74152ced8ae677ca5b174f06eb874a6ce0005ff0d471c *ffmpeg-v25.9.2-win32-ia32.zip -d1f499b957377c3822c43eadf3bc32e7cb04b52fb2fd51ba22f14cd61ef01727 *ffmpeg-v25.9.2-win32-x64.zip -86a0df1394e741feb21a891747775911d5c2f9cd940662826b33c309275abb7c *hunspell_dictionaries.zip -4c4bab279b39c4e463dcb3a897e256e5e4f088e6e6495f6aea10e26703ecafc3 *libcxx-objects-v25.9.2-linux-arm64.zip -d2b6349a89c9fce3ccc0a9a430b059eb18cd3967dbbe34bfcae54b3f58cd462a *libcxx-objects-v25.9.2-linux-armv7l.zip -e8d4b1a3228c0709dc54d780bd4d33727fff30c38f8e00409a6eaf54a69e5869 *libcxx-objects-v25.9.2-linux-x64.zip -7679259e7cb02140806cc616d012102462d671ae07c4673ad0c2c9a6716444a6 *libcxx_headers.zip -b1683af6708bceaa966e5168fda51223fa51e09549abc90f5744d500f9260c92 *libcxxabi_headers.zip -4fed33611a889d0100a6fbf4253cf9dcb9fbe3c42f7c86d8886d460a9a9cf8e6 *mksnapshot-v25.9.2-darwin-arm64.zip -5e1daea6393bd977a70020c36f1e4ee4e416c8c4eafe2b27b38292e4acb1764b *mksnapshot-v25.9.2-darwin-x64.zip -92ff719eb83df7f107d4dd3970122333f4bde194292c568b5c0a5ea4684bc9f1 *mksnapshot-v25.9.2-linux-arm64-x64.zip -e621d50652f2afa49f47ab7cccd07f7d29ef60f694a0e70d4e6434ddd07cf282 *mksnapshot-v25.9.2-linux-armv7l-x64.zip -012c24dd59f7b5b4322e53c12bb6450a7b15bc6800042fcf3804ba14685f8188 *mksnapshot-v25.9.2-linux-x64.zip -62e880bf8594b1d83926984c252d86990f1386655bd1375afc0fd3054018adef *mksnapshot-v25.9.2-mas-arm64.zip -0742e1bfcbe171199f0a333fddbf401a61777928d462b852d21fec2822b2c46e *mksnapshot-v25.9.2-mas-x64.zip -b019e6e117e13238465d1758274ebbaf7ccb999921dcb11ef1e3a9a5a6df952b *mksnapshot-v25.9.2-win32-arm64-x64.zip -bc7196f1fd2ba3aedc6c16e96e455d280155dfc493a0d0f6ce7bffe645e39e1e *mksnapshot-v25.9.2-win32-ia32.zip -2d152f09969d69439e831b4212e77ea157a9e4b3a9b3ad55d4f2efcc547c25eb *mksnapshot-v25.9.2-win32-x64.zip \ No newline at end of file +fb6f9b62f3f031106dbaba2538bd850c6c18206353a85552f66e41bea36cb4c0 *chromedriver-v27.1.3-darwin-arm64.zip +ad6fb1824df1ae040aaa0ea280b37b175458517f6023414ce11418a0787e7bc8 *chromedriver-v27.1.3-darwin-x64.zip +559c07c4392640478702818076414a53e32845ea10647b354f9d5cbd45eabea2 *chromedriver-v27.1.3-linux-arm64.zip +82a17100d8443b10763e66194960830236a1d6a8a931db7b75beac8d5fa929c4 *chromedriver-v27.1.3-linux-armv7l.zip +fea8713f19cafb4eb0591074d42a52ca6d1394a9da05d8c73ed2590f1bbd6056 *chromedriver-v27.1.3-linux-x64.zip +6202162efb2d4479a826dc0d6090c1ffa3c90efa245f6c66cfd6d71169f52cd8 *chromedriver-v27.1.3-mas-arm64.zip +dd966c0dd992b63616e0ec811f27367232c40b1ae12aca80467c7c3b3bf52da5 *chromedriver-v27.1.3-mas-x64.zip +a7c800241316318e74cdefd8c311c0aa80c84263471bc6f20738d6be1ede9f76 *chromedriver-v27.1.3-win32-arm64.zip +95722b9b0915e8e883de762ceea7e3e859d4b0c8ea05e1ec78273707bbae95be *chromedriver-v27.1.3-win32-ia32.zip +73d0d834812c51b408dd863588686e21013b076eb5af43a19a9b5bdb11b035cf *chromedriver-v27.1.3-win32-x64.zip +977a4b72c9f4bc83256b46bc477d8f99957e9db2d543a99e10bc72667431823c *electron-api.json +dee2d7db6aeaf9a0a4c67c6ad4242d162f5573f96198c8af7d3c4888090e7c3e *electron-v27.1.3-darwin-arm64-dsym-snapshot.zip +cf8bf2d3d907e0860b28fbe13d41889161fab11578d991251344820e2d9a0370 *electron-v27.1.3-darwin-arm64-dsym.zip +a98e58cc6b840dd079b42224ebb612e4286ee2dabc0fb0b3338d71da65b388c9 *electron-v27.1.3-darwin-arm64-symbols.zip +ae44b0d094c53e233f5f69db13fe83b1db5e6434a7688fe72550f30f00bde40c *electron-v27.1.3-darwin-arm64.zip +a262a0c9baa3c4296f0e82498714c84189ee4474a099bf3ed3f7ab532c42d8f7 *electron-v27.1.3-darwin-x64-dsym-snapshot.zip +ca6fced7f9c356bf85ca512721a929df6b8c72fffdd18de49e475140038aae99 *electron-v27.1.3-darwin-x64-dsym.zip +1f29c88e7a170ec4c0d28feff70b117d7dd9c32758f12e99e38cf7178d710c7d *electron-v27.1.3-darwin-x64-symbols.zip +1f390ed58536a6ca35a65f2d89dabfbec7710a63c0037e7b6b5b93ddec830e4a *electron-v27.1.3-darwin-x64.zip +20ec3f863b6af6dbf16e71a73f813dce72aa3ebe24e45a9aafeec95d0e50e0b1 *electron-v27.1.3-linux-arm64-debug.zip +9c61c8eccad95493e5b26d390d76054cc193ef6969ea09f9487d5fe7dddc74ed *electron-v27.1.3-linux-arm64-symbols.zip +dc40729e50501923fb6c05f96179404fb7cb66abffd4c541ba48a98dd99eb1ed *electron-v27.1.3-linux-arm64.zip +20ec3f863b6af6dbf16e71a73f813dce72aa3ebe24e45a9aafeec95d0e50e0b1 *electron-v27.1.3-linux-armv7l-debug.zip +070f1eb4f748ed7f2fcd7251eb1cc6a60dd673b875b5ccdde725a6d81d63aa93 *electron-v27.1.3-linux-armv7l-symbols.zip +b7722854c6cdc32748341a42a8031c6fb39a9c7bb4b14a5df2bede8b6c34a51d *electron-v27.1.3-linux-armv7l.zip +6a5b0a98a784761ad526b4d3c3f6ee9bb1b080fec033a6707f31562e21f78e21 *electron-v27.1.3-linux-x64-debug.zip +47cd6f88991657387ede77513fda4bee4af8774cda70370aee10efe20daf1e3d *electron-v27.1.3-linux-x64-symbols.zip +5c567315071b2c69e5b3834c8098270bc8be2625242709a82404ca16e66fae14 *electron-v27.1.3-linux-x64.zip +0e86b47e647bfa05638341f36405cd313827c35be4dc39e007150c5fed559d43 *electron-v27.1.3-mas-arm64-dsym-snapshot.zip +f353c28728ad2c18c8f394adca6cf579c7a6031d87192e4ac21c131aa15d73d1 *electron-v27.1.3-mas-arm64-dsym.zip +8a69b87569291270e647aeb45c4ba0c16b5282c6c23c60aafb067b9485908b2a *electron-v27.1.3-mas-arm64-symbols.zip +78f5a61e5d828fd85a25cad0f8bd97144fcb59e79f6be8ab9a6f5b92410bf8d0 *electron-v27.1.3-mas-arm64.zip +71d2a5843fab0b1e6fbbf31788f5ce262d26bead43974e4559b502e608c5caa0 *electron-v27.1.3-mas-x64-dsym-snapshot.zip +31ba66bc89ff0ca11d82971e5a1846ef3426bdd1aa22675fc5e5a9ecd545a419 *electron-v27.1.3-mas-x64-dsym.zip +3eb43d0058e88a0b45845f2e78d270325c52ae32b552e94b5da38d3a0187d3c8 *electron-v27.1.3-mas-x64-symbols.zip +bc7ff5f8938d24390a1305f13ed29760fb7c841b533fad090682024bdf93b304 *electron-v27.1.3-mas-x64.zip +e98c36b90984f7307463f815a7d593b41d373e24e6949e8dad28ea84b581c615 *electron-v27.1.3-win32-arm64-pdb.zip +c71180638cc29d888f6bdbbf92476dd4aa443c934ee3e9c588a898fbe0aaa70b *electron-v27.1.3-win32-arm64-symbols.zip +c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v27.1.3-win32-arm64-toolchain-profile.zip +4b8cbea485aff9325f3e41b842d4714900299667255179b2c7ac653b56d4b0c8 *electron-v27.1.3-win32-arm64.zip +d5be66a6f7416d4bf506c950e31c907604bbfc3c4c417c9545df81070cb669dd *electron-v27.1.3-win32-ia32-pdb.zip +e5ab5957302d1d839e620e803de810de9c476147383a05af41e08ba9add74445 *electron-v27.1.3-win32-ia32-symbols.zip +c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v27.1.3-win32-ia32-toolchain-profile.zip +c06c9ee185276e56dfb62ca7ea742f8442b8d573b430bb9d6ce03024fe4be670 *electron-v27.1.3-win32-ia32.zip +82a8dfb06126e25672f793a87fa6183c62badeefc4d6372043f038f3347c3880 *electron-v27.1.3-win32-x64-pdb.zip +441c05b66b2584421683771cd428be78d59e37359cee88d01e8a1201e8c95206 *electron-v27.1.3-win32-x64-symbols.zip +c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v27.1.3-win32-x64-toolchain-profile.zip +ed04476baf0d1c363f91c6cc457e448eaee2efd2464449f5bd1b3ec94f5a6b81 *electron-v27.1.3-win32-x64.zip +f58626c26c10446993521695da1fbe22162285dc4a49691de455153a6eb7ad4f *electron.d.ts +178f0822f1ac3c3dd936a05e7691eccbce7dc091fb23399eeb6c8c2d19d35309 *ffmpeg-v27.1.3-darwin-arm64.zip +8756fbaeffb0f076e9c03b03fbc0828c1d2af1fa5fafd892dbb35dbcab39606a *ffmpeg-v27.1.3-darwin-x64.zip +be517ba93c5b5f36d2e55af148213f4c2fc43177563825601bee6f88dd4f7b05 *ffmpeg-v27.1.3-linux-arm64.zip +926d0da25ffcea3d05a6cbcae15e5d7729d93bc43394ae4439747669d2210e1d *ffmpeg-v27.1.3-linux-armv7l.zip +6f9c0ef52af14828ad547a80b17f8c63cac51a18b8d5769a2f33e4fa6cccfc7e *ffmpeg-v27.1.3-linux-x64.zip +a8820f2d8133ac554edac5aaf5926f7b4d46e793c2315a1729099836dbe0674f *ffmpeg-v27.1.3-mas-arm64.zip +28cd237b7a4d04020ce262ab3e7bab66cb7921a94bb75f49d95eee0953624021 *ffmpeg-v27.1.3-mas-x64.zip +9949f98c8c07d03892a2b4940a4620a1ab2bc9501a1ab46d1941b4c2a3966beb *ffmpeg-v27.1.3-win32-arm64.zip +5cfe4c2b731c3db36338d01a88e146dc8cf7b83ede3f2090396f803f5095e7c2 *ffmpeg-v27.1.3-win32-ia32.zip +c175b1ef006ff337754bb9d9dd5b86e11273b981602d01a83bbc5eff09d583cb *ffmpeg-v27.1.3-win32-x64.zip +a37cecf4b0b2ffef035ed1916cc747037d42bd8e083c5b901decff3bfeb55a4d *hunspell_dictionaries.zip +3433837c4fdeaec616527ae03d433ae6f515a75b3855dfe750dc22b1622d67f0 *libcxx-objects-v27.1.3-linux-arm64.zip +60141a1fac588aed7320a53b355262b98dd3e67a6ad94a93f44ff240b34e69e0 *libcxx-objects-v27.1.3-linux-armv7l.zip +14d048f8375c27adc28006c9cdf73b4f9dcebb18f089b21cd2e35a17c9c89c21 *libcxx-objects-v27.1.3-linux-x64.zip +9983ad6c098939d91bc67b5a8d9ebd2e72685000310c712876533ce31e71d129 *libcxx_headers.zip +8052c0a22a9ad673d32c1ae157df9638838fbd017a030263d4cce21aeed5c824 *libcxxabi_headers.zip +734eef5f5c8ca1d9feb107c786d85a9560a2f8009c32cc6f8cda04d24b825d21 *mksnapshot-v27.1.3-darwin-arm64.zip +ec489cbe9634d799c14ec9897973a7924126404570a049a16eb0a2a771d728ed *mksnapshot-v27.1.3-darwin-x64.zip +b4f952c96d369b566e85f7b1d67c6a1553158f041c944a53e9bbd324a4a8699b *mksnapshot-v27.1.3-linux-arm64-x64.zip +c705cd0f7301fd7b8b282ffe51efdce3c7305a828c21015640c5091e6f9b71ed *mksnapshot-v27.1.3-linux-armv7l-x64.zip +bf5e7c0aa8000e6da7f8d00acdf7bb93474af8c2eb684177fb6fd0b2d2ae72d8 *mksnapshot-v27.1.3-linux-x64.zip +dd9ff64c44563d5713ae516dd05db950a34e9b271bc3df5ffed20e7eda1ae50b *mksnapshot-v27.1.3-mas-arm64.zip +31558d25b4051cbce2e5f98f58cc860b14fbbe92d727e2696f3f36ed266aed9e *mksnapshot-v27.1.3-mas-x64.zip +0b8f3b6702aa81adff35ddaedf44623ab91eda203aecde5e15759ff8ae95558f *mksnapshot-v27.1.3-win32-arm64-x64.zip +ad95d9708c7a94b396714956b7407c9a7283ca54b26bcf0034f81764d9285037 *mksnapshot-v27.1.3-win32-ia32.zip +98e7e1fd5580e8c626f519eb619ff8bf16c3d909212cd5260cebb8a155d2ddce *mksnapshot-v27.1.3-win32-x64.zip diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt index 7159352a1b2..9ed8af5842a 100644 --- a/build/checksums/nodejs.txt +++ b/build/checksums/nodejs.txt @@ -1,6 +1,6 @@ -bd302a689c3c34e2b61d86b97de66d26a335881a17af09b6a0a4bb1019df56e4 node-v18.15.0-darwin-arm64.tar.gz -76add174d2d3f98da08907412e82add7352b8cb6f639324d352a65c084b99c7e node-v18.15.0-darwin-x64.tar.gz -8ef7aa7a679360ddbf0c7c8511881030b3de9d1f54451d92ba5c8d59a91c7073 node-v18.15.0-linux-arm64.tar.gz -ca2186313d3cbe5c67d0c08e931a6d290906f4f13c584e63fefa05a04dee9c58 node-v18.15.0-linux-armv7l.tar.gz -b298a73a9fc07badfa9e4a2e86ed48824fc9201327cdc43e3f3f58b273c535e7 node-v18.15.0-linux-x64.tar.gz -17fd75d8a41bf9b4c475143e19ff2808afa7a92f7502ede731537d9da674d5e8 win-x64/node.exe +18ca716ea57522b90473777cb9f878467f77fdf826d37beb15a0889fdd74533e node-v18.17.1-darwin-arm64.tar.gz +b3e083d2715f07ec3f00438401fb58faa1e0bdf3c7bde9f38b75ed17809d92fa node-v18.17.1-darwin-x64.tar.gz +8f5203f5c6dc44ea50ac918b7ecbdb1c418e4f3d9376d8232a1ef9ff38f9c480 node-v18.17.1-linux-arm64.tar.gz +1ab79868859b2d37148c6d8ecee3abb5ee55b88731ab5df01928ed4f6f9bfbad node-v18.17.1-linux-armv7l.tar.gz +2cb75f2bc04b0a3498733fbee779b2f76fe3f655188b4ac69ef2887b6721da2d node-v18.17.1-linux-x64.tar.gz +afb45186ad4f4217c2fc1dfc2239ff5ab016ef0ba5fc329bc6aa8fd10c7ecc88 win-x64/node.exe diff --git a/build/checksums/vscode-sysroot.txt b/build/checksums/vscode-sysroot.txt new file mode 100644 index 00000000000..86da04db2ae --- /dev/null +++ b/build/checksums/vscode-sysroot.txt @@ -0,0 +1,3 @@ +a2d51dc505ed544c52757f90bcdab44920132295fc7a67166eff86b6e0e24aa8 aarch64-linux-gnu.tar.gz +032cf16bf8b965e1351305f10f3dedabf4f9868027ac6d0e8f52321ca0b70d4a arm-rpi-linux-gnueabihf.tar.gz +360475a764d0faf4d3743aa866347eff78072639d20660def83e1a03eadf534c x86_64-linux-gnu.tar.gz diff --git a/build/darwin/create-universal-app.js b/build/darwin/create-universal-app.js index b69003c3f89..7da8e55c908 100644 --- a/build/darwin/create-universal-app.js +++ b/build/darwin/create-universal-app.js @@ -57,4 +57,4 @@ if (require.main === module) { process.exit(1); }); } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLXVuaXZlcnNhbC1hcHAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjcmVhdGUtdW5pdmVyc2FsLWFwcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7O0FBRWhHLDZCQUE2QjtBQUM3Qix5QkFBeUI7QUFDekIsdUVBQTREO0FBQzVELHFFQUFvRDtBQUVwRCxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztBQUVuRCxLQUFLLFVBQVUsSUFBSSxDQUFDLFFBQWlCO0lBQ3BDLE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7SUFFeEMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2YsTUFBTSxJQUFJLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFFRCxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQztJQUNyRixNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsUUFBUSxHQUFHLE1BQU0sQ0FBQztJQUMxQyxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxtQkFBbUIsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUNyRSxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxxQkFBcUIsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUN6RSxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxVQUFVLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0lBQy9GLE1BQU0sYUFBYSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLFVBQVUsRUFBRSxXQUFXLEVBQUUsS0FBSyxFQUFFLG1CQUFtQixDQUFDLENBQUM7SUFDbkcsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsaUJBQWlCLElBQUksRUFBRSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQ3pFLE1BQU0sZUFBZSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLFVBQVUsRUFBRSxXQUFXLEVBQUUsS0FBSyxFQUFFLGNBQWMsQ0FBQyxDQUFDO0lBRWpHLE1BQU0sSUFBQSwyQ0FBZ0IsRUFBQztRQUN0QixVQUFVO1FBQ1YsWUFBWTtRQUNaLFdBQVc7UUFDWCxhQUFhO1FBQ2IsV0FBVyxFQUFFO1lBQ1osY0FBYztZQUNkLGFBQWE7WUFDYixlQUFlO1lBQ2YsZUFBZTtZQUNmLFlBQVksRUFBRSx5REFBeUQ7WUFDdkUsY0FBYyxFQUFFLHdEQUF3RDtZQUN4RSxRQUFRO1NBQ1I7UUFDRCxVQUFVO1FBQ1YsS0FBSyxFQUFFLElBQUk7S0FDWCxDQUFDLENBQUM7SUFFSCxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsZUFBZSxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7SUFDekUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxXQUFXLEVBQUU7UUFDMUIsc0JBQXNCLEVBQUUsa0JBQWtCO0tBQzFDLENBQUMsQ0FBQztJQUNILEVBQUUsQ0FBQyxhQUFhLENBQUMsZUFBZSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsV0FBVyxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBRTNFLGtEQUFrRDtJQUNsRCxNQUFNLFVBQVUsR0FBRyxNQUFNLElBQUEsMkJBQUssRUFBQyxNQUFNLEVBQUUsQ0FBQyxVQUFVLEVBQUUsT0FBTyxFQUFFLGVBQWUsQ0FBQyxDQUFDLENBQUM7SUFDL0UsTUFBTSxVQUFVLEdBQUcsTUFBTSxJQUFBLDJCQUFLLEVBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNsRixJQUFJLFVBQVUsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxLQUFLLGNBQWMsRUFBRSxDQUFDO1FBQ3RELE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLFVBQVUsRUFBRSxDQUFDLENBQUM7SUFDdEQsQ0FBQztBQUNGLENBQUM7QUFFRCxJQUFJLE9BQU8sQ0FBQyxJQUFJLEtBQUssTUFBTSxFQUFFLENBQUM7SUFDN0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUU7UUFDakMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNuQixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2pCLENBQUMsQ0FBQyxDQUFDO0FBQ0osQ0FBQyJ9 \ No newline at end of file +//# sourceMappingURL=create-universal-app.js.map \ No newline at end of file diff --git a/build/darwin/sign.js b/build/darwin/sign.js index 5501b2bf212..f5913b73ab8 100644 --- a/build/darwin/sign.js +++ b/build/darwin/sign.js @@ -110,4 +110,4 @@ if (require.main === module) { process.exit(1); }); } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNpZ24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOztBQUVoRyx5QkFBeUI7QUFDekIsNkJBQTZCO0FBQzdCLDhDQUE4QztBQUM5QyxxRUFBb0Q7QUFFcEQsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7QUFFbkQsU0FBUyxrQkFBa0I7SUFDMUIsTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxTQUFTLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNuRSxNQUFNLE1BQU0sR0FBRyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbkQsT0FBTyxNQUFNLENBQUM7QUFDZixDQUFDO0FBRUQsS0FBSyxVQUFVLElBQUksQ0FBQyxRQUFpQjtJQUNwQyxNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFDLENBQUM7SUFDbkQsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUN4QyxNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFFbEQsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2YsTUFBTSxJQUFJLEtBQUssQ0FBQywrQkFBK0IsQ0FBQyxDQUFDO0lBQ2xELENBQUM7SUFFRCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDZCxNQUFNLElBQUksS0FBSyxDQUFDLDhCQUE4QixDQUFDLENBQUM7SUFDakQsQ0FBQztJQUVELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxjQUFjLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDO0lBQ3JGLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDeEMsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsaUJBQWlCLElBQUksRUFBRSxDQUFDLENBQUM7SUFDN0QsTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUM7SUFDMUMsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLFlBQVksQ0FBQyxDQUFDO0lBQy9FLE1BQU0saUJBQWlCLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQztJQUM1QyxNQUFNLGdCQUFnQixHQUFHLGlCQUFpQixHQUFHLG1CQUFtQixDQUFDO0lBQ2pFLE1BQU0scUJBQXFCLEdBQUcsaUJBQWlCLEdBQUcsd0JBQXdCLENBQUM7SUFDM0UsTUFBTSxtQkFBbUIsR0FBRyxpQkFBaUIsR0FBRyxzQkFBc0IsQ0FBQztJQUN2RSxNQUFNLGFBQWEsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLFlBQVksQ0FBQyxDQUFDO0lBRS9FLE1BQU0sV0FBVyxHQUF5QjtRQUN6QyxHQUFHLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDO1FBQ2hDLFFBQVEsRUFBRSxRQUFRO1FBQ2xCLFlBQVksRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxRQUFRLEVBQUUsd0JBQXdCLENBQUM7UUFDdkYsc0JBQXNCLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsUUFBUSxFQUFFLHdCQUF3QixDQUFDO1FBQ2pHLGVBQWUsRUFBRSxJQUFJO1FBQ3JCLHVCQUF1QixFQUFFLEtBQUs7UUFDOUIsZ0NBQWdDLEVBQUUsS0FBSztRQUN2QyxRQUFRLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUscUJBQXFCLENBQUM7UUFDbkQsT0FBTyxFQUFFLGtCQUFrQixFQUFFO1FBQzdCLFFBQVE7UUFDUixtQkFBbUIsRUFBRSxLQUFLO0tBQzFCLENBQUM7SUFFRixNQUFNLE9BQU8sR0FBRztRQUNmLEdBQUcsV0FBVztRQUNkLG1FQUFtRTtRQUNuRSxNQUFNLEVBQUUsQ0FBQyxRQUFnQixFQUFFLEVBQUU7WUFDNUIsT0FBTyxRQUFRLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFDO2dCQUN6QyxRQUFRLENBQUMsUUFBUSxDQUFDLHFCQUFxQixDQUFDO2dCQUN4QyxRQUFRLENBQUMsUUFBUSxDQUFDLG1CQUFtQixDQUFDLENBQUM7UUFDekMsQ0FBQztLQUNELENBQUM7SUFFRixNQUFNLGFBQWEsR0FBeUI7UUFDM0MsR0FBRyxXQUFXO1FBQ2QsR0FBRyxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUM7UUFDbEQsWUFBWSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLFFBQVEsRUFBRSwrQkFBK0IsQ0FBQztRQUM5RixzQkFBc0IsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxRQUFRLEVBQUUsK0JBQStCLENBQUM7S0FDeEcsQ0FBQztJQUVGLE1BQU0sa0JBQWtCLEdBQXlCO1FBQ2hELEdBQUcsV0FBVztRQUNkLEdBQUcsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLHFCQUFxQixDQUFDO1FBQ3ZELFlBQVksRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxRQUFRLEVBQUUsb0NBQW9DLENBQUM7UUFDbkcsc0JBQXNCLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsUUFBUSxFQUFFLG9DQUFvQyxDQUFDO0tBQzdHLENBQUM7SUFFRixNQUFNLGdCQUFnQixHQUF5QjtRQUM5QyxHQUFHLFdBQVc7UUFDZCxHQUFHLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxtQkFBbUIsQ0FBQztRQUNyRCxZQUFZLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsUUFBUSxFQUFFLGtDQUFrQyxDQUFDO1FBQ2pHLHNCQUFzQixFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLFFBQVEsRUFBRSxrQ0FBa0MsQ0FBQztLQUMzRyxDQUFDO0lBRUYseURBQXlEO0lBQ3pELGtEQUFrRDtJQUNsRCxJQUFJLElBQUksS0FBSyxXQUFXLEVBQUUsQ0FBQztRQUMxQixNQUFNLElBQUEsMkJBQUssRUFBQyxRQUFRLEVBQUU7WUFDckIsU0FBUztZQUNULCtCQUErQjtZQUMvQixTQUFTO1lBQ1QsZ0VBQWdFO1lBQ2hFLEdBQUcsYUFBYSxFQUFFO1NBQ2xCLENBQUMsQ0FBQztRQUNILE1BQU0sSUFBQSwyQkFBSyxFQUFDLFFBQVEsRUFBRTtZQUNyQixVQUFVO1lBQ1YsOEJBQThCO1lBQzlCLFNBQVM7WUFDVCxtRUFBbUU7WUFDbkUsR0FBRyxhQUFhLEVBQUU7U0FDbEIsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxJQUFBLDJCQUFLLEVBQUMsUUFBUSxFQUFFO1lBQ3JCLFVBQVU7WUFDViwwQkFBMEI7WUFDMUIsU0FBUztZQUNULCtEQUErRDtZQUMvRCxHQUFHLGFBQWEsRUFBRTtTQUNsQixDQUFDLENBQUM7SUFDSixDQUFDO0lBRUQsTUFBTSxRQUFRLENBQUMsU0FBUyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQ3hDLE1BQU0sUUFBUSxDQUFDLFNBQVMsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0lBQzdDLE1BQU0sUUFBUSxDQUFDLFNBQVMsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQzNDLE1BQU0sUUFBUSxDQUFDLFNBQVMsQ0FBQyxPQUFjLENBQUMsQ0FBQztBQUMxQyxDQUFDO0FBRUQsSUFBSSxPQUFPLENBQUMsSUFBSSxLQUFLLE1BQU0sRUFBRSxDQUFDO0lBQzdCLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFO1FBQ2pDLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbkIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNqQixDQUFDLENBQUMsQ0FBQztBQUNKLENBQUMifQ== \ No newline at end of file +//# sourceMappingURL=sign.js.map \ No newline at end of file diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js index f9f76e4d371..22b70a953df 100644 --- a/build/gulpfile.editor.js +++ b/build/gulpfile.editor.js @@ -420,50 +420,17 @@ gulp.task('editor-distro', ) ); -const bundleEditorESMTask = task.define('editor-esm-bundle-webpack', () => { - const webpack = require('webpack'); - const webpackGulp = require('webpack-stream'); - - const result = es.through(); - - const webpackConfigPath = path.join(root, 'build/monaco/monaco.webpack.config.js'); - - const webpackConfig = { - ...require(webpackConfigPath), - ...{ mode: 'production' } - }; - - const webpackDone = (err, stats) => { - if (err) { - result.emit('error', err); - return; - } - const { compilation } = stats; - if (compilation.errors.length > 0) { - result.emit('error', compilation.errors.join('\n')); - } - if (compilation.warnings.length > 0) { - result.emit('data', compilation.warnings.join('\n')); - } - }; - - return webpackGulp(webpackConfig, webpack, webpackDone) - .pipe(gulp.dest('out-editor-esm-bundle')); -}); - -gulp.task('editor-esm-bundle', +gulp.task('editor-esm', task.series( task.parallel( util.rimraf('out-editor-src'), util.rimraf('out-editor-esm'), util.rimraf('out-monaco-editor-core'), - util.rimraf('out-editor-esm-bundle'), ), extractEditorSrcTask, createESMSourcesAndResourcesTask, compileEditorESMTask, appendJSToESMImportsTask, - bundleEditorESMTask, ) ); diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js index 0d7d3c5b7f8..8c2b62f7b2a 100644 --- a/build/gulpfile.vscode.linux.js +++ b/build/gulpfile.vscode.linux.js @@ -17,7 +17,6 @@ const task = require('./lib/task'); const packageJson = require('../package.json'); const product = require('../product.json'); 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); @@ -82,8 +81,7 @@ function prepareDebPackage(arch) { function (f) { size += f.isDirectory() ? 4096 : f.contents.length; }, async function () { const that = this; - const sysroot = await sysrootInstaller.getSysroot(debArch); - const dependencies = dependenciesGenerator.getDependencies('deb', binaryDir, product.applicationName, debArch, sysroot); + const dependencies = await dependenciesGenerator.getDependencies('deb', binaryDir, product.applicationName, debArch); gulp.src('resources/linux/debian/control.template', { base: '.' }) .pipe(replace('@@NAME@@', product.applicationName)) .pipe(replace('@@VERSION@@', packageJson.version + '-' + linuxPackageRevision)) @@ -186,19 +184,24 @@ 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 = 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)) - .pipe(replace('@@ICON@@', product.linuxIconName)) - .pipe(replace('@@VERSION@@', packageJson.version)) - .pipe(replace('@@RELEASE@@', linuxPackageRevision)) - .pipe(replace('@@ARCHITECTURE@@', rpmArch)) - .pipe(replace('@@LICENSE@@', product.licenseName)) - .pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@')) - .pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@')) - .pipe(replace('@@DEPENDENCIES@@', dependencies.join(', '))) - .pipe(rename('SPECS/' + product.applicationName + '.spec')); + const spec = code.pipe(es.through( + async function () { + const that = this; + const dependencies = await dependenciesGenerator.getDependencies('rpm', binaryDir, product.applicationName, rpmArch); + gulp.src('resources/linux/rpm/code.spec.template', { base: '.' }) + .pipe(replace('@@NAME@@', product.applicationName)) + .pipe(replace('@@NAME_LONG@@', product.nameLong)) + .pipe(replace('@@ICON@@', product.linuxIconName)) + .pipe(replace('@@VERSION@@', packageJson.version)) + .pipe(replace('@@RELEASE@@', linuxPackageRevision)) + .pipe(replace('@@ARCHITECTURE@@', rpmArch)) + .pipe(replace('@@LICENSE@@', product.licenseName)) + .pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@')) + .pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@')) + .pipe(replace('@@DEPENDENCIES@@', dependencies.join(', '))) + .pipe(rename('SPECS/' + product.applicationName + '.spec')) + .pipe(es.through(function (f) { that.emit('data', f); }, function () { that.emit('end'); })); + })); const specIcon = gulp.src('resources/linux/rpm/code.xpm', { base: '.' }) .pipe(rename('SOURCES/' + product.applicationName + '.xpm')); diff --git a/build/hygiene.js b/build/hygiene.js index 2c01b1f4d75..3809036dad1 100644 --- a/build/hygiene.js +++ b/build/hygiene.js @@ -41,7 +41,7 @@ function hygiene(some, linting = true) { const unicode = es.through(function (file) { const lines = file.contents.toString('utf8').split(/\r\n|\r|\n/); file.__lines = lines; - + const allowInComments = lines.some(line => /allow-any-unicode-comment-file/.test(line)); let skipNext = false; lines.forEach((line, i) => { if (/allow-any-unicode-next-line/.test(line)) { @@ -52,6 +52,15 @@ function hygiene(some, linting = true) { skipNext = false; return; } + // If unicode is allowed in comments, trim the comment from the line + if (allowInComments) { + if (line.match(/\s+(\*)/)) { // Naive multi-line comment check + line = ''; + } else { + const index = line.indexOf('\/\/'); + line = index === -1 ? line : line.substring(0, index); + } + } // Please do not add symbols that resemble ASCII letters! const m = /([^\t\n\r\x20-\x7E⊃⊇✔︎✓🎯⚠️🛑🔴🚗🚙🚕🎉✨❗⇧⌥⌘×÷¦⋯…↑↓￫→←↔⟷·•●◆▼⟪⟫┌└├⏎↩√φ]+)/g.exec(line); if (m) { @@ -192,7 +201,7 @@ function hygiene(some, linting = true) { result.pipe(filter(stylelintFilter)).pipe(gulpstylelint(((message, isError) => { if (isError) { console.error(message); - errorCount++; + errorCount++; } else { console.warn(message); } diff --git a/build/lib/asar.js b/build/lib/asar.js index e9f9dae0b0d..cadb9ab974d 100644 --- a/build/lib/asar.js +++ b/build/lib/asar.js @@ -116,4 +116,4 @@ function createAsar(folderPath, unpackGlobs, destFilename) { }); } exports.createAsar = createAsar; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXNhci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImFzYXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOzs7QUFFaEcsNkJBQTZCO0FBQzdCLG1DQUFtQztBQUNuQyxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztBQUM3QyxNQUFNLFVBQVUsR0FBMEIsT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBQUM7QUFDekUsbUNBQW1DO0FBQ25DLHVDQUF1QztBQVN2QyxTQUFnQixVQUFVLENBQUMsVUFBa0IsRUFBRSxXQUFxQixFQUFFLFlBQW9CO0lBRXpGLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxJQUFlLEVBQVcsRUFBRTtRQUNyRCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsV0FBVyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQzdDLElBQUksU0FBUyxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDOUMsT0FBTyxJQUFJLENBQUM7WUFDYixDQUFDO1FBQ0YsQ0FBQztRQUNELE9BQU8sS0FBSyxDQUFDO0lBQ2QsQ0FBQyxDQUFDO0lBRUYsTUFBTSxVQUFVLEdBQUcsSUFBSSxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDOUMsTUFBTSxHQUFHLEdBQWEsRUFBRSxDQUFDO0lBRXpCLGdDQUFnQztJQUNoQyxJQUFJLGNBQWMsR0FBRyxDQUFDLENBQUM7SUFDdkIsSUFBSSxjQUFjLEdBQUcsR0FBRyxFQUFFLEdBQUcsY0FBYyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFFakQseUNBQXlDO0lBQ3pDLE1BQU0sT0FBTyxHQUErQixFQUFFLENBQUM7SUFDL0MsTUFBTSx3QkFBd0IsR0FBRyxDQUFDLEdBQVcsRUFBRSxFQUFFO1FBQ2hELElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxF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 \ No newline at end of file +//# sourceMappingURL=asar.js.map \ No newline at end of file diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js index 53c4299c4bf..1b0adc48d4c 100644 --- a/build/lib/builtInExtensions.js +++ b/build/lib/builtInExtensions.js @@ -134,4 +134,4 @@ if (require.main === module) { process.exit(1); }); } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbHRJbkV4dGVuc2lvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJidWlsdEluRXh0ZW5zaW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyx5QkFBeUI7QUFDekIsNkJBQTZCO0FBQzdCLHlCQUF5QjtBQUN6QixpQ0FBaUM7QUFDakMsbUNBQW1DO0FBQ25DLHNDQUFzQztBQUN0QyxnQ0FBZ0M7QUFDaEMsb0NBQW9DO0FBQ3BDLHNDQUFzQztBQUN0QywwQ0FBMEM7QUFHMUMsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBb0JqQyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztBQUNuRCxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsb0JBQW9CLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDO0FBQ3BHLE1BQU0saUJBQWlCLEdBQTJCLFdBQVcsQ0FBQyxpQkFBaUIsSUFBSSxFQUFFLENBQUM7QUFDdEYsTUFBTSxvQkFBb0IsR0FBMkIsV0FBVyxDQUFDLG9CQUFvQixJQUFJLEVBQUUsQ0FBQztBQUM1RixNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxZQUFZLEVBQUUsY0FBYyxDQUFDLENBQUM7QUFDakcsTUFBTSxjQUFjLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGdEQUFnRCxDQUFDLENBQUM7QUFFdEYsU0FBUyxHQUFHLENBQUMsR0FBRyxRQUFrQjtJQUNqQyxJQUFJLGNBQWMsRUFBRSxDQUFDO1FBQ3BCLFFBQVEsQ0FBQyxHQUFHLFFBQVEsQ0FBQyxDQUFDO0lBQ3ZCLENB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 \ No newline at end of file +//# sourceMappingURL=builtInExtensions.js.map \ No newline at end of file diff --git a/build/lib/builtInExtensionsCG.js b/build/lib/builtInExtensionsCG.js index c0f19daae18..30b6791b3a0 100644 --- a/build/lib/builtInExtensionsCG.js +++ b/build/lib/builtInExtensionsCG.js @@ -4,7 +4,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ Object.defineProperty(exports, "__esModule", { value: true }); -const node_fetch_1 = require("node-fetch"); const fs = require("fs"); const path = require("path"); const url = require("url"); @@ -23,9 +22,9 @@ async function downloadExtensionDetails(extension) { const repositoryContentBaseUrl = `https://${token ? `${token}@` : ''}${contentBasePath}/${repository}/v${extension.version}`; async function getContent(fileName) { try { - const response = await (0, node_fetch_1.default)(`${repositoryContentBaseUrl}/${fileName}`); + const response = await fetch(`${repositoryContentBaseUrl}/${fileName}`); if (response.ok) { - return { fileName, body: await response.buffer() }; + return { fileName, body: Buffer.from(await response.arrayBuffer()) }; } else if (response.status === 404) { return { fileName, body: undefined }; @@ -77,4 +76,4 @@ main().then(() => { console.error(err); process.exit(1); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbHRJbkV4dGVuc2lvbnNDRy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImJ1aWx0SW5FeHRlbnNpb25zQ0cudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOztBQUVoRywyQ0FBK0I7QUFDL0IseUJBQXlCO0FBQ3pCLDZCQUE2QjtBQUM3QiwyQkFBMkI7QUFDM0IsMENBQTJDO0FBRzNDLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDO0FBQ25ELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLGNBQWMsQ0FBQyxDQUFDO0FBQy9DLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxvQkFBb0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7QUFDcEcsTUFBTSxpQkFBaUIsR0FBMkIsV0FBVyxDQUFDLGlCQUFpQixJQUFJLEVBQUUsQ0FBQztBQUN0RixNQUFNLG9CQUFvQixHQUEyQixXQUFXLENBQUMsb0JBQW9CLElBQUksRUFBRSxDQUFDO0FBQzVGLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUM7QUFFMUMsTUFBTSxlQUFlLEdBQUcsMkJBQTJCLENBQUM7QUFDcEQsTUFBTSxnQkFBZ0IsR0FBRyxDQUFDLGNBQWMsRUFBRSxtQkFBbUIsRUFBRSxXQUFXLENBQUMsQ0FBQztBQUU1RSxLQUFLLFVBQVUsd0JBQXdCLENBQUMsU0FBK0I7SUFDdEUsTUFBTSxjQUFjLEdBQUcsR0FBRyxTQUFTLENBQUMsSUFBSSxJQUFJLFNBQVMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNoRSxNQUFNLFVBQVUsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxJ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 \ No newline at end of file +//# sourceMappingURL=builtInExtensionsCG.js.map \ No newline at end of file diff --git a/build/lib/builtInExtensionsCG.ts b/build/lib/builtInExtensionsCG.ts index a84f4312b99..62d09498221 100644 --- a/build/lib/builtInExtensionsCG.ts +++ b/build/lib/builtInExtensionsCG.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import fetch from 'node-fetch'; import * as fs from 'fs'; import * as path from 'path'; import * as url from 'url'; @@ -30,7 +29,7 @@ async function downloadExtensionDetails(extension: IExtensionDefinition): Promis try { const response = await fetch(`${repositoryContentBaseUrl}/${fileName}`); if (response.ok) { - return { fileName, body: await response.buffer() }; + return { fileName, body: Buffer.from(await response.arrayBuffer()) }; } else if (response.status === 404) { return { fileName, body: undefined }; } else { diff --git a/build/lib/bundle.js b/build/lib/bundle.js index 2d1b35b6444..5d3ee9d5118 100644 --- a/build/lib/bundle.js +++ b/build/lib/bundle.js @@ -483,4 +483,4 @@ function topologicalSort(graph) { } return L; } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bundle.js","sourceRoot":"","sources":["bundle.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,yBAAyB;AACzB,6BAA6B;AAC7B,yBAAyB;AAqGzB;;GAEG;AACH,SAAgB,MAAM,CAAC,WAA0B,EAAE,MAAqB,EAAE,QAA0D;IACnI,MAAM,cAAc,GAAmB,EAAE,CAAC;IAC1C,WAAW,CAAC,OAAO,CAAC,CAAC,MAAmB,EAAE,EAAE;QAC3C,IAAI,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,oDAAoD,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;QACrF,CAAC;QACD,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,MAAM,sBAAsB,GAAmC,EAAE,CAAC;IAClE,WAAW,CAAC,OAAO,CAAC,CAAC,MAAmB,EAAE,EAAE;QAC3C,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QAC3C,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,cAAc;YAC/C,sBAAsB,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;QAC/C,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,cAAc;YAC/C,sBAAsB,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;QAC/C,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAGH,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC,CAAC;IACxF,MAAM,CAAC,GAAkB,EAAE,CAAC,gBAAgB,CAAC,wCAAwC,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC;IACxG,MAAM,YAAY,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACrC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAExD,MAAM,MAAM,GAAQ,YAAY,CAAC,OAAO,CAAC;IACzC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;IAClC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,wBAAwB,CAAC;IACnD,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,wBAAwB,CAAC;IACnD,CAAC;IACD,MAAM,CAAC,uBAAuB,GAAG,MAAM,CAAC,uBAAuB,IAAI,EAAE,CAAC;IACtE,MAAM,CAAC,uBAAuB,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;IAChD,MAAM,CAAC,uBAAuB,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;IAChD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEtB,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,YAAiB,EAAE,EAAE;QACzC,MAAM,WAAW,GAAG,CAAC,KAAiB,EAAE,EAAE;YACzC,IAAI,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACxB,CAAC,IAAI,KAAK,CAAC;YACZ,CAAC;YACD,gDAAgD;YAChD,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;YAC9C,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;YAC9C,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC;QACpD,CAAC,CAAC;QACF,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE,CAAC;YACvC,MAAM,UAAU,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;YAC5C,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;gBACvB,UAAU,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACxD,CAAC;YACD,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;gBACxB,UAAU,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC1D,CAAC;QACF,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE,GAAG,EAAE;QAChD,MAAM,OAAO,GAAuB,MAAM,CAAC,YAAY,EAAE,CAAC;QAC1D,MAAM,aAAa,GAAG,eAAe,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAC/D,MAAM,mBAAmB,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,mBAAmB,EAAE,CAAC;QACnE,QAAQ,CAAC,IAAI,EAAE;YACd,KAAK,EAAE,aAAa,CAAC,KAAK;YAC1B,mBAAmB,EAAE,mBAAmB;YACxC,UAAU,EAAE,aAAa,CAAC,UAAU;SACpC,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;AACvC,CAAC;AAxED,wBAwEC;AAED,SAAS,eAAe,CAAC,OAA2B,EAAE,WAA2B;IAChF,MAAM,UAAU,GAAwB,EAAE,CAAC;IAC3C,OAAO,CAAC,OAAO,CAAC,CAAC,CAAmB,EAAE,EAAE;QACvC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAW,EAAE,CAAC;IAChC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAmB,EAAE,EAAE;QACvC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;IAEpD,IAAI,MAAM,GAAkB,EAAE,CAAC;IAC/B,MAAM,WAAW,GAAe,EAAE,CAAC;IACnC,MAAM,UAAU,GAAgB;QAC/B,KAAK,EAAE,YAAY;QACnB,OAAO,EAAE,EAAE;KACX,CAAC;IAEF,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,cAAsB,EAAE,EAAE;QAC3D,MAAM,IAAI,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAC9D,MAAM,eAAe,GAAG,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACvD,MAAM,QAAQ,GAAa,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAEvF,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAmB,EAAE,EAAE;YACxC,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,EAAE,YAAY,CAAC,CAAC;YACvD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,OAAe,EAAE,EAAE;gBACpD,OAAO,eAAe,CAAC,OAAO,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,MAAc,EAAE,EAAE;YAC/D,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,eAAe,CAAC;QAErD,MAAM,GAAG,GAAG,cAAc,CACzB,UAAU,EACV,YAAY,EACZ,cAAc,EACd,eAAe,EACf,IAAI,CAAC,OAAO,IAAI,EAAE,EAClB,IAAI,CAAC,MAAM,IAAI,EAAE,EACjB,IAAI,CAAC,IAAI,CACT,CAAC;QAEF,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAClC,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;YAC1C,WAAW,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAClF,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,UAAkB,EAAE,EAAE;QACvD,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,OAAO,MAAM,CAAC,WAAW,KAAK,UAAU,EAAE,CAAC;YAC9C,MAAM,KAAK,GAAG,CAAC,QAAgB,EAAE,QAAgB,EAAE,EAAE;gBACpD,MAAM,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,CAAC;4BACT,IAAI,EAAE,IAAI;4BACV,QAAQ,EAAE,QAAQ;yBAClB,CAAC;iBACF,CAAC,CAAC;YACJ,CAAC,CAAC;YACF,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,OAAO;QACN,gBAAgB;QAChB,KAAK,EAAE,cAAc,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC;QAC3D,UAAU,EAAE,UAAU;KACtB,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,SAAwB;IAC/C,MAAM,eAAe,GAAG,CAAC,WAAmB,EAAE,SAAiB,EAAE,EAAE;QAClE,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACjD,IAAI,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACvB,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAChC,IAAI,MAAM,GAAkB,IAAI,CAAC;YACjC,IAAI,KAAK,GAAkB,IAAI,CAAC;YAChC,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;gBACzB,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACnB,CAAC;iBAAM,CAAC;gBACP,MAAM,GAAG,EAAE,CAAC;gBACZ,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACnB,CAAC;YAED,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClD,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;gBACvE,OAAO,MAAM,GAAG,GAAG,CAAC;YACrB,CAAC;YACD,OAAO,MAAM,GAAG,KAAK,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,OAAO;YACN,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI;SACV,CAAC;IACH,CAAC,CAAC;IAEF,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC9B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,OAAO;QACR,CAAC;QACD,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,OAAO;QACR,CAAC;QAED,4DAA4D;QAC5D,MAAM,SAAS,GAAmC,EAAE,CAAC;QACrD,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACnC,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;YAC7F,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,OAAO;YACR,CAAC;YAED,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3D,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YACvE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC/B,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAClD,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAChC,OAAO,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,MAAM,cAAc,GAAmC,EAAE,CAAC;QAC1D,kBAAkB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YAC5C,cAAc,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACnC,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,qDAAqD,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE;gBAC9H,MAAM,UAAU,GAAG,eAAe,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;gBAC3D,OAAO,cAAc,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,UAAU,CAAC,MAAM,aAAa,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAC5K,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;YACxB,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE;gBACT,eAAe;gBACf,aAAa,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,GAAG;gBAClD,4BAA4B;gBAC5B,oBAAoB;gBACpB,sDAAsD;gBACtD,+BAA+B;gBAC/B,KAAK;gBACL,kBAAkB;gBAClB,IAAI;aACJ,CAAC,IAAI,CAAC,IAAI,CAAC;SACZ,CAAC,CAAC;QAEH,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;YACrB,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,gBAAgB;SAC1B,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,SAAS,4BAA4B,CAAC,SAAwB;IAC7D,8CAA8C;IAC9C,MAAM,WAAW,GAAG;QACnB,EAAE,KAAK,EAAE,gBAAgB,EAAE,GAAG,EAAE,YAAY,EAAE;QAC9C,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,EAAE;QACvC,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,EAAE;QACzC,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,EAAE;QACzC,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,EAAE;QACtC,EAAE,KAAK,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,EAAE;QACxC,EAAE,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,EAAE;KAC1C,CAAC;IAEF,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC9B,MAAM,gBAAgB,GAAc,EAAE,CAAC;QACvC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACnC,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAClD,MAAM,QAAQ,GAAa,EAAE,CAAC;YAC9B,IAAI,uBAAuB,GAAG,KAAK,EAAE,eAAuB,CAAC;YAE7D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACvC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtB,IAAI,uBAAuB,EAAE,CAAC;oBAC7B,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAClB,IAAI,eAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;wBACjC,uBAAuB,GAAG,KAAK,CAAC;oBACjC,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBAC7C,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;wBACnC,IAAI,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;4BAClC,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;gCACzB,uBAAuB,GAAG,IAAI,CAAC;gCAC/B,eAAe,GAAG,WAAW,CAAC,GAAG,CAAC;4BACnC,CAAC;iCAAM,CAAC;gCACP,gBAAgB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;4BAC5B,CAAC;wBACF,CAAC;oBACF,CAAC;oBACD,IAAI,uBAAuB,EAAE,CAAC;wBAC7B,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACnB,CAAC;yBAAM,CAAC;wBACP,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACrB,CAAC;gBACF,CAAC;YACF,CAAC;YACD,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AAClB,CAAC;AAWD,SAAS,cAAc,CACtB,UAA+B,EAC/B,IAAY,EACZ,UAAkB,EAClB,eAAyB,EACzB,OAAqB,EACrB,MAAoB,EACpB,IAAwB;IAExB,IAAI,CAAC,IAAI,EAAE,CAAC;QACX,IAAI,GAAG,UAAU,GAAG,KAAK,CAAC;IAC3B,CAAC;IACD,MAAM,UAAU,GAAgB;QAC/B,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,IAAI;KACV,EACA,OAAO,GAAkB,CAAC,UAAU,CAAC,CAAC;IAEvC,MAAM,WAAW,GAAe,EAAE,CAAC;IACnC,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAiB,EAAE;QAC7D,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9B,WAAW,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;QAC1D,CAAC;QACD,OAAO,WAAW,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC,CAAC;IAEF,eAAe,CAAC,OAAO,CAAC,CAAC,CAAS,EAAE,EAAE;QACrC,MAAM,SAAS,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAEjC,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;YACpB,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;YAC3C,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7F,OAAO;QACR,CAAC;QAED,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAE7B,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO;QACR,CAAC;QAED,MAAM,QAAQ,GAAG,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEnD,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC5F,CAAC;aAAM,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;YAClC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC3F,CAAC;aAAM,CAAC;YACP,MAAM,UAAU,GAAG;gBAClB,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,YAAY,EAAE,MAAM,CAAC,YAAY;aACjC,CAAC;YACF,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,CAAC,EAAE,sBAAsB,UAAU,2DAA2D,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC5K,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,UAAkB,EAAE,EAAE;QACvD,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;YAC5C,MAAM,GAAG,GAA8B,CAAC,GAAG,EAAE;gBAC5C,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC3B,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC;YAEnC,MAAM,KAAK,GAAG,CAAC,QAAgB,EAAE,QAAgB,EAAE,EAAE;gBACpD,OAAO,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,CAAC;4BACT,IAAI,EAAE,IAAI;4BACV,QAAQ,EAAE,QAAQ;yBAClB,CAAC;iBACF,CAAC,CAAC;YACJ,CAAC,CAAC;YACF,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAC1D,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,CAAC,KAAiB,EAAS,EAAE;QAC5C,IAAI,QAAQ,GAAG,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACvB,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,WAAW,KAAK,CAAC,WAAW,IAAI,CAAC,CAAC;QAC7E,CAAC;QACD,OAAO;YACN,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE,QAAQ;SAClB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAE7C,UAAU,CAAC,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE3E,OAAO;QACN,KAAK,EAAE,OAAO;QACd,WAAW,EAAE,WAAW;KACxB,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAY;IACzC,MAAM,aAAa,GAAG,KAAK,CAAC;IAC5B,IAAI,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC7C,aAAa;IACb,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,aAAa,EAAE,CAAC;QAC9C,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED,SAAS,UAAU,CAAC,UAAkB,EAAE,MAAqB,EAAE,UAAkB,EAAE,UAAkB;IACpG,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;QACxC,MAAM,KAAK,GAAgC,CAAC,CAAC,IAAY,EAAE,EAAE;YAC5D,MAAM,IAAI,IAAI,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,aAAa,GAAG,GAAG,EAAE;YAC1B,OAAO,UAAU,CAAC;QACnB,CAAC,CAAC;QACF,KAAK,CAAC,QAAQ,GAAG,CAAC,QAAgB,EAAE,IAAY,EAAE,EAAE;YACnD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,GAAG,QAAQ,GAAG,IAAI,CAAC,CAAC;YAC/D,MAAM,IAAI,IAAI,CAAC;QAChB,CAAC,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO;QACN,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,MAAM;KAChB,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,QAAgB,EAAE,kBAA6B,EAAE,IAAY,EAAE,QAAgB;IAEvG,0DAA0D;IAC1D,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,IAAI,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAErG,oDAAoD;IACpD,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAE7D,MAAM,SAAS,GAAG,GAAG,GAAG,QAAQ,GAAG,KAAK,CAAC;IAEzC,OAAO;QACN,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,YAAY,GAAG,CAAC,CAAC,GAAG,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC;KAC9F,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,QAAgB,EAAE,MAAgB,EAAE,OAAe,EAAE,IAAY,EAAE,QAAgB;IAC7G,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC3E,MAAM,SAAS,GAAG,UAAU,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,OAAO,GAAG,IAAI,CAAC;IACpF,OAAO;QACN,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,SAAS;KACxC,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,gBAAgB,CAAC,GAAW,EAAE,WAAmB,EAAE,UAAkB;IAC7E,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,UAAU,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,iBAAiB,GAAG,CAAC,CAAC,CAAC;IAE3B,GAAG,CAAC;QACH,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;YAC1B,OAAO,iBAAiB,GAAG,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC;QAC/C,CAAC;QACD,iBAAiB,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,GAAG,CAAC,CAAC,CAAC;QAC7D,IAAI,EAAE,CAAC;IACR,CAAC,QAAQ,iBAAiB,IAAI,CAAC,EAAE;IAEjC,OAAO,CAAC,CAAC,CAAC;AACX,CAAC;AAGD;;GAEG;AACH,SAAS,KAAK,CAAC,SAAmB,EAAE,KAAa;IAChD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,KAAK,GAAG,SAAS,CAAC;IAExB,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,KAAK,CAAC,EAAG,CAAC,IAAI,EAAE,CAAC;QACjC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC1B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;gBACrB,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;gBACtB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpB,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAED;;GAEG;AACH,SAAS,eAAe,CAAC,KAAa;IAErC,MAAM,QAAQ,GAAa,EAAE,EAC5B,iBAAiB,GAA+B,EAAE,EAClD,YAAY,GAAW,EAAE,CAAC;IAE3B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,QAAgB,EAAE,EAAE;QAC/C,QAAQ,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;QAC1B,iBAAiB,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;QAErD,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAClC,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;YACxB,iBAAiB,CAAC,MAAM,CAAC,GAAG,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAE3D,YAAY,CAAC,MAAM,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAClD,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,oDAAoD;IACpD,MAAM,CAAC,GAAa,EAAE,EACrB,CAAC,GAAa,EAAE,CAAC;IAElB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;QAC9C,IAAI,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,gEAAgE;QAChE,CAAC,CAAC,IAAI,EAAE,CAAC;QAET,MAAM,CAAC,GAAW,CAAC,CAAC,KAAK,EAAG,CAAC;QAC7B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEV,MAAM,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,cAAc,CAAC,OAAO,CAAC,CAAC,CAAS,EAAE,EAAE;YACpC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC;YACvB,IAAI,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBAC5B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACX,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CAAC,+DAA+D,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACnH,CAAC;IAED,OAAO,CAAC,CAAC;AACV,CAAC"} \ No newline at end of file +//# sourceMappingURL=bundle.js.map \ No newline at end of file diff --git a/build/lib/compilation.js b/build/lib/compilation.js index 5fecfc82ca3..3d243a45232 100644 --- a/build/lib/compilation.js +++ b/build/lib/compilation.js @@ -287,4 +287,4 @@ exports.watchApiProposalNamesTask = task.define('watch-api-proposal-names', () = .pipe(util.debounce(task)) .pipe(gulp.dest('src')); }); -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"compilation.js","sourceRoot":"","sources":["compilation.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=compilation.js.map \ No newline at end of file diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts index ebc9dedf2e5..228bca4e6a6 100644 --- a/build/lib/compilation.ts +++ b/build/lib/compilation.ts @@ -221,7 +221,7 @@ class MonacoGenerator { } } - private _executeSoonTimer: NodeJS.Timer | null = null; + private _executeSoonTimer: NodeJS.Timeout | null = null; private _executeSoon(): void { if (this._executeSoonTimer !== null) { clearTimeout(this._executeSoonTimer); diff --git a/build/lib/dependencies.js b/build/lib/dependencies.js index 2e5adf6b455..64087a9ac17 100644 --- a/build/lib/dependencies.js +++ b/build/lib/dependencies.js @@ -73,4 +73,4 @@ exports.getProductionDependencies = getProductionDependencies; if (require.main === module) { console.log(JSON.stringify(getProductionDependencies(root), null, ' ')); } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwZW5kZW5jaWVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZGVwZW5kZW5jaWVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7O0FBRWhHLHlCQUF5QjtBQUN6Qiw2QkFBNkI7QUFDN0Isb0NBQW9DO0FBQ3BDLE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FBQztBQUM1QyxNQUFNLElBQUksR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFpQnBFLFNBQVMsZ0JBQWdCLENBQUMsTUFBYyxFQUFFLElBQVU7SUFDbkQsSUFBSSxXQUFXLENBQUM7SUFFaEIsSUFBSSxDQUFDO1FBQ0osV0FBVyxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7UUFDZCxHQUFHLENBQUMsT0FBTyxJQUFJLEtBQUssSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ2hDLE9BQU8sQ0FBQyxJQUFJLENBQUMsMkJBQTJCLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ3JELE9BQU8sSUFBSSxDQUFDO0lBQ2IsQ0FBQztJQUVELG1DQUFtQztJQUNuQyxJQUFJLFdBQVcsQ0FBQyxPQUFPLEtBQUssV0FBVyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQy9DLE9BQU8sSUFBSSxDQUFDO0lBQ2IsQ0FBQztJQUVELE1BQU0sSUFBSSxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUM7SUFDOUIsTUFBTSxPQUFPLEdBQUcsV0FBVyxDQUFDLE9BQU8sQ0FBQztJQUNwQyxNQUFNLGNBQWMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztJQUMvQyxNQUFNLFFBQVEsR0FBRyxFQUFFLENBQUM7SUFFcEIsS0FBSyxNQUFNLEtBQUssSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQztRQUMzQyxNQUFNLEdBQUcsR0FBRyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLEVBQUUsY0FBYyxDQUFDLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFFN0UsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNULFFBQVEsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDcEIsQ0FBQztJQUNGLENBQUM7SUFFRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsY0FBYyxFQUFFLFFBQVEsRUFBRSxDQUFDO0FBQzFELENBQUM7QUFFRCxTQUFTLDZCQUE2QixDQUFDLFVBQWtCO0lBQ3hELE1BQU0sR0FBRyxHQUFHLEVBQUUsQ0FBQyxRQUFRLENBQUMsa0JBQWtCLEVBQUUsRUFBRSxHQUFHLEVBQUUsVUFBVSxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLFFBQVEsRUFBRSxZQUFZLEVBQUUsRUFBRSxLQUFLLEVBQUUsQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUNwSyxNQUFNLEtBQUssR0FBRyxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFFOUMsSUFBSSxDQUFDLEtBQUssSUFBSSxLQUFLLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQ2xDLE1BQU0sSUFBSSxLQUFLLENBQUMsOENBQThDLENBQUMsQ0FBQztJQUNqRSxDQUFDO0lBRUQsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBZSxDQUFDO0lBRXhELE9BQU8sS0FBSztTQUNWLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLGNBQWMsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDO1NBQzFFLE1BQU0sQ0FBYSxDQUFDLEdBQUcsRUFBcUIsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUN6RCxDQUFDO0FBRUQsU0FBZ0IseUJBQXlCLENBQUMsVUFBa0I7SUFDM0QsTUFBTSxNQUFNLEdBQXFCLEVBQUUsQ0FBQztJQUNwQyxNQUFNLElBQUksR0FBRyw2QkFBNkIsQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUN2RCxNQUFNLE9BQU8sR0FBRyxDQUFDLEdBQWUsRUFBRSxFQUFFLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFFLElBQUksRUFBRSxHQUFHLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUFHLENBQUMsT0FBTyxFQUFFLElBQUksRUFBRSxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQy9JLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFdEIsc0NBQXNDO0lBQ3RDLE1BQU0sY0FBYyxHQUFHLEVBQUUsQ0FBQyxZQUFZLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDbkQsTUFBTSxrQkFBa0IsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxjQUFjLENBQUMsQ0FBQztJQUMvRCxNQUFNLHFCQUFxQixHQUFHLEdBQUcsSUFBSSxzQkFBc0Isa0JBQWtCLGVBQWUsQ0FBQztJQUU3RixJQUFJLEVBQUUsQ0FBQyxVQUFVLENBQUMscUJBQXFCLENBQUMsRUFBRSxDQUFDO1FBQzFDLE1BQU0saUJBQWlCLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLHFCQUFxQixFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDckYsTUFBTSxxQkFBcUIsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLFlBQVksSUFBSSxFQUFFLENBQUMsQ0FBQztRQUVoRixLQUFLLE1BQU0sSUFBSSxJQUFJLHFCQUFxQixFQUFFLENBQUM7WUFDMUMsTUFBTSxDQUFDLElBQUksQ0FBQztnQkFDWCxJQUFJO2dCQUNKLE9BQU8sRUFBRSxpQkFBaUIsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDO2dCQUM3QyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxjQUFjLEVBQUUsY0FBYyxFQUFFLElBQUksQ0FBQzthQUNyRCxDQUFDLENBQUM7UUFDSixDQUFDO0lBQ0YsQ0FBQztJQUVELE9BQU8sQ0FBQyxHQUFHLElBQUksR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7QUFDN0IsQ0FBQztBQXpCRCw4REF5QkM7QUFFRCxJQUFJLE9BQU8sQ0FBQyxJQUFJLEtBQUssTUFBTSxFQUFFLENBQUM7SUFDN0IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLHlCQUF5QixDQUFDLElBQUksQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDO0FBQzFFLENBQUMifQ== \ No newline at end of file +//# sourceMappingURL=dependencies.js.map \ No newline at end of file diff --git a/build/lib/electron.js b/build/lib/electron.js index f2546dceb10..df6473c32f8 100644 --- a/build/lib/electron.js +++ b/build/lib/electron.js @@ -219,4 +219,4 @@ if (require.main === module) { process.exit(1); }); } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"electron.js","sourceRoot":"","sources":["electron.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=electron.js.map \ No newline at end of file diff --git a/build/lib/extensions.js b/build/lib/extensions.js index 1ad9ef1520e..c81568c7275 100644 --- a/build/lib/extensions.js +++ b/build/lib/extensions.js @@ -501,4 +501,4 @@ async function buildExtensionMedia(isWatch, outputRoot) { }))); } exports.buildExtensionMedia = buildExtensionMedia; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"extensions.js","sourceRoot":"","sources":["extensions.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=extensions.js.map \ No newline at end of file diff --git a/build/lib/fetch.js b/build/lib/fetch.js index 209d8369e52..ba23e78257c 100644 --- a/build/lib/fetch.js +++ b/build/lib/fetch.js @@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.fetchGithub = exports.fetchUrl = exports.fetchUrls = void 0; const es = require("event-stream"); -const node_fetch_1 = require("node-fetch"); const VinylFile = require("vinyl"); const log = require("fancy-log"); const ansiColors = require("ansi-colors"); @@ -37,13 +36,13 @@ async function fetchUrl(url, options, retries = 10, retryDelay = 1000) { try { let startTime = 0; if (verbose) { - log(`Start fetching ${ansiColors.magenta(url)}${retries !== 10 ? `(${10 - retries} retry}` : ''}`); + log(`Start fetching ${ansiColors.magenta(url)}${retries !== 10 ? ` (${10 - retries} retry)` : ''}`); startTime = new Date().getTime(); } const controller = new AbortController(); const timeout = setTimeout(() => controller.abort(), 30 * 1000); try { - const response = await (0, node_fetch_1.default)(url, { + const response = await fetch(url, { ...options.nodeFetchOptions, signal: controller.signal /* Typings issue with lib.dom.d.ts */ }); @@ -51,7 +50,7 @@ async function fetchUrl(url, options, retries = 10, retryDelay = 1000) { log(`Fetch completed: Status ${response.status}. Took ${ansiColors.magenta(`${new Date().getTime() - startTime} ms`)}`); } if (response.ok && (response.status >= 200 && response.status < 300)) { - const contents = await response.buffer(); + const contents = Buffer.from(await response.arrayBuffer()); if (options.checksumSha256) { const actualSHA256Checksum = crypto.createHash('sha256').update(contents).digest('hex'); if (actualSHA256Checksum !== options.checksumSha256) { @@ -74,7 +73,11 @@ async function fetchUrl(url, options, retries = 10, retryDelay = 1000) { contents }); } - throw new Error(`Request ${ansiColors.magenta(url)} failed with status code: ${response.status}`); + let err = `Request ${ansiColors.magenta(url)} failed with status code: ${response.status}`; + if (response.status === 403) { + err += ' (you may be rate limited)'; + } + throw new Error(err); } finally { clearTimeout(timeout); @@ -133,4 +136,4 @@ function fetchGithub(repo, options) { })); } exports.fetchGithub = fetchGithub; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmV0Y2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmZXRjaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyxtQ0FBbUM7QUFDbkMsMkNBQWdEO0FBQ2hELG1DQUFtQztBQUNuQyxpQ0FBaUM7QUFDakMsMENBQTBDO0FBQzFDLGlDQUFpQztBQUNqQyxxQ0FBcUM7QUFVckMsU0FBZ0IsU0FBUyxDQUFDLElBQXVCLEVBQUUsT0FBc0I7SUFDeEUsSUFBSSxPQUFPLEtBQUssU0FBUyxFQUFFLENBQUM7UUFDM0IsT0FBTyxHQUFHLEVBQUUsQ0FBQztJQUNkLENBQUM7SUFFRCxJQUFJLE9BQU8sT0FBTyxDQUFDLElBQUksS0FBSyxRQUFRLElBQUksT0FBTyxDQUFDLElBQUksS0FBSyxJQUFJLEVBQUUsQ0FBQztRQUMvRCxPQUFPLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FBQztJQUNwQixDQUFDO0lBRUQsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztRQUMxQixJQUFJLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNmLENBQUM7SUFFRCxPQUFPLEVBQUUsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQTJCLENBQUMsSUFBWSxFQUFFLEVBQUUsRUFBRSxFQUFFO1FBQ3BGLE1BQU0sR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDMUMsUUFBUSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDbEMsRUFBRSxDQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUNyQixDQUFDLEVBQUUsS0FBSyxDQUFDLEVBQUU7WUFDVixFQUFFLENBQUMsS0FBSyxDQUFDLENBQUM7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 \ No newline at end of file +//# sourceMappingURL=fetch.js.map \ No newline at end of file diff --git a/build/lib/fetch.ts b/build/lib/fetch.ts index 238f0ac4228..dc1de777e04 100644 --- a/build/lib/fetch.ts +++ b/build/lib/fetch.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import * as es from 'event-stream'; -import fetch, { RequestInit } from 'node-fetch'; import * as VinylFile from 'vinyl'; import * as log from 'fancy-log'; import * as ansiColors from 'ansi-colors'; @@ -47,7 +46,7 @@ export async function fetchUrl(url: string, options: IFetchOptions, retries = 10 try { let startTime = 0; if (verbose) { - log(`Start fetching ${ansiColors.magenta(url)}${retries !== 10 ? `(${10 - retries} retry}` : ''}`); + log(`Start fetching ${ansiColors.magenta(url)}${retries !== 10 ? ` (${10 - retries} retry)` : ''}`); startTime = new Date().getTime(); } const controller = new AbortController(); @@ -61,7 +60,7 @@ export async function fetchUrl(url: string, options: IFetchOptions, retries = 10 log(`Fetch completed: Status ${response.status}. Took ${ansiColors.magenta(`${new Date().getTime() - startTime} ms`)}`); } if (response.ok && (response.status >= 200 && response.status < 300)) { - const contents = await response.buffer(); + const contents = Buffer.from(await response.arrayBuffer()); if (options.checksumSha256) { const actualSHA256Checksum = crypto.createHash('sha256').update(contents).digest('hex'); if (actualSHA256Checksum !== options.checksumSha256) { @@ -82,7 +81,11 @@ export async function fetchUrl(url: string, options: IFetchOptions, retries = 10 contents }); } - throw new Error(`Request ${ansiColors.magenta(url)} failed with status code: ${response.status}`); + let err = `Request ${ansiColors.magenta(url)} failed with status code: ${response.status}`; + if (response.status === 403) { + err += ' (you may be rate limited)'; + } + throw new Error(err); } finally { clearTimeout(timeout); } diff --git a/build/lib/getVersion.js b/build/lib/getVersion.js index ae0ec8d3dc7..abf05e93210 100644 --- a/build/lib/getVersion.js +++ b/build/lib/getVersion.js @@ -14,4 +14,4 @@ function getVersion(root) { return version; } exports.getVersion = getVersion; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0VmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImdldFZlcnNpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOzs7QUFFaEcsNkJBQTZCO0FBRTdCLFNBQWdCLFVBQVUsQ0FBQyxJQUFZO0lBQ3RDLElBQUksT0FBTyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMscUJBQXFCLENBQUMsQ0FBQztJQUVqRCxJQUFJLENBQUMsT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxFQUFFLENBQUM7UUFDekQsT0FBTyxHQUFHLEdBQUcsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDaEMsQ0FBQztJQUVELE9BQU8sT0FBTyxDQUFDO0FBQ2hCLENBQUM7QUFSRCxnQ0FRQyJ9 \ No newline at end of file +//# sourceMappingURL=getVersion.js.map \ No newline at end of file diff --git a/build/lib/git.js b/build/lib/git.js index 76f3756143e..a8e712ed070 100644 --- a/build/lib/git.js +++ b/build/lib/git.js @@ -52,4 +52,4 @@ function getVersion(repo) { return refs[ref]; } exports.getVersion = getVersion; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2l0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZ2l0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBOzs7Z0dBR2dHO0FBQ2hHLDZCQUE2QjtBQUM3Qix5QkFBeUI7QUFFekI7O0dBRUc7QUFDSCxTQUFnQixVQUFVLENBQUMsSUFBWTtJQUN0QyxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNwQyxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUN4QyxJQUFJLElBQVksQ0FBQztJQUVqQixJQUFJLENBQUM7UUFDSixJQUFJLEdBQUcsRUFBRSxDQUFDLFlBQVksQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDakQsQ0FBQztJQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7UUFDWixPQUFPLFNBQVMsQ0FBQztJQUNsQixDQUFDO0lBRUQsSUFBSSxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztRQUNsQyxPQUFPLElBQUksQ0FBQztJQUNiLENBQUM7SUFFRCxNQUFNLFFBQVEsR0FBRyxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRTFDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNmLE9BQU8sU0FBUyxDQUFDO0lBQ2xCLENBQUM7SUFFRCxNQUFNLEdBQUcsR0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDeEIsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFFcEMsSUFBSSxDQUFDO1FBQ0osT0FBTyxFQUFFLENBQUMsWUFBWSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNoRCxDQUFDO0lBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztRQUNaLE9BQU87SUFDUixDQUFDO0lBRUQsTUFBTSxjQUFjLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsYUFBYSxDQUFDLENBQUM7SUFDckQsSUFBSSxPQUFlLENBQUM7SUFFcEIsSUFBSSxDQUFDO1FBQ0osT0FBTyxHQUFHLEVBQUUsQ0FBQyxZQUFZLENBQUMsY0FBYyxFQUFFLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO0lBQzFELENBQUM7SUFBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1FBQ1osT0FBTyxTQUFTLENBQUM7SUFDbEIsQ0FBQztJQUVELE1BQU0sU0FBUyxHQUFHLDJCQUEyQixDQUFDO0lBQzlDLElBQUksU0FBaUMsQ0FBQztJQUN0QyxNQUFNLElBQUksR0FBOEIsRUFBRSxDQUFDO0lBRTNDLE9BQU8sU0FBUyxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztRQUM1QyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ25DLENBQUM7SUFFRCxPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNsQixDQUFDO0FBaERELGdDQWdEQyJ9 \ No newline at end of file +//# sourceMappingURL=git.js.map \ No newline at end of file diff --git a/build/lib/i18n.js b/build/lib/i18n.js index feb6513a70b..1844af139c5 100644 --- a/build/lib/i18n.js +++ b/build/lib/i18n.js @@ -877,4 +877,4 @@ function encodeEntities(value) { function decodeEntities(value) { return value.replace(/</g, '<').replace(/>/g, '>').replace(/&/g, '&'); } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"i18n.js","sourceRoot":"","sources":["i18n.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=i18n.js.map \ No newline at end of file diff --git a/build/lib/layersChecker.js b/build/lib/layersChecker.js index f94674d79d2..4979682935e 100644 --- a/build/lib/layersChecker.js +++ b/build/lib/layersChecker.js @@ -313,4 +313,4 @@ for (const sourceFile of program.getSourceFiles()) { if (hasErrors) { process.exit(1); } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"layersChecker.js","sourceRoot":"","sources":["layersChecker.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=layersChecker.js.map \ No newline at end of file diff --git a/build/lib/mangle/index.js b/build/lib/mangle/index.js index a2ab69e37d0..6a85a1a82f0 100644 --- a/build/lib/mangle/index.js +++ b/build/lib/mangle/index.js @@ -657,4 +657,4 @@ async function _run() { if (__filename === process_1.argv[1]) { _run(); } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/build/lib/mangle/renameWorker.js b/build/lib/mangle/renameWorker.js index 477e22fa8d0..428a9626a1f 100644 --- a/build/lib/mangle/renameWorker.js +++ b/build/lib/mangle/renameWorker.js @@ -17,4 +17,4 @@ function findRenameLocations(projectPath, fileName, position) { workerpool.worker({ findRenameLocations }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVuYW1lV29ya2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVuYW1lV29ya2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7QUFFaEcsaUNBQWlDO0FBQ2pDLHlDQUF5QztBQUN6QywyRUFBd0U7QUFFeEUsSUFBSSxPQUF1QyxDQUFDLENBQUEsMEVBQTBFO0FBRXRILFNBQVMsbUJBQW1CLENBQzNCLFdBQW1CLEVBQ25CLFFBQWdCLEVBQ2hCLFFBQWdCO0lBRWhCLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNkLE9BQU8sR0FBRyxFQUFFLENBQUMscUJBQXFCLENBQUMsSUFBSSxxREFBeUIsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDO0lBQ2hGLENBQUM7SUFFRCxPQUFPLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO0FBQ2xGLENBQUM7QUFFRCxVQUFVLENBQUMsTUFBTSxDQUFDO0lBQ2pCLG1CQUFtQjtDQUNuQixDQUFDLENBQUMifQ== \ No newline at end of file +//# sourceMappingURL=renameWorker.js.map \ No newline at end of file diff --git a/build/lib/mangle/staticLanguageServiceHost.js b/build/lib/mangle/staticLanguageServiceHost.js index fac5e863c50..1f338f0e61c 100644 --- a/build/lib/mangle/staticLanguageServiceHost.js +++ b/build/lib/mangle/staticLanguageServiceHost.js @@ -62,4 +62,4 @@ class StaticLanguageServiceHost { realpath = ts.sys.realpath; } exports.StaticLanguageServiceHost = StaticLanguageServiceHost; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdGljTGFuZ3VhZ2VTZXJ2aWNlSG9zdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInN0YXRpY0xhbmd1YWdlU2VydmljZUhvc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOzs7QUFFaEcsaUNBQWlDO0FBQ2pDLDZCQUE2QjtBQUU3QixNQUFhLHlCQUF5QjtJQUtoQjtJQUhKLFFBQVEsQ0FBdUI7SUFDL0IsZ0JBQWdCLEdBQW9DLElBQUksR0FBRyxFQUFFLENBQUM7SUFFL0UsWUFBcUIsV0FBbUI7UUFBbkIsZ0JBQVcsR0FBWCxXQUFXLENBQVE7UUFDdkMsTUFBTSxlQUFlLEdBQWdDLEVBQUUsQ0FBQztRQUN4RCxNQUFNLE1BQU0sR0FBRyxFQUFFLENBQUMsY0FBYyxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQy9ELElBQUksTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ2xCLE1BQU0sTUFBTSxDQUFDLEtBQUssQ0FBQztRQUNwQixDQUFDO1FBQ0QsSUFBSSxDQUFDLFFBQVEsR0FBRyxFQUFFLENBQUMsMEJBQTBCLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEVBQUUsZUFBZSxDQUFDLENBQUM7UUFDakgsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDckMsTUFBTSxNQUFNLENBQUMsS0FBSyxDQUFDO1FBQ3BCLENBQUM7SUFDRixDQUFDO0lBQ0Qsc0JBQXNCO1FBQ3JCLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUM7SUFDOUIsQ0FBQztJQUNELGtCQUFrQjtRQUNqQixPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDO0lBQ2hDLENBQUM7SUFDRCxnQkFBZ0IsQ0FBQyxTQUFpQjtRQUNqQyxPQUFPLEdBQUcsQ0FBQztJQUNaLENBQUM7SUFDRCxpQkFBaUI7UUFDaEIsT0FBTyxHQUFHLENBQUM7SUFDWixDQUFDO0lBQ0QsaUJBQWlCLENBQUMsUUFBZ0I7UUFDakMsSUFBSSxNQUFNLEdBQW1DLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDakYsSUFBSSxNQUFNLEtBQUssU0FBUyxFQUFFLENBQUM7WUFDMUIsTUFBTSxPQUFPLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDMUMsSUFBSSxPQUFPLEtBQUssU0FBUyxFQUFFLENBQUM7Z0JBQzNCLE9BQU8sU0FBUyxDQUFDO1lBQ2xCLENBQUM7WUFDRCxNQUFNLEdBQUcsRUFBRSxDQUFDLGNBQWMsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDL0MsSUFBSSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDN0MsQ0FBQztRQUNELE9BQU8sTUFBTSxDQUFDO0lBQ2YsQ0FBQztJQUNELG1CQUFtQjtRQUNsQixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7SUFDRCxxQkFBcUIsQ0FBQyxPQUEyQjtRQUNoRCxPQUFPLEVBQUUsQ0FBQyxxQkFBcUIsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBQ0QsZUFBZSxHQUFHLEVBQUUsQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDO0lBQ3pDLGNBQWMsR0FBRyxFQUFFLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQztJQUN2QyxVQUFVLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUM7SUFDL0IsUUFBUSxHQUFHLEVBQUUsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO0lBQzNCLGFBQWEsR0FBRyxFQUFFLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQztJQUNyQyxvREFBb0Q7SUFDcEQsUUFBUSxHQUFHLEVBQUUsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO0NBQzNCO0FBckRELDhEQXFEQyJ9 \ No newline at end of file +//# sourceMappingURL=staticLanguageServiceHost.js.map \ No newline at end of file diff --git a/build/lib/monaco-api.js b/build/lib/monaco-api.js index 721432ea56b..6512b6ae886 100644 --- a/build/lib/monaco-api.js +++ b/build/lib/monaco-api.js @@ -624,4 +624,4 @@ function execute() { return r; } exports.execute = execute; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"monaco-api.js","sourceRoot":"","sources":["monaco-api.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=monaco-api.js.map \ No newline at end of file diff --git a/build/lib/nls.js b/build/lib/nls.js index 311c9541672..50825224b28 100644 --- a/build/lib/nls.js +++ b/build/lib/nls.js @@ -371,4 +371,4 @@ var _nls; } _nls.patchFiles = patchFiles; })(_nls || (_nls = {})); -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nls.js","sourceRoot":"","sources":["nls.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=nls.js.map \ No newline at end of file diff --git a/build/lib/node.js b/build/lib/node.js index 112efd8d09f..7209dffc134 100644 --- a/build/lib/node.js +++ b/build/lib/node.js @@ -15,4 +15,4 @@ const arch = process.arch; const node = platform === 'win32' ? 'node.exe' : 'node'; const nodePath = path.join(root, '.build', 'node', `v${version}`, `${platform}-${arch}`, node); console.log(nodePath); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9kZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm5vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOztBQUVoRyw2QkFBNkI7QUFDN0IseUJBQXlCO0FBRXpCLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDO0FBQ25ELE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLFFBQVEsRUFBRSxTQUFTLENBQUMsQ0FBQztBQUN4RCxNQUFNLE1BQU0sR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLFVBQVUsRUFBRSxNQUFNLENBQUMsQ0FBQztBQUNuRCxNQUFNLE9BQU8sR0FBRyx1QkFBdUIsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFekQsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQztBQUNsQyxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDO0FBRTFCLE1BQU0sSUFBSSxHQUFHLFFBQVEsS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDO0FBQ3hELE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsSUFBSSxPQUFPLEVBQUUsRUFBRSxHQUFHLFFBQVEsSUFBSSxJQUFJLEVBQUUsRUFBRSxJQUFJLENBQUMsQ0FBQztBQUUvRixPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDIn0= \ No newline at end of file +//# sourceMappingURL=node.js.map \ No newline at end of file diff --git a/build/lib/optimize.js b/build/lib/optimize.js index a3d4db83821..9dff0859acc 100644 --- a/build/lib/optimize.js +++ b/build/lib/optimize.js @@ -285,4 +285,4 @@ function minifyTask(src, sourceMapBaseUrl) { }; } exports.minifyTask = minifyTask; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"optimize.js","sourceRoot":"","sources":["optimize.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=optimize.js.map \ No newline at end of file diff --git a/build/lib/policies.js b/build/lib/policies.js index ece7d5150fd..466295b8ad5 100644 --- a/build/lib/policies.js +++ b/build/lib/policies.js @@ -10,7 +10,6 @@ const path = require("path"); const byline = require("byline"); const ripgrep_1 = require("@vscode/ripgrep"); 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'); @@ -426,7 +425,7 @@ async function getSpecificNLS(resourceUrlTemplate, languageId, version) { path: 'extension/translations/main.i18n.json' }; const url = resourceUrlTemplate.replace(/\{([^}]+)\}/g, (_, key) => resource[key]); - const res = await (0, node_fetch_1.default)(url); + const res = await fetch(url); if (res.status !== 200) { throw new Error(`[${res.status}] Error downloading language pack ${languageId}@${version}`); } @@ -447,7 +446,7 @@ function compareVersions(a, b) { return a[2] - b[2]; } async function queryVersions(serviceUrl, languageId) { - const res = await (0, node_fetch_1.default)(`${serviceUrl}/extensionquery`, { + const res = await fetch(`${serviceUrl}/extensionquery`, { method: 'POST', headers: { 'Accept': 'application/json;api-version=3.0-preview.1', @@ -524,4 +523,4 @@ if (require.main === module) { process.exit(1); }); } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"policies.js","sourceRoot":"","sources":["policies.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=policies.js.map \ No newline at end of file diff --git a/build/lib/policies.ts b/build/lib/policies.ts index 0e89508fe8e..68f6989f27a 100644 --- a/build/lib/policies.ts +++ b/build/lib/policies.ts @@ -9,7 +9,6 @@ import * as path from 'path'; import * as byline from 'byline'; import { rgPath } from '@vscode/ripgrep'; 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'); diff --git a/build/lib/preLaunch.js b/build/lib/preLaunch.js index 846e649a7c2..efcb3220084 100644 --- a/build/lib/preLaunch.js +++ b/build/lib/preLaunch.js @@ -53,4 +53,4 @@ if (require.main === module) { process.exit(1); }); } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJlTGF1bmNoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicHJlTGF1bmNoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7QUFFaEcsWUFBWTtBQUVaLDZCQUE2QjtBQUM3QixpREFBc0M7QUFDdEMsMkJBQW9DO0FBRXBDLE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxRQUFRLEtBQUssT0FBTyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQztBQUNoRSxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7QUFFcEQsU0FBUyxVQUFVLENBQUMsT0FBZSxFQUFFLE9BQThCLEVBQUU7SUFDcEUsT0FBTyxJQUFJLE9BQU8sQ0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtRQUM1QyxNQUFNLEtBQUssR0FBRyxJQUFBLHFCQUFLLEVBQUMsT0FBTyxFQUFFLElBQUksRUFBRSxFQUFFLEdBQUcsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDekYsS0FBSyxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDbkUsS0FBSyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDM0IsQ0FBQyxDQUFDLENBQUM7QUFDSixDQUFDO0FBRUQsS0FBSyxVQUFVLE1BQU0sQ0FBQyxNQUFjO0lBQ25DLElBQUksQ0FBQztRQUNKLE1BQU0sYUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQzFDLE9BQU8sSUFBSSxDQUFDO0lBQ2IsQ0FBQztJQUFDLE1BQU0sQ0FBQztRQUNSLE9BQU8sS0FBSyxDQUFDO0lBQ2QsQ0FBQztBQUNGLENBQUM7QUFFRCxLQUFLLFVBQVUsaUJBQWlCO0lBQy9CLElBQUksQ0FBQyxDQUFDLE1BQU0sTUFBTSxDQUFDLGNBQWMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUNyQyxNQUFNLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN4QixDQUFDO0FBQ0YsQ0FBQztBQUVELEtBQUssVUFBVSxXQUFXO0lBQ3pCLE1BQU0sVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7QUFDdEMsQ0FBQztBQUVELEtBQUssVUFBVSxjQUFjO0lBQzVCLElBQUksQ0FBQyxDQUFDLE1BQU0sTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUM1QixNQUFNLFVBQVUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7QUFDRixDQUFDO0FBRUQsS0FBSyxVQUFVLElBQUk7SUFDbEIsTUFBTSxpQkFBaUIsRUFBRSxDQUFDO0lBQzFCLE1BQU0sV0FBVyxFQUFFLENBQUM7SUFDcEIsTUFBTSxjQUFjLEVBQUUsQ0FBQztJQUV2Qiw0REFBNEQ7SUFDNUQsTUFBTSxFQUFFLG9CQUFvQixFQUFFLEdBQUcsT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBQUM7SUFDaEUsTUFBTSxvQkFBb0IsRUFBRSxDQUFDO0FBQzlCLENBQUM7QUFFRCxJQUFJLE9BQU8sQ0FBQyxJQUFJLEtBQUssTUFBTSxFQUFFLENBQUM7SUFDN0IsSUFBSSxFQUFFLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFO1FBQ2xCLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbkIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNqQixDQUFDLENBQUMsQ0FBQztBQUNKLENBQUMifQ== \ No newline at end of file +//# sourceMappingURL=preLaunch.js.map \ No newline at end of file diff --git a/build/lib/reporter.js b/build/lib/reporter.js index 3ba88c26f3f..305d7364287 100644 --- a/build/lib/reporter.js +++ b/build/lib/reporter.js @@ -100,4 +100,4 @@ function createReporter(id) { return result; } exports.createReporter = createReporter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJyZXBvcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyxtQ0FBbUM7QUFDbkMsc0NBQXNDO0FBQ3RDLDBDQUEwQztBQUMxQyx5QkFBeUI7QUFDekIsNkJBQTZCO0FBRTdCLE1BQU0sUUFBUTtJQUNNO0lBQW5CLFlBQW1CLEVBQVU7UUFBVixPQUFFLEdBQUYsRUFBRSxDQUFRO0lBQzdCLENBQUM7SUFDRCxTQUFTLEdBQWUsRUFBRSxDQUFDO0lBQzNCLFNBQVMsR0FBa0IsSUFBSSxDQUFDO0lBQ2hDLEtBQUssR0FBRyxDQUFDLENBQUM7SUFFVixPQUFPO1FBQ04sSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDdEIsT0FBTztRQUNSLENBQUM7UUFFRCxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksSUFBSSxFQUFFLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDdEMsUUFBUSxDQUFDLFlBQVksVUFBVSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsR0FBRyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksSUFBSSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDNUcsQ0FBQztJQUVELEtBQUs7UUFDSixJQUFJLEVBQUUsSUFBSSxDQUFDLEtBQUssR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUN0QixPQUFPO1FBQ1IsQ0FBQztRQUVELElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUNaLENBQUM7SUFFRCxHQUFHO1FBQ0YsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNyQyxNQUFNLElBQUksR0FBRyxJQUFJLEdBQUcsRUFBVSxDQUFDO1FBRS9CLE1BQU0sQ0FBQyxH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 \ No newline at end of file +//# sourceMappingURL=reporter.js.map \ No newline at end of file diff --git a/build/lib/snapshotLoader.js b/build/lib/snapshotLoader.js index bafdf4ffe0c..0e58ceedffa 100644 --- a/build/lib/snapshotLoader.js +++ b/build/lib/snapshotLoader.js @@ -53,4 +53,4 @@ var snaps; cp.execFileSync(mksnapshot, [wrappedInputFilepath, `--startup_blob`, startupBlobFilepath]); } })(snaps || (snaps = {})); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3RMb2FkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzbmFwc2hvdExvYWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7QUFFaEcsSUFBVSxLQUFLLENBMkRkO0FBM0RELFdBQVUsS0FBSztJQUVkLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN6QixNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDN0IsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3pCLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUVwQyxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSwyQkFBMkIsT0FBTyxDQUFDLFFBQVEsS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUFDO0lBQ3JJLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0lBQzlDLE1BQU0sSUFBSSxHQUFHLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBRW5FLEVBQUU7SUFDRixJQUFJLGNBQXNCLENBQUM7SUFDM0IsSUFBSSxtQkFBMkIsQ0FBQztJQUVoQyxRQUFRLE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUMxQixLQUFLLFFBQVE7WUFDWixjQUFjLEdBQUcsaUJBQWlCLE9BQU8sQ0FBQyxRQUFRLDhDQUE4QyxDQUFDO1lBQ2pHLG1CQUFtQixHQUFHLGlCQUFpQixPQUFPLENBQUMsUUFBUSxtRkFBbUYsQ0FBQztZQUMzSSxNQUFNO1FBRVAsS0FBSyxPQUFPLENBQUM7UUFDYixLQUFLLE9BQU87WUFDWCxjQUFjLEdBQUcsVUFBVSxPQUFPLENBQUMsUUFBUSxJQUFJLElBQUksaUNBQWlDLENBQUM7WUFDckYsbUJBQW1CLEdBQUcsVUFBVSxPQUFPLENBQUMsUUFBUSxJQUFJLElBQUksb0JBQW9CLENBQUM7WUFDN0UsTUFBTTtRQUVQO1lBQ0MsTUFBTSxJQUFJLEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0lBQ3RDLENBQUM7SUFFRCxjQUFjLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsV0FBVyxFQUFFLGNBQWMsQ0FBQyxDQUFDO0lBQ25FLG1CQUFtQixHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLFdBQVcsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0lBRTdFLGNBQWMsQ0FBQyxjQUFjLEVBQUUsbUJBQW1CLENBQUMsQ0FBQztJQUVwRCxTQUFTLGNBQWMsQ0FBQyxjQUFzQixFQUFFLG1CQUEyQjtRQUUxRSxNQUFNLFNBQVMsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBQ2xELE1BQU0sZ0JBQWdCLEdBQUc7Ozs7S0FJdEIsU0FBUyxDQUFDLFFBQVEsRUFBRTs7Ozs7Ozs7O0dBU3RCLENBQUM7UUFDRixNQUFNLG9CQUFvQixHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxFQUFFLG1CQUFtQixDQUFDLENBQUM7UUFDekUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBQ2xDLEVBQUUsQ0FBQyxhQUFhLENBQUMsb0JBQW9CLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQztRQUV6RCxFQUFFLENBQUMsWUFBWSxDQUFDLFVBQVUsRUFBRSxDQUFDLG9CQUFvQixFQUFFLGdCQUFnQixFQUFFLG1CQUFtQixDQUFDLENBQUMsQ0FBQztJQUM1RixDQUFDO0FBQ0YsQ0FBQyxFQTNEUyxLQUFLLEtBQUwsS0FBSyxRQTJEZCJ9 \ No newline at end of file +//# sourceMappingURL=snapshotLoader.js.map \ No newline at end of file diff --git a/build/lib/standalone.js b/build/lib/standalone.js index 9a7d112bfeb..4ddf88ed223 100644 --- a/build/lib/standalone.js +++ b/build/lib/standalone.js @@ -318,4 +318,4 @@ function transportCSS(module, enqueue, write) { return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle; } } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"standalone.js","sourceRoot":"","sources":["standalone.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=standalone.js.map \ No newline at end of file diff --git a/build/lib/stats.js b/build/lib/stats.js index 6095916f66b..d923bb809da 100644 --- a/build/lib/stats.js +++ b/build/lib/stats.js @@ -74,4 +74,4 @@ function createStatsStream(group, log) { }); } exports.createStatsStream = createStatsStream; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJzdGF0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyxtQ0FBbUM7QUFDbkMsc0NBQXNDO0FBQ3RDLDBDQUEwQztBQUcxQyxNQUFNLEtBQUs7SUFDVztJQUFxQjtJQUEyQjtJQUFyRSxZQUFxQixJQUFZLEVBQVMsVUFBa0IsRUFBUyxTQUFpQjtRQUFqRSxTQUFJLEdBQUosSUFBSSxDQUFRO1FBQVMsZUFBVSxHQUFWLFVBQVUsQ0FBUTtRQUFTLGNBQVMsR0FBVCxTQUFTLENBQVE7SUFBSSxDQUFDO0lBRTNGLFFBQVEsQ0FBQyxNQUFnQjtRQUN4QixJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDYixJQUFJLElBQUksQ0FBQyxVQUFVLEtBQUssQ0FBQyxFQUFFLENBQUM7Z0JBQzNCLE9BQU8sR0FBRyxJQUFJLENBQUMsSUFBSSxLQUFLLElBQUksQ0FBQyxTQUFTLFFBQVEsQ0FBQztZQUNoRCxDQUFDO2lCQUFNLENBQUM7Z0JBQ1AsT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLEtBQUssSUFBSSxDQUFDLFVBQVUsZUFBZSxJQUFJLENBQUMsU0FBUyxRQUFRLENBQUM7WUFDOUUsQ0FBQztRQUNGLENBQUM7YUFBTSxDQUFDO1lBQ1AsSUFBSSxJQUFJLENBQUMsVUFBVSxLQUFLLENBQUMsRUFBRSxDQUFDO2dCQUMzQixPQUFPLGNBQWMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUM7WUFFNUYsQ0FBQztpQkFBTSxDQUFDO2dCQUNQLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxVQUFVLEdBQUcsR0FBRztvQkFDbEMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVB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 \ No newline at end of file +//# sourceMappingURL=stats.js.map \ No newline at end of file diff --git a/build/lib/stylelint/validateVariableNames.js b/build/lib/stylelint/validateVariableNames.js index 230c4b7f436..2367fb94c2e 100644 --- a/build/lib/stylelint/validateVariableNames.js +++ b/build/lib/stylelint/validateVariableNames.js @@ -31,4 +31,4 @@ function getVariableNameValidator() { }; } exports.getVariableNameValidator = getVariableNameValidator; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGVWYXJpYWJsZU5hbWVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsidmFsaWRhdGVWYXJpYWJsZU5hbWVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7O0FBRWhHLDJCQUFrQztBQUNsQyw2QkFBOEI7QUFFOUIsTUFBTSxXQUFXLEdBQUcsMEJBQTBCLENBQUM7QUFFL0MsSUFBSSxjQUF1QyxDQUFDO0FBQzVDLFNBQVMscUJBQXFCO0lBQzdCLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUNyQixNQUFNLHlCQUF5QixHQUFHLElBQUEsaUJBQVksRUFBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSwrQkFBK0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ3pILE1BQU0sa0JBQWtCLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO1FBQ2pFLGNBQWMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxDQUFDLEdBQUcsa0JBQWtCLENBQUMsTUFBTSxFQUFFLEdBQUcsa0JBQWtCLENBQUMsTUFBTSxDQUFhLENBQUMsQ0FBQztJQUNwRyxDQUFDO0lBQ0QsT0FBTyxjQUFjLENBQUM7QUFDdkIsQ0FBQztBQU1ELFNBQWdCLHdCQUF3QjtJQUN2QyxNQUFNLFlBQVksR0FBRyxxQkFBcUIsRUFBRSxDQUFDO0lBQzdDLE9BQU8sQ0FBQyxLQUFhLEVBQUUsTUFBd0MsRUFBRSxFQUFFO1FBQ2xFLFdBQVcsQ0FBQyxTQUFTLEdBQUcsQ0FBQyxDQUFDLENBQUMsa0NBQWtDO1FBQzdELElBQUksS0FBSyxDQUFDO1FBQ1YsT0FBTyxLQUFLLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQ3hDLE1BQU0sWUFBWSxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM5QixJQUFJLFlBQVksSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBQztnQkFDckQsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDO1lBQ3RCLENBQUM7UUFDRixDQUFDO0lBQ0YsQ0FBQyxDQUFDO0FBQ0gsQ0FBQztBQVpELDREQVlDIn0= \ No newline at end of file +//# sourceMappingURL=validateVariableNames.js.map \ No newline at end of file diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json index f81642f392c..0d6805f2788 100644 --- a/build/lib/stylelint/vscode-known-variables.json +++ b/build/lib/stylelint/vscode-known-variables.json @@ -180,7 +180,7 @@ "--vscode-editorCodeLens-foreground", "--vscode-editorCommentsWidget-rangeActiveBackground", "--vscode-editorCommentsWidget-rangeBackground", - "--vscode-editorCommentsWidget-replyButtonBackground", + "--vscode-editorCommentsWidget-replyInputBackground", "--vscode-editorCommentsWidget-resolvedBorder", "--vscode-editorCommentsWidget-unresolvedBorder", "--vscode-editorCursor-background", @@ -241,6 +241,7 @@ "--vscode-editorInlayHint-typeBackground", "--vscode-editorInlayHint-typeForeground", "--vscode-editorLightBulb-foreground", + "--vscode-editorLightBulbAi-foreground", "--vscode-editorLightBulbAutoFix-foreground", "--vscode-editorLineNumber-activeForeground", "--vscode-editorLineNumber-dimmedForeground", @@ -276,6 +277,8 @@ "--vscode-editorPane-background", "--vscode-editorRuler-foreground", "--vscode-editorStickyScroll-background", + "--vscode-editorStickyScroll-border", + "--vscode-editorStickyScroll-shadow", "--vscode-editorStickyScrollHover-background", "--vscode-editorSuggestWidget-background", "--vscode-editorSuggestWidget-border", @@ -455,6 +458,8 @@ "--vscode-notificationsErrorIcon-foreground", "--vscode-notificationsInfoIcon-foreground", "--vscode-notificationsWarningIcon-foreground", + "--vscode-outputView-background", + "--vscode-outputViewStickyScroll-background", "--vscode-panel-background", "--vscode-panel-border", "--vscode-panel-dropBorder", @@ -499,6 +504,10 @@ "--vscode-quickInputList-focusIconForeground", "--vscode-quickInputTitle-background", "--vscode-sash-hoverBorder", + "--vscode-scm-historyItemAdditionsForeground", + "--vscode-scm-historyItemDeletionsForeground", + "--vscode-scm-historyItemSelectedStatisticsBorder", + "--vscode-scm-historyItemStatisticsBorder", "--vscode-scrollbar-shadow", "--vscode-scrollbarSlider-activeBackground", "--vscode-scrollbarSlider-background", @@ -787,6 +796,7 @@ "--z-index-notebook-scrollbar", "--z-index-run-button-container", "--z-index-notebook-sticky-scroll", - "--zoom-factor" + "--zoom-factor", + "--test-bar-width" ] } diff --git a/build/lib/task.js b/build/lib/task.js index 367e7d42d15..6b040a75698 100644 --- a/build/lib/task.js +++ b/build/lib/task.js @@ -95,4 +95,4 @@ function define(name, task) { return task; } exports.define = define; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFzay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRhc2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Z0dBR2dHOzs7QUFFaEcsc0NBQXNDO0FBQ3RDLDBDQUEwQztBQW1CMUMsU0FBUyxVQUFVLENBQUMsQ0FBeUM7SUFDNUQsSUFBSSxPQUFhLENBQUUsQ0FBQyxJQUFJLEtBQUssVUFBVSxFQUFFLENBQUM7UUFDekMsT0FBTyxJQUFJLENBQUM7SUFDYixDQUFDO0lBQ0QsT0FBTyxLQUFLLENBQUM7QUFDZCxDQUFDO0FBRUQsU0FBUyxXQUFXLENBQUMsSUFBWTtJQUNoQyxPQUFPLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDO0FBQ2pDLENBQUM7QUFFRCxLQUFLLFVBQVUsUUFBUSxDQUFDLElBQVU7SUFDakMsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLFFBQVEsSUFBSSxJQUFJLENBQUMsV0FBVyxJQUFJLGFBQWEsQ0FBQztJQUNoRSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ2xCLFFBQVEsQ0FBQyxVQUFVLEVBQUUsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUNwRCxDQUFDO0lBQ0QsTUFBTSxTQUFTLEdBQUcsT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQ25DLE1BQU0sVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3ZCLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDN0MsTUFBTSxrQkFBa0IsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsR0FBRyxHQUFHLEdBQUcsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDakUsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNsQixRQUFRLENBQUMsVUFBVSxFQUFFLFVBQVUsQ0FB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 \ No newline at end of file +//# sourceMappingURL=task.js.map \ No newline at end of file diff --git a/build/lib/test/i18n.test.js b/build/lib/test/i18n.test.js index 9fa29003ce4..b8f4a2bedef 100644 --- a/build/lib/test/i18n.test.js +++ b/build/lib/test/i18n.test.js @@ -38,4 +38,4 @@ suite('XLF Parser Tests', () => { assert.deepStrictEqual(i18n.getResource('vs/workbench/browser/parts/panel/panelActions'), workbench); }); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaTE4bi50ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaTE4bi50ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7QUFFaEcsaUNBQWtDO0FBQ2xDLGdDQUFpQztBQUVqQyxLQUFLLENBQUMsa0JBQWtCLEVBQUUsR0FBRyxFQUFFO0lBQzlCLE1BQU0sU0FBUyxHQUFHLGtYQUFrWCxDQUFDO0lBQ3JZLE1BQU0sbUJBQW1CLEdBQUcsaWNBQWljLENBQUM7SUFDOWQsTUFBTSxJQUFJLEdBQUcsMkJBQTJCLENBQUM7SUFDekMsTUFBTSxJQUFJLEdBQUcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDOUIsTUFBTSxRQUFRLEdBQUcsQ0FBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDeEMsTUFBTSxrQkFBa0IsR0FBRyxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxDQUFDO0lBRXRFLElBQUksQ0FBQyxtQ0FBbUMsRUFBRSxHQUFHLEVBQUU7UUFDOUMsTUFBTSxHQUFHLEdBQUcsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLENBQUM7UUFDN0MsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQ2xDLE1BQU0sU0FBUyxHQUFHLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUVqQyxNQUFNLENBQUMsV0FBVyxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ2pFLENBQUMsQ0FBQyxDQUFDO0lBRUgsSUFBSSxDQUFDLG1DQUFtQyxFQUFFLEdBQUcsRUFBRTtRQUM5QyxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFVLGFBQWE7WUFDL0QsTUFBTSxDQUFDLGVBQWUsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLGtCQUFrQixDQUFDLENBQUM7WUFDdEUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ2pELENBQUMsQ0FBQyxDQUFDO0lBQ0osQ0FBQyxDQUFDLENBQUM7SUFFSCxJQUFJLENBQUMsbURBQW1ELEVBQUUsR0FBRyxFQUFFO1FBQzlELE1BQU0sYUFBYSxHQUFXLGVBQWUsRUFDNUMsZ0JBQWdCLEdBQVcsa0JBQWtCLENBQUM7UUFFL0MsTUFBTSxRQUFRLEdBQWtCLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxPQUFPLEVBQUUsYUFBYSxFQUFFLEVBQzlFLGFBQWEsR0FBRyxFQUFFLElBQUksRUFBRSxtQkFBbUIsRUFBRSxPQUFPLEVBQUUsYUFBYSxFQUFFLEVBQ3JFLE1BQU0sR0FBRyxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsT0FBTyxFQUFFLGFBQWEsRUFBRSxFQUN0RCxJQUFJLEdBQUcsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLE9BQU8sRUFBRSxhQUFhLEVBQUUsRUFDbEQsSUFBSSxHQUFHLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsRUFDckQsY0FBYyxHQUFHLEVBQUUsSUFBSSxFQUFFLDJCQUEyQixFQUFFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxFQUNqRixpQkFBaUIsR0FBRyxFQUFFLElBQUksRUFBRSxnQ0FBZ0MsRUFBRSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsRUFDekYsU0FBUyxHQUFHLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsQ0FBQztRQUVqRSxNQUFNLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsaURBQWlELENBQUMsRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN0RyxNQUFNLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsK0NBQStDLENBQUMsRUFBRSxhQUFhLENBQUMsQ0FBQztRQUN6RyxNQUFNLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsc0NBQXNDLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUN6RixNQUFNLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsNkJBQTZCLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUM5RSxNQUFNLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsOEJBQThCLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUMvRSxNQUFNLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsMkNBQTJDLENBQUMsRUFBRSxjQUFjLENBQUMsQ0FBQztRQUN0RyxNQUFNLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMscURBQXFELENBQUMsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1FBQ25ILE1BQU0sQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQywrQ0FBK0MsQ0FBQyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ3RHLENBQUMsQ0FBQyxDQUFDO0FBQ0osQ0FBQyxDQUFDLENBQUMifQ== \ No newline at end of file +//# sourceMappingURL=i18n.test.js.map \ No newline at end of file diff --git a/build/lib/treeshaking.js b/build/lib/treeshaking.js index 6b39c011da8..51c610ecda2 100644 --- a/build/lib/treeshaking.js +++ b/build/lib/treeshaking.js @@ -901,4 +901,4 @@ function getTokenAtPosition(ts, sourceFile, position, allowPositionInLeadingTriv } } //#endregion -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"treeshaking.js","sourceRoot":"","sources":["treeshaking.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=treeshaking.js.map \ No newline at end of file diff --git a/build/lib/tsb/builder.js b/build/lib/tsb/builder.js index aecaaf45dc6..e041a754c4f 100644 --- a/build/lib/tsb/builder.js +++ b/build/lib/tsb/builder.js @@ -571,4 +571,4 @@ class LanguageServiceHost { }); } } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=builder.js.map \ No newline at end of file diff --git a/build/lib/tsb/index.js b/build/lib/tsb/index.js index 34fc9bc2807..47f26bc8178 100644 --- a/build/lib/tsb/index.js +++ b/build/lib/tsb/index.js @@ -133,4 +133,4 @@ function create(projectPath, existingOptions, config, onError = _defaultOnError) return result; } exports.create = create; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRywrQkFBK0I7QUFDL0IsbUNBQW1DO0FBQ25DLHFDQUFxQztBQUNyQyxpQ0FBaUM7QUFDakMsbUNBQW9EO0FBQ3BELCtCQUErQjtBQUMvQixtQ0FBa0M7QUFDbEMsMkJBQTRDO0FBQzVDLGlDQUFpQztBQUNqQyxzQ0FBdUM7QUFDdkMsNkNBQXlFO0FBT3pFLE1BQU0sV0FBWSxTQUFRLGVBQU07SUFDL0IsTUFBTSxDQUFDLE1BQVcsRUFBRSxTQUFpQixFQUFFLFFBQStCLElBQVUsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzdGLEtBQUssS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztDQUM1QjtBQUVELFNBQVMsa0JBQWtCO0lBQzFCLE1BQU0sTUFBTSxHQUF3QixjQUFjLE9BQU8sSUFBSSxXQUFXLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM5RSxNQUFNLENBQUMsR0FBRyxHQUFHLEdBQUcsRUFBRSxDQUFDLElBQUksV0FBVyxFQUFFLENBQUM7SUFDckMsT0FBTyxNQUFNLENBQUM7QUFDZixDQUFDO0FBRUQsTUFBTSxlQUFlLEdBQUcsQ0FBQyxHQUFXLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFbkYsU0FBZ0IsTUFBTSxDQUNyQixXQUFtQixFQUNuQixlQUE0QyxFQUM1QyxNQUFzSCxFQUN0SCxVQUFxQyxlQUFlO0lBR3BELFNBQVMsZUFBZSxDQUFDLElBQTJCO1FBRW5ELElBQUksSUFBSSxZQUFZLEtBQUssRUFBRSxDQUFDO1lBQzNCLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDdkIsQ0FBQzthQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ3RDLE9BQU8sQ0FBQyxFQUFFLENBQUMsNEJBQTRCLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDO1FBQ2xFLENBQUM7YUFBTSxDQUFDO1lBQ1AsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyw2QkFBNkIsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDdEUsT0FBTyxDQUFDLGVBQU8sQ0FBQyxNQUFNLENBQUMsbUJBQW1CLEVBQ3pDLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUNsQixTQUFTLENBQUMsSUFBSSxHQUFHLENBQUMsRUFDbEIsU0FBUyxDQUFDLFNBQVMsR0FBRyxDQUFDLEVBQ3ZCLEVBQUUsQ0FBQyw0QkFBNEIsQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQ3hELENBQUM7UUFDSCxDQUFDO0lBQ0YsQ0FBQztJQUVELE1BQU0sTUFBTSxHQUFHLEVBQUUsQ0FBQyxjQUFjLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDL0QsSUFBSSxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDbEIsZUFBZSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM5QixPQUFPLGtCQUFrQixFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUVELE1BQU0sT0FBTyxHQUFHLEVBQUUsQ0FBQywwQkFBMEIsQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxHQUFHLEVBQUUsSUFBQSxjQUFPLEVBQUMsV0FBVyxDQUFDLEVBQUUsZUFBZSxDQUFDLENBQUM7SUFDNUcsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUMvQixPQUFPLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUN4QyxPQUFPLGtCQUFrQixFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUVELFNBQVMsS0FBSyxDQUFDLEtBQWEsRUFBRSxPQUFlO1FBQzVDLElBQUksTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ3BCLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQ2xDLENBQUM7SUFDRixDQUFDO0lBRUQsdUVBQXVFO0lBQ3ZFLFNBQVMsbUJBQW1CLENBQUMsT0FBbUMsRUFBRSxLQUFpQztRQUVsRyxPQUFPLE9BQU8sQ0FBQyxVQUF1QyxJQUFXO1lBQ2hFLGdDQUFnQztZQUNoQyxJQUFJLElBQUksQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDO2dCQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSx3QkFBd0IsQ0FBQyxDQUFDO2dCQUM3QyxPQUFPO1lBQ1IsQ0FBQztZQUNELE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFcEIsQ0FBQyxFQUFFO1lBQ0YsZ0NBQWdDO1lBQ2hDLE9BQU8sQ0FBQyxLQUFLLENBQ1osSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxFQUN4QixlQUFlLEVBQ2YsS0FBSyxDQUNMLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7UUFDN0QsQ0FBQyxDQUFDLENBQUM7SUFDSixDQUFDO0lBRUQsdURBQXVEO0lBQ3ZELFNBQVMscUJBQXFCLENBQUMsVUFBdUI7UUFDckQsT0FBTyxPQUFPLENBQUMsVUFBaUUsSUFBVztZQUMxRixnQ0FBZ0M7WUFDaEMsSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQztnQkFDckIsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsd0JBQXdCLENBQUMsQ0FBQztnQkFDN0MsT0FBTztZQUNSLENBQUM7WUFDRCxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO2dCQUNwQixPQUFPO1lBQ1IsQ0FBQztZQUNELElBQUksQ0FBQyxNQUFNLENBQUMsd0JBQXdCLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztnQkFDckUsT0FBTztZQUNSLENBQUM7WUFFRCxJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsRUFBRSxDQUFDO2dCQUMzQixVQUFVLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNqRCxDQUFDO1lBRUQsVUFBVSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUU1QixDQUFDLEVBQUU7WUFDRixVQUFVLENBQUMsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRTtnQkFDM0IsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztnQkFDakIsVUFBVSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7WUFDbEMsQ0FBQyxDQUFDLENBQUM7UUFDSixDQUFDLENBQUMsQ0FBQztJQUNKLENBQUM7SUFHRCxJQUFJLE1BQTJCLENBQUM7SUFDaEMsSUFBSSxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7UUFDMUIsTUFBTSxVQUFVLEdBQUcsQ0FBQyxNQUFNLENBQUMsZ0JBQWdCO1lBQzFDLENBQUMsQ0FBQyxJQUFJLDBCQUFhLENBQUMsS0FBSyxFQUFFLGVBQWUsRUFBRSxXQUFXLEVBQUUsT0FBTyxDQUFDO1lBQ2pFLENBQUMsQ0FBQyxJQUFJLDBCQUFhLENBQUMsS0FBSyxFQUFFLGVBQWUsRUFBRSxXQUFXLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDbkUsTUFBTSxHQUFRLENBQUMsR0FBRyxFQUFFLENBQUMscUJBQXFCLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztJQUN6RCxDQUFDO1NBQU0sQ0FBQztRQUNQLE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxFQUFFLEtBQUssRUFBRSxFQUFFLFdBQVcsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUNsRixNQUFNLEdBQVEsQ0FBQyxDQUFDLEtBQWdDLEVBQUUsRUFBRSxDQUFDLG1CQUFtQixDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDO0lBQzVGLENBQUM7SUFFRCxNQUFNLENBQUMsR0FBRyxHQUFHLENBQUMsSUFBc0MsRUFBRSxFQUFFO1FBQ3ZELElBQUksSUFBSSxHQUFHLENBQUMsQ0FBQztRQUNiLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlDLE9BQU8sSUFBSSxLQUFNLFNBQVEsaUJBQVE7WUFDaEM7Z0JBQ0MsS0FBSyxDQUFDLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7WUFDN0IsQ0FBQztZQUNELEtBQUs7Z0JBQ0osSUFBSSxJQUFJLEdBQVksSUFBSSxDQUFDO2dCQUN6QixJQUFJLElBQVksQ0FBQztnQkFDakIsT0FBTyxJQUFJLElBQUksSUFBSSxHQUFHLFVBQVUsQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLEVBQUUsQ0FBQztvQkFDakQsSUFBSSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztvQkFDeEIsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxLQUFLLENBQUM7d0JBQzFCLElBQUk7d0JBQ0osUUFBUSxFQUFFLElBQUEsaUJBQVksRUFBQyxJQUFJLENBQUM7d0JBQzVCLElBQUksRUFBRSxJQUFBLGFBQVEsRUFBQyxJQUFJLENBQUM7d0JBQ3BCLEdBQUcsRUFBRSxJQUFJLElBQUksSUFBSSxDQUFDLEdBQUc7d0JBQ3JCLElBQUksRUFBRSxJQUFJLElBQUksSUFBSSxDQUFDLElBQUksSUFBSSxJQUFBLGNBQU8sRUFBQyxXQUFXLENBQUM7cUJBQy9DLENBQUMsQ0FBQyxDQUFDO2dCQUNMLENBQUM7Z0JBQ0QsSUFBSSxJQUFJLElBQUksVUFBVSxDQUFDLE1BQU0sRUFBRSxDQUFDO29CQUMvQixJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNqQixDQUFDO1lBQ0YsQ0FBQztTQUNELENBQUM7SUFDSCxDQUFDLENBQUM7SUFFRixPQUE0QixNQUFNLENBQUM7QUFDcEMsQ0FBQztBQXBJRCx3QkFvSUMifQ== \ No newline at end of file +//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/build/lib/tsb/transpiler.js b/build/lib/tsb/transpiler.js index 0ad7aee859b..afec9062692 100644 --- a/build/lib/tsb/transpiler.js +++ b/build/lib/tsb/transpiler.js @@ -324,4 +324,4 @@ class SwcTranspiler { }; } exports.SwcTranspiler = SwcTranspiler; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transpiler.js","sourceRoot":"","sources":["transpiler.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=transpiler.js.map \ No newline at end of file diff --git a/build/lib/tsb/utils.js b/build/lib/tsb/utils.js index 4b4f7d76d4b..6ea66221b1b 100644 --- a/build/lib/tsb/utils.js +++ b/build/lib/tsb/utils.js @@ -123,4 +123,4 @@ var graph; } graph.Graph = Graph; })(graph || (exports.graph = graph = {})); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ1dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyxJQUFjLFdBQVcsQ0FzQ3hCO0FBdENELFdBQWMsV0FBVztJQUVyQixNQUFNLGNBQWMsR0FBRyxNQUFNLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQztJQUV2RCxTQUFnQixNQUFNLENBQUksVUFBaUMsRUFBRSxHQUFXO1FBQ3BFLElBQUksY0FBYyxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUN2QyxPQUFPLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUMzQixDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztJQUxlLGtCQUFNLFNBS3JCLENBQUE7SUFFRCxTQUFnQixNQUFNLENBQUksVUFBaUMsRUFBRSxHQUFXLEVBQUUsS0FBUTtRQUM5RSxVQUFVLENBQUMsR0FBRyxDQUFDLEdBQUcsS0FBSyxDQUFDO0lBQzVCLENBQUM7SUFGZSxrQkFBTSxTQUVyQixDQUFBO0lBRUQsU0FBZ0IsY0FBYyxDQUFJLFVBQWlDLEVBQUUsR0FBVyxFQUFFLEtBQVE7UUFDdEYsSUFBSSxjQUFjLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQ3ZDLE9BQU8sVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzNCLENBQUM7YUFBTSxDQUFDO1lBQ0osVUFBVSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEtBQUssQ0FBQztZQUN4QixPQUFPLEtBQUssQ0FBQztRQUNqQixDQUFDO0lBQ0wsQ0FBQztJQVBlLDBCQUFjLGlCQU83QixDQUFBO0lBRUQsU0FBZ0IsT0FBTyxDQUFJLFVBQWlDLEVBQUUsUUFBb0Q7UUFDOUcsS0FBSyxNQUFNLEdBQUcsSUFBSSxVQUFVLEVBQUUsQ0FBQztZQUMzQixJQUFJLGNBQWMsQ0FBQyxJQUFJLENBQUMs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 \ No newline at end of file +//# sourceMappingURL=utils.js.map \ No newline at end of file diff --git a/build/lib/typings/stream.d.ts b/build/lib/typings/stream.d.ts new file mode 100644 index 00000000000..43623cb79dd --- /dev/null +++ b/build/lib/typings/stream.d.ts @@ -0,0 +1,9 @@ +declare namespace NodeJS { + type ComposeFnParam = (source: any) => void; + interface ReadWriteStream { + compose( + stream: T | ComposeFnParam | Iterable | AsyncIterable, + options?: { signal: AbortSignal }, + ): T; + } +} diff --git a/build/lib/util.js b/build/lib/util.js index 22df871f790..388ef5df948 100644 --- a/build/lib/util.js +++ b/build/lib/util.js @@ -406,4 +406,4 @@ function buildWebNodePaths(outDir) { return result; } exports.buildWebNodePaths = buildWebNodePaths; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.js","sourceRoot":"","sources":["util.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=util.js.map \ No newline at end of file diff --git a/build/lib/watch/index.js b/build/lib/watch/index.js index bc422288299..86d2611febf 100644 --- a/build/lib/watch/index.js +++ b/build/lib/watch/index.js @@ -7,4 +7,4 @@ const watch = process.platform === 'win32' ? require('./watch-win32') : require( module.exports = function () { return watch.apply(null, arguments); }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7QUFFaEcsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLFFBQVEsS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBQUM7QUFFckcsTUFBTSxDQUFDLE9BQU8sR0FBRztJQUNoQixPQUFPLEtBQUssQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFDO0FBQ3JDLENBQUMsQ0FBQyJ9 \ No newline at end of file +//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/build/lib/watch/watch-win32.js b/build/lib/watch/watch-win32.js index e191a81cb93..49094e915e4 100644 --- a/build/lib/watch/watch-win32.js +++ b/build/lib/watch/watch-win32.js @@ -98,4 +98,4 @@ module.exports = function (pattern, options) { })) .pipe(rebase); }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2F0Y2gtd2luMzIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ3YXRjaC13aW4zMi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7O0FBRWhHLDZCQUE2QjtBQUM3QixvQ0FBb0M7QUFDcEMseUJBQXlCO0FBQ3pCLDhCQUE4QjtBQUM5QixtQ0FBbUM7QUFDbkMsc0NBQXNDO0FBR3RDLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLGFBQWEsQ0FBQyxDQUFDO0FBRXhELFNBQVMsWUFBWSxDQUFDLElBQXFCO0lBQzFDLFFBQVEsSUFBSSxFQUFFLENBQUM7UUFDZCxLQUFLLEdBQUcsQ0FBQyxDQUFDLE9BQU8sUUFBUSxDQUFDO1FBQzFCLEtBQUssR0FBRyxDQUFDLENBQUMsT0FBTyxLQUFLLENBQUM7UUFDdkIsT0FBTyxDQUFDLENBQUMsT0FBTyxRQUFRLENBQUM7SUFDMUIsQ0FBQztBQUNGLENBQUM7QUFFRCxTQUFTLEtBQUssQ0FBQyxJQUFZO0lBQzFCLE1BQU0sTUFBTSxHQUFHLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUM1QixJQUFJLEtBQUssR0FBMkIsRUFBRSxDQUFDLEtBQUssQ0FBQyxXQUFXLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBRWxFLEtBQUssQ0FBQyxNQUFPLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxVQUFVLElBQUk7UUFDdEMsTUFBTSxLQUFLLEdBQWEsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDMUQsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUN2QyxNQUFNLElBQUksR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDN0IsSUFBSSxJ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 \ No newline at end of file +//# sourceMappingURL=watch-win32.js.map \ No newline at end of file diff --git a/build/linux/debian/calculate-deps.js b/build/linux/debian/calculate-deps.js index 1e9205ba8fc..6304df9edda 100644 --- a/build/linux/debian/calculate-deps.js +++ b/build/linux/debian/calculate-deps.js @@ -11,15 +11,15 @@ 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)); +function generatePackageDeps(files, arch, chromiumSysroot, vscodeSysroot) { + const dependencies = files.map(file => calculatePackageDeps(file, arch, chromiumSysroot, vscodeSysroot)); 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) { +function calculatePackageDeps(binaryPath, arch, chromiumSysroot, vscodeSysroot) { 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.`); @@ -42,18 +42,19 @@ function calculatePackageDeps(binaryPath, arch, sysroot) { 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`); + cmd.push(`-l${chromiumSysroot}/usr/lib/x86_64-linux-gnu`, `-l${chromiumSysroot}/lib/x86_64-linux-gnu`, `-l${vscodeSysroot}/usr/lib/x86_64-linux-gnu`, `-l${vscodeSysroot}/lib/x86_64-linux-gnu`); break; case 'armhf': - cmd.push(`-l${sysroot}/usr/lib/arm-linux-gnueabihf`, `-l${sysroot}/lib/arm-linux-gnueabihf`); + cmd.push(`-l${chromiumSysroot}/usr/lib/arm-linux-gnueabihf`, `-l${chromiumSysroot}/lib/arm-linux-gnueabihf`, `-l${vscodeSysroot}/usr/lib/arm-linux-gnueabihf`, `-l${vscodeSysroot}/lib/arm-linux-gnueabihf`); break; case 'arm64': - cmd.push(`-l${sysroot}/usr/lib/aarch64-linux-gnu`, `-l${sysroot}/lib/aarch64-linux-gnu`); + cmd.push(`-l${chromiumSysroot}/usr/lib/aarch64-linux-gnu`, `-l${chromiumSysroot}/lib/aarch64-linux-gnu`, `-l${vscodeSysroot}/usr/lib/aarch64-linux-gnu`, `-l${vscodeSysroot}/lib/aarch64-linux-gnu`); break; } - cmd.push(`-l${sysroot}/usr/lib`); + cmd.push(`-l${chromiumSysroot}/usr/lib`); + cmd.push(`-L${vscodeSysroot}/debian/libxkbfile1/DEBIAN/shlibs`); cmd.push('-O', '-e', path.resolve(binaryPath)); - const dpkgShlibdepsResult = (0, child_process_1.spawnSync)('perl', cmd, { cwd: sysroot }); + const dpkgShlibdepsResult = (0, child_process_1.spawnSync)('perl', cmd, { cwd: chromiumSysroot }); if (dpkgShlibdepsResult.status !== 0) { throw new Error(`dpkg-shlibdeps failed with exit code ${dpkgShlibdepsResult.status}. stderr:\n${dpkgShlibdepsResult.stderr} `); } @@ -78,11 +79,9 @@ function calculatePackageDeps(binaryPath, arch, sysroot) { // TODO(deepak1556): remove this workaround in favor of computing the // versions from build container for native modules. const filteredDeps = depsStr.split(', ').filter(dependency => { - return !dependency.startsWith('libgcc-s1') && - !dependency.startsWith('libgssapi-krb5-2') && - !dependency.startsWith('libkrb5-3'); + return !dependency.startsWith('libgcc-s1'); }).sort(); const requires = new Set(filteredDeps); return requires; } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FsY3VsYXRlLWRlcHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjYWxjdWxhdGUtZGVwcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyxpREFBMEM7QUFDMUMsMkJBQXlDO0FBQ3pDLDJCQUE0QjtBQUM1Qiw2QkFBOEI7QUFDOUIsc0RBQXNEO0FBQ3RELDJDQUE2QztBQUc3QyxTQUFnQixtQkFBbUIsQ0FBQyxLQUFlLEVBQUUsSUFBc0IsRUFBRSxPQUFlO0lBQzNGLE1BQU0sWUFBWSxHQUFrQixLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsb0JBQW9CLENBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQ2pHLE1BQU0saUJBQWlCLEdBQUcsSUFBSSxHQUFHLENBQUMsMEJBQWMsQ0FBQyxDQUFDO0lBQ2xELFlBQVksQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUNyQyxPQUFPLFlBQVksQ0FBQztBQUNyQixDQUFDO0FBTEQsa0RBS0M7QUFFRCw2SEFBNkg7QUFDN0gsU0FBUyxvQkFBb0IsQ0FBQyxVQUFrQixFQUFFLElBQXNCLEVBQUUsT0FBZTtJQUN4RixJQUFJLENBQUM7UUFDSixJQUFJLENBQUMsQ0FBQyxJQUFBLGFBQVEsRUFBQyxVQUFVLENBQUMsQ0FBQyxJQUFJLEdBQUcsY0FBUyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7WUFDdEQsTUFBTSxJQUFJLEtBQUssQ0FBQyxVQUFVLFVBQVUsdUNBQXVDLENBQUMsQ0FBQztRQUM5RSxDQUFDO0lBQ0YsQ0FBQztJQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7UUFDWiw4REFBOEQ7UUFDOUQsT0FBTyxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsR0FBRyxVQUFVLEdBQUcsY0FBYyxDQUFDLENBQUM7SUFDL0QsQ0FBQztJQUVELHdDQUF3QztJQUN4QyxNQUFNLGdCQUFnQixHQUFHLFNB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 \ No newline at end of file +//# sourceMappingURL=calculate-deps.js.map \ No newline at end of file diff --git a/build/linux/debian/calculate-deps.ts b/build/linux/debian/calculate-deps.ts index a23c41ace24..92f8065f262 100644 --- a/build/linux/debian/calculate-deps.ts +++ b/build/linux/debian/calculate-deps.ts @@ -11,15 +11,15 @@ 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)); +export function generatePackageDeps(files: string[], arch: DebianArchString, chromiumSysroot: string, vscodeSysroot: string): Set[] { + const dependencies: Set[] = files.map(file => calculatePackageDeps(file, arch, chromiumSysroot, vscodeSysroot)); 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 { +function calculatePackageDeps(binaryPath: string, arch: DebianArchString, chromiumSysroot: string, vscodeSysroot: string): Set { try { if (!(statSync(binaryPath).mode & constants.S_IXUSR)) { throw new Error(`Binary ${binaryPath} needs to have an executable bit set.`); @@ -42,22 +42,29 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, sysroo 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`); + cmd.push(`-l${chromiumSysroot}/usr/lib/x86_64-linux-gnu`, + `-l${chromiumSysroot}/lib/x86_64-linux-gnu`, + `-l${vscodeSysroot}/usr/lib/x86_64-linux-gnu`, + `-l${vscodeSysroot}/lib/x86_64-linux-gnu`); break; case 'armhf': - cmd.push(`-l${sysroot}/usr/lib/arm-linux-gnueabihf`, - `-l${sysroot}/lib/arm-linux-gnueabihf`); + cmd.push(`-l${chromiumSysroot}/usr/lib/arm-linux-gnueabihf`, + `-l${chromiumSysroot}/lib/arm-linux-gnueabihf`, + `-l${vscodeSysroot}/usr/lib/arm-linux-gnueabihf`, + `-l${vscodeSysroot}/lib/arm-linux-gnueabihf`); break; case 'arm64': - cmd.push(`-l${sysroot}/usr/lib/aarch64-linux-gnu`, - `-l${sysroot}/lib/aarch64-linux-gnu`); + cmd.push(`-l${chromiumSysroot}/usr/lib/aarch64-linux-gnu`, + `-l${chromiumSysroot}/lib/aarch64-linux-gnu`, + `-l${vscodeSysroot}/usr/lib/aarch64-linux-gnu`, + `-l${vscodeSysroot}/lib/aarch64-linux-gnu`); break; } - cmd.push(`-l${sysroot}/usr/lib`); + cmd.push(`-l${chromiumSysroot}/usr/lib`); + cmd.push(`-L${vscodeSysroot}/debian/libxkbfile1/DEBIAN/shlibs`); cmd.push('-O', '-e', path.resolve(binaryPath)); - const dpkgShlibdepsResult = spawnSync('perl', cmd, { cwd: sysroot }); + const dpkgShlibdepsResult = spawnSync('perl', cmd, { cwd: chromiumSysroot }); if (dpkgShlibdepsResult.status !== 0) { throw new Error(`dpkg-shlibdeps failed with exit code ${dpkgShlibdepsResult.status}. stderr:\n${dpkgShlibdepsResult.stderr} `); } @@ -83,9 +90,7 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, sysroo // TODO(deepak1556): remove this workaround in favor of computing the // versions from build container for native modules. const filteredDeps = depsStr.split(', ').filter(dependency => { - return !dependency.startsWith('libgcc-s1') && - !dependency.startsWith('libgssapi-krb5-2') && - !dependency.startsWith('libkrb5-3'); + 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 index 16e27eedf01..bdb265b6fec 100644 --- a/build/linux/debian/dep-lists.js +++ b/build/linux/debian/dep-lists.js @@ -13,8 +13,6 @@ exports.additionalDeps = [ 'libnss3 (>= 3.26)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', // For Breakpad crash reports. 'xdg-utils (>= 1.0.2)', // OS integration - 'libgssapi-krb5-2', - 'libkrb5-3', ]; // Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/debian/manual_recommends // Dependencies that we can only recommend @@ -33,17 +31,18 @@ exports.referenceGeneratedDepsByArch = { 'libc6 (>= 2.16)', 'libc6 (>= 2.17)', 'libc6 (>= 2.2.5)', + 'libc6 (>= 2.28)', 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', - 'libdbus-1-3 (>= 1.5.12)', + 'libdbus-1-3 (>= 1.9.14)', 'libdrm2 (>= 2.4.75)', - 'libexpat1 (>= 2.0.1)', + 'libexpat1 (>= 2.1~beta3)', 'libgbm1 (>= 17.1.0~rc2)', 'libglib2.0-0 (>= 2.37.3)', - 'libgssapi-krb5-2', + 'libgssapi-krb5-2 (>= 1.17)', 'libgtk-3-0 (>= 3.9.10)', 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', - 'libkrb5-3', + 'libkrb5-3 (>= 1.6.dfsg.2)', 'libnspr4 (>= 2:4.9-2~)', 'libnss3 (>= 2:3.30)', 'libnss3 (>= 3.26)', @@ -55,10 +54,11 @@ exports.referenceGeneratedDepsByArch = { 'libxdamage1 (>= 1:1.1)', 'libxext6', 'libxfixes3', - 'libxkbcommon0 (>= 0.4.1)', - 'libxkbfile1', + 'libxkbcommon0 (>= 0.5.0)', + 'libxkbfile1 (>= 1:1.1.0)', 'libxrandr2', - 'xdg-utils (>= 1.0.2)' + 'xdg-utils (>= 1.0.2)', + 'zlib1g (>= 1:1.2.3.4)' ], 'armhf': [ 'ca-certificates', @@ -66,27 +66,27 @@ exports.referenceGeneratedDepsByArch = { 'libatk-bridge2.0-0 (>= 2.5.3)', 'libatk1.0-0 (>= 2.2.0)', 'libatspi2.0-0 (>= 2.9.90)', - 'libc6 (>= 2.15)', 'libc6 (>= 2.16)', 'libc6 (>= 2.17)', + 'libc6 (>= 2.28)', 'libc6 (>= 2.4)', - 'libc6 (>= 2.8)', 'libc6 (>= 2.9)', 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', - 'libdbus-1-3 (>= 1.5.12)', + 'libdbus-1-3 (>= 1.9.14)', 'libdrm2 (>= 2.4.75)', - 'libexpat1 (>= 2.0.1)', + 'libexpat1 (>= 2.1~beta3)', 'libgbm1 (>= 17.1.0~rc2)', 'libglib2.0-0 (>= 2.37.3)', - 'libgssapi-krb5-2', + 'libgssapi-krb5-2 (>= 1.17)', 'libgtk-3-0 (>= 3.9.10)', 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', - 'libkrb5-3', + 'libkrb5-3 (>= 1.6.dfsg.2)', 'libnspr4 (>= 2:4.9-2~)', 'libnss3 (>= 2:3.30)', 'libnss3 (>= 3.26)', 'libpango-1.0-0 (>= 1.14.0)', + 'libstdc++6 (>= 4.1.1)', 'libstdc++6 (>= 5)', 'libstdc++6 (>= 5.2)', 'libstdc++6 (>= 6)', @@ -97,8 +97,8 @@ exports.referenceGeneratedDepsByArch = { 'libxdamage1 (>= 1:1.1)', 'libxext6', 'libxfixes3', - 'libxkbcommon0 (>= 0.4.1)', - 'libxkbfile1', + 'libxkbcommon0 (>= 0.5.0)', + 'libxkbfile1 (>= 1:1.1.0)', 'libxrandr2', 'xdg-utils (>= 1.0.2)' ], @@ -109,21 +109,23 @@ exports.referenceGeneratedDepsByArch = { 'libatk1.0-0 (>= 2.2.0)', 'libatspi2.0-0 (>= 2.9.90)', 'libc6 (>= 2.17)', + 'libc6 (>= 2.28)', 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', - 'libdbus-1-3 (>= 1.0.2)', + 'libdbus-1-3 (>= 1.9.14)', 'libdrm2 (>= 2.4.75)', - 'libexpat1 (>= 2.0.1)', + 'libexpat1 (>= 2.1~beta3)', 'libgbm1 (>= 17.1.0~rc2)', 'libglib2.0-0 (>= 2.37.3)', - 'libgssapi-krb5-2', + 'libgssapi-krb5-2 (>= 1.17)', 'libgtk-3-0 (>= 3.9.10)', 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', - 'libkrb5-3', + 'libkrb5-3 (>= 1.6.dfsg.2)', 'libnspr4 (>= 2:4.9-2~)', 'libnss3 (>= 2:3.30)', 'libnss3 (>= 3.26)', 'libpango-1.0-0 (>= 1.14.0)', + 'libstdc++6 (>= 4.1.1)', 'libstdc++6 (>= 5)', 'libstdc++6 (>= 5.2)', 'libstdc++6 (>= 6)', @@ -134,10 +136,10 @@ exports.referenceGeneratedDepsByArch = { 'libxdamage1 (>= 1:1.1)', 'libxext6', 'libxfixes3', - 'libxkbcommon0 (>= 0.4.1)', - 'libxkbfile1', + 'libxkbcommon0 (>= 0.5.0)', + 'libxkbfile1 (>= 1:1.1.0)', 'libxrandr2', 'xdg-utils (>= 1.0.2)' ] }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwLWxpc3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZGVwLWxpc3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7O0FBRWhHLGtIQUFrSDtBQUNsSCw0REFBNEQ7QUFDL0MsUUFBQSxjQUFjLEdBQUc7SUFDN0IsaUJBQWlCLEVBQUUseUNBQXlDO0lBQzVELHFDQUFxQztJQUNyQyxtQkFBbUI7SUFDbkIsc0RBQXNELEVBQUUsOEJBQThCO0lBQ3RGLHNCQUFzQixFQUFFLGlCQUFpQjtJQUN6QyxrQkFBa0I7SUFDbEIsV0FBVztDQUNYLENBQUM7QUFFRixvSEFBb0g7QUFDcEgsMENBQTBDO0FBQzFDLDhEQUE4RDtBQUNqRCxRQUFBLGVBQWUsR0FBRztJQUM5QixZQUFZLENBQUMseUVBQXlFO0NBQ3RGLENBQUM7QUFFVyxRQUFBLDRCQUE0QixHQUFHO0lBQzNDLE9BQU8sRUFBRTtRQUNSLGlCQUFpQjtRQUNqQix3QkFBd0I7UUFDeEIsK0JBQStCO1FBQy9CLHdCQUF3QjtRQUN4QiwyQkFBMkI7UUFDM0IsaUJBQWlCO1FBQ2pCLGlCQUFpQjtRQUNqQixpQkFBaUI7UUFDakIsa0JBQWtCO1FBQ2xCLHNCQUFzQjtRQUN0QixzREFBc0Q7UUFDdEQseUJBQXlCO1FBQ3pCLHFCQUFxQjtRQUNyQixzQkFBc0I7UUFDdEIseUJBQXlCO1FBQ3pCLDBCQUEwQjtRQUMxQixrQkFBa0I7UUFDbEIsd0JBQXdCO1FBQ3hCLHFDQUFxQztRQUNyQyxXQUFXO1FBQ1gsd0JBQXdCO1FBQ3hCLHFCQUFxQjtRQUNyQixtQkFBbUI7UUFDbkIsNEJBQTRCO1FBQzVCLFVBQVU7UUFDViwwQkFBMEI7UUFDMUIsb0JBQW9CO1FBQ3BCLCtCQUErQjtRQUMvQix3QkFBd0I7UUFDeEIsVUFBVTtRQUNWLFlBQVk7UUFDWiwwQkFBMEI7UUFDMUIsYUFBYTtRQUNiLFlBQVk7UUFDWixzQkFBc0I7S0FDdEI7SUFDRCxPQUFPLEVBQUU7UUFDUixpQkFBaUI7UUFDakIsd0JBQXdCO1FBQ3hCLCtCQUErQjtRQUMvQix3QkFBd0I7UUFDeEIsMkJBQTJCO1FBQzNCLGlCQUFpQjtRQUNqQixpQkFBaUI7UUFDakIsaUJBQWlCO1FBQ2pCLGdCQUFnQjtRQUNoQixnQkFBZ0I7UUFDaEIsZ0JBQWdCO1FBQ2hCLHNCQUFzQjtRQUN0QixzREFBc0Q7UUFDdEQseUJBQXlCO1FBQ3pCLHFCQUFxQjtRQUNyQixzQkFBc0I7UUFDdEIseUJBQXlCO1FBQ3pCLDBCQUEwQjtRQUMxQixrQkFBa0I7UUFDbEIsd0JBQXdCO1FBQ3hCLHFDQUFxQztRQUNyQyxXQUFXO1FBQ1gsd0JBQXdCO1FBQ3hCLHFCQUFxQjtRQUNyQixtQkFBbUI7UUFDbkIsNEJBQTRCO1FBQzVCLG1CQUFtQjtRQUNuQixxQkFBcUI7UUFDckIsbUJBQW1CO1FBQ25CLFVBQVU7UUFDViwwQkFBMEI7UUFDMUIsb0JBQW9CO1FBQ3BCLCtCQUErQjtRQUMvQix3QkFBd0I7UUFDeEIsVUFBVTtRQUNWLFlBQVk7UUFDWiwwQkFBMEI7UUFDMUIsYUFBYTtRQUNiLFlBQVk7UUFDWixzQkFBc0I7S0FDdEI7SUFDRCxPQUFPLEVBQUU7UUFDUixpQkFBaUI7UUFDakIsd0JBQXdCO1FBQ3hCLCtCQUErQjtRQUMvQix3QkFBd0I7UUFDeEIsMkJBQTJCO1FBQzNCLGlCQUFpQjtRQUNqQixzQkFBc0I7UUFDdEIsc0RBQXNEO1FBQ3RELHdCQUF3QjtRQUN4QixxQkFBcUI7UUFDckIsc0JBQXNCO1FBQ3RCLHlCQUF5QjtRQUN6QiwwQkFBMEI7UUFDMUIsa0JBQWtCO1FBQ2xCLHdCQUF3QjtRQUN4QixxQ0FBcUM7UUFDckMsV0FBVztRQUNYLHdCQUF3QjtRQUN4QixxQkFBcUI7UUFDckIsbUJBQW1CO1FBQ25CLDRCQUE0QjtRQUM1QixtQkFBbUI7UUFDbkIscUJBQXFCO1FBQ3JCLG1CQUFtQjtRQUNuQixVQUFVO1FBQ1YsMEJBQTBCO1FBQzFCLG9CQUFvQjtRQUNwQiwrQkFBK0I7UUFDL0Isd0JBQXdCO1FBQ3hCLFVBQVU7UUFDVixZQUFZO1FBQ1osMEJBQTBCO1FBQzFCLGFBQWE7UUFDYixZQUFZO1FBQ1osc0JBQXNCO0tBQ3RCO0NBQ0QsQ0FBQyJ9 \ No newline at end of file +//# sourceMappingURL=dep-lists.js.map \ No newline at end of file diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts index c430f3b5ec3..3d6c2eba6e9 100644 --- a/build/linux/debian/dep-lists.ts +++ b/build/linux/debian/dep-lists.ts @@ -11,8 +11,6 @@ export const additionalDeps = [ 'libnss3 (>= 3.26)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', // For Breakpad crash reports. 'xdg-utils (>= 1.0.2)', // OS integration - 'libgssapi-krb5-2', - 'libkrb5-3', ]; // Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/debian/manual_recommends @@ -33,17 +31,18 @@ export const referenceGeneratedDepsByArch = { 'libc6 (>= 2.16)', 'libc6 (>= 2.17)', 'libc6 (>= 2.2.5)', + 'libc6 (>= 2.28)', 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', - 'libdbus-1-3 (>= 1.5.12)', + 'libdbus-1-3 (>= 1.9.14)', 'libdrm2 (>= 2.4.75)', - 'libexpat1 (>= 2.0.1)', + 'libexpat1 (>= 2.1~beta3)', 'libgbm1 (>= 17.1.0~rc2)', 'libglib2.0-0 (>= 2.37.3)', - 'libgssapi-krb5-2', + 'libgssapi-krb5-2 (>= 1.17)', 'libgtk-3-0 (>= 3.9.10)', 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', - 'libkrb5-3', + 'libkrb5-3 (>= 1.6.dfsg.2)', 'libnspr4 (>= 2:4.9-2~)', 'libnss3 (>= 2:3.30)', 'libnss3 (>= 3.26)', @@ -55,10 +54,11 @@ export const referenceGeneratedDepsByArch = { 'libxdamage1 (>= 1:1.1)', 'libxext6', 'libxfixes3', - 'libxkbcommon0 (>= 0.4.1)', - 'libxkbfile1', + 'libxkbcommon0 (>= 0.5.0)', + 'libxkbfile1 (>= 1:1.1.0)', 'libxrandr2', - 'xdg-utils (>= 1.0.2)' + 'xdg-utils (>= 1.0.2)', + 'zlib1g (>= 1:1.2.3.4)' ], 'armhf': [ 'ca-certificates', @@ -66,27 +66,27 @@ export const referenceGeneratedDepsByArch = { 'libatk-bridge2.0-0 (>= 2.5.3)', 'libatk1.0-0 (>= 2.2.0)', 'libatspi2.0-0 (>= 2.9.90)', - 'libc6 (>= 2.15)', 'libc6 (>= 2.16)', 'libc6 (>= 2.17)', + 'libc6 (>= 2.28)', 'libc6 (>= 2.4)', - 'libc6 (>= 2.8)', 'libc6 (>= 2.9)', 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', - 'libdbus-1-3 (>= 1.5.12)', + 'libdbus-1-3 (>= 1.9.14)', 'libdrm2 (>= 2.4.75)', - 'libexpat1 (>= 2.0.1)', + 'libexpat1 (>= 2.1~beta3)', 'libgbm1 (>= 17.1.0~rc2)', 'libglib2.0-0 (>= 2.37.3)', - 'libgssapi-krb5-2', + 'libgssapi-krb5-2 (>= 1.17)', 'libgtk-3-0 (>= 3.9.10)', 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', - 'libkrb5-3', + 'libkrb5-3 (>= 1.6.dfsg.2)', 'libnspr4 (>= 2:4.9-2~)', 'libnss3 (>= 2:3.30)', 'libnss3 (>= 3.26)', 'libpango-1.0-0 (>= 1.14.0)', + 'libstdc++6 (>= 4.1.1)', 'libstdc++6 (>= 5)', 'libstdc++6 (>= 5.2)', 'libstdc++6 (>= 6)', @@ -97,8 +97,8 @@ export const referenceGeneratedDepsByArch = { 'libxdamage1 (>= 1:1.1)', 'libxext6', 'libxfixes3', - 'libxkbcommon0 (>= 0.4.1)', - 'libxkbfile1', + 'libxkbcommon0 (>= 0.5.0)', + 'libxkbfile1 (>= 1:1.1.0)', 'libxrandr2', 'xdg-utils (>= 1.0.2)' ], @@ -109,21 +109,23 @@ export const referenceGeneratedDepsByArch = { 'libatk1.0-0 (>= 2.2.0)', 'libatspi2.0-0 (>= 2.9.90)', 'libc6 (>= 2.17)', + 'libc6 (>= 2.28)', 'libcairo2 (>= 1.6.0)', 'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', - 'libdbus-1-3 (>= 1.0.2)', + 'libdbus-1-3 (>= 1.9.14)', 'libdrm2 (>= 2.4.75)', - 'libexpat1 (>= 2.0.1)', + 'libexpat1 (>= 2.1~beta3)', 'libgbm1 (>= 17.1.0~rc2)', 'libglib2.0-0 (>= 2.37.3)', - 'libgssapi-krb5-2', + 'libgssapi-krb5-2 (>= 1.17)', 'libgtk-3-0 (>= 3.9.10)', 'libgtk-3-0 (>= 3.9.10) | libgtk-4-1', - 'libkrb5-3', + 'libkrb5-3 (>= 1.6.dfsg.2)', 'libnspr4 (>= 2:4.9-2~)', 'libnss3 (>= 2:3.30)', 'libnss3 (>= 3.26)', 'libpango-1.0-0 (>= 1.14.0)', + 'libstdc++6 (>= 4.1.1)', 'libstdc++6 (>= 5)', 'libstdc++6 (>= 5.2)', 'libstdc++6 (>= 6)', @@ -134,8 +136,8 @@ export const referenceGeneratedDepsByArch = { 'libxdamage1 (>= 1:1.1)', 'libxext6', 'libxfixes3', - 'libxkbcommon0 (>= 0.4.1)', - 'libxkbfile1', + 'libxkbcommon0 (>= 0.5.0)', + 'libxkbfile1 (>= 1:1.1.0)', 'libxrandr2', 'xdg-utils (>= 1.0.2)' ] diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js index d7a6ece5492..40ca42efe78 100644 --- a/build/linux/debian/install-sysroot.js +++ b/build/linux/debian/install-sysroot.js @@ -4,18 +4,37 @@ * 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; +exports.getChromiumSysroot = exports.getVSCodeSysroot = 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"); +const crypto_1 = require("crypto"); +const ansiColors = require("ansi-colors"); // 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'; +const REPO_ROOT = path.dirname(path.dirname(path.dirname(__dirname))); +const ghApiHeaders = { + Accept: 'application/vnd.github.v3+json', + 'User-Agent': 'VSCode Build', +}; +if (process.env.GITHUB_TOKEN) { + ghApiHeaders.Authorization = 'Basic ' + Buffer.from(process.env.GITHUB_TOKEN).toString('base64'); +} +const ghDownloadHeaders = { + ...ghApiHeaders, + Accept: 'application/octet-stream', +}; +function getElectronVersion() { + const yarnrc = fs.readFileSync(path.join(REPO_ROOT, '.yarnrc'), 'utf8'); + const electronVersion = /^target "(.*)"$/m.exec(yarnrc)[1]; + const msBuildId = /^ms_build_id "(.*)"$/m.exec(yarnrc)[1]; + return { electronVersion, msBuildId }; +} function getSha(filename) { + // CodeQL [SM04514] Hash logic cannot be changed due to external dependency, also the code is only used during build. const hash = (0, crypto_1.createHash)('sha1'); // Read file 1 MB at a time const fd = fs.openSync(filename, 'r'); @@ -29,15 +48,122 @@ function getSha(filename) { 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().electronVersion}/script/sysroots.json`; +function getVSCodeSysrootChecksum(expectedName) { + const checksums = fs.readFileSync(path.join(REPO_ROOT, 'build', 'checksums', 'vscode-sysroot.txt'), 'utf8'); + for (const line of checksums.split('\n')) { + const [checksum, name] = line.split(/\s+/); + if (name === expectedName) { + return checksum; + } + } + return undefined; +} +/* + * Do not use the fetch implementation from build/lib/fetch as it relies on vinyl streams + * and vinyl-fs breaks the symlinks in the compiler toolchain sysroot. We use the native + * tar implementation for that reason. + */ +async function fetchUrl(options, retries = 10, retryDelay = 1000) { + try { + const controller = new AbortController(); + const timeout = setTimeout(() => controller.abort(), 30 * 1000); + const version = '20231122-245579'; + try { + const response = await fetch(`https://api.github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, { + headers: ghApiHeaders, + signal: controller.signal /* Typings issue with lib.dom.d.ts */ + }); + if (response.ok && (response.status >= 200 && response.status < 300)) { + console.log(`Fetch completed: Status ${response.status}.`); + const contents = Buffer.from(await response.arrayBuffer()); + const asset = JSON.parse(contents.toString()).assets.find((a) => a.name === options.assetName); + if (!asset) { + throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`); + } + console.log(`Found asset ${options.assetName} @ ${asset.url}.`); + const assetResponse = await fetch(asset.url, { + headers: ghDownloadHeaders + }); + if (assetResponse.ok && (assetResponse.status >= 200 && assetResponse.status < 300)) { + const assetContents = Buffer.from(await assetResponse.arrayBuffer()); + console.log(`Fetched response body buffer: ${ansiColors.magenta(`${assetContents.byteLength} bytes`)}`); + if (options.checksumSha256) { + const actualSHA256Checksum = (0, crypto_1.createHash)('sha256').update(assetContents).digest('hex'); + if (actualSHA256Checksum !== options.checksumSha256) { + throw new Error(`Checksum mismatch for ${ansiColors.cyan(asset.url)} (expected ${options.checksumSha256}, actual ${actualSHA256Checksum}))`); + } + } + console.log(`Verified SHA256 checksums match for ${ansiColors.cyan(asset.url)}`); + const tarCommand = `tar -xz -C ${options.dest}`; + (0, child_process_1.execSync)(tarCommand, { input: assetContents }); + console.log(`Fetch complete!`); + return; + } + throw new Error(`Request ${ansiColors.magenta(asset.url)} failed with status code: ${assetResponse.status}`); + } + throw new Error(`Request ${ansiColors.magenta('https://api.github.com')} failed with status code: ${response.status}`); + } + finally { + clearTimeout(timeout); + } + } + catch (e) { + if (retries > 0) { + console.log(`Fetching failed: ${e}`); + await new Promise(resolve => setTimeout(resolve, retryDelay)); + return fetchUrl(options, retries - 1, retryDelay); + } + throw e; + } +} +async function getVSCodeSysroot(arch) { + let expectedName; + let triple; + switch (arch) { + case 'amd64': + expectedName = `x86_64-linux-gnu.tar.gz`; + triple = 'x86_64-linux-gnu'; + break; + case 'arm64': + expectedName = `aarch64-linux-gnu.tar.gz`; + triple = 'aarch64-linux-gnu'; + break; + case 'armhf': + expectedName = `arm-rpi-linux-gnueabihf.tar.gz`; + triple = 'arm-rpi-linux-gnueabihf'; + break; + } + const checksumSha256 = getVSCodeSysrootChecksum(expectedName); + if (!checksumSha256) { + throw new Error(`Could not find checksum for ${expectedName}`); + } + const sysroot = process.env['VSCODE_SYSROOT_DIR'] ?? path.join((0, os_1.tmpdir)(), `vscode-${arch}-sysroot`); + const stamp = path.join(sysroot, '.stamp'); + const result = `${sysroot}/${triple}/${triple}/sysroot`; + if (fs.existsSync(stamp) && fs.readFileSync(stamp).toString() === expectedName) { + return result; + } + console.log(`Installing ${arch} root image: ${sysroot}`); + fs.rmSync(sysroot, { recursive: true, force: true }); + fs.mkdirSync(sysroot); + await fetchUrl({ + checksumSha256, + assetName: expectedName, + dest: sysroot + }); + fs.writeFileSync(stamp, expectedName); + return result; +} +exports.getVSCodeSysroot = getVSCodeSysroot; +async function getChromiumSysroot(arch) { + const sysrootJSONUrl = `https://raw.githubusercontent.com/electron/electron/v${getElectronVersion().electronVersion}/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 sysrootArch = `bullseye_${arch}`; const sysrootDict = sysrootInfo[sysrootArch]; const tarballFilename = sysrootDict['Tarball']; const tarballSha = sysrootDict['Sha1Sum']; @@ -86,5 +212,5 @@ async function getSysroot(arch) { fs.writeFileSync(stamp, url); return sysroot; } -exports.getSysroot = getSysroot; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdGFsbC1zeXNyb290LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaW5zdGFsbC1zeXNyb290LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7O0FBRWhHLGlEQUEwQztBQUMxQyxtQ0FBb0M7QUFDcEMsMkJBQTRCO0FBQzVCLHlCQUF5QjtBQUN6QiwrQkFBK0I7QUFDL0IsNkJBQTZCO0FBRTdCLHVDQUF1QztBQUV2QyxvSEFBb0g7QUFDcEgsTUFBTSxVQUFVLEdBQUcsNENBQTRDLENBQUM7QUFDaEUsTUFBTSxRQUFRLEdBQUcsb0JBQW9CLENBQUM7QUFFdEMsU0FBUyxNQUFNLENBQUMsUUFBcUI7SUFDcEMsTUFBTSxJQUFJLEdBQUcsSUFBQSxtQkFBVSxFQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ2hDLDJCQUEyQjtJQUMzQixNQUFNLEVBQUUsR0FBRyxFQUFFLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUN0QyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsQ0FBQztJQUN6QyxJQUFJLFFBQVEsR0FBRyxDQUFDLENBQUM7SUFDakIsSUFBSSxTQUFTLEdBQUcsQ0FBQyxDQUFDO0lBQ2xCLE9BQU8sQ0FBQyxTQUFTLEdBQUcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUUsTUFBTSxFQUFFLENBQUMsRUFBRSxNQUFNLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxDQUFDLEtBQUssTUFBTSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQzVGLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDcEIsUUFBUSxJQUFJLFNBQVMsQ0FBQztJQUN2QixDQUFDO0lBQ0QsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDO0lBQ3hDLE9BQU8sSUFBSSxDQUFD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 \ No newline at end of file +exports.getChromiumSysroot = getChromiumSysroot; +//# sourceMappingURL=install-sysroot.js.map \ No newline at end of file diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts index 49eb4a67127..37ea883d9bc 100644 --- a/build/linux/debian/install-sysroot.ts +++ b/build/linux/debian/install-sysroot.ts @@ -3,20 +3,49 @@ * 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 { spawnSync, execSync } from 'child_process'; import { tmpdir } from 'os'; import * as fs from 'fs'; import * as https from 'https'; import * as path from 'path'; +import { createHash } from 'crypto'; import { DebianArchString } from './types'; -import * as util from '../../lib/util'; +import * as ansiColors from 'ansi-colors'; // 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'; +const REPO_ROOT = path.dirname(path.dirname(path.dirname(__dirname))); + +const ghApiHeaders: Record = { + Accept: 'application/vnd.github.v3+json', + 'User-Agent': 'VSCode Build', +}; + +if (process.env.GITHUB_TOKEN) { + ghApiHeaders.Authorization = 'Basic ' + Buffer.from(process.env.GITHUB_TOKEN).toString('base64'); +} + +const ghDownloadHeaders = { + ...ghApiHeaders, + Accept: 'application/octet-stream', +}; + +interface IFetchOptions { + assetName: string; + checksumSha256?: string; + dest: string; +} + +function getElectronVersion(): Record { + const yarnrc = fs.readFileSync(path.join(REPO_ROOT, '.yarnrc'), 'utf8'); + const electronVersion = /^target "(.*)"$/m.exec(yarnrc)![1]; + const msBuildId = /^ms_build_id "(.*)"$/m.exec(yarnrc)![1]; + return { electronVersion, msBuildId }; +} function getSha(filename: fs.PathLike): string { + // CodeQL [SM04514] Hash logic cannot be changed due to external dependency, also the code is only used during build. const hash = createHash('sha1'); // Read file 1 MB at a time const fd = fs.openSync(filename, 'r'); @@ -31,21 +60,128 @@ function getSha(filename: fs.PathLike): string { return hash.digest('hex'); } +function getVSCodeSysrootChecksum(expectedName: string) { + const checksums = fs.readFileSync(path.join(REPO_ROOT, 'build', 'checksums', 'vscode-sysroot.txt'), 'utf8'); + for (const line of checksums.split('\n')) { + const [checksum, name] = line.split(/\s+/); + if (name === expectedName) { + return checksum; + } + } + return undefined; +} + +/* + * Do not use the fetch implementation from build/lib/fetch as it relies on vinyl streams + * and vinyl-fs breaks the symlinks in the compiler toolchain sysroot. We use the native + * tar implementation for that reason. + */ +async function fetchUrl(options: IFetchOptions, retries = 10, retryDelay = 1000): Promise { + try { + const controller = new AbortController(); + const timeout = setTimeout(() => controller.abort(), 30 * 1000); + const version = '20231122-245579'; + try { + const response = await fetch(`https://api.github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, { + headers: ghApiHeaders, + signal: controller.signal as any /* Typings issue with lib.dom.d.ts */ + }); + if (response.ok && (response.status >= 200 && response.status < 300)) { + console.log(`Fetch completed: Status ${response.status}.`); + const contents = Buffer.from(await response.arrayBuffer()); + const asset = JSON.parse(contents.toString()).assets.find((a: { name: string }) => a.name === options.assetName); + if (!asset) { + throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`); + } + console.log(`Found asset ${options.assetName} @ ${asset.url}.`); + const assetResponse = await fetch(asset.url, { + headers: ghDownloadHeaders + }); + if (assetResponse.ok && (assetResponse.status >= 200 && assetResponse.status < 300)) { + const assetContents = Buffer.from(await assetResponse.arrayBuffer()); + console.log(`Fetched response body buffer: ${ansiColors.magenta(`${(assetContents as Buffer).byteLength} bytes`)}`); + if (options.checksumSha256) { + const actualSHA256Checksum = createHash('sha256').update(assetContents).digest('hex'); + if (actualSHA256Checksum !== options.checksumSha256) { + throw new Error(`Checksum mismatch for ${ansiColors.cyan(asset.url)} (expected ${options.checksumSha256}, actual ${actualSHA256Checksum}))`); + } + } + console.log(`Verified SHA256 checksums match for ${ansiColors.cyan(asset.url)}`); + const tarCommand = `tar -xz -C ${options.dest}`; + execSync(tarCommand, { input: assetContents }); + console.log(`Fetch complete!`); + return; + } + throw new Error(`Request ${ansiColors.magenta(asset.url)} failed with status code: ${assetResponse.status}`); + } + throw new Error(`Request ${ansiColors.magenta('https://api.github.com')} failed with status code: ${response.status}`); + } finally { + clearTimeout(timeout); + } + } catch (e) { + if (retries > 0) { + console.log(`Fetching failed: ${e}`); + await new Promise(resolve => setTimeout(resolve, retryDelay)); + return fetchUrl(options, retries - 1, retryDelay); + } + throw e; + } +} + 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().electronVersion}/script/sysroots.json`; +export async function getVSCodeSysroot(arch: DebianArchString): Promise { + let expectedName: string; + let triple: string; + switch (arch) { + case 'amd64': + expectedName = `x86_64-linux-gnu.tar.gz`; + triple = 'x86_64-linux-gnu'; + break; + case 'arm64': + expectedName = `aarch64-linux-gnu.tar.gz`; + triple = 'aarch64-linux-gnu'; + break; + case 'armhf': + expectedName = `arm-rpi-linux-gnueabihf.tar.gz`; + triple = 'arm-rpi-linux-gnueabihf'; + break; + } + const checksumSha256 = getVSCodeSysrootChecksum(expectedName); + if (!checksumSha256) { + throw new Error(`Could not find checksum for ${expectedName}`); + } + const sysroot = process.env['VSCODE_SYSROOT_DIR'] ?? path.join(tmpdir(), `vscode-${arch}-sysroot`); + const stamp = path.join(sysroot, '.stamp'); + const result = `${sysroot}/${triple}/${triple}/sysroot`; + if (fs.existsSync(stamp) && fs.readFileSync(stamp).toString() === expectedName) { + return result; + } + console.log(`Installing ${arch} root image: ${sysroot}`); + fs.rmSync(sysroot, { recursive: true, force: true }); + fs.mkdirSync(sysroot); + await fetchUrl({ + checksumSha256, + assetName: expectedName, + dest: sysroot + }); + fs.writeFileSync(stamp, expectedName); + return result; +} + +export async function getChromiumSysroot(arch: DebianArchString): Promise { + const sysrootJSONUrl = `https://raw.githubusercontent.com/electron/electron/v${getElectronVersion().electronVersion}/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 sysrootArch = `bullseye_${arch}`; const sysrootDict: SysrootDictEntry = sysrootInfo[sysrootArch]; const tarballFilename = sysrootDict['Tarball']; const tarballSha = sysrootDict['Sha1Sum']; diff --git a/build/linux/debian/types.js b/build/linux/debian/types.js index 74fefea37ca..2cd177c34a8 100644 --- a/build/linux/debian/types.js +++ b/build/linux/debian/types.js @@ -9,4 +9,4 @@ function isDebianArchString(s) { return ['amd64', 'armhf', 'arm64'].includes(s); } exports.isDebianArchString = isDebianArchString; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUloRyxTQUFnQixrQkFBa0IsQ0FBQyxDQUFTO0lBQzNDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNoRCxDQUFDO0FBRkQsZ0RBRUMifQ== \ No newline at end of file +//# sourceMappingURL=types.js.map \ No newline at end of file diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js index d262dbcd46b..e40ed70901c 100644 --- a/build/linux/dependencies-generator.js +++ b/build/linux/dependencies-generator.js @@ -7,12 +7,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.getDependencies = void 0; const child_process_1 = require("child_process"); const path = require("path"); +const install_sysroot_1 = require("./debian/install-sysroot"); 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"); +const product = require("../../product.json"); // 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 @@ -21,7 +23,7 @@ const types_2 = require("./rpm/types"); // 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; -// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/114.0.5735.199:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/118.0.5993.159:chrome/installer/linux/BUILD.gn;l=64-80 // and the Linux Archive build // Shared library dependencies that we already bundle. const bundledDeps = [ @@ -31,14 +33,11 @@ const bundledDeps = [ 'libvk_swiftshader.so', 'libffmpeg.so' ]; -function getDependencies(packageType, buildDir, applicationName, arch, sysroot) { +async function getDependencies(packageType, buildDir, applicationName, arch) { 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); @@ -51,16 +50,26 @@ function getDependencies(packageType, buildDir, applicationName, arch, sysroot) console.error(findResult.stderr.toString()); return []; } - const files = findResult.stdout.toString().trimEnd().split('\n'); const appPath = path.join(buildDir, applicationName); + // Add the native modules + const files = findResult.stdout.toString().trimEnd().split('\n'); + // Add the tunnel binary. + files.push(path.join(buildDir, 'bin', product.tunnelApplicationName)); + // Add the main executable. files.push(appPath); // Add chrome sandbox and crashpad handler. files.push(path.join(buildDir, 'chrome-sandbox')); files.push(path.join(buildDir, 'chrome_crashpad_handler')); // Generate the dependencies. - const dependencies = packageType === 'deb' ? - (0, calculate_deps_1.generatePackageDeps)(files, arch, sysroot) : - (0, calculate_deps_2.generatePackageDeps)(files); + let dependencies; + if (packageType === 'deb') { + const chromiumSysroot = await (0, install_sysroot_1.getChromiumSysroot)(arch); + const vscodeSysroot = await (0, install_sysroot_1.getVSCodeSysroot)(arch); + dependencies = (0, calculate_deps_1.generatePackageDeps)(files, arch, chromiumSysroot, vscodeSysroot); + } + else { + dependencies = (0, calculate_deps_2.generatePackageDeps)(files); + } // Merge all the dependencies. const mergedDependencies = mergePackageDeps(dependencies); // Exclude bundled dependencies and sort @@ -97,4 +106,4 @@ function mergePackageDeps(inputDeps) { } return requires; } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwZW5kZW5jaWVzLWdlbmVyYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImRlcGVuZGVuY2llcy1nZW5lcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7OztnR0FHZ0c7QUFFaEcsWUFBWSxDQUFDOzs7QUFFYixpREFBMEM7QUFDMUMsNkJBQThCO0FBQzlCLDREQUEyRjtBQUMzRix5REFBcUY7QUFDckYsa0RBQXlGO0FBQ3pGLCtDQUFtRjtBQUNuRiwwQ0FBc0U7QUFDdEUsdUNBQTZEO0FBRTdELHFDQUFxQztBQUNyQyxxRUFBcUU7QUFDckUsMkRBQTJEO0FBQzNELHlEQUF5RDtBQUN6RCxtRkFBbUY7QUFDbkYsZ0ZBQWdGO0FBQ2hGLGlDQUFpQztBQUNqQyxNQUFNLCtCQUErQixHQUFZLElBQUksQ0FBQztBQUV0RCxnSUFBZ0k7QUFDaEksOEJBQThCO0FBQzlCLHNEQUFzRDtBQUN0RCxNQUFNLFdBQVcsR0FBRztJQUNuQixXQUFXO0lBQ1gsY0FBYztJQUNkLGdCQUFnQjtJQUNoQixzQkFBc0I7SUFDdEIsY0FBYztDQUNkLENBQUM7QUFFRixTQUFnQixlQUFlLENBQUMsV0FBMEIsRUFBRSxRQUFnQixFQUFFLGVBQXVCLEVBQUUsSUFBWSxFQUFFLE9BQWdCO0lBQ3BJLElBQUksV0FBVyxLQUFLLEtBQUssRUFBRSxDQUFDO1FBQzNCLElBQUksQ0FBQyxJQUFBLDBCQUFrQixFQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDL0IsTUFBTSxJQUFJLEtBQUssQ0FBQyw2QkFBNkIsR0FBRyxJQUFJLENBQUMsQ0FBQztRQUN2RCxDQUFDO1FBQ0QsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2QsTUFBTSxJQUFJLEtBQUssQ0FBQywyQkFBMkIsQ0FBQyxDQUFDO1FBQzlDLENBQUM7SUFDRixDQUFDO0lBQ0QsSUFBSSxXQUFXLEtBQUssS0FBSyxJQUFJLENBQUMsSUFBQSx1QkFBZSxFQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7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 \ No newline at end of file +//# sourceMappingURL=dependencies-generator.js.map \ No newline at end of file diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts index 5c4b9d240dc..12bc3c08a64 100644 --- a/build/linux/dependencies-generator.ts +++ b/build/linux/dependencies-generator.ts @@ -7,12 +7,14 @@ import { spawnSync } from 'child_process'; import path = require('path'); +import { getChromiumSysroot, getVSCodeSysroot } from './debian/install-sysroot'; 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'; +import product = require('../../product.json'); // A flag that can easily be toggled. // Make sure to compile the build directory after toggling the value. @@ -23,7 +25,7 @@ import { isRpmArchString, RpmArchString } from './rpm/types'; // are valid, are in dep-lists.ts const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true; -// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/114.0.5735.199:chrome/installer/linux/BUILD.gn;l=64-80 +// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/118.0.5993.159:chrome/installer/linux/BUILD.gn;l=64-80 // and the Linux Archive build // Shared library dependencies that we already bundle. const bundledDeps = [ @@ -34,14 +36,11 @@ const bundledDeps = [ 'libffmpeg.so' ]; -export function getDependencies(packageType: 'deb' | 'rpm', buildDir: string, applicationName: string, arch: string, sysroot?: string): string[] { +export async function getDependencies(packageType: 'deb' | 'rpm', buildDir: string, applicationName: string, arch: string): Promise { 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); @@ -56,19 +55,26 @@ export function getDependencies(packageType: 'deb' | 'rpm', buildDir: string, ap return []; } - const files = findResult.stdout.toString().trimEnd().split('\n'); - const appPath = path.join(buildDir, applicationName); + // Add the native modules + const files = findResult.stdout.toString().trimEnd().split('\n'); + // Add the tunnel binary. + files.push(path.join(buildDir, 'bin', product.tunnelApplicationName)); + // Add the main executable. files.push(appPath); - // Add chrome sandbox and crashpad handler. files.push(path.join(buildDir, 'chrome-sandbox')); files.push(path.join(buildDir, 'chrome_crashpad_handler')); // Generate the dependencies. - const dependencies = packageType === 'deb' ? - generatePackageDepsDebian(files, arch as DebianArchString, sysroot!) : - generatePackageDepsRpm(files); + let dependencies: Set[]; + if (packageType === 'deb') { + const chromiumSysroot = await getChromiumSysroot(arch as DebianArchString); + const vscodeSysroot = await getVSCodeSysroot(arch as DebianArchString); + dependencies = generatePackageDepsDebian(files, arch as DebianArchString, chromiumSysroot, vscodeSysroot); + } else { + dependencies = generatePackageDepsRpm(files); + } // Merge all the dependencies. const mergedDependencies = mergePackageDeps(dependencies); diff --git a/build/linux/libcxx-fetcher.js b/build/linux/libcxx-fetcher.js index 9af7907c3eb..1e195ba1fac 100644 --- a/build/linux/libcxx-fetcher.js +++ b/build/linux/libcxx-fetcher.js @@ -68,4 +68,4 @@ if (require.main === module) { process.exit(1); }); } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGliY3h4LWZldGNoZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJsaWJjeHgtZmV0Y2hlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRywwRkFBMEY7QUFFMUYseUJBQXlCO0FBQ3pCLDZCQUE2QjtBQUM3QiwrQkFBK0I7QUFDL0IsdUNBQXVDO0FBQ3ZDLHVDQUFpRDtBQUVqRCxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztBQUVuRCxNQUFNLENBQUMsR0FBRyxLQUFLLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztBQUUzQixLQUFLLFVBQVUscUJBQXFCLENBQUMsTUFBYyxFQUFFLGVBQXVCLEVBQUUsUUFBZ0I7SUFDcEcsSUFBSSxNQUFNLEVBQUUsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQzFELE9BQU87SUFDUixDQUFDO0lBQ0QsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDO1FBQ2xDLE1BQU0sRUFBRSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBRUQsQ0FBQyxDQUFDLGVBQWUsUUFBUSxVQUFVLENBQUMsQ0FBQztJQUNyQyxNQUFNLE9BQU8sR0FBRyxNQUFNLElBQUEsc0JBQWdCLEVBQUM7UUFDdEMsT0FBTyxFQUFFLGVBQWU7UUFDeEIsU0FBUyxFQUFFLElBQUk7UUFDZixZQUFZLEVBQUUsR0FBRyxRQUFRLGNBQWM7S0FDdkMsQ0FBQyxDQUFDO0lBRUgsQ0FBQyxDQUFDLGFBQWEsUUFBUSxpQkFBaUIsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUNuRCxNQUFNLE9BQU8sQ0FBQyxPQUFPLEVB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 \ No newline at end of file +//# sourceMappingURL=libcxx-fetcher.js.map \ No newline at end of file diff --git a/build/linux/rpm/calculate-deps.js b/build/linux/rpm/calculate-deps.js index a068da1573f..ac870e4a546 100644 --- a/build/linux/rpm/calculate-deps.js +++ b/build/linux/rpm/calculate-deps.js @@ -33,4 +33,4 @@ function calculatePackageDeps(binaryPath) { const requires = new Set(findRequiresResult.stdout.toString('utf-8').trimEnd().split('\n')); return requires; } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FsY3VsYXRlLWRlcHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjYWxjdWxhdGUtZGVwcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyxpREFBMEM7QUFDMUMsMkJBQXlDO0FBQ3pDLDJDQUE2QztBQUU3QyxTQUFnQixtQkFBbUIsQ0FBQyxLQUFlO0lBQ2xELE1BQU0sWUFBWSxHQUFrQixLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsb0JBQW9CLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUNsRixNQUFNLGlCQUFpQixHQUFHLElBQUksR0FBRyxDQUFDLDBCQUFjLENBQUMsQ0FBQztJQUNsRCxZQUFZLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDckMsT0FBTyxZQUFZLENBQUM7QUFDckIsQ0FBQztBQUxELGtEQUtDO0FBRUQsMEhBQTBIO0FBQzFILFNBQVMsb0JBQW9CLENBQUMsVUFBa0I7SUFDL0MsSUFBSSxDQUFDO1FBQ0osSUFBSSxDQUFDLENBQUMsSUFBQSxhQUFRLEVBQUMsVUFBVSxDQUFDLENBQUMsSUFBSSxHQUFHLGNBQVMsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1lBQ3RELE1BQU0sSUFBSSxLQUFLLENBQUMsVUFBVSxVQUFVLHVDQUF1QyxDQUFDLENBQUM7UUFDOUUsQ0FBQztJQUNGLENBQUM7SUFBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1FBQ1osOERBQThEO1FBQzlELE9BQU8sQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEdBQUcsVUFBVSxHQUFHLGNBQWMsQ0FBQyxDQUFDO0lBQy9ELENBQUM7SUFFRCxNQUFNLGtCQUFrQixHQUFHLElBQUEseUJBQVMsRUFBQyw0QkFBNEIsRUFBRSxFQUFFLEtBQUssRUFBRSxVQUFVLEdBQUcsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUNqRyxJQUFJLGtCQUFrQixDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUNyQyxNQUFNLElBQUksS0FBSyxDQUFDLHVDQUF1QyxrQkFBa0IsQ0FBQyxNQUFNLGNBQWMsa0JBQWtCLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUM1SCxDQUFDO0lBRUQsTUFBTSxRQUFRLEdBQUcsSUFBSSxHQUFHLENBQUMsa0JBQWtCLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUM1RixPQUFPLFFBQVEsQ0FBQztBQUNqQixDQUFDIn0= \ No newline at end of file +//# sourceMappingURL=calculate-deps.js.map \ No newline at end of file diff --git a/build/linux/rpm/dep-lists.js b/build/linux/rpm/dep-lists.js index c97574a083b..e824f19c177 100644 --- a/build/linux/rpm/dep-lists.js +++ b/build/linux/rpm/dep-lists.js @@ -42,7 +42,11 @@ exports.referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.15)(64bit)', 'libc.so.6(GLIBC_2.16)(64bit)', 'libc.so.6(GLIBC_2.17)(64bit)', + 'libc.so.6(GLIBC_2.18)(64bit)', 'libc.so.6(GLIBC_2.2.5)(64bit)', + 'libc.so.6(GLIBC_2.25)(64bit)', + 'libc.so.6(GLIBC_2.27)(64bit)', + 'libc.so.6(GLIBC_2.28)(64bit)', 'libc.so.6(GLIBC_2.3)(64bit)', 'libc.so.6(GLIBC_2.3.2)(64bit)', 'libc.so.6(GLIBC_2.3.3)(64bit)', @@ -55,6 +59,7 @@ exports.referenceGeneratedDepsByArch = { 'libcairo.so.2()(64bit)', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3()(64bit)', + 'libdbus-1.so.3(LIBDBUS_1_3)(64bit)', 'libdl.so.2()(64bit)', 'libdl.so.2(GLIBC_2.2.5)(64bit)', 'libdrm.so.2()(64bit)', @@ -62,6 +67,8 @@ exports.referenceGeneratedDepsByArch = { 'libgbm.so.1()(64bit)', 'libgcc_s.so.1()(64bit)', 'libgcc_s.so.1(GCC_3.0)(64bit)', + 'libgcc_s.so.1(GCC_3.3)(64bit)', + 'libgcc_s.so.1(GCC_4.2.0)(64bit)', 'libgio-2.0.so.0()(64bit)', 'libglib-2.0.so.0()(64bit)', 'libgobject-2.0.so.0()(64bit)', @@ -104,7 +111,10 @@ exports.referenceGeneratedDepsByArch = { 'libutil.so.1(GLIBC_2.2.5)(64bit)', 'libxcb.so.1()(64bit)', 'libxkbcommon.so.0()(64bit)', + 'libxkbcommon.so.0(V_0.5.0)(64bit)', 'libxkbfile.so.1()(64bit)', + 'libz.so.1()(64bit)', + 'libz.so.1(ZLIB_1.2.3.4)(64bit)', 'rpmlib(FileDigests) <= 4.6.0-1', 'rtld(GNU_HASH)', 'xdg-utils' @@ -131,6 +141,10 @@ exports.referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.15)', 'libc.so.6(GLIBC_2.16)', 'libc.so.6(GLIBC_2.17)', + 'libc.so.6(GLIBC_2.18)', + 'libc.so.6(GLIBC_2.25)', + 'libc.so.6(GLIBC_2.27)', + 'libc.so.6(GLIBC_2.28)', 'libc.so.6(GLIBC_2.4)', 'libc.so.6(GLIBC_2.6)', 'libc.so.6(GLIBC_2.7)', @@ -139,6 +153,7 @@ exports.referenceGeneratedDepsByArch = { 'libcairo.so.2', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3', + 'libdbus-1.so.3(LIBDBUS_1_3)', 'libdl.so.2', 'libdl.so.2(GLIBC_2.4)', 'libdrm.so.2', @@ -147,6 +162,7 @@ exports.referenceGeneratedDepsByArch = { 'libgcc_s.so.1', 'libgcc_s.so.1(GCC_3.0)', 'libgcc_s.so.1(GCC_3.5)', + 'libgcc_s.so.1(GCC_4.3.0)', 'libgio-2.0.so.0', 'libglib-2.0.so.0', 'libgobject-2.0.so.0', @@ -205,6 +221,7 @@ exports.referenceGeneratedDepsByArch = { 'libutil.so.1(GLIBC_2.4)', 'libxcb.so.1', 'libxkbcommon.so.0', + 'libxkbcommon.so.0(V_0.5.0)', 'libxkbfile.so.1', 'rpmlib(FileDigests) <= 4.6.0-1', 'rtld(GNU_HASH)', @@ -228,6 +245,10 @@ exports.referenceGeneratedDepsByArch = { 'libatspi.so.0()(64bit)', 'libc.so.6()(64bit)', 'libc.so.6(GLIBC_2.17)(64bit)', + 'libc.so.6(GLIBC_2.18)(64bit)', + 'libc.so.6(GLIBC_2.25)(64bit)', + 'libc.so.6(GLIBC_2.27)(64bit)', + 'libc.so.6(GLIBC_2.28)(64bit)', 'libcairo.so.2()(64bit)', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3()(64bit)', @@ -239,6 +260,7 @@ exports.referenceGeneratedDepsByArch = { 'libgbm.so.1()(64bit)', 'libgcc_s.so.1()(64bit)', 'libgcc_s.so.1(GCC_3.0)(64bit)', + 'libgcc_s.so.1(GCC_3.3)(64bit)', 'libgcc_s.so.1(GCC_4.2.0)(64bit)', 'libgcc_s.so.1(GCC_4.5.0)(64bit)', 'libgio-2.0.so.0()(64bit)', @@ -302,4 +324,4 @@ exports.referenceGeneratedDepsByArch = { 'xdg-utils' ] }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwLWxpc3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZGVwLWxpc3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7O2dHQUdnRzs7O0FBRWhHLCtHQUErRztBQUMvRywrREFBK0Q7QUFDbEQsUUFBQSxjQUFjLEdBQUc7SUFDN0IsaUJBQWlCLEVBQUUseUNBQXlDO0lBQzVELHdCQUF3QjtJQUN4Qiw2QkFBNkI7SUFDN0IsNkJBQTZCO0lBQzdCLGdDQUFnQztJQUNoQyx5QkFBeUI7SUFDekIsdUJBQXVCO0lBQ3ZCLFdBQVcsQ0FBQyxpQkFBaUI7Q0FDN0IsQ0FBQztBQUVXLFFBQUEsNEJBQTRCLEdBQUc7SUFDM0MsUUFBUSxFQUFFO1FBQ1QsaUJBQWlCO1FBQ2pCLCtCQUErQjtRQUMvQiwwQ0FBMEM7UUFDMUMsd0NBQXdDO1FBQ3hDLHNCQUFzQjtRQUN0Qiw2QkFBNkI7UUFDN0IsMEJBQTBCO1FBQzFCLHVCQUF1QjtRQUN2Qix5QkFBeUI7UUFDekIseUJBQXlCO1FBQ3pCLHlCQUF5QjtRQUN6QixpQ0FBaUM7UUFDakMsc0NBQXNDO1FBQ3RDLDBCQUEwQjtRQUMxQixpQ0FBaUM7UUFDakMsd0JBQXdCO1FBQ3hCLG9CQUFvQjtRQUNwQiw4QkFBOEI7UUFDOUIsOEJBQThCO1FBQzlCLDhCQUE4QjtRQUM5Qiw4QkFBOEI7UUFDOUIsOEJBQThCO1FBQzlCLDhCQUE4QjtRQUM5QiwrQkFBK0I7UUFDL0IsNkJBQTZCO1FBQzdCLCtCQUErQjtRQUMvQiwrQkFBK0I7UUFDL0IsK0JBQStCO1FBQy9CLDZCQUE2QjtRQUM3Qiw2QkFBNkI7UUFDN0IsNkJBQTZCO1FBQzdCLDZCQUE2QjtRQUM3Qiw2QkFBNkI7UUFDN0Isd0JBQXdCO1FBQ3hCLHVCQUF1QjtRQUN2Qix5QkFBeUI7UUFDekIscUJBQXFCO1FBQ3JCLGdDQUFnQztRQUNoQyxzQkFBc0I7UUFDdEIsd0JBQXdCO1FBQ3hCLHNCQUFzQjtRQUN0Qix3QkFBd0I7UUFDeEIsK0JBQStCO1FB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 \ No newline at end of file +//# sourceMappingURL=dep-lists.js.map \ No newline at end of file diff --git a/build/linux/rpm/dep-lists.ts b/build/linux/rpm/dep-lists.ts index 2a30ba9d640..1c38df695db 100644 --- a/build/linux/rpm/dep-lists.ts +++ b/build/linux/rpm/dep-lists.ts @@ -41,7 +41,11 @@ export const referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.15)(64bit)', 'libc.so.6(GLIBC_2.16)(64bit)', 'libc.so.6(GLIBC_2.17)(64bit)', + 'libc.so.6(GLIBC_2.18)(64bit)', 'libc.so.6(GLIBC_2.2.5)(64bit)', + 'libc.so.6(GLIBC_2.25)(64bit)', + 'libc.so.6(GLIBC_2.27)(64bit)', + 'libc.so.6(GLIBC_2.28)(64bit)', 'libc.so.6(GLIBC_2.3)(64bit)', 'libc.so.6(GLIBC_2.3.2)(64bit)', 'libc.so.6(GLIBC_2.3.3)(64bit)', @@ -54,6 +58,7 @@ export const referenceGeneratedDepsByArch = { 'libcairo.so.2()(64bit)', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3()(64bit)', + 'libdbus-1.so.3(LIBDBUS_1_3)(64bit)', 'libdl.so.2()(64bit)', 'libdl.so.2(GLIBC_2.2.5)(64bit)', 'libdrm.so.2()(64bit)', @@ -61,6 +66,8 @@ export const referenceGeneratedDepsByArch = { 'libgbm.so.1()(64bit)', 'libgcc_s.so.1()(64bit)', 'libgcc_s.so.1(GCC_3.0)(64bit)', + 'libgcc_s.so.1(GCC_3.3)(64bit)', + 'libgcc_s.so.1(GCC_4.2.0)(64bit)', 'libgio-2.0.so.0()(64bit)', 'libglib-2.0.so.0()(64bit)', 'libgobject-2.0.so.0()(64bit)', @@ -103,7 +110,10 @@ export const referenceGeneratedDepsByArch = { 'libutil.so.1(GLIBC_2.2.5)(64bit)', 'libxcb.so.1()(64bit)', 'libxkbcommon.so.0()(64bit)', + 'libxkbcommon.so.0(V_0.5.0)(64bit)', 'libxkbfile.so.1()(64bit)', + 'libz.so.1()(64bit)', + 'libz.so.1(ZLIB_1.2.3.4)(64bit)', 'rpmlib(FileDigests) <= 4.6.0-1', 'rtld(GNU_HASH)', 'xdg-utils' @@ -130,6 +140,10 @@ export const referenceGeneratedDepsByArch = { 'libc.so.6(GLIBC_2.15)', 'libc.so.6(GLIBC_2.16)', 'libc.so.6(GLIBC_2.17)', + 'libc.so.6(GLIBC_2.18)', + 'libc.so.6(GLIBC_2.25)', + 'libc.so.6(GLIBC_2.27)', + 'libc.so.6(GLIBC_2.28)', 'libc.so.6(GLIBC_2.4)', 'libc.so.6(GLIBC_2.6)', 'libc.so.6(GLIBC_2.7)', @@ -138,6 +152,7 @@ export const referenceGeneratedDepsByArch = { 'libcairo.so.2', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3', + 'libdbus-1.so.3(LIBDBUS_1_3)', 'libdl.so.2', 'libdl.so.2(GLIBC_2.4)', 'libdrm.so.2', @@ -146,6 +161,7 @@ export const referenceGeneratedDepsByArch = { 'libgcc_s.so.1', 'libgcc_s.so.1(GCC_3.0)', 'libgcc_s.so.1(GCC_3.5)', + 'libgcc_s.so.1(GCC_4.3.0)', 'libgio-2.0.so.0', 'libglib-2.0.so.0', 'libgobject-2.0.so.0', @@ -204,6 +220,7 @@ export const referenceGeneratedDepsByArch = { 'libutil.so.1(GLIBC_2.4)', 'libxcb.so.1', 'libxkbcommon.so.0', + 'libxkbcommon.so.0(V_0.5.0)', 'libxkbfile.so.1', 'rpmlib(FileDigests) <= 4.6.0-1', 'rtld(GNU_HASH)', @@ -227,6 +244,10 @@ export const referenceGeneratedDepsByArch = { 'libatspi.so.0()(64bit)', 'libc.so.6()(64bit)', 'libc.so.6(GLIBC_2.17)(64bit)', + 'libc.so.6(GLIBC_2.18)(64bit)', + 'libc.so.6(GLIBC_2.25)(64bit)', + 'libc.so.6(GLIBC_2.27)(64bit)', + 'libc.so.6(GLIBC_2.28)(64bit)', 'libcairo.so.2()(64bit)', 'libcurl.so.4()(64bit)', 'libdbus-1.so.3()(64bit)', @@ -238,6 +259,7 @@ export const referenceGeneratedDepsByArch = { 'libgbm.so.1()(64bit)', 'libgcc_s.so.1()(64bit)', 'libgcc_s.so.1(GCC_3.0)(64bit)', + 'libgcc_s.so.1(GCC_3.3)(64bit)', 'libgcc_s.so.1(GCC_4.2.0)(64bit)', 'libgcc_s.so.1(GCC_4.5.0)(64bit)', 'libgio-2.0.so.0()(64bit)', diff --git a/build/linux/rpm/types.js b/build/linux/rpm/types.js index 9c29bad18d8..6dba7cf38d1 100644 --- a/build/linux/rpm/types.js +++ b/build/linux/rpm/types.js @@ -9,4 +9,4 @@ function isRpmArchString(s) { return ['x86_64', 'armv7hl', 'aarch64'].includes(s); } exports.isRpmArchString = isRpmArchString; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUloRyxTQUFnQixlQUFlLENBQUMsQ0FBUztJQUN4QyxPQUFPLENBQUMsUUFBUSxFQUFFLFNBQVMsRUFBRSxTQUFTLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDckQsQ0FBQztBQUZELDBDQUVDIn0= \ No newline at end of file +//# sourceMappingURL=types.js.map \ No newline at end of file diff --git a/build/monaco/monaco.webpack.config.js b/build/monaco/monaco.webpack.config.js deleted file mode 100644 index 9e075aad2aa..00000000000 --- a/build/monaco/monaco.webpack.config.js +++ /dev/null @@ -1,43 +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'); - -module.exports = { - mode: 'production', - entry: { - 'core': './build/monaco/esm.core.js', - 'editor.worker': './out-monaco-editor-core/esm/vs/editor/editor.worker.js' - }, - output: { - globalObject: 'self', - filename: '[name].bundle.js', - path: path.resolve(__dirname, 'dist') - }, - module: { - rules: [{ - test: /\.css$/, - use: ['style-loader', 'css-loader'] - }, { - test: /\.ttf$/, - use: ['file-loader'] - }] - }, - resolve: { - alias: { - 'monaco-editor-core': path.resolve(__dirname, '../../out-monaco-editor-core/esm/vs/editor/editor.main.js'), - } - }, - stats: { - all: false, - modules: true, - errors: true, - warnings: true, - // our additional options - moduleTrace: true, - errorDetails: true, - chunks: true - } -}; diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js index 07b4412c458..cce0f460378 100644 --- a/build/npm/postinstall.js +++ b/build/npm/postinstall.js @@ -85,22 +85,27 @@ for (let dir of dirs) { continue; } + let opts; + if (dir === 'build') { + const env = { ...process.env }; setupBuildYarnrc(); - yarnInstall('build'); + opts = { env }; + if (process.env['CC']) { env['CC'] = 'gcc'; } + if (process.env['CXX']) { env['CXX'] = 'g++'; } + if (process.env['CXXFLAGS']) { env['CXXFLAGS'] = ''; } + if (process.env['LDFLAGS']) { env['LDFLAGS'] = ''; } + yarnInstall('build', opts); continue; } - let opts; - if (/^(.build\/distro\/npm\/)?remote$/.test(dir)) { // node modules used by vscode server const env = { ...process.env }; if (process.env['VSCODE_REMOTE_CC']) { env['CC'] = process.env['VSCODE_REMOTE_CC']; } if (process.env['VSCODE_REMOTE_CXX']) { env['CXX'] = process.env['VSCODE_REMOTE_CXX']; } - if (process.env['CXXFLAGS']) { delete env['CXXFLAGS']; } - if (process.env['CFLAGS']) { delete env['CFLAGS']; } - if (process.env['LDFLAGS']) { delete env['LDFLAGS']; } + if (process.env['VSCODE_REMOTE_CXXFLAGS']) { env['CXXFLAGS'] = process.env['VSCODE_REMOTE_CXXFLAGS']; } + if (process.env['VSCODE_REMOTE_LDFLAGS']) { env['LDFLAGS'] = process.env['VSCODE_REMOTE_LDFLAGS']; } if (process.env['VSCODE_REMOTE_NODE_GYP']) { env['npm_config_node_gyp'] = process.env['VSCODE_REMOTE_NODE_GYP']; } opts = { env }; diff --git a/build/npm/preinstall.js b/build/npm/preinstall.js index b6a0a746780..edf0d98c3d5 100644 --- a/build/npm/preinstall.js +++ b/build/npm/preinstall.js @@ -11,11 +11,11 @@ const patchNodeVersion = parseInt(nodeVersion[3]); if (!process.env['VSCODE_SKIP_NODE_VERSION_CHECK']) { if (majorNodeVersion < 18 || (majorNodeVersion === 18 && minorNodeVersion < 15)) { - console.error('\033[1;31m*** Please use node.js versions >=18.15.x and <19.\033[0;0m'); + console.error('\x1b[1;31m*** Please use node.js versions >=18.15.x and <19.\x1b[0;0m'); err = true; } if (majorNodeVersion >= 19) { - console.warn('\033[1;31m*** Warning: Versions of node.js >= 19 have not been tested.\033[0;0m') + console.warn('\x1b[1;31m*** Warning: Versions of node.js >= 19 have not been tested.\x1b[0;0m') } } @@ -35,18 +35,18 @@ if ( ) || majorYarnVersion >= 2 ) { - console.error('\033[1;31m*** Please use yarn >=1.10.1 and <2.\033[0;0m'); + console.error('\x1b[1;31m*** Please use yarn >=1.10.1 and <2.\x1b[0;0m'); err = true; } if (!/yarn[\w-.]*\.c?js$|yarnpkg$/.test(process.env['npm_execpath'])) { - console.error('\033[1;31m*** Please use yarn to install dependencies.\033[0;0m'); + console.error('\x1b[1;31m*** Please use yarn to install dependencies.\x1b[0;0m'); err = true; } if (process.platform === 'win32') { if (!hasSupportedVisualStudioVersion()) { - console.error('\033[1;31m*** Invalid C/C++ Compiler Toolchain. Please check https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites.\033[0;0m'); + console.error('\x1b[1;31m*** Invalid C/C++ Compiler Toolchain. Please check https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites.\x1b[0;0m'); err = true; } if (!err) { diff --git a/build/package.json b/build/package.json index ca6b448b393..a06baecbdeb 100644 --- a/build/package.json +++ b/build/package.json @@ -3,9 +3,9 @@ "version": "1.0.0", "license": "MIT", "devDependencies": { - "@azure/cosmos": "^3.17.3", - "@azure/identity": "^3.1.3", - "@azure/storage-blob": "^12.13.0", + "@azure/cosmos": "^3", + "@azure/identity": "^3.4.1", + "@azure/storage-blob": "^12.17.0", "@electron/get": "^1.12.4", "@types/ansi-colors": "^3.2.0", "@types/byline": "^4.2.32", @@ -50,13 +50,13 @@ "jsonc-parser": "^2.3.0", "mime": "^1.4.1", "mkdirp": "^1.0.4", - "node-fetch": "2", "source-map": "0.6.1", "ternary-stream": "^3.0.0", "through2": "^4.0.2", "tmp": "^0.2.1", "vscode-universal-bundler": "^0.0.2", - "workerpool": "^6.4.0" + "workerpool": "^6.4.0", + "yauzl": "^2.10.0" }, "scripts": { "compile": "../node_modules/.bin/tsc -p tsconfig.build.json", diff --git a/build/tsconfig.json b/build/tsconfig.json index b195f7bae4e..ce7a493a7aa 100644 --- a/build/tsconfig.json +++ b/build/tsconfig.json @@ -8,8 +8,7 @@ "alwaysStrict": true, "removeComments": false, "preserveConstEnums": true, - "sourceMap": false, - "inlineSourceMap": true, + "sourceMap": true, "resolveJsonModule": true, // enable JavaScript type checking for the language service // use the tsconfig.build.json for compiling which disable JavaScript diff --git a/build/win32/explorer-appx-fetcher.js b/build/win32/explorer-appx-fetcher.js index ffc6c24b7dd..d618c21674a 100644 --- a/build/win32/explorer-appx-fetcher.js +++ b/build/win32/explorer-appx-fetcher.js @@ -51,4 +51,4 @@ if (require.main === module) { process.exit(1); }); } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhwbG9yZXItYXBweC1mZXRjaGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZXhwbG9yZXItYXBweC1mZXRjaGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Z0dBR2dHO0FBRWhHLFlBQVksQ0FBQzs7O0FBRWIseUJBQXlCO0FBQ3pCLCtCQUErQjtBQUMvQix1Q0FBdUM7QUFDdkMsNkJBQTZCO0FBQzdCLHVDQUFpRDtBQUVqRCxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztBQUVuRCxNQUFNLENBQUMsR0FBRyxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQztBQUVsQyxLQUFLLFVBQVUsb0JBQW9CLENBQUMsTUFBYyxFQUFFLFVBQWtCLFFBQVEsRUFBRSxhQUFxQixLQUFLO0lBQ2hILE1BQU0sY0FBYyxHQUFHLE9BQU8sS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDO0lBQ3hFLE1BQU0sUUFBUSxHQUFHLEdBQUcsY0FBYyxhQUFhLFVBQVUsTUFBTSxDQUFDO0lBRWhFLElBQUksTUFBTSxFQUFFLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLGVBQWUsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUNoRSxPQUFPO0lBQ1IsQ0FBQztJQUVELElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztRQUNsQyxNQUFNLEVBQUUsQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7SUFDakQsQ0FBQztJQUVELENBQUMsQ0FBQyxlQUFlLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDN0IsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFBLHNCQUFnQixFQUFDO1FBQ3ZDLFNBQVMsRUFBRSxJQUFJO1FBQ2YsT0FBTyxFQUFFLE9BQU87UUFDaEIsWUFBWSxFQUFFLFFBQVE7UUFDdEIsd0JBQXdCLEVBQUUsSUFBSTtRQUM5QixhQUFhLEVBQUU7WUFDZCxNQUFNLEVBQUUseUVBQXlFO1lBQ2pGLFNBQVMsRUFBRSxPQUFPO1lBQ2xCLGNBQWMsRUFBRSxRQUFRO1NBQ3hCO0tBQ0QsQ0FBQyxDQUFDO0lBRUgsQ0FBQyxDQUFDLGtCQUFrQixRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBQ2hDLE1BQU0sT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFLEdBQUcsRUFBRSxFQUFFLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQztBQUMzRCxDQUFDO0FBM0JELG9EQTJCQztBQUVELEtBQUssVUFBVSxJQUFJLENBQUMsU0FBa0I7SUFDckMsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUV4QyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7UUFDaEIsTUFBTSxJQUFJLEtBQUssQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO0lBQy9DLENBQUM7SUFFRCxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQztJQUNyRixNQUFNLG9CQUFvQixDQUFDLFNBQVMsRUFBRyxPQUFlLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFDO0FBQ3ZFLENBQUM7QUFFRCxJQUFJLE9BQU8sQ0FBQyxJQUFJLEtBQUssTUFBTSxFQUFFLENBQUM7SUFDN0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUU7UUFDakMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNuQixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2pCLENBQUMsQ0FBQyxDQUFDO0FBQ0osQ0FBQyJ9 \ No newline at end of file +//# sourceMappingURL=explorer-appx-fetcher.js.map \ No newline at end of file diff --git a/build/yarn.lock b/build/yarn.lock index f3dd7803415..c7d9bb3a37b 100644 --- a/build/yarn.lock +++ b/build/yarn.lock @@ -22,6 +22,15 @@ "@azure/abort-controller" "^1.0.0" tslib "^2.2.0" +"@azure/core-auth@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.5.0.tgz#a41848c5c31cb3b7c84c409885267d55a2c92e44" + integrity sha512-udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw== + dependencies: + "@azure/abort-controller" "^1.0.0" + "@azure/core-util" "^1.1.0" + tslib "^2.2.0" + "@azure/core-client@^1.4.0": version "1.5.0" resolved "https://registry.yarnpkg.com/@azure/core-client/-/core-client-1.5.0.tgz#7aabb87d20e08db3683a117191c844bc19adb74e" @@ -117,7 +126,15 @@ dependencies: tslib "^2.2.0" -"@azure/core-util@^1.0.0", "@azure/core-util@^1.1.1": +"@azure/core-util@^1.1.0", "@azure/core-util@^1.6.1": + version "1.6.1" + resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.6.1.tgz#fea221c4fa43c26543bccf799beb30c1c7878f5a" + integrity sha512-h5taHeySlsV9qxuK64KZxy4iln1BtMYlNt5jbuEFN3UFSAd1EwKg/Gjl5a6tZ/W8t6li3xPnutOx7zbDyXnPmQ== + dependencies: + "@azure/abort-controller" "^1.0.0" + tslib "^2.2.0" + +"@azure/core-util@^1.1.1": version "1.2.0" resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.2.0.tgz#3499deba1fc36dda6f1912b791809b6f15d4a392" integrity sha512-ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng== @@ -125,7 +142,7 @@ "@azure/abort-controller" "^1.0.0" tslib "^2.2.0" -"@azure/cosmos@^3.17.3": +"@azure/cosmos@^3": version "3.17.3" resolved "https://registry.yarnpkg.com/@azure/cosmos/-/cosmos-3.17.3.tgz#380398496af8ef3473ae0a9ad8cdbab32d91eb08" integrity sha512-wBglkQ6Irjv5Vo2iw8fd6eYj60WYRSSg4/0DBkeOP6BwQ4RA91znsOHd6s3qG6UAbNgYuzC9Nnq07vlFFZkHEw== @@ -144,27 +161,25 @@ universal-user-agent "^6.0.0" uuid "^8.3.0" -"@azure/identity@^3.1.3": - version "3.1.3" - resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-3.1.3.tgz#667a635b305d9d519e5c91cea5ba3390d0d2c198" - integrity sha512-y0jFjSfHsVPwXSwi3KaSPtOZtJZqhiqAhWUXfFYBUd/+twUBovZRXspBwLrF5rJe0r5NyvmScpQjL+TYDTQVvw== +"@azure/identity@^3.4.1": + version "3.4.1" + resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-3.4.1.tgz#18ba48b7421c818ef8116e8eec3c03ec1a62649a" + integrity sha512-oQ/r5MBdfZTMIUcY5Ch8G7Vv9aIXDkEYyU4Dfqjim4MQN+LY2uiQ57P1JDopMLeHCsZxM4yy8lEdne3tM9Xhzg== dependencies: "@azure/abort-controller" "^1.0.0" - "@azure/core-auth" "^1.3.0" + "@azure/core-auth" "^1.5.0" "@azure/core-client" "^1.4.0" "@azure/core-rest-pipeline" "^1.1.0" "@azure/core-tracing" "^1.0.0" - "@azure/core-util" "^1.0.0" + "@azure/core-util" "^1.6.1" "@azure/logger" "^1.0.0" - "@azure/msal-browser" "^2.32.2" - "@azure/msal-common" "^9.0.2" - "@azure/msal-node" "^1.14.6" + "@azure/msal-browser" "^3.5.0" + "@azure/msal-node" "^2.5.1" events "^3.0.0" jws "^4.0.0" open "^8.0.0" stoppable "^1.1.0" tslib "^2.2.0" - uuid "^8.3.0" "@azure/logger@^1.0.0": version "1.0.1" @@ -173,36 +188,31 @@ dependencies: tslib "^2.0.0" -"@azure/msal-browser@^2.32.2": - version "2.35.0" - resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-2.35.0.tgz#39b553f5da140d5d16bf90e0d92f1bcc6f0d61d3" - integrity sha512-L+gSBbJfU3H81Bnj+VIVjO7jRpt2Ex+4i2YVOPE50ykfQ5W9mtBFMRCHb1K+8FzTeyQH/KkQv6bC+MdaU+3LEw== +"@azure/msal-browser@^3.5.0": + version "3.5.0" + resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-3.5.0.tgz#eb64c931c78c2b75c70807f618e1284bbb183380" + integrity sha512-2NtMuel4CI3UEelCPKkNRXgKzpWEX48fvxIvPz7s0/sTcCaI08r05IOkH2GkXW+czUOtuY6+oGafJCpumnjRLg== dependencies: - "@azure/msal-common" "^12.0.0" + "@azure/msal-common" "14.4.0" -"@azure/msal-common@^12.0.0": - version "12.0.0" - resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-12.0.0.tgz#bcb41fd31657a34c4218ec38332de76ec6bf03e6" - integrity sha512-SvQl4JWy1yZnxyq0xng/urf103wz68UJG0K9Dq2NM2to7ePA+R1hMisKnXELJvZrEGYANGbh/Hc0T9piGqOteQ== +"@azure/msal-common@14.4.0": + version "14.4.0" + resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-14.4.0.tgz#f938c1d96bb73d65baab985c96faaa273c97cfd5" + integrity sha512-ffCymScQuMKVj+YVfwNI52A5Tu+uiZO2eTf+c+3TXxdAssks4nokJhtr+uOOMxH0zDi6d1OjFKFKeXODK0YLSg== -"@azure/msal-common@^9.0.2": - version "9.1.1" - resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-9.1.1.tgz#906d27905c956fe91bd8f31855fc624359098d83" - integrity sha512-we9xR8lvu47fF0h+J8KyXoRy9+G/fPzm3QEa2TrdR3jaVS3LKAyE2qyMuUkNdbVkvzl8Zr9f7l+IUSP22HeqXw== - -"@azure/msal-node@^1.14.6": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-1.17.0.tgz#fa7bba155719a7e26ac6e8d4941dd56e807e458a" - integrity sha512-aOKykKxDc+Kf5vcdOUPdKlJ96YAIyrHyl4W8RyfMqw0iApDckOuhejNwlZr6/M7U40wo1Wj4PwxRVx7d8OFBFg== +"@azure/msal-node@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-2.5.1.tgz#d180a1ba5fdc611a318a8f018a2db3453e2e2898" + integrity sha512-PsPRISqCG253HQk1cAS7eJW7NWTbnBGpG+vcGGz5z4JYRdnM2EIXlj1aBpXCdozenEPtXEVvHn2ELleW1w82nQ== dependencies: - "@azure/msal-common" "^12.0.0" + "@azure/msal-common" "14.4.0" jsonwebtoken "^9.0.0" uuid "^8.3.0" -"@azure/storage-blob@^12.13.0": - version "12.13.0" - resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.13.0.tgz#9209cbb5c2cd463fb967a0f2ae144ace20879160" - integrity sha512-t3Q2lvBMJucgTjQcP5+hvEJMAsJSk0qmAnjDLie2td017IiduZbbC9BOcFfmwzR6y6cJdZOuewLCNFmEx9IrXA== +"@azure/storage-blob@^12.17.0": + version "12.17.0" + resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.17.0.tgz#04aad7f59cb08dbbe5b1b672a9f5b6256c8c9006" + integrity sha512-sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-http" "^3.0.0" @@ -554,9 +564,11 @@ integrity sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ== "@types/node@18.x": - version "18.15.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469" - integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q== + version "18.18.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.9.tgz#5527ea1832db3bba8eb8023ce8497b7d3f299592" + integrity sha512-0f5klcuImLnG4Qreu9hPj/rEfFq6YRc5n2mAjSsH+ec/mJL+3voBH0+8T7o8RpFjH7ovc+TRsL/c7OYIQsPTfQ== + dependencies: + undici-types "~5.26.4" "@types/pump@^1.0.1": version "1.0.1" @@ -1709,7 +1721,7 @@ is-extendable@^1.0.1: is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-glob@^4.0.1: version "4.0.1" @@ -2066,13 +2078,6 @@ node-addon-api@^4.3.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== -node-fetch@2: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== - dependencies: - whatwg-url "^5.0.0" - node-fetch@^2.6.7: version "2.6.9" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" @@ -2196,7 +2201,7 @@ picomatch@^2.2.1: pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= + integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== pify@^3.0.0: version "3.0.0" @@ -2597,7 +2602,7 @@ through2@^4.0.2: through@^2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== time-stamp@^1.0.0: version "1.1.0" @@ -2694,6 +2699,11 @@ underscore@^1.12.1: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441" integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A== +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== + universal-user-agent@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee" diff --git a/cglicenses.json b/cglicenses.json index 006eaf1f968..a5b108d4f79 100644 --- a/cglicenses.json +++ b/cglicenses.json @@ -308,25 +308,6 @@ "CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." ] }, - { // Reason: Missing license file - "name": "emitter-listener", - "fullLicenseText": [ - "This software is released under the BSD-2-Clause license:", - "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 HOLDER 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: Missing license file "name": "const_format_proc_macros", "fullLicenseTextUri": "https://raw.githubusercontent.com/rodrimati1992/const_format_crates/b2207af46bfbd9f1a6bd12dbffd10feeea3d9fd7/LICENSE-ZLIB.md" diff --git a/cgmanifest.json b/cgmanifest.json index 1610dea5d34..505453b1a6d 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "chromium", "repositoryUrl": "https://chromium.googlesource.com/chromium/src", - "commitHash": "88c0a3606e1a856ad43651130d27bb880e1833d6" + "commitHash": "b1f5594cf472956192e71c38ebfc22472d44a03d" } }, "licenseDetail": [ @@ -40,7 +40,7 @@ "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ], "isOnlyProductionDependency": true, - "version": "114.0.5735.289" + "version": "118.0.5993.159" }, { "component": { @@ -48,7 +48,7 @@ "git": { "name": "ffmpeg", "repositoryUrl": "https://chromium.googlesource.com/chromium/third_party/ffmpeg", - "commitHash": "8d21d41d8bec5c0b266ee305d1a708dc5c23b594" + "commitHash": "0ba37733400593b162e5ae9ff26b384cff49c250" } }, "isOnlyProductionDependency": true, @@ -516,11 +516,11 @@ "git": { "name": "nodejs", "repositoryUrl": "https://github.com/nodejs/node", - "commitHash": "a94966ffc114e831d4a917a97f9958d3385ab6f7" + "commitHash": "2e414d5d1082233c3516fca923fe351d5186c80e" } }, "isOnlyProductionDependency": true, - "version": "18.15.0" + "version": "18.17.1" }, { "component": { @@ -528,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "468c4af6611c88762b7ba6c4400c5022895457c2" + "commitHash": "d449c890159beae4d5176138dc65ab22d37e0fee" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "25.9.2" + "version": "27.1.3" }, { "component": { diff --git a/cli/Cargo.lock b/cli/Cargo.lock index 7b66ef0b266..632ec0af176 100644 --- a/cli/Cargo.lock +++ b/cli/Cargo.lock @@ -207,6 +207,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + [[package]] name = "block-buffer" version = "0.10.3" @@ -308,7 +314,7 @@ checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" dependencies = [ "anstream", "anstyle", - "bitflags", + "bitflags 1.3.2", "clap_lex", "strsim", ] @@ -1238,7 +1244,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f27bb67f6dd1d0bb5ab582868e4f65052e58da6401188a08f0da09cf512b84b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", ] @@ -1336,7 +1342,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset", @@ -1463,11 +1469,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -1495,9 +1501,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" dependencies = [ "cc", "libc", @@ -1783,7 +1789,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1792,7 +1798,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1891,7 +1897,7 @@ version = "0.37.1" source = "git+https://github.com/microsoft/vscode-russh?branch=main#6a15199c784c0b6d171a6fec09ed730a5cd1350d" dependencies = [ "async-trait", - "bitflags", + "bitflags 1.3.2", "byteorder", "digest", "flate2", @@ -1956,7 +1962,7 @@ version = "0.37.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -2014,7 +2020,7 @@ version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -2232,7 +2238,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "system-configuration-sys", ] diff --git a/cli/src/commands/args.rs b/cli/src/commands/args.rs index ce1bf513e90..0272f63e73c 100644 --- a/cli/src/commands/args.rs +++ b/cli/src/commands/args.rs @@ -223,7 +223,7 @@ pub struct CommandShellArgs { #[clap(long, num_args = 0..=1, default_missing_value = "0")] pub on_port: Option, /// Require the given token string to be given in the handshake. - #[clap(long)] + #[clap(long, env = "VSCODE_CLI_REQUIRE_TOKEN")] pub require_token: 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)] diff --git a/cli/src/commands/tunnels.rs b/cli/src/commands/tunnels.rs index 7bc1618499b..f9ae6883075 100644 --- a/cli/src/commands/tunnels.rs +++ b/cli/src/commands/tunnels.rs @@ -533,7 +533,7 @@ async fn serve_with_csa( { vec.push(ShutdownRequest::ParentProcessKilled(p)); } - let shutdown = ShutdownRequest::create_rx(vec); + let mut shutdown = ShutdownRequest::create_rx(vec); let server = loop { if shutdown.is_open() { @@ -576,12 +576,10 @@ async fn serve_with_csa( { dt.start_existing_tunnel(t).await } else { - dt.start_new_launcher_tunnel( - gateway_args.name.as_deref(), - gateway_args.random_name, - &[CONTROL_PORT], - ) - .await + tokio::select! { + t = dt.start_new_launcher_tunnel(gateway_args.name.as_deref(), gateway_args.random_name, &[CONTROL_PORT]) => t, + _ = shutdown.wait() => return Ok(1), + } }?; csa.connection_token = Some(get_connection_token(&tunnel)); diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs index d8cbd1b91dd..dfb68c48afe 100644 --- a/cli/src/util/prereqs.rs +++ b/cli/src/util/prereqs.rs @@ -20,8 +20,8 @@ lazy_static! { static ref GENERIC_VERSION_RE: Regex = Regex::new(r"^([0-9]+)\.([0-9]+)$").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); + static ref MIN_CXX_VERSION: SimpleSemver = SimpleSemver::new(3, 4, 25); + static ref MIN_LDD_VERSION: SimpleSemver = SimpleSemver::new(2, 28, 0); } const NIXOS_TEST_PATH: &str = "/etc/NIXOS"; diff --git a/extensions/configuration-editing/src/configurationEditingMain.ts b/extensions/configuration-editing/src/configurationEditingMain.ts index acbd032dee2..30e7fd45370 100644 --- a/extensions/configuration-editing/src/configurationEditingMain.ts +++ b/extensions/configuration-editing/src/configurationEditingMain.ts @@ -54,6 +54,7 @@ function registerVariableCompletions(pattern: string): vscode.Disposable { return [ { label: 'workspaceFolder', detail: vscode.l10n.t("The path of the folder opened in VS Code") }, { label: 'workspaceFolderBasename', detail: vscode.l10n.t("The name of the folder opened in VS Code without any slashes (/)") }, + { label: 'fileWorkspaceFolderBasename', detail: vscode.l10n.t("The current opened file workspace folder name without any slashes (/)") }, { label: 'relativeFile', detail: vscode.l10n.t("The current opened file relative to ${workspaceFolder}") }, { label: 'relativeFileDirname', detail: vscode.l10n.t("The current opened file's dirname relative to ${workspaceFolder}") }, { label: 'file', detail: vscode.l10n.t("The current opened file") }, @@ -65,7 +66,7 @@ function registerVariableCompletions(pattern: string): vscode.Disposable { { label: 'fileBasename', detail: vscode.l10n.t("The current opened file's basename") }, { label: 'fileBasenameNoExtension', detail: vscode.l10n.t("The current opened file's basename with no file extension") }, { label: 'defaultBuildTask', detail: vscode.l10n.t("The name of the default build task. If there is not a single default build task then a quick pick is shown to choose the build task.") }, - { label: 'pathSeparator', detail: vscode.l10n.t("The character used by the operating system to separate components in file paths") }, + { label: 'pathSeparator', detail: vscode.l10n.t("The character used by the operating system to separate components in file paths. Is also aliased to '/'.") }, { label: 'extensionInstallFolder', detail: vscode.l10n.t("The path where an an extension is installed."), param: 'publisher.extension' }, ].map(variable => ({ label: `\${${variable.label}}`, diff --git a/extensions/csharp/cgmanifest.json b/extensions/csharp/cgmanifest.json index ad27f27b271..0dceaebc966 100644 --- a/extensions/csharp/cgmanifest.json +++ b/extensions/csharp/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "dotnet/csharp-tmLanguage", "repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage", - "commitHash": "6666eb1d5e6fb565a4110d6db645cc534fb3c6d2" + "commitHash": "7bf5709ac1a713e340a618d1b41f44a043e393c6" } }, "license": "MIT", diff --git a/extensions/csharp/syntaxes/csharp.tmLanguage.json b/extensions/csharp/syntaxes/csharp.tmLanguage.json index 9b6cf2e9664..4e6a722d413 100644 --- a/extensions/csharp/syntaxes/csharp.tmLanguage.json +++ b/extensions/csharp/syntaxes/csharp.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/dotnet/csharp-tmLanguage/commit/6666eb1d5e6fb565a4110d6db645cc534fb3c6d2", + "version": "https://github.com/dotnet/csharp-tmLanguage/commit/7bf5709ac1a713e340a618d1b41f44a043e393c6", "name": "C#", "scopeName": "source.cs", "patterns": [ @@ -232,7 +232,7 @@ "include": "#try-statement" }, { - "include": "#checked-unchecked-statement" + "include": "#expression-operator-expression" }, { "include": "#context-control-statement" @@ -3824,7 +3824,7 @@ }, "char-character-escape": { "name": "constant.character.escape.cs", - "match": "\\\\(['\"\\\\0abfnrtv]|x[0-9a-fA-F]{1,4}|u[0-9a-fA-F]{4})" + "match": "\\\\(x[0-9a-fA-F]{1,4}|u[0-9a-fA-F]{4}|.)" }, "string-literal": { "name": "string.quoted.double.cs", @@ -3851,7 +3851,7 @@ }, "string-character-escape": { "name": "constant.character.escape.cs", - "match": "\\\\(['\"\\\\0abfnrtv]|x[0-9a-fA-F]{1,4}|U[0-9a-fA-F]{8}|u[0-9a-fA-F]{4})" + "match": "\\\\(x[0-9a-fA-F]{1,4}|U[0-9a-fA-F]{8}|u[0-9a-fA-F]{4}|.)" }, "verbatim-string-literal": { "name": "string.quoted.double.cs", diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json index e39969bfa3e..523e66333bc 100644 --- a/extensions/css-language-features/server/package.json +++ b/extensions/css-language-features/server/package.json @@ -11,7 +11,7 @@ "browser": "./dist/browser/cssServerMain", "dependencies": { "@vscode/l10n": "^0.0.16", - "vscode-css-languageservice": "^6.2.10", + "vscode-css-languageservice": "^6.2.11", "vscode-languageserver": "^9.0.1", "vscode-uri": "^3.0.8" }, diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock index 09ef5de911b..28a355c3b01 100644 --- a/extensions/css-language-features/server/yarn.lock +++ b/extensions/css-language-features/server/yarn.lock @@ -17,10 +17,10 @@ resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.16.tgz#f075db346d0b08419a12540171b230bd803c42be" integrity sha512-JT5CvrIYYCrmB+dCana8sUqJEcGB1ZDXNLMQ2+42bW995WmNoenijWMUdZfwmuQUTQcEVVIa2OecZzTYWUW9Cg== -vscode-css-languageservice@^6.2.10: - version "6.2.10" - resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.10.tgz#ba114d92d634df7b45f572a6eaaccd29cbde5d9d" - integrity sha512-sYUZPku4mQ06AWGCbMyjv2tdR6juBW6hTbVPFwbJvNVzdtEfBioQOgkdXg7yMJNWnXkvWSU1FL2kb4Vxu5Cdyw== +vscode-css-languageservice@^6.2.11: + version "6.2.11" + resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.11.tgz#40de8b34adb6d68ee96795ffb34e34d99fc26801" + integrity sha512-qn49Wa6K94LnizpVxmlYrcPf1Cb36gq1nNueW0COhi4shylXBzET5wuDbH8ZWQlJD0HM5Mmnn7WE9vQVVs+ULA== dependencies: "@vscode/l10n" "^0.0.16" vscode-languageserver-textdocument "^1.0.11" diff --git a/extensions/dart/cgmanifest.json b/extensions/dart/cgmanifest.json index 0cfd30381b7..0086a5158e5 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": "bd0079ba7ca85cdd6400a8a467e532b539d0f285" + "commitHash": "0a6648177bdbb91a4e1a38c16e57ede0ccba4f18" } }, "licenseDetail": [ diff --git a/extensions/dart/syntaxes/dart.tmLanguage.json b/extensions/dart/syntaxes/dart.tmLanguage.json index af7d3f6f913..ae4db9698e9 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/bd0079ba7ca85cdd6400a8a467e532b539d0f285", + "version": "https://github.com/dart-lang/dart-syntax-highlight/commit/0a6648177bdbb91a4e1a38c16e57ede0ccba4f18", "name": "Dart", "scopeName": "source.dart", "patterns": [ @@ -90,15 +90,7 @@ "end": "```" }, { - "match": "(`.*?`)", - "captures": { - "0": { - "name": "variable.other.source.dart" - } - } - }, - { - "match": "(`.*?`)", + "match": "(`[^`]+?`)", "captures": { "0": { "name": "variable.other.source.dart" @@ -395,6 +387,7 @@ "string-interp": { "patterns": [ { + "name": "string.interpolated.expression.dart", "match": "\\$([a-zA-Z0-9_]+)", "captures": { "1": { @@ -408,8 +401,7 @@ "end": "\\}", "patterns": [ { - "include": "#constants-and-special-vars", - "name": "variable.parameter.dart" + "include": "#constants-and-special-vars" }, { "include": "#strings" diff --git a/extensions/debug-server-ready/package.json b/extensions/debug-server-ready/package.json index fdfe45b73b8..65efcdc09f3 100644 --- a/extensions/debug-server-ready/package.json +++ b/extensions/debug-server-ready/package.json @@ -158,6 +158,50 @@ "default": false } } + }, + { + "type": "object", + "additionalProperties": false, + "markdownDescription": "%debug.server.ready.serverReadyAction.description%", + "default": { + "action": "startDebugging", + "config": { + "type": "node", + "request": "launch" + }, + "killOnServerStop": false + }, + "required": [ + "config" + ], + "properties": { + "action": { + "type": "string", + "enum": [ + "startDebugging" + ], + "enumDescriptions": [ + "%debug.server.ready.action.startDebugging.description%" + ], + "markdownDescription": "%debug.server.ready.action.description%", + "default": "startDebugging" + }, + "pattern": { + "type": "string", + "markdownDescription": "%debug.server.ready.pattern.description%", + "default": "listening on port ([0-9]+)" + }, + "config": { + "type": "object", + "markdownDescription": "%debug.server.ready.debugConfig.description%", + "default": {} + }, + "killOnServerStop": { + "type": "boolean", + "markdownDescription": "%debug.server.ready.killOnServerStop.description%", + "default": false + } + } } ] } diff --git a/extensions/debug-server-ready/package.nls.json b/extensions/debug-server-ready/package.nls.json index 45169b0095b..6fa9d3a7630 100644 --- a/extensions/debug-server-ready/package.nls.json +++ b/extensions/debug-server-ready/package.nls.json @@ -8,6 +8,7 @@ "debug.server.ready.action.debugWithChrome.description": "Start debugging with the 'Debugger for Chrome'.", "debug.server.ready.action.startDebugging.description": "Run another launch configuration.", "debug.server.ready.pattern.description": "Server is ready if this pattern appears on the debug console. The first capture group must include a URI or a port number.", + "debug.server.ready.debugConfig.description": "The debug configuration to run.", "debug.server.ready.uriFormat.description": "A format string used when constructing the URI from a port number. The first '%s' is substituted with the port number.", "debug.server.ready.webRoot.description": "Value passed to the debug configuration for the 'Debugger for Chrome'.", "debug.server.ready.killOnServerStop.description": "Stop the child session when the parent session stopped.", diff --git a/extensions/debug-server-ready/src/extension.ts b/extensions/debug-server-ready/src/extension.ts index df5c8521c09..b3525281111 100644 --- a/extensions/debug-server-ready/src/extension.ts +++ b/extensions/debug-server-ready/src/extension.ts @@ -18,6 +18,7 @@ interface ServerReadyAction { uriFormat?: string; webRoot?: string; name?: string; + config?: vscode.DebugConfiguration; killOnServerStop?: boolean; } @@ -194,7 +195,11 @@ class ServerReadyDetector extends vscode.Disposable { break; case 'startDebugging': - await this.startNamedDebugSession(session, args.name || 'unspecified'); + if (args.config) { + await this.startDebugSession(session, args.config.name, args.config); + } else { + await this.startDebugSession(session, args.name || 'unspecified'); + } break; default: @@ -246,17 +251,24 @@ class ServerReadyDetector extends vscode.Disposable { }); } - private async startNamedDebugSession(session: vscode.DebugSession, name: string) { + /** + * Starts a debug session given a debug configuration name (saved in launch.json) or a debug configuration object. + * + * @param session The parent debugSession + * @param name The name of the configuration to launch. If config it set, it assumes it is the same as config.name. + * @param config [Optional] Instead of starting a debug session by debug configuration name, use a debug configuration object instead. + */ + private async startDebugSession(session: vscode.DebugSession, name: string, config?: vscode.DebugConfiguration) { const args = session.configuration.serverReadyAction as ServerReadyAction; if (!args.killOnServerStop) { - await vscode.debug.startDebugging(session.workspaceFolder, name); + await vscode.debug.startDebugging(session.workspaceFolder, config ?? name); return; } const cts = new vscode.CancellationTokenSource(); const newSessionPromise = this.catchStartedDebugSession(x => x.name === name, cts.token); - if (!await vscode.debug.startDebugging(session.workspaceFolder, name)) { + if (!await vscode.debug.startDebugging(session.workspaceFolder, config ?? name)) { cts.cancel(); cts.dispose(); return; diff --git a/extensions/fsharp/cgmanifest.json b/extensions/fsharp/cgmanifest.json index 9e5553c2695..03dad6e72c9 100644 --- a/extensions/fsharp/cgmanifest.json +++ b/extensions/fsharp/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "ionide/ionide-fsgrammar", "repositoryUrl": "https://github.com/ionide/ionide-fsgrammar", - "commitHash": "078bbf85225b82de3ae4c2db7ee74d9239b249ce" + "commitHash": "472c6b2030c962217cbbb26e4ddcce1b8ffe0867" } }, "license": "MIT", diff --git a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json index d515173125d..20151138ccf 100644 --- a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json +++ b/extensions/fsharp/syntaxes/fsharp.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/ionide/ionide-fsgrammar/commit/078bbf85225b82de3ae4c2db7ee74d9239b249ce", + "version": "https://github.com/ionide/ionide-fsgrammar/commit/472c6b2030c962217cbbb26e4ddcce1b8ffe0867", "name": "fsharp", "scopeName": "source.fsharp", "patterns": [ @@ -600,7 +600,7 @@ }, { "name": "comment.line.double-slash.fsharp", - "match": "(??@^|/])//(?![!%&+-.<=>?@^|]).*$" + "match": "(??@^|/])//(.*$)" } ] }, @@ -630,7 +630,7 @@ }, "abstract_definition": { "name": "abstract.definition.fsharp", - "begin": "\\b(abstract)\\s+(member)?(\\s+\\[\\<.*\\>\\])?\\s*([_[:alpha:]0-9,\\._`\\s]+)(:)", + "begin": "\\b(abstract)\\s+(member)?(\\s+\\[\\<.*\\>\\])?\\s*([_[:alpha:]0-9,\\._`\\s]+)(<)?", "end": "\\s*(with)\\b|=|$", "beginCaptures": { "1": { @@ -676,7 +676,7 @@ } }, { - "match": "(?!with|get|set\\b)\\b([\\w0-9'`^._]+)", + "match": "(?!with|get|set\\b)\\s*([\\w0-9'`^._]+)", "comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted", "captures": { "1": { diff --git a/extensions/git-base/languages/git-commit.language-configuration.json b/extensions/git-base/languages/git-commit.language-configuration.json index b61fbe63d34..6ee9f77f0b4 100644 --- a/extensions/git-base/languages/git-commit.language-configuration.json +++ b/extensions/git-base/languages/git-commit.language-configuration.json @@ -7,5 +7,14 @@ ["{", "}"], ["[", "]"], ["(", ")"] + ], + "autoClosingPairs": [ + { "open": "{", "close": "}" }, + { "open": "[", "close": "]" }, + { "open": "(", "close": ")" }, + { "open": "'", "close": "'", "notIn": ["string", "comment"] }, + { "open": "\"", "close": "\"", "notIn": ["string"] }, + { "open": "`", "close": "`", "notIn": ["string", "comment"] }, + { "open": "/**", "close": " */", "notIn": ["string"] } ] -} \ No newline at end of file +} diff --git a/extensions/git-base/languages/git-rebase.language-configuration.json b/extensions/git-base/languages/git-rebase.language-configuration.json index b61fbe63d34..6ee9f77f0b4 100644 --- a/extensions/git-base/languages/git-rebase.language-configuration.json +++ b/extensions/git-base/languages/git-rebase.language-configuration.json @@ -7,5 +7,14 @@ ["{", "}"], ["[", "]"], ["(", ")"] + ], + "autoClosingPairs": [ + { "open": "{", "close": "}" }, + { "open": "[", "close": "]" }, + { "open": "(", "close": ")" }, + { "open": "'", "close": "'", "notIn": ["string", "comment"] }, + { "open": "\"", "close": "\"", "notIn": ["string"] }, + { "open": "`", "close": "`", "notIn": ["string", "comment"] }, + { "open": "/**", "close": " */", "notIn": ["string"] } ] -} \ No newline at end of file +} diff --git a/extensions/git-base/languages/ignore.language-configuration.json b/extensions/git-base/languages/ignore.language-configuration.json index b75f42e22a8..ad8b8ee5cd8 100644 --- a/extensions/git-base/languages/ignore.language-configuration.json +++ b/extensions/git-base/languages/ignore.language-configuration.json @@ -1,5 +1,14 @@ { "comments": { "lineComment": "#", - } + }, + "autoClosingPairs": [ + { "open": "{", "close": "}" }, + { "open": "[", "close": "]" }, + { "open": "(", "close": ")" }, + { "open": "'", "close": "'", "notIn": ["string", "comment"] }, + { "open": "\"", "close": "\"", "notIn": ["string"] }, + { "open": "`", "close": "`", "notIn": ["string", "comment"] }, + { "open": "/**", "close": " */", "notIn": ["string"] } + ] } diff --git a/extensions/git-base/src/remoteSource.ts b/extensions/git-base/src/remoteSource.ts index 05831eb010b..eb86b27367a 100644 --- a/extensions/git-base/src/remoteSource.ts +++ b/extensions/git-base/src/remoteSource.ts @@ -3,35 +3,51 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { QuickPickItem, window, QuickPick, QuickPickItemKind, l10n } from 'vscode'; +import { QuickPickItem, window, QuickPick, QuickPickItemKind, l10n, Disposable } from 'vscode'; import { RemoteSourceProvider, RemoteSource, PickRemoteSourceOptions, PickRemoteSourceResult, RemoteSourceAction } from './api/git-base'; import { Model } from './model'; import { throttle, debounce } from './decorators'; async function getQuickPickResult(quickpick: QuickPick): Promise { + const listeners: Disposable[] = []; const result = await new Promise(c => { - quickpick.onDidAccept(() => c(quickpick.selectedItems[0])); - quickpick.onDidHide(() => c(undefined)); + listeners.push( + quickpick.onDidAccept(() => c(quickpick.selectedItems[0])), + quickpick.onDidHide(() => c(undefined)), + ); quickpick.show(); }); quickpick.hide(); + listeners.forEach(l => l.dispose()); return result; } -class RemoteSourceProviderQuickPick { +class RemoteSourceProviderQuickPick implements Disposable { + + private disposables: Disposable[] = []; + private isDisposed: boolean = false; private quickpick: QuickPick | undefined; constructor(private provider: RemoteSourceProvider) { } + dispose() { + this.disposables.forEach(d => d.dispose()); + this.disposables = []; + this.quickpick = undefined; + this.isDisposed = true; + } + private ensureQuickPick() { if (!this.quickpick) { this.quickpick = window.createQuickPick(); + this.disposables.push(this.quickpick); this.quickpick.ignoreFocusOut = true; + this.disposables.push(this.quickpick.onDidHide(() => this.dispose())); if (this.provider.supportsQuery) { this.quickpick.placeholder = this.provider.placeholder ?? l10n.t('Repository name (type to search)'); - this.quickpick.onDidChangeValue(this.onDidChangeValue, this); + this.disposables.push(this.quickpick.onDidChangeValue(this.onDidChangeValue, this)); } else { this.quickpick.placeholder = this.provider.placeholder ?? l10n.t('Repository name'); } @@ -46,11 +62,18 @@ class RemoteSourceProviderQuickPick { @throttle private async query(): Promise { try { + if (this.isDisposed) { + return; + } this.ensureQuickPick(); this.quickpick!.busy = true; this.quickpick!.show(); const remoteSources = await this.provider.getRemoteSources(this.quickpick?.value) || []; + // The user may have cancelled the picker in the meantime + if (this.isDisposed) { + return; + } if (remoteSources.length === 0) { this.quickpick!.items = [{ @@ -70,12 +93,17 @@ class RemoteSourceProviderQuickPick { this.quickpick!.items = [{ label: l10n.t('{0} Error: {1}', '$(error)', err.message), alwaysShow: true }]; console.error(err); } finally { - this.quickpick!.busy = false; + if (!this.isDisposed) { + this.quickpick!.busy = false; + } } } async pick(): Promise { await this.query(); + if (this.isDisposed) { + return; + } const result = await getQuickPickResult(this.quickpick!); return result?.remoteSource; } @@ -173,6 +201,7 @@ export async function pickRemoteSource(model: Model, options: PickRemoteSourceOp async function pickProviderSource(provider: RemoteSourceProvider, options: PickRemoteSourceOptions = {}): Promise { const quickpick = new RemoteSourceProviderQuickPick(provider); const remote = await quickpick.pick(); + quickpick.dispose(); let url: string | undefined; diff --git a/extensions/git/package.json b/extensions/git/package.json index 7a20e7ffef1..8744035090e 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -24,7 +24,7 @@ "tabInputTextMerge", "timeline", "contribMergeEditorMenus", - "scmInputBoxActionButton" + "contribSourceControlInputBoxMenu" ], "categories": [ "Other" @@ -98,6 +98,12 @@ "category": "Git", "enablement": "!operationInProgress" }, + { + "command": "git.closeOtherRepositories", + "title": "%command.closeOtherRepositories%", + "category": "Git", + "enablement": "!operationInProgress" + }, { "command": "git.refresh", "title": "%command.refresh%", @@ -697,7 +703,7 @@ { "command": "git.timeline.openCommit", "title": "%command.timelineOpenCommit%", - "icon": "$(wand)", + "icon": "$(diff-multiple)", "category": "Git" }, { @@ -762,14 +768,14 @@ }, { "command": "git.viewChanges", - "title": "View Changes", - "icon": "$(search)", + "title": "%command.viewChanges%", + "icon": "$(diff-multiple)", "category": "Git" }, { "command": "git.viewStagedChanges", - "title": "View Staged Changes", - "icon": "$(search)", + "title": "%command.viewStagedChanges%", + "icon": "$(diff-multiple)", "category": "Git" } ], @@ -827,6 +833,10 @@ "command": "git.close", "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0" }, + { + "command": "git.closeOtherRepositories", + "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount > 1" + }, { "command": "git.refresh", "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0" @@ -1336,8 +1346,13 @@ "scm/sourceControl": [ { "command": "git.close", - "group": "navigation", + "group": "navigation@1", "when": "scmProvider == git" + }, + { + "command": "git.closeOtherRepositories", + "group": "navigation@2", + "when": "scmProvider == git && gitOpenRepositoryCount > 1" } ], "scm/resourceGroup/context": [ @@ -1423,12 +1438,12 @@ }, { "command": "git.viewStagedChanges", - "when": "scmProvider == git && scmResourceGroup == index", + "when": "scmProvider == git && scmResourceGroup == index && config.multiDiffEditor.experimental.enabled", "group": "inline@1" }, { "command": "git.viewChanges", - "when": "scmProvider == git && scmResourceGroup == workingTree", + "when": "scmProvider == git && scmResourceGroup == workingTree && config.multiDiffEditor.experimental.enabled", "group": "inline@1" } ], @@ -1810,7 +1825,7 @@ { "command": "git.timeline.openCommit", "group": "inline", - "when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection" + "when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection && config.multiDiffEditor.experimental.enabled" }, { "command": "git.timeline.openDiff", @@ -1820,7 +1835,7 @@ { "command": "git.timeline.openCommit", "group": "1_actions@2", - "when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection" + "when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection && config.multiDiffEditor.experimental.enabled" }, { "command": "git.timeline.compareWithSelected", @@ -2503,7 +2518,7 @@ "warn", "off" ], - "default": "warn", + "default": "off", "description": "%config.inputValidation%" }, "git.inputValidationLength": { @@ -2946,8 +2961,10 @@ "configurationDefaults": { "[git-commit]": { "editor.rulers": [ + 50, 72 ], + "editor.wordWrap": "off", "workbench.editor.restoreViewState": false }, "[git-rebase]": { diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json index 5f454ae4008..9b053671d0f 100644 --- a/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json @@ -9,6 +9,7 @@ "command.openRepository": "Open Repository", "command.reopenClosedRepositories": "Reopen Closed Repositories...", "command.close": "Close Repository", + "command.closeOtherRepositories": "Close Other Repositories", "command.refresh": "Refresh", "command.openChange": "Open Changes", "command.openAllChanges": "Open All Changes", @@ -63,12 +64,12 @@ "command.deleteBranch": "Delete Branch...", "command.renameBranch": "Rename Branch...", "command.cherryPick": "Cherry Pick...", - "command.merge": "Merge Branch...", + "command.merge": "Merge...", "command.mergeAbort": "Abort Merge", "command.rebase": "Rebase Branch...", "command.createTag": "Create Tag", - "command.deleteTag": "Delete Tag", - "command.deleteRemoteTag": "Delete Remote Tag", + "command.deleteTag": "Delete Tag...", + "command.deleteRemoteTag": "Delete Remote Tag...", "command.fetch": "Fetch", "command.fetchPrune": "Fetch (Prune)", "command.fetchAll": "Fetch From All Remotes", @@ -111,6 +112,8 @@ "command.timelineCompareWithSelected": "Compare with Selected", "command.manageUnsafeRepositories": "Manage Unsafe Repositories", "command.openRepositoriesInParentFolders": "Open Repositories In Parent Folders", + "command.viewChanges": "View Changes", + "command.viewStagedChanges": "View Staged Changes", "command.api.getRepositories": "Get Repositories", "command.api.getRepositoryState": "Get Repository State", "command.api.getRemoteSources": "Get Remote Sources", @@ -165,7 +168,7 @@ "config.smartCommitChanges.all": "Automatically stage all changes.", "config.smartCommitChanges.tracked": "Automatically stage tracked changes only.", "config.suggestSmartCommit": "Suggests to enable smart commit (commit all changes when there are no staged changes).", - "config.enableCommitSigning": "Enables commit signing with GPG or X.509.", + "config.enableCommitSigning": "Enables commit signing with GPG, X.509, or SSH.", "config.discardAllScope": "Controls what changes are discarded by the `Discard all changes` command. `all` discards all changes. `tracked` discards only tracked files. `prompt` shows a prompt dialog every time the action is run.", "config.decorations.enabled": "Controls whether Git contributes colors and badges to the Explorer and the Open Editors view.", "config.enableStatusBarSync": "Controls whether the Git Sync command appears in the status bar.", diff --git a/extensions/git/src/actionButton.ts b/extensions/git/src/actionButton.ts index 5dd42eebdd5..d29bfcb2322 100644 --- a/extensions/git/src/actionButton.ts +++ b/extensions/git/src/actionButton.ts @@ -10,6 +10,24 @@ import { CommitCommandsCenter } from './postCommitCommands'; import { Repository } from './repository'; import { dispose } from './util'; +function isActionButtonStateEqual(state1: ActionButtonState, state2: ActionButtonState): boolean { + return state1.HEAD?.name === state2.HEAD?.name && + state1.HEAD?.commit === state2.HEAD?.commit && + state1.HEAD?.remote === state2.HEAD?.remote && + state1.HEAD?.type === state2.HEAD?.type && + state1.HEAD?.ahead === state2.HEAD?.ahead && + state1.HEAD?.behind === state2.HEAD?.behind && + state1.HEAD?.upstream?.name === state2.HEAD?.upstream?.name && + state1.HEAD?.upstream?.remote === state2.HEAD?.upstream?.remote && + state1.HEAD?.upstream?.commit === state2.HEAD?.upstream?.commit && + state1.isCheckoutInProgress === state2.isCheckoutInProgress && + state1.isCommitInProgress === state2.isCommitInProgress && + state1.isMergeInProgress === state2.isMergeInProgress && + state1.isRebaseInProgress === state2.isRebaseInProgress && + state1.isSyncInProgress === state2.isSyncInProgress && + state1.repositoryHasChangesToCommit === state2.repositoryHasChangesToCommit; +} + interface ActionButtonState { readonly HEAD: Branch | undefined; readonly isCheckoutInProgress: boolean; @@ -20,24 +38,26 @@ interface ActionButtonState { readonly repositoryHasChangesToCommit: boolean; } -abstract class AbstractActionButton { - protected _onDidChange = new EventEmitter(); +export class ActionButton { + private _onDidChange = new EventEmitter(); get onDidChange(): Event { return this._onDidChange.event; } private _state: ActionButtonState; - protected get state() { return this._state; } - protected set state(state: ActionButtonState) { - if (JSON.stringify(this._state) !== JSON.stringify(state)) { - this._state = state; - this._onDidChange.fire(); + private get state() { return this._state; } + private set state(state: ActionButtonState) { + if (isActionButtonStateEqual(this._state, state)) { + return; } + + this._state = state; + this._onDidChange.fire(); } - abstract get button(): SourceControlActionButton | undefined; + private disposables: Disposable[] = []; - protected disposables: Disposable[] = []; - - constructor(readonly repository: Repository) { + constructor( + readonly repository: Repository, + readonly postCommitCommandCenter: CommitCommandsCenter) { this._state = { HEAD: undefined, isCheckoutInProgress: false, @@ -50,126 +70,6 @@ abstract class AbstractActionButton { repository.onDidRunGitStatus(this.onDidRunGitStatus, this, this.disposables); repository.onDidChangeOperations(this.onDidChangeOperations, this, this.disposables); - } - - protected getPublishBranchActionButton(): SourceControlActionButton | undefined { - const icon = this.state.isSyncInProgress ? '$(sync~spin)' : '$(cloud-upload)'; - - return { - command: { - command: 'git.publish', - title: l10n.t({ message: '{0} Publish Branch', args: [icon], comment: ['{Locked="Branch"}', 'Do not translate "Branch" as it is a git term'] }), - tooltip: this.state.isSyncInProgress ? - (this.state.HEAD?.name ? - l10n.t({ message: 'Publishing Branch "{0}"...', args: [this.state.HEAD.name], comment: ['{Locked="Branch"}', 'Do not translate "Branch" as it is a git term'] }) : - l10n.t({ message: 'Publishing Branch...', comment: ['{Locked="Branch"}', 'Do not translate "Branch" as it is a git term'] })) : - (this.repository.HEAD?.name ? - l10n.t({ message: 'Publish Branch "{0}"', args: [this.state.HEAD?.name], comment: ['{Locked="Branch"}', 'Do not translate "Branch" as it is a git term'] }) : - l10n.t({ message: 'Publish Branch', comment: ['{Locked="Branch"}', 'Do not translate "Branch" as it is a git term'] })), - arguments: [this.repository.sourceControl], - }, - enabled: !this.state.isCheckoutInProgress && !this.state.isSyncInProgress && !this.state.isCommitInProgress && !this.state.isMergeInProgress && !this.state.isRebaseInProgress - }; - } - - protected getSyncChangesActionButton(): SourceControlActionButton | undefined { - const branchIsAheadOrBehind = (this.state.HEAD?.behind ?? 0) > 0 || (this.state.HEAD?.ahead ?? 0) > 0; - - const ahead = this.state.HEAD?.ahead ? ` ${this.state.HEAD.ahead}$(arrow-up)` : ''; - const behind = this.state.HEAD?.behind ? ` ${this.state.HEAD.behind}$(arrow-down)` : ''; - const icon = this.state.isSyncInProgress ? '$(sync~spin)' : '$(sync)'; - - return { - command: { - command: 'git.sync', - title: l10n.t('{0} Sync Changes{1}{2}', icon, behind, ahead), - tooltip: this.state.isSyncInProgress ? - l10n.t('Synchronizing Changes...') - : this.repository.syncTooltip, - arguments: [this.repository.sourceControl], - }, - description: `${icon}${behind}${ahead}`, - enabled: !this.state.isCheckoutInProgress && !this.state.isSyncInProgress && !this.state.isCommitInProgress && !this.state.isMergeInProgress && !this.state.isRebaseInProgress && branchIsAheadOrBehind - }; - } - - private onDidChangeOperations(): void { - const isCheckoutInProgress - = this.repository.operations.isRunning(OperationKind.Checkout) || - this.repository.operations.isRunning(OperationKind.CheckoutTracking); - - const isCommitInProgress = - this.repository.operations.isRunning(OperationKind.Commit) || - this.repository.operations.isRunning(OperationKind.PostCommitCommand) || - this.repository.operations.isRunning(OperationKind.RebaseContinue); - - const isSyncInProgress = - this.repository.operations.isRunning(OperationKind.Sync) || - this.repository.operations.isRunning(OperationKind.Push) || - this.repository.operations.isRunning(OperationKind.Pull); - - this.state = { ...this.state, isCheckoutInProgress, isCommitInProgress, isSyncInProgress }; - } - - private onDidRunGitStatus(): void { - this.state = { - ...this.state, - HEAD: this.repository.HEAD, - isMergeInProgress: this.repository.mergeGroup.resourceStates.length !== 0, - isRebaseInProgress: !!this.repository.rebaseCommit, - repositoryHasChangesToCommit: this.repositoryHasChangesToCommit() - }; - } - - protected repositoryHasChangesToCommit(): boolean { - const config = workspace.getConfiguration('git', Uri.file(this.repository.root)); - const enableSmartCommit = config.get('enableSmartCommit') === true; - const suggestSmartCommit = config.get('suggestSmartCommit') === true; - const smartCommitChanges = config.get<'all' | 'tracked'>('smartCommitChanges', 'all'); - - const resources = [...this.repository.indexGroup.resourceStates]; - - if ( - // Smart commit enabled (all) - (enableSmartCommit && smartCommitChanges === 'all') || - // Smart commit disabled, smart suggestion enabled - (!enableSmartCommit && suggestSmartCommit) - ) { - resources.push(...this.repository.workingTreeGroup.resourceStates); - } - - // Smart commit enabled (tracked only) - if (enableSmartCommit && smartCommitChanges === 'tracked') { - resources.push(...this.repository.workingTreeGroup.resourceStates.filter(r => r.type !== Status.UNTRACKED)); - } - - return resources.length !== 0; - } - - dispose(): void { - this.disposables = dispose(this.disposables); - } -} - -export class CommitActionButton extends AbstractActionButton { - override get button(): SourceControlActionButton | undefined { - if (!this.state.HEAD) { return undefined; } - - let actionButton: SourceControlActionButton | undefined; - - if (this.state.repositoryHasChangesToCommit) { - // Commit Changes (enabled) - actionButton = this.getCommitActionButton(); - } - - // Commit Changes (enabled) -> Publish Branch -> Sync Changes -> Commit Changes (disabled) - return actionButton ?? this.getPublishBranchActionButton() ?? this.getSyncChangesActionButton() ?? this.getCommitActionButton(); - } - - constructor( - repository: Repository, - readonly postCommitCommandCenter: CommitCommandsCenter) { - super(repository); this.disposables.push(repository.onDidChangeBranchProtection(() => this._onDidChange.fire())); this.disposables.push(postCommitCommandCenter.onDidChange(() => this._onDidChange.fire())); @@ -182,8 +82,7 @@ export class CommitActionButton extends AbstractActionButton { this.onDidChangeSmartCommitSettings(); } - if (e.affectsConfiguration('scm.experimental.showSyncView') || - e.affectsConfiguration('git.branchProtectionPrompt', root) || + if (e.affectsConfiguration('git.branchProtectionPrompt', root) || e.affectsConfiguration('git.postCommitCommand', root) || e.affectsConfiguration('git.rememberPostCommitCommand', root) || e.affectsConfiguration('git.showActionButton', root)) { @@ -192,6 +91,20 @@ export class CommitActionButton extends AbstractActionButton { })); } + get button(): SourceControlActionButton | undefined { + if (!this.state.HEAD) { return undefined; } + + let actionButton: SourceControlActionButton | undefined; + + if (this.state.repositoryHasChangesToCommit) { + // Commit Changes (enabled) + actionButton = this.getCommitActionButton(); + } + + // Commit Changes (enabled) -> Publish Branch -> Sync Changes -> Commit Changes (disabled) + return actionButton ?? this.getPublishBranchActionButton() ?? this.getSyncChangesActionButton() ?? this.getCommitActionButton(); + } + private getCommitActionButton(): SourceControlActionButton | undefined { const config = workspace.getConfiguration('git', Uri.file(this.repository.root)); const showActionButton = config.get<{ commit: boolean }>('showActionButton', { commit: true }); @@ -219,6 +132,16 @@ export class CommitActionButton extends AbstractActionButton { }; } + // Not a branch (tag, detached) + if (this.state.HEAD?.type === RefType.Tag || !this.state.HEAD?.name) { + return { + command: 'git.commit', + title: l10n.t('{0} Commit', '$(check)'), + tooltip: this.state.isCommitInProgress ? l10n.t('Committing Changes...') : l10n.t('Commit Changes'), + arguments: [this.repository.sourceControl, ''] + }; + } + // Commit return this.postCommitCommandCenter.getPrimaryCommand(); } @@ -229,6 +152,11 @@ export class CommitActionButton extends AbstractActionButton { return []; } + // Not a branch (tag, detached) + if (this.state.HEAD?.type === RefType.Tag || !this.state.HEAD?.name) { + return []; + } + // Commit const commandGroups: Command[][] = []; for (const commands of this.postCommitCommandCenter.getSecondaryCommands()) { @@ -240,27 +168,34 @@ export class CommitActionButton extends AbstractActionButton { return commandGroups; } - protected override getPublishBranchActionButton(): SourceControlActionButton | undefined { - const scmConfig = workspace.getConfiguration('scm'); - if (scmConfig.get('experimental.showSyncView', false)) { - return undefined; - } - + private getPublishBranchActionButton(): SourceControlActionButton | undefined { const config = workspace.getConfiguration('git', Uri.file(this.repository.root)); const showActionButton = config.get<{ publish: boolean }>('showActionButton', { publish: true }); // Not a branch (tag, detached), branch does have an upstream, commit/merge/rebase is in progress, or the button is disabled if (this.state.HEAD?.type === RefType.Tag || !this.state.HEAD?.name || this.state.HEAD?.upstream || this.state.isCommitInProgress || this.state.isMergeInProgress || this.state.isRebaseInProgress || !showActionButton.publish) { return undefined; } - return super.getPublishBranchActionButton(); + // Button icon + const icon = this.state.isSyncInProgress ? '$(sync~spin)' : '$(cloud-upload)'; + + return { + command: { + command: 'git.publish', + title: l10n.t({ message: '{0} Publish Branch', args: [icon], comment: ['{Locked="Branch"}', 'Do not translate "Branch" as it is a git term'] }), + tooltip: this.state.isSyncInProgress ? + (this.state.HEAD?.name ? + l10n.t({ message: 'Publishing Branch "{0}"...', args: [this.state.HEAD.name], comment: ['{Locked="Branch"}', 'Do not translate "Branch" as it is a git term'] }) : + l10n.t({ message: 'Publishing Branch...', comment: ['{Locked="Branch"}', 'Do not translate "Branch" as it is a git term'] })) : + (this.repository.HEAD?.name ? + l10n.t({ message: 'Publish Branch "{0}"', args: [this.state.HEAD?.name], comment: ['{Locked="Branch"}', 'Do not translate "Branch" as it is a git term'] }) : + l10n.t({ message: 'Publish Branch', comment: ['{Locked="Branch"}', 'Do not translate "Branch" as it is a git term'] })), + arguments: [this.repository.sourceControl], + }, + enabled: !this.state.isCheckoutInProgress && !this.state.isSyncInProgress + }; } - protected override getSyncChangesActionButton(): SourceControlActionButton | undefined { - const scmConfig = workspace.getConfiguration('scm'); - if (scmConfig.get('experimental.showSyncView', false)) { - return undefined; - } - + private getSyncChangesActionButton(): SourceControlActionButton | undefined { const config = workspace.getConfiguration('git', Uri.file(this.repository.root)); const showActionButton = config.get<{ sync: boolean }>('showActionButton', { sync: true }); const branchIsAheadOrBehind = (this.state.HEAD?.behind ?? 0) > 0 || (this.state.HEAD?.ahead ?? 0) > 0; @@ -268,7 +203,40 @@ export class CommitActionButton extends AbstractActionButton { // Branch does not have an upstream, branch is not ahead/behind the remote branch, commit/merge/rebase is in progress, or the button is disabled if (!this.state.HEAD?.upstream || !branchIsAheadOrBehind || this.state.isCommitInProgress || this.state.isMergeInProgress || this.state.isRebaseInProgress || !showActionButton.sync) { return undefined; } - return super.getSyncChangesActionButton(); + const ahead = this.state.HEAD.ahead ? ` ${this.state.HEAD.ahead}$(arrow-up)` : ''; + const behind = this.state.HEAD.behind ? ` ${this.state.HEAD.behind}$(arrow-down)` : ''; + const icon = this.state.isSyncInProgress ? '$(sync~spin)' : '$(sync)'; + + return { + command: { + command: 'git.sync', + title: l10n.t('{0} Sync Changes{1}{2}', icon, behind, ahead), + tooltip: this.state.isSyncInProgress ? + l10n.t('Synchronizing Changes...') + : this.repository.syncTooltip, + arguments: [this.repository.sourceControl], + }, + description: `${icon}${behind}${ahead}`, + enabled: !this.state.isCheckoutInProgress && !this.state.isSyncInProgress + }; + } + + private onDidChangeOperations(): void { + const isCheckoutInProgress + = this.repository.operations.isRunning(OperationKind.Checkout) || + this.repository.operations.isRunning(OperationKind.CheckoutTracking); + + const isCommitInProgress = + this.repository.operations.isRunning(OperationKind.Commit) || + this.repository.operations.isRunning(OperationKind.PostCommitCommand) || + this.repository.operations.isRunning(OperationKind.RebaseContinue); + + const isSyncInProgress = + this.repository.operations.isRunning(OperationKind.Sync) || + this.repository.operations.isRunning(OperationKind.Push) || + this.repository.operations.isRunning(OperationKind.Pull); + + this.state = { ...this.state, isCheckoutInProgress, isCommitInProgress, isSyncInProgress }; } private onDidChangeSmartCommitSettings(): void { @@ -277,30 +245,43 @@ export class CommitActionButton extends AbstractActionButton { repositoryHasChangesToCommit: this.repositoryHasChangesToCommit() }; } -} -export class SyncActionButton extends AbstractActionButton { - override get button(): SourceControlActionButton | undefined { - if (!this.state.HEAD) { return undefined; } - - // Publish Branch -> Sync Changes - return this.getPublishBranchActionButton() ?? this.getSyncChangesActionButton(); + private onDidRunGitStatus(): void { + this.state = { + ...this.state, + HEAD: this.repository.HEAD, + isMergeInProgress: this.repository.mergeGroup.resourceStates.length !== 0, + isRebaseInProgress: !!this.repository.rebaseCommit, + repositoryHasChangesToCommit: this.repositoryHasChangesToCommit() + }; } - constructor(repository: Repository) { - super(repository); + private repositoryHasChangesToCommit(): boolean { + const config = workspace.getConfiguration('git', Uri.file(this.repository.root)); + const enableSmartCommit = config.get('enableSmartCommit') === true; + const suggestSmartCommit = config.get('suggestSmartCommit') === true; + const smartCommitChanges = config.get<'all' | 'tracked'>('smartCommitChanges', 'all'); - this.disposables.push(workspace.onDidChangeConfiguration(e => { - if (e.affectsConfiguration('scm.experimental.showSyncView')) { - this._onDidChange.fire(); - } - })); + const resources = [...this.repository.indexGroup.resourceStates]; + + if ( + // Smart commit enabled (all) + (enableSmartCommit && smartCommitChanges === 'all') || + // Smart commit disabled, smart suggestion enabled + (!enableSmartCommit && suggestSmartCommit) + ) { + resources.push(...this.repository.workingTreeGroup.resourceStates); + } + + // Smart commit enabled (tracked only) + if (enableSmartCommit && smartCommitChanges === 'tracked') { + resources.push(...this.repository.workingTreeGroup.resourceStates.filter(r => r.type !== Status.UNTRACKED)); + } + + return resources.length !== 0; } - protected override getPublishBranchActionButton(): SourceControlActionButton | undefined { - // Not a branch (tag, detached), branch does have an upstream - if (this.state.HEAD?.type === RefType.Tag || this.state.HEAD?.upstream) { return undefined; } - - return super.getPublishBranchActionButton(); + dispose(): void { + this.disposables = dispose(this.disposables); } } diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts index e77f0f2d381..747a2ada11b 100644 --- a/extensions/git/src/api/api1.ts +++ b/extensions/git/src/api/api1.ts @@ -5,7 +5,7 @@ import { Model } from '../model'; import { Repository as BaseRepository, Resource } from '../repository'; -import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, ForcePushMode, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, CredentialsProvider, BranchQuery, PushErrorHandler, PublishEvent, FetchOptions, RemoteSourceProvider, RemoteSourcePublisher, PostCommitCommandsProvider, RefQuery, BranchProtectionProvider, InitOptions, CommitMessageProvider } from './git'; +import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, ForcePushMode, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, CredentialsProvider, BranchQuery, PushErrorHandler, PublishEvent, FetchOptions, RemoteSourceProvider, RemoteSourcePublisher, PostCommitCommandsProvider, RefQuery, BranchProtectionProvider, InitOptions } from './git'; import { Event, SourceControlInputBox, Uri, SourceControl, Disposable, commands, CancellationToken } from 'vscode'; import { combinedDisposable, mapEvent } from '../util'; import { toGitUri } from '../uri'; @@ -157,6 +157,10 @@ export class ApiRepository implements Repository { return this.repository.diffBetween(ref1, ref2, path); } + getDiff(): Promise { + return this.repository.getDiff(); + } + hashObject(data: string): Promise { return this.repository.hashObject(data); } @@ -189,7 +193,7 @@ export class ApiRepository implements Repository { return this.repository.getRefs(query, cancellationToken); } - getMergeBase(ref1: string, ref2: string): Promise { + getMergeBase(ref1: string, ref2: string): Promise { return this.repository.getMergeBase(ref1, ref2); } @@ -341,10 +345,6 @@ export class ApiImpl implements API { return this._model.registerBranchProtectionProvider(root, provider); } - registerCommitMessageProvider(provider: CommitMessageProvider): Disposable { - return this._model.registerCommitMessageProvider(provider); - } - constructor(private _model: Model) { } } diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts index 1eb99ff0329..9ac4fdd0161 100644 --- a/extensions/git/src/api/git.d.ts +++ b/extensions/git/src/api/git.d.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Uri, Event, Disposable, ProviderResult, Command, CancellationToken, ThemeIcon } from 'vscode'; +import { Uri, Event, Disposable, ProviderResult, Command, CancellationToken } from 'vscode'; export { ProviderResult } from 'vscode'; export interface Git { @@ -36,6 +36,7 @@ export interface Ref { export interface UpstreamRef { readonly remote: string; readonly name: string; + readonly commit?: string; } export interface Branch extends Ref { @@ -44,6 +45,12 @@ export interface Branch extends Ref { readonly behind?: number; } +export interface CommitShortStat { + readonly files: number; + readonly insertions: number; + readonly deletions: number; +} + export interface Commit { readonly hash: string; readonly message: string; @@ -52,6 +59,7 @@ export interface Commit { readonly authorName?: string; readonly authorEmail?: string; readonly commitDate?: Date; + readonly shortStat?: CommitShortStat; } export interface Submodule { @@ -134,6 +142,7 @@ export interface LogOptions { readonly range?: string; readonly reverse?: boolean; readonly sortByAuthorDate?: boolean; + readonly shortStats?: boolean; } export interface CommitOptions { @@ -214,6 +223,8 @@ export interface Repository { diffBetween(ref1: string, ref2: string): Promise; diffBetween(ref1: string, ref2: string, path: string): Promise; + getDiff(): Promise; + hashObject(data: string): Promise; createBranch(name: string, checkout: boolean, ref?: string): Promise; @@ -225,7 +236,7 @@ export interface Repository { getRefs(query: RefQuery, cancellationToken?: CancellationToken): Promise; - getMergeBase(ref1: string, ref2: string): Promise; + getMergeBase(ref1: string, ref2: string): Promise; tag(name: string, upstream: string): Promise; deleteTag(name: string): Promise; @@ -301,12 +312,6 @@ export interface BranchProtectionProvider { provideBranchProtection(): BranchProtection[]; } -export interface CommitMessageProvider { - readonly title: string; - readonly icon?: Uri | { light: Uri, dark: Uri } | ThemeIcon; - provideCommitMessage(repository: Repository, changes: string[], cancellationToken?: CancellationToken): Promise; -} - export type APIState = 'uninitialized' | 'initialized'; export interface PublishEvent { @@ -334,7 +339,6 @@ export interface API { registerPostCommitCommandsProvider(provider: PostCommitCommandsProvider): Disposable; registerPushErrorHandler(handler: PushErrorHandler): Disposable; registerBranchProtectionProvider(root: Uri, provider: BranchProtectionProvider): Disposable; - registerCommitMessageProvider(provider: CommitMessageProvider): Disposable; } export interface GitExtension { diff --git a/extensions/git/src/askpass-main.ts b/extensions/git/src/askpass-main.ts index 16ac88a56eb..c2f59168c67 100644 --- a/extensions/git/src/askpass-main.ts +++ b/extensions/git/src/askpass-main.ts @@ -46,7 +46,9 @@ function main(argv: string[]): void { if (askpassType === 'ssh') { if (/passphrase/i.test(request)) { // passphrase - file = argv[6].replace(/^["']+|["':]+$/g, ''); + // Commit signing - Enter passphrase: + // Git operation - Enter passphrase for key '/c/Users//.ssh/id_ed25519': + file = argv[6]?.replace(/^["']+|["':]+$/g, ''); } else { // authenticity host = argv[6].replace(/^["']+|["':]+$/g, ''); diff --git a/extensions/git/src/askpass.ts b/extensions/git/src/askpass.ts index 7821ce112e8..6b27d876185 100644 --- a/extensions/git/src/askpass.ts +++ b/extensions/git/src/askpass.ts @@ -102,7 +102,7 @@ export class Askpass implements IIPCHandler, ITerminalEnvironmentProvider { const options: InputBoxOptions = { password: true, placeHolder: l10n.t('Passphrase'), - prompt: `SSH Key: ${file}`, + prompt: file ? `SSH Key: ${file}` : undefined, ignoreFocusOut: true }; diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts index 89ca2519c5a..50a9fbbb22f 100644 --- a/extensions/git/src/commands.ts +++ b/extensions/git/src/commands.ts @@ -8,7 +8,7 @@ import * as path from 'path'; import { Command, commands, Disposable, LineChange, MessageOptions, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider, InputBoxValidationSeverity, TabInputText, TabInputTextMerge, QuickPickItemKind, TextDocument, LogOutputChannel, l10n, Memento, UIKind, QuickInputButton, ThemeIcon } from 'vscode'; import TelemetryReporter from '@vscode/extension-telemetry'; import { uniqueNamesGenerator, adjectives, animals, colors, NumberDictionary } from '@joaomoreno/unique-names-generator'; -import { Branch, ForcePushMode, GitErrorCodes, Ref, RefType, Status, CommitOptions, RemoteSourcePublisher, Remote } from './api/git'; +import { ForcePushMode, GitErrorCodes, Ref, RefType, Status, CommitOptions, RemoteSourcePublisher, Remote } from './api/git'; import { Git, Stash } from './git'; import { Model } from './model'; import { Repository, Resource, ResourceGroupType } from './repository'; @@ -20,109 +20,179 @@ import { ApiRepository } from './api/api1'; import { getRemoteSourceActions, pickRemoteSource } from './remoteSource'; import { RemoteSourceAction } from './api/git-base'; -class CheckoutItem implements QuickPickItem { +abstract class CheckoutCommandItem implements QuickPickItem { + abstract get label(): string; + get description(): string { return ''; } + get alwaysShow(): boolean { return true; } +} + +class CreateBranchItem extends CheckoutCommandItem { + get label(): string { return l10n.t('{0} Create new branch...', '$(plus)'); } +} + +class CreateBranchFromItem extends CheckoutCommandItem { + get label(): string { return l10n.t('{0} Create new branch from...', '$(plus)'); } +} + +class CheckoutDetachedItem extends CheckoutCommandItem { + get label(): string { return l10n.t('{0} Checkout detached...', '$(debug-disconnect)'); } +} + +class RefItemSeparator implements QuickPickItem { + get kind(): QuickPickItemKind { return QuickPickItemKind.Separator; } + + get label(): string { + switch (this.refType) { + case RefType.Head: + return l10n.t('branches'); + case RefType.RemoteHead: + return l10n.t('remote branches'); + case RefType.Tag: + return l10n.t('tags'); + default: + return ''; + } + } + + constructor(private readonly refType: RefType) { } +} + +class RefItem implements QuickPickItem { + + get label(): string { + switch (this.ref.type) { + case RefType.Head: + return `$(git-branch) ${this.ref.name ?? this.shortCommit}`; + case RefType.RemoteHead: + return `$(cloud) ${this.ref.name ?? this.shortCommit}`; + case RefType.Tag: + return `$(tag) ${this.ref.name ?? this.shortCommit}`; + default: + return ''; + } + } + + get description(): string { + switch (this.ref.type) { + case RefType.Head: + return this.shortCommit; + case RefType.RemoteHead: + return l10n.t('Remote branch at {0}', this.shortCommit); + case RefType.Tag: + return l10n.t('Tag at {0}', this.shortCommit); + default: + return ''; + } + } - protected get shortCommit(): string { return (this.ref.commit || '').substr(0, 8); } - get label(): string { return `${this.repository.isBranchProtected(this.ref) ? '$(lock)' : '$(git-branch)'} ${this.ref.name || this.shortCommit}`; } - get description(): string { return this.shortCommit; } get refName(): string | undefined { return this.ref.name; } get refRemote(): string | undefined { return this.ref.remote; } + get shortCommit(): string { return (this.ref.commit || '').substr(0, 8); } + + private _buttons?: QuickInputButton[]; get buttons(): QuickInputButton[] | undefined { return this._buttons; } set buttons(newButtons: QuickInputButton[] | undefined) { this._buttons = newButtons; } - constructor(protected repository: Repository, protected ref: Ref, protected _buttons?: QuickInputButton[]) { } + constructor(protected readonly ref: Ref) { } +} - async run(opts?: { detached?: boolean }): Promise { +class CheckoutItem extends RefItem { + + async run(repository: Repository, opts?: { detached?: boolean }): Promise { if (!this.ref.name) { return; } - const config = workspace.getConfiguration('git', Uri.file(this.repository.root)); + const config = workspace.getConfiguration('git', Uri.file(repository.root)); const pullBeforeCheckout = config.get('pullBeforeCheckout', false) === true; const treeish = opts?.detached ? this.ref.commit ?? this.ref.name : this.ref.name; - await this.repository.checkout(treeish, { ...opts, pullBeforeCheckout }); + await repository.checkout(treeish, { ...opts, pullBeforeCheckout }); } } -class CheckoutTagItem extends CheckoutItem { +class CheckoutProtectedItem extends CheckoutItem { - override get label(): string { return `$(tag) ${this.ref.name || this.shortCommit}`; } - override get description(): string { - return l10n.t('Tag at {0}', this.shortCommit); + override get label(): string { + return `$(lock) ${this.ref.name ?? this.shortCommit}`; } - override async run(opts?: { detached?: boolean }): Promise { - if (!this.ref.name) { - return; - } - - await this.repository.checkout(this.ref.name, opts); - } } -class CheckoutRemoteHeadItem extends CheckoutItem { +class CheckoutRemoteHeadItem extends RefItem { - override get label(): string { return `$(cloud) ${this.ref.name || this.shortCommit}`; } - override get description(): string { - return l10n.t('Remote branch at {0}', this.shortCommit); - } - - override async run(opts?: { detached?: boolean }): Promise { + async run(repository: Repository, opts?: { detached?: boolean }): Promise { if (!this.ref.name) { return; } if (opts?.detached) { - await this.repository.checkout(this.ref.commit ?? this.ref.name, opts); + await repository.checkout(this.ref.commit ?? this.ref.name, opts); return; } - const branches = await this.repository.findTrackingBranches(this.ref.name); + const branches = await repository.findTrackingBranches(this.ref.name); if (branches.length > 0) { - await this.repository.checkout(branches[0].name!, opts); + await repository.checkout(branches[0].name!, opts); } else { - await this.repository.checkoutTracking(this.ref.name, opts); + await repository.checkoutTracking(this.ref.name, opts); } } } -class BranchDeleteItem implements QuickPickItem { +class CheckoutTagItem extends RefItem { - private get shortCommit(): string { return (this.ref.commit || '').substr(0, 8); } - get branchName(): string | undefined { return this.ref.name; } - get label(): string { return this.branchName || ''; } - get description(): string { return this.shortCommit; } - - constructor(private ref: Ref) { } - - async run(repository: Repository, force?: boolean): Promise { - if (!this.branchName) { + async run(repository: Repository, opts?: { detached?: boolean }): Promise { + if (!this.ref.name) { return; } - await repository.deleteBranch(this.branchName, force); + + await repository.checkout(this.ref.name, opts); } } -class MergeItem implements QuickPickItem { +class BranchDeleteItem extends RefItem { - get label(): string { return this.ref.name || ''; } - get description(): string { return this.ref.name || ''; } + async run(repository: Repository, force?: boolean): Promise { + if (this.ref.name) { + await repository.deleteBranch(this.ref.name, force); + } + } +} - constructor(protected ref: Ref) { } +class TagDeleteItem extends RefItem { async run(repository: Repository): Promise { - await repository.merge(this.ref.name! || this.ref.commit!); + if (this.ref.name) { + await repository.deleteTag(this.ref.name); + } } } -class RebaseItem implements QuickPickItem { +class RemoteTagDeleteItem extends RefItem { - get label(): string { return this.ref.name || ''; } - description: string = ''; + override get description(): string { + return l10n.t('Remote tag at {0}', this.shortCommit); + } - constructor(readonly ref: Ref) { } + async run(repository: Repository, remote: string): Promise { + if (this.ref.name) { + await repository.deleteRemoteTag(remote, this.ref.name); + } + } +} + +class MergeItem extends RefItem { + + async run(repository: Repository): Promise { + if (this.ref.name || this.ref.commit) { + await repository.merge(this.ref.name ?? this.ref.commit!); + } + } +} + +class RebaseItem extends RefItem { async run(repository: Repository): Promise { if (this.ref?.name) { @@ -131,22 +201,11 @@ class RebaseItem implements QuickPickItem { } } -class CreateBranchItem implements QuickPickItem { - get label(): string { return '$(plus) ' + l10n.t('Create new branch...'); } - get description(): string { return ''; } - get alwaysShow(): boolean { return true; } -} +class RebaseUpstreamItem extends RebaseItem { -class CreateBranchFromItem implements QuickPickItem { - get label(): string { return '$(plus) ' + l10n.t('Create new branch from...'); } - get description(): string { return ''; } - get alwaysShow(): boolean { return true; } -} - -class CheckoutDetachedItem implements QuickPickItem { - get label(): string { return '$(debug-disconnect) ' + l10n.t('Checkout detached...'); } - get description(): string { return ''; } - get alwaysShow(): boolean { return true; } + override get description(): string { + return '(upstream)'; + } } class HEADItem implements QuickPickItem { @@ -254,7 +313,7 @@ async function categorizeResourceByResolution(resources: Resource[]): Promise<{ return { merge, resolved, unresolved, deletionConflicts }; } -async function createCheckoutItems(repository: Repository, detached = false): Promise { +async function createCheckoutItems(repository: Repository, detached = false): Promise { const config = workspace.getConfiguration('git'); const checkoutTypeConfig = config.get('checkoutType'); let checkoutTypes: string[]; @@ -273,39 +332,13 @@ async function createCheckoutItems(repository: Repository, detached = false): Pr } const refs = await repository.getRefs(); - const processors = checkoutTypes.map(type => getCheckoutProcessor(repository, type)) - .filter(p => !!p) as CheckoutProcessor[]; - - for (const ref of refs) { - if (!detached && ref.name === 'origin/HEAD') { - continue; - } - - for (const processor of processors) { - processor.onRef(ref); - } - } + const refProcessors = checkoutTypes.map(type => getCheckoutRefProcessor(repository, type)) + .filter(p => !!p) as RefProcessor[]; const buttons = await getRemoteRefItemButtons(repository); - let fallbackRemoteButtons: RemoteSourceActionButton[] | undefined = []; - const remote = repository.remotes.find(r => r.pushUrl === repository.HEAD?.remote || r.fetchUrl === repository.HEAD?.remote) ?? repository.remotes[0]; - const remoteUrl = remote?.pushUrl ?? remote?.fetchUrl; - if (remoteUrl) { - fallbackRemoteButtons = buttons.get(remoteUrl); - } + const itemsProcessor = new CheckoutItemsProcessor(refProcessors, repository, buttons, detached); - return processors.reduce((r, p) => r.concat(...p.items.map((item) => { - if (item.refRemote) { - const matchingRemote = repository.remotes.find((remote) => remote.name === item.refRemote); - const remoteUrl = matchingRemote?.pushUrl ?? matchingRemote?.fetchUrl; - if (remoteUrl) { - item.buttons = buttons.get(item.refRemote); - } - } - - item.buttons = fallbackRemoteButtons; - return item; - })), []); + return itemsProcessor.processRefs(refs); } type RemoteSourceActionButton = { @@ -336,30 +369,181 @@ async function getRemoteRefItemButtons(repository: Repository) { return remoteUrlsToActions; } -class CheckoutProcessor { +class RefProcessor { + protected readonly refs: Ref[] = []; - private refs: Ref[] = []; - get items(): CheckoutItem[] { return this.refs.map(r => new this.ctor(this.repository, r)); } - constructor(private repository: Repository, private type: RefType, private ctor: { new(repository: Repository, ref: Ref): CheckoutItem }) { } + get items(): QuickPickItem[] { + const items = this.refs.map(r => new this.ctor(r)); + return items.length === 0 ? items : [new RefItemSeparator(this.type), ...items]; + } - onRef(ref: Ref): void { - if (ref.type === this.type) { - this.refs.push(ref); + constructor(protected readonly type: RefType, protected readonly ctor: { new(ref: Ref): QuickPickItem } = RefItem) { } + + processRef(ref: Ref): boolean { + if (!ref.name && !ref.commit) { + return false; } + if (ref.type !== this.type) { + return false; + } + + this.refs.push(ref); + return true; } } -function getCheckoutProcessor(repository: Repository, type: string): CheckoutProcessor | undefined { - switch (type) { - case 'local': - return new CheckoutProcessor(repository, RefType.Head, CheckoutItem); - case 'remote': - return new CheckoutProcessor(repository, RefType.RemoteHead, CheckoutRemoteHeadItem); - case 'tags': - return new CheckoutProcessor(repository, RefType.Tag, CheckoutTagItem); +class RefItemsProcessor { + + constructor(protected readonly processors: RefProcessor[]) { } + + processRefs(refs: Ref[]): QuickPickItem[] { + for (const ref of refs) { + for (const processor of this.processors) { + if (processor.processRef(ref)) { + break; + } + } + } + + const result: QuickPickItem[] = []; + for (const processor of this.processors) { + result.push(...processor.items); + } + + return result; + } +} + +class RebaseItemsProcessors extends RefItemsProcessor { + + private upstreamName: string | undefined; + + constructor(private readonly repository: Repository) { + super([ + new RefProcessor(RefType.Head, RebaseItem), + new RefProcessor(RefType.RemoteHead, RebaseItem) + ]); + + if (this.repository.HEAD?.upstream) { + this.upstreamName = `${this.repository.HEAD?.upstream.remote}/${this.repository.HEAD?.upstream.name}`; + } } - return undefined; + override processRefs(refs: Ref[]): QuickPickItem[] { + const result: QuickPickItem[] = []; + + for (const ref of refs) { + if (ref.name === this.repository.HEAD?.name) { + continue; + } + + if (ref.name === this.upstreamName) { + result.push(new RebaseUpstreamItem(ref)); + continue; + } + + for (const processor of this.processors) { + if (processor.processRef(ref)) { + break; + } + } + } + + for (const processor of this.processors) { + result.push(...processor.items); + } + + return result; + } +} + +class CheckoutRefProcessor extends RefProcessor { + + override get items(): QuickPickItem[] { + const items = this.refs.map(ref => { + return this.repository.isBranchProtected(ref) ? + new CheckoutProtectedItem(ref) : + new CheckoutItem(ref); + }); + + return items.length === 0 ? items : [new RefItemSeparator(this.type), ...items]; + } + + constructor(private readonly repository: Repository) { + super(RefType.Head); + } +} + +class CheckoutItemsProcessor extends RefItemsProcessor { + + private defaultButtons: RemoteSourceActionButton[] | undefined; + + constructor( + processors: RefProcessor[], + private readonly repository: Repository, + private readonly buttons: Map, + private readonly detached = false) { + super(processors); + + // Default button(s) + const remote = repository.remotes.find(r => r.pushUrl === repository.HEAD?.remote || r.fetchUrl === repository.HEAD?.remote) ?? repository.remotes[0]; + const remoteUrl = remote?.pushUrl ?? remote?.fetchUrl; + if (remoteUrl) { + this.defaultButtons = buttons.get(remoteUrl); + } + } + + override processRefs(refs: Ref[]): QuickPickItem[] { + for (const ref of refs) { + if (!this.detached && ref.name === 'origin/HEAD') { + continue; + } + + for (const processor of this.processors) { + if (processor.processRef(ref)) { + break; + } + } + } + + const result: QuickPickItem[] = []; + for (const processor of this.processors) { + for (const item of processor.items) { + if (!(item instanceof RefItem)) { + result.push(item); + continue; + } + + // Button(s) + if (item.refRemote) { + const matchingRemote = this.repository.remotes.find((remote) => remote.name === item.refRemote); + const remoteUrl = matchingRemote?.pushUrl ?? matchingRemote?.fetchUrl; + if (remoteUrl) { + item.buttons = this.buttons.get(item.refRemote); + } + } else { + item.buttons = this.defaultButtons; + } + + result.push(item); + } + } + + return result; + } +} + +function getCheckoutRefProcessor(repository: Repository, type: string): RefProcessor | undefined { + switch (type) { + case 'local': + return new CheckoutRefProcessor(repository); + case 'remote': + return new RefProcessor(RefType.RemoteHead, CheckoutRemoteHeadItem); + case 'tags': + return new RefProcessor(RefType.Tag, CheckoutTagItem); + default: + return undefined; + } } function getRepositoryLabel(repositoryRoot: string): string { @@ -380,12 +564,6 @@ function sanitizeRemoteName(name: string) { return name && name.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$|\[|\]$/g, '-'); } -class TagItem implements QuickPickItem { - get label(): string { return `$(tag) ${this.ref.name ?? ''}`; } - get description(): string { return this.ref.commit?.substr(0, 8) ?? ''; } - constructor(readonly ref: Ref) { } -} - enum PushType { Push, PushTo, @@ -454,7 +632,7 @@ export class CommandCenter { @command('git.refresh', { repository: true }) async refresh(repository: Repository): Promise { - await repository.status(); + await repository.refresh(); } @command('git.openResource') @@ -865,6 +1043,7 @@ export class CommandCenter { const choices = [open, openNewWindow]; if (!askToOpen) { + await this.model.openRepository(repositoryPath); return; } @@ -951,6 +1130,16 @@ export class CommandCenter { this.model.close(repository); } + @command('git.closeOtherRepositories', { repository: true }) + async closeOtherRepositories(repository: Repository): Promise { + for (const r of this.model.repositories) { + if (r === repository) { + continue; + } + this.model.close(r); + } + } + @command('git.openFile') async openFile(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise { const preserveFocus = arg instanceof Resource; @@ -2208,7 +2397,7 @@ export class CommandCenter { const picks: QuickPickItem[] = []; if (!opts?.detached) { - picks.push(createBranch, createBranchFrom, checkoutDetached, { label: '', kind: QuickPickItemKind.Separator }); + picks.push(createBranch, createBranchFrom, checkoutDetached); } const quickpick = window.createQuickPick(); @@ -2250,7 +2439,7 @@ export class CommandCenter { const item = choice as CheckoutItem; try { - await item.run(opts); + await item.run(repository, opts); } catch (err) { if (err.gitErrorCode !== GitErrorCodes.DirtyWorkTree) { throw err; @@ -2263,10 +2452,10 @@ export class CommandCenter { if (choice === force) { await this.cleanAll(repository); - await item.run(opts); + await item.run(repository, opts); } else if (choice === stash || choice === migrate) { if (await this._stash(repository)) { - await item.run(opts); + await item.run(repository, opts); if (choice === migrate) { await this.stashPopLatest(repository); @@ -2386,7 +2575,14 @@ export class CommandCenter { if (from) { const getRefPicks = async () => { - return [new HEADItem(repository), ...await createCheckoutItems(repository)]; + const refs = await repository.getRefs(); + const refProcessors = new RefItemsProcessor([ + new RefProcessor(RefType.Head), + new RefProcessor(RefType.RemoteHead), + new RefProcessor(RefType.Tag) + ]); + + return [new HEADItem(repository), ...refProcessors.processRefs(refs)]; }; const placeHolder = l10n.t('Select a ref to create the branch from'); @@ -2396,7 +2592,7 @@ export class CommandCenter { return; } - if (choice.refName) { + if (choice instanceof RefItem && choice.refName) { target = choice.refName; } } @@ -2426,10 +2622,10 @@ export class CommandCenter { const placeHolder = l10n.t('Select a branch to delete'); const choice = await window.showQuickPick(getBranchPicks(), { placeHolder }); - if (!choice || !choice.branchName) { + if (!choice || !choice.refName) { return; } - name = choice.branchName; + name = choice.refName; run = force => choice.run(repository, force); } @@ -2477,32 +2673,23 @@ export class CommandCenter { @command('git.merge', { repository: true }) async merge(repository: Repository): Promise { - const config = workspace.getConfiguration('git'); - const checkoutType = config.get('checkoutType'); - const includeRemotes = checkoutType === 'all' || checkoutType === 'remote' || checkoutType?.includes('remote'); - - const getBranchPicks = async (): Promise => { + const getQuickPickItems = async (): Promise => { const refs = await repository.getRefs(); + const itemsProcessor = new RefItemsProcessor([ + new RefProcessor(RefType.Head, MergeItem), + new RefProcessor(RefType.RemoteHead, MergeItem), + new RefProcessor(RefType.Tag, MergeItem) + ]); - const heads = refs.filter(ref => ref.type === RefType.Head) - .filter(ref => ref.name || ref.commit) - .map(ref => new MergeItem(ref as Branch)); - - const remoteHeads = (includeRemotes ? refs.filter(ref => ref.type === RefType.RemoteHead) : []) - .filter(ref => ref.name || ref.commit) - .map(ref => new MergeItem(ref as Branch)); - - return [...heads, ...remoteHeads]; + return itemsProcessor.processRefs(refs); }; - const placeHolder = l10n.t('Select a branch to merge from'); - const choice = await window.showQuickPick(getBranchPicks(), { placeHolder }); + const placeHolder = l10n.t('Select a branch or tag to merge from'); + const choice = await window.showQuickPick(getQuickPickItems(), { placeHolder }); - if (!choice) { - return; + if (choice instanceof MergeItem) { + await choice.run(repository); } - - await choice.run(repository); } @command('git.mergeAbort', { repository: true }) @@ -2512,45 +2699,19 @@ export class CommandCenter { @command('git.rebase', { repository: true }) async rebase(repository: Repository): Promise { - const config = workspace.getConfiguration('git'); - const checkoutType = config.get('checkoutType'); - const includeRemotes = checkoutType === 'all' || checkoutType === 'remote' || checkoutType?.includes('remote'); - - const getBranchPicks = async () => { + const getQuickPickItems = async (): Promise => { const refs = await repository.getRefs(); + const itemsProcessor = new RebaseItemsProcessors(repository); - const heads = refs.filter(ref => ref.type === RefType.Head) - .filter(ref => ref.name !== repository.HEAD?.name) - .filter(ref => ref.name || ref.commit); - - const remoteHeads = (includeRemotes ? refs.filter(ref => ref.type === RefType.RemoteHead) : []) - .filter(ref => ref.name || ref.commit); - - const picks = [...heads, ...remoteHeads].map(ref => new RebaseItem(ref)); - - // set upstream branch as first - if (repository.HEAD?.upstream) { - const upstreamName = `${repository.HEAD?.upstream.remote}/${repository.HEAD?.upstream.name}`; - const index = picks.findIndex(e => e.ref.name === upstreamName); - - if (index > -1) { - const [ref] = picks.splice(index, 1); - ref.description = '(upstream)'; - picks.unshift(ref); - } - } - - return picks; + return itemsProcessor.processRefs(refs); }; const placeHolder = l10n.t('Select a branch to rebase onto'); - const choice = await window.showQuickPick(getBranchPicks(), { placeHolder }); + const choice = await window.showQuickPick(getQuickPickItems(), { placeHolder }); - if (!choice) { - return; + if (choice instanceof RebaseItem) { + await choice.run(repository); } - - await choice.run(repository); } @command('git.createTag', { repository: true }) @@ -2577,16 +2738,16 @@ export class CommandCenter { @command('git.deleteTag', { repository: true }) async deleteTag(repository: Repository): Promise { - const tagPicks = async (): Promise => { + const tagPicks = async (): Promise => { const remoteTags = await repository.getRefs({ pattern: 'refs/tags' }); - return remoteTags.length === 0 ? [{ label: l10n.t('$(info) This repository has no tags.') }] : remoteTags.map(ref => new TagItem(ref)); + return remoteTags.length === 0 ? [{ label: l10n.t('$(info) This repository has no tags.') }] : remoteTags.map(ref => new TagDeleteItem(ref)); }; const placeHolder = l10n.t('Select a tag to delete'); - const choice = await window.showQuickPick(tagPicks(), { placeHolder }); + const choice = await window.showQuickPick(tagPicks(), { placeHolder }); - if (choice && choice instanceof TagItem && choice.ref.name) { - await repository.deleteTag(choice.ref.name); + if (choice instanceof TagDeleteItem) { + await choice.run(repository); } } @@ -2613,7 +2774,7 @@ export class CommandCenter { remoteName = remotePick.remoteName; } - const remoteTagPicks = async (): Promise => { + const remoteTagPicks = async (): Promise => { const remoteTagsRaw = await repository.getRemoteRefs(remoteName, { tags: true }); // Deduplicate annotated and lightweight tags @@ -2628,14 +2789,14 @@ export class CommandCenter { } } - return remoteTags.length === 0 ? [{ label: l10n.t('$(info) Remote "{0}" has no tags.', remoteName) }] : remoteTags.map(ref => new TagItem(ref)); + return remoteTags.length === 0 ? [{ label: l10n.t('$(info) Remote "{0}" has no tags.', remoteName) }] : remoteTags.map(ref => new RemoteTagDeleteItem(ref)); }; - const tagPickPlaceholder = l10n.t('Select a tag to delete'); - const remoteTagPick = await window.showQuickPick(remoteTagPicks(), { placeHolder: tagPickPlaceholder }); + const tagPickPlaceholder = l10n.t('Select a remote tag to delete'); + const remoteTagPick = await window.showQuickPick(remoteTagPicks(), { placeHolder: tagPickPlaceholder }); - if (remoteTagPick && remoteTagPick instanceof TagItem && remoteTagPick.ref.name) { - await repository.deleteRemoteTag(remoteName, remoteTagPick.ref.name); + if (remoteTagPick instanceof RemoteTagDeleteItem) { + await remoteTagPick.run(repository, remoteName); } } @@ -2725,21 +2886,20 @@ export class CommandCenter { remoteName = remotePick.label; } - const getBranchPicks = async (): Promise => { - const remoteRefs = await repository.getRefs(); - const remoteRefsFiltered = remoteRefs.filter(r => (r.remote === remoteName)); - return remoteRefsFiltered.map(r => ({ label: r.name! })); + const getBranchPicks = async (): Promise => { + const remoteRefs = await repository.getRefs({ pattern: `refs/remotes/${remoteName}/` }); + return remoteRefs.map(r => new RefItem(r)); }; const branchPlaceHolder = l10n.t('Pick a branch to pull from'); const branchPick = await window.showQuickPick(getBranchPicks(), { placeHolder: branchPlaceHolder }); - if (!branchPick) { + if (!branchPick || !branchPick.refName) { return; } const remoteCharCnt = remoteName.length; - await repository.pullFrom(false, remoteName, branchPick.label.slice(remoteCharCnt + 1)); + await repository.pullFrom(false, remoteName, branchPick.refName.slice(remoteCharCnt + 1)); } @command('git.pull', { repository: true }) @@ -3264,18 +3424,21 @@ export class CommandCenter { } @command('git.stash', { repository: true }) - async stash(repository: Repository): Promise { - await this._stash(repository); + async stash(repository: Repository): Promise { + const result = await this._stash(repository); + return result; } @command('git.stashStaged', { repository: true }) - async stashStaged(repository: Repository): Promise { - await this._stash(repository, false, true); + async stashStaged(repository: Repository): Promise { + const result = await this._stash(repository, false, true); + return result; } @command('git.stashIncludeUntracked', { repository: true }) - async stashIncludeUntracked(repository: Repository): Promise { - await this._stash(repository, true); + async stashIncludeUntracked(repository: Repository): Promise { + const result = await this._stash(repository, true); + return result; } @command('git.stashPop', { repository: true }) @@ -3631,34 +3794,14 @@ export class CommandCenter { } } - @command('git.generateCommitMessage', { repository: true }) - async generateCommitMessage(repository: Repository): Promise { - if (!repository || !this.model.commitMessageProvider) { - return; - } - - await window.withProgress({ location: ProgressLocation.SourceControl }, async () => { - await repository.generateCommitMessage(); - }); - } - - @command('git.generateCommitMessageCancel', { repository: true }) - generateCommitMessageCancel(repository: Repository): void { - if (!repository || !this.model.commitMessageProvider) { - return; - } - - repository.generateCommitMessageCancel(); - } - @command('git.viewChanges', { repository: true }) viewChanges(repository: Repository): void { - this._viewChanges('Changes', repository.workingTreeGroup.resourceStates); + this._viewChanges('Git: Changes', repository.workingTreeGroup.resourceStates); } @command('git.viewStagedChanges', { repository: true }) viewStagedChanges(repository: Repository): void { - this._viewChanges('Staged Changes', repository.indexGroup.resourceStates); + this._viewChanges('Git: Staged Changes', repository.indexGroup.resourceStates); } private _viewChanges(title: string, resources: Resource[]): void { diff --git a/extensions/git/src/commitMessageProvider.ts b/extensions/git/src/commitMessageProvider.ts deleted file mode 100644 index e0a3ccc2210..00000000000 --- a/extensions/git/src/commitMessageProvider.ts +++ /dev/null @@ -1,188 +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 { CancellationToken, Disposable, Event, EventEmitter, Uri, workspace, SourceControlInputBoxActionButton, ThemeIcon, l10n } from 'vscode'; -import { CommitMessageProvider, Status, Repository as ApiRepository } from './api/git'; -import { Repository } from './repository'; -import { dispose } from './util'; - -export interface ICommitMessageProviderRegistry { - readonly onDidChangeCommitMessageProvider: Event; - - commitMessageProvider: CommitMessageProvider | undefined; - registerCommitMessageProvider(provider: CommitMessageProvider): Disposable; -} - -export class TestCommitMessageProvider implements CommitMessageProvider { - - readonly icon = new ThemeIcon('rocket'); - readonly title = 'Generate Commit Message (Test)'; - - private readonly _changesMap = new Map(); - - async provideCommitMessage(repository: ApiRepository, changes: string[], token: CancellationToken): Promise { - console.log('Repository: ', repository.rootUri.fsPath); - - if (token.isCancellationRequested) { - return undefined; - } - - return new Promise(resolve => { - token.onCancellationRequested(() => resolve(undefined)); - - setTimeout(() => { - const attemptCount = this.getAttemptCount(repository, changes); - this._changesMap.set(repository.rootUri.fsPath, [changes, attemptCount]); - - resolve(`Test commit message (Attempt No. ${attemptCount})`); - }, 5000); - }); - } - - private getAttemptCount(repository: ApiRepository, changes: string[]): number { - const [previousChanges, previousCount] = this._changesMap.get(repository.rootUri.fsPath) ?? [[], 1]; - if (previousChanges.length !== changes.length) { - return 1; - } - - for (let index = 0; index < changes.length; index++) { - if (previousChanges[index] !== changes[index]) { - return 1; - } - } - - return previousCount + 1; - } - -} - -interface ActionButtonState { - readonly isGenerating: boolean; - readonly enabled: boolean; -} - -export class GenerateCommitMessageActionButton { - - private _onDidChange = new EventEmitter(); - get onDidChange(): Event { return this._onDidChange.event; } - - private _state: ActionButtonState; - get state() { return this._state; } - set state(state: ActionButtonState) { - if (this._state.enabled === state.enabled && - this._state.isGenerating === state.isGenerating) { - return; - } - - this._state = state; - this._onDidChange.fire(); - } - - get button(): SourceControlInputBoxActionButton | undefined { - if (this.commitMessageProviderRegistry.commitMessageProvider === undefined) { - return undefined; - } - - return this.state.isGenerating ? - { - icon: new ThemeIcon('debug-stop'), - command: { - title: l10n.t('Cancel'), - command: 'git.generateCommitMessageCancel', - arguments: [this.repository.sourceControl] - }, - enabled: this.state.enabled, - } : - { - icon: this.commitMessageProviderRegistry.commitMessageProvider.icon ?? new ThemeIcon('sparkle'), - command: { - title: this.commitMessageProviderRegistry.commitMessageProvider.title, - command: 'git.generateCommitMessage', - arguments: [this.repository.sourceControl] - }, - enabled: this.state.enabled - }; - } - - private disposables: Disposable[] = []; - - constructor( - private readonly repository: Repository, - private readonly commitMessageProviderRegistry: ICommitMessageProviderRegistry - ) { - this._state = { - enabled: false, - isGenerating: false - }; - - const root = Uri.file(repository.root); - this.disposables.push(workspace.onDidChangeConfiguration(e => { - if (e.affectsConfiguration('git.enableSmartCommit', root) || - e.affectsConfiguration('git.smartCommitChanges', root) || - e.affectsConfiguration('git.suggestSmartCommit', root)) { - this.onDidChangeSmartCommitSettings(); - } - })); - repository.onDidRunGitStatus(this.onDidRunGitStatus, this, this.disposables); - repository.onDidStartCommitMessageGeneration(this.onDidStartCommitMessageGeneration, this, this.disposables); - repository.onDidEndCommitMessageGeneration(this.onDidEndCommitMessageGeneration, this, this.disposables); - commitMessageProviderRegistry.onDidChangeCommitMessageProvider(this.onDidChangeCommitMessageProvider, this, this.disposables); - } - - private onDidChangeCommitMessageProvider(): void { - this._onDidChange.fire(); - } - - private onDidStartCommitMessageGeneration(): void { - this.state = { ...this.state, isGenerating: true }; - } - - private onDidEndCommitMessageGeneration(): void { - this.state = { ...this.state, isGenerating: false }; - } - - private onDidChangeSmartCommitSettings(): void { - this.state = { - ...this.state, - enabled: this.repositoryHasChangesToCommit() - }; - } - - private onDidRunGitStatus(): void { - this.state = { - ...this.state, - enabled: this.repositoryHasChangesToCommit() - }; - } - - private repositoryHasChangesToCommit(): boolean { - const config = workspace.getConfiguration('git', Uri.file(this.repository.root)); - const enableSmartCommit = config.get('enableSmartCommit') === true; - const suggestSmartCommit = config.get('suggestSmartCommit') === true; - const smartCommitChanges = config.get<'all' | 'tracked'>('smartCommitChanges', 'all'); - - const resources = [...this.repository.indexGroup.resourceStates]; - - if ( - // Smart commit enabled (all) - (enableSmartCommit && smartCommitChanges === 'all') || - // Smart commit disabled, smart suggestion enabled - (!enableSmartCommit && suggestSmartCommit) - ) { - resources.push(...this.repository.workingTreeGroup.resourceStates); - } - - // Smart commit enabled (tracked only) - if (enableSmartCommit && smartCommitChanges === 'tracked') { - resources.push(...this.repository.workingTreeGroup.resourceStates.filter(r => r.type !== Status.UNTRACKED)); - } - - return resources.length !== 0; - } - - dispose(): void { - this.disposables = dispose(this.disposables); - } -} diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts index 5dde9b26da9..6f768d36ea0 100644 --- a/extensions/git/src/git.ts +++ b/extensions/git/src/git.ts @@ -50,6 +50,8 @@ interface MutableRemote extends Remote { * Log file options. */ export interface LogFileOptions { + /** Optional. Continue listing the history of a file beyond renames */ + readonly follow?: boolean; /** Optional. The maximum number of log entries to retrieve. */ readonly maxEntries?: number | string; /** Optional. The Git sha (hash) to start retrieving log entries from. */ @@ -706,6 +708,12 @@ export class Git { } } +export interface CommitShortStat { + readonly files: number; + readonly insertions: number; + readonly deletions: number; +} + export interface Commit { hash: string; message: string; @@ -715,6 +723,7 @@ export interface Commit { authorEmail?: string; commitDate?: Date; refNames: string[]; + shortStat?: CommitShortStat; } interface GitConfigSection { @@ -866,7 +875,7 @@ export function parseGitRemotes(raw: string): MutableRemote[] { return remotes; } -const commitRegex = /([0-9a-f]{40})\n(.*)\n(.*)\n(.*)\n(.*)\n(.*)\n(.*)(?:\n([^]*?))?(?:\x00)/gm; +const commitRegex = /([0-9a-f]{40})\n(.*)\n(.*)\n(.*)\n(.*)\n(.*)\n(.*)(?:\n([^]*?))?(?:\x00)(?:\n((?:.*)files? changed(?:.*))$)?/gm; export function parseGitCommits(data: string): Commit[] { const commits: Commit[] = []; @@ -879,6 +888,7 @@ export function parseGitCommits(data: string): Commit[] { let parents; let refNames; let message; + let shortStat; let match; do { @@ -887,7 +897,7 @@ export function parseGitCommits(data: string): Commit[] { break; } - [, ref, authorName, authorEmail, authorDate, commitDate, parents, refNames, message] = match; + [, ref, authorName, authorEmail, authorDate, commitDate, parents, refNames, message, shortStat] = match; if (message[message.length - 1] === '\n') { message = message.substr(0, message.length - 1); @@ -902,13 +912,27 @@ export function parseGitCommits(data: string): Commit[] { authorName: ` ${authorName}`.substr(1), authorEmail: ` ${authorEmail}`.substr(1), commitDate: new Date(Number(commitDate) * 1000), - refNames: refNames.split(',').map(s => s.trim()) + refNames: refNames.split(',').map(s => s.trim()), + shortStat: shortStat ? parseGitDiffShortStat(shortStat) : undefined }); } while (true); return commits; } +const diffShortStatRegex = /(\d+) files? changed(?:, (\d+) insertions?\(\+\))?(?:, (\d+) deletions?\(-\))?/; + +function parseGitDiffShortStat(data: string): CommitShortStat { + const matches = data.trim().match(diffShortStatRegex); + + if (!matches) { + return { files: 0, insertions: 0, deletions: 0 }; + } + + const [, files, insertions = undefined, deletions = undefined] = matches; + return { files: parseInt(files), insertions: parseInt(insertions ?? '0'), deletions: parseInt(deletions ?? '0') }; +} + interface LsTreeElement { mode: string; type: string; @@ -993,8 +1017,14 @@ export class Repository { args.push(value); } - const result = await this.exec(args, options); - return result.stdout.trim(); + try { + const result = await this.exec(args, options); + return result.stdout.trim(); + } + catch (err) { + this.logger.warn(`git config failed: ${err.message}`); + return ''; + } } async getConfigs(scope: string): Promise<{ key: string; value: string }[]> { @@ -1018,6 +1048,14 @@ export class Repository { async log(options?: LogOptions): Promise { const args = ['log', `--format=${COMMIT_FORMAT}`, '-z']; + if (options?.shortStats) { + args.push('--shortstat'); + + if (this._git.compareGitVersionTo('2.31') !== -1) { + args.push('--diff-merges=first-parent'); + } + } + if (options?.reverse) { args.push('--reverse', '--ancestry-path'); } @@ -1065,15 +1103,28 @@ export class Repository { args.push('--author-date-order'); } - args.push('--', uri.fsPath); - - const result = await this.exec(args); - if (result.exitCode) { - // No file history, e.g. a new file or untracked - return []; + if (options?.follow) { + args.push('--follow'); } - return parseGitCommits(result.stdout); + args.push('--', uri.fsPath); + + try { + const result = await this.exec(args); + if (result.exitCode) { + // No file history, e.g. a new file or untracked + return []; + } + + return parseGitCommits(result.stdout); + } catch (err) { + // Repository has no commits yet + if (/does not have any commits yet/.test(err.stderr)) { + return []; + } + + throw err; + } } async reflog(ref: string, pattern: string): Promise { @@ -1324,15 +1375,7 @@ export class Repository { return { files: 0, insertions: 0, deletions: 0 }; } - const regex = /(\d+) files? changed(?:, (\d+) insertions\(\+\))?(?:, (\d+) deletions\(-\))?/; - const matches = result.stdout.trim().match(regex); - - if (!matches) { - return { files: 0, insertions: 0, deletions: 0 }; - } - - const [, files, insertions = undefined, deletions = undefined] = matches; - return { files: parseInt(files), insertions: parseInt(insertions ?? '0'), deletions: parseInt(deletions ?? '0') }; + return parseGitDiffShortStat(result.stdout.trim()); } private async diffFiles(cached: boolean, ref?: string): Promise { @@ -1416,11 +1459,16 @@ export class Repository { return result; } - async getMergeBase(ref1: string, ref2: string): Promise { - const args = ['merge-base', ref1, ref2]; - const result = await this.exec(args); + async getMergeBase(ref1: string, ref2: string): Promise { + try { + const args = ['merge-base', ref1, ref2]; + const result = await this.exec(args); - return result.stdout.trim(); + return result.stdout.trim(); + } + catch (err) { + return undefined; + } } async hashObject(data: string): Promise { @@ -2170,6 +2218,13 @@ export class Repository { if (HEAD.name) { // Branch HEAD = await this.getBranch(HEAD.name); + + // Upstream commit + if (HEAD && HEAD.upstream) { + const ref = `refs/remotes/${HEAD.upstream.remote}/${HEAD.upstream.name}`; + const commit = await this.revParse(ref); + HEAD = { ...HEAD, upstream: { ...HEAD.upstream, commit } }; + } } else if (HEAD.commit) { // Tag || Commit const tags = await this.getRefs({ pattern: 'refs/tags' }); @@ -2488,7 +2543,8 @@ export class Repository { return branch; } - return Promise.reject(new Error('No such branch')); + this.logger.warn(`No such branch: ${name}.`); + return Promise.reject(new Error(`No such branch: ${name}.`)); } async getDefaultBranch(): Promise { @@ -2566,13 +2622,26 @@ export class Repository { } async getCommitCount(range: string): Promise<{ ahead: number; behind: number }> { - const result = await this.exec(['rev-list', '--count', '--left-right', range]); + const args = ['rev-list', '--count', '--left-right', range]; + + if (isWindows) { + args.splice(0, 0, '-c', 'core.longpaths=true'); + } + + const result = await this.exec(args); const [ahead, behind] = result.stdout.trim().split('\t'); return { ahead: Number(ahead) || 0, behind: Number(behind) || 0 }; } async revParse(ref: string): Promise { + try { + const result = await fs.readFile(path.join(this.dotGit.path, ref), 'utf8'); + return result.trim(); + } catch (err) { + this.logger.warn(err.message); + } + try { const result = await this.exec(['rev-parse', ref]); if (result.stderr) { diff --git a/extensions/git/src/historyProvider.ts b/extensions/git/src/historyProvider.ts index 0256ffdcc1c..a6e97c63763 100644 --- a/extensions/git/src/historyProvider.ts +++ b/extensions/git/src/historyProvider.ts @@ -4,32 +4,23 @@ *--------------------------------------------------------------------------------------------*/ -import { Disposable, Event, EventEmitter, FileDecoration, FileDecorationProvider, SourceControlActionButton, SourceControlHistoryItem, SourceControlHistoryItemChange, SourceControlHistoryItemGroup, SourceControlHistoryOptions, SourceControlHistoryProvider, ThemeIcon, Uri, window, l10n } from 'vscode'; +import { Disposable, Event, EventEmitter, FileDecoration, FileDecorationProvider, SourceControlHistoryItem, SourceControlHistoryItemChange, SourceControlHistoryItemGroup, SourceControlHistoryOptions, SourceControlHistoryProvider, ThemeIcon, Uri, window, l10n, LogOutputChannel } from 'vscode'; import { Repository, Resource } from './repository'; -import { IDisposable } from './util'; +import { IDisposable, filterEvent } from './util'; import { toGitUri } from './uri'; -import { SyncActionButton } from './actionButton'; -import { RefType, Status } from './api/git'; +import { Branch, RefType, Status } from './api/git'; import { emojify, ensureEmojis } from './emoji'; +import { Operation } from './operation'; export class GitHistoryProvider implements SourceControlHistoryProvider, FileDecorationProvider, IDisposable { - private readonly _onDidChangeActionButton = new EventEmitter(); - readonly onDidChangeActionButton: Event = this._onDidChangeActionButton.event; - private readonly _onDidChangeCurrentHistoryItemGroup = new EventEmitter(); readonly onDidChangeCurrentHistoryItemGroup: Event = this._onDidChangeCurrentHistoryItemGroup.event; private readonly _onDidChangeDecorations = new EventEmitter(); readonly onDidChangeFileDecorations: Event = this._onDidChangeDecorations.event; - private _actionButton: SourceControlActionButton | undefined; - get actionButton(): SourceControlActionButton | undefined { return this._actionButton; } - set actionButton(button: SourceControlActionButton | undefined) { - this._actionButton = button; - this._onDidChangeActionButton.fire(); - } - + private _HEAD: Branch | undefined; private _currentHistoryItemGroup: SourceControlHistoryItemGroup | undefined; get currentHistoryItemGroup(): SourceControlHistoryItemGroup | undefined { return this._currentHistoryItemGroup; } @@ -42,27 +33,38 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec private disposables: Disposable[] = []; - constructor(protected readonly repository: Repository) { - const actionButton = new SyncActionButton(repository); - this.actionButton = actionButton.button; - this.disposables.push(actionButton); - + constructor(protected readonly repository: Repository, private readonly logger: LogOutputChannel) { this.disposables.push(repository.onDidRunGitStatus(this.onDidRunGitStatus, this)); - this.disposables.push(actionButton.onDidChange(() => this.actionButton = actionButton.button)); + this.disposables.push(filterEvent(repository.onDidRunOperation, e => e.operation === Operation.Refresh)(() => this._onDidChangeCurrentHistoryItemGroup.fire())); this.disposables.push(window.registerFileDecorationProvider(this)); } private async onDidRunGitStatus(): Promise { - if (!this.repository.HEAD?.name || !this.repository.HEAD?.commit) { return; } + // Check if HEAD has changed + if (this._HEAD?.name === this.repository.HEAD?.name && + this._HEAD?.commit === this.repository.HEAD?.commit && + this._HEAD?.upstream?.name === this.repository.HEAD?.upstream?.name && + this._HEAD?.upstream?.remote === this.repository.HEAD?.upstream?.remote && + this._HEAD?.upstream?.commit === this.repository.HEAD?.upstream?.commit) { + return; + } + + this._HEAD = this.repository.HEAD; + + // Check if HEAD supports incoming/outgoing (not a tag, not detached) + if (!this._HEAD?.name || !this._HEAD?.commit || this._HEAD.type === RefType.Tag) { + this.currentHistoryItemGroup = undefined; + return; + } this.currentHistoryItemGroup = { - id: `refs/heads/${this.repository.HEAD.name}`, - label: this.repository.HEAD.name, - upstream: this.repository.HEAD.upstream ? + id: `refs/heads/${this._HEAD.name}`, + label: this._HEAD.name, + upstream: this._HEAD.upstream ? { - id: `refs/remotes/${this.repository.HEAD.upstream.remote}/${this.repository.HEAD.upstream.name}`, - label: `${this.repository.HEAD.upstream.remote}/${this.repository.HEAD.upstream.name}`, + id: `refs/remotes/${this._HEAD.upstream.remote}/${this._HEAD.upstream.name}`, + label: `${this._HEAD.upstream.remote}/${this._HEAD.upstream.name}`, } : undefined }; } @@ -80,7 +82,7 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec const historyItemGroupIdRef = await this.repository.revParse(historyItemGroupId) ?? ''; const [commits, summary] = await Promise.all([ - this.repository.log({ range: `${optionsRef}..${historyItemGroupIdRef}`, sortByAuthorDate: true }), + this.repository.log({ range: `${optionsRef}..${historyItemGroupIdRef}`, shortStats: true, sortByAuthorDate: true }), this.getSummaryHistoryItem(optionsRef, historyItemGroupIdRef) ]); @@ -97,7 +99,8 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec label: emojify(subject), description: commit.authorName, icon: new ThemeIcon('git-commit'), - timestamp: commit.authorDate?.getTime() + timestamp: commit.authorDate?.getTime(), + statistics: commit.shortStat ?? { files: 0, insertions: 0, deletions: 0 }, }; })); @@ -154,19 +157,24 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec } // Branch base - const branchBase = await this.repository.getBranchBase(historyItemGroupId); + try { + const branchBase = await this.repository.getBranchBase(historyItemGroupId); - if (branchBase?.name && branchBase?.type === RefType.Head) { - return { - id: `refs/heads/${branchBase.name}`, - label: branchBase.name - }; + if (branchBase?.name && branchBase?.type === RefType.Head) { + return { + id: `refs/heads/${branchBase.name}`, + label: branchBase.name + }; + } + if (branchBase?.name && branchBase.remote && branchBase?.type === RefType.RemoteHead) { + return { + id: `refs/remotes/${branchBase.remote}/${branchBase.name}`, + label: `${branchBase.remote}/${branchBase.name}` + }; + } } - if (branchBase?.name && branchBase.remote && branchBase?.type === RefType.RemoteHead) { - return { - id: `refs/remotes/${branchBase.remote}/${branchBase.name}`, - label: `${branchBase.remote}/${branchBase.name}` - }; + catch (err) { + this.logger.error(`Failed to get branch base for '${historyItemGroupId}': ${err.message}`); } return undefined; @@ -174,12 +182,18 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec async resolveHistoryItemGroupCommonAncestor(refId1: string, refId2: string): Promise<{ id: string; ahead: number; behind: number } | undefined> { const ancestor = await this.repository.getMergeBase(refId1, refId2); - if (ancestor === '') { + if (!ancestor) { return undefined; } - const commitCount = await this.repository.getCommitCount(`${refId1}...${refId2}`); - return { id: ancestor, ahead: commitCount.ahead, behind: commitCount.behind }; + try { + const commitCount = await this.repository.getCommitCount(`${refId1}...${refId2}`); + return { id: ancestor, ahead: commitCount.ahead, behind: commitCount.behind }; + } catch (err) { + this.logger.error(`Failed to get ahead/behind for '${refId1}...${refId2}': ${err.message}`); + } + + return undefined; } provideFileDecoration(uri: Uri): FileDecoration | undefined { diff --git a/extensions/git/src/ipc/ipcServer.ts b/extensions/git/src/ipc/ipcServer.ts index 8481aa4a35d..a7142fe22e1 100644 --- a/extensions/git/src/ipc/ipcServer.ts +++ b/extensions/git/src/ipc/ipcServer.ts @@ -30,7 +30,7 @@ export interface IIPCHandler { export async function createIPCServer(context?: string): Promise { const server = http.createServer(); - const hash = crypto.createHash('sha1'); + const hash = crypto.createHash('sha256'); if (!context) { const buffer = await new Promise((c, e) => crypto.randomBytes(20, (err, buf) => err ? e(err) : c(buf))); @@ -39,7 +39,7 @@ export async function createIPCServer(context?: string): Promise { hash.update(context); } - const ipcHandlePath = getIPCHandlePath(hash.digest('hex').substr(0, 10)); + const ipcHandlePath = getIPCHandlePath(hash.digest('hex').substring(0, 10)); if (process.platform !== 'win32') { try { diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts index 4632cd83bb3..ccab4e07857 100644 --- a/extensions/git/src/model.ts +++ b/extensions/git/src/model.ts @@ -12,14 +12,13 @@ import { Git } from './git'; import * as path from 'path'; import * as fs from 'fs'; import { fromGitUri } from './uri'; -import { APIState as State, CredentialsProvider, PushErrorHandler, PublishEvent, RemoteSourcePublisher, PostCommitCommandsProvider, BranchProtectionProvider, CommitMessageProvider } from './api/git'; +import { APIState as State, CredentialsProvider, PushErrorHandler, PublishEvent, RemoteSourcePublisher, PostCommitCommandsProvider, BranchProtectionProvider } from './api/git'; import { Askpass } from './askpass'; import { IPushErrorHandlerRegistry } from './pushError'; import { ApiRepository } from './api/api1'; import { IRemoteSourcePublisherRegistry } from './remotePublisher'; import { IPostCommitCommandsProviderRegistry } from './postCommitCommands'; import { IBranchProtectionProviderRegistry } from './branchProtection'; -import { ICommitMessageProviderRegistry } from './commitMessageProvider'; class RepositoryPick implements QuickPickItem { @memoize get label(): string { @@ -171,7 +170,7 @@ class UnsafeRepositoriesManager { } } -export class Model implements IRepositoryResolver, IBranchProtectionProviderRegistry, ICommitMessageProviderRegistry, IRemoteSourcePublisherRegistry, IPostCommitCommandsProviderRegistry, IPushErrorHandlerRegistry { +export class Model implements IRepositoryResolver, IBranchProtectionProviderRegistry, IRemoteSourcePublisherRegistry, IPostCommitCommandsProviderRegistry, IPushErrorHandlerRegistry { private _onDidOpenRepository = new EventEmitter(); readonly onDidOpenRepository: Event = this._onDidOpenRepository.event; @@ -238,14 +237,6 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi private pushErrorHandlers = new Set(); - private _commitMessageProvider: CommitMessageProvider | undefined; - get commitMessageProvider(): CommitMessageProvider | undefined { - return this._commitMessageProvider; - } - - private _onDidChangeCommitMessageProvider = new EventEmitter(); - readonly onDidChangeCommitMessageProvider = this._onDidChangeCommitMessageProvider.event; - private _unsafeRepositoriesManager: UnsafeRepositoriesManager; get unsafeRepositories(): string[] { return this._unsafeRepositoriesManager.repositories; @@ -587,7 +578,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi // Open repository const [dotGit, repositoryRootRealPath] = await Promise.all([this.git.getRepositoryDotGit(repositoryRoot), this.getRepositoryRootRealPath(repositoryRoot)]); - const repository = new Repository(this.git.open(repositoryRoot, repositoryRootRealPath, dotGit, this.logger), this, this, this, this, this, this, this.globalState, this.logger, this.telemetryReporter); + const repository = new Repository(this.git.open(repositoryRoot, repositoryRootRealPath, dotGit, this.logger), this, this, this, this, this, this.globalState, this.logger, this.telemetryReporter); this.open(repository); this._closedRepositoriesManager.deleteRepository(repository.root); @@ -948,16 +939,6 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi return toDisposable(() => this.pushErrorHandlers.delete(handler)); } - registerCommitMessageProvider(provider: CommitMessageProvider): Disposable { - this._commitMessageProvider = provider; - this._onDidChangeCommitMessageProvider.fire(); - - return toDisposable(() => { - this._commitMessageProvider = undefined; - this._onDidChangeCommitMessageProvider.fire(); - }); - } - getPushErrorHandlers(): PushErrorHandler[] { return [...this.pushErrorHandlers]; } diff --git a/extensions/git/src/operation.ts b/extensions/git/src/operation.ts index 44ee21f2325..15e494f5fab 100644 --- a/extensions/git/src/operation.ts +++ b/extensions/git/src/operation.ts @@ -48,6 +48,7 @@ export const enum OperationKind { Rebase = 'Rebase', RebaseAbort = 'RebaseAbort', RebaseContinue = 'RebaseContinue', + Refresh = 'Refresh', RevertFiles = 'RevertFiles', RevList = 'RevList', RevParse = 'RevParse', @@ -67,9 +68,9 @@ export type Operation = AddOperation | ApplyOperation | BlameOperation | BranchO GetBranchOperation | GetBranchesOperation | GetCommitTemplateOperation | GetObjectDetailsOperation | GetRefsOperation | GetRemoteRefsOperation | HashObjectOperation | IgnoreOperation | LogOperation | LogFileOperation | MergeOperation | MergeAbortOperation | MergeBaseOperation | MoveOperation | PostCommitCommandOperation | PullOperation | PushOperation | RemoteOperation | RenameBranchOperation | RemoveOperation | - ResetOperation | RebaseOperation | RebaseAbortOperation | RebaseContinueOperation | RevertFilesOperation | RevListOperation | RevParseOperation | - SetBranchUpstreamOperation | ShowOperation | StageOperation | StatusOperation | StashOperation | SubmoduleUpdateOperation | SyncOperation | - TagOperation; + ResetOperation | RebaseOperation | RebaseAbortOperation | RebaseContinueOperation | RefreshOperation | RevertFilesOperation | RevListOperation | + RevParseOperation | SetBranchUpstreamOperation | ShowOperation | StageOperation | StatusOperation | StashOperation | SubmoduleUpdateOperation | + SyncOperation | TagOperation; type BaseOperation = { kind: OperationKind; blocking: boolean; readOnly: boolean; remote: boolean; retry: boolean; showProgress: boolean }; export type AddOperation = BaseOperation & { kind: OperationKind.Add }; @@ -114,6 +115,7 @@ export type ResetOperation = BaseOperation & { kind: OperationKind.Reset }; export type RebaseOperation = BaseOperation & { kind: OperationKind.Rebase }; export type RebaseAbortOperation = BaseOperation & { kind: OperationKind.RebaseAbort }; export type RebaseContinueOperation = BaseOperation & { kind: OperationKind.RebaseContinue }; +export type RefreshOperation = BaseOperation & { kind: OperationKind.Refresh }; export type RevertFilesOperation = BaseOperation & { kind: OperationKind.RevertFiles }; export type RevListOperation = BaseOperation & { kind: OperationKind.RevList }; export type RevParseOperation = BaseOperation & { kind: OperationKind.RevParse }; @@ -169,6 +171,7 @@ export const Operation = { Rebase: { kind: OperationKind.Rebase, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as RebaseOperation, RebaseAbort: { kind: OperationKind.RebaseAbort, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as RebaseAbortOperation, RebaseContinue: { kind: OperationKind.RebaseContinue, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as RebaseContinueOperation, + Refresh: { kind: OperationKind.Refresh, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as RefreshOperation, RevertFiles: (showProgress: boolean) => ({ kind: OperationKind.RevertFiles, blocking: false, readOnly: false, remote: false, retry: false, showProgress } as RevertFilesOperation), RevList: { kind: OperationKind.RevList, blocking: false, readOnly: true, remote: false, retry: false, showProgress: false } as RevListOperation, RevParse: { kind: OperationKind.RevParse, blocking: false, readOnly: true, remote: false, retry: false, showProgress: false } as RevParseOperation, diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts index 9e32d37f147..4855d754240 100644 --- a/extensions/git/src/repository.ts +++ b/extensions/git/src/repository.ts @@ -19,12 +19,11 @@ import { IFileWatcher, watch } from './watch'; import { IPushErrorHandlerRegistry } from './pushError'; import { ApiRepository } from './api/api1'; import { IRemoteSourcePublisherRegistry } from './remotePublisher'; -import { CommitActionButton } from './actionButton'; +import { ActionButton } from './actionButton'; import { IPostCommitCommandsProviderRegistry, CommitCommandsCenter } from './postCommitCommands'; import { Operation, OperationKind, OperationManager, OperationResult } from './operation'; import { GitBranchProtectionProvider, IBranchProtectionProviderRegistry } from './branchProtection'; import { GitHistoryProvider } from './historyProvider'; -import { GenerateCommitMessageActionButton, ICommitMessageProviderRegistry } from './commitMessageProvider'; const timeout = (millis: number) => new Promise(c => setTimeout(c, millis)); @@ -34,47 +33,6 @@ function getIconUri(iconName: string, theme: string): Uri { return Uri.file(path.join(iconsRootPath, theme, `${iconName}.svg`)); } -function wrapCommitMessage(message: string, subjectLineLength: number, bodyLineLength: number): string { - const messageLinesWrapped: string[] = []; - const messageLines = message.split(/\r?\n/g); - - for (let index = 0; index < messageLines.length; index++) { - const messageLine = messageLines[index]; - const threshold = index === 0 ? subjectLineLength : bodyLineLength; - - if (messageLine.length <= threshold) { - messageLinesWrapped.push(messageLine); - continue; - } - - let position = 0; - const lineSegments: string[] = []; - while (messageLine.length - position > threshold) { - const lastSpaceBeforeThreshold = messageLine.lastIndexOf(' ', position + threshold); - if (lastSpaceBeforeThreshold !== -1 && lastSpaceBeforeThreshold > position) { - lineSegments.push(...[messageLine.substring(position, lastSpaceBeforeThreshold), '\n']); - position = lastSpaceBeforeThreshold + 1; - } else { - // Find first space after threshold - const firstSpaceAfterThreshold = messageLine.indexOf(' ', position); - if (firstSpaceAfterThreshold !== -1) { - lineSegments.push(...[messageLine.substring(position, firstSpaceAfterThreshold), '\n']); - position = firstSpaceAfterThreshold + 1; - } else { - lineSegments.push(messageLine.substring(position)); - position = messageLine.length; - } - } - } - if (position < messageLine.length) { - lineSegments.push(messageLine.substring(position)); - } - messageLinesWrapped.push(lineSegments.join('')); - } - - return messageLinesWrapped.join('\n'); -} - export const enum RepositoryState { Idle, Disposed @@ -845,7 +803,6 @@ export class Repository implements Disposable { private commitCommandCenter: CommitCommandsCenter; private resourceCommandResolver = new ResourceCommandResolver(this); private updateModelStateCancellationTokenSource: CancellationTokenSource | undefined; - private generateCommitMessageCancellationTokenSource: CancellationTokenSource | undefined; private disposables: Disposable[] = []; constructor( @@ -855,7 +812,6 @@ export class Repository implements Disposable { remoteSourcePublisherRegistry: IRemoteSourcePublisherRegistry, postCommitCommandsProviderRegistry: IPostCommitCommandsProviderRegistry, private readonly branchProtectionProviderRegistry: IBranchProtectionProviderRegistry, - private readonly commitMessageProviderRegistry: ICommitMessageProviderRegistry, globalState: Memento, private readonly logger: LogOutputChannel, private telemetryReporter: TelemetryReporter @@ -894,18 +850,13 @@ export class Repository implements Disposable { this._sourceControl.quickDiffProvider = this; - const historyProvider = new GitHistoryProvider(this); + const historyProvider = new GitHistoryProvider(this, logger); this._sourceControl.historyProvider = historyProvider; this.disposables.push(historyProvider); this._sourceControl.acceptInputCommand = { command: 'git.commit', title: l10n.t('Commit'), arguments: [this._sourceControl] }; this._sourceControl.inputBox.validateInput = this.validateInput.bind(this); - const inputActionButton = new GenerateCommitMessageActionButton(this, commitMessageProviderRegistry); - this.disposables.push(inputActionButton); - inputActionButton.onDidChange(() => this._sourceControl.inputBox.actionButton = inputActionButton.button); - this._sourceControl.inputBox.actionButton = inputActionButton.button; - this.disposables.push(this._sourceControl); this.updateInputBoxPlaceholder(); @@ -991,10 +942,10 @@ export class Repository implements Disposable { this.commitCommandCenter = new CommitCommandsCenter(globalState, this, postCommitCommandsProviderRegistry); this.disposables.push(this.commitCommandCenter); - const commitActionButton = new CommitActionButton(this, this.commitCommandCenter); - this.disposables.push(commitActionButton); - commitActionButton.onDidChange(() => this._sourceControl.actionButton = commitActionButton.button); - this._sourceControl.actionButton = commitActionButton.button; + const actionButton = new ActionButton(this, this.commitCommandCenter); + this.disposables.push(actionButton); + actionButton.onDidChange(() => this._sourceControl.actionButton = actionButton.button); + this._sourceControl.actionButton = actionButton.button; const progressManager = new ProgressManager(this); this.disposables.push(progressManager); @@ -1142,6 +1093,11 @@ export class Repository implements Disposable { await this.run(Operation.Status); } + @throttle + async refresh(): Promise { + await this.run(Operation.Refresh); + } + diff(cached?: boolean): Promise { return this.run(Operation.Diff, () => this.repository.diff(cached)); } @@ -1189,7 +1145,7 @@ export class Repository implements Disposable { return this.run(Operation.Diff, () => this.repository.diffBetweenShortStat(ref1, ref2)); } - getMergeBase(ref1: string, ref2: string): Promise { + getMergeBase(ref1: string, ref2: string): Promise { return this.run(Operation.MergeBase, () => this.repository.getMergeBase(ref1, ref2)); } @@ -1518,8 +1474,9 @@ export class Repository implements Disposable { // Git config try { const mergeBase = await this.getConfig(branchMergeBaseConfigKey); - if (mergeBase) { - return await this.getBranch(mergeBase); + if (mergeBase !== '') { + const mergeBaseBranch = await this.getBranch(mergeBase); + return mergeBaseBranch; } } catch (err) { } @@ -1666,6 +1623,21 @@ export class Repository implements Disposable { return await this.run(Operation.RevList, () => this.repository.getCommitCount(range)); } + async getDiff(): Promise { + const diff: string[] = []; + if (this.indexGroup.resourceStates.length !== 0) { + for (const file of this.indexGroup.resourceStates.map(r => r.resourceUri.fsPath)) { + diff.push(await this.diffIndexWithHEAD(file)); + } + } else { + for (const file of this.workingTreeGroup.resourceStates.map(r => r.resourceUri.fsPath)) { + diff.push(await this.diffWithHEAD(file)); + } + } + + return diff; + } + async revParse(ref: string): Promise { return await this.run(Operation.RevParse, () => this.repository.revParse(ref)); } @@ -2066,58 +2038,6 @@ export class Repository implements Disposable { }); } - async generateCommitMessage(): Promise { - if (!this.commitMessageProviderRegistry.commitMessageProvider) { - return; - } - - this._onDidStartCommitMessageGeneration.fire(); - this.generateCommitMessageCancellationTokenSource?.cancel(); - this.generateCommitMessageCancellationTokenSource = new CancellationTokenSource(); - - try { - const diff: string[] = []; - if (this.indexGroup.resourceStates.length !== 0) { - for (const file of this.indexGroup.resourceStates.map(r => r.resourceUri.fsPath)) { - diff.push(await this.diffIndexWithHEAD(file)); - } - } else { - for (const file of this.workingTreeGroup.resourceStates.map(r => r.resourceUri.fsPath)) { - diff.push(await this.diffWithHEAD(file)); - } - } - - if (diff.length === 0) { - return; - } - - const token = this.generateCommitMessageCancellationTokenSource.token; - const provider = this.commitMessageProviderRegistry.commitMessageProvider; - const commitMessage = await provider.provideCommitMessage(new ApiRepository(this), diff, token); - if (commitMessage) { - const config = workspace.getConfiguration('git'); - const subjectLineLength = config.get('inputValidationSubjectLength', null); - const bodyLineLength = config.get('inputValidationLength', 50); - - this.inputBox.value = wrapCommitMessage(commitMessage, subjectLineLength ?? bodyLineLength, bodyLineLength); - } - } - catch (err) { - this.logger.error(err); - } - finally { - this._onDidEndCommitMessageGeneration.fire(); - } - } - - generateCommitMessageCancel(): void { - this.generateCommitMessageCancellationTokenSource?.cancel(); - this.generateCommitMessageCancellationTokenSource?.dispose(); - this.generateCommitMessageCancellationTokenSource = undefined; - - this._onDidEndCommitMessageGeneration.fire(); - } - // Parses output of `git check-ignore -v -z` and returns only those paths // that are actually ignored by git. // Matches to a negative pattern (starting with '!') are filtered out. diff --git a/extensions/git/src/test/git.test.ts b/extensions/git/src/test/git.test.ts index 10d7461080e..129a3afcec4 100644 --- a/extensions/git/src/test/git.test.ts +++ b/extensions/git/src/test/git.test.ts @@ -270,14 +270,15 @@ suite('git', () => { suite('parseGitCommit', () => { test('single parent commit', function () { - const GIT_OUTPUT_SINGLE_PARENT = `52c293a05038d865604c2284aa8698bd087915a1 -John Doe -john.doe@mail.com -1580811030 -1580811031 -8e5a374372b8393906c7e380dbb09349c5385554 -main,branch -This is a commit message.\x00`; + const GIT_OUTPUT_SINGLE_PARENT = + '52c293a05038d865604c2284aa8698bd087915a1\n' + + 'John Doe\n' + + 'john.doe@mail.com\n' + + '1580811030\n' + + '1580811031\n' + + '8e5a374372b8393906c7e380dbb09349c5385554\n' + + 'main,branch\n' + + 'This is a commit message.\x00'; assert.deepStrictEqual(parseGitCommits(GIT_OUTPUT_SINGLE_PARENT), [{ hash: '52c293a05038d865604c2284aa8698bd087915a1', @@ -288,18 +289,20 @@ This is a commit message.\x00`; authorEmail: 'john.doe@mail.com', commitDate: new Date(1580811031000), refNames: ['main', 'branch'], + shortStat: undefined }]); }); test('multiple parent commits', function () { - const GIT_OUTPUT_MULTIPLE_PARENTS = `52c293a05038d865604c2284aa8698bd087915a1 -John Doe -john.doe@mail.com -1580811030 -1580811031 -8e5a374372b8393906c7e380dbb09349c5385554 df27d8c75b129ab9b178b386077da2822101b217 -main -This is a commit message.\x00`; + const GIT_OUTPUT_MULTIPLE_PARENTS = + '52c293a05038d865604c2284aa8698bd087915a1\n' + + 'John Doe\n' + + 'john.doe@mail.com\n' + + '1580811030\n' + + '1580811031\n' + + '8e5a374372b8393906c7e380dbb09349c5385554 df27d8c75b129ab9b178b386077da2822101b217\n' + + 'main\n' + + 'This is a commit message.\x00'; assert.deepStrictEqual(parseGitCommits(GIT_OUTPUT_MULTIPLE_PARENTS), [{ hash: '52c293a05038d865604c2284aa8698bd087915a1', @@ -310,18 +313,20 @@ This is a commit message.\x00`; authorEmail: 'john.doe@mail.com', commitDate: new Date(1580811031000), refNames: ['main'], + shortStat: undefined }]); }); test('no parent commits', function () { - const GIT_OUTPUT_NO_PARENTS = `52c293a05038d865604c2284aa8698bd087915a1 -John Doe -john.doe@mail.com -1580811030 -1580811031 - -main -This is a commit message.\x00`; + const GIT_OUTPUT_NO_PARENTS = + '52c293a05038d865604c2284aa8698bd087915a1\n' + + 'John Doe\n' + + 'john.doe@mail.com\n' + + '1580811030\n' + + '1580811031\n' + + '\n' + + 'main\n' + + 'This is a commit message.\x00'; assert.deepStrictEqual(parseGitCommits(GIT_OUTPUT_NO_PARENTS), [{ hash: '52c293a05038d865604c2284aa8698bd087915a1', @@ -332,6 +337,191 @@ This is a commit message.\x00`; authorEmail: 'john.doe@mail.com', commitDate: new Date(1580811031000), refNames: ['main'], + shortStat: undefined + }]); + }); + + test('commit with shortstat', function () { + const GIT_OUTPUT_SINGLE_PARENT = + '52c293a05038d865604c2284aa8698bd087915a1\n' + + 'John Doe\n' + + 'john.doe@mail.com\n' + + '1580811030\n' + + '1580811031\n' + + '8e5a374372b8393906c7e380dbb09349c5385554\n' + + 'main,branch\n' + + 'This is a commit message.\x00\n' + + ' 1 file changed, 2 insertions(+), 3 deletion(-)'; + + assert.deepStrictEqual(parseGitCommits(GIT_OUTPUT_SINGLE_PARENT), [{ + hash: '52c293a05038d865604c2284aa8698bd087915a1', + message: 'This is a commit message.', + parents: ['8e5a374372b8393906c7e380dbb09349c5385554'], + authorDate: new Date(1580811030000), + authorName: 'John Doe', + authorEmail: 'john.doe@mail.com', + commitDate: new Date(1580811031000), + refNames: ['main', 'branch'], + shortStat: { + deletions: 3, + files: 1, + insertions: 2 + } + }]); + }); + + test('commit with shortstat (no insertions)', function () { + const GIT_OUTPUT_SINGLE_PARENT = + '52c293a05038d865604c2284aa8698bd087915a1\n' + + 'John Doe\n' + + 'john.doe@mail.com\n' + + '1580811030\n' + + '1580811031\n' + + '8e5a374372b8393906c7e380dbb09349c5385554\n' + + 'main,branch\n' + + 'This is a commit message.\x00\n' + + ' 1 file changed, 3 deletion(-)'; + + assert.deepStrictEqual(parseGitCommits(GIT_OUTPUT_SINGLE_PARENT), [{ + hash: '52c293a05038d865604c2284aa8698bd087915a1', + message: 'This is a commit message.', + parents: ['8e5a374372b8393906c7e380dbb09349c5385554'], + authorDate: new Date(1580811030000), + authorName: 'John Doe', + authorEmail: 'john.doe@mail.com', + commitDate: new Date(1580811031000), + refNames: ['main', 'branch'], + shortStat: { + deletions: 3, + files: 1, + insertions: 0 + } + }]); + }); + + test('commit with shortstat (no deletions)', function () { + const GIT_OUTPUT_SINGLE_PARENT = + '52c293a05038d865604c2284aa8698bd087915a1\n' + + 'John Doe\n' + + 'john.doe@mail.com\n' + + '1580811030\n' + + '1580811031\n' + + '8e5a374372b8393906c7e380dbb09349c5385554\n' + + 'main,branch\n' + + 'This is a commit message.\x00\n' + + ' 1 file changed, 2 insertions(+)'; + + assert.deepStrictEqual(parseGitCommits(GIT_OUTPUT_SINGLE_PARENT), [{ + hash: '52c293a05038d865604c2284aa8698bd087915a1', + message: 'This is a commit message.', + parents: ['8e5a374372b8393906c7e380dbb09349c5385554'], + authorDate: new Date(1580811030000), + authorName: 'John Doe', + authorEmail: 'john.doe@mail.com', + commitDate: new Date(1580811031000), + refNames: ['main', 'branch'], + shortStat: { + deletions: 0, + files: 1, + insertions: 2 + } + }]); + }); + + test('commit list', function () { + const GIT_OUTPUT_SINGLE_PARENT = + '52c293a05038d865604c2284aa8698bd087915a1\n' + + 'John Doe\n' + + 'john.doe@mail.com\n' + + '1580811030\n' + + '1580811031\n' + + '8e5a374372b8393906c7e380dbb09349c5385554\n' + + 'main,branch\n' + + 'This is a commit message.\x00\n' + + '52c293a05038d865604c2284aa8698bd087915a2\n' + + 'Jane Doe\n' + + 'jane.doe@mail.com\n' + + '1580811032\n' + + '1580811033\n' + + '8e5a374372b8393906c7e380dbb09349c5385555\n' + + 'main,branch\n' + + 'This is another commit message.\x00'; + + assert.deepStrictEqual(parseGitCommits(GIT_OUTPUT_SINGLE_PARENT), [ + { + hash: '52c293a05038d865604c2284aa8698bd087915a1', + message: 'This is a commit message.', + parents: ['8e5a374372b8393906c7e380dbb09349c5385554'], + authorDate: new Date(1580811030000), + authorName: 'John Doe', + authorEmail: 'john.doe@mail.com', + commitDate: new Date(1580811031000), + refNames: ['main', 'branch'], + shortStat: undefined, + }, + { + hash: '52c293a05038d865604c2284aa8698bd087915a2', + message: 'This is another commit message.', + parents: ['8e5a374372b8393906c7e380dbb09349c5385555'], + authorDate: new Date(1580811032000), + authorName: 'Jane Doe', + authorEmail: 'jane.doe@mail.com', + commitDate: new Date(1580811033000), + refNames: ['main', 'branch'], + shortStat: undefined, + }, + ]); + }); + + test('commit list with shortstat', function () { + const GIT_OUTPUT_SINGLE_PARENT = '52c293a05038d865604c2284aa8698bd087915a1\n' + + 'John Doe\n' + + 'john.doe@mail.com\n' + + '1580811030\n' + + '1580811031\n' + + '8e5a374372b8393906c7e380dbb09349c5385554\n' + + 'main,branch\n' + + 'This is a commit message.\x00\n' + + ' 5 file changed, 12 insertions(+), 13 deletion(-)\n' + + '52c293a05038d865604c2284aa8698bd087915a2\n' + + 'Jane Doe\n' + + 'jane.doe@mail.com\n' + + '1580811032\n' + + '1580811033\n' + + '8e5a374372b8393906c7e380dbb09349c5385555\n' + + 'main,branch\n' + + 'This is another commit message.\x00\n' + + ' 6 file changed, 22 insertions(+), 23 deletion(-)'; + + assert.deepStrictEqual(parseGitCommits(GIT_OUTPUT_SINGLE_PARENT), [{ + hash: '52c293a05038d865604c2284aa8698bd087915a1', + message: 'This is a commit message.', + parents: ['8e5a374372b8393906c7e380dbb09349c5385554'], + authorDate: new Date(1580811030000), + authorName: 'John Doe', + authorEmail: 'john.doe@mail.com', + commitDate: new Date(1580811031000), + refNames: ['main', 'branch'], + shortStat: { + deletions: 13, + files: 5, + insertions: 12 + } + }, + { + hash: '52c293a05038d865604c2284aa8698bd087915a2', + message: 'This is another commit message.', + parents: ['8e5a374372b8393906c7e380dbb09349c5385555'], + authorDate: new Date(1580811032000), + authorName: 'Jane Doe', + authorEmail: 'jane.doe@mail.com', + commitDate: new Date(1580811033000), + refNames: ['main', 'branch'], + shortStat: { + deletions: 23, + files: 6, + insertions: 22 + } }]); }); }); diff --git a/extensions/git/src/timelineProvider.ts b/extensions/git/src/timelineProvider.ts index 1f0093e6cc3..5788ecc53dd 100644 --- a/extensions/git/src/timelineProvider.ts +++ b/extensions/git/src/timelineProvider.ts @@ -152,6 +152,7 @@ export class GitTimelineProvider implements TimelineProvider { const commits = await repo.logFile(uri, { maxEntries: limit, hash: options.cursor, + follow: true, // sortByAuthorDate: true }); diff --git a/extensions/git/tsconfig.json b/extensions/git/tsconfig.json index 022beed0bcb..d5fdbd539da 100644 --- a/extensions/git/tsconfig.json +++ b/extensions/git/tsconfig.json @@ -13,7 +13,6 @@ "../../src/vscode-dts/vscode.proposed.diffCommand.d.ts", "../../src/vscode-dts/vscode.proposed.scmActionButton.d.ts", "../../src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts", - "../../src/vscode-dts/vscode.proposed.scmInputBoxActionButton.d.ts", "../../src/vscode-dts/vscode.proposed.scmSelectedProvider.d.ts", "../../src/vscode-dts/vscode.proposed.scmValidation.d.ts", "../../src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts", diff --git a/extensions/github-authentication/yarn.lock b/extensions/github-authentication/yarn.lock index 1ef92ae2259..6ca3b99e669 100644 --- a/extensions/github-authentication/yarn.lock +++ b/extensions/github-authentication/yarn.lock @@ -132,12 +132,14 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= -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== +axios@^1.6.1: + version "1.6.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.2.tgz#de67d42c755b571d3e698df1b6504cde9b0ee9f2" + integrity sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A== dependencies: - follow-redirects "^1.14.8" + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" combined-stream@^1.0.8: version "1.0.8" @@ -151,10 +153,10 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= -follow-redirects@^1.14.8: - version "1.15.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.0.tgz#06441868281c86d0dda4ad8bdaead2d02dca89d4" - integrity sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ== +follow-redirects@^1.15.0: + version "1.15.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" + integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q== form-data@^3.0.0: version "3.0.0" @@ -165,6 +167,15 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + mime-db@1.44.0: version "1.44.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" @@ -184,12 +195,17 @@ node-fetch@2.6.7: dependencies: whatwg-url "^5.0.0" -tas-client@0.1.45: - version "0.1.45" - resolved "https://registry.yarnpkg.com/tas-client/-/tas-client-0.1.45.tgz#83bbf73f8458a0f527f9a389f7e1c37f63a64a76" - integrity sha512-IG9UmCpDbDPK23UByQ27rLybkRZYEx2eC9EkieXdwPKKjZPD2zPwfQmyGnZrZet4FUt3yj0ytkwz+liR9Nz/nA== +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + +tas-client@0.1.73: + version "0.1.73" + resolved "https://registry.yarnpkg.com/tas-client/-/tas-client-0.1.73.tgz#2dacf68547a37989ef1554c6510dc108a1ea7a71" + integrity sha512-UDdUF9kV2hYdlv+7AgqP2kXarVSUhjK7tg1BUflIRGEgND0/QoNpN64rcEuhEcM8AIbW65yrCopJWqRhLZ3m8w== dependencies: - axios "^0.26.1" + axios "^1.6.1" tr46@~0.0.3: version "0.0.3" @@ -197,11 +213,11 @@ tr46@~0.0.3: integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= vscode-tas-client@^0.1.47: - version "0.1.47" - resolved "https://registry.yarnpkg.com/vscode-tas-client/-/vscode-tas-client-0.1.47.tgz#d66795cbbaa231aba659b6c40d43927d73596375" - integrity sha512-SlEPDi+0gwxor4ANzBtXwqROPQdQkClHeVJgnkvdDF5Xnl407htCsabTPAq4Di8muObORtLchqQS/k1ocaGDEg== + version "0.1.75" + resolved "https://registry.yarnpkg.com/vscode-tas-client/-/vscode-tas-client-0.1.75.tgz#771780a9a178163028299f52d41973300060dd38" + integrity sha512-/+ALFWPI4U3obeRvLFSt39guT7P9bZQrkmcLoiS+2HtzJ/7iPKNt5Sj+XTiitGlPYVFGFc0plxX8AAp6Uxs0xQ== dependencies: - tas-client "0.1.45" + tas-client "0.1.73" webidl-conversions@^3.0.0: version "3.0.1" diff --git a/extensions/ini/package.json b/extensions/ini/package.json index ac1a59e8af5..a8b332a74ec 100644 --- a/extensions/ini/package.json +++ b/extensions/ini/package.json @@ -35,7 +35,8 @@ ".gitattributes", ".gitconfig", ".gitmodules", - ".editorconfig" + ".editorconfig", + ".repo" ], "filenames": [ "gitconfig", diff --git a/extensions/ipynb/package.json b/extensions/ipynb/package.json index f7afc12a448..aee7e85a30a 100644 --- a/extensions/ipynb/package.json +++ b/extensions/ipynb/package.json @@ -5,7 +5,7 @@ "publisher": "vscode", "version": "1.0.0", "license": "MIT", - "icon": "media/icon.png", + "icon": "media/icon.png", "engines": { "vscode": "^1.57.0" }, @@ -58,10 +58,10 @@ "command": "ipynb.cleanInvalidImageAttachment", "title": "%cleanInvalidImageAttachment.title%" }, - { - "command": "notebook.cellOutput.copy", - "title": "%copyCellOutput.title%" - } + { + "command": "notebook.cellOutput.copy", + "title": "%copyCellOutput.title%" + } ], "notebooks": [ { @@ -105,12 +105,12 @@ "when": "false" } ], - "webview/context": [ - { - "command": "notebook.cellOutput.copy", - "when": "webviewId == 'notebook.output' && webviewSection == 'image'" - } - ] + "webview/context": [ + { + "command": "notebook.cellOutput.copy", + "when": "webviewId == 'notebook.output' && webviewSection == 'image'" + } + ] } }, "scripts": { @@ -120,13 +120,11 @@ }, "dependencies": { "@enonic/fnv-plus": "^1.3.0", - "detect-indent": "^6.0.0", - "uuid": "^8.3.2" + "detect-indent": "^6.0.0" }, "devDependencies": { "@jupyterlab/nbformat": "^3.2.9", - "@types/markdown-it": "12.2.3", - "@types/uuid": "^8.3.1" + "@types/markdown-it": "12.2.3" }, "repository": { "type": "git", diff --git a/extensions/ipynb/src/cellIdService.ts b/extensions/ipynb/src/cellIdService.ts index 2eccb586ef4..43c769bca51 100644 --- a/extensions/ipynb/src/cellIdService.ts +++ b/extensions/ipynb/src/cellIdService.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import { ExtensionContext, NotebookDocument, NotebookDocumentChangeEvent, NotebookEdit, workspace, WorkspaceEdit } from 'vscode'; -import { v4 as uuid } from 'uuid'; import { getCellMetadata } from './serializers'; import { CellMetadata } from './common'; import { getNotebookMetadata } from './notebookSerializer'; @@ -57,7 +56,7 @@ function generateCellId(notebook: NotebookDocument) { while (true) { // Details of the id can be found here https://jupyter.org/enhancement-proposals/62-cell-id/cell-id.html#adding-an-id-field, // & here https://jupyter.org/enhancement-proposals/62-cell-id/cell-id.html#updating-older-formats - const id = uuid().replace(/-/g, '').substring(0, 8); + const id = generateUuid().replace(/-/g, '').substring(0, 8); let duplicate = false; for (let index = 0; index < notebook.cellCount; index++) { const cell = notebook.cellAt(index); @@ -75,3 +74,56 @@ function generateCellId(notebook: NotebookDocument) { } } } + + +/** + * Copied from src/vs/base/common/uuid.ts + */ +function generateUuid() { + // use `randomValues` if possible + function getRandomValues(bucket: Uint8Array): Uint8Array { + for (let i = 0; i < bucket.length; i++) { + bucket[i] = Math.floor(Math.random() * 256); + } + return bucket; + } + + // prep-work + const _data = new Uint8Array(16); + const _hex: string[] = []; + for (let i = 0; i < 256; i++) { + _hex.push(i.toString(16).padStart(2, '0')); + } + + // get data + getRandomValues(_data); + + // set version bits + _data[6] = (_data[6] & 0x0f) | 0x40; + _data[8] = (_data[8] & 0x3f) | 0x80; + + // print as string + let i = 0; + let result = ''; + result += _hex[_data[i++]]; + result += _hex[_data[i++]]; + result += _hex[_data[i++]]; + result += _hex[_data[i++]]; + result += '-'; + result += _hex[_data[i++]]; + result += _hex[_data[i++]]; + result += '-'; + result += _hex[_data[i++]]; + result += _hex[_data[i++]]; + result += '-'; + result += _hex[_data[i++]]; + result += _hex[_data[i++]]; + result += '-'; + result += _hex[_data[i++]]; + result += _hex[_data[i++]]; + result += _hex[_data[i++]]; + result += _hex[_data[i++]]; + result += _hex[_data[i++]]; + result += _hex[_data[i++]]; + return result; +} diff --git a/extensions/ipynb/yarn.lock b/extensions/ipynb/yarn.lock index 7b5488e7109..fa950f66b64 100644 --- a/extensions/ipynb/yarn.lock +++ b/extensions/ipynb/yarn.lock @@ -37,17 +37,7 @@ 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.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" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6" integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA== - -uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== diff --git a/extensions/java/cgmanifest.json b/extensions/java/cgmanifest.json index 72e0c5c882b..ecfeb0eb668 100644 --- a/extensions/java/cgmanifest.json +++ b/extensions/java/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "redhat-developer/vscode-java", "repositoryUrl": "https://github.com/redhat-developer/vscode-java", - "commitHash": "5d224a552cf5f0f8ebccf69e43e2575ed2c13839" + "commitHash": "f09b712f5d6d6339e765f58c8dfab3f78a378183" } }, "license": "MIT", @@ -44,7 +44,7 @@ "suitability for any purpose." ], "description": "This grammar was derived from https://github.com/atom/language-java/blob/master/grammars/java.cson.", - "version": "1.22.0" + "version": "1.26.0" } ], "version": 1 diff --git a/extensions/java/syntaxes/java.tmLanguage.json b/extensions/java/syntaxes/java.tmLanguage.json index 7f969ccb787..54201a57c20 100644 --- a/extensions/java/syntaxes/java.tmLanguage.json +++ b/extensions/java/syntaxes/java.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/redhat-developer/vscode-java/commit/5d224a552cf5f0f8ebccf69e43e2575ed2c13839", + "version": "https://github.com/redhat-developer/vscode-java/commit/f09b712f5d6d6339e765f58c8dfab3f78a378183", "name": "Java", "scopeName": "source.java", "patterns": [ @@ -1598,11 +1598,7 @@ "name": "string.quoted.triple.java", "patterns": [ { - "match": "\\\\\"\"\"", - "name": "constant.character.escape.java" - }, - { - "match": "\\\\.", + "match": "(\\\\\"\"\")(?!\")|(\\\\.)", "name": "constant.character.escape.java" } ] diff --git a/extensions/julia/cgmanifest.json b/extensions/julia/cgmanifest.json index e9abeec7da0..f1efc7764f0 100644 --- a/extensions/julia/cgmanifest.json +++ b/extensions/julia/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "JuliaEditorSupport/atom-language-julia", "repositoryUrl": "https://github.com/JuliaEditorSupport/atom-language-julia", - "commitHash": "85cf3ef2ddcb7bc9b2b17b2a5f1fc664e1f1e718" + "commitHash": "8747e069119b24bff2703374d7961e3446a74034" } }, "license": "MIT", diff --git a/extensions/julia/syntaxes/julia.tmLanguage.json b/extensions/julia/syntaxes/julia.tmLanguage.json index 64c075d404e..c1b883e534d 100644 --- a/extensions/julia/syntaxes/julia.tmLanguage.json +++ b/extensions/julia/syntaxes/julia.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/JuliaEditorSupport/atom-language-julia/commit/85cf3ef2ddcb7bc9b2b17b2a5f1fc664e1f1e718", + "version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/8747e069119b24bff2703374d7961e3446a74034", "name": "Julia", "scopeName": "source.julia", "comment": "This grammar is used by Atom (Oniguruma), GitHub (PCRE), and VSCode (Oniguruma),\nso all regexps must be compatible with both engines.\n\nSpecs:\n- https://github.com/kkos/oniguruma/blob/master/doc/RE\n- https://www.pcre.org/current/doc/html/", @@ -30,6 +30,9 @@ { "include": "#function_call" }, + { + "include": "#for_block" + }, { "include": "#keyword" }, @@ -76,11 +79,7 @@ "name": "constant.numeric.julia" }, { - "match": "\\bfor\\b", - "name": "keyword.control.julia" - }, - { - "include": "$self" + "include": "#self_no_for_block" } ] } @@ -106,7 +105,7 @@ }, "patterns": [ { - "include": "$self" + "include": "#self_no_for_block" } ] } @@ -115,8 +114,26 @@ "bracket": { "patterns": [ { - "match": "(?:\\(|\\)|\\[|\\]|\\{|\\}|,|;)(?!('|(?:\\.'))*\\.?')", - "name": "meta.bracket.julia" + "begin": "\\{", + "beginCaptures": { + "0": { + "name": "meta.bracket.julia" + } + }, + "end": "(\\})((?:\\.)?'*)", + "endCaptures": { + "1": { + "name": "meta.bracket.julia" + }, + "2": { + "name": "keyword.operator.transpose.julia" + } + }, + "patterns": [ + { + "include": "#self_no_for_block" + } + ] } ] }, @@ -215,11 +232,7 @@ }, "patterns": [ { - "match": "\\bfor\\b", - "name": "keyword.control.julia" - }, - { - "include": "$self" + "include": "#self_no_for_block" } ] } @@ -259,14 +272,10 @@ } ] }, - "keyword": { + "for_block": { + "comment": "for blocks need to be special-cased to support tokenizing 'outer' properly", "patterns": [ { - "match": "\\b(? div { } pre code { + display: inline-block; color: var(--vscode-editor-foreground); tab-size: 4; + background: none; } /** Theming */ diff --git a/extensions/markdown-language-features/notebook/index.ts b/extensions/markdown-language-features/notebook/index.ts index d52d6b6b12a..22fe3119ad1 100644 --- a/extensions/markdown-language-features/notebook/index.ts +++ b/extensions/markdown-language-features/notebook/index.ts @@ -282,6 +282,15 @@ export const activate: ActivationFunction = (ctx) => { line-height: 1.357em; white-space: pre-wrap; } + + li p { + margin-bottom: 0.7em; + } + + ul, + ol { + margin-bottom: 0.7em; + } `; const template = document.createElement('template'); template.classList.add('markdown-style'); diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json index 749673f151d..5dcce219bfa 100644 --- a/extensions/markdown-language-features/package.json +++ b/extensions/markdown-language-features/package.json @@ -503,11 +503,21 @@ "%configuration.copyIntoWorkspace.never%" ] }, + "markdown.editor.filePaste.videoSnippet": { + "type": "string", + "markdownDescription": "%configuration.markdown.editor.filePaste.videoSnippet%", + "default": "" + }, + "markdown.editor.filePaste.audioSnippet": { + "type": "string", + "markdownDescription": "%configuration.markdown.editor.filePaste.audioSnippet%", + "default": "" + }, "markdown.editor.pasteUrlAsFormattedLink.enabled": { "type": "string", "scope": "resource", "markdownDescription": "%configuration.markdown.editor.pasteUrlAsFormattedLink.enabled%", - "default":"never", + "default": "smart", "enum": [ "always", "smart", @@ -734,6 +744,7 @@ "morphdom": "^2.6.1", "picomatch": "^2.3.1", "vscode-languageclient": "^8.0.2", + "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.3" }, "devDependencies": { diff --git a/extensions/markdown-language-features/package.nls.json b/extensions/markdown-language-features/package.nls.json index 9054456fed9..02d80098b9a 100644 --- a/extensions/markdown-language-features/package.nls.json +++ b/extensions/markdown-language-features/package.nls.json @@ -43,10 +43,10 @@ "configuration.markdown.editor.filePaste.copyIntoWorkspace": "Controls if files outside of the workspace that are pasted into a Markdown editor should be copied into the workspace.\n\nUse `#markdown.copyFiles.destination#` to configure where copied files should be created.", "configuration.copyIntoWorkspace.mediaFiles": "Try to copy external image and video files into the workspace.", "configuration.copyIntoWorkspace.never": "Do not copy external files into the workspace.", - "configuration.markdown.editor.pasteUrlAsFormattedLink.enabled": "Controls how a Markdown link is created when a URL is pasted into the Markdown editor. Requires enabling `#editor.pasteAs.enabled#`.", - "configuration.pasteUrlAsFormattedLink.always": "Always creates a Markdown link when a URL is pasted into the Markdown editor.", - "configuration.pasteUrlAsFormattedLink.smart": "Smartly avoids creating a Markdown link in specific cases, such as within code brackets or inside an existing Markdown link.", - "configuration.pasteUrlAsFormattedLink.never": "Never creates a Markdown link when a URL is pasted into the Markdown editor.", + "configuration.markdown.editor.pasteUrlAsFormattedLink.enabled": "Controls if Markdown links are created when URLs are pasted into a Markdown editor. Requires enabling `#editor.pasteAs.enabled#`.", + "configuration.pasteUrlAsFormattedLink.always": "Always insert Markdown links.", + "configuration.pasteUrlAsFormattedLink.smart": "Smartly create Markdown links by default when you have selected text and are not pasting into a code block or other special element. Use the paste widget to switch between pasting as plain text or as Markdown links.", + "configuration.pasteUrlAsFormattedLink.never": "Never create Markdown links.", "configuration.markdown.validate.enabled.description": "Enable all error reporting in Markdown files.", "configuration.markdown.validate.referenceLinks.enabled.description": "Validate reference links in Markdown files, for example: `[link][ref]`. Requires enabling `#markdown.validate.enabled#`.", "configuration.markdown.validate.fragmentLinks.enabled.description": "Validate fragment links to headers in the current Markdown file, for example: `[link](#header)`. Requires enabling `#markdown.validate.enabled#`.", @@ -71,5 +71,7 @@ "configuration.markdown.preferredMdPathExtensionStyle.auto": "For existing paths, try to maintain the file extension style. For new paths, add file extensions.", "configuration.markdown.preferredMdPathExtensionStyle.includeExtension": "Prefer including the file extension. For example, path completions to a file named `file.md` will insert `file.md`.", "configuration.markdown.preferredMdPathExtensionStyle.removeExtension": "Prefer removing the file extension. For example, path completions to a file named `file.md` will insert `file` without the `.md`.", + "configuration.markdown.editor.filePaste.videoSnippet": "Snippet used when adding videos to Markdown. This snippet can use the following variables:\n- `${src}` — The resolved path of the video file.\n- `${title}` — The title used for the video. A snippet placeholder will automatically be created for this variable.", + "configuration.markdown.editor.filePaste.audioSnippet": "Snippet used when adding audio to Markdown. This snippet can use the following variables:\n- `${src}` — The resolved path of the audio file.\n- `${title}` — The title used for the audio. A snippet placeholder will automatically be created for this variable.", "workspaceTrust": "Required for loading styles configured in the workspace." } diff --git a/extensions/markdown-language-features/server/src/server.ts b/extensions/markdown-language-features/server/src/server.ts index 807d171681a..50c34378471 100644 --- a/extensions/markdown-language-features/server/src/server.ts +++ b/extensions/markdown-language-features/server/src/server.ts @@ -218,7 +218,7 @@ export async function startServer(connection: Connection, serverConfig: { const action: lsp.CodeAction = { title: l10n.t("Organize link definitions"), kind: organizeLinkDefKind, - data: { uri: document.uri } + data: { uri: document.uri } satisfies OrganizeLinkActionData, }; return [action]; } diff --git a/extensions/markdown-language-features/src/client/inMemoryDocument.ts b/extensions/markdown-language-features/src/client/inMemoryDocument.ts index 0848a79093f..adf7a143c1d 100644 --- a/extensions/markdown-language-features/src/client/inMemoryDocument.ts +++ b/extensions/markdown-language-features/src/client/inMemoryDocument.ts @@ -3,18 +3,28 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { TextDocument } from 'vscode-languageserver-textdocument'; 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, - ) { } + private readonly _doc: TextDocument; - getText(): string { - return this._contents; + public readonly uri: vscode.Uri; + public readonly version: number; + + constructor( + uri: vscode.Uri, + contents: string, + version: number = 0, + ) { + this.uri = uri; + this.version = version; + this._doc = TextDocument.create(this.uri.toString(), 'markdown', 0, contents); + } + + getText(range?: vscode.Range): string { + return this._doc.getText(range); } } diff --git a/extensions/markdown-language-features/src/commands/insertResource.ts b/extensions/markdown-language-features/src/commands/insertResource.ts index 87de74270ca..9369141465e 100644 --- a/extensions/markdown-language-features/src/commands/insertResource.ts +++ b/extensions/markdown-language-features/src/commands/insertResource.ts @@ -29,8 +29,11 @@ export class InsertLinkFromWorkspace implements Command { title: vscode.l10n.t("Insert link"), defaultUri: getDefaultUri(activeEditor.document), }); + if (!resources) { + return; + } - return insertLink(activeEditor, resources ?? [], false); + return insertLink(activeEditor, resources, false); } } @@ -54,8 +57,11 @@ export class InsertImageFromWorkspace implements Command { title: vscode.l10n.t("Insert image"), defaultUri: getDefaultUri(activeEditor.document), }); + if (!resources) { + return; + } - return insertLink(activeEditor, resources ?? [], true); + return insertLink(activeEditor, resources, true); } } @@ -67,20 +73,18 @@ function getDefaultUri(document: vscode.TextDocument) { return Utils.dirname(docUri); } -async function insertLink(activeEditor: vscode.TextEditor, selectedFiles: vscode.Uri[], insertAsImage: boolean): Promise { - if (!selectedFiles.length) { - return; +async function insertLink(activeEditor: vscode.TextEditor, selectedFiles: readonly vscode.Uri[], insertAsMedia: boolean): Promise { + const edit = createInsertLinkEdit(activeEditor, selectedFiles, insertAsMedia); + if (edit) { + await vscode.workspace.applyEdit(edit); } - - const edit = createInsertLinkEdit(activeEditor, selectedFiles, insertAsImage); - await vscode.workspace.applyEdit(edit); } -function createInsertLinkEdit(activeEditor: vscode.TextEditor, selectedFiles: vscode.Uri[], insertAsMedia: boolean, title = '', placeholderValue = 0, pasteAsMarkdownLink = true, isExternalLink = false) { +function createInsertLinkEdit(activeEditor: vscode.TextEditor, selectedFiles: readonly vscode.Uri[], insertAsMedia: boolean) { const snippetEdits = coalesce(activeEditor.selections.map((selection, i): vscode.SnippetTextEdit | undefined => { const selectionText = activeEditor.document.getText(selection); - const snippet = createUriListSnippet(activeEditor.document, selectedFiles, [], title, placeholderValue, pasteAsMarkdownLink, isExternalLink, { - insertAsMedia, + const snippet = createUriListSnippet(activeEditor.document.uri, selectedFiles.map(uri => ({ uri })), { + insertAsMedia: insertAsMedia, placeholderText: selectionText, placeholderStartIndex: (i + 1) * selectedFiles.length, separator: insertAsMedia ? '\n' : ' ', @@ -88,6 +92,9 @@ function createInsertLinkEdit(activeEditor: vscode.TextEditor, selectedFiles: vs return snippet ? new vscode.SnippetTextEdit(selection, snippet.snippet) : undefined; })); + if (!snippetEdits.length) { + return; + } const edit = new vscode.WorkspaceEdit(); edit.set(activeEditor.document.uri, snippetEdits); diff --git a/extensions/markdown-language-features/src/extension.shared.ts b/extensions/markdown-language-features/src/extension.shared.ts index 0d6c160bffe..aceb8f8b5ae 100644 --- a/extensions/markdown-language-features/src/extension.shared.ts +++ b/extensions/markdown-language-features/src/extension.shared.ts @@ -7,10 +7,9 @@ import * as vscode from 'vscode'; import { MdLanguageClient } from './client/client'; import { CommandManager } from './commandManager'; import { registerMarkdownCommands } from './commands/index'; -import { registerPasteSupport } from './languageFeatures/copyFiles/pasteResourceProvider'; import { registerLinkPasteSupport } from './languageFeatures/copyFiles/pasteUrlProvider'; +import { registerResourceDropOrPasteSupport } from './languageFeatures/copyFiles/dropOrPasteResource'; import { registerDiagnosticSupport } from './languageFeatures/diagnostics'; -import { registerDropIntoEditorSupport } from './languageFeatures/copyFiles/dropResourceProvider'; import { registerFindFileReferenceSupport } from './languageFeatures/fileReferences'; import { registerUpdateLinksOnRename } from './languageFeatures/linkUpdater'; import { ILogger } from './logging'; @@ -57,9 +56,8 @@ function registerMarkdownLanguageFeatures( return vscode.Disposable.from( // Language features registerDiagnosticSupport(selector, commandManager), - registerDropIntoEditorSupport(selector), registerFindFileReferenceSupport(commandManager, client), - registerPasteSupport(selector), + registerResourceDropOrPasteSupport(selector), registerLinkPasteSupport(selector), registerUpdateLinksOnRename(client), ); diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyFiles.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyFiles.ts index c8f44fad2bc..299a8347b1c 100644 --- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyFiles.ts +++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/copyFiles.ts @@ -2,19 +2,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 picomatch from 'picomatch'; +import * as path from 'path'; import * as vscode from 'vscode'; import { Utils } from 'vscode-uri'; -import { getParentDocumentUri } from '../../util/document'; type OverwriteBehavior = 'overwrite' | 'nameIncrementally'; -interface CopyFileConfiguration { +export interface CopyFileConfiguration { readonly destination: Record; readonly overwriteBehavior: OverwriteBehavior; } -function getCopyFileConfiguration(document: vscode.TextDocument): CopyFileConfiguration { +export function getCopyFileConfiguration(document: vscode.TextDocument): CopyFileConfiguration { const config = vscode.workspace.getConfiguration('markdown', document); return { destination: config.get>('copyFiles.destination') ?? {}, @@ -29,72 +28,7 @@ function readOverwriteBehavior(config: vscode.WorkspaceConfiguration): Overwrite } } -export class NewFilePathGenerator { - - private readonly _usedPaths = new Set(); - - async getNewFilePath( - document: vscode.TextDocument, - file: vscode.DataTransferFile, - token: vscode.CancellationToken, - ): Promise<{ readonly uri: vscode.Uri; readonly overwrite: boolean } | undefined> { - const config = getCopyFileConfiguration(document); - const desiredPath = getDesiredNewFilePath(config, document, file); - - const root = Utils.dirname(desiredPath); - const ext = Utils.extname(desiredPath); - let baseName = Utils.basename(desiredPath); - baseName = baseName.slice(0, baseName.length - ext.length); - for (let i = 0; ; ++i) { - if (token.isCancellationRequested) { - return undefined; - } - - const name = i === 0 ? baseName : `${baseName}-${i}`; - const uri = vscode.Uri.joinPath(root, name + ext); - if (this._wasPathAlreadyUsed(uri)) { - continue; - } - - // Try overwriting if it already exists - if (config.overwriteBehavior === 'overwrite') { - this._usedPaths.add(uri.toString()); - return { uri, overwrite: true }; - } - - // Otherwise we need to check the fs to see if it exists - try { - await vscode.workspace.fs.stat(uri); - } catch { - if (!this._wasPathAlreadyUsed(uri)) { - // Does not exist - this._usedPaths.add(uri.toString()); - return { uri, overwrite: false }; - } - } - } - } - - private _wasPathAlreadyUsed(uri: vscode.Uri) { - return this._usedPaths.has(uri.toString()); - } -} - -function getDesiredNewFilePath(config: CopyFileConfiguration, document: vscode.TextDocument, file: vscode.DataTransferFile): vscode.Uri { - const docUri = getParentDocumentUri(document.uri); - for (const [rawGlob, rawDest] of Object.entries(config.destination)) { - for (const glob of parseGlob(rawGlob)) { - if (picomatch.isMatch(docUri.path, glob, { dot: true })) { - return resolveCopyDestination(docUri, file.name, rawDest, uri => vscode.workspace.getWorkspaceFolder(uri)?.uri); - } - } - } - - // Default to next to current file - return vscode.Uri.joinPath(Utils.dirname(docUri), file.name); -} - -function parseGlob(rawGlob: string): Iterable { +export function parseGlob(rawGlob: string): Iterable { if (rawGlob.startsWith('/')) { // Anchor to workspace folders return (vscode.workspace.workspaceFolders ?? []).map(folder => vscode.Uri.joinPath(folder.uri, rawGlob).path); @@ -147,28 +81,45 @@ function resolveCopyDestinationSetting(documentUri: vscode.Uri, fileName: string const workspaceFolder = getWorkspaceFolder(documentUri); const vars = new Map([ - ['documentDirName', documentDirName.path], // Parent directory path + // Document + ['documentDirName', documentDirName.path], // Absolute parent directory path + ['documentRelativeDirName', workspaceFolder ? path.posix.relative(workspaceFolder.path, documentDirName.path) : documentDirName.path], // Absolute parent directory path ['documentFileName', documentBaseName], // Full filename: file.md ['documentBaseName', documentBaseName.slice(0, documentBaseName.length - documentExtName.length)], // Just the name: file - ['documentExtName', documentExtName.replace('.', '')], // Just the file ext: md + ['documentExtName', documentExtName.replace('.', '')], // The document ext (without dot): md + ['documentFilePath', documentUri.path], // Full document path + ['documentRelativeFilePath', workspaceFolder ? path.posix.relative(workspaceFolder.path, documentUri.path) : documentUri.path], // Full document path relative to workspace // Workspace - ['documentWorkspaceFolder', (workspaceFolder ?? documentDirName).path], + ['documentWorkspaceFolder', ((workspaceFolder ?? documentDirName).path)], // File - ['fileName', fileName],// Full file name + ['fileName', fileName], // Full file name + ['fileExtName', path.extname(fileName).replace('.', '')], // File extension (without dot): png ]); - return outDest.replaceAll(/\$\{(\w+)(?:\/([^\}]+?)\/([^\}]+?)\/)?\}/g, (_, name, pattern, replacement) => { + return outDest.replaceAll(/(?\\\$)|(?\w+)(?:\/(?(?:\\\/|[^\}\/])+)\/(?(?:\\\/|[^\}\/])*)\/)?\}/g, (match, _escape, name, pattern, replacement, _offset, _str, groups) => { + if (groups?.['escape']) { + return '$'; + } + const entry = vars.get(name); - if (!entry) { - return ''; + if (typeof entry !== 'string') { + return match; } if (pattern && replacement) { - return entry.replace(new RegExp(pattern), replacement); + try { + return entry.replace(new RegExp(replaceTransformEscapes(pattern)), replaceTransformEscapes(replacement)); + } catch (e) { + console.log(`Error applying 'resolveCopyDestinationSetting' transform: ${pattern} -> ${replacement}`); + } } return entry; }); } + +function replaceTransformEscapes(str: string): string { + return str.replaceAll(/\\\//g, '/'); +} diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropOrPasteResource.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropOrPasteResource.ts new file mode 100644 index 00000000000..41c8bd13146 --- /dev/null +++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropOrPasteResource.ts @@ -0,0 +1,237 @@ +/*--------------------------------------------------------------------------------------------- + * 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 { getParentDocumentUri } from '../../util/document'; +import { Mime, mediaMimes } from '../../util/mimes'; +import { Schemes } from '../../util/schemes'; +import { NewFilePathGenerator } from './newFilePathGenerator'; +import { createInsertUriListEdit, createUriListSnippet, getSnippetLabel } from './shared'; + +/** + * Provides support for pasting or dropping resources into markdown documents. + * + * This includes: + * + * - `text/uri-list` data in the data transfer. + * - File object in the data transfer. + * - Media data in the data transfer, such as `image/png`. + */ +class ResourcePasteOrDropProvider implements vscode.DocumentPasteEditProvider, vscode.DocumentDropEditProvider { + + public static readonly id = 'insertResource'; + + public static readonly mimeTypes = [ + Mime.textUriList, + 'files', + ...mediaMimes, + ]; + + private readonly _yieldTo = [ + { mimeType: 'text/plain' }, + { extensionId: 'vscode.ipynb', providerId: 'insertAttachment' }, + ]; + + public 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; + } + + const filesEdit = await this._getMediaFilesDropEdit(document, dataTransfer, token); + if (filesEdit) { + return filesEdit; + } + + if (token.isCancellationRequested) { + return; + } + + return this._createEditFromUriListData(document, [new vscode.Range(position, position)], dataTransfer, token); + } + + public async provideDocumentPasteEdits( + document: vscode.TextDocument, + ranges: readonly vscode.Range[], + dataTransfer: vscode.DataTransfer, + token: vscode.CancellationToken, + ): Promise { + const enabled = vscode.workspace.getConfiguration('markdown', document).get('editor.filePaste.enabled', true); + if (!enabled) { + return; + } + + const createEdit = await this._getMediaFilesPasteEdit(document, dataTransfer, token); + if (createEdit) { + return createEdit; + } + + if (token.isCancellationRequested) { + return; + } + + return this._createEditFromUriListData(document, ranges, dataTransfer, token); + } + + private async _createEditFromUriListData( + document: vscode.TextDocument, + ranges: readonly vscode.Range[], + dataTransfer: vscode.DataTransfer, + token: vscode.CancellationToken, + ): Promise { + const uriList = await dataTransfer.get(Mime.textUriList)?.asString(); + if (!uriList || token.isCancellationRequested) { + return; + } + + const pasteEdit = createInsertUriListEdit(document, ranges, uriList); + if (!pasteEdit) { + return; + } + + const uriEdit = new vscode.DocumentPasteEdit('', pasteEdit.label); + const edit = new vscode.WorkspaceEdit(); + edit.set(document.uri, pasteEdit.edits); + uriEdit.additionalEdit = edit; + uriEdit.yieldTo = this._yieldTo; + return uriEdit; + } + + private async _getMediaFilesPasteEdit( + document: vscode.TextDocument, + dataTransfer: vscode.DataTransfer, + token: vscode.CancellationToken, + ): Promise { + if (getParentDocumentUri(document.uri).scheme === Schemes.untitled) { + return; + } + + const copyFilesIntoWorkspace = vscode.workspace.getConfiguration('markdown', document).get<'mediaFiles' | 'never'>('editor.filePaste.copyIntoWorkspace', 'mediaFiles'); + if (copyFilesIntoWorkspace !== 'mediaFiles') { + return; + } + + const edit = await this._createEditForMediaFiles(document, dataTransfer, token); + if (!edit) { + return; + } + + const pasteEdit = new vscode.DocumentPasteEdit(edit.snippet, edit.label); + pasteEdit.additionalEdit = edit.additionalEdits; + pasteEdit.yieldTo = this._yieldTo; + return pasteEdit; + } + + private async _getMediaFilesDropEdit( + document: vscode.TextDocument, + dataTransfer: vscode.DataTransfer, + token: vscode.CancellationToken, + ): Promise { + if (getParentDocumentUri(document.uri).scheme === Schemes.untitled) { + return; + } + + const copyIntoWorkspace = vscode.workspace.getConfiguration('markdown', document).get<'mediaFiles' | 'never'>('editor.drop.copyIntoWorkspace', 'mediaFiles'); + if (copyIntoWorkspace !== 'mediaFiles') { + return; + } + + const edit = await this._createEditForMediaFiles(document, dataTransfer, token); + if (!edit) { + return; + } + + const dropEdit = new vscode.DocumentDropEdit(edit.snippet); + dropEdit.label = edit.label; + dropEdit.additionalEdit = edit.additionalEdits; + dropEdit.yieldTo = this._yieldTo; + return dropEdit; + } + + /** + * Create a new edit for media files in a data transfer. + * + * This tries copying files outside of the workspace into the workspace. + */ + private async _createEditForMediaFiles( + document: vscode.TextDocument, + dataTransfer: vscode.DataTransfer, + token: vscode.CancellationToken, + ): Promise<{ snippet: vscode.SnippetString; label: string; additionalEdits: vscode.WorkspaceEdit } | undefined> { + interface FileEntry { + readonly uri: vscode.Uri; + readonly newFile?: { readonly contents: vscode.DataTransferFile; readonly overwrite: boolean }; + } + + const pathGenerator = new NewFilePathGenerator(); + const fileEntries = coalesce(await Promise.all(Array.from(dataTransfer, async ([mime, item]): Promise => { + if (!mediaMimes.has(mime)) { + return; + } + + const file = item?.asFile(); + if (!file) { + return; + } + + if (file.uri) { + // If the file is already in a workspace, we don't want to create a copy of it + const workspaceFolder = vscode.workspace.getWorkspaceFolder(file.uri); + if (workspaceFolder) { + return { uri: file.uri }; + } + } + + const newFile = await pathGenerator.getNewFilePath(document, file, token); + if (!newFile) { + return; + } + return { uri: newFile.uri, newFile: { contents: file, overwrite: newFile.overwrite } }; + }))); + if (!fileEntries.length) { + return; + } + + const workspaceEdit = new vscode.WorkspaceEdit(); + for (const entry of fileEntries) { + if (entry.newFile) { + workspaceEdit.createFile(entry.uri, { + contents: entry.newFile.contents, + overwrite: entry.newFile.overwrite, + }); + } + } + + const snippet = createUriListSnippet(document.uri, fileEntries); + if (!snippet) { + return; + } + + return { + snippet: snippet.snippet, + label: getSnippetLabel(snippet), + additionalEdits: workspaceEdit, + }; + } +} + +export function registerResourceDropOrPasteSupport(selector: vscode.DocumentSelector): vscode.Disposable { + return vscode.Disposable.from( + vscode.languages.registerDocumentPasteEditProvider(selector, new ResourcePasteOrDropProvider(), { + id: ResourcePasteOrDropProvider.id, + pasteMimeTypes: ResourcePasteOrDropProvider.mimeTypes, + }), + vscode.languages.registerDocumentDropEditProvider(selector, new ResourcePasteOrDropProvider(), { + id: ResourcePasteOrDropProvider.id, + dropMimeTypes: ResourcePasteOrDropProvider.mimeTypes, + }), + ); +} diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropResourceProvider.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropResourceProvider.ts deleted file mode 100644 index 1c5a19461cf..00000000000 --- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/dropResourceProvider.ts +++ /dev/null @@ -1,85 +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 { Mime, mediaMimes } from '../../util/mimes'; -import { Schemes } from '../../util/schemes'; -import { createEditForMediaFiles, tryGetUriListSnippet } from './shared'; - -class ResourceDropProvider implements vscode.DocumentDropEditProvider { - - public static readonly id = 'insertLink'; - - public static readonly dropMimeTypes = [ - Mime.textUriList, - ...mediaMimes, - ]; - - private readonly _yieldTo = [ - { mimeType: 'text/plain' }, - { extensionId: 'vscode.ipynb', providerId: 'insertAttachment' }, - ]; - - 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; - } - - const filesEdit = await this._getMediaFilesEdit(document, dataTransfer, token); - if (filesEdit) { - return filesEdit; - } - - if (token.isCancellationRequested) { - return; - } - - return this._getUriListEdit(document, dataTransfer, token); - } - - private async _getUriListEdit(document: vscode.TextDocument, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Promise { - const urlList = await dataTransfer.get(Mime.textUriList)?.asString(); - if (!urlList || token.isCancellationRequested) { - return undefined; - } - - const snippet = await tryGetUriListSnippet(document, urlList, token); - if (!snippet) { - return undefined; - } - - const edit = new vscode.DocumentDropEdit(snippet.snippet); - edit.label = snippet.label; - edit.yieldTo = this._yieldTo; - return edit; - } - - private async _getMediaFilesEdit(document: vscode.TextDocument, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Promise { - if (document.uri.scheme === Schemes.untitled) { - return; - } - - const copyIntoWorkspace = vscode.workspace.getConfiguration('markdown', document).get<'mediaFiles' | 'never'>('editor.drop.copyIntoWorkspace', 'mediaFiles'); - if (copyIntoWorkspace !== 'mediaFiles') { - return; - } - - const edit = await createEditForMediaFiles(document, dataTransfer, token); - if (!edit) { - return; - } - - const dropEdit = new vscode.DocumentDropEdit(edit.snippet); - dropEdit.label = edit.label; - dropEdit.additionalEdit = edit.additionalEdits; - dropEdit.yieldTo = this._yieldTo; - return dropEdit; - } -} - -export function registerDropIntoEditorSupport(selector: vscode.DocumentSelector) { - return vscode.languages.registerDocumentDropEditProvider(selector, new ResourceDropProvider(), ResourceDropProvider); -} diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/newFilePathGenerator.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/newFilePathGenerator.ts new file mode 100644 index 00000000000..1625977a72c --- /dev/null +++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/newFilePathGenerator.ts @@ -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. + *--------------------------------------------------------------------------------------------*/ + +import * as picomatch from 'picomatch'; +import * as vscode from 'vscode'; +import { Utils } from 'vscode-uri'; +import { getParentDocumentUri } from '../../util/document'; +import { CopyFileConfiguration, getCopyFileConfiguration, parseGlob, resolveCopyDestination } from './copyFiles'; + + +export class NewFilePathGenerator { + + private readonly _usedPaths = new Set(); + + async getNewFilePath( + document: vscode.TextDocument, + file: vscode.DataTransferFile, + token: vscode.CancellationToken + ): Promise<{ readonly uri: vscode.Uri; readonly overwrite: boolean } | undefined> { + const config = getCopyFileConfiguration(document); + const desiredPath = getDesiredNewFilePath(config, document, file); + + const root = Utils.dirname(desiredPath); + const ext = Utils.extname(desiredPath); + let baseName = Utils.basename(desiredPath); + baseName = baseName.slice(0, baseName.length - ext.length); + for (let i = 0; ; ++i) { + if (token.isCancellationRequested) { + return undefined; + } + + const name = i === 0 ? baseName : `${baseName}-${i}`; + const uri = vscode.Uri.joinPath(root, name + ext); + if (this._wasPathAlreadyUsed(uri)) { + continue; + } + + // Try overwriting if it already exists + if (config.overwriteBehavior === 'overwrite') { + this._usedPaths.add(uri.toString()); + return { uri, overwrite: true }; + } + + // Otherwise we need to check the fs to see if it exists + try { + await vscode.workspace.fs.stat(uri); + } catch { + if (!this._wasPathAlreadyUsed(uri)) { + // Does not exist + this._usedPaths.add(uri.toString()); + return { uri, overwrite: false }; + } + } + } + } + + private _wasPathAlreadyUsed(uri: vscode.Uri) { + return this._usedPaths.has(uri.toString()); + } +} + +export function getDesiredNewFilePath(config: CopyFileConfiguration, document: vscode.TextDocument, file: vscode.DataTransferFile): vscode.Uri { + const docUri = getParentDocumentUri(document.uri); + for (const [rawGlob, rawDest] of Object.entries(config.destination)) { + for (const glob of parseGlob(rawGlob)) { + if (picomatch.isMatch(docUri.path, glob, { dot: true })) { + return resolveCopyDestination(docUri, file.name, rawDest, uri => vscode.workspace.getWorkspaceFolder(uri)?.uri); + } + } + } + + // Default to next to current file + return vscode.Uri.joinPath(Utils.dirname(docUri), file.name); +} + diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/pasteResourceProvider.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/pasteResourceProvider.ts deleted file mode 100644 index cd051210d2d..00000000000 --- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/pasteResourceProvider.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 { Mime, mediaMimes } from '../../util/mimes'; -import { Schemes } from '../../util/schemes'; -import { PasteUrlAsFormattedLink, createEditAddingLinksForUriList, createEditForMediaFiles, getPasteUrlAsFormattedLinkSetting } from './shared'; - -class PasteResourceEditProvider implements vscode.DocumentPasteEditProvider { - - public static readonly id = 'insertLink'; - - public static readonly pasteMimeTypes = [ - Mime.textUriList, - ...mediaMimes, - ]; - - private readonly _yieldTo = [ - { mimeType: 'text/plain' }, - { extensionId: 'vscode.ipynb', providerId: 'insertAttachment' }, - ]; - - async provideDocumentPasteEdits( - document: vscode.TextDocument, - ranges: readonly vscode.Range[], - dataTransfer: vscode.DataTransfer, - token: vscode.CancellationToken, - ): Promise { - const enabled = vscode.workspace.getConfiguration('markdown', document).get('editor.filePaste.enabled', true); - if (!enabled) { - return; - } - - const createEdit = await this._getMediaFilesEdit(document, dataTransfer, token); - if (createEdit) { - return createEdit; - } - - if (token.isCancellationRequested) { - return; - } - - return this._getUriListEdit(document, ranges, dataTransfer, token); - } - - private async _getUriListEdit(document: vscode.TextDocument, ranges: readonly vscode.Range[], dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Promise { - const uriList = await dataTransfer.get(Mime.textUriList)?.asString(); - if (!uriList || token.isCancellationRequested) { - return; - } - - const pasteUrlSetting = getPasteUrlAsFormattedLinkSetting(document); - const pasteEdit = await createEditAddingLinksForUriList(document, ranges, uriList, false, pasteUrlSetting === PasteUrlAsFormattedLink.Smart, token); - if (!pasteEdit) { - return; - } - - const uriEdit = new vscode.DocumentPasteEdit('', pasteEdit.label); - uriEdit.additionalEdit = pasteEdit.additionalEdits; - uriEdit.yieldTo = this._yieldTo; - return uriEdit; - } - - private async _getMediaFilesEdit(document: vscode.TextDocument, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Promise { - if (document.uri.scheme === Schemes.untitled) { - return; - } - - const copyFilesIntoWorkspace = vscode.workspace.getConfiguration('markdown', document).get<'mediaFiles' | 'never'>('editor.filePaste.copyIntoWorkspace', 'mediaFiles'); - if (copyFilesIntoWorkspace === 'never') { - return; - } - - const edit = await createEditForMediaFiles(document, dataTransfer, token); - if (!edit) { - return; - } - - const pasteEdit = new vscode.DocumentPasteEdit(edit.snippet, edit.label); - pasteEdit.additionalEdit = edit.additionalEdits; - pasteEdit.yieldTo = this._yieldTo; - return pasteEdit; - } -} - -export function registerPasteSupport(selector: vscode.DocumentSelector,) { - return vscode.languages.registerDocumentPasteEditProvider(selector, new PasteResourceEditProvider(), PasteResourceEditProvider); -} diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/pasteUrlProvider.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/pasteUrlProvider.ts index b68b9cdaa2b..e87c63f3d50 100644 --- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/pasteUrlProvider.ts +++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/pasteUrlProvider.ts @@ -4,16 +4,31 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; +import { ITextDocument } from '../../types/textDocument'; import { Mime } from '../../util/mimes'; -import { createEditAddingLinksForUriList, getPasteUrlAsFormattedLinkSetting, PasteUrlAsFormattedLink, validateLink } from './shared'; +import { createInsertUriListEdit, externalUriSchemes } from './shared'; +enum PasteUrlAsFormattedLink { + Always = 'always', + Smart = 'smart', + Never = 'never' +} + +function getPasteUrlAsFormattedLinkSetting(document: vscode.TextDocument): PasteUrlAsFormattedLink { + return vscode.workspace.getConfiguration('markdown', document) + .get('editor.pasteUrlAsFormattedLink.enabled', PasteUrlAsFormattedLink.Smart); +} + +/** + * Adds support for pasting text uris to create markdown links. + * + * This only applies to `text/plain`. Other mimes like `text/uri-list` are handled by ResourcePasteOrDropProvider. + */ class PasteUrlEditProvider implements vscode.DocumentPasteEditProvider { public static readonly id = 'insertMarkdownLink'; - public static readonly pasteMimeTypes = [ - Mime.textPlain, - ]; + public static readonly pasteMimeTypes = [Mime.textPlain]; async provideDocumentPasteEdits( document: vscode.TextDocument, @@ -28,22 +43,108 @@ class PasteUrlEditProvider implements vscode.DocumentPasteEditProvider { const item = dataTransfer.get(Mime.textPlain); const urlList = await item?.asString(); - if (token.isCancellationRequested || !urlList || !validateLink(urlList).isValid) { + if (token.isCancellationRequested || !urlList) { return; } - const pasteEdit = await createEditAddingLinksForUriList(document, ranges, validateLink(urlList).cleanedUrlList, true, pasteUrlSetting === PasteUrlAsFormattedLink.Smart, token); - if (!pasteEdit) { + const uriText = findValidUriInText(urlList); + if (!uriText) { return; } - const edit = new vscode.DocumentPasteEdit('', pasteEdit.label); - edit.additionalEdit = pasteEdit.additionalEdits; - edit.yieldTo = pasteEdit.markdownLink ? undefined : [{ mimeType: Mime.textPlain }]; - return edit; + const edit = createInsertUriListEdit(document, ranges, uriText); + if (!edit) { + return; + } + + const pasteEdit = new vscode.DocumentPasteEdit('', edit.label); + const workspaceEdit = new vscode.WorkspaceEdit(); + workspaceEdit.set(document.uri, edit.edits); + pasteEdit.additionalEdit = workspaceEdit; + + // If smart pasting is enabled, deprioritize this provider when: + // - The user has no selection + // - At least one of the ranges occurs in a context where smart pasting is disabled (such as a fenced code block) + if (pasteUrlSetting === PasteUrlAsFormattedLink.Smart) { + if (!ranges.every(range => shouldSmartPaste(document, range))) { + pasteEdit.yieldTo = [{ mimeType: Mime.textPlain }]; + } + } + return pasteEdit; } } export function registerLinkPasteSupport(selector: vscode.DocumentSelector,) { - return vscode.languages.registerDocumentPasteEditProvider(selector, new PasteUrlEditProvider(), PasteUrlEditProvider); + return vscode.languages.registerDocumentPasteEditProvider(selector, new PasteUrlEditProvider(), { + id: PasteUrlEditProvider.id, + pasteMimeTypes: PasteUrlEditProvider.pasteMimeTypes, + }); +} + +const smartPasteRegexes = [ + { regex: /(\[[^\[\]]*](?:\([^\(\)]*\)|\[[^\[\]]*]))/g }, // In a Markdown link + { regex: /^```[\s\S]*?```$/gm }, // In a backtick fenced code block + { regex: /^~~~[\s\S]*?~~~$/gm }, // In a tildefenced code block + { regex: /^\$\$[\s\S]*?\$\$$/gm }, // In a fenced math block + { regex: /`[^`]*`/g }, // In inline code + { regex: /\$[^$]*\$/g }, // In inline math +]; + +export function shouldSmartPaste(document: ITextDocument, selectedRange: vscode.Range): boolean { + // Disable for empty selections and multi-line selections + if (selectedRange.isEmpty || selectedRange.start.line !== selectedRange.end.line) { + return false; + } + + const rangeText = document.getText(selectedRange); + // Disable for whitespace only selections + if (rangeText.trim().length === 0) { + return false; + } + + // Disable when the selection is already a link + if (findValidUriInText(rangeText)) { + return false; + } + + if (/\[.*\]\(.*\)/.test(rangeText) || /!\[.*\]\(.*\)/.test(rangeText)) { + return false; + } + + for (const regex of smartPasteRegexes) { + const matches = [...document.getText().matchAll(regex.regex)]; + for (const match of matches) { + if (match.index !== undefined) { + const useDefaultPaste = selectedRange.start.character > match.index && selectedRange.end.character < match.index + match[0].length; + if (useDefaultPaste) { + return false; + } + } + } + } + + return true; +} + +export function findValidUriInText(text: string): string | undefined { + const trimmedUrlList = text.trim(); + + // Uri must consist of a single sequence of characters without spaces + if (!/^\S+$/.test(trimmedUrlList)) { + return; + } + + let uri: vscode.Uri; + try { + uri = vscode.Uri.parse(trimmedUrlList); + } catch { + // Could not parse + return; + } + + if (!externalUriSchemes.includes(uri.scheme.toLowerCase()) || uri.authority.length <= 1) { + return; + } + + return trimmedUrlList; } diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts index dc8c15075f4..bd2bf0b8053 100644 --- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts +++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts @@ -6,11 +6,12 @@ import * as path from 'path'; import * as vscode from 'vscode'; import * as URI from 'vscode-uri'; +import { ITextDocument } from '../../types/textDocument'; import { coalesce } from '../../util/arrays'; import { getDocumentDir } from '../../util/document'; -import { mediaMimes } from '../../util/mimes'; import { Schemes } from '../../util/schemes'; -import { NewFilePathGenerator } from './copyFiles'; +import { resolveSnippet } from './snippets'; +import { parseUriList } from '../../util/uriList'; enum MediaKind { Image, @@ -50,129 +51,80 @@ export const mediaFileExtensions = new Map([ ['wav', MediaKind.Audio], ]); -const smartPasteRegexes = [ - { regex: /(\[[^\[\]]*](?:\([^\(\)]*\)|\[[^\[\]]*]))/g }, // In a Markdown link - { regex: /^```[\s\S]*?```$/gm }, // In a backtick fenced code block - { regex: /^~~~[\s\S]*?~~~$/gm }, // In a tildefenced code block - { regex: /^\$\$[\s\S]*?\$\$$/gm }, // In a fenced math block - { regex: /`[^`]*`/g }, // In inline code - { regex: /\$[^$]*\$/g }, // In inline math -]; - -export interface SkinnyTextDocument { - offsetAt(position: vscode.Position): number; - getText(range?: vscode.Range): string; - readonly uri: vscode.Uri; +export function getSnippetLabel(counter: { insertedAudioVideoCount: number; insertedImageCount: number; insertedLinkCount: number }) { + if (counter.insertedAudioVideoCount > 0) { + if (counter.insertedLinkCount > 0) { + return vscode.l10n.t('Insert Markdown Media and Links'); + } else { + return vscode.l10n.t('Insert Markdown Media'); + } + } else if (counter.insertedImageCount > 0 && counter.insertedLinkCount > 0) { + return vscode.l10n.t('Insert Markdown Images and Links'); + } else if (counter.insertedImageCount > 0) { + return counter.insertedImageCount > 1 + ? vscode.l10n.t('Insert Markdown Images') + : vscode.l10n.t('Insert Markdown Image'); + } else { + return counter.insertedLinkCount > 1 + ? vscode.l10n.t('Insert Markdown Links') + : vscode.l10n.t('Insert Markdown Link'); + } } -export enum PasteUrlAsFormattedLink { - Always = 'always', - Smart = 'smart', - Never = 'never' -} - -export function getPasteUrlAsFormattedLinkSetting(document: vscode.TextDocument): PasteUrlAsFormattedLink { - return vscode.workspace.getConfiguration('markdown', document).get('editor.pasteUrlAsFormattedLink.enabled', PasteUrlAsFormattedLink.Smart); -} - -export async function createEditAddingLinksForUriList( - document: SkinnyTextDocument, +export function createInsertUriListEdit( + document: ITextDocument, ranges: readonly vscode.Range[], urlList: string, - isExternalLink: boolean, - useSmartPaste: boolean, - token: vscode.CancellationToken, -): Promise<{ additionalEdits: vscode.WorkspaceEdit; label: string; markdownLink: boolean } | undefined> { - - if (ranges.length === 0) { +): { edits: vscode.SnippetTextEdit[]; label: string } | undefined { + if (!ranges.length) { return; } - const edits: vscode.SnippetTextEdit[] = []; - let placeHolderValue: number = ranges.length; - let label: string = ''; - let pasteAsMarkdownLink: boolean = true; - let markdownLink: boolean = true; - for (const range of ranges) { - const selectedRange: vscode.Range = new vscode.Range( - new vscode.Position(range.start.line, document.offsetAt(range.start)), - new vscode.Position(range.end.line, document.offsetAt(range.end)) - ); - - if (useSmartPaste) { - pasteAsMarkdownLink = checkSmartPaste(document, selectedRange, range); - markdownLink = pasteAsMarkdownLink; // FIX: this will only match the last range - } - - const snippet = await tryGetUriListSnippet(document, urlList, token, document.getText(range), placeHolderValue, pasteAsMarkdownLink, isExternalLink); - if (!snippet) { - return; - } - - pasteAsMarkdownLink = true; - placeHolderValue--; - edits.push(new vscode.SnippetTextEdit(range, snippet.snippet)); - label = snippet.label; - } - - const additionalEdits = new vscode.WorkspaceEdit(); - additionalEdits.set(document.uri, edits); - - return { additionalEdits, label, markdownLink }; -} - -export function checkSmartPaste(document: SkinnyTextDocument, selectedRange: vscode.Range, range: vscode.Range): boolean { - if (selectedRange.isEmpty || /^[\s\n]*$/.test(document.getText(range)) || validateLink(document.getText(range)).isValid) { - return false; - } - if (/\[.*\]\(.*\)/.test(document.getText(range)) || /!\[.*\]\(.*\)/.test(document.getText(range))) { - return false; - } - for (const regex of smartPasteRegexes) { - const matches = [...document.getText().matchAll(regex.regex)]; - for (const match of matches) { - if (match.index !== undefined) { - const useDefaultPaste = selectedRange.start.character > match.index && selectedRange.end.character < match.index + match[0].length; - if (useDefaultPaste) { - return false; - } - } - } - } - return true; -} - -export function validateLink(urlList: string): { isValid: boolean; cleanedUrlList: string } { - let isValid = false; - let uri = undefined; - const trimmedUrlList = urlList?.trim(); //remove leading and trailing whitespace and new lines - try { - uri = vscode.Uri.parse(trimmedUrlList); - } catch (error) { - return { isValid: false, cleanedUrlList: urlList }; - } - const splitUrlList = trimmedUrlList.split(' ').filter(item => item !== ''); //split on spaces and remove empty strings - if (uri) { - isValid = splitUrlList.length === 1 && !splitUrlList[0].includes('\n') && externalUriSchemes.includes(vscode.Uri.parse(splitUrlList[0]).scheme) && !!vscode.Uri.parse(splitUrlList[0]).authority; - } - return { isValid, cleanedUrlList: splitUrlList[0] }; -} - -export async function tryGetUriListSnippet(document: SkinnyTextDocument, urlList: String, token: vscode.CancellationToken, title = '', placeHolderValue = 0, pasteAsMarkdownLink = true, isExternalLink = false): Promise<{ snippet: vscode.SnippetString; label: string } | undefined> { - if (token.isCancellationRequested) { - return undefined; - } - const uriStrings: string[] = []; - const uris: vscode.Uri[] = []; - for (const resource of urlList.split(/\r?\n/g)) { + const entries = coalesce(parseUriList(urlList).map(line => { try { - uris.push(vscode.Uri.parse(resource)); - uriStrings.push(resource); + return { uri: vscode.Uri.parse(line), str: line }; } catch { - // noop + // Uri parse failure + return undefined; } + })); + if (!entries.length) { + return; } - return createUriListSnippet(document, uris, uriStrings, title, placeHolderValue, pasteAsMarkdownLink, isExternalLink); + + const edits: vscode.SnippetTextEdit[] = []; + + let insertedLinkCount = 0; + let insertedImageCount = 0; + let insertedAudioVideoCount = 0; + + // Use 1 for all empty ranges but give non-empty range unique indices starting after 1 + let placeHolderStartIndex = 1 + entries.length; + + // Sort ranges by start position + const orderedRanges = [...ranges].sort((a, b) => a.start.compareTo(b.start)); + const allRangesAreEmpty = orderedRanges.every(range => range.isEmpty); + + for (const range of orderedRanges) { + const snippet = createUriListSnippet(document.uri, entries, { + placeholderText: range.isEmpty ? undefined : document.getText(range), + placeholderStartIndex: allRangesAreEmpty ? 1 : placeHolderStartIndex, + }); + if (!snippet) { + continue; + } + + insertedLinkCount += snippet.insertedLinkCount; + insertedImageCount += snippet.insertedImageCount; + insertedAudioVideoCount += snippet.insertedAudioVideoCount; + + placeHolderStartIndex += entries.length; + + edits.push(new vscode.SnippetTextEdit(range, snippet.snippet)); + } + + const label = getSnippetLabel({ insertedAudioVideoCount, insertedImageCount, insertedLinkCount }); + return { edits, label }; } interface UriListSnippetOptions { @@ -181,87 +133,76 @@ interface UriListSnippetOptions { readonly placeholderStartIndex?: number; /** - * Should the snippet be for an image link or video? + * Controls if a media link (`![](...)`) is inserted instead of a normal markdown link. * - * If `undefined`, tries to infer this from the uri. + * By default tries to infer this from the uri. */ readonly insertAsMedia?: boolean; readonly separator?: string; } -export function appendToLinkSnippet( - snippet: vscode.SnippetString, - title: string, - uriString: string, - placeholderValue: number, - isExternalLink: boolean, -): vscode.SnippetString { - snippet.appendText('['); - snippet.appendPlaceholder(escapeBrackets(title) || 'Title', placeholderValue); - snippet.appendText(`](${escapeMarkdownLinkPath(uriString, isExternalLink)})`); - return snippet; + +interface UriSnippet { + snippet: vscode.SnippetString; + insertedLinkCount: number; + insertedImageCount: number; + insertedAudioVideoCount: number; } export function createUriListSnippet( - document: SkinnyTextDocument, - uris: readonly vscode.Uri[], - uriStrings?: readonly string[], - title = '', - placeholderValue = 0, - pasteAsMarkdownLink = true, - isExternalLink = false, + document: vscode.Uri, + uris: ReadonlyArray<{ + readonly uri: vscode.Uri; + readonly str?: string; + }>, options?: UriListSnippetOptions, -): { snippet: vscode.SnippetString; label: string } | undefined { +): UriSnippet | undefined { if (!uris.length) { return; } - const documentDir = getDocumentDir(document.uri); + const documentDir = getDocumentDir(document); + const config = vscode.workspace.getConfiguration('markdown', document); + const title = options?.placeholderText || 'Title'; - let snippet = new vscode.SnippetString(); let insertedLinkCount = 0; let insertedImageCount = 0; let insertedAudioVideoCount = 0; + const snippet = new vscode.SnippetString(); + let placeholderIndex = options?.placeholderStartIndex ?? 1; + uris.forEach((uri, i) => { - const mdPath = getMdPath(documentDir, uri); + const mdPath = getRelativeMdPath(documentDir, uri.uri) ?? uri.str ?? uri.uri.toString(); - const ext = URI.Utils.extname(uri).toLowerCase().replace('.', ''); - const insertAsMedia = typeof options?.insertAsMedia === 'undefined' ? mediaFileExtensions.has(ext) : !!options.insertAsMedia; - const insertAsVideo = mediaFileExtensions.get(ext) === MediaKind.Video; - const insertAsAudio = mediaFileExtensions.get(ext) === MediaKind.Audio; + const ext = URI.Utils.extname(uri.uri).toLowerCase().replace('.', ''); + const insertAsMedia = options?.insertAsMedia || (typeof options?.insertAsMedia === 'undefined' && mediaFileExtensions.has(ext)); - if (insertAsVideo) { - insertedAudioVideoCount++; - snippet.appendText(`'); - } else if (insertAsAudio) { - insertedAudioVideoCount++; - snippet.appendText(`'); - } else if (insertAsMedia) { - if (insertAsMedia) { + if (insertAsMedia) { + const insertAsVideo = mediaFileExtensions.get(ext) === MediaKind.Video; + const insertAsAudio = mediaFileExtensions.get(ext) === MediaKind.Audio; + if (insertAsVideo || insertAsAudio) { + insertedAudioVideoCount++; + const mediaSnippet = insertAsVideo + ? config.get('editor.filePaste.videoSnippet', '') + : config.get('editor.filePaste.audioSnippet', ''); + snippet.value += resolveSnippet(mediaSnippet, new Map([ + ['src', mdPath], + ['title', `\${${placeholderIndex++}:${title}}`], + ])); + } else { insertedImageCount++; - if (pasteAsMarkdownLink) { - snippet.appendText('!['); - const placeholderText = escapeBrackets(title) || options?.placeholderText || 'Alt text'; - const placeholderIndex = typeof options?.placeholderStartIndex !== 'undefined' ? options?.placeholderStartIndex + i : (placeholderValue === 0 ? undefined : placeholderValue); - snippet.appendPlaceholder(placeholderText, placeholderIndex); - snippet.appendText(`](${escapeMarkdownLinkPath(mdPath, isExternalLink)})`); - } else { - snippet.appendText(escapeMarkdownLinkPath(mdPath, isExternalLink)); - } + snippet.appendText('!['); + const placeholderText = escapeBrackets(options?.placeholderText || 'alt text'); + snippet.appendPlaceholder(placeholderText, placeholderIndex); + snippet.appendText(`](${escapeMarkdownLinkPath(mdPath)})`); } } else { insertedLinkCount++; - if (uriStrings && isExternalLink) { - snippet = appendToLinkSnippet(snippet, title, uriStrings[i], placeholderValue, isExternalLink); - } else { - snippet.appendText(escapeMarkdownLinkPath(mdPath, isExternalLink)); - } + snippet.appendText('['); + snippet.appendPlaceholder(escapeBrackets(options?.placeholderText ?? 'text'), placeholderIndex); + snippet.appendText(`](${escapeMarkdownLinkPath(mdPath)})`); } if (i < uris.length - 1 && uris.length > 1) { @@ -269,99 +210,11 @@ export function createUriListSnippet( } }); - let label: string; - if (insertedAudioVideoCount > 0) { - if (insertedLinkCount > 0) { - label = vscode.l10n.t('Insert Markdown Media and Links'); - } else { - label = vscode.l10n.t('Insert Markdown Media'); - } - } else if (insertedImageCount > 0 && insertedLinkCount > 0) { - label = vscode.l10n.t('Insert Markdown Images and Links'); - } else if (insertedImageCount > 0) { - label = insertedImageCount > 1 - ? vscode.l10n.t('Insert Markdown Images') - : vscode.l10n.t('Insert Markdown Image'); - } else { - label = insertedLinkCount > 1 - ? vscode.l10n.t('Insert Markdown Links') - : vscode.l10n.t('Insert Markdown Link'); - } - - return { snippet, label }; + return { snippet, insertedAudioVideoCount, insertedImageCount, insertedLinkCount }; } -/** - * Create a new edit from the image files in a data transfer. - * - * This tries copying files outside of the workspace into the workspace. - */ -export async function createEditForMediaFiles( - document: vscode.TextDocument, - dataTransfer: vscode.DataTransfer, - token: vscode.CancellationToken -): Promise<{ snippet: vscode.SnippetString; label: string; additionalEdits: vscode.WorkspaceEdit } | undefined> { - if (document.uri.scheme === Schemes.untitled) { - return; - } - interface FileEntry { - readonly uri: vscode.Uri; - readonly newFile?: { readonly contents: vscode.DataTransferFile; readonly overwrite: boolean }; - } - - const pathGenerator = new NewFilePathGenerator(); - const fileEntries = coalesce(await Promise.all(Array.from(dataTransfer, async ([mime, item]): Promise => { - if (!mediaMimes.has(mime)) { - return; - } - - const file = item?.asFile(); - if (!file) { - return; - } - - if (file.uri) { - // If the file is already in a workspace, we don't want to create a copy of it - const workspaceFolder = vscode.workspace.getWorkspaceFolder(file.uri); - if (workspaceFolder) { - return { uri: file.uri }; - } - } - - const newFile = await pathGenerator.getNewFilePath(document, file, token); - if (!newFile) { - return; - } - return { uri: newFile.uri, newFile: { contents: file, overwrite: newFile.overwrite } }; - }))); - if (!fileEntries.length) { - return; - } - - const workspaceEdit = new vscode.WorkspaceEdit(); - for (const entry of fileEntries) { - if (entry.newFile) { - workspaceEdit.createFile(entry.uri, { - contents: entry.newFile.contents, - overwrite: entry.newFile.overwrite, - }); - } - } - - const snippet = createUriListSnippet(document, fileEntries.map(entry => entry.uri)); - if (!snippet) { - return; - } - - return { - snippet: snippet.snippet, - label: snippet.label, - additionalEdits: workspaceEdit, - }; -} - -function getMdPath(dir: vscode.Uri | undefined, file: vscode.Uri) { +function getRelativeMdPath(dir: vscode.Uri | undefined, file: vscode.Uri): string | undefined { if (dir && dir.scheme === file.scheme && dir.authority === file.authority) { if (file.scheme === Schemes.file) { // On windows, we must use the native `path.relative` to generate the relative path @@ -373,20 +226,15 @@ function getMdPath(dir: vscode.Uri | undefined, file: vscode.Uri) { return path.posix.relative(dir.path, file.path); } - - return file.toString(false); + return undefined; } -function escapeHtmlAttribute(attr: string): string { - return encodeURI(attr).replaceAll('"', '"'); -} - -function escapeMarkdownLinkPath(mdPath: string, isExternalLink: boolean): string { +function escapeMarkdownLinkPath(mdPath: string): string { if (needsBracketLink(mdPath)) { return '<' + mdPath.replaceAll('<', '\\<').replaceAll('>', '\\>') + '>'; } - return isExternalLink ? mdPath : encodeURI(mdPath); + return mdPath; } function escapeBrackets(value: string): string { @@ -394,7 +242,7 @@ function escapeBrackets(value: string): string { return value; } -function needsBracketLink(mdPath: string) { +function needsBracketLink(mdPath: string): boolean { // Links with whitespace or control characters must be enclosed in brackets if (mdPath.startsWith('<') || /\s|[\u007F\u0000-\u001f]/.test(mdPath)) { return true; @@ -422,4 +270,3 @@ function needsBracketLink(mdPath: string) { return nestingCount > 0; } - diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/snippets.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/snippets.ts new file mode 100644 index 00000000000..854cf2175d0 --- /dev/null +++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/snippets.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. + *--------------------------------------------------------------------------------------------*/ + +/** + * Resolves variables in a VS Code snippet style string + */ +export function resolveSnippet(snippetString: string, vars: ReadonlyMap): string { + return snippetString.replaceAll(/(?\\\$)|(?\w+)(?:\/(?(?:\\\/|[^\}])+?)\/(?(?:\\\/|[^\}])+?)\/)?\}/g, (match, _escape, name, pattern, replacement, _offset, _str, groups) => { + if (groups?.['escape']) { + return '$'; + } + + const entry = vars.get(name); + if (typeof entry !== 'string') { + return match; + } + + if (pattern && replacement) { + return entry.replace(new RegExp(replaceTransformEscapes(pattern)), replaceTransformEscapes(replacement)); + } + + return entry; + }); +} + + +function replaceTransformEscapes(str: string): string { + return str.replaceAll(/\\\//g, '/'); +} + diff --git a/extensions/markdown-language-features/src/markdownEngine.ts b/extensions/markdown-language-features/src/markdownEngine.ts index cd999c44116..2a2e5896dbd 100644 --- a/extensions/markdown-language-features/src/markdownEngine.ts +++ b/extensions/markdown-language-features/src/markdownEngine.ts @@ -398,15 +398,14 @@ async function getMarkdownOptions(md: () => MarkdownIt): Promise${highlighted}`; } catch (error) { } } - return `
${md().utils.escapeHtml(str)}
`; + return md().utils.escapeHtml(str); } }; } diff --git a/extensions/markdown-language-features/src/test/copyFile.test.ts b/extensions/markdown-language-features/src/test/copyFile.test.ts index 41d502c39cc..95347c99e5f 100644 --- a/extensions/markdown-language-features/src/test/copyFile.test.ts +++ b/extensions/markdown-language-features/src/test/copyFile.test.ts @@ -68,10 +68,31 @@ suite('resolveCopyDestination', () => { assert.strictEqual(dest.toString(), 'test://projects/project/sub/img.gif'); }); - test('transforms should support capture groups', async () => { + test('Transforms should support capture groups', async () => { const documentUri = vscode.Uri.parse('test://projects/project/sub/readme.md'); const dest = resolveCopyDestination(documentUri, 'img.png', '${fileName/(.+)\\.(.+)/$2.$1/}', () => undefined); assert.strictEqual(dest.toString(), 'test://projects/project/sub/png.img'); }); + + test('Should support escaping snippet variables ', async () => { + const documentUri = vscode.Uri.parse('test://projects/project/sub/readme.md'); + + // Escape leading '$' + assert.strictEqual( + resolveCopyDestination(documentUri, 'img.png', '\\${fileName}', () => undefined).toString(true), + 'test://projects/project/sub/${fileName}'); + + // Escape closing '}' + assert.strictEqual( + resolveCopyDestination(documentUri, 'img.png', '${fileName\\}', () => undefined).toString(true), + 'test://projects/project/sub/${fileName\\}'); + }); + + test('Transforms should support escaped slashes', async () => { + const documentUri = vscode.Uri.parse('test://projects/project/sub/readme.md'); + const dest = resolveCopyDestination(documentUri, 'img.png', '${fileName/(.+)/x\\/y/}.${fileExtName}', () => undefined); + + assert.strictEqual(dest.toString(), 'test://projects/project/sub/x/y.png'); + }); }); diff --git a/extensions/markdown-language-features/src/test/markdownLink.test.ts b/extensions/markdown-language-features/src/test/markdownLink.test.ts index f0133ad85cc..0d30ec948d5 100644 --- a/extensions/markdown-language-features/src/test/markdownLink.test.ts +++ b/extensions/markdown-language-features/src/test/markdownLink.test.ts @@ -2,232 +2,216 @@ * 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 'mocha'; -import { SkinnyTextDocument, checkSmartPaste, createEditAddingLinksForUriList, appendToLinkSnippet, validateLink } from '../languageFeatures/copyFiles/shared'; +import * as vscode from 'vscode'; +import { InMemoryDocument } from '../client/inMemoryDocument'; +import { findValidUriInText, shouldSmartPaste } from '../languageFeatures/copyFiles/pasteUrlProvider'; +import { createInsertUriListEdit } from '../languageFeatures/copyFiles/shared'; + +function makeTestDoc(contents: string) { + return new InMemoryDocument(vscode.Uri.file('test.md'), contents); +} suite('createEditAddingLinksForUriList', () => { test('Markdown Link Pasting should occur for a valid link (end to end)', async () => { // createEditAddingLinksForUriList -> checkSmartPaste -> tryGetUriListSnippet -> createUriListSnippet -> createLinkSnippet - const skinnyDocument: SkinnyTextDocument = { - uri: vscode.Uri.parse('file:///path/to/your/file'), - offsetAt: function () { return 0; }, - getText: function () { return 'hello world!'; }, - }; - - const result = await createEditAddingLinksForUriList(skinnyDocument, [new vscode.Range(0, 0, 0, 12)], 'https://www.microsoft.com/', true, true, new vscode.CancellationTokenSource().token); + const result = createInsertUriListEdit( + new InMemoryDocument(vscode.Uri.file('test.md'), 'hello world!'), [new vscode.Range(0, 0, 0, 12)], 'https://www.microsoft.com/'); // need to check the actual result -> snippet value assert.strictEqual(result?.label, 'Insert Markdown Link'); }); suite('validateLink', () => { - test('Markdown pasting should occur for a valid link.', () => { - const isLink = validateLink('https://www.microsoft.com/').isValid; - assert.strictEqual(isLink, true); + test('Markdown pasting should occur for a valid link', () => { + assert.strictEqual( + findValidUriInText('https://www.microsoft.com/'), + 'https://www.microsoft.com/'); }); - test('Markdown pasting should occur for a valid link preceded by a new line.', () => { - const isLink = validateLink('\r\nhttps://www.microsoft.com/').isValid; - assert.strictEqual(isLink, true); + test('Markdown pasting should occur for a valid link preceded by a new line', () => { + assert.strictEqual( + findValidUriInText('\r\nhttps://www.microsoft.com/'), + 'https://www.microsoft.com/'); }); - test('Markdown pasting should occur for a valid link followed by a new line.', () => { - const isLink = validateLink('https://www.microsoft.com/\r\n').isValid; - assert.strictEqual(isLink, true); + test('Markdown pasting should occur for a valid link followed by a new line', () => { + assert.strictEqual( + findValidUriInText('https://www.microsoft.com/\r\n'), + 'https://www.microsoft.com/'); }); - test('Markdown pasting should not occur for a valid hostname and invalid protool.', () => { - const isLink = validateLink('invalid:www.microsoft.com').isValid; - assert.strictEqual(isLink, false); + test('Markdown pasting should not occur for a valid hostname and invalid protool', () => { + assert.strictEqual( + findValidUriInText('invalid:www.microsoft.com'), + undefined); }); - test('Markdown pasting should not occur for plain text.', () => { - const isLink = validateLink('hello world!').isValid; - assert.strictEqual(isLink, false); + test('Markdown pasting should not occur for plain text', () => { + assert.strictEqual( + findValidUriInText('hello world!'), + undefined); }); - test('Markdown pasting should not occur for plain text including a colon.', () => { - const isLink = validateLink('hello: world!').isValid; - assert.strictEqual(isLink, false); + test('Markdown pasting should not occur for plain text including a colon', () => { + assert.strictEqual( + findValidUriInText('hello: world!'), + undefined); }); - test('Markdown pasting should not occur for plain text including a slashes.', () => { - const isLink = validateLink('helloworld!').isValid; - assert.strictEqual(isLink, false); + test('Markdown pasting should not occur for plain text including a slashes', () => { + assert.strictEqual( + findValidUriInText('helloworld!'), + undefined); }); - test('Markdown pasting should not occur for a link followed by text.', () => { - const isLink = validateLink('https://www.microsoft.com/ hello world!').isValid; - assert.strictEqual(isLink, false); + test('Markdown pasting should not occur for a link followed by text', () => { + assert.strictEqual( + findValidUriInText('https://www.microsoft.com/ hello world!'), + undefined); }); - test('Markdown pasting should occur for a link preceded or followed by spaces.', () => { - const isLink = validateLink(' https://www.microsoft.com/ ').isValid; - assert.strictEqual(isLink, true); + test('Markdown pasting should occur for a link preceded or followed by spaces', () => { + assert.strictEqual( + findValidUriInText(' https://www.microsoft.com/ '), + 'https://www.microsoft.com/'); }); - test('Markdown pasting should not occur for a link with an invalid scheme.', () => { - const isLink = validateLink('hello:www.microsoft.com').isValid; - assert.strictEqual(isLink, false); + test('Markdown pasting should not occur for a link with an invalid scheme', () => { + assert.strictEqual( + findValidUriInText('hello:www.microsoft.com'), + undefined); }); - test('Markdown pasting should not occur for multiple links being pasted.', () => { - const isLink = validateLink('https://www.microsoft.com/\r\nhttps://www.microsoft.com/\r\nhttps://www.microsoft.com/\r\nhttps://www.microsoft.com/').isValid; - assert.strictEqual(isLink, false); + test('Markdown pasting should not occur for multiple links being pasted', () => { + assert.strictEqual( + findValidUriInText('https://www.microsoft.com/\r\nhttps://www.microsoft.com/\r\nhttps://www.microsoft.com/\r\nhttps://www.microsoft.com/'), + undefined); }); - test('Markdown pasting should not occur for multiple links with spaces being pasted.', () => { - const isLink = validateLink('https://www.microsoft.com/ \r\nhttps://www.microsoft.com/\r\nhttps://www.microsoft.com/\r\n hello \r\nhttps://www.microsoft.com/').isValid; - assert.strictEqual(isLink, false); + test('Markdown pasting should not occur for multiple links with spaces being pasted', () => { + assert.strictEqual( + findValidUriInText('https://www.microsoft.com/ \r\nhttps://www.microsoft.com/\r\nhttps://www.microsoft.com/\r\n hello \r\nhttps://www.microsoft.com/'), + undefined); }); test('Markdown pasting should not occur for just a valid uri scheme', () => { - const isLink = validateLink('https://').isValid; - assert.strictEqual(isLink, false); + assert.strictEqual( + findValidUriInText('https://'), + undefined); }); }); - suite('appendToLinkSnippet', () => { + suite('createInsertUriListEdit', () => { test('Should create snippet with < > when pasted link has an mismatched parentheses', () => { - const uriString = 'https://www.mic(rosoft.com'; - const snippet = appendToLinkSnippet(new vscode.SnippetString(''), 'abc', uriString, 0, true); - assert.strictEqual(snippet?.value, '[${0:abc}]()'); + const edit = createInsertUriListEdit(makeTestDoc(''), [new vscode.Range(0, 0, 0, 0)], 'https://www.mic(rosoft.com'); + assert.strictEqual(edit?.edits?.[0].snippet.value, '[${1:text}]()'); }); test('Should create Markdown link snippet when pasteAsMarkdownLink is true', () => { - const uriString = 'https://www.microsoft.com'; - const snippet = appendToLinkSnippet(new vscode.SnippetString(''), '', uriString, 0, true); - assert.strictEqual(snippet?.value, '[${0:Title}](https://www.microsoft.com)'); + const edit = createInsertUriListEdit(makeTestDoc(''), [new vscode.Range(0, 0, 0, 0)], 'https://www.microsoft.com'); + assert.strictEqual(edit?.edits?.[0].snippet.value, '[${1:text}](https://www.microsoft.com)'); }); test('Should use an unencoded URI string in Markdown link when passing in an external browser link', () => { - const uriString = 'https://www.microsoft.com'; - const snippet = appendToLinkSnippet(new vscode.SnippetString(''), '', uriString, 0, true); - assert.strictEqual(snippet?.value, '[${0:Title}](https://www.microsoft.com)'); + const edit = createInsertUriListEdit(makeTestDoc(''), [new vscode.Range(0, 0, 0, 0)], 'https://www.microsoft.com'); + assert.strictEqual(edit?.edits?.[0].snippet.value, '[${1:text}](https://www.microsoft.com)'); }); test('Should not decode an encoded URI string when passing in an external browser link', () => { - const uriString = 'https://www.microsoft.com/%20'; - const snippet = appendToLinkSnippet(new vscode.SnippetString(''), '', uriString, 0, true); - assert.strictEqual(snippet?.value, '[${0:Title}](https://www.microsoft.com/%20)'); + const edit = createInsertUriListEdit(makeTestDoc(''), [new vscode.Range(0, 0, 0, 0)], 'https://www.microsoft.com/%20'); + assert.strictEqual(edit?.edits?.[0].snippet.value, '[${1:text}](https://www.microsoft.com/%20)'); }); test('Should not encode an unencoded URI string when passing in an external browser link', () => { - const uriString = 'https://www.example.com/path?query=value&another=value#fragment'; - const snippet = appendToLinkSnippet(new vscode.SnippetString(''), '', uriString, 0, true); - assert.strictEqual(snippet?.value, '[${0:Title}](https://www.example.com/path?query=value&another=value#fragment)'); + const edit = createInsertUriListEdit(makeTestDoc(''), [new vscode.Range(0, 0, 0, 0)], 'https://www.example.com/path?query=value&another=value#fragment'); + assert.strictEqual(edit?.edits?.[0].snippet.value, '[${1:text}](https://www.example.com/path?query=value&another=value#fragment)'); }); }); suite('checkSmartPaste', () => { - const skinnyDocument: SkinnyTextDocument = { - uri: vscode.Uri.file('/path/to/your/file'), - offsetAt: function () { return 0; }, - getText: function () { return 'hello world!'; }, - }; - test('Should evaluate pasteAsMarkdownLink as true for selected plain text', () => { - const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 0, 0, 12), new vscode.Range(0, 0, 0, 12)); - assert.strictEqual(pasteAsMarkdownLink, true); + assert.strictEqual( + shouldSmartPaste(makeTestDoc('hello world'), new vscode.Range(0, 0, 0, 12)), + true); }); test('Should evaluate pasteAsMarkdownLink as false for a valid selected link', () => { - skinnyDocument.getText = function () { return 'https://www.microsoft.com'; }; - const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 0, 0, 25), new vscode.Range(0, 0, 0, 25)); - assert.strictEqual(pasteAsMarkdownLink, false); + assert.strictEqual( + shouldSmartPaste(makeTestDoc('https://www.microsoft.com'), new vscode.Range(0, 0, 0, 25)), + false); }); test('Should evaluate pasteAsMarkdownLink as false for a valid selected link with trailing whitespace', () => { - skinnyDocument.getText = function () { return ' https://www.microsoft.com '; }; - const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 0, 0, 30), new vscode.Range(0, 0, 0, 30)); - assert.strictEqual(pasteAsMarkdownLink, false); + assert.strictEqual( + shouldSmartPaste(makeTestDoc(' https://www.microsoft.com '), new vscode.Range(0, 0, 0, 30)), + false); }); test('Should evaluate pasteAsMarkdownLink as true for a link pasted in square brackets', () => { - skinnyDocument.getText = function () { return '[abc]'; }; - const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 1, 0, 4), new vscode.Range(0, 1, 0, 4)); - assert.strictEqual(pasteAsMarkdownLink, true); + assert.strictEqual( + shouldSmartPaste(makeTestDoc('[abc]'), new vscode.Range(0, 1, 0, 4)), + true); }); test('Should evaluate pasteAsMarkdownLink as false for no selection', () => { - const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 0, 0, 0), new vscode.Range(0, 0, 0, 0)); - assert.strictEqual(pasteAsMarkdownLink, false); + assert.strictEqual( + shouldSmartPaste(makeTestDoc('xyz'), new vscode.Range(0, 0, 0, 0)), + false); }); test('Should evaluate pasteAsMarkdownLink as false for selected whitespace and new lines', () => { - skinnyDocument.getText = function () { return ' \r\n\r\n'; }; - const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 0, 0, 7), new vscode.Range(0, 0, 0, 7)); - assert.strictEqual(pasteAsMarkdownLink, false); + assert.strictEqual( + shouldSmartPaste(makeTestDoc(' \r\n\r\n'), new vscode.Range(0, 0, 0, 7)), + false); }); test('Should evaluate pasteAsMarkdownLink as false for pasting within a backtick code block', () => { - skinnyDocument.getText = function () { return '```\r\n\r\n```'; }; - const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 5, 0, 5), new vscode.Range(0, 5, 0, 5)); - assert.strictEqual(pasteAsMarkdownLink, false); + assert.strictEqual( + shouldSmartPaste(makeTestDoc('```\r\n\r\n```'), new vscode.Range(0, 5, 0, 5)), + false); }); test('Should evaluate pasteAsMarkdownLink as false for pasting within a tilde code block', () => { - skinnyDocument.getText = function () { return '~~~\r\n\r\n~~~'; }; - const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 5, 0, 5), new vscode.Range(0, 5, 0, 5)); - assert.strictEqual(pasteAsMarkdownLink, false); + assert.strictEqual( + shouldSmartPaste(makeTestDoc('~~~\r\n\r\n~~~'), new vscode.Range(0, 5, 0, 5)), + false); }); test('Should evaluate pasteAsMarkdownLink as false for pasting within a math block', () => { - skinnyDocument.getText = function () { return '$$$\r\n\r\n$$$'; }; - const pasteAsMarkdownLink = checkSmartPaste(skinnyDocument, new vscode.Range(0, 5, 0, 5), new vscode.Range(0, 5, 0, 5)); - assert.strictEqual(pasteAsMarkdownLink, false); + assert.strictEqual( + shouldSmartPaste(makeTestDoc('$$$\r\n\r\n$$$'), new vscode.Range(0, 5, 0, 5)), + false); }); - const linkSkinnyDoc: SkinnyTextDocument = { - uri: vscode.Uri.file('/path/to/your/file'), - offsetAt: function () { return 0; }, - getText: function () { return '[a](bcdef)'; }, - }; - test('Should evaluate pasteAsMarkdownLink as false for pasting within a Markdown link', () => { - const pasteAsMarkdownLink = checkSmartPaste(linkSkinnyDoc, new vscode.Range(0, 4, 0, 6), new vscode.Range(0, 4, 0, 6)); - assert.strictEqual(pasteAsMarkdownLink, false); + assert.strictEqual( + shouldSmartPaste(makeTestDoc('[a](bcdef)'), new vscode.Range(0, 4, 0, 6)), + false); }); - - const imageLinkSkinnyDoc: SkinnyTextDocument = { - uri: vscode.Uri.file('/path/to/your/file'), - offsetAt: function () { return 0; }, - getText: function () { return '![a](bcdef)'; }, - }; - test('Should evaluate pasteAsMarkdownLink as false for pasting within a Markdown image link', () => { - const pasteAsMarkdownLink = checkSmartPaste(imageLinkSkinnyDoc, new vscode.Range(0, 5, 0, 10), new vscode.Range(0, 5, 0, 10)); - assert.strictEqual(pasteAsMarkdownLink, false); + assert.strictEqual( + shouldSmartPaste(makeTestDoc('![a](bcdef)'), new vscode.Range(0, 5, 0, 10)), + false); }); - const inlineCodeSkinnyCode: SkinnyTextDocument = { - uri: vscode.Uri.file('/path/to/your/file'), - offsetAt: function () { return 0; }, - getText: function () { return '``'; }, - }; - test('Should evaluate pasteAsMarkdownLink as false for pasting within inline code', () => { - const pasteAsMarkdownLink = checkSmartPaste(inlineCodeSkinnyCode, new vscode.Range(0, 1, 0, 1), new vscode.Range(0, 1, 0, 1)); - assert.strictEqual(pasteAsMarkdownLink, false); + assert.strictEqual( + shouldSmartPaste(makeTestDoc('``'), new vscode.Range(0, 1, 0, 1)), + false); }); - const inlineMathSkinnyDoc: SkinnyTextDocument = { - uri: vscode.Uri.file('/path/to/your/file'), - offsetAt: function () { return 0; }, - getText: function () { return '$$'; }, - }; - test('Should evaluate pasteAsMarkdownLink as false for pasting within inline math', () => { - const pasteAsMarkdownLink = checkSmartPaste(inlineMathSkinnyDoc, new vscode.Range(0, 1, 0, 1), new vscode.Range(0, 1, 0, 1)); - assert.strictEqual(pasteAsMarkdownLink, false); + assert.strictEqual( + shouldSmartPaste(makeTestDoc('$$'), new vscode.Range(0, 1, 0, 1)), + false); }); }); }); diff --git a/extensions/markdown-language-features/src/types/textDocument.ts b/extensions/markdown-language-features/src/types/textDocument.ts index a960e54d220..e57299671f6 100644 --- a/extensions/markdown-language-features/src/types/textDocument.ts +++ b/extensions/markdown-language-features/src/types/textDocument.ts @@ -12,6 +12,6 @@ export interface ITextDocument { readonly uri: vscode.Uri; readonly version: number; - getText(): string; + getText(range?: vscode.Range): string; } diff --git a/extensions/markdown-language-features/src/util/uriList.ts b/extensions/markdown-language-features/src/util/uriList.ts new file mode 100644 index 00000000000..04897af453e --- /dev/null +++ b/extensions/markdown-language-features/src/util/uriList.ts @@ -0,0 +1,14 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +function splitUriList(str: string): string[] { + return str.split('\r\n'); +} + +export function parseUriList(str: string): string[] { + return splitUriList(str) + .filter(value => !value.startsWith('#')) // Remove comments + .map(value => value.trim()); +} diff --git a/extensions/markdown-language-features/yarn.lock b/extensions/markdown-language-features/yarn.lock index bb33b5fe336..5e3d1826af5 100644 --- a/extensions/markdown-language-features/yarn.lock +++ b/extensions/markdown-language-features/yarn.lock @@ -295,6 +295,11 @@ vscode-languageserver-protocol@3.17.2: vscode-jsonrpc "8.0.2" vscode-languageserver-types "3.17.2" +vscode-languageserver-textdocument@^1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz#0822a000e7d4dc083312580d7575fe9e3ba2e2bf" + integrity sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA== + 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" diff --git a/extensions/microsoft-authentication/src/AADHelper.ts b/extensions/microsoft-authentication/src/AADHelper.ts index c87d40fe51c..0417defe534 100644 --- a/extensions/microsoft-authentication/src/AADHelper.ts +++ b/extensions/microsoft-authentication/src/AADHelper.ts @@ -536,7 +536,7 @@ export class AzureActiveDirectoryService { scope: scopeData.scopeStr, sessionId, account: { - label: claims.email ?? claims.preferred_username ?? claims.unique_name ?? 'user@example.com', + label: claims.preferred_username ?? claims.email ?? claims.unique_name ?? 'user@example.com', id, type: claims.tid === MSA_TID || claims.tid === MSA_PASSTHRU_TID ? MicrosoftAccountType.MSA : MicrosoftAccountType.AAD } diff --git a/extensions/notebook-renderers/src/ansi.ts b/extensions/notebook-renderers/src/ansi.ts index d09e7b73edb..48d280b18b4 100644 --- a/extensions/notebook-renderers/src/ansi.ts +++ b/extensions/notebook-renderers/src/ansi.ts @@ -5,11 +5,10 @@ import { RGBA, Color } from './color'; import { ansiColorIdentifiers } from './colorMap'; -import { linkify } from './linkify'; +import { LinkOptions, linkify } from './linkify'; -export function handleANSIOutput(text: string, trustHtml: boolean): HTMLSpanElement { - const workspaceFolder = undefined; +export function handleANSIOutput(text: string, linkOptions: LinkOptions): HTMLSpanElement { const root: HTMLSpanElement = document.createElement('span'); const textLength: number = text.length; @@ -52,7 +51,7 @@ export function handleANSIOutput(text: string, trustHtml: boolean): HTMLSpanElem if (sequenceFound) { // Flush buffer with previous styles. - appendStylizedStringToContainer(root, buffer, trustHtml, styleNames, workspaceFolder, customFgColor, customBgColor, customUnderlineColor); + appendStylizedStringToContainer(root, buffer, linkOptions, styleNames, customFgColor, customBgColor, customUnderlineColor); buffer = ''; @@ -98,7 +97,7 @@ export function handleANSIOutput(text: string, trustHtml: boolean): HTMLSpanElem // Flush remaining text buffer if not empty. if (buffer) { - appendStylizedStringToContainer(root, buffer, trustHtml, styleNames, workspaceFolder, customFgColor, customBgColor, customUnderlineColor); + appendStylizedStringToContainer(root, buffer, linkOptions, styleNames, customFgColor, customBgColor, customUnderlineColor); } return root; @@ -382,9 +381,8 @@ export function handleANSIOutput(text: string, trustHtml: boolean): HTMLSpanElem function appendStylizedStringToContainer( root: HTMLElement, stringContent: string, - trustHtml: boolean, + linkOptions: LinkOptions, cssClasses: string[], - workspaceFolder: string | undefined, customTextColor?: RGBA | string, customBackgroundColor?: RGBA | string, customUnderlineColor?: RGBA | string @@ -397,7 +395,7 @@ function appendStylizedStringToContainer( if (container.childElementCount === 0) { // plain text - container = linkify(stringContent, true, workspaceFolder, trustHtml); + container = linkify(stringContent, linkOptions, true); } container.className = cssClasses.join(' '); diff --git a/extensions/notebook-renderers/src/index.ts b/extensions/notebook-renderers/src/index.ts index ba57767b7fc..ff79bd0e22e 100644 --- a/extensions/notebook-renderers/src/index.ts +++ b/extensions/notebook-renderers/src/index.ts @@ -176,7 +176,9 @@ function renderError( const stackTrace = formatStackTrace(err.stack); const outputScrolling = scrollingEnabled(outputInfo, ctx.settings); - const content = createOutputContent(outputInfo.id, stackTrace ?? '', { linesLimit: ctx.settings.lineLimit, scrollable: outputScrolling, trustHtml }); + const outputOptions = { linesLimit: ctx.settings.lineLimit, scrollable: outputScrolling, trustHtml, linkifyFilePaths: ctx.settings.linkifyFilePaths }; + + const content = createOutputContent(outputInfo.id, stackTrace ?? '', outputOptions); const contentParent = document.createElement('div'); contentParent.classList.toggle('word-wrap', ctx.settings.outputWordWrap); disposableStore.push(ctx.onDidChangeSettings(e => { @@ -279,7 +281,7 @@ function scrollingEnabled(output: OutputItem, options: RenderOptions) { function renderStream(outputInfo: OutputWithAppend, outputElement: HTMLElement, error: boolean, ctx: IRichRenderContext): IDisposable { const disposableStore = createDisposableStore(); const outputScrolling = scrollingEnabled(outputInfo, ctx.settings); - const outputOptions = { linesLimit: ctx.settings.lineLimit, scrollable: outputScrolling, trustHtml: false, error }; + const outputOptions = { linesLimit: ctx.settings.lineLimit, scrollable: outputScrolling, trustHtml: false, error, linkifyFilePaths: ctx.settings.linkifyFilePaths }; outputElement.classList.add('output-stream'); @@ -330,7 +332,8 @@ function renderText(outputInfo: OutputItem, outputElement: HTMLElement, ctx: IRi const text = outputInfo.text(); const outputScrolling = scrollingEnabled(outputInfo, ctx.settings); - const content = createOutputContent(outputInfo.id, text, { linesLimit: ctx.settings.lineLimit, scrollable: outputScrolling, trustHtml: false }); + const outputOptions = { linesLimit: ctx.settings.lineLimit, scrollable: outputScrolling, trustHtml: false, linkifyFilePaths: ctx.settings.linkifyFilePaths }; + const content = createOutputContent(outputInfo.id, text, outputOptions); content.classList.add('output-plaintext'); if (ctx.settings.outputWordWrap) { content.classList.add('word-wrap'); diff --git a/extensions/notebook-renderers/src/linkify.ts b/extensions/notebook-renderers/src/linkify.ts index 49fdc4edf8c..99760213d8b 100644 --- a/extensions/notebook-renderers/src/linkify.ts +++ b/extensions/notebook-renderers/src/linkify.ts @@ -26,6 +26,11 @@ type LinkPart = { captures: string[]; }; +export type LinkOptions = { + trustHtml?: boolean; + linkifyFilePaths: boolean; +}; + export class LinkDetector { // used by unit tests @@ -51,7 +56,7 @@ export class LinkDetector { * When splitLines is true, each line of the text, even if it contains no links, is wrapped in a * and added as a child of the returned . */ - linkify(text: string, splitLines?: boolean, workspaceFolder?: string, trustHtml?: boolean): HTMLElement { + linkify(text: string, options: LinkOptions, splitLines?: boolean): HTMLElement { if (splitLines) { const lines = text.split('\n'); for (let i = 0; i < lines.length - 1; i++) { @@ -61,7 +66,7 @@ export class LinkDetector { // Remove the last element ('') that split added. lines.pop(); } - const elements = lines.map(line => this.linkify(line, false, workspaceFolder, trustHtml)); + const elements = lines.map(line => this.linkify(line, options, false)); if (elements.length === 1) { // Do not wrap single line with extra span. return elements[0]; @@ -72,8 +77,9 @@ export class LinkDetector { } const container = document.createElement('span'); - for (const part of this.detectLinks(text)) { + for (const part of this.detectLinks(text, !!options.trustHtml, options.linkifyFilePaths)) { try { + let span: HTMLSpanElement | null = null; switch (part.kind) { case 'text': container.appendChild(document.createTextNode(part.value)); @@ -83,13 +89,9 @@ export class LinkDetector { container.appendChild(this.createWebLink(part.value)); break; case 'html': - if (this.shouldGenerateHtml(!!trustHtml)) { - const span = document.createElement('span'); - span.innerHTML = this.createHtml(part.value)!; - container.appendChild(span); - } else { - container.appendChild(document.createTextNode(part.value)); - } + span = document.createElement('span'); + span.innerHTML = this.createHtml(part.value)!; + container.appendChild(span); break; } } catch (e) { @@ -149,15 +151,27 @@ export class LinkDetector { return link; } - private detectLinks(text: string): LinkPart[] { + private detectLinks(text: string, trustHtml: boolean, detectFilepaths: boolean): LinkPart[] { if (text.length > MAX_LENGTH) { return [{ kind: 'text', value: text, captures: [] }]; } - const regexes: RegExp[] = [HTML_LINK_REGEX, WEB_LINK_REGEX, PATH_LINK_REGEX]; - const kinds: LinkKind[] = ['html', 'web', 'path']; + const regexes: RegExp[] = []; + const kinds: LinkKind[] = []; const result: LinkPart[] = []; + if (this.shouldGenerateHtml(trustHtml)) { + regexes.push(HTML_LINK_REGEX); + kinds.push('html'); + } + regexes.push(WEB_LINK_REGEX); + kinds.push('web'); + if (detectFilepaths) { + regexes.push(PATH_LINK_REGEX); + kinds.push('path'); + } + + const splitOne = (text: string, regexIndex: number) => { if (regexIndex >= regexes.length) { result.push({ value: text, kind: 'text', captures: [] }); @@ -192,6 +206,6 @@ export class LinkDetector { } const linkDetector = new LinkDetector(); -export function linkify(text: string, splitLines?: boolean, workspaceFolder?: string, trustHtml = false) { - return linkDetector.linkify(text, splitLines, workspaceFolder, trustHtml); +export function linkify(text: string, linkOptions: LinkOptions, splitLines?: boolean) { + return linkDetector.linkify(text, linkOptions, splitLines); } diff --git a/extensions/notebook-renderers/src/rendererTypes.ts b/extensions/notebook-renderers/src/rendererTypes.ts index ded12bdcacc..e1fc869a301 100644 --- a/extensions/notebook-renderers/src/rendererTypes.ts +++ b/extensions/notebook-renderers/src/rendererTypes.ts @@ -32,6 +32,7 @@ export interface RenderOptions { readonly lineLimit: number; readonly outputScrolling: boolean; readonly outputWordWrap: boolean; + readonly linkifyFilePaths: boolean; } export type IRichRenderContext = RendererContext & { readonly settings: RenderOptions; readonly onDidChangeSettings: Event }; @@ -41,6 +42,7 @@ export type OutputElementOptions = { scrollable?: boolean; error?: boolean; trustHtml?: boolean; + linkifyFilePaths: boolean; }; export interface OutputWithAppend extends OutputItem { diff --git a/extensions/notebook-renderers/src/test/linkify.test.ts b/extensions/notebook-renderers/src/test/linkify.test.ts index 7ee5487a84b..cae8f569423 100644 --- a/extensions/notebook-renderers/src/test/linkify.test.ts +++ b/extensions/notebook-renderers/src/test/linkify.test.ts @@ -15,27 +15,32 @@ suite('Notebook builtin output link detection', () => { LinkDetector.injectedHtmlCreator = (value: string) => value; test('no links', () => { - const htmlWithLinks = linkify('hello', true, undefined, true); + const htmlWithLinks = linkify('hello', { linkifyFilePaths: true, trustHtml: true }, true); assert.equal(htmlWithLinks.innerHTML, 'hello'); }); test('web link detection', () => { - const htmlWithLinks = linkify('something www.example.com something', true, undefined, true); + const htmlWithLinks = linkify('something www.example.com something', { linkifyFilePaths: true, trustHtml: true }, true); + const htmlWithLinks2 = linkify('something www.example.com something', { linkifyFilePaths: false, trustHtml: false }, true); assert.equal(htmlWithLinks.innerHTML, 'something www.example.com something'); assert.equal(htmlWithLinks.textContent, 'something www.example.com something'); + assert.equal(htmlWithLinks2.innerHTML, 'something www.example.com something'); + assert.equal(htmlWithLinks2.textContent, 'something www.example.com something'); }); test('html link detection', () => { - const htmlWithLinks = linkify('something link something', true, undefined, true); + const htmlWithLinks = linkify('something link something', { linkifyFilePaths: true, trustHtml: true }, true); + const htmlWithLinks2 = linkify('something link something', { linkifyFilePaths: false, trustHtml: true }, true); assert.equal(htmlWithLinks.innerHTML, 'something link something'); assert.equal(htmlWithLinks.textContent, 'something link something'); + assert.equal(htmlWithLinks2.innerHTML, 'something link something'); + assert.equal(htmlWithLinks2.textContent, 'something link something'); }); test('html link without trust', () => { - const trustHtml = false; - const htmlWithLinks = linkify('something link something', true, undefined, trustHtml); + const htmlWithLinks = linkify('something link something', { linkifyFilePaths: true, trustHtml: false }, true); assert.equal(htmlWithLinks.innerHTML, 'something <a href="file.py">link</a> something'); assert.equal(htmlWithLinks.textContent, 'something link something'); diff --git a/extensions/notebook-renderers/src/test/notebookRenderer.test.ts b/extensions/notebook-renderers/src/test/notebookRenderer.test.ts index 8e33720d337..07ec9cdf9ea 100644 --- a/extensions/notebook-renderers/src/test/notebookRenderer.test.ts +++ b/extensions/notebook-renderers/src/test/notebookRenderer.test.ts @@ -273,6 +273,36 @@ suite('Notebook builtin output renderer', () => { assert.ok(inserted.innerHTML.indexOf('shouldBeTruncated') === -1, `Beginning content should be truncated`); }); + test(`Render filepath links in text output when enabled`, async () => { + LinkDetector.injectedHtmlCreator = (value: string) => value; + const context = createContext({ outputWordWrap: true, outputScrolling: true, linkifyFilePaths: true }); + const renderer = await activate(context); + assert.ok(renderer, 'Renderer not created'); + + const outputElement = new OutputHtml().getFirstOuputElement(); + const outputItem = createOutputItem('./dir/file.txt', stdoutMimeType); + await renderer!.renderOutputItem(outputItem, outputElement); + + const inserted = outputElement.firstChild as HTMLElement; + assert.ok(inserted, `nothing appended to output element: ${outputElement.innerHTML}`); + assert.ok(outputElement.innerHTML.indexOf('') !== -1, `inner HTML:\n ${outputElement.innerHTML}`); + }); + + test(`No filepath links in text output when disabled`, async () => { + LinkDetector.injectedHtmlCreator = (value: string) => value; + const context = createContext({ outputWordWrap: true, outputScrolling: true, linkifyFilePaths: false }); + const renderer = await activate(context); + assert.ok(renderer, 'Renderer not created'); + + const outputElement = new OutputHtml().getFirstOuputElement(); + const outputItem = createOutputItem('./dir/file.txt', stdoutMimeType); + await renderer!.renderOutputItem(outputItem, outputElement); + + const inserted = outputElement.firstChild as HTMLElement; + assert.ok(inserted, `nothing appended to output element: ${outputElement.innerHTML}`); + assert.ok(outputElement.innerHTML.indexOf('') === -1, `inner HTML:\n ${outputElement.innerHTML}`); + }); + test(`Render with wordwrap and scrolling for error output`, async () => { LinkDetector.injectedHtmlCreator = (value: string) => value; const context = createContext({ outputWordWrap: true, outputScrolling: true }); @@ -474,7 +504,6 @@ suite('Notebook builtin output renderer', () => { const inserted = outputElement.firstChild as HTMLElement; assert.ok(inserted, `nothing appended to output element: ${outputElement.innerHTML}`); - //assert.ok(false, `TextContent:\n ${outputElement.textContent}`); assert.ok(outputElement.innerHTML.indexOf('class="code-background-colored"') === -1, `inner HTML:\n ${outputElement.innerHTML}`); }); diff --git a/extensions/notebook-renderers/src/textHelper.ts b/extensions/notebook-renderers/src/textHelper.ts index 5cf0e24eb96..b49dbb6ad8d 100644 --- a/extensions/notebook-renderers/src/textHelper.ts +++ b/extensions/notebook-renderers/src/textHelper.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { handleANSIOutput } from './ansi'; +import { LinkOptions } from './linkify'; import { OutputElementOptions, OutputWithAppend } from './rendererTypes'; export const scrollableClass = 'scrollable'; @@ -68,44 +69,44 @@ function generateNestedViewAllElement(outputId: string) { return container; } -function truncatedArrayOfString(id: string, buffer: string[], linesLimit: number, trustHtml: boolean) { +function truncatedArrayOfString(id: string, buffer: string[], linesLimit: number, linkOptions: LinkOptions) { const container = document.createElement('div'); const lineCount = buffer.length; if (lineCount <= linesLimit) { - const spanElement = handleANSIOutput(buffer.join('\n'), trustHtml); + const spanElement = handleANSIOutput(buffer.join('\n'), linkOptions); container.appendChild(spanElement); return container; } - container.appendChild(handleANSIOutput(buffer.slice(0, linesLimit - 5).join('\n'), trustHtml)); + container.appendChild(handleANSIOutput(buffer.slice(0, linesLimit - 5).join('\n'), linkOptions)); // truncated piece const elipses = document.createElement('div'); elipses.innerText = '...'; container.appendChild(elipses); - container.appendChild(handleANSIOutput(buffer.slice(lineCount - 5).join('\n'), trustHtml)); + container.appendChild(handleANSIOutput(buffer.slice(lineCount - 5).join('\n'), linkOptions)); container.appendChild(generateViewMoreElement(id)); return container; } -function scrollableArrayOfString(id: string, buffer: string[], trustHtml: boolean) { +function scrollableArrayOfString(id: string, buffer: string[], linkOptions: LinkOptions) { const element = document.createElement('div'); if (buffer.length > softScrollableLineLimit) { element.appendChild(generateNestedViewAllElement(id)); } - element.appendChild(handleANSIOutput(buffer.slice(-1 * softScrollableLineLimit).join('\n'), trustHtml)); + element.appendChild(handleANSIOutput(buffer.slice(-1 * softScrollableLineLimit).join('\n'), linkOptions)); return element; } const outputLengths: Record = {}; -function appendScrollableOutput(element: HTMLElement, id: string, appended: string, trustHtml: boolean) { +function appendScrollableOutput(element: HTMLElement, id: string, appended: string, linkOptions: LinkOptions) { if (!outputLengths[id]) { outputLengths[id] = 0; } @@ -117,22 +118,23 @@ function appendScrollableOutput(element: HTMLElement, id: string, appended: stri return false; } else { - element.appendChild(handleANSIOutput(buffer.join('\n'), trustHtml)); + element.appendChild(handleANSIOutput(buffer.join('\n'), linkOptions)); outputLengths[id] = appendedLength; } return true; } export function createOutputContent(id: string, outputText: string, options: OutputElementOptions): HTMLElement { - const { linesLimit, error, scrollable, trustHtml } = options; + const { linesLimit, error, scrollable, trustHtml, linkifyFilePaths } = options; + const linkOptions: LinkOptions = { linkifyFilePaths, trustHtml }; const buffer = outputText.split(/\r\n|\r|\n/g); outputLengths[id] = outputLengths[id] = Math.min(buffer.length, softScrollableLineLimit); let outputElement: HTMLElement; if (scrollable) { - outputElement = scrollableArrayOfString(id, buffer, !!trustHtml); + outputElement = scrollableArrayOfString(id, buffer, linkOptions); } else { - outputElement = truncatedArrayOfString(id, buffer, linesLimit, !!trustHtml); + outputElement = truncatedArrayOfString(id, buffer, linesLimit, linkOptions); } outputElement.setAttribute('output-item-id', id); @@ -145,9 +147,10 @@ export function createOutputContent(id: string, outputText: string, options: Out export function appendOutput(outputInfo: OutputWithAppend, existingContent: HTMLElement, options: OutputElementOptions) { const appendedText = outputInfo.appendedText?.(); + const linkOptions = { linkifyFilePaths: options.linkifyFilePaths, trustHtml: options.trustHtml }; // appending output only supported for scrollable ouputs currently if (appendedText && options.scrollable) { - if (appendScrollableOutput(existingContent, outputInfo.id, appendedText, false)) { + if (appendScrollableOutput(existingContent, outputInfo.id, appendedText, linkOptions)) { return; } } diff --git a/extensions/npm/README.md b/extensions/npm/README.md index 296bf03f73e..215ca927ff4 100644 --- a/extensions/npm/README.md +++ b/extensions/npm/README.md @@ -34,7 +34,7 @@ The extension fetches data from and } const lines = outputMatch.regexMatch[1]; - const fixes: vscode.TerminalQuickFixExecuteTerminalCommand[] = []; + const fixes: vscode.TerminalQuickFixTerminalCommand[] = []; for (const line of lines.split('\n')) { // search from the second char, since the lines might be prefixed with // "npm ERR!" which comes before the actual command suggestion. diff --git a/extensions/npm/src/npmScriptLens.ts b/extensions/npm/src/npmScriptLens.ts index 2f2b9342b02..c8e506904f8 100644 --- a/extensions/npm/src/npmScriptLens.ts +++ b/extensions/npm/src/npmScriptLens.ts @@ -31,16 +31,17 @@ const getFreshLensLocation = () => workspace.getConfiguration().get(Constants.Co */ export class NpmScriptLensProvider implements CodeLensProvider, Disposable { private lensLocation = getFreshLensLocation(); - private changeEmitter = new EventEmitter(); + private readonly changeEmitter = new EventEmitter(); private subscriptions: Disposable[] = []; /** * @inheritdoc */ - public onDidChangeCodeLenses = this.changeEmitter.event; + public readonly onDidChangeCodeLenses = this.changeEmitter.event; constructor() { this.subscriptions.push( + this.changeEmitter, workspace.onDidChangeConfiguration(evt => { if (evt.affectsConfiguration(Constants.ConfigKey)) { this.lensLocation = getFreshLensLocation(); diff --git a/extensions/npm/src/npmView.ts b/extensions/npm/src/npmView.ts index d087e75347a..38768b47710 100644 --- a/extensions/npm/src/npmView.ts +++ b/extensions/npm/src/npmView.ts @@ -16,7 +16,8 @@ import { createTask, getPackageManager, getTaskName, isAutoDetectionEnabled, isWorkspaceFolder, INpmTaskDefinition, NpmTaskProvider, startDebugging, - ITaskWithLocation + ITaskWithLocation, + INSTALL_SCRIPT } from './tasks'; @@ -82,7 +83,7 @@ class NpmScript extends TreeItem { : task.task.name; super(name, TreeItemCollapsibleState.None); this.taskLocation = task.location; - const command: ExplorerCommands = workspace.getConfiguration('npm').get('scriptExplorerAction') || 'open'; + const command: ExplorerCommands = name === `${INSTALL_SCRIPT} ` ? 'run' : workspace.getConfiguration('npm').get('scriptExplorerAction') || 'open'; const commandList = { 'open': { diff --git a/extensions/npm/src/preferred-pm.ts b/extensions/npm/src/preferred-pm.ts index 92fcdfc8033..0c5b383c6a6 100644 --- a/extensions/npm/src/preferred-pm.ts +++ b/extensions/npm/src/preferred-pm.ts @@ -23,6 +23,14 @@ async function pathExists(filePath: string) { return true; } +async function isBunPreferred(pkgPath: string): Promise { + if (await pathExists(path.join(pkgPath, 'bun.lockb'))) { + return { isPreferred: true, hasLockfile: true }; + } + + return { isPreferred: false, hasLockfile: false }; +} + async function isPNPMPreferred(pkgPath: string): Promise { if (await pathExists(path.join(pkgPath, 'pnpm-lock.yaml'))) { return { isPreferred: true, hasLockfile: true }; @@ -78,6 +86,12 @@ export async function findPreferredPM(pkgPath: string): Promise<{ name: string; detectedPackageManagerProperties.push(yarnPreferred); } + const bunPreferred = await isBunPreferred(pkgPath); + if (bunPreferred.isPreferred) { + detectedPackageManagerNames.push('bun'); + detectedPackageManagerProperties.push(bunPreferred); + } + const pmUsedForInstallation: { name: string } | null = await whichPM(pkgPath); if (pmUsedForInstallation && !detectedPackageManagerNames.includes(pmUsedForInstallation.name)) { diff --git a/extensions/npm/src/tasks.ts b/extensions/npm/src/tasks.ts index 17bb815f962..390da48cf58 100644 --- a/extensions/npm/src/tasks.ts +++ b/extensions/npm/src/tasks.ts @@ -31,7 +31,7 @@ type AutoDetect = 'on' | 'off'; let cachedTasks: ITaskWithLocation[] | undefined = undefined; -const INSTALL_SCRIPT = 'install'; +export const INSTALL_SCRIPT = 'install'; export interface ITaskLocation { document: Uri; diff --git a/extensions/npm/yarn.lock b/extensions/npm/yarn.lock index 12f7036d0f6..7dad0575479 100644 --- a/extensions/npm/yarn.lock +++ b/extensions/npm/yarn.lock @@ -181,6 +181,11 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" +vscode-uri@^3.0.8: + version "3.0.8" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f" + integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw== + which-pm@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/which-pm/-/which-pm-2.1.1.tgz#0be2b70c67e94a32e87b9768a94a7f0954f2dcfa" diff --git a/extensions/package.json b/extensions/package.json index 680720b8a54..8bd2f6d07ce 100644 --- a/extensions/package.json +++ b/extensions/package.json @@ -4,7 +4,7 @@ "license": "MIT", "description": "Dependencies shared by all extensions", "dependencies": { - "typescript": "^5.3.1-rc" + "typescript": "5.3.2" }, "scripts": { "postinstall": "node ./postinstall.mjs" diff --git a/extensions/python/cgmanifest.json b/extensions/python/cgmanifest.json index ace7056c995..37a21b2de54 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": "7d0f2b22a5ad8fccbd7341bc7b7a715169283044" + "commitHash": "c9b3409deb69acec31bbf7913830e93a046b30cc" } }, "license": "MIT", diff --git a/extensions/references-view/src/references/model.ts b/extensions/references-view/src/references/model.ts index 19bac0047d9..33b5c497f1e 100644 --- a/extensions/references-view/src/references/model.ts +++ b/extensions/references-view/src/references/model.ts @@ -257,7 +257,7 @@ export class ReferencesModel implements SymbolItemNavigation{ +class ReferencesTreeDataProvider implements vscode.TreeDataProvider { private readonly _listener: vscode.Disposable; private readonly _onDidChange = new vscode.EventEmitter(); diff --git a/extensions/references-view/src/tree.ts b/extensions/references-view/src/tree.ts index 2a4a0e924af..9432fd2a80f 100644 --- a/extensions/references-view/src/tree.ts +++ b/extensions/references-view/src/tree.ts @@ -237,7 +237,7 @@ class HistoryItem { } } -class TreeInputHistory implements vscode.TreeDataProvider{ +class TreeInputHistory implements vscode.TreeDataProvider { private readonly _onDidChangeTreeData = new vscode.EventEmitter(); readonly onDidChangeTreeData = this._onDidChangeTreeData.event; diff --git a/extensions/shared.webpack.config.js b/extensions/shared.webpack.config.js index 644d400df6d..81eb0ffd1ce 100644 --- a/extensions/shared.webpack.config.js +++ b/extensions/shared.webpack.config.js @@ -31,7 +31,7 @@ function withNodeDefaults(/**@type WebpackConfig & { context: string }*/extConfi }, resolve: { - conditionNames: ['import', 'require'], + conditionNames: ['import', 'require', 'node-addons', 'node'], mainFields: ['module', 'main'], extensions: ['.ts', '.js'] // support ts-files and js-files }, diff --git a/extensions/sql/cgmanifest.json b/extensions/sql/cgmanifest.json index 732474f0dc5..fec241862ef 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": "9cb3529a978ddf599bf5bdd228f21bbcfe2914f5" + "commitHash": "49eff02f68b6ee73025c6665c672ca1c93385dde" } }, "license": "MIT", - "version": "1.20.0" + "version": "1.23.0" } ], "version": 1 diff --git a/extensions/sql/syntaxes/sql.tmLanguage.json b/extensions/sql/syntaxes/sql.tmLanguage.json index ba6fac58192..9db45221026 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/9cb3529a978ddf599bf5bdd228f21bbcfe2914f5", + "version": "https://github.com/microsoft/vscode-mssql/commit/49eff02f68b6ee73025c6665c672ca1c93385dde", "name": "SQL", "scopeName": "source.sql", "patterns": [ @@ -372,7 +372,7 @@ "include": "#regexps" }, { - "match": "\\b(?i)(abort|abort_after_wait|absent|absolute|accent_sensitivity|acceptable_cursopt|acp|action|activation|add|address|admin|aes_128|aes_192|aes_256|affinity|after|aggregate|algorithm|all_constraints|all_errormsgs|all_indexes|all_levels|all_results|allow_connections|allow_dup_row|allow_encrypted_value_modifications|allow_page_locks|allow_row_locks|allow_snapshot_isolation|alter|altercolumn|always|anonymous|ansi_defaults|ansi_null_default|ansi_null_dflt_off|ansi_null_dflt_on|ansi_nulls|ansi_padding|ansi_warnings|appdomain|append|application|apply|arithabort|arithignore|array|assembly|asymmetric|asynchronous_commit|at|atan2|atomic|attach|attach_force_rebuild_log|attach_rebuild_log|audit|auth_realm|authentication|auto|auto_cleanup|auto_close|auto_create_statistics|auto_drop|auto_shrink|auto_update_statistics|auto_update_statistics_async|automated_backup_preference|automatic|autopilot|availability|availability_mode|backup|backup_priority|base64|basic|batches|batchsize|before|between|bigint|binary|binding|bit|block|blockers|blocksize|bmk|both|break|broker|broker_instance|bucket_count|buffer|buffercount|bulk_logged|by|call|caller|card|case|catalog|catch|cert|certificate|change_retention|change_tracking|change_tracking_context|changes|char|character|character_set|check_expiration|check_policy|checkconstraints|checkindex|checkpoint|checksum|cleanup_policy|clear|clear_port|close|clustered|codepage|collection|column_encryption_key|column_master_key|columnstore|columnstore_archive|colv_80_to_100|colv_100_to_80|commit_differential_base|committed|compatibility_level|compress_all_row_groups|compression|compression_delay|concat_null_yields_null|concatenate|configuration|connect|containment|continue|continue_after_error|contract|contract_name|control|conversation|conversation_group_id|conversation_handle|copy|copy_only|count_rows|counter|create(\\\\s+or\\\\s+alter)?|credential|cross|cryptographic|cryptographic_provider|cube|cursor|cursor_close_on_commit|cursor_default|data|data_compression|data_flush_interval_seconds|data_mirroring|data_purity|data_source|database|database_name|database_snapshot|datafiletype|date_correlation_optimization|date|datefirst|dateformat|date_format|datetime|datetime2|datetimeoffset|day(s)?|db_chaining|dbid|dbidexec|dbo_only|deadlock_priority|deallocate|dec|decimal|declare|decrypt|decrypt_a|decryption|default_database|default_fulltext_language|default_language|default_logon_domain|default_schema|definition|delay|delayed_durability|delimitedtext|density_vector|dependent|des|description|desired_state|desx|differential|digest|disable|disable_broker|disable_def_cnst_chk|disabled|disk|distinct|distributed|distribution|drop|drop_existing|dts_buffers|dump|durability|dynamic|edition|elements|else|emergency|empty|enable|enable_broker|enabled|encoding|encrypted|encrypted_value|encryption|encryption_type|end|endpoint|endpoint_url|enhancedintegrity|entry|error_broker_conversations|errorfile|estimateonly|event|except|exec|executable|execute|exists|expand|expiredate|expiry_date|explicit|external|external_access|failover|failover_mode|failure_condition_level|fast|fast_forward|fastfirstrow|federated_service_account|fetch|field_terminator|fieldterminator|file|filelistonly|filegroup|filegrowth|filename|filestream|filestream_log|filestream_on|filetable|file_format|filter|first_row|fips_flagger|fire_triggers|first|firstrow|float|flush_interval_seconds|fmtonly|following|for|force|force_failover_allow_data_loss|force_service_allow_data_loss|forced|forceplan|formatfile|format_options|format_type|formsof|forward_only|free_cursors|free_exec_context|fullscan|fulltext|fulltextall|fulltextkey|function|generated|get|geography|geometry|global|go|goto|governor|guid|hadoop|hardening|hash|hashed|header_limit|headeronly|health_check_timeout|hidden|hierarchyid|histogram|histogram_steps|hits_cursors|hits_exec_context|hour(s)?|http|identity|identity_value|if|ifnull|ignore|ignore_constraints|ignore_dup_key|ignore_dup_row|ignore_triggers|image|immediate|implicit_transactions|include|include_null_values|incremental|index|inflectional|init|initiator|insensitive|insert|instead|int|integer|integrated|intersect|intermediate|interval_length_minutes|into|inuse_cursors|inuse_exec_context|io|is|isabout|iso_week|isolation|job_tracker_location|json|keep|keep_nulls|keep_replication|keepdefaults|keepfixed|keepidentity|keepnulls|kerberos|key|key_path|key_source|key_store_provider_name|keyset|kill|kilobytes_per_batch|labelonly|langid|language|last|lastrow|leading|legacy_cardinality_estimation|length|level|lifetime|lineage_80_to_100|lineage_100_to_80|listener_ip|listener_port|load|loadhistory|lob_compaction|local|local_service_name|locate|location|lock_escalation|lock_timeout|lockres|log|login|login_type|loop|manual|mark_in_use_for_removal|masked|master|matched|max_queue_readers|max_duration|max_outstanding_io_per_volume|maxdop|maxerrors|maxlength|maxtransfersize|max_plans_per_query|max_storage_size_mb|mediadescription|medianame|mediapassword|memogroup|memory_optimized|merge|message|message_forward_size|message_forwarding|microsecond|millisecond|minute(s)?|mirror_address|misses_cursors|misses_exec_context|mixed|modify|money|month|move|multi_user|must_change|name|namespace|nanosecond|native|native_compilation|nchar|ncharacter|nested_triggers|never|new_account|new_broker|newname|next|no|no_browsetable|no_checksum|no_compression|no_infomsgs|no_triggers|no_truncate|nocount|noexec|noexpand|noformat|noinit|nolock|nonatomic|nonclustered|nondurable|none|norecompute|norecovery|noreset|norewind|noskip|not|notification|nounload|now|nowait|ntext|ntlm|nulls|numeric|numeric_roundabort|nvarchar|object|objid|oem|offline|old_account|online|operation_mode|open|openjson|optimistic|option|orc|out|outer|output|over|override|owner|ownership|pad_index|page|page_checksum|page_verify|pagecount|paglock|param|parameter_sniffing|parameter_type_expansion|parameterization|parquet|parseonly|partial|partition|partner|password|path|pause|percentage|permission_set|persisted|period|physical_only|plan_forcing_mode|policy|pool|population|ports|preceding|precision|predicate|presume_abort|primary|primary_role|print|prior|priority |priority_level|private|proc(edure)?|procedure_name|profile|provider|quarter|query_capture_mode|query_governor_cost_limit|query_optimizer_hotfixes|query_store|queue|quoted_identifier|raiserror|range|raw|rcfile|rc2|rc4|rc4_128|rdbms|read_committed_snapshot|read|read_only|read_write|readcommitted|readcommittedlock|readonly|readpast|readuncommitted|readwrite|real|rebuild|receive|recmodel_70backcomp|recompile|reconfigure|recovery|recursive|recursive_triggers|redo_queue|reject_sample_value|reject_type|reject_value|relative|remote|remote_data_archive|remote_proc_transactions|remote_service_name|remove|removed_cursors|removed_exec_context|reorganize|repeat|repeatable|repeatableread|replace|replica|replicated|replnick_100_to_80|replnickarray_80_to_100|replnickarray_100_to_80|required|required_cursopt|resample|reset|resource|resource_manager_location|respect|restart|restore|restricted_user|resume|retaindays|retention|return|revert|rewind|rewindonly|returns|robust|role|rollup|root|round_robin|route|row|rowdump|rowguidcol|rowlock|row_terminator|rows|rows_per_batch|rowsets_only|rowterminator|rowversion|rsa_1024|rsa_2048|rsa_3072|rsa_4096|rsa_512|safe|safety|sample|save|scalar|schema|schemabinding|scoped|scroll|scroll_locks|sddl|second|secexpr|seconds|secondary|secondary_only|secondary_role|secret|security|securityaudit|selective|self|send|sent|sequence|serde_method|serializable|server|service|service_broker|service_name|service_objective|session_timeout|session|sessions|seterror|setopts|sets|shard_map_manager|shard_map_name|sharded|shared_memory|show_statistics|showplan_all|showplan_text|showplan_xml|showplan_xml_with_recompile|shrinkdb|shutdown|sid|signature|simple|single_blob|single_clob|single_nclob|single_user|singleton|site|size|size_based_cleanup_mode|skip|smalldatetime|smallint|smallmoney|snapshot|snapshot_import|snapshotrestorephase|soap|softnuma|sort_in_tempdb|sorted_data|sorted_data_reorg|spatial|sql|sql_bigint|sql_binary|sql_bit|sql_char|sql_date|sql_decimal|sql_double|sql_float|sql_guid|sql_handle|sql_longvarbinary|sql_longvarchar|sql_numeric|sql_real|sql_smallint|sql_time|sql_timestamp|sql_tinyint|sql_tsi_day|sql_tsi_frac_second|sql_tsi_hour|sql_tsi_minute|sql_tsi_month|sql_tsi_quarter|sql_tsi_second|sql_tsi_week|sql_tsi_year|sql_type_date|sql_type_time|sql_type_timestamp|sql_varbinary|sql_varchar|sql_variant|sql_wchar|sql_wlongvarchar|ssl|ssl_port|standard|standby|start|start_date|started|stat_header|state|statement|static|statistics|statistics_incremental|statistics_norecompute|statistics_only|statman|stats|stats_stream|status|stop|stop_on_error|stopat|stopatmark|stopbeforemark|stoplist|stopped|string_delimiter|subject|supplemental_logging|supported|suspend|symmetric|synchronous_commit|synonym|sysname|system|system_time|system_versioning|table|tableresults|tablock|tablockx|take|tape|target|target_index|target_partition|target_recovery_time|tcp|temporal_history_retention|text|textimage_on|then|thesaurus|throw|time|timeout|timestamp|tinyint|to|top|torn_page_detection|track_columns_updated|trailing|tran|transaction|transfer|transform_noise_words|triple_des|triple_des_3key|truncate|trustworthy|try|tsql|two_digit_year_cutoff|type|type_desc|type_warning|tzoffset|uid|unbounded|uncommitted|unique|uniqueidentifier|unlimited|unload|unlock|unsafe|updlock|url|use|useplan|useroptions|use_type_default|using|utcdatetime|valid_xml|validation|value|values|varbinary|varchar|verbose|verifyonly|version|view_metadata|virtual_device|visiblity|wait_at_low_priority|waitfor|webmethod|week|weekday|weight|well_formed_xml|when|while|widechar|widechar_ansi|widenative|window|windows|with|within|within group|witness|without|without_array_wrapper|workload|wsdl|xact_abort|xlock|xml|xmlschema|xquery|xsinil|year|zone)\\b", + "match": "\\b(?i)(abort|abort_after_wait|absent|absolute|accent_sensitivity|acceptable_cursopt|acp|action|activation|add|address|admin|aes_128|aes_192|aes_256|affinity|after|aggregate|algorithm|all_constraints|all_errormsgs|all_indexes|all_levels|all_results|allow_connections|allow_dup_row|allow_encrypted_value_modifications|allow_page_locks|allow_row_locks|allow_snapshot_isolation|alter|altercolumn|always|anonymous|ansi_defaults|ansi_null_default|ansi_null_dflt_off|ansi_null_dflt_on|ansi_nulls|ansi_padding|ansi_warnings|appdomain|append|application|apply|arithabort|arithignore|array|assembly|asymmetric|asynchronous_commit|at|atan2|atomic|attach|attach_force_rebuild_log|attach_rebuild_log|audit|auth_realm|authentication|auto|auto_cleanup|auto_close|auto_create_statistics|auto_drop|auto_shrink|auto_update_statistics|auto_update_statistics_async|automated_backup_preference|automatic|autopilot|availability|availability_mode|backup|backup_priority|base64|basic|batches|batchsize|before|between|bigint|binary|binding|bit|block|blockers|blocksize|bmk|both|break|broker|broker_instance|bucket_count|buffer|buffercount|bulk_logged|by|call|caller|card|case|catalog|catch|cert|certificate|change_retention|change_tracking|change_tracking_context|changes|char|character|character_set|check_expiration|check_policy|checkconstraints|checkindex|checkpoint|checksum|cleanup_policy|clear|clear_port|close|clustered|codepage|collection|column_encryption_key|column_master_key|columnstore|columnstore_archive|colv_80_to_100|colv_100_to_80|commit_differential_base|committed|compatibility_level|compress_all_row_groups|compression|compression_delay|concat_null_yields_null|concatenate|configuration|connect|connection|containment|continue|continue_after_error|contract|contract_name|control|conversation|conversation_group_id|conversation_handle|copy|copy_only|count_rows|counter|create(\\\\s+or\\\\s+alter)?|credential|cross|cryptographic|cryptographic_provider|cube|cursor|cursor_close_on_commit|cursor_default|data|data_compression|data_flush_interval_seconds|data_mirroring|data_purity|data_source|database|database_name|database_snapshot|datafiletype|date_correlation_optimization|date|datefirst|dateformat|date_format|datetime|datetime2|datetimeoffset|day(s)?|db_chaining|dbid|dbidexec|dbo_only|deadlock_priority|deallocate|dec|decimal|declare|decrypt|decrypt_a|decryption|default_database|default_fulltext_language|default_language|default_logon_domain|default_schema|definition|delay|delayed_durability|delimitedtext|density_vector|dependent|des|description|desired_state|desx|differential|digest|disable|disable_broker|disable_def_cnst_chk|disabled|disk|distinct|distributed|distribution|drop|drop_existing|dts_buffers|dump|durability|dynamic|edition|elements|else|emergency|empty|enable|enable_broker|enabled|encoding|encrypted|encrypted_value|encryption|encryption_type|end|endpoint|endpoint_url|enhancedintegrity|entry|error_broker_conversations|errorfile|estimateonly|event|except|exec|executable|execute|exists|expand|expiredate|expiry_date|explicit|external|external_access|failover|failover_mode|failure_condition_level|fast|fast_forward|fastfirstrow|federated_service_account|fetch|field_terminator|fieldterminator|file|filelistonly|filegroup|filegrowth|filename|filestream|filestream_log|filestream_on|filetable|file_format|filter|first_row|fips_flagger|fire_triggers|first|firstrow|float|flush_interval_seconds|fmtonly|following|for|force|force_failover_allow_data_loss|force_service_allow_data_loss|forced|forceplan|formatfile|format_options|format_type|formsof|forward_only|free_cursors|free_exec_context|fullscan|fulltext|fulltextall|fulltextkey|function|generated|get|geography|geometry|global|go|goto|governor|guid|hadoop|hardening|hash|hashed|header_limit|headeronly|health_check_timeout|hidden|hierarchyid|histogram|histogram_steps|hits_cursors|hits_exec_context|hour(s)?|http|identity|identity_value|if|ifnull|ignore|ignore_constraints|ignore_dup_key|ignore_dup_row|ignore_triggers|image|immediate|implicit_transactions|include|include_null_values|incremental|index|inflectional|init|initiator|insensitive|insert|instead|int|integer|integrated|intersect|intermediate|interval_length_minutes|into|inuse_cursors|inuse_exec_context|io|is|isabout|iso_week|isolation|job_tracker_location|json|keep|keep_nulls|keep_replication|keepdefaults|keepfixed|keepidentity|keepnulls|kerberos|key|key_path|key_source|key_store_provider_name|keyset|kill|kilobytes_per_batch|labelonly|langid|language|last|lastrow|leading|legacy_cardinality_estimation|length|level|lifetime|lineage_80_to_100|lineage_100_to_80|listener_ip|listener_port|load|loadhistory|lob_compaction|local|local_service_name|locate|location|lock_escalation|lock_timeout|lockres|log|login|login_type|loop|manual|mark_in_use_for_removal|masked|master|match|matched|max_queue_readers|max_duration|max_outstanding_io_per_volume|maxdop|maxerrors|maxlength|maxtransfersize|max_plans_per_query|max_storage_size_mb|mediadescription|medianame|mediapassword|memogroup|memory_optimized|merge|message|message_forward_size|message_forwarding|microsecond|millisecond|minute(s)?|mirror_address|misses_cursors|misses_exec_context|mixed|modify|money|month|move|multi_user|must_change|name|namespace|nanosecond|native|native_compilation|nchar|ncharacter|nested_triggers|never|new_account|new_broker|newname|next|no|no_browsetable|no_checksum|no_compression|no_infomsgs|no_triggers|no_truncate|nocount|noexec|noexpand|noformat|noinit|nolock|nonatomic|nonclustered|nondurable|none|norecompute|norecovery|noreset|norewind|noskip|not|notification|nounload|now|nowait|ntext|ntlm|nulls|numeric|numeric_roundabort|nvarchar|object|objid|oem|offline|old_account|online|operation_mode|open|openjson|optimistic|option|orc|out|outer|output|over|override|owner|ownership|pad_index|page|page_checksum|page_verify|pagecount|paglock|param|parameter_sniffing|parameter_type_expansion|parameterization|parquet|parseonly|partial|partition|partner|password|path|pause|percentage|permission_set|persisted|period|physical_only|plan_forcing_mode|policy|pool|population|ports|preceding|precision|predicate|presume_abort|primary|primary_role|print|prior|priority |priority_level|private|proc(edure)?|procedure_name|profile|provider|quarter|query_capture_mode|query_governor_cost_limit|query_optimizer_hotfixes|query_store|queue|quoted_identifier|raiserror|range|raw|rcfile|rc2|rc4|rc4_128|rdbms|read_committed_snapshot|read|read_only|read_write|readcommitted|readcommittedlock|readonly|readpast|readuncommitted|readwrite|real|rebuild|receive|recmodel_70backcomp|recompile|reconfigure|recovery|recursive|recursive_triggers|redo_queue|reject_sample_value|reject_type|reject_value|relative|remote|remote_data_archive|remote_proc_transactions|remote_service_name|remove|removed_cursors|removed_exec_context|reorganize|repeat|repeatable|repeatableread|replace|replica|replicated|replnick_100_to_80|replnickarray_80_to_100|replnickarray_100_to_80|required|required_cursopt|resample|reset|resource|resource_manager_location|respect|restart|restore|restricted_user|resume|retaindays|retention|return|revert|rewind|rewindonly|returns|robust|role|rollup|root|round_robin|route|row|rowdump|rowguidcol|rowlock|row_terminator|rows|rows_per_batch|rowsets_only|rowterminator|rowversion|rsa_1024|rsa_2048|rsa_3072|rsa_4096|rsa_512|safe|safety|sample|save|scalar|schema|schemabinding|scoped|scroll|scroll_locks|sddl|second|secexpr|seconds|secondary|secondary_only|secondary_role|secret|security|securityaudit|selective|self|send|sent|sequence|serde_method|serializable|server|service|service_broker|service_name|service_objective|session_timeout|session|sessions|seterror|setopts|sets|shard_map_manager|shard_map_name|sharded|shared_memory|shortest_path|show_statistics|showplan_all|showplan_text|showplan_xml|showplan_xml_with_recompile|shrinkdb|shutdown|sid|signature|simple|single_blob|single_clob|single_nclob|single_user|singleton|site|size|size_based_cleanup_mode|skip|smalldatetime|smallint|smallmoney|snapshot|snapshot_import|snapshotrestorephase|soap|softnuma|sort_in_tempdb|sorted_data|sorted_data_reorg|spatial|sql|sql_bigint|sql_binary|sql_bit|sql_char|sql_date|sql_decimal|sql_double|sql_float|sql_guid|sql_handle|sql_longvarbinary|sql_longvarchar|sql_numeric|sql_real|sql_smallint|sql_time|sql_timestamp|sql_tinyint|sql_tsi_day|sql_tsi_frac_second|sql_tsi_hour|sql_tsi_minute|sql_tsi_month|sql_tsi_quarter|sql_tsi_second|sql_tsi_week|sql_tsi_year|sql_type_date|sql_type_time|sql_type_timestamp|sql_varbinary|sql_varchar|sql_variant|sql_wchar|sql_wlongvarchar|ssl|ssl_port|standard|standby|start|start_date|started|stat_header|state|statement|static|statistics|statistics_incremental|statistics_norecompute|statistics_only|statman|stats|stats_stream|status|stop|stop_on_error|stopat|stopatmark|stopbeforemark|stoplist|stopped|string_delimiter|subject|supplemental_logging|supported|suspend|symmetric|synchronous_commit|synonym|sysname|system|system_time|system_versioning|table|tableresults|tablock|tablockx|take|tape|target|target_index|target_partition|target_recovery_time|tcp|temporal_history_retention|text|textimage_on|then|thesaurus|throw|time|timeout|timestamp|tinyint|to|top|torn_page_detection|track_columns_updated|trailing|tran|transaction|transfer|transform_noise_words|triple_des|triple_des_3key|truncate|trustworthy|try|tsql|two_digit_year_cutoff|type|type_desc|type_warning|tzoffset|uid|unbounded|uncommitted|unique|uniqueidentifier|unlimited|unload|unlock|unsafe|updlock|url|use|useplan|useroptions|use_type_default|using|utcdatetime|valid_xml|validation|value|values|varbinary|varchar|verbose|verifyonly|version|view_metadata|virtual_device|visiblity|wait_at_low_priority|waitfor|webmethod|week|weekday|weight|well_formed_xml|when|while|widechar|widechar_ansi|widenative|window|windows|with|within|within group|witness|without|without_array_wrapper|workload|wsdl|xact_abort|xlock|xml|xmlschema|xquery|xsinil|year|zone)\\b", "name": "keyword.other.sql" }, { diff --git a/extensions/swift/LICENSE.md b/extensions/swift/LICENSE.md deleted file mode 100644 index 2a342e30ba8..00000000000 --- a/extensions/swift/LICENSE.md +++ /dev/null @@ -1,45 +0,0 @@ -Monarch definition & snippets: - -The MIT License (MIT) - -Copyright (c) 2015 David Owens II - -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. - -TextMate grammar: - -Copyright (c) 2014 Darin Morrison - -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. \ No newline at end of file diff --git a/extensions/swift/cgmanifest.json b/extensions/swift/cgmanifest.json index a6e26d57d7c..816621e4170 100644 --- a/extensions/swift/cgmanifest.json +++ b/extensions/swift/cgmanifest.json @@ -1,5 +1,16 @@ { "registrations": [ + { + "component": { + "type": "git", + "git": { + "name": "jtbandes/swift-tmlanguage", + "repositoryUrl": "https://github.com/jtbandes/swift-tmlanguage", + "commitHash": "ab893c684dd7eeb7c249139e29e931334316fda7" + } + }, + "license": "MIT" + }, { "component": { "type": "git", @@ -32,42 +43,8 @@ "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." ], "license": "MIT", - "description": "The files in this folder are based on https://github.com/owensd/vscode-swift.", + "description": "The files in the 'snippets' subfolder in this folder are based on https://github.com/owensd/vscode-swift.", "version": "0.0.1" - }, - { - "component": { - "type": "git", - "git": { - "name": "freebroccolo/atom-language-swift", - "repositoryUrl": "https://github.com/freebroccolo/atom-language-swift", - "commitHash": "d8f4ed1f79cbb4d5d215e7a68fa8cc6b618e16e0" - } - }, - "licenseDetail": [ - "The MIT License (MIT)", - "", - "Copyright (c) 2014 Darin Morrison", - "", - "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": "0.0.0" } ], "version": 1 diff --git a/extensions/swift/package.json b/extensions/swift/package.json index d8786ae14c6..fd1a76cbadd 100644 --- a/extensions/swift/package.json +++ b/extensions/swift/package.json @@ -9,7 +9,7 @@ "vscode": "*" }, "scripts": { - "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/swift.tmbundle Syntaxes/Swift.tmLanguage ./syntaxes/swift.tmLanguage.json" + "update-grammar": "node ../node_modules/vscode-grammar-updater/bin jtbandes/swift-tmlanguage Swift.tmLanguage.json ./syntaxes/swift.tmLanguage.json" }, "contributes": { "languages": [ diff --git a/extensions/swift/syntaxes/swift.tmLanguage.json b/extensions/swift/syntaxes/swift.tmLanguage.json index f63b127dc62..6259b151369 100644 --- a/extensions/swift/syntaxes/swift.tmLanguage.json +++ b/extensions/swift/syntaxes/swift.tmLanguage.json @@ -1,10 +1,10 @@ { "information_for_contributors": [ - "This file has been converted from https://github.com/textmate/swift.tmbundle/blob/master/Syntaxes/Swift.tmLanguage", + "This file has been converted from https://github.com/jtbandes/swift-tmlanguage/blob/master/Swift.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/textmate/swift.tmbundle/commit/7a35637eb70aef3114b091c4ff6fbf6a2faa881b", + "version": "https://github.com/jtbandes/swift-tmlanguage/commit/ab893c684dd7eeb7c249139e29e931334316fda7", "name": "Swift", "scopeName": "source.swift", "comment": "See swift.tmbundle/grammar-test.swift for test cases.", @@ -15,23 +15,25 @@ ], "repository": { "async-throws": { + "match": "\\b(?:(throws\\s+async|rethrows\\s+async)|(throws|rethrows)|(async))\\b", "captures": { "1": { "name": "invalid.illegal.await-must-precede-throws.swift" }, "2": { - "name": "keyword.control.exception.swift" + "name": "storage.modifier.exception.swift" }, "3": { - "name": "keyword.control.async.swift" + "name": "storage.modifier.async.swift" } - }, - "match": "\\b(?:(throws\\s+async|rethrows\\s+async)|(throws|rethrows)|(async))\\b" + } }, "attributes": { "patterns": [ { + "name": "meta.attribute.available.swift", "begin": "((@)available)(\\()", + "end": "\\)", "beginCaptures": { "1": { "name": "storage.modifier.attribute.swift" @@ -43,15 +45,14 @@ "name": "punctuation.definition.arguments.begin.swift" } }, - "end": "\\)", "endCaptures": { "0": { "name": "punctuation.definition.arguments.end.swift" } }, - "name": "meta.attribute.available.swift", "patterns": [ { + "match": "\\b(swift|(?:iOS|macOS|OSX|watchOS|tvOS|UIKitForMac)(?:ApplicationExtension)?)\\b(?:\\s+([0-9]+(?:\\.[0-9]+)*\\b))?", "captures": { "1": { "name": "keyword.other.platform.os.swift" @@ -59,11 +60,11 @@ "2": { "name": "constant.numeric.swift" } - }, - "match": "\\b(swift|(?:iOS|macOS|OSX|watchOS|tvOS|UIKitForMac)(?:ApplicationExtension)?)\\b(?:\\s+([0-9]+(?:\\.[0-9]+)*\\b))?" + } }, { "begin": "\\b(introduced|deprecated|obsoleted)\\s*(:)\\s*", + "end": "(?!\\G)", "beginCaptures": { "1": { "name": "keyword.other.swift" @@ -72,16 +73,16 @@ "name": "punctuation.separator.key-value.swift" } }, - "end": "(?!\\G)", "patterns": [ { - "match": "\\b[0-9]+(?:\\.[0-9]+)*\\b", - "name": "constant.numeric.swift" + "name": "constant.numeric.swift", + "match": "\\b[0-9]+(?:\\.[0-9]+)*\\b" } ] }, { "begin": "\\b(message|renamed)\\s*(:)\\s*(?=\")", + "end": "(?!\\G)", "beginCaptures": { "1": { "name": "keyword.other.swift" @@ -90,7 +91,6 @@ "name": "punctuation.separator.key-value.swift" } }, - "end": "(?!\\G)", "patterns": [ { "include": "#literals" @@ -98,6 +98,7 @@ ] }, { + "match": "(?:(\\*)|\\b(deprecated|unavailable|noasync)\\b)\\s*(.*?)(?=[,)])", "captures": { "1": { "name": "keyword.other.platform.all.swift" @@ -108,13 +109,14 @@ "3": { "name": "invalid.illegal.character-not-allowed-here.swift" } - }, - "match": "(?:(\\*)|\\b(deprecated|unavailable|noasync)\\b)\\s*(.*?)(?=[,)])" + } } ] }, { + "name": "meta.attribute.objc.swift", "begin": "((@)objc)(\\()", + "end": "\\)", "beginCaptures": { "1": { "name": "storage.modifier.attribute.swift" @@ -126,27 +128,28 @@ "name": "punctuation.definition.arguments.begin.swift" } }, - "end": "\\)", "endCaptures": { "0": { "name": "punctuation.definition.arguments.end.swift" } }, - "name": "meta.attribute.objc.swift", "patterns": [ { + "name": "entity.name.function.swift", + "match": "\\w*(?::(?:\\w*:)*(\\w*))?", "captures": { "1": { "name": "invalid.illegal.missing-colon-after-selector-piece.swift" } - }, - "match": "\\w*(?::(?:\\w*:)*(\\w*))?", - "name": "entity.name.function.swift" + } } ] }, { + "comment": "any other attribute", + "name": "meta.attribute.swift", "begin": "(@)(?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k)", + "end": "(?!\\G\\()", "beginCaptures": { "0": { "name": "storage.modifier.attribute.swift" @@ -161,24 +164,21 @@ "name": "punctuation.definition.identifier.swift" } }, - "comment": "any other attribute", - "end": "(?!\\G\\()", - "name": "meta.attribute.swift", "patterns": [ { + "name": "meta.arguments.attribute.swift", "begin": "\\(", + "end": "\\)", "beginCaptures": { "0": { "name": "punctuation.definition.arguments.begin.swift" } }, - "end": "\\)", "endCaptures": { "0": { "name": "punctuation.definition.arguments.end.swift" } }, - "name": "meta.arguments.attribute.swift", "patterns": [ { "include": "#expressions" @@ -193,18 +193,18 @@ "patterns": [ { "comment": "Member functions in the standard library in Swift 3 which may be used with trailing closures and no parentheses", - "match": "(?<=\\.)(?:s(?:ort(?:ed)?|plit)|contains|index|partition|f(?:i(?:lter|rst)|orEach|latMap)|with(?:MutableCharacters|CString|U(?:nsafe(?:Mutable(?:BufferPointer|Pointer(?:s|To(?:Header|Elements)))|BufferPointer)|TF8Buffer))|m(?:in|a(?:p|x)))(?=\\s*[({])\\b", - "name": "support.function.swift" + "name": "support.function.swift", + "match": "(?<=\\.)(?:s(?:ort(?:ed)?|plit)|contains|index|partition|f(?:i(?:lter|rst)|orEach|latMap)|with(?:MutableCharacters|CString|U(?:nsafe(?:Mutable(?:BufferPointer|Pointer(?:s|To(?:Header|Elements)))|BufferPointer)|TF8Buffer))|m(?:in|a(?:p|x)))(?=\\s*[({])\\b" }, { "comment": "Member functions in the standard library in Swift 3", - "match": "(?<=\\.)(?:s(?:ymmetricDifference|t(?:oreBytes|arts|ride)|ortInPlace|u(?:ccessor|ffix|btract(?:ing|InPlace|WithOverflow)?)|quareRoot|amePosition)|h(?:oldsUnique(?:Reference|OrPinnedReference)|as(?:Suffix|Prefix))|ne(?:gate(?:d)?|xt)|c(?:o(?:untByEnumerating|py(?:Bytes)?)|lamp(?:ed)?|reate)|t(?:o(?:IntMax|Opaque|UIntMax)|ake(?:RetainedValue|UnretainedValue)|r(?:uncatingRemainder|a(?:nscodedLength|ilSurrogate)))|i(?:s(?:MutableAndUniquelyReferenced(?:OrPinned)?|S(?:trictSu(?:perset(?:Of)?|bset(?:Of)?)|u(?:perset(?:Of)?|bset(?:Of)?))|Continuation|T(?:otallyOrdered|railSurrogate)|Disjoint(?:With)?|Unique(?:Reference|lyReferenced(?:OrPinned)?)|Equal|Le(?:ss(?:ThanOrEqualTo)?|adSurrogate))|n(?:sert(?:ContentsOf)?|tersect(?:ion|InPlace)?|itialize(?:Memory|From)?|dex(?:Of|ForKey)))|o(?:verlaps|bjectAt)|d(?:i(?:stance(?:To)?|vide(?:d|WithOverflow)?)|e(?:s(?:cendant|troy)|code(?:CString)?|initialize|alloc(?:ate(?:Capacity)?)?)|rop(?:First|Last))|u(?:n(?:ion(?:InPlace)?|derestimateCount|wrappedOrError)|p(?:date(?:Value)?|percased))|join(?:ed|WithSeparator)|p(?:op(?:First|Last)|ass(?:Retained|Unretained)|re(?:decessor|fix))|e(?:scape(?:d)?|n(?:code|umerate(?:d)?)|lementsEqual|xclusiveOr(?:InPlace)?)|f(?:orm(?:Remainder|S(?:ymmetricDifference|quareRoot)|TruncatingRemainder|In(?:tersection|dex)|Union)|latten|rom(?:CString(?:RepairingIllFormedUTF8)?|Opaque))|w(?:i(?:thMemoryRebound|dth)|rite(?:To)?)|l(?:o(?:wercased|ad)|e(?:adSurrogate|xicographical(?:Compare|lyPrecedes)))|a(?:ss(?:ign(?:BackwardFrom|From)?|umingMemoryBound)|d(?:d(?:ing(?:Product)?|Product|WithOverflow)?|vanced(?:By)?)|utorelease|ppend(?:ContentsOf)?|lloc(?:ate)?|bs)|r(?:ound(?:ed)?|e(?:serveCapacity|tain|duce|place(?:Range|Subrange)?|verse(?:d)?|quest(?:NativeBuffer|UniqueMutableBackingBuffer)|lease|m(?:ove(?:Range|Subrange|Value(?:ForKey)?|First|Last|A(?:tIndex|ll))?|ainder(?:WithOverflow)?)))|ge(?:nerate|t(?:Objects|Element))|m(?:in(?:imum(?:Magnitude)?|Element)|ove(?:Initialize(?:Memory|BackwardFrom|From)?|Assign(?:From)?)?|ultipl(?:y(?:WithOverflow)?|ied)|easure|a(?:ke(?:Iterator|Description)|x(?:imum(?:Magnitude)?|Element)))|bindMemory)(?=\\s*\\()", - "name": "support.function.swift" + "name": "support.function.swift", + "match": "(?<=\\.)(?:s(?:ymmetricDifference|t(?:oreBytes|arts|ride)|ortInPlace|u(?:ccessor|ffix|btract(?:ing|InPlace|WithOverflow)?)|quareRoot|amePosition)|h(?:oldsUnique(?:Reference|OrPinnedReference)|as(?:Suffix|Prefix))|ne(?:gate(?:d)?|xt)|c(?:o(?:untByEnumerating|py(?:Bytes)?)|lamp(?:ed)?|reate)|t(?:o(?:IntMax|Opaque|UIntMax)|ake(?:RetainedValue|UnretainedValue)|r(?:uncatingRemainder|a(?:nscodedLength|ilSurrogate)))|i(?:s(?:MutableAndUniquelyReferenced(?:OrPinned)?|S(?:trictSu(?:perset(?:Of)?|bset(?:Of)?)|u(?:perset(?:Of)?|bset(?:Of)?))|Continuation|T(?:otallyOrdered|railSurrogate)|Disjoint(?:With)?|Unique(?:Reference|lyReferenced(?:OrPinned)?)|Equal|Le(?:ss(?:ThanOrEqualTo)?|adSurrogate))|n(?:sert(?:ContentsOf)?|tersect(?:ion|InPlace)?|itialize(?:Memory|From)?|dex(?:Of|ForKey)))|o(?:verlaps|bjectAt)|d(?:i(?:stance(?:To)?|vide(?:d|WithOverflow)?)|e(?:s(?:cendant|troy)|code(?:CString)?|initialize|alloc(?:ate(?:Capacity)?)?)|rop(?:First|Last))|u(?:n(?:ion(?:InPlace)?|derestimateCount|wrappedOrError)|p(?:date(?:Value)?|percased))|join(?:ed|WithSeparator)|p(?:op(?:First|Last)|ass(?:Retained|Unretained)|re(?:decessor|fix))|e(?:scape(?:d)?|n(?:code|umerate(?:d)?)|lementsEqual|xclusiveOr(?:InPlace)?)|f(?:orm(?:Remainder|S(?:ymmetricDifference|quareRoot)|TruncatingRemainder|In(?:tersection|dex)|Union)|latten|rom(?:CString(?:RepairingIllFormedUTF8)?|Opaque))|w(?:i(?:thMemoryRebound|dth)|rite(?:To)?)|l(?:o(?:wercased|ad)|e(?:adSurrogate|xicographical(?:Compare|lyPrecedes)))|a(?:ss(?:ign(?:BackwardFrom|From)?|umingMemoryBound)|d(?:d(?:ing(?:Product)?|Product|WithOverflow)?|vanced(?:By)?)|utorelease|ppend(?:ContentsOf)?|lloc(?:ate)?|bs)|r(?:ound(?:ed)?|e(?:serveCapacity|tain|duce|place(?:Range|Subrange)?|verse(?:d)?|quest(?:NativeBuffer|UniqueMutableBackingBuffer)|lease|m(?:ove(?:Range|Subrange|Value(?:ForKey)?|First|Last|A(?:tIndex|ll))?|ainder(?:WithOverflow)?)))|ge(?:nerate|t(?:Objects|Element))|m(?:in(?:imum(?:Magnitude)?|Element)|ove(?:Initialize(?:Memory|BackwardFrom|From)?|Assign(?:From)?)?|ultipl(?:y(?:WithOverflow)?|ied)|easure|a(?:ke(?:Iterator|Description)|x(?:imum(?:Magnitude)?|Element)))|bindMemory)(?=\\s*\\()" }, { "comment": "Member functions in the standard library in Swift 2 only", - "match": "(?<=\\.)(?:s(?:uperclassMirror|amePositionIn|tartsWith)|nextObject|c(?:haracterAtIndex|o(?:untByEnumeratingWithState|pyWithZone)|ustom(?:Mirror|PlaygroundQuickLook))|is(?:EmptyInput|ASCII)|object(?:Enumerator|ForKey|AtIndex)|join|put|keyEnumerator|withUnsafeMutablePointerToValue|length|getMirror|m(?:oveInitializeAssignFrom|ember))(?=\\s*\\()", - "name": "support.function.swift" + "name": "support.function.swift", + "match": "(?<=\\.)(?:s(?:uperclassMirror|amePositionIn|tartsWith)|nextObject|c(?:haracterAtIndex|o(?:untByEnumeratingWithState|pyWithZone)|ustom(?:Mirror|PlaygroundQuickLook))|is(?:EmptyInput|ASCII)|object(?:Enumerator|ForKey|AtIndex)|join|put|keyEnumerator|withUnsafeMutablePointerToValue|length|getMirror|m(?:oveInitializeAssignFrom|ember))(?=\\s*\\()" } ] }, @@ -212,6 +212,7 @@ "patterns": [ { "begin": "\\b(type)(\\()\\s*(of)(:)", + "end": "\\)", "beginCaptures": { "1": { "name": "support.function.dynamic-type.swift" @@ -226,7 +227,6 @@ "name": "punctuation.separator.argument-label.begin.swift" } }, - "end": "\\)", "endCaptures": { "0": { "name": "punctuation.definition.arguments.end.swift" @@ -240,18 +240,18 @@ }, { "comment": "Global functions available in Swift 3 which may be used with trailing closures and no parentheses", - "match": "\\b(?:anyGenerator|autoreleasepool)(?=\\s*[({])\\b", - "name": "support.function.swift" + "name": "support.function.swift", + "match": "\\b(?:anyGenerator|autoreleasepool)(?=\\s*[({])\\b" }, { "comment": "Global functions available in Swift 3", - "match": "\\b(?:s(?:tride(?:of(?:Value)?)?|izeof(?:Value)?|equence|wap)|numericCast|transcode|is(?:UniquelyReferenced(?:NonObjC)?|KnownUniquelyReferenced)|zip|d(?:ump|ebugPrint)|unsafe(?:BitCast|Downcast|Unwrap|Address(?:Of)?)|pr(?:int|econdition(?:Failure)?)|fatalError|with(?:Unsafe(?:MutablePointer|Pointer)|ExtendedLifetime|VaList)|a(?:ssert(?:ionFailure)?|lignof(?:Value)?|bs)|re(?:peatElement|adLine)|getVaList|m(?:in|ax))(?=\\s*\\()", - "name": "support.function.swift" + "name": "support.function.swift", + "match": "\\b(?:s(?:tride(?:of(?:Value)?)?|izeof(?:Value)?|equence|wap)|numericCast|transcode|is(?:UniquelyReferenced(?:NonObjC)?|KnownUniquelyReferenced)|zip|d(?:ump|ebugPrint)|unsafe(?:BitCast|Downcast|Unwrap|Address(?:Of)?)|pr(?:int|econdition(?:Failure)?)|fatalError|with(?:Unsafe(?:MutablePointer|Pointer)|ExtendedLifetime|VaList)|a(?:ssert(?:ionFailure)?|lignof(?:Value)?|bs)|re(?:peatElement|adLine)|getVaList|m(?:in|ax))(?=\\s*\\()" }, { "comment": "Global functions available in Swift 2 only", - "match": "\\b(?:s(?:ort|uffix|pli(?:ce|t))|insert|overlaps|d(?:istance|rop(?:First|Last))|join|prefix|extend|withUnsafe(?:MutablePointers|Pointers)|lazy|advance|re(?:flect|move(?:Range|Last|A(?:tIndex|ll))))(?=\\s*\\()", - "name": "support.function.swift" + "name": "support.function.swift", + "match": "\\b(?:s(?:ort|uffix|pli(?:ce|t))|insert|overlaps|d(?:istance|rop(?:First|Last))|join|prefix|extend|withUnsafe(?:MutablePointers|Pointers)|lazy|advance|re(?:flect|move(?:Range|Last|A(?:tIndex|ll))))(?=\\s*\\()" } ] }, @@ -259,23 +259,23 @@ "patterns": [ { "comment": "The simpler (?<=\\bProcess\\.|\\bCommandLine\\.) breaks VS Code / Atom, see https://github.com/textmate/swift.tmbundle/issues/29", - "match": "(?<=^Process\\.|\\WProcess\\.|^CommandLine\\.|\\WCommandLine\\.)(arguments|argc|unsafeArgv)", - "name": "support.variable.swift" + "name": "support.variable.swift", + "match": "(?<=^Process\\.|\\WProcess\\.|^CommandLine\\.|\\WCommandLine\\.)(arguments|argc|unsafeArgv)" }, { "comment": "Properties in the standard library in Swift 3", - "match": "(?<=\\.)(?:s(?:t(?:artIndex|ri(?:ngValue|de))|i(?:ze|gn(?:BitIndex|ificand(?:Bit(?:Count|Pattern)|Width)?|alingNaN)?)|u(?:perclassMirror|mmary|bscriptBaseAddress))|h(?:eader|as(?:hValue|PointerRepresentation))|n(?:ulTerminatedUTF8|ext(?:Down|Up)|a(?:n|tiveOwner))|c(?:haracters|ount(?:TrailingZeros)?|ustom(?:Mirror|PlaygroundQuickLook)|apacity)|i(?:s(?:S(?:ign(?:Minus|aling(?:NaN)?)|ubnormal)|N(?:ormal|aN)|Canonical|Infinite|Zero|Empty|Finite|ASCII)|n(?:dices|finity)|dentity)|owner|de(?:scription|bugDescription)|u(?:n(?:safelyUnwrapped|icodeScalar(?:s)?|derestimatedCount)|tf(?:16|8(?:Start|C(?:String|odeUnitCount))?)|intValue|ppercaseString|lp(?:OfOne)?)|p(?:i|ointee)|e(?:ndIndex|lements|xponent(?:Bit(?:Count|Pattern))?)|value(?:s)?|keys|quietNaN|f(?:irst(?:ElementAddress(?:IfContiguous)?)?|loatingPointClass)|l(?:ittleEndian|owercaseString|eastNo(?:nzeroMagnitude|rmalMagnitude)|a(?:st|zy))|a(?:l(?:ignment|l(?:ocatedElementCount|Zeros))|rray(?:PropertyIsNativeTypeChecked)?)|ra(?:dix|wValue)|greatestFiniteMagnitude|m(?:in|emory|ax)|b(?:yteS(?:ize|wapped)|i(?:nade|tPattern|gEndian)|uffer|ase(?:Address)?))\\b", - "name": "support.variable.swift" + "name": "support.variable.swift", + "match": "(?<=\\.)(?:s(?:t(?:artIndex|ri(?:ngValue|de))|i(?:ze|gn(?:BitIndex|ificand(?:Bit(?:Count|Pattern)|Width)?|alingNaN)?)|u(?:perclassMirror|mmary|bscriptBaseAddress))|h(?:eader|as(?:hValue|PointerRepresentation))|n(?:ulTerminatedUTF8|ext(?:Down|Up)|a(?:n|tiveOwner))|c(?:haracters|ount(?:TrailingZeros)?|ustom(?:Mirror|PlaygroundQuickLook)|apacity)|i(?:s(?:S(?:ign(?:Minus|aling(?:NaN)?)|ubnormal)|N(?:ormal|aN)|Canonical|Infinite|Zero|Empty|Finite|ASCII)|n(?:dices|finity)|dentity)|owner|de(?:scription|bugDescription)|u(?:n(?:safelyUnwrapped|icodeScalar(?:s)?|derestimatedCount)|tf(?:16|8(?:Start|C(?:String|odeUnitCount))?)|intValue|ppercaseString|lp(?:OfOne)?)|p(?:i|ointee)|e(?:ndIndex|lements|xponent(?:Bit(?:Count|Pattern))?)|value(?:s)?|keys|quietNaN|f(?:irst(?:ElementAddress(?:IfContiguous)?)?|loatingPointClass)|l(?:ittleEndian|owercaseString|eastNo(?:nzeroMagnitude|rmalMagnitude)|a(?:st|zy))|a(?:l(?:ignment|l(?:ocatedElementCount|Zeros))|rray(?:PropertyIsNativeTypeChecked)?)|ra(?:dix|wValue)|greatestFiniteMagnitude|m(?:in|emory|ax)|b(?:yteS(?:ize|wapped)|i(?:nade|tPattern|gEndian)|uffer|ase(?:Address)?))\\b" }, { "comment": "Properties in the standard library in Swift 2 only", - "match": "(?<=\\.)(?:boolValue|disposition|end|objectIdentifier|quickLookObject|start|valueType)\\b", - "name": "support.variable.swift" + "name": "support.variable.swift", + "match": "(?<=\\.)(?:boolValue|disposition|end|objectIdentifier|quickLookObject|start|valueType)\\b" }, { "comment": "Enum cases in the standard library - note that there is some overlap between these and the properties", - "match": "(?<=\\.)(?:s(?:calarValue|i(?:ze|gnalingNaN)|o(?:und|me)|uppressed|prite|et)|n(?:one|egative(?:Subnormal|Normal|Infinity|Zero))|c(?:ol(?:or|lection)|ustomized)|t(?:o(?:NearestOr(?:Even|AwayFromZero)|wardZero)|uple|ext)|i(?:nt|mage)|optional|d(?:ictionary|o(?:uble|wn))|u(?:Int|p|rl)|p(?:o(?:sitive(?:Subnormal|Normal|Infinity|Zero)|int)|lus)|e(?:rror|mptyInput)|view|quietNaN|float|a(?:ttributedString|wayFromZero)|r(?:ectangle|ange)|generated|minus|b(?:ool|ezierPath))\\b", - "name": "support.variable.swift" + "name": "support.variable.swift", + "match": "(?<=\\.)(?:s(?:calarValue|i(?:ze|gnalingNaN)|o(?:und|me)|uppressed|prite|et)|n(?:one|egative(?:Subnormal|Normal|Infinity|Zero))|c(?:ol(?:or|lection)|ustomized)|t(?:o(?:NearestOr(?:Even|AwayFromZero)|wardZero)|uple|ext)|i(?:nt|mage)|optional|d(?:ictionary|o(?:uble|wn))|u(?:Int|p|rl)|p(?:o(?:sitive(?:Subnormal|Normal|Infinity|Zero)|int)|lus)|e(?:rror|mptyInput)|view|quietNaN|float|a(?:ttributedString|wayFromZero)|r(?:ectangle|ange)|generated|minus|b(?:ool|ezierPath))\\b" } ] }, @@ -283,107 +283,105 @@ "comment": "Types provided in the standard library", "patterns": [ { - "include": "#builtin-class-type" + "include": "#builtin-types-builtin-class-type" }, { - "include": "#builtin-enum-type" + "include": "#builtin-types-builtin-enum-type" }, { - "include": "#builtin-protocol-type" + "include": "#builtin-types-builtin-protocol-type" }, { - "include": "#builtin-struct-type" + "include": "#builtin-types-builtin-struct-type" }, { - "include": "#builtin-typealias" + "include": "#builtin-types-builtin-typealias" }, { - "match": "\\bAny\\b", - "name": "support.type.any.swift" + "name": "support.type.any.swift", + "match": "\\bAny\\b" } - ], - "repository": { - "builtin-class-type": { - "comment": "Builtin class types", - "match": "\\b(Managed(Buffer|ProtoBuffer)|NonObjectiveCBase|AnyGenerator)\\b", - "name": "support.class.swift" + ] + }, + "builtin-types-builtin-class-type": { + "comment": "Builtin class types", + "name": "support.class.swift", + "match": "\\b(Managed(Buffer|ProtoBuffer)|NonObjectiveCBase|AnyGenerator)\\b" + }, + "builtin-types-builtin-enum-type": { + "patterns": [ + { + "comment": "CommandLine is an enum, but it acts like a constant", + "name": "support.constant.swift", + "match": "\\b(?:CommandLine|Process(?=\\.))\\b" }, - "builtin-enum-type": { - "patterns": [ - { - "comment": "CommandLine is an enum, but it acts like a constant", - "match": "\\b(?:CommandLine|Process(?=\\.))\\b", - "name": "support.constant.swift" - }, - { - "comment": "The return type of a function that never returns", - "match": "\\bNever\\b", - "name": "support.constant.never.swift" - }, - { - "comment": "Enum types in the standard library in Swift 3", - "match": "\\b(?:ImplicitlyUnwrappedOptional|Representation|MemoryLayout|FloatingPointClassification|SetIndexRepresentation|SetIteratorRepresentation|FloatingPointRoundingRule|UnicodeDecodingResult|Optional|DictionaryIndexRepresentation|AncestorRepresentation|DisplayStyle|PlaygroundQuickLook|Never|FloatingPointSign|Bit|DictionaryIteratorRepresentation)\\b", - "name": "support.type.swift" - }, - { - "comment": "Enum types in the standard library in Swift 2 only", - "match": "\\b(?:MirrorDisposition|QuickLookObject)\\b", - "name": "support.type.swift" - } - ] + { + "comment": "The return type of a function that never returns", + "name": "support.constant.never.swift", + "match": "\\bNever\\b" }, - "builtin-protocol-type": { - "patterns": [ - { - "comment": "Protocols in the standard library in Swift 3", - "match": "\\b(?:Ra(?:n(?:domAccess(?:Collection|Indexable)|geReplaceable(?:Collection|Indexable))|wRepresentable)|M(?:irrorPath|utable(?:Collection|Indexable))|Bi(?:naryFloatingPoint|twiseOperations|directional(?:Collection|Indexable))|S(?:tr(?:ideable|eamable)|igned(?:Number|Integer)|e(?:tAlgebra|quence))|Hashable|C(?:o(?:llection|mparable)|ustom(?:Reflectable|StringConvertible|DebugStringConvertible|PlaygroundQuickLookable|LeafReflectable)|VarArg)|TextOutputStream|I(?:n(?:teger(?:Arithmetic)?|dexable(?:Base)?)|teratorProtocol)|OptionSet|Un(?:signedInteger|icodeCodec)|E(?:quatable|rror|xpressibleBy(?:BooleanLiteral|String(?:Interpolation|Literal)|NilLiteral|IntegerLiteral|DictionaryLiteral|UnicodeScalarLiteral|ExtendedGraphemeClusterLiteral|FloatLiteral|ArrayLiteral))|FloatingPoint|L(?:osslessStringConvertible|azy(?:SequenceProtocol|CollectionProtocol))|A(?:nyObject|bsoluteValuable))\\b", - "name": "support.type.swift" - }, - { - "comment": "Protocols in the standard library in Swift 2 only", - "match": "\\b(?:Ran(?:domAccessIndexType|geReplaceableCollectionType)|GeneratorType|M(?:irror(?:Type|PathType)|utable(?:Sliceable|CollectionType))|B(?:i(?:twiseOperationsType|directionalIndexType)|oolean(?:Type|LiteralConvertible))|S(?:tring(?:InterpolationConvertible|LiteralConvertible)|i(?:nkType|gned(?:NumberType|IntegerType))|e(?:tAlgebraType|quenceType)|liceable)|NilLiteralConvertible|C(?:ollectionType|VarArgType)|Inte(?:rvalType|ger(?:Type|LiteralConvertible|ArithmeticType))|O(?:utputStreamType|ptionSetType)|DictionaryLiteralConvertible|Un(?:signedIntegerType|icode(?:ScalarLiteralConvertible|CodecType))|E(?:rrorType|xten(?:sibleCollectionType|dedGraphemeClusterLiteralConvertible))|F(?:orwardIndexType|loat(?:ingPointType|LiteralConvertible))|A(?:nyCollectionType|rrayLiteralConvertible))\\b", - "name": "support.type.swift" - } - ] + { + "comment": "Enum types in the standard library in Swift 3", + "name": "support.type.swift", + "match": "\\b(?:ImplicitlyUnwrappedOptional|Representation|MemoryLayout|FloatingPointClassification|SetIndexRepresentation|SetIteratorRepresentation|FloatingPointRoundingRule|UnicodeDecodingResult|Optional|DictionaryIndexRepresentation|AncestorRepresentation|DisplayStyle|PlaygroundQuickLook|Never|FloatingPointSign|Bit|DictionaryIteratorRepresentation)\\b" }, - "builtin-struct-type": { - "patterns": [ - { - "comment": "Structs in the standard library in Swift 3", - "match": "\\b(?:R(?:e(?:peat(?:ed)?|versed(?:RandomAccess(?:Collection|Index)|Collection|Index))|an(?:domAccessSlice|ge(?:Replaceable(?:RandomAccessSlice|BidirectionalSlice|Slice)|Generator)?))|Generator(?:Sequence|OfOne)|M(?:irror|utable(?:Ran(?:domAccessSlice|geReplaceable(?:RandomAccessSlice|BidirectionalSlice|Slice))|BidirectionalSlice|Slice)|anagedBufferPointer)|B(?:idirectionalSlice|ool)|S(?:t(?:aticString|ri(?:ng|deT(?:hrough(?:Generator|Iterator)?|o(?:Generator|Iterator)?)))|et(?:I(?:ndex|terator))?|lice)|HalfOpenInterval|C(?:haracter(?:View)?|o(?:ntiguousArray|untable(?:Range|ClosedRange)|llectionOfOne)|OpaquePointer|losed(?:Range(?:I(?:ndex|terator))?|Interval)|VaListPointer)|I(?:n(?:t(?:16|8|32|64)?|d(?:ices|ex(?:ing(?:Generator|Iterator))?))|terator(?:Sequence|OverOne)?)|Zip2(?:Sequence|Iterator)|O(?:paquePointer|bjectIdentifier)|D(?:ictionary(?:I(?:ndex|terator)|Literal)?|ouble|efault(?:RandomAccessIndices|BidirectionalIndices|Indices))|U(?:n(?:safe(?:RawPointer|Mutable(?:RawPointer|BufferPointer|Pointer)|BufferPointer(?:Generator|Iterator)?|Pointer)|icodeScalar(?:View)?|foldSequence|managed)|TF(?:16(?:View)?|8(?:View)?|32)|Int(?:16|8|32|64)?)|Join(?:Generator|ed(?:Sequence|Iterator))|PermutationGenerator|E(?:numerate(?:Generator|Sequence|d(?:Sequence|Iterator))|mpty(?:Generator|Collection|Iterator))|Fl(?:oat(?:80)?|atten(?:Generator|BidirectionalCollection(?:Index)?|Sequence|Collection(?:Index)?|Iterator))|L(?:egacyChildren|azy(?:RandomAccessCollection|Map(?:RandomAccessCollection|Generator|BidirectionalCollection|Sequence|Collection|Iterator)|BidirectionalCollection|Sequence|Collection|Filter(?:Generator|BidirectionalCollection|Sequence|Collection|I(?:ndex|terator))))|A(?:ny(?:RandomAccessCollection|Generator|BidirectionalCollection|Sequence|Hashable|Collection|I(?:ndex|terator))|utoreleasingUnsafeMutablePointer|rray(?:Slice)?))\\b", - "name": "support.type.swift" - }, - { - "comment": "Structs in the standard library in Swift 2 only", - "match": "\\b(?:R(?:everse(?:RandomAccess(?:Collection|Index)|Collection|Index)|awByte)|Map(?:Generator|Sequence|Collection)|S(?:inkOf|etGenerator)|Zip2Generator|DictionaryGenerator|Filter(?:Generator|Sequence|Collection(?:Index)?)|LazyForwardCollection|Any(?:RandomAccessIndex|BidirectionalIndex|Forward(?:Collection|Index)))\\b", - "name": "support.type.swift" - } - ] - }, - "builtin-typealias": { - "patterns": [ - { - "comment": "Typealiases in the standard library in Swift 3", - "match": "\\b(?:Raw(?:Significand|Exponent|Value)|B(?:ooleanLiteralType|uffer|ase)|S(?:t(?:orage|r(?:i(?:ngLiteralType|de)|eam(?:1|2)))|ubSequence)|NativeBuffer|C(?:hild(?:ren)?|Bool|S(?:hort|ignedChar)|odeUnit|Char(?:16|32)?|Int|Double|Unsigned(?:Short|Char|Int|Long(?:Long)?)|Float|WideChar|Long(?:Long)?)|I(?:n(?:t(?:Max|egerLiteralType)|d(?:ices|ex(?:Distance)?))|terator)|Distance|U(?:n(?:icodeScalar(?:Type|Index|View|LiteralType)|foldFirstSequence)|TF(?:16(?:Index|View)|8Index)|IntMax)|E(?:lement(?:s)?|x(?:tendedGraphemeCluster(?:Type|LiteralType)|ponent))|V(?:oid|alue)|Key|Float(?:32|LiteralType|64)|AnyClass)\\b", - "name": "support.type.swift" - }, - { - "comment": "Typealiases in the standard library in Swift 2 only", - "match": "\\b(?:Generator|PlaygroundQuickLook|UWord|Word)\\b", - "name": "support.type.swift" - } - ] + { + "comment": "Enum types in the standard library in Swift 2 only", + "name": "support.type.swift", + "match": "\\b(?:MirrorDisposition|QuickLookObject)\\b" } - } + ] + }, + "builtin-types-builtin-protocol-type": { + "patterns": [ + { + "comment": "Protocols in the standard library in Swift 3", + "name": "support.type.swift", + "match": "\\b(?:Ra(?:n(?:domAccess(?:Collection|Indexable)|geReplaceable(?:Collection|Indexable))|wRepresentable)|M(?:irrorPath|utable(?:Collection|Indexable))|Bi(?:naryFloatingPoint|twiseOperations|directional(?:Collection|Indexable))|S(?:tr(?:ideable|eamable)|igned(?:Number|Integer)|e(?:tAlgebra|quence))|Hashable|C(?:o(?:llection|mparable)|ustom(?:Reflectable|StringConvertible|DebugStringConvertible|PlaygroundQuickLookable|LeafReflectable)|VarArg)|TextOutputStream|I(?:n(?:teger(?:Arithmetic)?|dexable(?:Base)?)|teratorProtocol)|OptionSet|Un(?:signedInteger|icodeCodec)|E(?:quatable|rror|xpressibleBy(?:BooleanLiteral|String(?:Interpolation|Literal)|NilLiteral|IntegerLiteral|DictionaryLiteral|UnicodeScalarLiteral|ExtendedGraphemeClusterLiteral|FloatLiteral|ArrayLiteral))|FloatingPoint|L(?:osslessStringConvertible|azy(?:SequenceProtocol|CollectionProtocol))|A(?:nyObject|bsoluteValuable))\\b" + }, + { + "comment": "Protocols in the standard library in Swift 2 only", + "name": "support.type.swift", + "match": "\\b(?:Ran(?:domAccessIndexType|geReplaceableCollectionType)|GeneratorType|M(?:irror(?:Type|PathType)|utable(?:Sliceable|CollectionType))|B(?:i(?:twiseOperationsType|directionalIndexType)|oolean(?:Type|LiteralConvertible))|S(?:tring(?:InterpolationConvertible|LiteralConvertible)|i(?:nkType|gned(?:NumberType|IntegerType))|e(?:tAlgebraType|quenceType)|liceable)|NilLiteralConvertible|C(?:ollectionType|VarArgType)|Inte(?:rvalType|ger(?:Type|LiteralConvertible|ArithmeticType))|O(?:utputStreamType|ptionSetType)|DictionaryLiteralConvertible|Un(?:signedIntegerType|icode(?:ScalarLiteralConvertible|CodecType))|E(?:rrorType|xten(?:sibleCollectionType|dedGraphemeClusterLiteralConvertible))|F(?:orwardIndexType|loat(?:ingPointType|LiteralConvertible))|A(?:nyCollectionType|rrayLiteralConvertible))\\b" + } + ] + }, + "builtin-types-builtin-struct-type": { + "patterns": [ + { + "comment": "Structs in the standard library in Swift 3", + "name": "support.type.swift", + "match": "\\b(?:R(?:e(?:peat(?:ed)?|versed(?:RandomAccess(?:Collection|Index)|Collection|Index))|an(?:domAccessSlice|ge(?:Replaceable(?:RandomAccessSlice|BidirectionalSlice|Slice)|Generator)?))|Generator(?:Sequence|OfOne)|M(?:irror|utable(?:Ran(?:domAccessSlice|geReplaceable(?:RandomAccessSlice|BidirectionalSlice|Slice))|BidirectionalSlice|Slice)|anagedBufferPointer)|B(?:idirectionalSlice|ool)|S(?:t(?:aticString|ri(?:ng|deT(?:hrough(?:Generator|Iterator)?|o(?:Generator|Iterator)?)))|et(?:I(?:ndex|terator))?|lice)|HalfOpenInterval|C(?:haracter(?:View)?|o(?:ntiguousArray|untable(?:Range|ClosedRange)|llectionOfOne)|OpaquePointer|losed(?:Range(?:I(?:ndex|terator))?|Interval)|VaListPointer)|I(?:n(?:t(?:16|8|32|64)?|d(?:ices|ex(?:ing(?:Generator|Iterator))?))|terator(?:Sequence|OverOne)?)|Zip2(?:Sequence|Iterator)|O(?:paquePointer|bjectIdentifier)|D(?:ictionary(?:I(?:ndex|terator)|Literal)?|ouble|efault(?:RandomAccessIndices|BidirectionalIndices|Indices))|U(?:n(?:safe(?:RawPointer|Mutable(?:RawPointer|BufferPointer|Pointer)|BufferPointer(?:Generator|Iterator)?|Pointer)|icodeScalar(?:View)?|foldSequence|managed)|TF(?:16(?:View)?|8(?:View)?|32)|Int(?:16|8|32|64)?)|Join(?:Generator|ed(?:Sequence|Iterator))|PermutationGenerator|E(?:numerate(?:Generator|Sequence|d(?:Sequence|Iterator))|mpty(?:Generator|Collection|Iterator))|Fl(?:oat(?:80)?|atten(?:Generator|BidirectionalCollection(?:Index)?|Sequence|Collection(?:Index)?|Iterator))|L(?:egacyChildren|azy(?:RandomAccessCollection|Map(?:RandomAccessCollection|Generator|BidirectionalCollection|Sequence|Collection|Iterator)|BidirectionalCollection|Sequence|Collection|Filter(?:Generator|BidirectionalCollection|Sequence|Collection|I(?:ndex|terator))))|A(?:ny(?:RandomAccessCollection|Generator|BidirectionalCollection|Sequence|Hashable|Collection|I(?:ndex|terator))|utoreleasingUnsafeMutablePointer|rray(?:Slice)?))\\b" + }, + { + "comment": "Structs in the standard library in Swift 2 only", + "name": "support.type.swift", + "match": "\\b(?:R(?:everse(?:RandomAccess(?:Collection|Index)|Collection|Index)|awByte)|Map(?:Generator|Sequence|Collection)|S(?:inkOf|etGenerator)|Zip2Generator|DictionaryGenerator|Filter(?:Generator|Sequence|Collection(?:Index)?)|LazyForwardCollection|Any(?:RandomAccessIndex|BidirectionalIndex|Forward(?:Collection|Index)))\\b" + } + ] + }, + "builtin-types-builtin-typealias": { + "patterns": [ + { + "comment": "Typealiases in the standard library in Swift 3", + "name": "support.type.swift", + "match": "\\b(?:Raw(?:Significand|Exponent|Value)|B(?:ooleanLiteralType|uffer|ase)|S(?:t(?:orage|r(?:i(?:ngLiteralType|de)|eam(?:1|2)))|ubSequence)|NativeBuffer|C(?:hild(?:ren)?|Bool|S(?:hort|ignedChar)|odeUnit|Char(?:16|32)?|Int|Double|Unsigned(?:Short|Char|Int|Long(?:Long)?)|Float|WideChar|Long(?:Long)?)|I(?:n(?:t(?:Max|egerLiteralType)|d(?:ices|ex(?:Distance)?))|terator)|Distance|U(?:n(?:icodeScalar(?:Type|Index|View|LiteralType)|foldFirstSequence)|TF(?:16(?:Index|View)|8Index)|IntMax)|E(?:lement(?:s)?|x(?:tendedGraphemeCluster(?:Type|LiteralType)|ponent))|V(?:oid|alue)|Key|Float(?:32|LiteralType|64)|AnyClass)\\b" + }, + { + "comment": "Typealiases in the standard library in Swift 2 only", + "name": "support.type.swift", + "match": "\\b(?:Generator|PlaygroundQuickLook|UWord|Word)\\b" + } + ] }, "code-block": { "begin": "\\{", + "end": "\\}", "beginCaptures": { "0": { "name": "punctuation.section.scope.begin.swift" } }, - "end": "\\}", "endCaptures": { "0": { "name": "punctuation.section.scope.end.swift" @@ -398,136 +396,136 @@ "comments": { "patterns": [ { + "name": "comment.line.number-sign.swift", + "match": "\\A^(#!).*$\\n?", "captures": { "1": { "name": "punctuation.definition.comment.swift" } - }, - "match": "\\A^(#!).*$\\n?", - "name": "comment.line.number-sign.swift" + } }, { - "begin": "/\\*\\*(?!/)", - "beginCaptures": { - "0": { - "name": "punctuation.definition.comment.begin.swift" - } - }, - "end": "\\*/", - "endCaptures": { - "0": { - "name": "punctuation.definition.comment.end.swift" - } - }, "name": "comment.block.documentation.swift", - "patterns": [ - { - "include": "#nested" - } - ] - }, - { - "begin": "/\\*:", + "begin": "/\\*\\*(?!/)", + "end": "\\*/", "beginCaptures": { "0": { "name": "punctuation.definition.comment.begin.swift" } }, - "end": "\\*/", "endCaptures": { "0": { "name": "punctuation.definition.comment.end.swift" } }, + "patterns": [ + { + "include": "#comments-nested" + } + ] + }, + { "name": "comment.block.documentation.playground.swift", - "patterns": [ - { - "include": "#nested" - } - ] - }, - { - "begin": "/\\*", + "begin": "/\\*:", + "end": "\\*/", "beginCaptures": { "0": { "name": "punctuation.definition.comment.begin.swift" } }, - "end": "\\*/", "endCaptures": { "0": { "name": "punctuation.definition.comment.end.swift" } }, - "name": "comment.block.swift", "patterns": [ { - "include": "#nested" + "include": "#comments-nested" } ] }, { - "match": "\\*/", - "name": "invalid.illegal.unexpected-end-of-block-comment.swift" + "name": "comment.block.swift", + "begin": "/\\*", + "end": "\\*/", + "beginCaptures": { + "0": { + "name": "punctuation.definition.comment.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.comment.end.swift" + } + }, + "patterns": [ + { + "include": "#comments-nested" + } + ] + }, + { + "name": "invalid.illegal.unexpected-end-of-block-comment.swift", + "match": "\\*/" }, { "begin": "(^[ \\t]+)?(?=//)", + "end": "(?!\\G)", "beginCaptures": { "1": { "name": "punctuation.whitespace.comment.leading.swift" } }, - "end": "(?!\\G)", "patterns": [ { + "name": "comment.line.triple-slash.documentation.swift", "begin": "///", + "end": "$", "beginCaptures": { "0": { "name": "punctuation.definition.comment.swift" } - }, - "end": "^", - "name": "comment.line.triple-slash.documentation.swift" + } }, { + "name": "comment.line.double-slash.documentation.swift", "begin": "//:", + "end": "$", "beginCaptures": { "0": { "name": "punctuation.definition.comment.swift" } - }, - "end": "^", - "name": "comment.line.double-slash.documentation.swift" + } }, { + "name": "comment.line.double-slash.swift", "begin": "//", + "end": "$", "beginCaptures": { "0": { "name": "punctuation.definition.comment.swift" } - }, - "end": "^", - "name": "comment.line.double-slash.swift" + } } ] } - ], - "repository": { - "nested": { - "begin": "/\\*", - "end": "\\*/", - "patterns": [ - { - "include": "#nested" - } - ] + ] + }, + "comments-nested": { + "begin": "/\\*", + "end": "\\*/", + "patterns": [ + { + "include": "#comments-nested" } - } + ] }, "compiler-control": { "patterns": [ { + "contentName": "comment.block.preprocessor.swift", "begin": "^\\s*(#)(if|elseif)\\s+(false)\\b.*?(?=$|//|/\\*)", + "end": "(?=^\\s*(#(elseif|else|endif)\\b))", "beginCaptures": { "0": { "name": "meta.preprocessor.conditional.swift" @@ -536,37 +534,36 @@ "name": "punctuation.definition.preprocessor.swift" }, "2": { - "name": "keyword.control.preprocessor.conditional.swift" + "name": "keyword.control.import.preprocessor.conditional.swift" }, "3": { "name": "constant.language.boolean.swift" } - }, - "contentName": "comment.block.preprocessor.swift", - "end": "(?=^\\s*(#(elseif|else|endif)\\b))" + } }, { - "begin": "^\\s*(#)(if|elseif)\\s+", + "name": "meta.preprocessor.conditional.swift", "captures": { "1": { "name": "punctuation.definition.preprocessor.swift" }, "2": { - "name": "keyword.control.preprocessor.conditional.swift" + "name": "keyword.control.import.preprocessor.conditional.swift" } }, + "begin": "^\\s*(#)(if|elseif)\\s+", "end": "(?=\\s*(?://|/\\*))|$", - "name": "meta.preprocessor.conditional.swift", "patterns": [ { - "match": "(&&|\\|\\|)", - "name": "keyword.operator.logical.swift" + "name": "keyword.operator.logical.swift", + "match": "(&&|\\|\\|)" }, { - "match": "\\b(true|false)\\b", - "name": "constant.language.boolean.swift" + "name": "constant.language.boolean.swift", + "match": "\\b(true|false)\\b" }, { + "match": "\\b(arch)\\s*(\\()\\s*(?:(arm|arm64|powerpc64|powerpc64le|i386|x86_64|s390x)|\\w+)\\s*(\\))", "captures": { "1": { "name": "keyword.other.condition.swift" @@ -580,10 +577,10 @@ "4": { "name": "punctuation.definition.parameters.end.swift" } - }, - "match": "\\b(arch)\\s*(\\()\\s*(?:(arm|arm64|powerpc64|powerpc64le|i386|x86_64|s390x)|\\w+)\\s*(\\))" + } }, { + "match": "\\b(os)\\s*(\\()\\s*(?:(macOS|OSX|iOS|tvOS|watchOS|Android|Linux|FreeBSD|Windows|PS4)|\\w+)\\s*(\\))", "captures": { "1": { "name": "keyword.other.condition.swift" @@ -597,10 +594,10 @@ "4": { "name": "punctuation.definition.parameters.end.swift" } - }, - "match": "\\b(os)\\s*(\\()\\s*(?:(macOS|OSX|iOS|tvOS|watchOS|Android|Linux|FreeBSD|Windows|PS4)|\\w+)\\s*(\\))" + } }, { + "match": "\\b(canImport)\\s*(\\()([\\p{L}_][\\p{L}_\\p{N}\\p{M}]*)(\\))", "captures": { "1": { "name": "keyword.other.condition.swift" @@ -614,11 +611,11 @@ "4": { "name": "punctuation.definition.parameters.end.swift" } - }, - "match": "\\b(canImport)\\s*(\\()([\\p{L}_][\\p{L}_\\p{N}\\p{M}]*)(\\))" + } }, { "begin": "\\b(targetEnvironment)\\s*(\\()", + "end": "(\\))|$", "beginCaptures": { "1": { "name": "keyword.other.condition.swift" @@ -627,7 +624,6 @@ "name": "punctuation.definition.parameters.begin.swift" } }, - "end": "(\\))|$", "endCaptures": { "1": { "name": "punctuation.definition.parameters.end.swift" @@ -635,13 +631,14 @@ }, "patterns": [ { - "match": "\\b(simulator|UIKitForMac)\\b", - "name": "support.constant.platform.environment.swift" + "name": "support.constant.platform.environment.swift", + "match": "\\b(simulator|UIKitForMac)\\b" } ] }, { "begin": "\\b(swift|compiler)\\s*(\\()", + "end": "(\\))|$", "beginCaptures": { "1": { "name": "keyword.other.condition.swift" @@ -650,7 +647,6 @@ "name": "punctuation.definition.parameters.begin.swift" } }, - "end": "(\\))|$", "endCaptures": { "1": { "name": "punctuation.definition.parameters.end.swift" @@ -658,44 +654,46 @@ }, "patterns": [ { - "match": ">=|<", - "name": "keyword.operator.comparison.swift" + "name": "keyword.operator.comparison.swift", + "match": ">=|<" }, { - "match": "\\b[0-9]+(?:\\.[0-9]+)*\\b", - "name": "constant.numeric.swift" + "name": "constant.numeric.swift", + "match": "\\b[0-9]+(?:\\.[0-9]+)*\\b" } ] } ] }, { + "name": "meta.preprocessor.conditional.swift", + "match": "^\\s*(#)(else|endif)(.*?)(?=$|//|/\\*)", "captures": { "1": { "name": "punctuation.definition.preprocessor.swift" }, "2": { - "name": "keyword.control.preprocessor.conditional.swift" + "name": "keyword.control.import.preprocessor.conditional.swift" }, "3": { "patterns": [ { - "match": "\\S+", - "name": "invalid.illegal.character-not-allowed-here.swift" + "name": "invalid.illegal.character-not-allowed-here.swift", + "match": "\\S+" } ] } - }, - "match": "^\\s*(#)(else|endif)(.*?)(?=$|//|/\\*)", - "name": "meta.preprocessor.conditional.swift" + } }, { + "name": "meta.preprocessor.sourcelocation.swift", + "match": "^\\s*(#)(sourceLocation)((\\()([^)]*)(\\)))(.*?)(?=$|//|/\\*)", "captures": { "1": { "name": "punctuation.definition.preprocessor.swift" }, "2": { - "name": "keyword.control.preprocessor.sourcelocation.swift" + "name": "keyword.control.import.preprocessor.sourcelocation.swift" }, "4": { "name": "punctuation.definition.parameters.begin.swift" @@ -704,6 +702,7 @@ "patterns": [ { "begin": "(file)\\s*(:)\\s*(?=\")", + "end": "(?!\\G)", "beginCaptures": { "1": { "name": "support.variable.parameter.swift" @@ -712,7 +711,6 @@ "name": "punctuation.separator.key-value.swift" } }, - "end": "(?!\\G)", "patterns": [ { "include": "#literals" @@ -720,6 +718,7 @@ ] }, { + "match": "(line)\\s*(:)\\s*([0-9]+)", "captures": { "1": { "name": "support.variable.parameter.swift" @@ -730,16 +729,15 @@ "3": { "name": "constant.numeric.integer.swift" } - }, - "match": "(line)\\s*(:)\\s*([0-9]+)" + } }, { - "match": ",", - "name": "punctuation.separator.parameters.swift" + "name": "punctuation.separator.parameters.swift", + "match": "," }, { - "match": "\\S+", - "name": "invalid.illegal.character-not-allowed-here.swift" + "name": "invalid.illegal.character-not-allowed-here.swift", + "match": "\\S+" } ] }, @@ -749,1545 +747,1766 @@ "7": { "patterns": [ { - "match": "\\S+", - "name": "invalid.illegal.character-not-allowed-here.swift" + "name": "invalid.illegal.character-not-allowed-here.swift", + "match": "\\S+" + } + ] + } + } + } + ] + }, + "conditionals": { + "patterns": [ + { + "begin": "(?&|\\^~.])(->)(?![/=\\-+!*%<>&|\\^~.])" - }, - { - "captures": { - "1": { - "name": "keyword.operator.type.composition.swift" - } - }, - "comment": "Swift 3: A & B", - "match": "(?&|\\^~.])(&)(?![/=\\-+!*%<>&|\\^~.])" - }, - { - "match": "[?!]", - "name": "keyword.operator.type.optional.swift" - }, - { - "match": "\\.\\.\\.", - "name": "keyword.operator.function.variadic-parameter.swift" - }, - { - "comment": "Swift 2: protocol", - "match": "\\bprotocol\\b", + ] + }, + "declarations-available-types": { + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#builtin-types" + }, + { + "include": "#attributes" + }, + { + "name": "storage.modifier.async.swift", + "match": "\\basync\\b" + }, + { + "name": "storage.modifier.exception.swift", + "match": "\\b(?:throws|rethrows)\\b" + }, + { + "name": "keyword.other.operator.type.opaque.swift", + "match": "\\bsome\\b" + }, + { + "name": "keyword.other.operator.type.existential.swift", + "match": "\\bany\\b" + }, + { + "name": "keyword.control.loop.swift", + "match": "\\b(?:repeat|each)\\b" + }, + { + "name": "storage.modifier.swift", + "match": "\\b(?:inout|isolated|borrowing|consuming)\\b" + }, + { + "name": "variable.language.swift", + "match": "\\bSelf\\b" + }, + { + "match": "(?&|\\^~.])(->)(?![/=\\-+!*%<>&|\\^~.])", + "captures": { + "1": { + "name": "keyword.operator.type.function.swift" + } + } + }, + { + "comment": "Swift 3: A & B", + "match": "(?&|\\^~.])(&)(?![/=\\-+!*%<>&|\\^~.])", + "captures": { + "1": { "name": "keyword.operator.type.composition.swift" - }, - { - "match": "(?<=\\.)(?:Protocol|Type)\\b", - "name": "keyword.operator.type.metatype.swift" - }, - { - "include": "#tuple-type" - }, - { - "include": "#collection-type" - }, - { - "include": "#generic-argument-clause" - } - ], - "repository": { - "collection-type": { - "begin": "\\[", - "beginCaptures": { - "0": { - "name": "punctuation.section.collection-type.begin.swift" - } - }, - "comment": "array and dictionary types [Value] and [Key: Value]", - "end": "\\]|(?=[>){}])", - "endCaptures": { - "0": { - "name": "punctuation.section.collection-type.end.swift" - } - }, - "patterns": [ - { - "include": "#available-types" - }, - { - "begin": ":", - "beginCaptures": { - "0": { - "name": "punctuation.separator.key-value.swift" - } - }, - "end": "(?=\\]|[>){}])", - "patterns": [ - { - "match": ":", - "name": "invalid.illegal.extra-colon-in-dictionary-type.swift" - }, - { - "include": "#available-types" - } - ] - } - ] - }, - "tuple-type": { - "begin": "\\(", - "beginCaptures": { - "0": { - "name": "punctuation.section.tuple-type.begin.swift" - } - }, - "end": "\\)|(?=[>\\]{}])", - "endCaptures": { - "0": { - "name": "punctuation.section.tuple-type.end.swift" - } - }, - "patterns": [ - { - "include": "#available-types" - } - ] } } }, - "extension": { - "begin": "\\b(extension)\\s+((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))", - "beginCaptures": { - "1": { - "name": "storage.type.$1.swift" - }, - "2": { - "name": "entity.name.type.swift", - "patterns": [ - { - "include": "#available-types" - } - ] - }, - "3": { - "name": "punctuation.definition.identifier.swift" - }, - "4": { - "name": "punctuation.definition.identifier.swift" - } - }, - "end": "(?<=\\})", - "name": "meta.definition.type.$1.swift", - "patterns": [ - { - "include": "#comments" - }, - { - "comment": "SE-0143: Conditional Conformances", - "include": "#generic-where-clause" - }, - { - "include": "#inheritance-clause" - }, - { - "begin": "\\{", - "beginCaptures": { - "0": { - "name": "punctuation.definition.type.begin.swift" - } - }, - "end": "\\}", - "endCaptures": { - "0": { - "name": "punctuation.definition.type.end.swift" - } - }, - "name": "meta.definition.type.body.swift", - "patterns": [ - { - "include": "$self" - } - ] - } - ] + { + "name": "keyword.operator.type.optional.swift", + "match": "[?!]" }, - "function": { - "begin": "(?x)\n\t\t\t\t\t\t\\b\n\t\t\t\t\t\t(?:(nonisolated)\\s+)?\n\t\t\t\t\t\t(func)\n\t\t\t\t\t\t\\s+\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t(?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k)\n\t\t\t\t\t\t | (?:\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?\t\t\t\t\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t\t[/=\\-+!*%<>&|^~?]\n\t\t\t\t\t\t\t\t\t | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t | [\\x{00AC}\\x{00AE}]\n\t\t\t\t\t\t\t\t\t | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n\t\t\t\t\t\t\t\t\t | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t | [\\x{3001}-\\x{3003}]\n\t\t\t\t\t\t\t\t\t | [\\x{3008}-\\x{3030}]\n\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\\g\n\t\t\t\t\t\t\t\t\t | (?\t\t\t\t\t\t\t\t# operator-character\n\t\t\t\t\t\t\t\t\t\t\t[\\x{0300}-\\x{036F}]\n\t\t\t\t\t\t\t\t\t\t | [\\x{1DC0}-\\x{1DFF}]\n\t\t\t\t\t\t\t\t\t\t | [\\x{20D0}-\\x{20FF}]\n\t\t\t\t\t\t\t\t\t\t | [\\x{FE00}-\\x{FE0F}]\n\t\t\t\t\t\t\t\t\t\t | [\\x{FE20}-\\x{FE2F}]\n\t\t\t\t\t\t\t\t\t\t | [\\x{E0100}-\\x{E01EF}]\n\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t)*\n\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t | ( \\. ( \\g | \\g | \\. )+ )\t\t\t# Dot operators\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t)\n\t\t\t\t\t\t\\s*\n\t\t\t\t\t\t(?=\\(|<)\n\t\t\t\t\t", - "beginCaptures": { - "1": { - "name": "storage.modifier.swift" - }, - "2": { - "name": "storage.type.function.swift" - }, - "3": { - "name": "entity.name.function.swift" - }, - "4": { - "name": "punctuation.definition.identifier.swift" - }, - "5": { - "name": "punctuation.definition.identifier.swift" - } - }, - "end": "(?<=\\})|$(?# functions in protocol declarations or generated interfaces have no body)", - "name": "meta.definition.function.swift", - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#generic-parameter-clause" - }, - { - "include": "#parameter-clause" - }, - { - "include": "#function-result" - }, - { - "include": "#async-throws" - }, - { - "comment": "Swift 3: generic constraints after the parameters and return type", - "include": "#generic-where-clause" - }, - { - "begin": "(\\{)", - "beginCaptures": { - "1": { - "name": "punctuation.section.function.begin.swift" - } - }, - "end": "(\\})", - "endCaptures": { - "1": { - "name": "punctuation.section.function.end.swift" - } - }, - "name": "meta.definition.function.body.swift", - "patterns": [ - { - "include": "$self" - } - ] - } - ] + { + "name": "keyword.operator.function.variadic-parameter.swift", + "match": "\\.\\.\\." }, - "function-initializer": { - "begin": "(?", + "name": "keyword.other.type.composition.swift", + "match": "\\bprotocol\\b" }, - "function-result": { - "begin": "(?&|\\^~.])(->)(?![/=\\-+!*%<>&|\\^~.])\\s*", - "beginCaptures": { - "1": { - "name": "keyword.operator.function-result.swift" - } - }, - "end": "(?!\\G)(?=\\{|\\bwhere\\b|;)|$", - "name": "meta.function-result.swift", - "patterns": [ - { - "include": "#available-types" - } - ] + { + "name": "keyword.other.type.metatype.swift", + "match": "(?<=\\.)(?:Protocol|Type)\\b" }, - "generic-argument-clause": { - "begin": "<", + { + "include": "#declarations-available-types-tuple-type" + }, + { + "include": "#declarations-available-types-collection-type" + }, + { + "include": "#declarations-generic-argument-clause" + } + ] + }, + "declarations-available-types-collection-type": { + "comment": "array and dictionary types [Value] and [Key: Value]", + "begin": "\\[", + "end": "\\]|(?=[>){}])", + "beginCaptures": { + "0": { + "name": "punctuation.section.collection-type.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.section.collection-type.end.swift" + } + }, + "patterns": [ + { + "include": "#declarations-available-types" + }, + { + "begin": ":", + "end": "(?=\\]|[>){}])", "beginCaptures": { "0": { - "name": "punctuation.separator.generic-argument-clause.begin.swift" + "name": "punctuation.separator.key-value.swift" + } + }, + "patterns": [ + { + "name": "invalid.illegal.extra-colon-in-dictionary-type.swift", + "match": ":" + }, + { + "include": "#declarations-available-types" + } + ] + } + ] + }, + "declarations-available-types-tuple-type": { + "begin": "\\(", + "end": "\\)|(?=[>\\]{}])", + "beginCaptures": { + "0": { + "name": "punctuation.section.tuple-type.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.section.tuple-type.end.swift" + } + }, + "patterns": [ + { + "include": "#declarations-available-types" + } + ] + }, + "declarations-extension": { + "name": "meta.definition.type.$1.swift", + "begin": "\\b(extension)\\s+((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "storage.type.$1.swift" + }, + "2": { + "name": "entity.name.type.swift", + "patterns": [ + { + "include": "#declarations-available-types" + } + ] + }, + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "punctuation.definition.identifier.swift" + } + }, + "patterns": [ + { + "include": "#comments" + }, + { + "comment": "SE-0143: Conditional Conformances", + "include": "#declarations-generic-where-clause" + }, + { + "include": "#declarations-inheritance-clause" + }, + { + "name": "meta.definition.type.body.swift", + "begin": "\\{", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.type.begin.swift" } }, - "end": ">|(?=[)\\]{}])", "endCaptures": { "0": { - "name": "punctuation.separator.generic-argument-clause.end.swift" + "name": "punctuation.definition.type.end.swift" } }, - "name": "meta.generic-argument-clause.swift", "patterns": [ { - "include": "#available-types" + "include": "$self" } ] + } + ] + }, + "declarations-function": { + "name": "meta.definition.function.swift", + "begin": "(?x)\n\\b\n(func)\n\\s+\n(\n (?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k)\n | (?:\n (\n (? # operator-head\n [/=\\-+!*%<>&|^~?]\n | [\\x{00A1}-\\x{00A7}]\n | [\\x{00A9}\\x{00AB}]\n | [\\x{00AC}\\x{00AE}]\n | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n | [\\x{2030}-\\x{203E}]\n | [\\x{2041}-\\x{2053}]\n | [\\x{2055}-\\x{205E}]\n | [\\x{2190}-\\x{23FF}]\n | [\\x{2500}-\\x{2775}]\n | [\\x{2794}-\\x{2BFF}]\n | [\\x{2E00}-\\x{2E7F}]\n | [\\x{3001}-\\x{3003}]\n | [\\x{3008}-\\x{3030}]\n )\n (\n \\g\n | (? # operator-character\n [\\x{0300}-\\x{036F}]\n | [\\x{1DC0}-\\x{1DFF}]\n | [\\x{20D0}-\\x{20FF}]\n | [\\x{FE00}-\\x{FE0F}]\n | [\\x{FE20}-\\x{FE2F}]\n | [\\x{E0100}-\\x{E01EF}]\n )\n )*\n )\n | ( \\. ( \\g | \\g | \\. )+ ) # Dot operators\n )\n)\n\\s*\n(?=\\(|<)", + "end": "(?<=\\})|$(?# functions in protocol declarations or generated interfaces have no body)", + "beginCaptures": { + "1": { + "name": "storage.type.function.swift" }, - "generic-parameter-clause": { - "begin": "<", - "beginCaptures": { - "0": { - "name": "punctuation.separator.generic-parameter-clause.begin.swift" - } - }, - "end": ">|(?=[^\\w\\d:<>\\s,=&`])(?# characters besides these are never valid in a generic param list -- even if it's not really a valid clause, we should stop trying to parse it if we see one of them.)", - "endCaptures": { - "0": { - "name": "punctuation.separator.generic-parameter-clause.end.swift" - } - }, - "name": "meta.generic-parameter-clause.swift", - "patterns": [ - { - "include": "#comments" - }, - { - "comment": "Swift 2: constraints inside the generic param list", - "include": "#generic-where-clause" - }, - { - "captures": { - "1": { - "name": "variable.language.generic-parameter.swift" - } - }, - "match": "\\b((?!\\d)\\w[\\w\\d]*)\\b" - }, - { - "match": ",", - "name": "punctuation.separator.generic-parameters.swift" - }, - { - "begin": "(:)\\s*", - "beginCaptures": { - "1": { - "name": "punctuation.separator.generic-parameter-constraint.swift" - } - }, - "end": "(?=[,>]|(?!\\G)\\bwhere\\b)", - "name": "meta.generic-parameter-constraint.swift", - "patterns": [ - { - "begin": "\\G", - "end": "(?=[,>]|(?!\\G)\\bwhere\\b)", - "name": "entity.other.inherited-class.swift", - "patterns": [ - { - "include": "#type-identifier" - } - ] - } - ] - } - ] + "2": { + "name": "entity.name.function.swift" }, - "generic-where-clause": { - "begin": "\\b(where)\\b\\s*", + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "punctuation.definition.identifier.swift" + } + }, + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#declarations-generic-parameter-clause" + }, + { + "include": "#declarations-parameter-clause" + }, + { + "include": "#declarations-function-result" + }, + { + "include": "#async-throws" + }, + { + "comment": "Swift 3: generic constraints after the parameters and return type", + "include": "#declarations-generic-where-clause" + }, + { + "name": "meta.definition.function.body.swift", + "begin": "(\\{)", + "end": "(\\})", "beginCaptures": { "1": { - "name": "keyword.other.generic-constraint-introducer.swift" + "name": "punctuation.section.function.begin.swift" + } + }, + "endCaptures": { + "1": { + "name": "punctuation.section.function.end.swift" } }, - "end": "(?!\\G)$|(?=[>{};\\n]|//|/\\*)", - "name": "meta.generic-where-clause.swift", "patterns": [ { - "include": "#comments" - }, - { - "include": "#requirement-list" + "include": "$self" } - ], - "repository": { - "requirement-list": { - "begin": "\\G|,\\s*", - "end": "(?=[,>{};\\n]|//|/\\*)", - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#constraint" - }, - { - "include": "#available-types" - }, - { - "begin": "(?&|\\^~.])(==)(?![/=\\-+!*%<>&|\\^~.])", - "beginCaptures": { - "1": { - "name": "keyword.operator.generic-constraint.same-type.swift" - } - }, - "end": "(?=\\s*[,>{};\\n]|//|/\\*)", - "name": "meta.generic-where-clause.same-type-requirement.swift", - "patterns": [ - { - "include": "#available-types" - } - ] - }, - { - "begin": "(?&|\\^~.])(:)(?![/=\\-+!*%<>&|\\^~.])", - "beginCaptures": { - "1": { - "name": "keyword.operator.generic-constraint.conforms-to.swift" - } - }, - "end": "(?=\\s*[,>{};\\n]|//|/\\*)", - "name": "meta.generic-where-clause.conformance-requirement.swift", - "patterns": [ - { - "begin": "\\G\\s*", - "contentName": "entity.other.inherited-class.swift", - "end": "(?=\\s*[,>{};\\n]|//|/\\*)", - "patterns": [ - { - "include": "#available-types" - } - ] - } - ] - } - ] + ] + } + ] + }, + "declarations-function-initializer": { + "name": "meta.definition.function.initializer.swift", + "begin": "(?&|\\^~.])(->)(?![/=\\-+!*%<>&|\\^~.])\\s*", + "end": "(?!\\G)(?=\\{|\\bwhere\\b|;|=)|$", + "beginCaptures": { + "1": { + "name": "keyword.operator.function-result.swift" + } + }, + "patterns": [ + { + "include": "#declarations-available-types" + } + ] + }, + "declarations-function-subscript": { + "name": "meta.definition.function.subscript.swift", + "begin": "(?|(?=[)\\]{}])", + "beginCaptures": { + "0": { + "name": "punctuation.separator.generic-argument-clause.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.separator.generic-argument-clause.end.swift" + } + }, + "patterns": [ + { + "include": "#declarations-available-types" + } + ] + }, + "declarations-generic-parameter-clause": { + "name": "meta.generic-parameter-clause.swift", + "begin": "<", + "end": ">|(?=[^\\w\\d:<>\\s,=&`])(?# characters besides these are never valid in a generic param list -- even if it's not really a valid clause, we should stop trying to parse it if we see one of them.)", + "beginCaptures": { + "0": { + "name": "punctuation.separator.generic-parameter-clause.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.separator.generic-parameter-clause.end.swift" + } + }, + "patterns": [ + { + "include": "#comments" + }, + { + "comment": "Swift 2: constraints inside the generic param list", + "include": "#declarations-generic-where-clause" + }, + { + "name": "keyword.control.loop.swift", + "match": "\\beach\\b" + }, + { + "match": "\\b((?!\\d)\\w[\\w\\d]*)\\b", + "captures": { + "1": { + "name": "variable.language.generic-parameter.swift" } } }, - "import": { - "begin": "(?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k)\n\t\t\t\t\t\t\t\t\t", - "name": "entity.name.type.swift" - }, - { - "match": "(?x)\n\t\t\t\t\t\t\t\t\t\t(?<=\\G|\\.)\n\t\t\t\t\t\t\t\t\t\t\\$[0-9]+\n\t\t\t\t\t\t\t\t\t", - "name": "entity.name.type.swift" - }, - { - "captures": { - "1": { - "patterns": [ - { - "match": "\\.", - "name": "invalid.illegal.dot-not-allowed-here.swift" - } - ] - } - }, - "match": "(?x)\n\t\t\t\t\t\t\t\t\t\t(?<=\\G|\\.)\n\t\t\t\t\t\t\t\t\t\t(?:\n\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t(?\t\t\t\t\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t\t\t\t\t[/=\\-+!*%<>&|^~?]\n\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{00AC}\\x{00AE}]\n\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{3001}-\\x{3003}]\n\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{3008}-\\x{3030}]\n\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\\g\n\t\t\t\t\t\t\t\t\t\t\t\t | (?\t\t\t\t\t\t\t\t# operator-character\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t[\\x{0300}-\\x{036F}]\n\t\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{1DC0}-\\x{1DFF}]\n\t\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{20D0}-\\x{20FF}]\n\t\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{FE00}-\\x{FE0F}]\n\t\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{FE20}-\\x{FE2F}]\n\t\t\t\t\t\t\t\t\t\t\t\t\t | [\\x{E0100}-\\x{E01EF}]\n\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t)*\n\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t | ( \\. ( \\g | \\g | \\. )+ )\t\t\t# Dot operators\n\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t(?=\\.|;|$|//|/\\*|\\s)\n\t\t\t\t\t\t\t\t\t", - "name": "entity.name.type.swift" - }, - { - "match": "\\.", - "name": "punctuation.separator.import.swift" - }, - { - "begin": "(?!\\s*(;|$|//|/\\*))", - "end": "(?=\\s*(;|$|//|/\\*))", - "name": "invalid.illegal.character-not-allowed-here.swift" - } - ] - } - ] + { + "name": "punctuation.separator.generic-parameters.swift", + "match": "," }, - "inheritance-clause": { - "begin": "(:)(?=\\s*\\{)|(:)\\s*", + { + "name": "meta.generic-parameter-constraint.swift", + "begin": "(:)\\s*", + "end": "(?=[,>]|(?!\\G)\\bwhere\\b)", "beginCaptures": { "1": { - "name": "invalid.illegal.empty-inheritance-clause.swift" - }, - "2": { - "name": "punctuation.separator.inheritance-clause.swift" + "name": "punctuation.separator.generic-parameter-constraint.swift" } }, - "end": "(?!\\G)$|(?=[={}]|(?!\\G)\\bwhere\\b)", - "name": "meta.inheritance-clause.swift", "patterns": [ { - "begin": "\\bclass\\b", - "beginCaptures": { - "0": { - "name": "storage.type.class.swift" - } - }, - "end": "(?=[={}]|(?!\\G)\\bwhere\\b)", - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#more-types" - } - ] - }, - { - "begin": "\\G", - "end": "(?!\\G)$|(?=[={}]|(?!\\G)\\bwhere\\b)", - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#inherited-type" - }, - { - "include": "#more-types" - } - ] - } - ], - "repository": { - "inherited-type": { - "begin": "(?=[`\\p{L}_])", - "end": "(?!\\G)", "name": "entity.other.inherited-class.swift", + "begin": "\\G", + "end": "(?=[,>]|(?!\\G)\\bwhere\\b)", "patterns": [ { - "include": "#type-identifier" - } - ] - }, - "more-types": { - "begin": ",\\s*", - "end": "(?!\\G)(?!//|/\\*)|(?=[,={}]|(?!\\G)\\bwhere\\b)", - "name": "meta.inheritance-list.more-types", - "patterns": [ - { - "include": "#comments" + "include": "#declarations-type-identifier" }, { - "include": "#inherited-type" - }, - { - "include": "#more-types" + "include": "#declarations-type-operators" } ] } - } + ] + } + ] + }, + "declarations-generic-where-clause": { + "name": "meta.generic-where-clause.swift", + "begin": "\\b(where)\\b\\s*", + "end": "(?!\\G)$|(?=[>{};\\n]|//|/\\*)", + "beginCaptures": { + "1": { + "name": "keyword.other.generic-constraint-introducer.swift" + } + }, + "patterns": [ + { + "include": "#comments" }, - "operator": { - "begin": "(?x)\n\t\t\t\t\t\t(?:\n\t\t\t\t\t\t\t\\b(prefix|infix|postfix)\n\t\t\t\t\t\t\t\\s+\n\t\t\t\t\t\t)?\n\t\t\t\t\t\t\\b\n\t\t\t\t\t\t(operator)\n\t\t\t\t\t\t\\s+\n\t\t\t\t\t\t(\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t(?\t\t\t\t\t\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t[/=\\-+!*%<>&|^~?]\n\t\t\t\t\t\t\t\t | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t | [\\x{00AC}\\x{00AE}]\n\t\t\t\t\t\t\t\t | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n\t\t\t\t\t\t\t\t | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t | [\\x{3001}-\\x{3003}]\n\t\t\t\t\t\t\t\t | [\\x{3008}-\\x{3030}]\n\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\\g\n\t\t\t\t\t\t\t\t | \\.\t\t\t\t\t\t\t\t\t# Invalid dot\n\t\t\t\t\t\t\t\t | (?\t\t\t\t\t\t\t\t# operator-character\n\t\t\t\t\t\t\t\t\t\t[\\x{0300}-\\x{036F}]\n\t\t\t\t\t\t\t\t\t | [\\x{1DC0}-\\x{1DFF}]\n\t\t\t\t\t\t\t\t\t | [\\x{20D0}-\\x{20FF}]\n\t\t\t\t\t\t\t\t\t | [\\x{FE00}-\\x{FE0F}]\n\t\t\t\t\t\t\t\t\t | [\\x{FE20}-\\x{FE2F}]\n\t\t\t\t\t\t\t\t\t | [\\x{E0100}-\\x{E01EF}]\n\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t)*+\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t | ( \\. ( \\g | \\g | \\. )++ )\t\t\t# Dot operators\n\t\t\t\t\t\t)\n\t\t\t\t\t\t\\s*\n\t\t\t\t\t", + { + "include": "#declarations-generic-where-clause-requirement-list" + } + ] + }, + "declarations-generic-where-clause-requirement-list": { + "begin": "\\G|,\\s*", + "end": "(?=[,>{};\\n]|//|/\\*)", + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#constraint" + }, + { + "include": "#declarations-available-types" + }, + { + "name": "meta.generic-where-clause.same-type-requirement.swift", + "begin": "(?&|\\^~.])(==)(?![/=\\-+!*%<>&|\\^~.])", + "end": "(?=\\s*[,>{};\\n]|//|/\\*)", "beginCaptures": { + "1": { + "name": "keyword.operator.generic-constraint.same-type.swift" + } + }, + "patterns": [ + { + "include": "#declarations-available-types" + } + ] + }, + { + "name": "meta.generic-where-clause.conformance-requirement.swift", + "begin": "(?&|\\^~.])(:)(?![/=\\-+!*%<>&|\\^~.])", + "end": "(?=\\s*[,>{};\\n]|//|/\\*)", + "beginCaptures": { + "1": { + "name": "keyword.operator.generic-constraint.conforms-to.swift" + } + }, + "patterns": [ + { + "contentName": "entity.other.inherited-class.swift", + "begin": "\\G\\s*", + "end": "(?=\\s*[,>{};\\n]|//|/\\*)", + "patterns": [ + { + "include": "#declarations-available-types" + } + ] + } + ] + } + ] + }, + "declarations-import": { + "name": "meta.import.swift", + "begin": "(?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k)", + "captures": { + "1": { + "name": "punctuation.definition.identifier.swift" + }, + "2": { + "name": "punctuation.definition.identifier.swift" + } + } + }, + { + "name": "entity.name.type.swift", + "match": "(?x)\n(?<=\\G|\\.)\n\\$[0-9]+" + }, + { + "name": "entity.name.type.swift", + "match": "(?x)\n(?<=\\G|\\.)\n(?:\n (\n (? # operator-head\n [/=\\-+!*%<>&|^~?]\n | [\\x{00A1}-\\x{00A7}]\n | [\\x{00A9}\\x{00AB}]\n | [\\x{00AC}\\x{00AE}]\n | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n | [\\x{2030}-\\x{203E}]\n | [\\x{2041}-\\x{2053}]\n | [\\x{2055}-\\x{205E}]\n | [\\x{2190}-\\x{23FF}]\n | [\\x{2500}-\\x{2775}]\n | [\\x{2794}-\\x{2BFF}]\n | [\\x{2E00}-\\x{2E7F}]\n | [\\x{3001}-\\x{3003}]\n | [\\x{3008}-\\x{3030}]\n )\n (\n \\g\n | (? # operator-character\n [\\x{0300}-\\x{036F}]\n | [\\x{1DC0}-\\x{1DFF}]\n | [\\x{20D0}-\\x{20FF}]\n | [\\x{FE00}-\\x{FE0F}]\n | [\\x{FE20}-\\x{FE2F}]\n | [\\x{E0100}-\\x{E01EF}]\n )\n )*\n )\n | ( \\. ( \\g | \\g | \\. )+ ) # Dot operators\n)\n(?=\\.|;|$|//|/\\*|\\s)", + "captures": { + "1": { + "patterns": [ + { + "name": "invalid.illegal.dot-not-allowed-here.swift", + "match": "\\." + } + ] + } + } + }, + { + "name": "punctuation.separator.import.swift", + "match": "\\." + }, + { + "name": "invalid.illegal.character-not-allowed-here.swift", + "begin": "(?!\\s*(;|$|//|/\\*))", + "end": "(?=\\s*(;|$|//|/\\*))" + } + ] + } + ] + }, + "declarations-inheritance-clause": { + "name": "meta.inheritance-clause.swift", + "begin": "(:)(?=\\s*\\{)|(:)\\s*", + "end": "(?!\\G)$|(?=[={}]|(?!\\G)\\bwhere\\b)", + "beginCaptures": { + "1": { + "name": "invalid.illegal.empty-inheritance-clause.swift" + }, + "2": { + "name": "punctuation.separator.inheritance-clause.swift" + } + }, + "patterns": [ + { + "begin": "\\bclass\\b", + "end": "(?=[={}]|(?!\\G)\\bwhere\\b)", + "beginCaptures": { + "0": { + "name": "storage.type.class.swift" + } + }, + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#declarations-inheritance-clause-more-types" + } + ] + }, + { + "begin": "\\G", + "end": "(?!\\G)$|(?=[={}]|(?!\\G)\\bwhere\\b)", + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#declarations-inheritance-clause-inherited-type" + }, + { + "include": "#declarations-inheritance-clause-more-types" + }, + { + "include": "#declarations-type-operators" + } + ] + } + ] + }, + "declarations-inheritance-clause-inherited-type": { + "name": "entity.other.inherited-class.swift", + "begin": "(?=[`\\p{L}_])", + "end": "(?!\\G)", + "patterns": [ + { + "include": "#declarations-type-identifier" + } + ] + }, + "declarations-inheritance-clause-more-types": { + "name": "meta.inheritance-list.more-types", + "begin": ",\\s*", + "end": "(?!\\G)(?!//|/\\*)|(?=[,={}]|(?!\\G)\\bwhere\\b)", + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#declarations-inheritance-clause-inherited-type" + }, + { + "include": "#declarations-inheritance-clause-more-types" + }, + { + "include": "#declarations-type-operators" + } + ] + }, + "declarations-macro": { + "name": "meta.definition.macro.swift", + "begin": "(?x)\n\\b\n(macro)\n\\s+\n((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\n\\s*\n(?=\\(|<|=)", + "end": "$|(?=;|//|/\\*|\\}|=)", + "beginCaptures": { + "1": { + "name": "storage.type.function.swift" + }, + "2": { + "name": "entity.name.function.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "punctuation.definition.identifier.swift" + } + }, + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#declarations-generic-parameter-clause" + }, + { + "include": "#declarations-parameter-clause" + }, + { + "include": "#declarations-function-result" + }, + { + "include": "#async-throws" + }, + { + "comment": "Swift 3: generic constraints after the parameters and return type", + "include": "#declarations-generic-where-clause" + } + ] + }, + "declarations-operator": { + "name": "meta.definition.operator.swift", + "begin": "(?x)\n(?:\n \\b(prefix|infix|postfix)\n \\s+\n)?\n\\b\n(operator)\n\\s+\n(\n (\n (? # operator-head\n [/=\\-+!*%<>&|^~?]\n | [\\x{00A1}-\\x{00A7}]\n | [\\x{00A9}\\x{00AB}]\n | [\\x{00AC}\\x{00AE}]\n | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n | [\\x{2030}-\\x{203E}]\n | [\\x{2041}-\\x{2053}]\n | [\\x{2055}-\\x{205E}]\n | [\\x{2190}-\\x{23FF}]\n | [\\x{2500}-\\x{2775}]\n | [\\x{2794}-\\x{2BFF}]\n | [\\x{2E00}-\\x{2E7F}]\n | [\\x{3001}-\\x{3003}]\n | [\\x{3008}-\\x{3030}]\n )\n (\n \\g\n | \\. # Invalid dot\n | (? # operator-character\n [\\x{0300}-\\x{036F}]\n | [\\x{1DC0}-\\x{1DFF}]\n | [\\x{20D0}-\\x{20FF}]\n | [\\x{FE00}-\\x{FE0F}]\n | [\\x{FE20}-\\x{FE2F}]\n | [\\x{E0100}-\\x{E01EF}]\n )\n )*+\n )\n | ( \\. ( \\g | \\g | \\. )++ ) # Dot operators\n)\n\\s*", + "end": "(;)|$\\n?|(?=//|/\\*)", + "beginCaptures": { + "1": { + "name": "storage.modifier.swift" + }, + "2": { + "name": "storage.type.function.operator.swift" + }, + "3": { + "name": "entity.name.function.operator.swift" + }, + "4": { + "comment": "workaround for https://github.com/microsoft/vscode-textmate/issues/140#issuecomment-1793610346", + "name": "entity.name.function.operator.swift", + "patterns": [ + { + "name": "invalid.illegal.dot-not-allowed-here.swift", + "match": "\\." + } + ] + } + }, + "endCaptures": { + "1": { + "name": "punctuation.terminator.statement.swift" + } + }, + "patterns": [ + { + "include": "#declarations-operator-swift2" + }, + { + "include": "#declarations-operator-swift3" + }, + { + "name": "invalid.illegal.character-not-allowed-here.swift", + "match": "((?!$|;|//|/\\*)\\S)+" + } + ] + }, + "declarations-operator-swift2": { + "begin": "\\G(\\{)", + "end": "(\\})", + "beginCaptures": { + "1": { + "name": "punctuation.definition.operator.begin.swift" + } + }, + "endCaptures": { + "1": { + "name": "punctuation.definition.operator.end.swift" + } + }, + "patterns": [ + { + "include": "#comments" + }, + { + "match": "\\b(associativity)\\s+(left|right)\\b", + "captures": { "1": { "name": "storage.modifier.swift" }, "2": { - "name": "storage.type.function.operator.swift" - }, - "3": { - "name": "entity.name.function.operator.swift" - }, - "4": { - "patterns": [ - { - "match": "\\.", - "name": "invalid.illegal.dot-not-allowed-here.swift" - } - ] - } - }, - "end": "(;)|$\\n?|(?=//|/\\*)", - "endCaptures": { - "1": { - "name": "punctuation.terminator.statement.swift" - } - }, - "name": "meta.definition.operator.swift", - "patterns": [ - { - "include": "#swift2" - }, - { - "include": "#swift3" - }, - { - "match": "((?!$|;|//|/\\*)\\S)+", - "name": "invalid.illegal.character-not-allowed-here.swift" - } - ], - "repository": { - "swift2": { - "begin": "\\G(\\{)", - "beginCaptures": { - "1": { - "name": "punctuation.definition.operator.begin.swift" - } - }, - "end": "(\\})", - "endCaptures": { - "1": { - "name": "punctuation.definition.operator.end.swift" - } - }, - "patterns": [ - { - "include": "#comments" - }, - { - "captures": { - "1": { - "name": "storage.modifier.swift" - }, - "2": { - "name": "keyword.other.operator.associativity.swift" - } - }, - "match": "\\b(associativity)\\s+(left|right)\\b" - }, - { - "captures": { - "1": { - "name": "storage.modifier.swift" - }, - "2": { - "name": "constant.numeric.integer.swift" - } - }, - "match": "\\b(precedence)\\s+([0-9]+)\\b" - }, - { - "captures": { - "1": { - "name": "storage.modifier.swift" - } - }, - "match": "\\b(assignment)\\b" - } - ] - }, - "swift3": { - "captures": { - "2": { - "name": "entity.other.inherited-class.swift", - "patterns": [ - { - "include": "#types-precedencegroup" - } - ] - }, - "3": { - "name": "punctuation.definition.identifier.swift" - }, - "4": { - "name": "punctuation.definition.identifier.swift" - } - }, - "match": "\\G(:)\\s*((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))" + "name": "keyword.other.operator.associativity.swift" } } }, - "parameter-clause": { - "begin": "(\\()", - "beginCaptures": { + { + "match": "\\b(precedence)\\s+([0-9]+)\\b", + "captures": { "1": { - "name": "punctuation.definition.parameters.begin.swift" - } - }, - "end": "(\\))(?:\\s*(async)\\b)?", - "endCaptures": { - "1": { - "name": "punctuation.definition.parameters.end.swift" + "name": "storage.modifier.swift" }, "2": { - "name": "keyword.control.async.swift" - } - }, - "name": "meta.parameter-clause.swift", - "patterns": [ - { - "include": "#parameter-list" - } - ] - }, - "parameter-list": { - "patterns": [ - { - "captures": { - "1": { - "name": "entity.name.function.swift" - }, - "2": { - "name": "punctuation.definition.identifier.swift" - }, - "3": { - "name": "punctuation.definition.identifier.swift" - }, - "4": { - "name": "variable.parameter.function.swift" - }, - "5": { - "name": "punctuation.definition.identifier.swift" - }, - "6": { - "name": "punctuation.definition.identifier.swift" - } - }, - "comment": "External parameter labels are considered part of the function name", - "match": "((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s+((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))(?=\\s*:)" - }, - { - "captures": { - "1": { - "name": "variable.parameter.function.swift" - }, - "2": { - "name": "entity.name.function.swift" - }, - "3": { - "name": "punctuation.definition.identifier.swift" - }, - "4": { - "name": "punctuation.definition.identifier.swift" - } - }, - "comment": "If no external label is given, the name is both the external label and the internal variable name", - "match": "(((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k)))(?=\\s*:)" - }, - { - "begin": ":\\s*(?!\\s)", - "end": "(?=[,)])", - "patterns": [ - { - "include": "#available-types" - }, - { - "match": ":", - "name": "invalid.illegal.extra-colon-in-parameter-list.swift" - }, - { - "begin": "=", - "beginCaptures": { - "0": { - "name": "keyword.operator.assignment.swift" - } - }, - "comment": "a parameter's default value", - "end": "(?=[,)])", - "patterns": [ - { - "include": "#expressions" - } - ] - } - ] - } - ] - }, - "precedencegroup": { - "begin": "\\b(precedencegroup)\\s+((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s*(?=\\{)", - "beginCaptures": { - "1": { - "name": "storage.type.precedencegroup.swift" - }, - "2": { - "name": "entity.name.type.precedencegroup.swift" - }, - "3": { - "name": "punctuation.definition.identifier.swift" - }, - "4": { - "name": "punctuation.definition.identifier.swift" - } - }, - "end": "(?!\\G)", - "name": "meta.definition.precedencegroup.swift", - "patterns": [ - { - "begin": "\\{", - "beginCaptures": { - "0": { - "name": "punctuation.definition.precedencegroup.begin.swift" - } - }, - "end": "\\}", - "endCaptures": { - "0": { - "name": "punctuation.definition.precedencegroup.end.swift" - } - }, - "patterns": [ - { - "include": "#comments" - }, - { - "captures": { - "1": { - "name": "storage.modifier.swift" - }, - "2": { - "name": "entity.other.inherited-class.swift", - "patterns": [ - { - "include": "#types-precedencegroup" - } - ] - }, - "3": { - "name": "punctuation.definition.identifier.swift" - }, - "4": { - "name": "punctuation.definition.identifier.swift" - } - }, - "match": "\\b(higherThan|lowerThan)\\s*:\\s*((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))" - }, - { - "captures": { - "1": { - "name": "storage.modifier.swift" - }, - "2": { - "name": "keyword.other.operator.associativity.swift" - } - }, - "match": "\\b(associativity)\\b(?:\\s*:\\s*(right|left|none)\\b)?" - }, - { - "captures": { - "1": { - "name": "storage.modifier.swift" - }, - "2": { - "name": "constant.language.boolean.swift" - } - }, - "match": "\\b(assignment)\\b(?:\\s*:\\s*(true|false)\\b)?" - } - ] - } - ] - }, - "protocol": { - "begin": "\\b(protocol)\\s+((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))", - "beginCaptures": { - "1": { - "name": "storage.type.$1.swift" - }, - "2": { - "name": "entity.name.type.$1.swift" - }, - "3": { - "name": "punctuation.definition.identifier.swift" - }, - "4": { - "name": "punctuation.definition.identifier.swift" - } - }, - "end": "(?<=\\})", - "name": "meta.definition.type.protocol.swift", - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#inheritance-clause" - }, - { - "comment": "SE-0142: Permit where clauses to constrain associated types", - "include": "#generic-where-clause" - }, - { - "begin": "\\{", - "beginCaptures": { - "0": { - "name": "punctuation.definition.type.begin.swift" - } - }, - "end": "\\}", - "endCaptures": { - "0": { - "name": "punctuation.definition.type.end.swift" - } - }, - "name": "meta.definition.type.body.swift", - "patterns": [ - { - "include": "#protocol-method" - }, - { - "include": "#protocol-initializer" - }, - { - "include": "#associated-type" - }, - { - "include": "$self" - } - ] - } - ], - "repository": { - "associated-type": { - "begin": "\\b(associatedtype)\\s+((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s*", - "beginCaptures": { - "1": { - "name": "keyword.other.declaration-specifier.swift" - }, - "2": { - "name": "variable.language.associatedtype.swift" - }, - "3": { - "name": "punctuation.definition.identifier.swift" - }, - "4": { - "name": "punctuation.definition.identifier.swift" - } - }, - "end": "(?!\\G)$|(?=[;}]|$)", - "name": "meta.definition.associatedtype.swift", - "patterns": [ - { - "include": "#inheritance-clause" - }, - { - "comment": "SE-0142: Permit where clauses to constrain associated types", - "include": "#generic-where-clause" - }, - { - "include": "#typealias-assignment" - } - ] - }, - "protocol-initializer": { - "begin": "(?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k)\n\t\t \t\t\t\t\t\t | (?:\n\t\t \t\t\t\t\t\t\t\t(\n\t\t \t\t\t\t\t\t\t\t\t(?\t\t\t\t\t\t\t\t# operator-head\n\t\t \t\t\t\t\t\t\t\t\t\t[/=\\-+!*%<>&|^~?]\n\t\t \t\t\t\t\t\t\t\t\t | [\\x{00A1}-\\x{00A7}]\n\t\t \t\t\t\t\t\t\t\t\t | [\\x{00A9}\\x{00AB}]\n\t\t \t\t\t\t\t\t\t\t\t | [\\x{00AC}\\x{00AE}]\n\t\t \t\t\t\t\t\t\t\t\t | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n\t\t \t\t\t\t\t\t\t\t\t | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t \t\t\t\t\t\t\t\t\t | [\\x{2030}-\\x{203E}]\n\t\t \t\t\t\t\t\t\t\t\t | [\\x{2041}-\\x{2053}]\n\t\t \t\t\t\t\t\t\t\t\t | [\\x{2055}-\\x{205E}]\n\t\t \t\t\t\t\t\t\t\t\t | [\\x{2190}-\\x{23FF}]\n\t\t \t\t\t\t\t\t\t\t\t | [\\x{2500}-\\x{2775}]\n\t\t \t\t\t\t\t\t\t\t\t | [\\x{2794}-\\x{2BFF}]\n\t\t \t\t\t\t\t\t\t\t\t | [\\x{2E00}-\\x{2E7F}]\n\t\t \t\t\t\t\t\t\t\t\t | [\\x{3001}-\\x{3003}]\n\t\t \t\t\t\t\t\t\t\t\t | [\\x{3008}-\\x{3030}]\n\t\t \t\t\t\t\t\t\t\t\t)\n\t\t \t\t\t\t\t\t\t\t\t(\n\t\t \t\t\t\t\t\t\t\t\t\t\\g\n\t\t \t\t\t\t\t\t\t\t\t | (?\t\t\t\t\t\t\t\t# operator-character\n\t\t \t\t\t\t\t\t\t\t\t\t\t[\\x{0300}-\\x{036F}]\n\t\t \t\t\t\t\t\t\t\t\t\t | [\\x{1DC0}-\\x{1DFF}]\n\t\t \t\t\t\t\t\t\t\t\t\t | [\\x{20D0}-\\x{20FF}]\n\t\t \t\t\t\t\t\t\t\t\t\t | [\\x{FE00}-\\x{FE0F}]\n\t\t \t\t\t\t\t\t\t\t\t\t | [\\x{FE20}-\\x{FE2F}]\n\t\t \t\t\t\t\t\t\t\t\t\t | [\\x{E0100}-\\x{E01EF}]\n\t\t \t\t\t\t\t\t\t\t\t\t)\n\t\t \t\t\t\t\t\t\t\t\t)*\n\t\t \t\t\t\t\t\t\t\t)\n\t\t \t\t\t\t\t\t\t | ( \\. ( \\g | \\g | \\. )+ )\t\t\t# Dot operators\n\t\t \t\t\t\t\t\t\t)\n\t\t \t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\\s*\n\t\t\t\t\t\t\t\t(?=\\(|<)\n\t\t\t\t\t\t\t", - "beginCaptures": { - "1": { - "name": "storage.type.function.swift" - }, - "2": { - "name": "entity.name.function.swift" - }, - "3": { - "name": "punctuation.definition.identifier.swift" - }, - "4": { - "name": "punctuation.definition.identifier.swift" - } - }, - "end": "$|(?=;|//|/\\*|\\})", - "name": "meta.definition.function.swift", - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#generic-parameter-clause" - }, - { - "include": "#parameter-clause" - }, - { - "include": "#function-result" - }, - { - "include": "#async-throws" - }, - { - "comment": "Swift 3: generic constraints after the parameters and return type", - "include": "#generic-where-clause" - }, - { - "begin": "\\{", - "beginCaptures": { - "0": { - "name": "punctuation.section.function.begin.swift" - } - }, - "end": "\\}", - "endCaptures": { - "0": { - "name": "punctuation.section.function.end.swift" - } - }, - "name": "invalid.illegal.function-body-not-allowed-in-protocol.swift", - "patterns": [ - { - "include": "$self" - } - ] - } - ] + "name": "constant.numeric.integer.swift" } } }, - "type": { - "patterns": [ - { - "begin": "\\b(class(?!\\s+(?:func|var|let)\\b)|struct|actor)\\s+((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))", - "beginCaptures": { - "1": { - "name": "storage.type.$1.swift" - }, - "2": { - "name": "entity.name.type.$1.swift" - }, - "3": { - "name": "punctuation.definition.identifier.swift" - }, - "4": { - "name": "punctuation.definition.identifier.swift" - } - }, - "end": "(?<=\\})", - "name": "meta.definition.type.$1.swift", - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#generic-parameter-clause" - }, - { - "comment": "Swift 3: generic constraints after the generic param list", - "include": "#generic-where-clause" - }, - { - "include": "#inheritance-clause" - }, - { - "begin": "\\{", - "beginCaptures": { - "0": { - "name": "punctuation.definition.type.begin.swift" - } - }, - "end": "\\}", - "endCaptures": { - "0": { - "name": "punctuation.definition.type.end.swift" - } - }, - "name": "meta.definition.type.body.swift", - "patterns": [ - { - "include": "$self" - } - ] - } - ] - }, - { - "include": "#type-enum" - } - ] - }, - "type-enum": { - "begin": "\\b(enum)\\s+((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))", - "beginCaptures": { + { + "match": "\\b(assignment)\\b", + "captures": { "1": { - "name": "storage.type.$1.swift" - }, - "2": { - "name": "entity.name.type.$1.swift" - }, - "3": { - "name": "punctuation.definition.identifier.swift" - }, - "4": { - "name": "punctuation.definition.identifier.swift" - } - }, - "end": "(?<=\\})", - "name": "meta.definition.type.$1.swift", - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#generic-parameter-clause" - }, - { - "comment": "Swift 3: generic constraints after the generic param list", - "include": "#generic-where-clause" - }, - { - "include": "#inheritance-clause" - }, - { - "begin": "\\{", - "beginCaptures": { - "0": { - "name": "punctuation.definition.type.begin.swift" - } - }, - "end": "\\}", - "endCaptures": { - "0": { - "name": "punctuation.definition.type.end.swift" - } - }, - "name": "meta.definition.type.body.swift", - "patterns": [ - { - "include": "#enum-case-clause" - }, - { - "include": "$self" - } - ] - } - ], - "repository": { - "associated-values": { - "begin": "\\G\\(", - "beginCaptures": { - "0": { - "name": "punctuation.definition.parameters.begin.swift" - } - }, - "end": "\\)", - "endCaptures": { - "0": { - "name": "punctuation.definition.parameters.end.swift" - } - }, - "patterns": [ - { - "include": "#comments" - }, - { - "begin": "(?x)\n\t\t\t\t\t\t\t\t\t\t(?:(_)|((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*\\k))\n\t\t\t\t\t\t\t\t\t\t\\s+\n\t\t\t\t\t\t\t\t\t\t(((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*\\k))\n\t\t\t\t\t\t\t\t\t\t\\s*(:)", - "beginCaptures": { - "1": { - "name": "entity.name.function.swift" - }, - "2": { - "name": "invalid.illegal.distinct-labels-not-allowed.swift" - }, - "5": { - "name": "variable.parameter.function.swift" - }, - "7": { - "name": "punctuation.separator.argument-label.swift" - } - }, - "end": "(?=[,)\\]])", - "patterns": [ - { - "include": "#available-types" - } - ] - }, - { - "begin": "(((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*\\k))\\s*(:)", - "beginCaptures": { - "1": { - "name": "entity.name.function.swift" - }, - "2": { - "name": "variable.parameter.function.swift" - }, - "4": { - "name": "punctuation.separator.argument-label.swift" - } - }, - "end": "(?=[,)\\]])", - "patterns": [ - { - "include": "#available-types" - } - ] - }, - { - "begin": "(?![,)\\]])(?=\\S)", - "comment": "an element without a label (i.e. anything else)", - "end": "(?=[,)\\]])", - "patterns": [ - { - "include": "#available-types" - }, - { - "match": ":", - "name": "invalid.illegal.extra-colon-in-parameter-list.swift" - } - ] - } - ] - }, - "enum-case": { - "begin": "(?x)((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s*", - "beginCaptures": { - "1": { - "name": "constant.other.swift" - } - }, - "end": "(?<=\\))|(?![=(])", - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#associated-values" - }, - { - "include": "#raw-value-assignment" - } - ] - }, - "enum-case-clause": { - "begin": "\\b(case)\\b\\s*", - "beginCaptures": { - "1": { - "name": "storage.type.enum.case.swift" - } - }, - "end": "(?=[;}])|(?!\\G)(?!//|/\\*)(?=[^\\s,])", - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#enum-case" - }, - { - "include": "#more-cases" - } - ] - }, - "more-cases": { - "begin": ",\\s*", - "end": "(?!\\G)(?!//|/\\*)(?=[;}]|[^\\s,])", - "name": "meta.enum-case.more-cases", - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#enum-case" - }, - { - "include": "#more-cases" - } - ] - }, - "raw-value-assignment": { - "begin": "(=)\\s*", - "beginCaptures": { - "1": { - "name": "keyword.operator.assignment.swift" - } - }, - "end": "(?!\\G)", - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#literals" - } - ] + "name": "storage.modifier.swift" } } - }, - "type-identifier": { - "begin": "((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s*", - "beginCaptures": { - "1": { - "name": "meta.type-name.swift", - "patterns": [ - { - "include": "#builtin-types" - } - ] - }, - "2": { - "name": "punctuation.definition.identifier.swift" - }, - "3": { - "name": "punctuation.definition.identifier.swift" - } - }, - "end": "(?!<)", + } + ] + }, + "declarations-operator-swift3": { + "match": "\\G(:)\\s*((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))", + "captures": { + "2": { + "name": "entity.other.inherited-class.swift", "patterns": [ { - "begin": "(?=<)", - "end": "(?!\\G)", - "patterns": [ - { - "include": "#generic-argument-clause" - } - ] + "include": "#declarations-types-precedencegroup" } ] }, - "typealias": { - "begin": "\\b(typealias)\\s+((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s*", - "beginCaptures": { - "1": { - "name": "keyword.other.declaration-specifier.swift" - }, - "2": { - "name": "entity.name.type.typealias.swift" - }, - "3": { - "name": "punctuation.definition.identifier.swift" - }, - "4": { - "name": "punctuation.definition.identifier.swift" - } - }, - "end": "(?!\\G)$|(?=;|//|/\\*|$)", - "name": "meta.definition.typealias.swift", - "patterns": [ - { - "begin": "\\G(?=<)", - "end": "(?!\\G)", - "patterns": [ - { - "include": "#generic-parameter-clause" - } - ] - }, - { - "include": "#typealias-assignment" - } - ] + "3": { + "name": "punctuation.definition.identifier.swift" }, - "typealias-assignment": { - "begin": "(=)\\s*", - "beginCaptures": { - "1": { - "name": "keyword.operator.assignment.swift" - } - }, - "end": "(?!\\G)$|(?=;|//|/\\*|$)", - "patterns": [ - { - "include": "#available-types" - } - ] - }, - "typed-variable-declaration": { - "begin": "(?x)\n\t\t\t\t\t\t\\b(?:(async)\\s+)?(let|var)\\b\\s+\n\t\t\t\t\t\t(?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k)\\s*\n\t\t\t\t\t\t:\n\t\t\t\t\t", - "beginCaptures": { - "1": { - "name": "keyword.control.async.swift" - }, - "2": { - "name": "keyword.other.declaration-specifier.swift" - } - }, - "end": "(?=$|[={])", - "patterns": [ - { - "include": "#available-types" - } - ] - }, - "types-precedencegroup": { - "patterns": [ - { - "comment": "Precedence groups in the standard library", - "match": "\\b(?:BitwiseShift|Assignment|RangeFormation|Casting|Addition|NilCoalescing|Comparison|LogicalConjunction|LogicalDisjunction|Default|Ternary|Multiplication|FunctionArrow)Precedence\\b", - "name": "support.type.swift" - } - ] + "4": { + "name": "punctuation.definition.identifier.swift" } } }, + "declarations-parameter-clause": { + "name": "meta.parameter-clause.swift", + "begin": "(\\()", + "end": "(\\))(?:\\s*(async)\\b)?", + "beginCaptures": { + "1": { + "name": "punctuation.definition.parameters.begin.swift" + } + }, + "endCaptures": { + "1": { + "name": "punctuation.definition.parameters.end.swift" + }, + "2": { + "name": "storage.modifier.async.swift" + } + }, + "patterns": [ + { + "include": "#declarations-parameter-list" + } + ] + }, + "declarations-parameter-list": { + "patterns": [ + { + "comment": "External parameter labels are considered part of the function name", + "match": "((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s+((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))(?=\\s*:)", + "captures": { + "1": { + "name": "entity.name.function.swift" + }, + "2": { + "name": "punctuation.definition.identifier.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "variable.parameter.function.swift" + }, + "5": { + "name": "punctuation.definition.identifier.swift" + }, + "6": { + "name": "punctuation.definition.identifier.swift" + } + } + }, + { + "comment": "If no external label is given, the name is both the external label and the internal variable name", + "match": "(((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k)))(?=\\s*:)", + "captures": { + "1": { + "name": "variable.parameter.function.swift" + }, + "2": { + "name": "entity.name.function.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "punctuation.definition.identifier.swift" + } + } + }, + { + "begin": ":\\s*(?!\\s)", + "end": "(?=[,)])", + "patterns": [ + { + "include": "#declarations-available-types" + }, + { + "name": "invalid.illegal.extra-colon-in-parameter-list.swift", + "match": ":" + }, + { + "comment": "a parameter's default value", + "begin": "=", + "end": "(?=[,)])", + "beginCaptures": { + "0": { + "name": "keyword.operator.assignment.swift" + } + }, + "patterns": [ + { + "include": "#expressions" + } + ] + } + ] + } + ] + }, + "declarations-precedencegroup": { + "name": "meta.definition.precedencegroup.swift", + "begin": "\\b(precedencegroup)\\s+((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s*(?=\\{)", + "end": "(?!\\G)", + "beginCaptures": { + "1": { + "name": "storage.type.precedencegroup.swift" + }, + "2": { + "name": "entity.name.type.precedencegroup.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "punctuation.definition.identifier.swift" + } + }, + "patterns": [ + { + "begin": "\\{", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.precedencegroup.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.precedencegroup.end.swift" + } + }, + "patterns": [ + { + "include": "#comments" + }, + { + "match": "\\b(higherThan|lowerThan)\\s*:\\s*((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))", + "captures": { + "1": { + "name": "storage.modifier.swift" + }, + "2": { + "name": "entity.other.inherited-class.swift", + "patterns": [ + { + "include": "#declarations-types-precedencegroup" + } + ] + }, + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "punctuation.definition.identifier.swift" + } + } + }, + { + "match": "\\b(associativity)\\b(?:\\s*:\\s*(right|left|none)\\b)?", + "captures": { + "1": { + "name": "storage.modifier.swift" + }, + "2": { + "name": "keyword.other.operator.associativity.swift" + } + } + }, + { + "match": "\\b(assignment)\\b(?:\\s*:\\s*(true|false)\\b)?", + "captures": { + "1": { + "name": "storage.modifier.swift" + }, + "2": { + "name": "constant.language.boolean.swift" + } + } + } + ] + } + ] + }, + "declarations-protocol": { + "name": "meta.definition.type.protocol.swift", + "begin": "\\b(protocol)\\s+((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "storage.type.$1.swift" + }, + "2": { + "name": "entity.name.type.$1.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "punctuation.definition.identifier.swift" + } + }, + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#declarations-inheritance-clause" + }, + { + "comment": "SE-0142: Permit where clauses to constrain associated types", + "include": "#declarations-generic-where-clause" + }, + { + "name": "meta.definition.type.body.swift", + "begin": "\\{", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.type.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.type.end.swift" + } + }, + "patterns": [ + { + "include": "#declarations-protocol-protocol-method" + }, + { + "include": "#declarations-protocol-protocol-initializer" + }, + { + "include": "#declarations-protocol-associated-type" + }, + { + "include": "$self" + } + ] + } + ] + }, + "declarations-protocol-associated-type": { + "name": "meta.definition.associatedtype.swift", + "begin": "\\b(associatedtype)\\s+((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s*", + "end": "(?!\\G)$|(?=[;}]|$)", + "beginCaptures": { + "1": { + "name": "keyword.other.declaration-specifier.swift" + }, + "2": { + "name": "variable.language.associatedtype.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "punctuation.definition.identifier.swift" + } + }, + "patterns": [ + { + "include": "#declarations-inheritance-clause" + }, + { + "comment": "SE-0142: Permit where clauses to constrain associated types", + "include": "#declarations-generic-where-clause" + }, + { + "include": "#declarations-typealias-assignment" + } + ] + }, + "declarations-protocol-protocol-initializer": { + "name": "meta.definition.function.initializer.swift", + "begin": "(?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k)\n | (?:\n (\n (? # operator-head\n [/=\\-+!*%<>&|^~?]\n | [\\x{00A1}-\\x{00A7}]\n | [\\x{00A9}\\x{00AB}]\n | [\\x{00AC}\\x{00AE}]\n | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n | [\\x{2030}-\\x{203E}]\n | [\\x{2041}-\\x{2053}]\n | [\\x{2055}-\\x{205E}]\n | [\\x{2190}-\\x{23FF}]\n | [\\x{2500}-\\x{2775}]\n | [\\x{2794}-\\x{2BFF}]\n | [\\x{2E00}-\\x{2E7F}]\n | [\\x{3001}-\\x{3003}]\n | [\\x{3008}-\\x{3030}]\n )\n (\n \\g\n | (? # operator-character\n [\\x{0300}-\\x{036F}]\n | [\\x{1DC0}-\\x{1DFF}]\n | [\\x{20D0}-\\x{20FF}]\n | [\\x{FE00}-\\x{FE0F}]\n | [\\x{FE20}-\\x{FE2F}]\n | [\\x{E0100}-\\x{E01EF}]\n )\n )*\n )\n | ( \\. ( \\g | \\g | \\. )+ ) # Dot operators\n )\n )\n\\s*\n(?=\\(|<)", + "end": "$|(?=;|//|/\\*|\\})", + "beginCaptures": { + "1": { + "name": "storage.type.function.swift" + }, + "2": { + "name": "entity.name.function.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "punctuation.definition.identifier.swift" + } + }, + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#declarations-generic-parameter-clause" + }, + { + "include": "#declarations-parameter-clause" + }, + { + "include": "#declarations-function-result" + }, + { + "include": "#async-throws" + }, + { + "comment": "Swift 3: generic constraints after the parameters and return type", + "include": "#declarations-generic-where-clause" + }, + { + "name": "invalid.illegal.function-body-not-allowed-in-protocol.swift", + "begin": "\\{", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.section.function.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.section.function.end.swift" + } + }, + "patterns": [ + { + "include": "$self" + } + ] + } + ] + }, + "declarations-type": { + "patterns": [ + { + "name": "meta.definition.type.$1.swift", + "begin": "\\b(class(?!\\s+(?:func|var|let)\\b)|struct|actor)\\b\\s*((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "storage.type.$1.swift" + }, + "2": { + "name": "entity.name.type.$1.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "punctuation.definition.identifier.swift" + } + }, + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#declarations-generic-parameter-clause" + }, + { + "comment": "Swift 3: generic constraints after the generic param list", + "include": "#declarations-generic-where-clause" + }, + { + "include": "#declarations-inheritance-clause" + }, + { + "name": "meta.definition.type.body.swift", + "begin": "\\{", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.type.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.type.end.swift" + } + }, + "patterns": [ + { + "include": "$self" + } + ] + } + ] + }, + { + "include": "#declarations-type-enum" + } + ] + }, + "declarations-type-enum": { + "name": "meta.definition.type.$1.swift", + "begin": "\\b(enum)\\s+((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))", + "end": "(?<=\\})", + "beginCaptures": { + "1": { + "name": "storage.type.$1.swift" + }, + "2": { + "name": "entity.name.type.$1.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "punctuation.definition.identifier.swift" + } + }, + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#declarations-generic-parameter-clause" + }, + { + "comment": "Swift 3: generic constraints after the generic param list", + "include": "#declarations-generic-where-clause" + }, + { + "include": "#declarations-inheritance-clause" + }, + { + "name": "meta.definition.type.body.swift", + "begin": "\\{", + "end": "\\}", + "beginCaptures": { + "0": { + "name": "punctuation.definition.type.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.type.end.swift" + } + }, + "patterns": [ + { + "include": "#declarations-type-enum-enum-case-clause" + }, + { + "include": "$self" + } + ] + } + ] + }, + "declarations-type-enum-associated-values": { + "begin": "\\G\\(", + "end": "\\)", + "beginCaptures": { + "0": { + "name": "punctuation.definition.parameters.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.parameters.end.swift" + } + }, + "patterns": [ + { + "include": "#comments" + }, + { + "begin": "(?x)\n(?:(_)|((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*\\k))\n\\s+\n(((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*\\k))\n\\s*(:)", + "end": "(?=[,)\\]])", + "beginCaptures": { + "1": { + "name": "entity.name.function.swift" + }, + "2": { + "name": "invalid.illegal.distinct-labels-not-allowed.swift" + }, + "5": { + "name": "variable.parameter.function.swift" + }, + "7": { + "name": "punctuation.separator.argument-label.swift" + } + }, + "patterns": [ + { + "include": "#declarations-available-types" + } + ] + }, + { + "begin": "(((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*\\k))\\s*(:)", + "end": "(?=[,)\\]])", + "beginCaptures": { + "1": { + "name": "entity.name.function.swift" + }, + "2": { + "name": "variable.parameter.function.swift" + }, + "4": { + "name": "punctuation.separator.argument-label.swift" + } + }, + "patterns": [ + { + "include": "#declarations-available-types" + } + ] + }, + { + "comment": "an element without a label (i.e. anything else)", + "begin": "(?![,)\\]])(?=\\S)", + "end": "(?=[,)\\]])", + "patterns": [ + { + "include": "#declarations-available-types" + }, + { + "name": "invalid.illegal.extra-colon-in-parameter-list.swift", + "match": ":" + } + ] + } + ] + }, + "declarations-type-enum-enum-case": { + "begin": "(?x)((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s*", + "end": "(?<=\\))|(?![=(])", + "beginCaptures": { + "1": { + "name": "variable.other.enummember.swift" + } + }, + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#declarations-type-enum-associated-values" + }, + { + "include": "#declarations-type-enum-raw-value-assignment" + } + ] + }, + "declarations-type-enum-enum-case-clause": { + "begin": "\\b(case)\\b\\s*", + "end": "(?=[;}])|(?!\\G)(?!//|/\\*)(?=[^\\s,])", + "beginCaptures": { + "1": { + "name": "storage.type.enum.case.swift" + } + }, + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#declarations-type-enum-enum-case" + }, + { + "include": "#declarations-type-enum-more-cases" + } + ] + }, + "declarations-type-enum-more-cases": { + "name": "meta.enum-case.more-cases", + "begin": ",\\s*", + "end": "(?!\\G)(?!//|/\\*)(?=[;}]|[^\\s,])", + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#declarations-type-enum-enum-case" + }, + { + "include": "#declarations-type-enum-more-cases" + } + ] + }, + "declarations-type-enum-raw-value-assignment": { + "begin": "(=)\\s*", + "end": "(?!\\G)", + "beginCaptures": { + "1": { + "name": "keyword.operator.assignment.swift" + } + }, + "patterns": [ + { + "include": "#comments" + }, + { + "include": "#literals" + } + ] + }, + "declarations-type-identifier": { + "begin": "((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s*", + "end": "(?!<)", + "beginCaptures": { + "1": { + "name": "meta.type-name.swift", + "patterns": [ + { + "include": "#builtin-types" + } + ] + }, + "2": { + "name": "punctuation.definition.identifier.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + } + }, + "patterns": [ + { + "begin": "(?=<)", + "end": "(?!\\G)", + "patterns": [ + { + "include": "#declarations-generic-argument-clause" + } + ] + } + ] + }, + "declarations-type-operators": { + "patterns": [ + { + "comment": "Swift 3: A & B", + "match": "(?&|\\^~.])(&)(?![/=\\-+!*%<>&|\\^~.])", + "captures": { + "1": { + "name": "keyword.operator.type.composition.swift" + } + } + }, + { + "comment": "SE-0390: Noncopyable structs and enums", + "match": "(?&|\\^~.])(~)(?![/=\\-+!*%<>&|\\^~.])", + "captures": { + "1": { + "name": "keyword.operator.type.requirement-suppression.swift" + } + } + } + ] + }, + "declarations-typealias": { + "name": "meta.definition.typealias.swift", + "begin": "\\b(typealias)\\s+((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s*", + "end": "(?!\\G)$|(?=;|//|/\\*|$)", + "beginCaptures": { + "1": { + "name": "keyword.other.declaration-specifier.swift" + }, + "2": { + "name": "entity.name.type.typealias.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "punctuation.definition.identifier.swift" + } + }, + "patterns": [ + { + "begin": "\\G(?=<)", + "end": "(?!\\G)", + "patterns": [ + { + "include": "#declarations-generic-parameter-clause" + } + ] + }, + { + "include": "#declarations-typealias-assignment" + } + ] + }, + "declarations-typealias-assignment": { + "begin": "(=)\\s*", + "end": "(?!\\G)$|(?=;|//|/\\*|$)", + "beginCaptures": { + "1": { + "name": "keyword.operator.assignment.swift" + } + }, + "patterns": [ + { + "include": "#declarations-available-types" + } + ] + }, + "declarations-typed-variable-declaration": { + "begin": "(?x)\n\\b(?:(async)\\s+)?(let|var)\\b\\s+\n(?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k)\\s*\n:", + "end": "(?=$|[={])", + "beginCaptures": { + "1": { + "name": "storage.modifier.async.swift" + }, + "2": { + "name": "keyword.other.declaration-specifier.swift" + } + }, + "patterns": [ + { + "include": "#declarations-available-types" + } + ] + }, + "declarations-types-precedencegroup": { + "patterns": [ + { + "comment": "Precedence groups in the standard library", + "name": "support.type.swift", + "match": "\\b(?:BitwiseShift|Assignment|RangeFormation|Casting|Addition|NilCoalescing|Comparison|LogicalConjunction|LogicalDisjunction|Default|Ternary|Multiplication|FunctionArrow)Precedence\\b" + } + ] + }, "expressions": { + "comment": "trailing closures need to be parsed before other member references", + "patterns": [ + { + "include": "#expressions-without-trailing-closures-or-member-references" + }, + { + "include": "#expressions-trailing-closure" + }, + { + "include": "#member-reference" + } + ] + }, + "expressions-trailing-closure": { + "patterns": [ + { + "comment": "foo { body } -- a call with a trailing closure and no argument clause", + "name": "meta.function-call.trailing-closure-only.swift", + "match": "(#?(?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))(?=\\s*\\{)", + "captures": { + "1": { + "name": "support.function.any-method.swift" + }, + "2": { + "name": "punctuation.definition.identifier.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + } + } + }, + { + "comment": "foo: { body } -- labeled-trailing-closure (SE-0279)", + "match": "((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s*(:)(?=\\s*\\{)", + "captures": { + "1": { + "name": "support.function.any-method.trailing-closure-label.swift" + }, + "2": { + "name": "punctuation.definition.identifier.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "punctuation.separator.argument-label.swift" + } + } + } + ] + }, + "expressions-without-trailing-closures": { + "patterns": [ + { + "include": "#expressions-without-trailing-closures-or-member-references" + }, + { + "include": "#member-references" + } + ] + }, + "expressions-without-trailing-closures-or-member-references": { "patterns": [ { "include": "#comments" @@ -2299,7 +2518,7 @@ "include": "#attributes" }, { - "include": "#closure-parameter" + "include": "#expressions-without-trailing-closures-or-member-references-closure-parameter" }, { "include": "#literals" @@ -2320,294 +2539,287 @@ "include": "#builtin-properties" }, { - "include": "#compound-name" + "include": "#expressions-without-trailing-closures-or-member-references-compound-name" + }, + { + "include": "#conditionals" }, { "include": "#keywords" }, { - "include": "#function-call-expression" + "include": "#expressions-without-trailing-closures-or-member-references-availability-condition" }, { - "include": "#subscript-expression" + "include": "#expressions-without-trailing-closures-or-member-references-function-or-macro-call-expression" }, { - "include": "#parenthesized-expression" + "include": "#expressions-without-trailing-closures-or-member-references-macro-expansion" }, { - "include": "#member-reference" + "include": "#expressions-without-trailing-closures-or-member-references-subscript-expression" }, { - "include": "#availability-condition" + "include": "#expressions-without-trailing-closures-or-member-references-parenthesized-expression" }, { - "match": "\\b_\\b", - "name": "support.variable.discard-value.swift" + "name": "support.variable.discard-value.swift", + "match": "\\b_\\b" } - ], - "repository": { - "availability-condition": { - "begin": "\\B(#(?:un)?available)(\\()", - "beginCaptures": { - "1": { - "name": "support.function.availability-condition.swift" - }, - "2": { - "name": "punctuation.definition.arguments.begin.swift" - } - }, - "end": "\\)", - "endCaptures": { - "0": { - "name": "punctuation.definition.arguments.end.swift" - } - }, - "patterns": [ - { - "captures": { - "1": { - "name": "keyword.other.platform.os.swift" - }, - "2": { - "name": "constant.numeric.swift" - } - }, - "match": "\\s*\\b((?:iOS|macOS|OSX|watchOS|tvOS|UIKitForMac)(?:ApplicationExtension)?)\\b(?:\\s+([0-9]+(?:\\.[0-9]+)*\\b))" - }, - { - "captures": { - "1": { - "name": "keyword.other.platform.all.swift" - }, - "2": { - "name": "invalid.illegal.character-not-allowed-here.swift" - } - }, - "match": "(\\*)\\s*(.*?)(?=[,)])" - }, - { - "match": "[^\\s,)]+", - "name": "invalid.illegal.character-not-allowed-here.swift" - } - ] + ] + }, + "expressions-without-trailing-closures-or-member-references-availability-condition": { + "begin": "\\B(#(?:un)?available)(\\()", + "end": "\\)", + "beginCaptures": { + "1": { + "name": "support.function.availability-condition.swift" }, - "closure-parameter": { - "match": "\\$[0-9]+", - "name": "variable.language.closure-parameter.swift" - }, - "compound-name": { + "2": { + "name": "punctuation.definition.arguments.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.swift" + } + }, + "patterns": [ + { + "match": "\\s*\\b((?:iOS|macOS|OSX|watchOS|tvOS|UIKitForMac)(?:ApplicationExtension)?)\\b(?:\\s+([0-9]+(?:\\.[0-9]+)*\\b))", "captures": { "1": { - "name": "entity.name.function.compound-name.swift" + "name": "keyword.other.platform.os.swift" }, "2": { - "name": "punctuation.definition.entity.swift" - }, - "3": { - "name": "punctuation.definition.entity.swift" - }, - "4": { - "patterns": [ - { - "captures": { - "1": { - "name": "punctuation.definition.entity.swift" - }, - "2": { - "name": "punctuation.definition.entity.swift" - } - }, - "match": "(?`?)(?!_:)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k):", - "name": "entity.name.function.compound-name.swift" - } - ] + "name": "constant.numeric.swift" } - }, - "comment": "a reference to a function with disambiguating argument labels, such as foo(_:), foo(bar:), etc.", - "match": "(?x)\n\t\t\t\t\t\t((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k)) \t\t# function name\n\t\t\t\t\t\t\\(\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k)) \t# argument label\n\t\t\t\t\t\t\t\t\t:\t\t\t\t\t\t\t\t\t\t\t\t# colon\n\t\t\t\t\t\t\t\t)+\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\\)\n\t\t\t\t\t" + } }, - "expression-element-list": { - "patterns": [ - { - "include": "#comments" - }, - { - "begin": "((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s*(:)", - "beginCaptures": { - "1": { - "name": "support.function.any-method.swift" - }, - "2": { - "name": "punctuation.definition.identifier.swift" - }, - "3": { - "name": "punctuation.definition.identifier.swift" - }, - "4": { - "name": "punctuation.separator.argument-label.swift" - } - }, - "comment": "an element with a label", - "end": "(?=[,)\\]])", - "patterns": [ - { - "include": "#expressions" - } - ] - }, - { - "begin": "(?![,)\\]])(?=\\S)", - "comment": "an element without a label (i.e. anything else)", - "end": "(?=[,)\\]])", - "patterns": [ - { - "include": "#expressions" - } - ] - } - ] - }, - "function-call-expression": { - "patterns": [ - { - "begin": "((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s*(\\()", - "beginCaptures": { - "1": { - "name": "support.function.any-method.swift" - }, - "2": { - "name": "punctuation.definition.identifier.swift" - }, - "3": { - "name": "punctuation.definition.identifier.swift" - }, - "4": { - "name": "punctuation.definition.arguments.begin.swift" - } - }, - "comment": "foo(args) -- a call whose callee is a highlightable name", - "end": "\\)", - "endCaptures": { - "0": { - "name": "punctuation.definition.arguments.end.swift" - } - }, - "name": "meta.function-call.swift", - "patterns": [ - { - "include": "#expression-element-list" - } - ] - }, - { - "begin": "(?<=[`\\])}>\\p{L}_\\p{N}\\p{M}])\\s*(\\()", - "beginCaptures": { - "1": { - "name": "punctuation.definition.arguments.begin.swift" - } - }, - "comment": "[Int](args) -- a call whose callee is a more complicated expression", - "end": "\\)", - "endCaptures": { - "0": { - "name": "punctuation.definition.arguments.end.swift" - } - }, - "name": "meta.function-call.swift", - "patterns": [ - { - "include": "#expression-element-list" - } - ] - } - ] - }, - "member-reference": { + { + "match": "(\\*)\\s*(.*?)(?=[,)])", + "captures": { + "1": { + "name": "keyword.other.platform.all.swift" + }, + "2": { + "name": "invalid.illegal.character-not-allowed-here.swift" + } + } + }, + { + "name": "invalid.illegal.character-not-allowed-here.swift", + "match": "[^\\s,)]+" + } + ] + }, + "expressions-without-trailing-closures-or-member-references-closure-parameter": { + "name": "variable.language.closure-parameter.swift", + "match": "\\$[0-9]+" + }, + "expressions-without-trailing-closures-or-member-references-compound-name": { + "comment": "a reference to a function with disambiguating argument labels, such as foo(_:), foo(bar:), etc.", + "match": "(?x)\n((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k)) # function name\n\\(\n (\n (\n ((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k)) # argument label\n : # colon\n )+\n )\n\\)", + "captures": { + "1": { + "name": "entity.name.function.compound-name.swift" + }, + "2": { + "name": "punctuation.definition.entity.swift" + }, + "3": { + "name": "punctuation.definition.entity.swift" + }, + "4": { "patterns": [ { + "name": "entity.name.function.compound-name.swift", + "match": "(?`?)(?!_:)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k):", "captures": { "1": { - "name": "variable.other.swift" + "name": "punctuation.definition.entity.swift" }, "2": { - "name": "punctuation.definition.identifier.swift" - }, - "3": { - "name": "punctuation.definition.identifier.swift" + "name": "punctuation.definition.entity.swift" } - }, - "match": "(?<=\\.)((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))" - } - ] - }, - "parenthesized-expression": { - "begin": "\\(", - "beginCaptures": { - "0": { - "name": "punctuation.section.tuple.begin.swift" - } - }, - "comment": "correctly matching closure expressions is too hard (depends on trailing \"in\") so we just tack on some basics to the end of parenthesized-expression", - "end": "(\\))\\s*((?:\\b(?:async|throws|rethrows)\\s)*)", - "endCaptures": { - "1": { - "name": "punctuation.section.tuple.end.swift" - }, - "2": { - "patterns": [ - { - "match": "\\brethrows\\b", - "name": "invalid.illegal.rethrows-only-allowed-on-function-declarations.swift" - }, - { - "include": "#async-throws" - } - ] - } - }, - "patterns": [ - { - "include": "#expression-element-list" - } - ] - }, - "subscript-expression": { - "begin": "(?<=[`\\p{L}_\\p{N}\\p{M}])\\s*(\\[)", - "beginCaptures": { - "1": { - "name": "punctuation.definition.arguments.begin.swift" - } - }, - "end": "\\]", - "endCaptures": { - "0": { - "name": "punctuation.definition.arguments.end.swift" - } - }, - "name": "meta.subscript-expression.swift", - "patterns": [ - { - "include": "#expression-element-list" + } } ] } } }, + "expressions-without-trailing-closures-or-member-references-expression-element-list": { + "patterns": [ + { + "include": "#comments" + }, + { + "comment": "an element with a label", + "begin": "((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s*(:)", + "end": "(?=[,)\\]])", + "beginCaptures": { + "1": { + "name": "support.function.any-method.swift" + }, + "2": { + "name": "punctuation.definition.identifier.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "punctuation.separator.argument-label.swift" + } + }, + "patterns": [ + { + "include": "#expressions" + } + ] + }, + { + "comment": "an element without a label (i.e. anything else)", + "begin": "(?![,)\\]])(?=\\S)", + "end": "(?=[,)\\]])", + "patterns": [ + { + "include": "#expressions" + } + ] + } + ] + }, + "expressions-without-trailing-closures-or-member-references-function-or-macro-call-expression": { + "patterns": [ + { + "comment": "foo(args) -- a call whose callee is a highlightable name", + "name": "meta.function-call.swift", + "begin": "(#?(?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))\\s*(\\()", + "end": "\\)", + "beginCaptures": { + "1": { + "name": "support.function.any-method.swift" + }, + "2": { + "name": "punctuation.definition.identifier.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + }, + "4": { + "name": "punctuation.definition.arguments.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.swift" + } + }, + "patterns": [ + { + "include": "#expressions-without-trailing-closures-or-member-references-expression-element-list" + } + ] + }, + { + "comment": "[Int](args) -- a call whose callee is a more complicated expression", + "name": "meta.function-call.swift", + "begin": "(?<=[`\\])}>\\p{L}_\\p{N}\\p{M}])\\s*(\\()", + "end": "\\)", + "beginCaptures": { + "1": { + "name": "punctuation.definition.arguments.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.swift" + } + }, + "patterns": [ + { + "include": "#expressions-without-trailing-closures-or-member-references-expression-element-list" + } + ] + } + ] + }, + "expressions-without-trailing-closures-or-member-references-macro-expansion": { + "name": "support.function.any-method.swift", + "match": "(#(?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))" + }, + "expressions-without-trailing-closures-or-member-references-parenthesized-expression": { + "comment": "correctly matching closure expressions is too hard (depends on trailing \"in\") so we just tack on some basics to the end of parenthesized-expression", + "begin": "\\(", + "end": "(\\))\\s*((?:\\b(?:async|throws|rethrows)\\s)*)", + "beginCaptures": { + "0": { + "name": "punctuation.section.tuple.begin.swift" + } + }, + "endCaptures": { + "1": { + "name": "punctuation.section.tuple.end.swift" + }, + "2": { + "patterns": [ + { + "name": "invalid.illegal.rethrows-only-allowed-on-function-declarations.swift", + "match": "\\brethrows\\b" + }, + { + "include": "#async-throws" + } + ] + } + }, + "patterns": [ + { + "include": "#expressions-without-trailing-closures-or-member-references-expression-element-list" + } + ] + }, + "expressions-without-trailing-closures-or-member-references-subscript-expression": { + "name": "meta.subscript-expression.swift", + "begin": "(?<=[`\\p{L}_\\p{N}\\p{M}])\\s*(\\[)", + "end": "\\]", + "beginCaptures": { + "1": { + "name": "punctuation.definition.arguments.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.arguments.end.swift" + } + }, + "patterns": [ + { + "include": "#expressions-without-trailing-closures-or-member-references-expression-element-list" + } + ] + }, "keywords": { "patterns": [ { - "match": "(?\n (?> # no backtracking, avoids issues with negative lookbehind at end\n (?:\n \\\\Q\n (?:(?!\\\\E)(?!/\\2).)*+\n (?:\\\\E\n # A quoted sequence may not have a closing E, in which case it extends to the end of the regex\n | (?(3)|(?\\{)?+(?\\{)?+(?\\{)?+(?\\{)?+(?\\{)?+\n .+?\n \\}(?()\\})(?()\\})(?()\\})(?()\\})(?()\\})\n (?:\\[(?!\\d)\\w+\\])?\n [X<>]?\n \\)\n | (?\\[ (?:\\\\. | [^\\[\\]] | \\g)+ \\])\n | \\(\\g?+\\)\n | (?:(?!/\\2)[^()\\[\\\\])+ # any character (until end)\n )+\n )\n)?+\n# may end with a space only if it is an extended literal or contains only a single escaped space\n(?(3)|(?(5)(?'\n \"\\k'\" NamedOrNumberRef \"'\"\n '\\g<' NamedOrNumberRef '>'\n \"\\g'\" NamedOrNumberRef \"'\"", + "match": "(?x)(\\\\[gk](<)|\\\\[gk]') (?: ((?!\\d)\\w+) (?:([+-])(\\d+))? | ([+-]?\\d+) (?:([+-])(\\d+))? ) ((?(2)>|'))", + "captures": { + "1": { + "name": "constant.character.escape.backslash.regexp" + }, + "3": { + "name": "variable.other.group-name.regexp" + }, + "4": { + "name": "keyword.operator.recursion-level.regexp" + }, + "5": { + "name": "constant.numeric.integer.decimal.regexp" + }, + "6": { + "name": "constant.numeric.integer.decimal.regexp" + }, + "7": { + "name": "keyword.operator.recursion-level.regexp" + }, + "8": { + "name": "constant.numeric.integer.decimal.regexp" + }, + "9": { + "name": "constant.character.escape.backslash.regexp" + } + } + }, + { + "comment": "'\\k{' NamedRef '}'", + "match": "(?x)(\\\\k\\{) ((?!\\d)\\w+) (?:([+-])(\\d+))? (\\})", + "captures": { + "1": { + "name": "constant.character.escape.backslash.regexp" + }, + "2": { + "name": "variable.other.group-name.regexp" + }, + "3": { + "name": "keyword.operator.recursion-level.regexp" + }, + "4": { + "name": "constant.numeric.integer.decimal.regexp" + }, + "5": { + "name": "constant.character.escape.backslash.regexp" + } + } + }, + { + "name": "keyword.other.back-reference.regexp", + "match": "\\\\[1-9][0-9]+" + }, + { + "comment": "'(?P=' NamedRef ')'", + "match": "(?x)(\\(\\?(?:P[=>]|&)) ((?!\\d)\\w+) (?:([+-])(\\d+))? (\\))", + "captures": { + "1": { + "name": "keyword.other.back-reference.regexp" + }, + "2": { + "name": "variable.other.group-name.regexp" + }, + "3": { + "name": "keyword.operator.recursion-level.regexp" + }, + "4": { + "name": "constant.numeric.integer.decimal.regexp" + }, + "5": { + "name": "keyword.other.back-reference.regexp" + } + } + }, + { + "name": "keyword.other.back-reference.regexp", + "match": "\\(\\?R\\)" + }, + { + "comment": "'(?' NumberRef ')'", + "match": "(?x)(\\(\\?) ([+-]?\\d+) (?:([+-])(\\d+))? (\\))", + "captures": { + "1": { + "name": "keyword.other.back-reference.regexp" + }, + "2": { + "name": "constant.numeric.integer.decimal.regexp" + }, + "3": { + "name": "keyword.operator.recursion-level.regexp" + }, + "4": { + "name": "constant.numeric.integer.decimal.regexp" + }, + "5": { + "name": "keyword.other.back-reference.regexp" + } + } + } + ] + }, + "literals-regular-expression-literal-backtracking-directive-or-global-matching-option": { + "match": "(?x)\n(\\(\\*)\n(?:\n (ACCEPT|FAIL|F|MARK(?=:)|(?=:)|COMMIT|PRUNE|SKIP|THEN)\n (?:(:)([^)]+))?\n | (?:(LIMIT_(?:DEPTH|HEAP|MATCH))(=)(\\d+))\n | (\n CRLF | CR | ANYCRLF | ANY | LF | NUL\n | BSR_ANYCRLF | BSR_UNICODE\n | NOTEMPTY_ATSTART | NOTEMPTY\n | NO_AUTO_POSSESS | NO_DOTSTAR_ANCHOR\n | NO_JIT | NO_START_OPT | UTF | UCP\n )\n)\n(\\))", + "captures": { + "1": { + "name": "keyword.control.directive.regexp" + }, + "2": { + "name": "keyword.control.directive.regexp" + }, + "3": { + "name": "keyword.control.directive.regexp" + }, + "4": { + "name": "variable.language.tag.regexp" + }, + "5": { + "name": "keyword.control.directive.regexp" + }, + "6": { + "name": "keyword.operator.assignment.regexp" + }, + "7": { + "name": "constant.numeric.integer.decimal.regexp" + }, + "8": { + "name": "keyword.control.directive.regexp" + }, + "9": { + "name": "keyword.control.directive.regexp" + } } }, + "literals-regular-expression-literal-callout": { + "name": "meta.callout.regexp", + "match": "(?x)\n# PCRECallout\n(\\()(?\\?C)\n (?:\n (?\\d+)\n | `(?(?:[^`]|``)*)`\n | '(?(?:[^']|'')*)'\n | \"(?(?:[^\"]|\"\")*)\"\n | \\^(?(?:[^\\^]|\\^\\^)*)\\^\n | %(?(?:[^%]|%%)*)%\n | \\#(?(?:[^#]|\\#\\#)*)\\#\n | \\$(?(?:[^$]|\\$\\$)*)\\$\n | \\{(?(?:[^}]|\\}\\})*)\\}\n )?\n(\\))\n# NamedCallout\n| (\\()(?\\*)\n (?(?!\\d)\\w+)\n (?:\\[(?(?!\\d)\\w+)\\])?\n (?:\\{ [^,}]+ (?:,[^,}]+)* \\})?\n (\\))\n# InterpolatedCallout\n| (\\()(?\\?)\n # we only support a fixed maximum number of braces because otherwise we can't balance the number of open and close braces\n (\\{(?\\{)?+(?\\{)?+(?\\{)?+(?\\{)?+(?\\{)?+) .+? \\}(?()\\})(?()\\})(?()\\})(?()\\})(?()\\})\n (?:\\[(?(?!\\d)\\w+)\\])?\n (?[X<>]?)\n (\\))", + "captures": { + "1": { + "name": "punctuation.definition.group.regexp" + }, + "2": { + "name": "keyword.control.callout.regexp" + }, + "3": { + "name": "constant.numeric.integer.decimal.regexp" + }, + "4": { + "name": "entity.name.function.callout.regexp" + }, + "5": { + "name": "entity.name.function.callout.regexp" + }, + "6": { + "name": "entity.name.function.callout.regexp" + }, + "7": { + "name": "entity.name.function.callout.regexp" + }, + "8": { + "name": "entity.name.function.callout.regexp" + }, + "9": { + "name": "entity.name.function.callout.regexp" + }, + "10": { + "name": "entity.name.function.callout.regexp" + }, + "11": { + "name": "entity.name.function.callout.regexp" + }, + "12": { + "name": "punctuation.definition.group.regexp" + }, + "13": { + "name": "punctuation.definition.group.regexp" + }, + "14": { + "name": "keyword.control.callout.regexp" + }, + "15": { + "name": "entity.name.function.callout.regexp" + }, + "16": { + "name": "variable.language.tag-name.regexp" + }, + "17": { + "name": "punctuation.definition.group.regexp" + }, + "18": { + "name": "punctuation.definition.group.regexp" + }, + "19": { + "name": "keyword.control.callout.regexp" + }, + "26": { + "name": "variable.language.tag-name.regexp" + }, + "27": { + "name": "keyword.control.callout.regexp" + }, + "28": { + "name": "punctuation.definition.group.regexp" + } + } + }, + "literals-regular-expression-literal-character-properties": { + "name": "constant.other.character-class.set.regexp", + "match": "(?x)\n\\\\[pP]\\{ ([\\s\\w-]+(?:=[\\s\\w-]+)?) \\}\n| (\\[:) ([\\s\\w-]+(?:=[\\s\\w-]+)?) (:\\])", + "captures": { + "1": { + "name": "support.variable.character-property.regexp" + }, + "2": { + "name": "punctuation.definition.character-class.regexp" + }, + "3": { + "name": "support.variable.character-property.regexp" + }, + "4": { + "name": "punctuation.definition.character-class.regexp" + } + } + }, + "literals-regular-expression-literal-custom-char-class": { + "patterns": [ + { + "name": "constant.other.character-class.set.regexp", + "begin": "(\\[)(\\^)?", + "end": "\\]", + "beginCaptures": { + "1": { + "name": "punctuation.definition.character-class.regexp" + }, + "2": { + "name": "keyword.operator.negation.regexp" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.character-class.regexp" + } + }, + "patterns": [ + { + "include": "#literals-regular-expression-literal-custom-char-class-members" + } + ] + } + ] + }, + "literals-regular-expression-literal-custom-char-class-members": { + "comment": "TODO: should also include atoms?", + "patterns": [ + { + "comment": "\\b inside a character class represents a backspace", + "name": "constant.character.escape.backslash.regexp", + "match": "\\\\b" + }, + { + "include": "#literals-regular-expression-literal-custom-char-class" + }, + { + "include": "#literals-regular-expression-literal-quote" + }, + { + "include": "#literals-regular-expression-literal-set-operators" + }, + { + "include": "#literals-regular-expression-literal-unicode-scalars" + }, + { + "include": "#literals-regular-expression-literal-character-properties" + } + ] + }, + "literals-regular-expression-literal-group-option-toggle": { + "comment": "A matching option sequence may be part of an \"isolated group\" which has an implicit scope that wraps the remaining elements of the current group", + "name": "keyword.other.option-toggle.regexp", + "match": "(?x)\n\\(\\?\n(?:\n \\^(?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})*\n | (?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})+\n | (?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})* - (?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})*\n)\n\\)" + }, + "literals-regular-expression-literal-group-or-conditional": { + "patterns": [ + { + "name": "meta.group.absent.regexp", + "begin": "(\\()(\\?~)", + "end": "\\)", + "beginCaptures": { + "1": { + "name": "punctuation.definition.group.regexp" + }, + "2": { + "name": "keyword.control.conditional.absent.regexp" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.group.regexp" + } + }, + "patterns": [ + { + "include": "#literals-regular-expression-literal-regex-guts" + } + ] + }, + { + "name": "meta.group.conditional.regexp", + "begin": "(?x)\n# KnownConditionalStart\n(\\() (?\\?\\()\n (?:\n (? (?[+-]?\\d+)(?:(?[+-])(?\\d+))? )\n | (?R) \\g?\n | (?R&) (? (?(?!\\d)\\w+) (?:(?[+-])(?\\d+))? )\n | (?<) (?:\\g|\\g) (?>)\n | (?') (?:\\g|\\g) (?')\n | (?DEFINE)\n | (?VERSION)(?>?=)(?\\d+\\.\\d+)\n )\n(?\\))\n| (\\()(?\\?)(?=\\()", + "end": "\\)", + "beginCaptures": { + "1": { + "name": "punctuation.definition.group.regexp" + }, + "2": { + "name": "keyword.control.conditional.regexp" + }, + "4": { + "name": "constant.numeric.integer.decimal.regexp" + }, + "5": { + "name": "keyword.operator.recursion-level.regexp" + }, + "6": { + "name": "constant.numeric.integer.decimal.regexp" + }, + "7": { + "name": "keyword.control.conditional.regexp" + }, + "8": { + "name": "keyword.control.conditional.regexp" + }, + "10": { + "name": "variable.other.group-name.regexp" + }, + "11": { + "name": "keyword.operator.recursion-level.regexp" + }, + "12": { + "name": "constant.numeric.integer.decimal.regexp" + }, + "13": { + "name": "keyword.control.conditional.regexp" + }, + "14": { + "name": "keyword.control.conditional.regexp" + }, + "15": { + "name": "keyword.control.conditional.regexp" + }, + "16": { + "name": "keyword.control.conditional.regexp" + }, + "17": { + "name": "keyword.control.conditional.regexp" + }, + "18": { + "name": "keyword.control.conditional.regexp" + }, + "19": { + "name": "keyword.operator.comparison.regexp" + }, + "20": { + "name": "constant.numeric.integer.decimal.regexp" + }, + "21": { + "name": "keyword.control.conditional.regexp" + }, + "22": { + "name": "punctuation.definition.group.regexp" + }, + "23": { + "name": "keyword.control.conditional.regexp" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.group.regexp" + } + }, + "patterns": [ + { + "include": "#literals-regular-expression-literal-regex-guts" + } + ] + }, + { + "name": "meta.group.regexp", + "begin": "(?x)\n(\\()\n(\n # BasicGroupKind\n (\\?)\n (?:\n ([:|>=!*] | <[=!*])\n # named groups\n | P?< (?:((?!\\d)\\w+) (-))? ((?!\\d)\\w+) >\n | ' (?:((?!\\d)\\w+) (-))? ((?!\\d)\\w+) '\n # matching options\n | (?:\n \\^(?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})*\n | (?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})+\n | (?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})* - (?:[iJmnsUxwDPSW]|xx|y\\{[gw]\\})*\n ): # case without : is handled by group-option-toggle\n )\n # PCRE2GroupKind\n | \\*(\n atomic\n |pla|positive_lookahead\n |nla|negative_lookahead\n |plb|positive_lookbehind\n |nlb|negative_lookbehind\n |napla|non_atomic_positive_lookahead\n |naplb|non_atomic_positive_lookbehind\n |sr|script_run\n |asr|atomic_script_run\n ):\n)?+", + "end": "\\)", + "beginCaptures": { + "1": { + "name": "punctuation.definition.group.regexp" + }, + "2": { + "name": "keyword.other.group-options.regexp" + }, + "3": { + "name": "punctuation.definition.group.regexp" + }, + "4": { + "name": "punctuation.definition.group.regexp" + }, + "5": { + "name": "variable.other.group-name.regexp" + }, + "6": { + "name": "keyword.operator.balancing-group.regexp" + }, + "7": { + "name": "variable.other.group-name.regexp" + }, + "8": { + "name": "variable.other.group-name.regexp" + }, + "9": { + "name": "keyword.operator.balancing-group.regexp" + }, + "10": { + "name": "variable.other.group-name.regexp" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.group.regexp" + } + }, + "patterns": [ + { + "include": "#literals-regular-expression-literal-regex-guts" + } + ] + } + ] + }, + "literals-regular-expression-literal-line-comment": { + "name": "comment.line.regexp", + "match": "(\\#).*$", + "captures": { + "1": { + "name": "punctuation.definition.comment.regexp" + } + } + }, + "literals-regular-expression-literal-quote": { + "name": "string.quoted.other.regexp.swift", + "begin": "\\\\Q", + "end": "\\\\E|(\\n)", + "beginCaptures": { + "0": { + "name": "constant.character.escape.backslash.regexp" + } + }, + "endCaptures": { + "0": { + "name": "constant.character.escape.backslash.regexp" + }, + "1": { + "name": "invalid.illegal.returns-not-allowed.regexp" + } + } + }, + "literals-regular-expression-literal-regex-guts": { + "patterns": [ + { + "include": "#literals-regular-expression-literal-quote" + }, + { + "name": "comment.block.regexp", + "begin": "\\(\\?\\#", + "end": "\\)", + "beginCaptures": { + "0": { + "name": "punctuation.definition.comment.begin.regexp" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.comment.end.regexp" + } + } + }, + { + "name": "meta.embedded.expression.regexp", + "begin": "<\\{", + "end": "\\}>", + "beginCaptures": { + "0": { + "name": "punctuation.section.embedded.begin.regexp" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.section.embedded.end.regexp" + } + } + }, + { + "include": "#literals-regular-expression-literal-unicode-scalars" + }, + { + "include": "#literals-regular-expression-literal-character-properties" + }, + { + "name": "keyword.control.anchor.regexp", + "match": "[$^]|\\\\[AbBGyYzZ]|\\\\K" + }, + { + "include": "#literals-regular-expression-literal-backtracking-directive-or-global-matching-option" + }, + { + "include": "#literals-regular-expression-literal-callout" + }, + { + "include": "#literals-regular-expression-literal-backreference-or-subpattern" + }, + { + "name": "constant.character.character-class.regexp", + "match": "\\.|\\\\[CdDhHNORsSvVwWX]" + }, + { + "name": "constant.character.entity.control-character.regexp", + "match": "\\\\c." + }, + { + "name": "constant.character.escape.backslash.regexp", + "match": "\\\\[^c]" + }, + { + "name": "keyword.operator.or.regexp", + "match": "\\|" + }, + { + "name": "keyword.operator.quantifier.regexp", + "match": "[*+?]" + }, + { + "name": "keyword.operator.quantifier.regexp", + "match": "\\{\\s*\\d+\\s*(?:,\\s*\\d*\\s*)?\\}|\\{\\s*,\\s*\\d+\\s*\\}" + }, + { + "include": "#literals-regular-expression-literal-custom-char-class" + }, + { + "include": "#literals-regular-expression-literal-group-option-toggle" + }, + { + "include": "#literals-regular-expression-literal-group-or-conditional" + } + ] + }, + "literals-regular-expression-literal-set-operators": { + "patterns": [ + { + "name": "keyword.operator.intersection.regexp.swift", + "match": "&&" + }, + { + "name": "keyword.operator.subtraction.regexp.swift", + "match": "--" + }, + { + "name": "keyword.operator.symmetric-difference.regexp.swift", + "match": "\\~\\~" + } + ] + }, + "literals-regular-expression-literal-unicode-scalars": { + "name": "constant.character.numeric.regexp", + "match": "(?x)\n\\\\u\\{\\s*(?:[0-9a-fA-F]+\\s*)+\\}\n| \\\\u[0-9a-fA-F]{4}\n| \\\\x\\{[0-9a-fA-F]+\\}\n| \\\\x[0-9a-fA-F]{0,2}\n| \\\\U[0-9a-fA-F]{8}\n| \\\\o\\{[0-7]+\\}\n| \\\\0[0-7]{0,3}\n| \\\\N\\{(?:U\\+[0-9a-fA-F]{1,8} | [\\s\\w-]+)\\}" + }, + "literals-string": { + "patterns": [ + { + "comment": "SE-0168: Multi-Line String Literals", + "name": "string.quoted.double.block.swift", + "begin": "\"\"\"", + "end": "\"\"\"(#*)", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.string.end.swift" + }, + "1": { + "name": "invalid.illegal.extra-closing-delimiter.swift" + } + }, + "patterns": [ + { + "name": "invalid.illegal.content-after-opening-delimiter.swift", + "match": "\\G.+(?=\"\"\")|\\G.+" + }, + { + "name": "constant.character.escape.newline.swift", + "match": "\\\\\\s*\\n" + }, + { + "include": "#literals-string-string-guts" + }, + { + "comment": "Allow \\(\"\"\"...\"\"\") to appear inside a block string", + "name": "invalid.illegal.content-before-closing-delimiter.swift", + "match": "\\S((?!\\\\\\().)*(?=\"\"\")" + } + ] + }, + { + "name": "string.quoted.double.block.raw.swift", + "begin": "#\"\"\"", + "end": "\"\"\"#(#*)", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.string.end.swift" + }, + "1": { + "name": "invalid.illegal.extra-closing-delimiter.swift" + } + }, + "patterns": [ + { + "name": "invalid.illegal.content-after-opening-delimiter.swift", + "match": "\\G.+(?=\"\"\")|\\G.+" + }, + { + "name": "constant.character.escape.newline.swift", + "match": "\\\\#\\s*\\n" + }, + { + "include": "#literals-string-raw-string-guts" + }, + { + "comment": "Allow \\(\"\"\"...\"\"\") to appear inside a block string", + "name": "invalid.illegal.content-before-closing-delimiter.swift", + "match": "\\S((?!\\\\#\\().)*(?=\"\"\")" + } + ] + }, + { + "name": "string.quoted.double.block.raw.swift", + "begin": "(##+)\"\"\"", + "end": "\"\"\"\\1(#*)", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.string.end.swift" + }, + "1": { + "name": "invalid.illegal.extra-closing-delimiter.swift" + } + }, + "patterns": [ + { + "name": "invalid.illegal.content-after-opening-delimiter.swift", + "match": "\\G.+(?=\"\"\")|\\G.+" + } + ] + }, + { + "name": "string.quoted.double.single-line.swift", + "begin": "\"", + "end": "\"(#*)", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.string.end.swift" + }, + "1": { + "name": "invalid.illegal.extra-closing-delimiter.swift" + } + }, + "patterns": [ + { + "name": "invalid.illegal.returns-not-allowed.swift", + "match": "\\r|\\n" + }, + { + "include": "#literals-string-string-guts" + } + ] + }, + { + "comment": "SE-0168: raw string literals (more than one #, grammar limitations prevent us from supporting escapes)", + "name": "string.quoted.double.single-line.raw.swift", + "begin": "(##+)\"", + "end": "\"\\1(#*)", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.begin.raw.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.string.end.raw.swift" + }, + "1": { + "name": "invalid.illegal.extra-closing-delimiter.swift" + } + }, + "patterns": [ + { + "name": "invalid.illegal.returns-not-allowed.swift", + "match": "\\r|\\n" + } + ] + }, + { + "comment": "SE-0168: raw string literals (one #, escapes supported)", + "name": "string.quoted.double.single-line.raw.swift", + "begin": "#\"", + "end": "\"#(#*)", + "beginCaptures": { + "0": { + "name": "punctuation.definition.string.begin.raw.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.definition.string.end.raw.swift" + }, + "1": { + "name": "invalid.illegal.extra-closing-delimiter.swift" + } + }, + "patterns": [ + { + "name": "invalid.illegal.returns-not-allowed.swift", + "match": "\\r|\\n" + }, + { + "include": "#literals-string-raw-string-guts" + } + ] + } + ] + }, + "literals-string-raw-string-guts": { + "comment": "the same as #string-guts but with # in escapes", + "patterns": [ + { + "name": "constant.character.escape.swift", + "match": "\\\\#[0\\\\tnr\"']" + }, + { + "name": "constant.character.escape.unicode.swift", + "match": "\\\\#u\\{[0-9a-fA-F]{1,8}\\}" + }, + { + "contentName": "source.swift", + "name": "meta.embedded.line.swift", + "begin": "\\\\#\\(", + "end": "(\\))", + "beginCaptures": { + "0": { + "name": "punctuation.section.embedded.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.section.embedded.end.swift" + }, + "1": { + "name": "source.swift" + } + }, + "patterns": [ + { + "include": "$self" + }, + { + "comment": "Nested parens", + "begin": "\\(", + "end": "\\)" + } + ] + }, + { + "name": "invalid.illegal.escape-not-recognized", + "match": "\\\\#." + } + ] + }, + "literals-string-string-guts": { + "patterns": [ + { + "name": "constant.character.escape.swift", + "match": "\\\\[0\\\\tnr\"']" + }, + { + "name": "constant.character.escape.unicode.swift", + "match": "\\\\u\\{[0-9a-fA-F]{1,8}\\}" + }, + { + "contentName": "source.swift", + "name": "meta.embedded.line.swift", + "begin": "\\\\\\(", + "end": "(\\))", + "beginCaptures": { + "0": { + "name": "punctuation.section.embedded.begin.swift" + } + }, + "endCaptures": { + "0": { + "name": "punctuation.section.embedded.end.swift" + }, + "1": { + "name": "source.swift" + } + }, + "patterns": [ + { + "include": "$self" + }, + { + "comment": "Nested parens", + "begin": "\\(", + "end": "\\)" + } + ] + }, + { + "name": "invalid.illegal.escape-not-recognized", + "match": "\\\\." + } + ] + }, + "member-reference": { + "patterns": [ + { + "match": "(?<=\\.)((?`?)[\\p{L}_][\\p{L}_\\p{N}\\p{M}]*(\\k))", + "captures": { + "1": { + "name": "variable.other.swift" + }, + "2": { + "name": "punctuation.definition.identifier.swift" + }, + "3": { + "name": "punctuation.definition.identifier.swift" + } + } + } + ] + }, "operators": { "patterns": [ { "comment": "Type casting", - "match": "\\b(is\\b|as([!?]\\B|\\b))", - "name": "keyword.operator.type-casting.swift" + "name": "keyword.operator.type-casting.swift", + "match": "\\b(is\\b|as([!?]\\B|\\b))" }, { - "begin": "(?x)\n\t\t\t\t\t\t(?=\n\t\t\t\t\t\t\t(?\t\t\t\t\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t[/=\\-+!*%<>&|^~?]\n\t\t\t\t\t\t\t | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t | [\\x{00AC}\\x{00AE}]\n\t\t\t\t\t\t\t | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n\t\t\t\t\t\t\t | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t | [\\x{3001}-\\x{3003}]\n\t\t\t\t\t\t\t | [\\x{3008}-\\x{3030}]\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t | \\.\n\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\\g\t\t\t\t\t\t\t# operator-head\n\t\t\t\t\t\t\t | \\.\n\t\t\t\t\t\t\t | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\n\t\t\t\t\t\t\t | [\\x{1DC0}-\\x{1DFF}]\n\t\t\t\t\t\t\t | [\\x{20D0}-\\x{20FF}]\n\t\t\t\t\t\t\t | [\\x{FE00}-\\x{FE0F}]\n\t\t\t\t\t\t\t | [\\x{FE20}-\\x{FE2F}]\n\t\t\t\t\t\t\t | [\\x{E0100}-\\x{E01EF}]\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t)\n\t\t\t\t\t", "comment": "This rule helps us speed up the matching.", + "begin": "(?x)\n(?=\n (? # operator-head\n [/=\\-+!*%<>&|^~?]\n | [\\x{00A1}-\\x{00A7}]\n | [\\x{00A9}\\x{00AB}]\n | [\\x{00AC}\\x{00AE}]\n | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n | [\\x{2030}-\\x{203E}]\n | [\\x{2041}-\\x{2053}]\n | [\\x{2055}-\\x{205E}]\n | [\\x{2190}-\\x{23FF}]\n | [\\x{2500}-\\x{2775}]\n | [\\x{2794}-\\x{2BFF}]\n | [\\x{2E00}-\\x{2E7F}]\n | [\\x{3001}-\\x{3003}]\n | [\\x{3008}-\\x{3030}]\n )\n | \\.\n (\n \\g # operator-head\n | \\.\n | [\\x{0300}-\\x{036F}] # operator-character\n | [\\x{1DC0}-\\x{1DFF}]\n | [\\x{20D0}-\\x{20FF}]\n | [\\x{FE00}-\\x{FE0F}]\n | [\\x{FE20}-\\x{FE2F}]\n | [\\x{E0100}-\\x{E01EF}]\n )\n)", "end": "(?!\\G)", "patterns": [ { - "captures": { - "0": { - "patterns": [ - { - "match": "\\G(\\+\\+|\\-\\-)$", - "name": "keyword.operator.increment-or-decrement.swift" - }, - { - "match": "\\G(\\+|\\-)$", - "name": "keyword.operator.arithmetic.unary.swift" - }, - { - "match": "\\G!$", - "name": "keyword.operator.logical.not.swift" - }, - { - "match": "\\G~$", - "name": "keyword.operator.bitwise.not.swift" - }, - { - "match": ".+", - "name": "keyword.operator.custom.prefix.swift" - } - ] - } - }, "comment": "Prefix unary operator", - "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t(?<=^|[\\s(\\[{,;:])\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?!(//|/\\*|\\*/))\n\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t[/=\\-+!*%<>&|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t | [\\x{00AC}\\x{00AE}]\n\t\t\t\t\t\t\t\t\t | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n\t\t\t\t\t\t\t\t\t | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t | [\\x{3001}-\\x{3003}]\n\t\t\t\t\t\t\t\t\t | [\\x{3008}-\\x{3030}]\n\t\t\t\t\t\t\t\t \n\t\t\t\t\t\t\t\t\t | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\n\t\t\t\t\t\t\t\t\t | [\\x{1DC0}-\\x{1DFF}]\n\t\t\t\t\t\t\t\t\t | [\\x{20D0}-\\x{20FF}]\n\t\t\t\t\t\t\t\t\t | [\\x{FE00}-\\x{FE0F}]\n\t\t\t\t\t\t\t\t\t | [\\x{FE20}-\\x{FE2F}]\n\t\t\t\t\t\t\t\t\t | [\\x{E0100}-\\x{E01EF}]\n\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t)++\n\t\t\t\t\t\t\t\t(?![\\s)\\]},;:]|\\z)\n\t\t\t\t\t\t\t" - }, - { + "match": "(?x)\n\\G # Matching from the beginning ensures\n # that we start with operator-head\n(?<=^|[\\s(\\[{,;:])\n(\n (?!(//|/\\*|\\*/))\n (\n [/=\\-+!*%<>&|^~?] # operator-head\n | [\\x{00A1}-\\x{00A7}]\n | [\\x{00A9}\\x{00AB}]\n | [\\x{00AC}\\x{00AE}]\n | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n | [\\x{2030}-\\x{203E}]\n | [\\x{2041}-\\x{2053}]\n | [\\x{2055}-\\x{205E}]\n | [\\x{2190}-\\x{23FF}]\n | [\\x{2500}-\\x{2775}]\n | [\\x{2794}-\\x{2BFF}]\n | [\\x{2E00}-\\x{2E7F}]\n | [\\x{3001}-\\x{3003}]\n | [\\x{3008}-\\x{3030}]\n \n | [\\x{0300}-\\x{036F}] # operator-character\n | [\\x{1DC0}-\\x{1DFF}]\n | [\\x{20D0}-\\x{20FF}]\n | [\\x{FE00}-\\x{FE0F}]\n | [\\x{FE20}-\\x{FE2F}]\n | [\\x{E0100}-\\x{E01EF}]\n )\n)++\n(?![\\s)\\]},;:]|\\z)", "captures": { "0": { "patterns": [ { - "match": "\\G(\\+\\+|\\-\\-)$", - "name": "keyword.operator.increment-or-decrement.swift" + "name": "keyword.operator.increment-or-decrement.swift", + "match": "\\G(\\+\\+|\\-\\-)$" }, { - "match": "\\G!$", - "name": "keyword.operator.increment-or-decrement.swift" + "name": "keyword.operator.arithmetic.unary.swift", + "match": "\\G(\\+|\\-)$" }, { - "match": ".+", - "name": "keyword.operator.custom.postfix.swift" + "name": "keyword.operator.logical.not.swift", + "match": "\\G!$" + }, + { + "name": "keyword.operator.bitwise.not.swift", + "match": "\\G~$" + }, + { + "name": "keyword.operator.custom.prefix.swift", + "match": ".+" } ] } - }, + } + }, + { "comment": "Postfix unary operator", - "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t(?&|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t | [\\x{00AC}\\x{00AE}]\n\t\t\t\t\t\t\t\t\t | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n\t\t\t\t\t\t\t\t\t | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t | [\\x{3001}-\\x{3003}]\n\t\t\t\t\t\t\t\t\t | [\\x{3008}-\\x{3030}]\n\t\t\t\t\t\t\t\t \n\t\t\t\t\t\t\t\t\t | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\n\t\t\t\t\t\t\t\t\t | [\\x{1DC0}-\\x{1DFF}]\n\t\t\t\t\t\t\t\t\t | [\\x{20D0}-\\x{20FF}]\n\t\t\t\t\t\t\t\t\t | [\\x{FE00}-\\x{FE0F}]\n\t\t\t\t\t\t\t\t\t | [\\x{FE20}-\\x{FE2F}]\n\t\t\t\t\t\t\t\t\t | [\\x{E0100}-\\x{E01EF}]\n\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t)++\n\t\t\t\t\t\t\t\t(?=[\\s)\\]},;:]|\\z)\n\t\t\t\t\t\t\t" - }, - { + "match": "(?x)\n\\G # Matching from the beginning ensures\n # that we start with operator-head\n(?&|^~?] # operator-head\n | [\\x{00A1}-\\x{00A7}]\n | [\\x{00A9}\\x{00AB}]\n | [\\x{00AC}\\x{00AE}]\n | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n | [\\x{2030}-\\x{203E}]\n | [\\x{2041}-\\x{2053}]\n | [\\x{2055}-\\x{205E}]\n | [\\x{2190}-\\x{23FF}]\n | [\\x{2500}-\\x{2775}]\n | [\\x{2794}-\\x{2BFF}]\n | [\\x{2E00}-\\x{2E7F}]\n | [\\x{3001}-\\x{3003}]\n | [\\x{3008}-\\x{3030}]\n \n | [\\x{0300}-\\x{036F}] # operator-character\n | [\\x{1DC0}-\\x{1DFF}]\n | [\\x{20D0}-\\x{20FF}]\n | [\\x{FE00}-\\x{FE0F}]\n | [\\x{FE20}-\\x{FE2F}]\n | [\\x{E0100}-\\x{E01EF}]\n )\n)++\n(?=[\\s)\\]},;:]|\\z)", "captures": { "0": { "patterns": [ { - "match": "\\G=$", - "name": "keyword.operator.assignment.swift" + "name": "keyword.operator.increment-or-decrement.swift", + "match": "\\G(\\+\\+|\\-\\-)$" }, { - "match": "\\G(\\+|\\-|\\*|/|%|<<|>>|&|\\^|\\||&&|\\|\\|)=$", - "name": "keyword.operator.assignment.compound.swift" + "name": "keyword.operator.increment-or-decrement.swift", + "match": "\\G!$" }, { - "match": "\\G(\\+|\\-|\\*|/)$", - "name": "keyword.operator.arithmetic.swift" - }, - { - "match": "\\G&(\\+|\\-|\\*)$", - "name": "keyword.operator.arithmetic.overflow.swift" - }, - { - "match": "\\G%$", - "name": "keyword.operator.arithmetic.remainder.swift" - }, - { - "match": "\\G(==|!=|>|<|>=|<=|~=)$", - "name": "keyword.operator.comparison.swift" - }, - { - "match": "\\G\\?\\?$", - "name": "keyword.operator.coalescing.swift" - }, - { - "match": "\\G(&&|\\|\\|)$", - "name": "keyword.operator.logical.swift" - }, - { - "match": "\\G(&|\\||\\^|<<|>>)$", - "name": "keyword.operator.bitwise.swift" - }, - { - "match": "\\G(===|!==)$", - "name": "keyword.operator.bitwise.swift" - }, - { - "match": "\\G\\?$", - "name": "keyword.operator.ternary.swift" - }, - { - "match": ".+", - "name": "keyword.operator.custom.infix.swift" + "name": "keyword.operator.custom.postfix.swift", + "match": ".+" } ] } - }, + } + }, + { "comment": "Infix operator", - "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?!(//|/\\*|\\*/))\n\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t[/=\\-+!*%<>&|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t | [\\x{00AC}\\x{00AE}]\n\t\t\t\t\t\t\t\t\t | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n\t\t\t\t\t\t\t\t\t | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t | [\\x{3001}-\\x{3003}]\n\t\t\t\t\t\t\t\t\t | [\\x{3008}-\\x{3030}]\n\t\t\t\t\t\t\t\t \n\t\t\t\t\t\t\t\t\t | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\n\t\t\t\t\t\t\t\t\t | [\\x{1DC0}-\\x{1DFF}]\n\t\t\t\t\t\t\t\t\t | [\\x{20D0}-\\x{20FF}]\n\t\t\t\t\t\t\t\t\t | [\\x{FE00}-\\x{FE0F}]\n\t\t\t\t\t\t\t\t\t | [\\x{FE20}-\\x{FE2F}]\n\t\t\t\t\t\t\t\t\t | [\\x{E0100}-\\x{E01EF}]\n\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t)++\n\t\t\t\t\t\t\t" - }, - { + "match": "(?x)\n\\G # Matching from the beginning ensures\n # that we start with operator-head\n(\n (?!(//|/\\*|\\*/))\n (\n [/=\\-+!*%<>&|^~?] # operator-head\n | [\\x{00A1}-\\x{00A7}]\n | [\\x{00A9}\\x{00AB}]\n | [\\x{00AC}\\x{00AE}]\n | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n | [\\x{2030}-\\x{203E}]\n | [\\x{2041}-\\x{2053}]\n | [\\x{2055}-\\x{205E}]\n | [\\x{2190}-\\x{23FF}]\n | [\\x{2500}-\\x{2775}]\n | [\\x{2794}-\\x{2BFF}]\n | [\\x{2E00}-\\x{2E7F}]\n | [\\x{3001}-\\x{3003}]\n | [\\x{3008}-\\x{3030}]\n \n | [\\x{0300}-\\x{036F}] # operator-character\n | [\\x{1DC0}-\\x{1DFF}]\n | [\\x{20D0}-\\x{20FF}]\n | [\\x{FE00}-\\x{FE0F}]\n | [\\x{FE20}-\\x{FE2F}]\n | [\\x{E0100}-\\x{E01EF}]\n )\n)++", "captures": { "0": { "patterns": [ { - "match": ".+", - "name": "keyword.operator.custom.prefix.dot.swift" - } - ] - } - }, - "comment": "Dot prefix unary operator", - "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t(?<=^|[\\s(\\[{,;:])\n\t\t\t\t\t\t\t\t\\.\t\t\t\t\t\t\t\t\t\t# dot\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?!(//|/\\*|\\*/))\n\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\\.\t\t\t\t\t\t\t\t# dot\n\t\t\t\t\t\t\t\t\t | [/=\\-+!*%<>&|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t | [\\x{00AC}\\x{00AE}]\n\t\t\t\t\t\t\t\t\t | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n\t\t\t\t\t\t\t\t\t | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t | [\\x{3001}-\\x{3003}]\n\t\t\t\t\t\t\t\t\t | [\\x{3008}-\\x{3030}]\n\t\t\t\t\t\t\t\t \n\t\t\t\t\t\t\t\t\t | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\n\t\t\t\t\t\t\t\t\t | [\\x{1DC0}-\\x{1DFF}]\n\t\t\t\t\t\t\t\t\t | [\\x{20D0}-\\x{20FF}]\n\t\t\t\t\t\t\t\t\t | [\\x{FE00}-\\x{FE0F}]\n\t\t\t\t\t\t\t\t\t | [\\x{FE20}-\\x{FE2F}]\n\t\t\t\t\t\t\t\t\t | [\\x{E0100}-\\x{E01EF}]\n\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t)++\n\t\t\t\t\t\t\t\t(?![\\s)\\]},;:]|\\z)\n\t\t\t\t\t\t\t" - }, - { - "captures": { - "0": { - "patterns": [ - { - "match": ".+", - "name": "keyword.operator.custom.postfix.dot.swift" - } - ] - } - }, - "comment": "Dot postfix unary operator", - "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t(?&|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t | [\\x{00AC}\\x{00AE}]\n\t\t\t\t\t\t\t\t\t | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n\t\t\t\t\t\t\t\t\t | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t | [\\x{3001}-\\x{3003}]\n\t\t\t\t\t\t\t\t\t | [\\x{3008}-\\x{3030}]\n\t\t\t\t\t\t\t\t \n\t\t\t\t\t\t\t\t\t | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\n\t\t\t\t\t\t\t\t\t | [\\x{1DC0}-\\x{1DFF}]\n\t\t\t\t\t\t\t\t\t | [\\x{20D0}-\\x{20FF}]\n\t\t\t\t\t\t\t\t\t | [\\x{FE00}-\\x{FE0F}]\n\t\t\t\t\t\t\t\t\t | [\\x{FE20}-\\x{FE2F}]\n\t\t\t\t\t\t\t\t\t | [\\x{E0100}-\\x{E01EF}]\n\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t)++\n\t\t\t\t\t\t\t\t(?=[\\s)\\]},;:]|\\z)\n\t\t\t\t\t\t\t" - }, - { - "captures": { - "0": { - "patterns": [ - { - "match": "\\G\\.\\.[.<]$", - "name": "keyword.operator.range.swift" + "name": "keyword.operator.assignment.swift", + "match": "\\G=$" }, { - "match": ".+", - "name": "keyword.operator.custom.infix.dot.swift" + "name": "keyword.operator.assignment.compound.swift", + "match": "\\G(\\+|\\-|\\*|/|%|<<|>>|&|\\^|\\||&&|\\|\\|)=$" + }, + { + "name": "keyword.operator.arithmetic.swift", + "match": "\\G(\\+|\\-|\\*|/)$" + }, + { + "name": "keyword.operator.arithmetic.overflow.swift", + "match": "\\G&(\\+|\\-|\\*)$" + }, + { + "name": "keyword.operator.arithmetic.remainder.swift", + "match": "\\G%$" + }, + { + "name": "keyword.operator.comparison.swift", + "match": "\\G(==|!=|>|<|>=|<=|~=)$" + }, + { + "name": "keyword.operator.coalescing.swift", + "match": "\\G\\?\\?$" + }, + { + "name": "keyword.operator.logical.swift", + "match": "\\G(&&|\\|\\|)$" + }, + { + "name": "keyword.operator.bitwise.swift", + "match": "\\G(&|\\||\\^|<<|>>)$" + }, + { + "name": "keyword.operator.bitwise.swift", + "match": "\\G(===|!==)$" + }, + { + "name": "keyword.operator.ternary.swift", + "match": "\\G\\?$" + }, + { + "name": "keyword.operator.custom.infix.swift", + "match": ".+" } ] } - }, + } + }, + { + "comment": "Dot prefix unary operator", + "match": "(?x)\n\\G # Matching from the beginning ensures\n # that we start with operator-head\n(?<=^|[\\s(\\[{,;:])\n\\. # dot\n(\n (?!(//|/\\*|\\*/))\n (\n \\. # dot\n | [/=\\-+!*%<>&|^~?] # operator-head\n | [\\x{00A1}-\\x{00A7}]\n | [\\x{00A9}\\x{00AB}]\n | [\\x{00AC}\\x{00AE}]\n | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n | [\\x{2030}-\\x{203E}]\n | [\\x{2041}-\\x{2053}]\n | [\\x{2055}-\\x{205E}]\n | [\\x{2190}-\\x{23FF}]\n | [\\x{2500}-\\x{2775}]\n | [\\x{2794}-\\x{2BFF}]\n | [\\x{2E00}-\\x{2E7F}]\n | [\\x{3001}-\\x{3003}]\n | [\\x{3008}-\\x{3030}]\n \n | [\\x{0300}-\\x{036F}] # operator-character\n | [\\x{1DC0}-\\x{1DFF}]\n | [\\x{20D0}-\\x{20FF}]\n | [\\x{FE00}-\\x{FE0F}]\n | [\\x{FE20}-\\x{FE2F}]\n | [\\x{E0100}-\\x{E01EF}]\n )\n)++\n(?![\\s)\\]},;:]|\\z)", + "captures": { + "0": { + "patterns": [ + { + "name": "keyword.operator.custom.prefix.dot.swift", + "match": ".+" + } + ] + } + } + }, + { + "comment": "Dot postfix unary operator", + "match": "(?x)\n\\G # Matching from the beginning ensures\n # that we start with operator-head\n(?&|^~?] # operator-head\n | [\\x{00A1}-\\x{00A7}]\n | [\\x{00A9}\\x{00AB}]\n | [\\x{00AC}\\x{00AE}]\n | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n | [\\x{2030}-\\x{203E}]\n | [\\x{2041}-\\x{2053}]\n | [\\x{2055}-\\x{205E}]\n | [\\x{2190}-\\x{23FF}]\n | [\\x{2500}-\\x{2775}]\n | [\\x{2794}-\\x{2BFF}]\n | [\\x{2E00}-\\x{2E7F}]\n | [\\x{3001}-\\x{3003}]\n | [\\x{3008}-\\x{3030}]\n \n | [\\x{0300}-\\x{036F}] # operator-character\n | [\\x{1DC0}-\\x{1DFF}]\n | [\\x{20D0}-\\x{20FF}]\n | [\\x{FE00}-\\x{FE0F}]\n | [\\x{FE20}-\\x{FE2F}]\n | [\\x{E0100}-\\x{E01EF}]\n )\n)++\n(?=[\\s)\\]},;:]|\\z)", + "captures": { + "0": { + "patterns": [ + { + "name": "keyword.operator.custom.postfix.dot.swift", + "match": ".+" + } + ] + } + } + }, + { "comment": "Dot infix operator", - "match": "(?x)\n\t\t\t\t\t\t\t\t\\G\t\t\t\t\t\t\t\t\t\t# Matching from the beginning ensures\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t# that we start with operator-head\n\t\t\t\t\t\t\t\t\\.\t\t\t\t\t\t\t\t\t\t# dot\n\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t(?!(//|/\\*|\\*/))\n\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\\.\t\t\t\t\t\t\t\t# dot\n\t\t\t\t\t\t\t\t\t | [/=\\-+!*%<>&|^~?]\t\t\t\t# operator-head\n\t\t\t\t\t\t\t\t\t | [\\x{00A1}-\\x{00A7}]\n\t\t\t\t\t\t\t\t\t | [\\x{00A9}\\x{00AB}]\n\t\t\t\t\t\t\t\t\t | [\\x{00AC}\\x{00AE}]\n\t\t\t\t\t\t\t\t\t | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n\t\t\t\t\t\t\t\t\t | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n\t\t\t\t\t\t\t\t\t | [\\x{2030}-\\x{203E}]\n\t\t\t\t\t\t\t\t\t | [\\x{2041}-\\x{2053}]\n\t\t\t\t\t\t\t\t\t | [\\x{2055}-\\x{205E}]\n\t\t\t\t\t\t\t\t\t | [\\x{2190}-\\x{23FF}]\n\t\t\t\t\t\t\t\t\t | [\\x{2500}-\\x{2775}]\n\t\t\t\t\t\t\t\t\t | [\\x{2794}-\\x{2BFF}]\n\t\t\t\t\t\t\t\t\t | [\\x{2E00}-\\x{2E7F}]\n\t\t\t\t\t\t\t\t\t | [\\x{3001}-\\x{3003}]\n\t\t\t\t\t\t\t\t\t | [\\x{3008}-\\x{3030}]\n\t\t\t\t\t\t\t\t \n\t\t\t\t\t\t\t\t\t | [\\x{0300}-\\x{036F}]\t\t\t\t# operator-character\n\t\t\t\t\t\t\t\t\t | [\\x{1DC0}-\\x{1DFF}]\n\t\t\t\t\t\t\t\t\t | [\\x{20D0}-\\x{20FF}]\n\t\t\t\t\t\t\t\t\t | [\\x{FE00}-\\x{FE0F}]\n\t\t\t\t\t\t\t\t\t | [\\x{FE20}-\\x{FE2F}]\n\t\t\t\t\t\t\t\t\t | [\\x{E0100}-\\x{E01EF}]\n\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t)++\n\t\t\t\t\t\t\t" + "match": "(?x)\n\\G # Matching from the beginning ensures\n # that we start with operator-head\n\\. # dot\n(\n (?!(//|/\\*|\\*/))\n (\n \\. # dot\n | [/=\\-+!*%<>&|^~?] # operator-head\n | [\\x{00A1}-\\x{00A7}]\n | [\\x{00A9}\\x{00AB}]\n | [\\x{00AC}\\x{00AE}]\n | [\\x{00B0}-\\x{00B1}\\x{00B6}\\x{00BB}\\x{00BF}\\x{00D7}\\x{00F7}]\n | [\\x{2016}-\\x{2017}\\x{2020}-\\x{2027}]\n | [\\x{2030}-\\x{203E}]\n | [\\x{2041}-\\x{2053}]\n | [\\x{2055}-\\x{205E}]\n | [\\x{2190}-\\x{23FF}]\n | [\\x{2500}-\\x{2775}]\n | [\\x{2794}-\\x{2BFF}]\n | [\\x{2E00}-\\x{2E7F}]\n | [\\x{3001}-\\x{3003}]\n | [\\x{3008}-\\x{3030}]\n \n | [\\x{0300}-\\x{036F}] # operator-character\n | [\\x{1DC0}-\\x{1DFF}]\n | [\\x{20D0}-\\x{20FF}]\n | [\\x{FE00}-\\x{FE0F}]\n | [\\x{FE20}-\\x{FE2F}]\n | [\\x{E0100}-\\x{E01EF}]\n )\n)++", + "captures": { + "0": { + "patterns": [ + { + "name": "keyword.operator.range.swift", + "match": "\\G\\.\\.[.<]$" + }, + { + "name": "keyword.operator.custom.infix.dot.swift", + "match": ".+" + } + ] + } + } } ] }, { - "match": ":", - "name": "keyword.operator.ternary.swift" + "name": "keyword.operator.ternary.swift", + "match": ":" } ] }, diff --git a/extensions/theme-defaults/themes/dark_vs.json b/extensions/theme-defaults/themes/dark_vs.json index bbd2b232db2..543e4efcecd 100644 --- a/extensions/theme-defaults/themes/dark_vs.json +++ b/extensions/theme-defaults/themes/dark_vs.json @@ -310,9 +310,7 @@ "scope": [ "support.type.vendored.property-name", "support.type.property-name", - "variable.css", - "variable.scss", - "source.css.less variable.other", + "source.css variable", "source.coffee.embedded" ], "settings": { diff --git a/extensions/theme-defaults/themes/hc_black.json b/extensions/theme-defaults/themes/hc_black.json index 07cf7df710e..ebb49d98644 100644 --- a/extensions/theme-defaults/themes/hc_black.json +++ b/extensions/theme-defaults/themes/hc_black.json @@ -270,9 +270,7 @@ "scope": [ "support.type.vendored.property-name", "support.type.property-name", - "variable.css", - "variable.scss", - "source.css.less variable.other", + "source.css variable", "source.coffee.embedded" ], "settings": { diff --git a/extensions/theme-defaults/themes/hc_light.json b/extensions/theme-defaults/themes/hc_light.json index ff22daa9d3d..460f26ad738 100644 --- a/extensions/theme-defaults/themes/hc_light.json +++ b/extensions/theme-defaults/themes/hc_light.json @@ -280,9 +280,7 @@ "scope": [ "support.type.vendored.property-name", "support.type.property-name", - "variable.css", - "variable.scss", - "source.css.less variable.other", + "source.css variable", "source.coffee.embedded" ], "settings": { diff --git a/extensions/theme-defaults/themes/light_vs.json b/extensions/theme-defaults/themes/light_vs.json index 80fe7c7aaa7..c67d2932a16 100644 --- a/extensions/theme-defaults/themes/light_vs.json +++ b/extensions/theme-defaults/themes/light_vs.json @@ -328,9 +328,7 @@ "scope": [ "support.type.vendored.property-name", "support.type.property-name", - "variable.css", - "variable.scss", - "source.css.less variable.other", + "source.css variable", "source.coffee.embedded" ], "settings": { diff --git a/extensions/theme-seti/cgmanifest.json b/extensions/theme-seti/cgmanifest.json index b2b36944416..7e0ad68e317 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": "fd20793e5a75b350eab8d489165fb9b420df3f62" + "commitHash": "8eec7f2e37cd8fd91a98c61d129468bb49735a94" } }, "version": "0.1.0" diff --git a/extensions/theme-seti/icons/seti.woff b/extensions/theme-seti/icons/seti.woff index 88cb75699ed..5069a94ff94 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 184cded8cad..b40d561539e 100644 --- a/extensions/theme-seti/icons/vs-seti-icon-theme.json +++ b/extensions/theme-seti/icons/vs-seti-icon-theme.json @@ -1798,6 +1798,7 @@ "version.txt": "_clock", "version": "_clock", "mvnw": "_maven", + "pom.xml": "_maven", "tsconfig.json": "_tsconfig", "swagger.json": "_json_1", "swagger.yml": "_json_1", @@ -1916,7 +1917,7 @@ "sql": "_db", "swift": "_swift", "typescript": "_typescript", - "typescriptreact": "_typescript", + "typescriptreact": "_react", "xml": "_xml", "dockercompose": "_docker_3", "yaml": "_yml", @@ -2232,7 +2233,7 @@ "sql": "_db_light", "swift": "_swift_light", "typescript": "_typescript_light", - "typescriptreact": "_typescript_light", + "typescriptreact": "_react_light", "xml": "_xml_light", "dockercompose": "_docker_3_light", "yaml": "_yml_light", @@ -2280,6 +2281,7 @@ "version.txt": "_clock_light", "version": "_clock_light", "mvnw": "_maven_light", + "pom.xml": "_maven_light", "tsconfig.json": "_tsconfig_light", "swagger.json": "_json_1_light", "swagger.yml": "_json_1_light", @@ -2348,5 +2350,5 @@ "npm-debug.log": "_npm_ignored_light" } }, - "version": "https://github.com/jesseweed/seti-ui/commit/fd20793e5a75b350eab8d489165fb9b420df3f62" + "version": "https://github.com/jesseweed/seti-ui/commit/8eec7f2e37cd8fd91a98c61d129468bb49735a94" } \ No newline at end of file diff --git a/extensions/typescript-language-features/extension-browser.webpack.config.js b/extensions/typescript-language-features/extension-browser.webpack.config.js index 7e131117174..8c44bfc9713 100644 --- a/extensions/typescript-language-features/extension-browser.webpack.config.js +++ b/extensions/typescript-language-features/extension-browser.webpack.config.js @@ -65,7 +65,7 @@ module.exports = [withBrowserDefaults({ }), withBrowserDefaults({ context: __dirname, entry: { - 'typescript/tsserver.web': './web/webServer.ts' + 'typescript/tsserver.web': './web/src/webServer.ts' }, module: { exprContextCritical: false, diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json index f8cf80d7d4e..880c8dc462b 100644 --- a/extensions/typescript-language-features/package.json +++ b/extensions/typescript-language-features/package.json @@ -8,7 +8,9 @@ "license": "MIT", "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255", "enabledApiProposals": [ - "workspaceTrust" + "workspaceTrust", + "multiDocumentHighlightProvider", + "mappedEditsProvider" ], "capabilities": { "virtualWorkspaces": { @@ -51,7 +53,7 @@ "scripts": { "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:typescript-language-features", "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" + "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch" }, "activationEvents": [ "onLanguage:javascript", @@ -259,6 +261,12 @@ "description": "%typescript.implementationsCodeLens.enabled%", "scope": "window" }, + "typescript.implementationsCodeLens.showOnInterfaceMethods": { + "type": "boolean", + "default": false, + "description": "%typescript.implementationsCodeLens.showOnInterfaceMethods%", + "scope": "window" + }, "typescript.tsserver.enableTracing": { "type": "boolean", "default": false, diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json index d233e9614de..0bd09aa8d55 100644 --- a/extensions/typescript-language-features/package.nls.json +++ b/extensions/typescript-language-features/package.nls.json @@ -58,6 +58,7 @@ "typescript.referencesCodeLens.enabled": "Enable/disable references CodeLens in TypeScript files.", "typescript.referencesCodeLens.showOnAllFunctions": "Enable/disable references CodeLens on all functions in TypeScript files.", "typescript.implementationsCodeLens.enabled": "Enable/disable implementations CodeLens. This CodeLens shows the implementers of an interface.", + "typescript.implementationsCodeLens.showOnInterfaceMethods": "Enable/disable implementations CodeLens on interface methods.", "typescript.openTsServerLog.title": "Open TS Server log", "typescript.restartTsServer": "Restart TS Server", "typescript.selectTypeScriptVersion.title": "Select TypeScript Version...", diff --git a/extensions/typescript-language-features/src/extension.browser.ts b/extensions/typescript-language-features/src/extension.browser.ts index 65e9d57fc38..66532bc81fc 100644 --- a/extensions/typescript-language-features/src/extension.browser.ts +++ b/extensions/typescript-language-features/src/extension.browser.ts @@ -62,7 +62,7 @@ export async function activate(context: vscode.ExtensionContext): Promise { new TypeScriptVersion( TypeScriptVersionSource.Bundled, vscode.Uri.joinPath(context.extensionUri, 'dist/browser/typescript/tsserver.web.js').toString(), - API.fromSimpleString('5.1.3'))); + API.fromSimpleString('5.3.2'))); let experimentTelemetryReporter: IExperimentationTelemetryReporter | undefined; const packageInfo = getPackageInfo(context); diff --git a/extensions/typescript-language-features/src/languageFeatures/codeLens/baseCodeLensProvider.ts b/extensions/typescript-language-features/src/languageFeatures/codeLens/baseCodeLensProvider.ts index 7c970e4212c..4907fe4c282 100644 --- a/extensions/typescript-language-features/src/languageFeatures/codeLens/baseCodeLensProvider.ts +++ b/extensions/typescript-language-features/src/languageFeatures/codeLens/baseCodeLensProvider.ts @@ -9,6 +9,7 @@ import type * as Proto from '../../tsServer/protocol/protocol'; import * as typeConverters from '../../typeConverters'; import { ITypeScriptServiceClient } from '../../typescriptService'; import { escapeRegExp } from '../../utils/regexp'; +import { Disposable } from '../../utils/dispose'; export class ReferencesCodeLens extends vscode.CodeLens { @@ -21,7 +22,9 @@ export class ReferencesCodeLens extends vscode.CodeLens { } } -export abstract class TypeScriptBaseCodeLensProvider implements vscode.CodeLensProvider { +export abstract class TypeScriptBaseCodeLensProvider extends Disposable implements vscode.CodeLensProvider { + protected changeEmitter = this._register(new vscode.EventEmitter()); + public onDidChangeCodeLenses = this.changeEmitter.event; public static readonly cancelledCommand: vscode.Command = { // Cancellation is not an error. Just show nothing until we can properly re-compute the code lens @@ -37,8 +40,9 @@ export abstract class TypeScriptBaseCodeLensProvider implements vscode.CodeLensP public constructor( protected client: ITypeScriptServiceClient, private readonly cachedResponse: CachedResponse - ) { } - + ) { + super(); + } async provideCodeLenses(document: vscode.TextDocument, token: vscode.CancellationToken): Promise { const filepath = this.client.toOpenTsFilePath(document); diff --git a/extensions/typescript-language-features/src/languageFeatures/codeLens/implementationsCodeLens.ts b/extensions/typescript-language-features/src/languageFeatures/codeLens/implementationsCodeLens.ts index ca71495b345..6088292f8d0 100644 --- a/extensions/typescript-language-features/src/languageFeatures/codeLens/implementationsCodeLens.ts +++ b/extensions/typescript-language-features/src/languageFeatures/codeLens/implementationsCodeLens.ts @@ -17,6 +17,20 @@ import { ExecutionTarget } from '../../tsServer/server'; export default class TypeScriptImplementationsCodeLensProvider extends TypeScriptBaseCodeLensProvider { + public constructor( + client: ITypeScriptServiceClient, + protected _cachedResponse: CachedResponse, + private readonly language: LanguageDescription + ) { + super(client, _cachedResponse); + this._register( + vscode.workspace.onDidChangeConfiguration(evt => { + if (evt.affectsConfiguration(`${language.id}.implementationsCodeLens.showOnInterfaceMethods`)) { + this.changeEmitter.fire(); + } + }) + ); + } public async resolveCodeLens( codeLens: ReferencesCodeLens, @@ -71,8 +85,11 @@ export default class TypeScriptImplementationsCodeLensProvider extends TypeScrip protected extractSymbol( document: vscode.TextDocument, item: Proto.NavigationTree, - _parent: Proto.NavigationTree | undefined + parent: Proto.NavigationTree | undefined ): vscode.Range | undefined { + if (item.kind === PConst.Kind.method && parent && parent.kind === PConst.Kind.interface && vscode.workspace.getConfiguration(this.language.id).get('implementationsCodeLens.showOnInterfaceMethods')) { + return getSymbolRange(document, item); + } switch (item.kind) { case PConst.Kind.interface: return getSymbolRange(document, item); @@ -102,6 +119,6 @@ export function register( requireSomeCapability(client, ClientCapability.Semantic), ], () => { return vscode.languages.registerCodeLensProvider(selector.semantic, - new TypeScriptImplementationsCodeLensProvider(client, cachedResponse)); + new TypeScriptImplementationsCodeLensProvider(client, cachedResponse, language)); }); } diff --git a/extensions/typescript-language-features/src/languageFeatures/codeLens/referencesCodeLens.ts b/extensions/typescript-language-features/src/languageFeatures/codeLens/referencesCodeLens.ts index d76db9f9b18..de7d1f6d900 100644 --- a/extensions/typescript-language-features/src/languageFeatures/codeLens/referencesCodeLens.ts +++ b/extensions/typescript-language-features/src/languageFeatures/codeLens/referencesCodeLens.ts @@ -23,6 +23,13 @@ export class TypeScriptReferencesCodeLensProvider extends TypeScriptBaseCodeLens private readonly language: LanguageDescription ) { super(client, _cachedResponse); + this._register( + vscode.workspace.onDidChangeConfiguration(evt => { + if (evt.affectsConfiguration(`${language.id}.referencesCodeLens.showOnAllFunctions`)) { + this.changeEmitter.fire(); + } + }) + ); } public async resolveCodeLens(codeLens: ReferencesCodeLens, token: vscode.CancellationToken): Promise { @@ -70,7 +77,7 @@ export class TypeScriptReferencesCodeLensProvider extends TypeScriptBaseCodeLens switch (item.kind) { case PConst.Kind.function: { const showOnAllFunctions = vscode.workspace.getConfiguration(this.language.id).get('referencesCodeLens.showOnAllFunctions'); - if (showOnAllFunctions) { + if (showOnAllFunctions && item.nameSpan) { return getSymbolRange(document, item); } } diff --git a/extensions/typescript-language-features/src/languageFeatures/completions.ts b/extensions/typescript-language-features/src/languageFeatures/completions.ts index b97c9b8b3fb..943a2437449 100644 --- a/extensions/typescript-language-features/src/languageFeatures/completions.ts +++ b/extensions/typescript-language-features/src/languageFeatures/completions.ts @@ -760,6 +760,12 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider< isIncomplete = !!response.body.isIncomplete || (response as any).metadata && (response as any).metadata.isIncomplete; entries = response.body.entries; metadata = response.metadata; + + if (response.body.optionalReplacementSpan) { + for (const entry of entries) { + entry.replacementSpan ??= response.body.optionalReplacementSpan; + } + } } else { const response = await this.client.interruptGetErr(() => this.client.execute('completions', args, token)); if (response.type !== 'response' || !response.body) { diff --git a/extensions/typescript-language-features/src/languageFeatures/documentHighlight.ts b/extensions/typescript-language-features/src/languageFeatures/documentHighlight.ts index b3489ecdbc5..2213e3b4ee2 100644 --- a/extensions/typescript-language-features/src/languageFeatures/documentHighlight.ts +++ b/extensions/typescript-language-features/src/languageFeatures/documentHighlight.ts @@ -9,11 +9,43 @@ import type * as Proto from '../tsServer/protocol/protocol'; import * as typeConverters from '../typeConverters'; import { ITypeScriptServiceClient } from '../typescriptService'; -class TypeScriptDocumentHighlightProvider implements vscode.DocumentHighlightProvider { +class TypeScriptDocumentHighlightProvider implements vscode.DocumentHighlightProvider, vscode.MultiDocumentHighlightProvider { public constructor( private readonly client: ITypeScriptServiceClient ) { } + public async provideMultiDocumentHighlights( + document: vscode.TextDocument, + position: vscode.Position, + otherDocuments: vscode.TextDocument[], + token: vscode.CancellationToken + ): Promise { + const allFiles = [document, ...otherDocuments].map(doc => this.client.toOpenTsFilePath(doc)).filter(file => !!file) as string[]; + const file = this.client.toOpenTsFilePath(document); + + if (!file || allFiles.length === 0) { + return []; + } + + const args = { + ...typeConverters.Position.toFileLocationRequestArgs(file, position), + filesToSearch: allFiles + }; + const response = await this.client.execute('documentHighlights', args, token); + if (response.type !== 'response' || !response.body) { + return []; + } + + const result = response.body.map(highlightItem => + new vscode.MultiDocumentHighlight( + vscode.Uri.file(highlightItem.file), + [...convertDocumentHighlight(highlightItem)] + ) + ); + + return result; + } + public async provideDocumentHighlights( document: vscode.TextDocument, position: vscode.Position, @@ -48,6 +80,10 @@ export function register( selector: DocumentSelector, client: ITypeScriptServiceClient, ) { - return vscode.languages.registerDocumentHighlightProvider(selector.syntax, - new TypeScriptDocumentHighlightProvider(client)); + const provider = new TypeScriptDocumentHighlightProvider(client); + + return vscode.Disposable.from( + vscode.languages.registerDocumentHighlightProvider(selector.syntax, provider), + vscode.languages.registerMultiDocumentHighlightProvider(selector.syntax, provider) + ); } diff --git a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts index 3162410275e..42e7f9f7461 100644 --- a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts +++ b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts @@ -192,7 +192,7 @@ export default class FileConfigurationManager extends Disposable { includeCompletionsWithObjectLiteralMethodSnippets: config.get('suggest.objectLiteralMethodSnippets.enabled', true), autoImportFileExcludePatterns: this.getAutoImportFileExcludePatternsPreference(preferencesConfig, vscode.workspace.getWorkspaceFolder(document.uri)?.uri), // @ts-expect-error until 5.3 #56090 - preferTypeOnlyAutoImports: config.get('preferTypeOnlyAutoImports', false), + preferTypeOnlyAutoImports: preferencesConfig.get('preferTypeOnlyAutoImports', false), useLabelDetailsInCompletionEntries: true, allowIncompleteCompletions: true, displayPartsForJSDoc: true, diff --git a/extensions/typescript-language-features/src/languageFeatures/mappedCodeEditProvider.ts b/extensions/typescript-language-features/src/languageFeatures/mappedCodeEditProvider.ts new file mode 100644 index 00000000000..0d04d2dc808 --- /dev/null +++ b/extensions/typescript-language-features/src/languageFeatures/mappedCodeEditProvider.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. + *--------------------------------------------------------------------------------------------*/ + +import * as vscode from 'vscode'; +import { API } from '../tsServer/api'; +import { FileSpan } from '../tsServer/protocol/protocol'; +import { ITypeScriptServiceClient } from '../typescriptService'; +import { conditionalRegistration, requireMinVersion } from './util/dependentRegistration'; +import { Range, WorkspaceEdit } from '../typeConverters'; +import { DocumentSelector } from '../configuration/documentSelector'; + +class TsMappedEditsProvider implements vscode.MappedEditsProvider { + constructor( + private readonly client: ITypeScriptServiceClient + ) { } + + async provideMappedEdits(document: vscode.TextDocument, codeBlocks: string[], context: vscode.MappedEditsContext, token: vscode.CancellationToken): Promise { + if (!this.isEnabled()) { + return; + } + + const file = this.client.toOpenTsFilePath(document); + if (!file) { + return; + } + + const response = await this.client.execute('mapCode', { + mappings: [{ + file, + contents: codeBlocks, + focusLocations: context.documents.map(documents => { + return documents.flatMap((contextItem): FileSpan[] => { + const file = this.client.toTsFilePath(contextItem.uri); + if (!file) { + return []; + } + return contextItem.ranges.map((range): FileSpan => ({ file, ...Range.toTextSpan(range) })); + }); + }), + }], + }, token); + if (response.type !== 'response' || !response.body) { + return; + } + + return WorkspaceEdit.fromFileCodeEdits(this.client, response.body); + } + + private isEnabled(): boolean { + return vscode.workspace.getConfiguration('typescript').get('experimental.mappedCodeEdits.enabled', false); + } +} + +export function register( + selector: DocumentSelector, + client: ITypeScriptServiceClient, +) { + return conditionalRegistration([ + requireMinVersion(client, API.v540) + ], () => { + const provider = new TsMappedEditsProvider(client); + return vscode.chat.registerMappedEditsProvider(selector.semantic, provider); + }); +} diff --git a/extensions/typescript-language-features/src/languageFeatures/quickFix.ts b/extensions/typescript-language-features/src/languageFeatures/quickFix.ts index e0fadc0cc43..9f82bc759e3 100644 --- a/extensions/typescript-language-features/src/languageFeatures/quickFix.ts +++ b/extensions/typescript-language-features/src/languageFeatures/quickFix.ts @@ -223,7 +223,7 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider{ + arguments: [{ message: 'Add types to this code. Add separate interfaces when possible. Do not change the code except for adding types.', expand: { kind: 'navtree-function', pos: diagnostic.range.start }, - document - }], + document, + action: { type: 'quickfix', quickfix: action } + } satisfies EditorChatFollowUp_Args], title: '' }; actions.push(inferFromBody); @@ -370,7 +371,7 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider{ action: action, diagnostic, document }], + arguments: [{ action: action, diagnostic, document } satisfies ApplyCodeActionCommand_args], title: '' }; if (expand && message !== undefined) { @@ -380,11 +381,12 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider{ + arguments: [{ message, expand, - document - }], + document, + action: { type: 'quickfix', quickfix: action } + } satisfies EditorChatFollowUp_Args], }], }; } @@ -423,7 +425,7 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider{ action }], + arguments: [{ action } satisfies ApplyFixAllCodeAction_args], title: '' }; results.addFixAllAction(tsAction.fixId, action); diff --git a/extensions/typescript-language-features/src/languageFeatures/refactor.ts b/extensions/typescript-language-features/src/languageFeatures/refactor.ts index 061756576c5..6e2be78b6c6 100644 --- a/extensions/typescript-language-features/src/languageFeatures/refactor.ts +++ b/extensions/typescript-language-features/src/languageFeatures/refactor.ts @@ -13,14 +13,16 @@ import * as fileSchemes from '../configuration/fileSchemes'; import { Schemes } from '../configuration/schemes'; import { TelemetryReporter } from '../logging/telemetry'; import { API } from '../tsServer/api'; +import { CachedResponse } from '../tsServer/cachedResponse'; import type * as Proto from '../tsServer/protocol/protocol'; +import * as PConst from '../tsServer/protocol/protocol.const'; import * as typeConverters from '../typeConverters'; import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService'; import { coalesce } from '../utils/arrays'; import { nulToken } from '../utils/cancellation'; import FormattingOptionsManager from './fileConfigurationManager'; +import { CompositeCommand, EditorChatFollowUp, EditorChatFollowUp_Args } from './util/copilot'; import { conditionalRegistration, requireSomeCapability } from './util/dependentRegistration'; -import { EditorChatFollowUp, EditorChatFollowUp_Args, CompositeCommand } from './util/copilot'; function toWorkspaceEdit(client: ITypeScriptServiceClient, edits: readonly Proto.FileCodeEdits[]): vscode.WorkspaceEdit { const workspaceEdit = new vscode.WorkspaceEdit(); @@ -219,7 +221,7 @@ class MoveToFileRefactorCommand implements Command { quickPick.items = [ selectExistingFileItem, selectNewFileItem, - { label: vscode.l10n.t("Destination Files"), kind: vscode.QuickPickItemKind.Separator }, + { label: vscode.l10n.t("destination files"), kind: vscode.QuickPickItemKind.Separator }, ...coalesce(destinationItems) ]; }; @@ -455,8 +457,44 @@ type TsCodeAction = InlinedCodeAction | MoveToFileCodeAction | SelectCodeAction; class TypeScriptRefactorProvider implements vscode.CodeActionProvider { + private static readonly _declarationKinds = new Set([ + PConst.Kind.module, + PConst.Kind.class, + PConst.Kind.interface, + PConst.Kind.function, + PConst.Kind.enum, + PConst.Kind.type, + PConst.Kind.const, + PConst.Kind.variable, + PConst.Kind.let, + ]); + + private static isOnSignatureName(node: Proto.NavigationTree, range: vscode.Range): boolean { + if (this._declarationKinds.has(node.kind)) { + // Show when on the name span + if (node.nameSpan) { + const convertedSpan = typeConverters.Range.fromTextSpan(node.nameSpan); + if (range.intersection(convertedSpan)) { + return true; + } + } + + // Show when on the same line as an exported symbols without a name (handles default exports) + if (!node.nameSpan && /\bexport\b/.test(node.kindModifiers) && node.spans.length) { + const convertedSpan = typeConverters.Range.fromTextSpan(node.spans[0]); + if (range.intersection(new vscode.Range(convertedSpan.start.line, 0, convertedSpan.start.line, Number.MAX_SAFE_INTEGER))) { + return true; + } + } + } + + // Show if on the signature of any children + return node.childItems?.some(child => this.isOnSignatureName(child, range)) ?? false; + } + constructor( private readonly client: ITypeScriptServiceClient, + private readonly cachedNavTree: CachedResponse, private readonly formattingOptionsManager: FormattingOptionsManager, commandManager: CommandManager, telemetryReporter: TelemetryReporter @@ -465,7 +503,7 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider { + const applicableRefactors = this.convertApplicableRefactors(document, response.body, rangeOrSelection); + const actions = coalesce(await Promise.all(Array.from(applicableRefactors, async action => { if (this.client.apiVersion.lt(API.v430)) { // Don't show 'infer return type' refactoring unless it has been explicitly requested // https://github.com/microsoft/TypeScript/issues/42993 if (!context.only && action.kind?.value === 'refactor.rewrite.function.returnType') { - return false; + return undefined; } } - return true; - }); + + // Don't include move actions on auto light bulb unless you are on a declaration name + if (this.client.apiVersion.lt(API.v540) && context.triggerKind === vscode.CodeActionTriggerKind.Automatic) { + if (action.kind?.value === Move_NewFile.kind.value || action.kind?.value === Move_File.kind.value) { + const file = this.client.toOpenTsFilePath(document); + if (!file) { + return undefined; + } + + const navTree = await this.cachedNavTree.execute(document, () => this.client.execute('navtree', { file }, token)); + if (navTree.type !== 'response' || !navTree.body || !TypeScriptRefactorProvider.isOnSignatureName(navTree.body, rangeOrSelection)) { + return undefined; + } + } + } + + return action; + }))); if (!context.only) { return actions; } + return this.pruneInvalidActions(this.appendInvalidActions(actions), context.only, /* numberOfInvalid = */ 5); } @@ -544,10 +600,7 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider ({ title: '', command: EditorChatFollowUp.ID, - arguments: [{ + arguments: [{ message: `Rename ${newName} to a better name based on usage.`, expand: Extract_Constant.matches(action) ? { kind: 'navtree-function', @@ -600,8 +654,9 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider, formattingOptionsManager: FormattingOptionsManager, commandManager: CommandManager, telemetryReporter: TelemetryReporter, @@ -728,7 +784,7 @@ export function register( requireSomeCapability(client, ClientCapability.Semantic), ], () => { return vscode.languages.registerCodeActionsProvider(selector.semantic, - new TypeScriptRefactorProvider(client, formattingOptionsManager, commandManager, telemetryReporter), + new TypeScriptRefactorProvider(client, cachedNavTree, formattingOptionsManager, commandManager, telemetryReporter), TypeScriptRefactorProvider.metadata); }); } diff --git a/extensions/typescript-language-features/src/languageFeatures/rename.ts b/extensions/typescript-language-features/src/languageFeatures/rename.ts index 3dcca16f5b2..19dc5b93c99 100644 --- a/extensions/typescript-language-features/src/languageFeatures/rename.ts +++ b/extensions/typescript-language-features/src/languageFeatures/rename.ts @@ -85,7 +85,7 @@ class TypeScriptRenameProvider implements vscode.RenameProvider { } if (renameInfo.fileToRename) { - const edits = await this.renameFile(renameInfo.fileToRename, newName, token); + const edits = await this.renameFile(renameInfo.fileToRename, renameInfo.fullDisplayName, newName, token); if (edits) { return edits; } else { @@ -170,13 +170,17 @@ class TypeScriptRenameProvider implements vscode.RenameProvider { private async renameFile( fileToRename: string, + fullDisplayName: string, newName: string, token: vscode.CancellationToken, ): Promise { - // Make sure we preserve file extension if none provided + // Make sure we preserve file extension if extension is unchanged or none provided if (!path.extname(newName)) { newName += path.extname(fileToRename); } + else if (path.extname(newName) === path.extname(fullDisplayName)) { + newName = newName.slice(0, newName.length - path.extname(newName).length) + path.extname(fileToRename); + } const dirname = path.dirname(fileToRename); const newFilePath = path.join(dirname, newName); diff --git a/extensions/typescript-language-features/src/languageFeatures/util/copilot.ts b/extensions/typescript-language-features/src/languageFeatures/util/copilot.ts index 697cf78954d..e03358a81b0 100644 --- a/extensions/typescript-language-features/src/languageFeatures/util/copilot.ts +++ b/extensions/typescript-language-features/src/languageFeatures/util/copilot.ts @@ -9,6 +9,7 @@ import { nulToken } from '../../utils/cancellation'; import type * as Proto from '../../tsServer/protocol/protocol'; import * as typeConverters from '../../typeConverters'; import { ITypeScriptServiceClient } from '../../typescriptService'; +import { TelemetryReporter } from '../../logging/telemetry'; export class EditorChatFollowUp implements Command { public static readonly ID = '_typescript.quickFix.editorChatReplacement2'; @@ -16,9 +17,38 @@ export class EditorChatFollowUp implements Command { constructor( private readonly client: ITypeScriptServiceClient, + private readonly telemetryReporter: TelemetryReporter, ) { } - async execute({ message, document, expand }: EditorChatFollowUp_Args) { + async execute({ message, document, expand, action }: EditorChatFollowUp_Args) { + if (action.type === 'quickfix') { + /* __GDPR__ + "aiQuickfix.execute" : { + "owner": "mjbvz", + "action" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }, + "${include}": [ + "${TypeScriptCommonProperties}" + ] + } + */ + this.telemetryReporter.logTelemetry('aiQuickfix.execute', { + action: action.quickfix.fixName, + }); + } else { + /* __GDPR__ + "aiRefactor.execute" : { + "owner": "mjbvz", + "action" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }, + "${include}": [ + "${TypeScriptCommonProperties}" + ] + } + */ + this.telemetryReporter.logTelemetry('aiRefactor.execute', { + action: action.refactor.name, + }); + } + const initialRange = expand.kind === 'navtree-function' ? await findScopeEndLineFromNavTree( @@ -50,6 +80,13 @@ export interface EditorChatFollowUp_Args { readonly message: string; readonly document: vscode.TextDocument; readonly expand: Expand; + readonly action: { + readonly type: 'refactor'; + readonly refactor: Proto.RefactorActionInfo; + } | { + readonly type: 'quickfix'; + readonly quickfix: Proto.CodeFixAction; + }; } export class CompositeCommand implements Command { diff --git a/extensions/typescript-language-features/src/languageProvider.ts b/extensions/typescript-language-features/src/languageProvider.ts index 7acbf733f0c..6157c3b8cb4 100644 --- a/extensions/typescript-language-features/src/languageProvider.ts +++ b/extensions/typescript-language-features/src/languageProvider.ts @@ -57,17 +57,17 @@ export default class LanguageProvider extends Disposable { private async registerProviders(): Promise { const selector = this.documentSelector; - const cachedResponse = new CachedResponse(); + const cachedNavTreeResponse = new CachedResponse(); await Promise.all([ import('./languageFeatures/callHierarchy').then(provider => this._register(provider.register(selector, this.client))), - import('./languageFeatures/codeLens/implementationsCodeLens').then(provider => this._register(provider.register(selector, this.description, this.client, cachedResponse))), - import('./languageFeatures/codeLens/referencesCodeLens').then(provider => this._register(provider.register(selector, this.description, this.client, cachedResponse))), + import('./languageFeatures/codeLens/implementationsCodeLens').then(provider => this._register(provider.register(selector, this.description, this.client, cachedNavTreeResponse))), + import('./languageFeatures/codeLens/referencesCodeLens').then(provider => this._register(provider.register(selector, this.description, this.client, cachedNavTreeResponse))), import('./languageFeatures/completions').then(provider => this._register(provider.register(selector, this.description, this.client, this.typingsStatus, this.fileConfigurationManager, this.commandManager, this.telemetryReporter, this.onCompletionAccepted))), import('./languageFeatures/definitions').then(provider => this._register(provider.register(selector, this.client))), import('./languageFeatures/directiveCommentCompletions').then(provider => this._register(provider.register(selector, this.client))), import('./languageFeatures/documentHighlight').then(provider => this._register(provider.register(selector, this.client))), - import('./languageFeatures/documentSymbol').then(provider => this._register(provider.register(selector, this.client, cachedResponse))), + import('./languageFeatures/documentSymbol').then(provider => this._register(provider.register(selector, this.client, cachedNavTreeResponse))), import('./languageFeatures/fileReferences').then(provider => this._register(provider.register(this.client, this.commandManager))), import('./languageFeatures/fixAll').then(provider => this._register(provider.register(selector, this.client, this.fileConfigurationManager, this.client.diagnosticsManager))), import('./languageFeatures/folding').then(provider => this._register(provider.register(selector, this.client))), @@ -77,9 +77,10 @@ export default class LanguageProvider extends Disposable { import('./languageFeatures/inlayHints').then(provider => this._register(provider.register(selector, this.description, this.client, this.fileConfigurationManager, this.telemetryReporter))), import('./languageFeatures/jsDocCompletions').then(provider => this._register(provider.register(selector, this.description, this.client, this.fileConfigurationManager))), import('./languageFeatures/linkedEditing').then(provider => this._register(provider.register(selector, this.client))), + import('./languageFeatures/mappedCodeEditProvider').then(provider => this._register(provider.register(selector, this.client))), import('./languageFeatures/organizeImports').then(provider => this._register(provider.register(selector, this.client, this.commandManager, this.fileConfigurationManager, this.telemetryReporter))), import('./languageFeatures/quickFix').then(provider => this._register(provider.register(selector, this.client, this.fileConfigurationManager, this.commandManager, this.client.diagnosticsManager, this.telemetryReporter))), - import('./languageFeatures/refactor').then(provider => this._register(provider.register(selector, this.client, this.fileConfigurationManager, this.commandManager, this.telemetryReporter))), + import('./languageFeatures/refactor').then(provider => this._register(provider.register(selector, this.client, cachedNavTreeResponse, this.fileConfigurationManager, this.commandManager, this.telemetryReporter))), import('./languageFeatures/references').then(provider => this._register(provider.register(selector, this.client))), import('./languageFeatures/rename').then(provider => this._register(provider.register(selector, this.description, this.client, this.fileConfigurationManager))), import('./languageFeatures/semanticTokens').then(provider => this._register(provider.register(selector, this.client))), diff --git a/extensions/typescript-language-features/src/tsServer/api.ts b/extensions/typescript-language-features/src/tsServer/api.ts index d7d24848baa..92e4503ec85 100644 --- a/extensions/typescript-language-features/src/tsServer/api.ts +++ b/extensions/typescript-language-features/src/tsServer/api.ts @@ -35,6 +35,7 @@ export class API { public static readonly v500 = API.fromSimpleString('5.0.0'); public static readonly v510 = API.fromSimpleString('5.1.0'); public static readonly v520 = API.fromSimpleString('5.2.0'); + public static readonly v540 = API.fromSimpleString('5.4.0'); public static fromVersionString(versionString: string): API { let version = semver.valid(versionString); diff --git a/extensions/typescript-language-features/src/tsServer/protocol/protocol.d.ts b/extensions/typescript-language-features/src/tsServer/protocol/protocol.d.ts index 38345971fc8..b8d863ebb1a 100644 --- a/extensions/typescript-language-features/src/tsServer/protocol/protocol.d.ts +++ b/extensions/typescript-language-features/src/tsServer/protocol/protocol.d.ts @@ -19,5 +19,43 @@ declare module 'typescript/lib/tsserverlibrary' { interface Response { readonly _serverType?: ServerType; } + + export interface MapCodeRequestArgs { + /// The files and changes to try and apply/map. + mappings: MapCodeRequestDocumentMapping[]; + + /// Edits to apply to the current workspace before performing the mapping. + updates?: FileCodeEdits[] + } + + export interface MapCodeRequestDocumentMapping { + /// The file for the request (absolute pathname required). Null/undefined + /// if specific file is unknown. + file?: string; + + /// Optional name of project that contains file + projectFileName?: string; + + /// The specific code to map/insert/replace in the file. + contents: string[]; + + /// Areas of "focus" to inform the code mapper with. For example, cursor + /// location, current selection, viewport, etc. Nested arrays denote + /// priority: toplevel arrays are more important than inner arrays, and + /// inner array priorities are based on items within that array. Items + /// earlier in the arrays have higher priority. + focusLocations?: FileSpan[][]; + } + + export interface MapCodeRequest extends Request { + command: 'mapCode', + arguments: MapCodeRequestArgs; + } + + export interface MapCodeResponse extends Response { + body: FileCodeEdits[] + } } } + + diff --git a/extensions/typescript-language-features/src/typescriptService.ts b/extensions/typescript-language-features/src/typescriptService.ts index 6eb30e20986..5823430c416 100644 --- a/extensions/typescript-language-features/src/typescriptService.ts +++ b/extensions/typescript-language-features/src/typescriptService.ts @@ -76,6 +76,7 @@ interface StandardTsServerRequests { 'findSourceDefinition': [Proto.FileLocationRequestArgs, Proto.DefinitionResponse]; 'getMoveToRefactoringFileSuggestions': [Proto.GetMoveToRefactoringFileSuggestionsRequestArgs, Proto.GetMoveToRefactoringFileSuggestions]; 'linkedEditingRange': [Proto.FileLocationRequestArgs, Proto.LinkedEditingRangeResponse]; + 'mapCode': [Proto.MapCodeRequestArgs, Proto.MapCodeResponse]; } interface NoResponseTsServerRequests { diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts index a38914263b9..0796befc6bb 100644 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts @@ -355,12 +355,12 @@ export default class TypeScriptServiceClient extends Disposable implements IType return this._onReady!.promise.then(f); } - private info(message: string, data?: any): void { - this.logger.info(message, data); + private info(message: string, ...data: any[]): void { + this.logger.info(message, ...data); } - private error(message: string, data?: any): void { - this.logger.error(message, data); + private error(message: string, ...data: any[]): void { + this.logger.error(message, ...data); } private logTelemetry(eventName: string, properties?: TelemetryProperties) { diff --git a/extensions/typescript-language-features/src/ui/activeJsTsEditorTracker.ts b/extensions/typescript-language-features/src/ui/activeJsTsEditorTracker.ts index e7ad8d7ea09..3da1f5a8570 100644 --- a/extensions/typescript-language-features/src/ui/activeJsTsEditorTracker.ts +++ b/extensions/typescript-language-features/src/ui/activeJsTsEditorTracker.ts @@ -7,6 +7,7 @@ import * as vscode from 'vscode'; import { isJsConfigOrTsConfigFileName } from '../configuration/languageDescription'; import { isSupportedLanguageMode } from '../configuration/languageIds'; import { Disposable } from '../utils/dispose'; +import { coalesce } from '../utils/arrays'; /** * Tracks the active JS/TS editor. @@ -24,41 +25,81 @@ export class ActiveJsTsEditorTracker extends Disposable { public constructor() { super(); - vscode.window.onDidChangeActiveTextEditor(this.onDidChangeActiveTextEditor, this, this._disposables); - vscode.window.onDidChangeVisibleTextEditors(() => { - // Make sure the active editor is still in the visible set. - // This can happen if the output view is focused and the last active TS file is closed - if (this._activeJsTsEditor) { - if (!vscode.window.visibleTextEditors.some(visibleEditor => visibleEditor === this._activeJsTsEditor)) { - this.onDidChangeActiveTextEditor(undefined); - } - } - }, this, this._disposables); - this.onDidChangeActiveTextEditor(vscode.window.activeTextEditor); + this._register(vscode.window.onDidChangeActiveTextEditor(_ => this.update())); + this._register(vscode.window.onDidChangeVisibleTextEditors(_ => this.update())); + + this.update(); } public get activeJsTsEditor(): vscode.TextEditor | undefined { return this._activeJsTsEditor; } - private onDidChangeActiveTextEditor(editor: vscode.TextEditor | undefined): any { - if (editor === this._activeJsTsEditor) { - return; + + private update() { + // Use tabs to find the active editor. + // This correctly handles switching to the output view / debug console, which changes the activeEditor but not + // the active tab. + const editorCandidates = this.getEditorCandidatesForActiveTab(); + const managedEditors = editorCandidates.filter(editor => this.isManagedFile(editor)); + const newActiveJsTsEditor = managedEditors.at(0); + if (this._activeJsTsEditor !== newActiveJsTsEditor) { + this._activeJsTsEditor = newActiveJsTsEditor; + this._onDidChangeActiveJsTsEditor.fire(this._activeJsTsEditor); + } + } + + private getEditorCandidatesForActiveTab(): vscode.TextEditor[] { + const tab = vscode.window.tabGroups.activeTabGroup.activeTab; + if (!tab) { + return []; } - if (editor && !editor.viewColumn) { - // viewColumn is undefined for the debug/output panel, but we still want - // to show the version info for the previous editor - return; + // Basic text editor tab + if (tab.input instanceof vscode.TabInputText) { + const inputUri = tab.input.uri; + const editor = vscode.window.visibleTextEditors.find(editor => { + return editor.document.uri.toString() === inputUri.toString() + && editor.viewColumn === tab.group.viewColumn; + }); + return editor ? [editor] : []; } - if (editor && this.isManagedFile(editor)) { - this._activeJsTsEditor = editor; - } else { - this._activeJsTsEditor = undefined; + // Diff editor tab. We could be focused on either side of the editor. + if (tab.input instanceof vscode.TabInputTextDiff) { + const original = tab.input.original; + const modified = tab.input.modified; + // Check the active editor first. However if a non tab editor like the output view is focused, + // we still need to check the visible text editors. + // TODO: This may return incorrect editors incorrect as there does not seem to be a reliable way to map from an editor to the + // view column of its parent diff editor. See https://github.com/microsoft/vscode/issues/201845 + return coalesce([vscode.window.activeTextEditor, ...vscode.window.visibleTextEditors]).filter(editor => { + return (editor.document.uri.toString() === original.toString() || editor.document.uri.toString() === modified.toString()) + && editor.viewColumn === undefined; // Editors in diff views have undefined view columns + }); } - this._onDidChangeActiveJsTsEditor.fire(this._activeJsTsEditor); + + // Notebook editor. Find editor for notebook cell. + if (tab.input instanceof vscode.TabInputNotebook) { + const activeEditor = vscode.window.activeTextEditor; + if (!activeEditor) { + return []; + } + + // Notebooks cell editors have undefined view columns. + if (activeEditor.viewColumn !== undefined) { + return []; + } + + const notebook = vscode.window.visibleNotebookEditors.find(editor => + editor.notebook.uri.toString() === (tab.input as vscode.TabInputNotebook).uri.toString() + && editor.viewColumn === tab.group.viewColumn); + + return notebook?.notebook.getCells().some(cell => cell.document.uri.toString() === activeEditor.document.uri.toString()) ? [activeEditor] : []; + } + + return []; } private isManagedFile(editor: vscode.TextEditor): boolean { diff --git a/extensions/typescript-language-features/tsconfig.json b/extensions/typescript-language-features/tsconfig.json index 73957dde932..f5236f44031 100644 --- a/extensions/typescript-language-features/tsconfig.json +++ b/extensions/typescript-language-features/tsconfig.json @@ -11,6 +11,8 @@ "include": [ "src/**/*", "../../src/vscode-dts/vscode.d.ts", - "../../src/vscode-dts/vscode.proposed.workspaceTrust.d.ts" + "../../src/vscode-dts/vscode.proposed.workspaceTrust.d.ts", + "../../src/vscode-dts/vscode.proposed.multiDocumentHighlightProvider.d.ts", + "../../src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts", ] } diff --git a/extensions/typescript-language-features/web/src/fileWatcherManager.ts b/extensions/typescript-language-features/web/src/fileWatcherManager.ts new file mode 100644 index 00000000000..8c8d7403740 --- /dev/null +++ b/extensions/typescript-language-features/web/src/fileWatcherManager.ts @@ -0,0 +1,128 @@ +/*--------------------------------------------------------------------------------------------- + * 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 ts from 'typescript/lib/tsserverlibrary'; +import { URI } from 'vscode-uri'; +import { Logger } from './logging'; +import { PathMapper, fromResource, looksLikeLibDtsPath, looksLikeNodeModules, mapUri } from './pathMapper'; + +/** + * Copied from `ts.FileWatcherEventKind` to avoid direct dependency. + */ +enum FileWatcherEventKind { + Created = 0, + Changed = 1, + Deleted = 2, +} + +export class FileWatcherManager { + private static readonly noopWatcher: ts.FileWatcher = { close() { } }; + + private readonly watchFiles = new Map(); + private readonly watchDirectories = new Map(); + + private watchId = 0; + + constructor( + private readonly watchPort: MessagePort, + extensionUri: URI, + private readonly enabledExperimentalTypeAcquisition: boolean, + private readonly pathMapper: PathMapper, + private readonly logger: Logger + ) { + watchPort.onmessage = (e: any) => this.updateWatch(e.data.event, URI.from(e.data.uri), extensionUri); + } + + watchFile(path: string, callback: ts.FileWatcherCallback, pollingInterval?: number, options?: ts.WatchOptions): ts.FileWatcher { + if (looksLikeLibDtsPath(path)) { // We don't support watching lib files on web since they are readonly + return FileWatcherManager.noopWatcher; + } + + console.log('watching file:', path); + + this.logger.logVerbose('fs.watchFile', { path }); + + let uri: URI; + try { + uri = this.pathMapper.toResource(path); + } catch (e) { + console.error(e); + return FileWatcherManager.noopWatcher; + } + + this.watchFiles.set(path, { callback, pollingInterval, options }); + const watchIds = [++this.watchId]; + this.watchPort.postMessage({ type: 'watchFile', uri: uri, id: watchIds[0] }); + if (this.enabledExperimentalTypeAcquisition && looksLikeNodeModules(path)) { + watchIds.push(++this.watchId); + this.watchPort.postMessage({ type: 'watchFile', uri: mapUri(uri, 'vscode-node-modules'), id: watchIds[1] }); + } + return { + close: () => { + this.logger.logVerbose('fs.watchFile.close', { path }); + this.watchFiles.delete(path); + for (const id of watchIds) { + this.watchPort.postMessage({ type: 'dispose', id }); + } + } + }; + } + + watchDirectory(path: string, callback: ts.DirectoryWatcherCallback, recursive?: boolean, options?: ts.WatchOptions): ts.FileWatcher { + this.logger.logVerbose('fs.watchDirectory', { path }); + + let uri: URI; + try { + uri = this.pathMapper.toResource(path); + } catch (e) { + console.error(e); + return FileWatcherManager.noopWatcher; + } + + this.watchDirectories.set(path, { callback, recursive, options }); + const watchIds = [++this.watchId]; + this.watchPort.postMessage({ type: 'watchDirectory', recursive, uri, id: this.watchId }); + return { + close: () => { + this.logger.logVerbose('fs.watchDirectory.close', { path }); + + this.watchDirectories.delete(path); + for (const id of watchIds) { + this.watchPort.postMessage({ type: 'dispose', id }); + } + } + }; + } + + private updateWatch(event: 'create' | 'change' | 'delete', uri: URI, extensionUri: URI) { + const kind = this.toTsWatcherKind(event); + const path = fromResource(extensionUri, uri); + + const fileWatcher = this.watchFiles.get(path); + if (fileWatcher) { + fileWatcher.callback(path, kind); + return; + } + + for (const watch of Array.from(this.watchDirectories.keys()).filter(dir => path.startsWith(dir))) { + this.watchDirectories.get(watch)!.callback(path); + return; + } + + console.error(`no watcher found for ${path}`); + } + + private toTsWatcherKind(event: 'create' | 'change' | 'delete') { + if (event === 'create') { + return FileWatcherEventKind.Created; + } else if (event === 'change') { + return FileWatcherEventKind.Changed; + } else if (event === 'delete') { + return FileWatcherEventKind.Deleted; + } + throw new Error(`Unknown event: ${event}`); + } +} + diff --git a/extensions/typescript-language-features/web/src/logging.ts b/extensions/typescript-language-features/web/src/logging.ts new file mode 100644 index 00000000000..843228f0df0 --- /dev/null +++ b/extensions/typescript-language-features/web/src/logging.ts @@ -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. + *--------------------------------------------------------------------------------------------*/ +import type * as ts from 'typescript/lib/tsserverlibrary'; + +/** + * Matches the ts.server.LogLevel enum + */ +export enum LogLevel { + terse = 0, + normal = 1, + requestTime = 2, + verbose = 3, +} + +export class Logger { + public readonly tsLogger: ts.server.Logger; + + constructor(logLevel: LogLevel | undefined) { + const doLog = typeof logLevel === 'undefined' + ? (_message: string) => { } + : (message: string) => { postMessage({ type: 'log', body: message }); }; + + this.tsLogger = { + close: () => { }, + hasLevel: level => typeof logLevel === 'undefined' ? false : level <= logLevel, + loggingEnabled: () => true, + perftrc: () => { }, + info: doLog, + msg: doLog, + startGroup: () => { }, + endGroup: () => { }, + getLogFileName: () => undefined + }; + } + + log(level: LogLevel, message: string, data?: any) { + if (this.tsLogger.hasLevel(level)) { + this.tsLogger.info(message + (data ? ' ' + JSON.stringify(data) : '')); + } + } + + logNormal(message: string, data?: any) { + this.log(LogLevel.normal, message, data); + } + + logVerbose(message: string, data?: any) { + this.log(LogLevel.verbose, message, data); + } +} + +export function parseLogLevel(input: string | undefined): LogLevel | undefined { + switch (input) { + case 'normal': return LogLevel.normal; + case 'terse': return LogLevel.terse; + case 'verbose': return LogLevel.verbose; + default: return undefined; + } +} diff --git a/extensions/typescript-language-features/web/src/pathMapper.ts b/extensions/typescript-language-features/web/src/pathMapper.ts new file mode 100644 index 00000000000..e92548950fc --- /dev/null +++ b/extensions/typescript-language-features/web/src/pathMapper.ts @@ -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. + *--------------------------------------------------------------------------------------------*/ +import { URI } from 'vscode-uri'; + +export class PathMapper { + + private readonly projectRootPaths = new Map(); + + constructor( + private readonly extensionUri: URI + ) { } + + /** + * Copied from toResource in typescriptServiceClient.ts + */ + toResource(filepath: string): URI { + if (looksLikeLibDtsPath(filepath)) { + return URI.from({ + scheme: this.extensionUri.scheme, + authority: this.extensionUri.authority, + path: this.extensionUri.path + '/dist/browser/typescript/' + filepath.slice(1) + }); + } + + const uri = filePathToResourceUri(filepath); + if (!uri) { + throw new Error(`Could not parse path ${filepath}`); + } + + // Check if TS is trying to read a file outside of the project root. + // We allow reading files on unknown scheme as these may be loose files opened by the user. + // However we block reading files on schemes that are on a known file system with an unknown root + let allowRead: 'implicit' | 'block' | 'allow' = 'implicit'; + for (const projectRoot of this.projectRootPaths.values()) { + if (uri.scheme === projectRoot.scheme) { + if (uri.toString().startsWith(projectRoot.toString())) { + allowRead = 'allow'; + break; + } + + // Tentatively block the read but a future loop may allow it + allowRead = 'block'; + } + } + + if (allowRead === 'block') { + throw new AccessOutsideOfRootError(filepath, Array.from(this.projectRootPaths.keys())); + } + + return uri; + } + + addProjectRoot(projectRootPath: string) { + const uri = filePathToResourceUri(projectRootPath); + if (uri) { + this.projectRootPaths.set(projectRootPath, uri); + } + } +} + +class AccessOutsideOfRootError extends Error { + constructor( + public readonly filepath: string, + public readonly projectRootPaths: readonly string[] + ) { + super(`Could not read file outside of project root ${filepath}`); + } +} + +export function fromResource(extensionUri: URI, uri: URI) { + if (uri.scheme === extensionUri.scheme + && uri.authority === extensionUri.authority + && uri.path.startsWith(extensionUri.path + '/dist/browser/typescript/lib.') + && uri.path.endsWith('.d.ts')) { + return uri.path; + } + return `/${uri.scheme}/${uri.authority}${uri.path}`; +} + +export function looksLikeLibDtsPath(filepath: string) { + return filepath.startsWith('/lib.') && filepath.endsWith('.d.ts'); +} + +export function looksLikeNodeModules(filepath: string) { + return filepath.includes('/node_modules'); +} + +function filePathToResourceUri(filepath: string): URI | undefined { + const parts = filepath.match(/^\/([^\/]+)\/([^\/]*)(?:\/(.+))?$/); + if (!parts) { + return undefined; + } + + const scheme = parts[1]; + const authority = parts[2] === 'ts-nul-authority' ? '' : parts[2]; + const path = parts[3]; + return URI.from({ scheme, authority, path: (path ? '/' + path : path) }); +} + +export function mapUri(uri: URI, mappedScheme: string): URI { + if (uri.scheme === 'vscode-global-typings') { + throw new Error('can\'t map vscode-global-typings'); + } + if (!uri.authority) { + uri = uri.with({ authority: 'ts-nul-authority' }); + } + uri = uri.with({ scheme: mappedScheme, path: `/${uri.scheme}/${uri.authority || 'ts-nul-authority'}${uri.path}` }); + + return uri; +} diff --git a/extensions/typescript-language-features/web/src/serverHost.ts b/extensions/typescript-language-features/web/src/serverHost.ts new file mode 100644 index 00000000000..f2f9ca95996 --- /dev/null +++ b/extensions/typescript-language-features/web/src/serverHost.ts @@ -0,0 +1,428 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { ApiClient, FileStat, FileType, Requests } from '@vscode/sync-api-client'; +import { ClientConnection } from '@vscode/sync-api-common/browser'; +import { basename } from 'path'; +import type * as ts from 'typescript/lib/tsserverlibrary'; +import { FileWatcherManager } from './fileWatcherManager'; +import { Logger } from './logging'; +import { PathMapper, looksLikeNodeModules, mapUri } from './pathMapper'; +import { findArgument, hasArgument } from './util/args'; + +type ServerHostWithImport = ts.server.ServerHost & { importPlugin(root: string, moduleName: string): Promise }; + +function createServerHost( + ts: typeof import('typescript/lib/tsserverlibrary'), + logger: Logger, + apiClient: ApiClient | undefined, + args: readonly string[], + watchManager: FileWatcherManager, + pathMapper: PathMapper, + enabledExperimentalTypeAcquisition: boolean, + exit: () => void, +): ServerHostWithImport { + const currentDirectory = '/'; + const fs = apiClient?.vscode.workspace.fileSystem; + + // Internals + const combinePaths: (path: string, ...paths: (string | undefined)[]) => string = (ts as any).combinePaths; + const byteOrderMarkIndicator = '\uFEFF'; + const matchFiles: ( + path: string, + extensions: readonly string[] | undefined, + excludes: readonly string[] | undefined, + includes: readonly string[] | undefined, + useCaseSensitiveFileNames: boolean, + currentDirectory: string, + depth: number | undefined, + getFileSystemEntries: (path: string) => { files: readonly string[]; directories: readonly string[] }, + realpath: (path: string) => string + ) => string[] = (ts as any).matchFiles; + const generateDjb2Hash = (ts as any).generateDjb2Hash; + + // Legacy web + const memoize: (callback: () => T) => () => T = (ts as any).memoize; + const ensureTrailingDirectorySeparator: (path: string) => string = (ts as any).ensureTrailingDirectorySeparator; + const getDirectoryPath: (path: string) => string = (ts as any).getDirectoryPath; + const directorySeparator: string = (ts as any).directorySeparator; + const executingFilePath = findArgument(args, '--executingFilePath') || location + ''; + const getExecutingDirectoryPath = memoize(() => memoize(() => ensureTrailingDirectorySeparator(getDirectoryPath(executingFilePath)))); + const getWebPath = (path: string) => path.startsWith(directorySeparator) ? path.replace(directorySeparator, getExecutingDirectoryPath()) : undefined; + + const textDecoder = new TextDecoder(); + const textEncoder = new TextEncoder(); + + return { + watchFile: watchManager.watchFile.bind(watchManager), + watchDirectory: watchManager.watchDirectory.bind(watchManager), + setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): any { + return setTimeout(callback, ms, ...args); + }, + clearTimeout(timeoutId: any): void { + clearTimeout(timeoutId); + }, + setImmediate(callback: (...args: any[]) => void, ...args: any[]): any { + return this.setTimeout(callback, 0, ...args); + }, + clearImmediate(timeoutId: any): void { + this.clearTimeout(timeoutId); + }, + importPlugin: async (root, moduleName) => { + const packageRoot = combinePaths(root, moduleName); + + let packageJson: any | undefined; + try { + const packageJsonResponse = await fetch(combinePaths(packageRoot, 'package.json')); + packageJson = await packageJsonResponse.json(); + } catch (e) { + return { module: undefined, error: new Error(`Could not load plugin. Could not load 'package.json'.`) }; + } + + const browser = packageJson.browser; + if (!browser) { + return { module: undefined, error: new Error(`Could not load plugin. No 'browser' field found in package.json.`) }; + } + + const scriptPath = combinePaths(packageRoot, browser); + try { + const { default: module } = await import(/* webpackIgnore: true */ scriptPath); + return { module, error: undefined }; + } catch (e) { + return { module: undefined, error: e }; + } + }, + args: Array.from(args), + newLine: '\n', + useCaseSensitiveFileNames: true, + write: s => { + apiClient?.vscode.terminal.write(s); + }, + writeOutputIsTTY() { + return true; + }, + readFile(path) { + logger.logVerbose('fs.readFile', { path }); + + if (!fs) { + const webPath = getWebPath(path); + if (webPath) { + const request = new XMLHttpRequest(); + request.open('GET', webPath, /* asynchronous */ false); + request.send(); + return request.status === 200 ? request.responseText : undefined; + } else { + return undefined; + } + } + + let uri; + try { + uri = pathMapper.toResource(path); + } catch (e) { + return undefined; + } + + let contents: Uint8Array | undefined; + try { + // We need to slice the bytes since we can't pass a shared array to text decoder + contents = fs.readFile(uri); + } catch (error) { + if (!enabledExperimentalTypeAcquisition) { + return undefined; + } + try { + contents = fs.readFile(mapUri(uri, 'vscode-node-modules')); + } catch (e) { + return undefined; + } + } + return textDecoder.decode(contents.slice()); + }, + getFileSize(path) { + logger.logVerbose('fs.getFileSize', { path }); + + if (!fs) { + throw new Error('not supported'); + } + + const uri = pathMapper.toResource(path); + let ret = 0; + try { + ret = fs.stat(uri).size; + } catch (_error) { + if (enabledExperimentalTypeAcquisition) { + try { + ret = fs.stat(mapUri(uri, 'vscode-node-modules')).size; + } catch (_error) { + } + } + } + return ret; + }, + writeFile(path, data, writeByteOrderMark) { + logger.logVerbose('fs.writeFile', { path }); + + if (!fs) { + throw new Error('not supported'); + } + + if (writeByteOrderMark) { + data = byteOrderMarkIndicator + data; + } + + let uri; + try { + uri = pathMapper.toResource(path); + } catch (e) { + return; + } + const encoded = textEncoder.encode(data); + try { + fs.writeFile(uri, encoded); + const name = basename(uri.path); + if (uri.scheme !== 'vscode-global-typings' && (name === 'package.json' || name === 'package-lock.json' || name === 'package-lock.kdl')) { + fs.writeFile(mapUri(uri, 'vscode-node-modules'), encoded); + } + } catch (error) { + console.error('fs.writeFile', { path, error }); + } + }, + resolvePath(path: string): string { + return path; + }, + fileExists(path: string): boolean { + logger.logVerbose('fs.fileExists', { path }); + + if (!fs) { + const webPath = getWebPath(path); + if (!webPath) { + return false; + } + + const request = new XMLHttpRequest(); + request.open('HEAD', webPath, /* asynchronous */ false); + request.send(); + return request.status === 200; + } + + let uri; + try { + uri = pathMapper.toResource(path); + } catch (e) { + return false; + } + let ret = false; + try { + ret = fs.stat(uri).type === FileType.File; + } catch (_error) { + if (enabledExperimentalTypeAcquisition) { + try { + ret = fs.stat(mapUri(uri, 'vscode-node-modules')).type === FileType.File; + } catch (_error) { + } + } + } + return ret; + }, + directoryExists(path: string): boolean { + logger.logVerbose('fs.directoryExists', { path }); + + if (!fs) { + return false; + } + + let uri; + try { + uri = pathMapper.toResource(path); + } catch (_error) { + return false; + } + + let stat: FileStat | undefined = undefined; + try { + stat = fs.stat(uri); + } catch (_error) { + if (enabledExperimentalTypeAcquisition) { + try { + stat = fs.stat(mapUri(uri, 'vscode-node-modules')); + } catch (_error) { + } + } + } + if (stat) { + if (path.startsWith('/https') && !path.endsWith('.d.ts')) { + // TODO: Hack, https 'file system' can't actually tell what is a file vs directory + return stat.type === FileType.File || stat.type === FileType.Directory; + } + + return stat.type === FileType.Directory; + } else { + return false; + } + }, + createDirectory(path: string): void { + logger.logVerbose('fs.createDirectory', { path }); + if (!fs) { + throw new Error('not supported'); + } + + try { + fs.createDirectory(pathMapper.toResource(path)); + } catch (error) { + logger.logNormal('Error fs.createDirectory', { path, error: error + '' }); + } + }, + getExecutingFilePath(): string { + return currentDirectory; + }, + getCurrentDirectory(): string { + return currentDirectory; + }, + getDirectories(path: string): string[] { + logger.logVerbose('fs.getDirectories', { path }); + + return getAccessibleFileSystemEntries(path).directories.slice(); + }, + readDirectory(path: string, extensions?: readonly string[], excludes?: readonly string[], includes?: readonly string[], depth?: number): string[] { + logger.logVerbose('fs.readDirectory', { path }); + + return matchFiles(path, extensions, excludes, includes, /*useCaseSensitiveFileNames*/ true, currentDirectory, depth, getAccessibleFileSystemEntries, realpath); + }, + getModifiedTime(path: string): Date | undefined { + logger.logVerbose('fs.getModifiedTime', { path }); + + if (!fs) { + throw new Error('not supported'); + } + + const uri = pathMapper.toResource(path); + let s: FileStat | undefined = undefined; + try { + s = fs.stat(uri); + } catch (_e) { + if (enabledExperimentalTypeAcquisition) { + try { + s = fs.stat(mapUri(uri, 'vscode-node-modules')); + } catch (_e) { + } + } + } + return s && new Date(s.mtime); + }, + deleteFile(path: string): void { + logger.logVerbose('fs.deleteFile', { path }); + + if (!fs) { + throw new Error('not supported'); + } + + try { + fs.delete(pathMapper.toResource(path)); + } catch (error) { + logger.logNormal('Error fs.deleteFile', { path, error: error + '' }); + } + }, + createHash: generateDjb2Hash, + /** This must be cryptographically secure. + The browser implementation, crypto.subtle.digest, is async so not possible to call from tsserver. */ + createSHA256Hash: undefined, + exit: exit, + realpath, + base64decode: input => Buffer.from(input, 'base64').toString('utf8'), + base64encode: input => Buffer.from(input).toString('base64'), + }; + + // For module resolution only. `node_modules` is also automatically mapped + // as if all node_modules-like paths are symlinked. + function realpath(path: string): string { + const isNm = looksLikeNodeModules(path) && !path.startsWith('/vscode-global-typings/'); + // skip paths without .. or ./ or /. And things that look like node_modules + if (!isNm && !path.match(/\.\.|\/\.|\.\//)) { + return path; + } + + let uri = pathMapper.toResource(path); + if (isNm) { + uri = mapUri(uri, 'vscode-node-modules'); + } + const out = [uri.scheme]; + if (uri.authority) { out.push(uri.authority); } + for (const part of uri.path.split('/')) { + switch (part) { + case '': + case '.': + break; + case '..': + //delete if there is something there to delete + out.pop(); + break; + default: + out.push(part); + } + } + return '/' + out.join('/'); + } + + function getAccessibleFileSystemEntries(path: string): { files: readonly string[]; directories: readonly string[] } { + if (!fs) { + throw new Error('not supported'); + } + + const uri = pathMapper.toResource(path || '.'); + let entries: [string, FileType][] = []; + const files: string[] = []; + const directories: string[] = []; + try { + entries = fs.readDirectory(uri); + } catch (_e) { + try { + entries = fs.readDirectory(mapUri(uri, 'vscode-node-modules')); + } catch (_e) { + } + } + for (const [entry, type] of entries) { + // This is necessary because on some file system node fails to exclude + // '.' and '..'. See https://github.com/nodejs/node/issues/4002 + if (entry === '.' || entry === '..') { + continue; + } + + if (type === FileType.File) { + files.push(entry); + } + else if (type === FileType.Directory) { + directories.push(entry); + } + } + files.sort(); + directories.sort(); + return { files, directories }; + } +} + +export async function createSys( + ts: typeof import('typescript/lib/tsserverlibrary'), + args: readonly string[], + fsPort: MessagePort, + logger: Logger, + watchManager: FileWatcherManager, + pathMapper: PathMapper, + onExit: () => void, +) { + if (hasArgument(args, '--enableProjectWideIntelliSenseOnWeb')) { + const enabledExperimentalTypeAcquisition = hasArgument(args, '--experimentalTypeAcquisition'); + const connection = new ClientConnection(fsPort); + await connection.serviceReady(); + + const apiClient = new ApiClient(connection); + const fs = apiClient.vscode.workspace.fileSystem; + const sys = createServerHost(ts, logger, apiClient, args, watchManager, pathMapper, enabledExperimentalTypeAcquisition, onExit); + return { sys, fs }; + } else { + return { sys: createServerHost(ts, logger, undefined, args, watchManager, pathMapper, false, onExit) }; + } +} + diff --git a/extensions/typescript-language-features/web/jsTyping.ts b/extensions/typescript-language-features/web/src/typingsInstaller/jsTyping.ts similarity index 100% rename from extensions/typescript-language-features/web/jsTyping.ts rename to extensions/typescript-language-features/web/src/typingsInstaller/jsTyping.ts diff --git a/extensions/typescript-language-features/web/typingsInstaller.ts b/extensions/typescript-language-features/web/src/typingsInstaller/typingsInstaller.ts similarity index 98% rename from extensions/typescript-language-features/web/typingsInstaller.ts rename to extensions/typescript-language-features/web/src/typingsInstaller/typingsInstaller.ts index 7b9b164c40c..7c40993d6df 100644 --- a/extensions/typescript-language-features/web/typingsInstaller.ts +++ b/extensions/typescript-language-features/web/src/typingsInstaller/typingsInstaller.ts @@ -34,7 +34,7 @@ type InstallerResponse = ts.server.PackageInstalledResponse | ts.server.SetTypin * The "server" part of the "server/client" model. This is the part that * actually gets instantiated and passed to tsserver. */ -export default class WebTypingsInstallerClient implements ts.server.ITypingsInstaller { +export class WebTypingsInstallerClient implements ts.server.ITypingsInstaller { private projectService: ts.server.ProjectService | undefined; diff --git a/extensions/typescript-language-features/web/src/util/args.ts b/extensions/typescript-language-features/web/src/util/args.ts new file mode 100644 index 00000000000..8a9224ddf6b --- /dev/null +++ b/extensions/typescript-language-features/web/src/util/args.ts @@ -0,0 +1,42 @@ +/*--------------------------------------------------------------------------------------------- + * 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 ts from 'typescript/lib/tsserverlibrary'; + +export function hasArgument(args: readonly string[], name: string): boolean { + return args.indexOf(name) >= 0; +} + +export function findArgument(args: readonly string[], name: string): string | undefined { + const index = args.indexOf(name); + return 0 <= index && index < args.length - 1 + ? args[index + 1] + : undefined; +} + +export function findArgumentStringArray(args: readonly string[], name: string): readonly string[] { + const arg = findArgument(args, name); + return arg === undefined ? [] : arg.split(',').filter(name => name !== ''); +} + +/** + * Copied from `ts.LanguageServiceMode` to avoid direct dependency. + */ +export enum LanguageServiceMode { + Semantic = 0, + PartialSemantic = 1, + Syntactic = 2, +} + +export function parseServerMode(args: readonly string[]): ts.LanguageServiceMode | string | undefined { + const mode = findArgument(args, '--serverMode'); + if (!mode) { return undefined; } + + switch (mode.toLowerCase()) { + case 'semantic': return LanguageServiceMode.Semantic; + case 'partialsemantic': return LanguageServiceMode.PartialSemantic; + case 'syntactic': return LanguageServiceMode.Syntactic; + default: return mode; + } +} diff --git a/extensions/typescript-language-features/web/src/util/hrtime.ts b/extensions/typescript-language-features/web/src/util/hrtime.ts new file mode 100644 index 00000000000..76ed9db834f --- /dev/null +++ b/extensions/typescript-language-features/web/src/util/hrtime.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. + *--------------------------------------------------------------------------------------------*/ +export function hrtime(previous?: [number, number]): [number, number] { + const now = self.performance.now() * 0.001; + let seconds = Math.floor(now); + let nanoseconds = Math.floor((now % 1) * 1000000000); + // NOTE: This check is added probably because it's missed without strictFunctionTypes on + if (previous?.[0] !== undefined && previous?.[1] !== undefined) { + seconds = seconds - previous[0]; + nanoseconds = nanoseconds - previous[1]; + if (nanoseconds < 0) { + seconds--; + nanoseconds += 1000000000; + } + } + return [seconds, nanoseconds]; +} diff --git a/extensions/typescript-language-features/web/src/wasmCancellationToken.ts b/extensions/typescript-language-features/web/src/wasmCancellationToken.ts new file mode 100644 index 00000000000..3885d107f25 --- /dev/null +++ b/extensions/typescript-language-features/web/src/wasmCancellationToken.ts @@ -0,0 +1,26 @@ +/*--------------------------------------------------------------------------------------------- + * 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 ts from 'typescript/lib/tsserverlibrary'; + +export class WasmCancellationToken implements ts.server.ServerCancellationToken { + shouldCancel: (() => boolean) | undefined; + currentRequestId: number | undefined = undefined; + + setRequest(requestId: number) { + this.currentRequestId = requestId; + } + + resetRequest(requestId: number) { + if (requestId === this.currentRequestId) { + this.currentRequestId = undefined; + } else { + throw new Error(`Mismatched request id, expected ${this.currentRequestId} but got ${requestId}`); + } + } + + isCancellationRequested(): boolean { + return this.currentRequestId !== undefined && !!this.shouldCancel && this.shouldCancel(); + } +} diff --git a/extensions/typescript-language-features/web/src/webServer.ts b/extensions/typescript-language-features/web/src/webServer.ts new file mode 100644 index 00000000000..3d2d5f9dfeb --- /dev/null +++ b/extensions/typescript-language-features/web/src/webServer.ts @@ -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. + *--------------------------------------------------------------------------------------------*/ +/// + +import ts from 'typescript/lib/tsserverlibrary'; +import { URI } from 'vscode-uri'; +import { FileWatcherManager } from './fileWatcherManager'; +import { Logger, parseLogLevel } from './logging'; +import { PathMapper } from './pathMapper'; +import { createSys } from './serverHost'; +import { findArgument, findArgumentStringArray, hasArgument, parseServerMode } from './util/args'; +import { StartSessionOptions, startWorkerSession } from './workerSession'; + +const setSys: (s: ts.System) => void = (ts as any).setSys; + +async function initializeSession( + args: readonly string[], + extensionUri: URI, + ports: { tsserver: MessagePort; sync: MessagePort; watcher: MessagePort }, +): Promise { + const logLevel = parseLogLevel(findArgument(args, '--logVerbosity')); + const logger = new Logger(logLevel); + + const modeOrUnknown = parseServerMode(args); + const serverMode = typeof modeOrUnknown === 'number' ? modeOrUnknown : undefined; + const unknownServerMode = typeof modeOrUnknown === 'string' ? modeOrUnknown : undefined; + logger.tsLogger.info(`Starting TS Server`); + logger.tsLogger.info(`Version: 0.0.0`); + logger.tsLogger.info(`Arguments: ${args.join(' ')}`); + logger.tsLogger.info(`ServerMode: ${serverMode} unknownServerMode: ${unknownServerMode}`); + const sessionOptions = parseSessionOptions(args, serverMode); + + const enabledExperimentalTypeAcquisition = hasArgument(args, '--enableProjectWideIntelliSenseOnWeb') && hasArgument(args, '--experimentalTypeAcquisition'); + + const pathMapper = new PathMapper(extensionUri); + const watchManager = new FileWatcherManager(ports.watcher, extensionUri, enabledExperimentalTypeAcquisition, pathMapper, logger); + + const { sys, fs } = await createSys(ts, args, ports.sync, logger, watchManager, pathMapper, () => { + removeEventListener('message', listener); + }); + setSys(sys); + startWorkerSession(ts, sys, fs, sessionOptions, ports.tsserver, pathMapper, logger); +} + +function parseSessionOptions(args: readonly string[], serverMode: ts.LanguageServiceMode | undefined): StartSessionOptions { + return { + globalPlugins: findArgumentStringArray(args, '--globalPlugins'), + pluginProbeLocations: findArgumentStringArray(args, '--pluginProbeLocations'), + allowLocalPluginLoads: hasArgument(args, '--allowLocalPluginLoads'), + useSingleInferredProject: hasArgument(args, '--useSingleInferredProject'), + useInferredProjectPerProjectRoot: hasArgument(args, '--useInferredProjectPerProjectRoot'), + suppressDiagnosticEvents: hasArgument(args, '--suppressDiagnosticEvents'), + noGetErrOnBackgroundUpdate: hasArgument(args, '--noGetErrOnBackgroundUpdate'), + serverMode, + disableAutomaticTypingAcquisition: hasArgument(args, '--disableAutomaticTypingAcquisition'), + }; +} + +let hasInitialized = false; +const listener = async (e: any) => { + if (!hasInitialized) { + hasInitialized = true; + if ('args' in e.data) { + const args = e.data.args; + const extensionUri = URI.from(e.data.extensionUri); + const [sync, tsserver, watcher] = e.ports as MessagePort[]; + await initializeSession(args, extensionUri, { sync, tsserver, watcher }); + } else { + console.error('unexpected message in place of initial message: ' + JSON.stringify(e.data)); + } + return; + } + console.error(`unexpected message on main channel: ${JSON.stringify(e)}`); +}; +addEventListener('message', listener); diff --git a/extensions/typescript-language-features/web/src/workerSession.ts b/extensions/typescript-language-features/web/src/workerSession.ts new file mode 100644 index 00000000000..6ae517ccc32 --- /dev/null +++ b/extensions/typescript-language-features/web/src/workerSession.ts @@ -0,0 +1,126 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +import { FileSystem } from '@vscode/sync-api-client'; +import type * as ts from 'typescript/lib/tsserverlibrary'; +import { Logger } from './logging'; +import { WebTypingsInstallerClient } from './typingsInstaller/typingsInstaller'; +import { hrtime } from './util/hrtime'; +import { WasmCancellationToken } from './wasmCancellationToken'; +import { PathMapper } from './pathMapper'; + +export interface StartSessionOptions { + readonly globalPlugins: ts.server.SessionOptions['globalPlugins']; + readonly pluginProbeLocations: ts.server.SessionOptions['pluginProbeLocations']; + readonly allowLocalPluginLoads: ts.server.SessionOptions['allowLocalPluginLoads']; + readonly useSingleInferredProject: ts.server.SessionOptions['useSingleInferredProject']; + readonly useInferredProjectPerProjectRoot: ts.server.SessionOptions['useInferredProjectPerProjectRoot']; + readonly suppressDiagnosticEvents: ts.server.SessionOptions['suppressDiagnosticEvents']; + readonly noGetErrOnBackgroundUpdate: ts.server.SessionOptions['noGetErrOnBackgroundUpdate']; + readonly serverMode: ts.server.SessionOptions['serverMode']; + readonly disableAutomaticTypingAcquisition: boolean; +} + +export function startWorkerSession( + ts: typeof import('typescript/lib/tsserverlibrary'), + host: ts.server.ServerHost, + fs: FileSystem | undefined, + options: StartSessionOptions, + port: MessagePort, + pathMapper: PathMapper, + logger: Logger, +): void { + const indent: (str: string) => string = (ts as any).server.indent; + + const worker = new class WorkerSession extends ts.server.Session<{}> { + + private readonly wasmCancellationToken: WasmCancellationToken; + private readonly listener: (message: any) => void; + + constructor() { + const cancellationToken = new WasmCancellationToken(); + const typingsInstaller = options.disableAutomaticTypingAcquisition || !fs ? ts.server.nullTypingsInstaller : new WebTypingsInstallerClient(host, '/vscode-global-typings/ts-nul-authority/projects'); + + super({ + host, + cancellationToken, + ...options, + typingsInstaller, + byteLength: () => { throw new Error('Not implemented'); }, // Formats the message text in send of Session which is overridden in this class so not needed + hrtime, + logger: logger.tsLogger, + canUseEvents: true, + }); + this.wasmCancellationToken = cancellationToken; + + this.listener = (message: any) => { + // TEMP fix since Cancellation.retrieveCheck is not correct + function retrieveCheck2(data: any) { + if (!globalThis.crossOriginIsolated || !(data.$cancellationData instanceof SharedArrayBuffer)) { + return () => false; + } + const typedArray = new Int32Array(data.$cancellationData, 0, 1); + return () => { + return Atomics.load(typedArray, 0) === 1; + }; + } + + const shouldCancel = retrieveCheck2(message.data); + if (shouldCancel) { + this.wasmCancellationToken.shouldCancel = shouldCancel; + } + + try { + if (message.data.command === 'updateOpen') { + const args = message.data.arguments as ts.server.protocol.UpdateOpenRequestArgs; + for (const open of args.openFiles ?? []) { + if (open.projectRootPath) { + pathMapper.addProjectRoot(open.projectRootPath); + } + } + } + } catch { + // Noop + } + + this.onMessage(message.data); + }; + } + + public override send(msg: ts.server.protocol.Message) { + if (msg.type === 'event' && !this.canUseEvents) { + if (this.logger.hasLevel(ts.server.LogLevel.verbose)) { + this.logger.info(`Session does not support events: ignored event: ${JSON.stringify(msg)}`); + } + return; + } + if (this.logger.hasLevel(ts.server.LogLevel.verbose)) { + this.logger.info(`${msg.type}:${indent(JSON.stringify(msg))}`); + } + port.postMessage(msg); + } + + protected override parseMessage(message: {}): ts.server.protocol.Request { + return message as ts.server.protocol.Request; + } + + protected override toStringMessage(message: {}) { + return JSON.stringify(message, undefined, 2); + } + + override exit() { + this.logger.info('Exiting...'); + port.removeEventListener('message', this.listener); + this.projectService.closeLog(); + close(); + } + + listen() { + this.logger.info(`webServer.ts: tsserver starting to listen for messages on 'message'...`); + port.onmessage = this.listener; + } + }(); + + worker.listen(); +} diff --git a/extensions/typescript-language-features/web/tsconfig.json b/extensions/typescript-language-features/web/tsconfig.json index 531d57bddcb..fce002fbadc 100644 --- a/extensions/typescript-language-features/web/tsconfig.json +++ b/extensions/typescript-language-features/web/tsconfig.json @@ -8,7 +8,7 @@ "node" ] }, - "files": [ - "webServer.ts" + "include": [ + "src/**/*.ts" ] } diff --git a/extensions/typescript-language-features/web/webServer.ts b/extensions/typescript-language-features/web/webServer.ts deleted file mode 100644 index 191c2d03f63..00000000000 --- a/extensions/typescript-language-features/web/webServer.ts +++ /dev/null @@ -1,864 +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 { ApiClient, FileStat, FileSystem, FileType, Requests } from '@vscode/sync-api-client'; -import { ClientConnection } from '@vscode/sync-api-common/browser'; -import { basename } from 'path'; -import * as ts from 'typescript/lib/tsserverlibrary'; -import { URI } from 'vscode-uri'; -import WebTypingsInstaller from './typingsInstaller'; - -// GLOBALS -const watchFiles: Map = new Map(); -const watchDirectories: Map = new Map(); -let session: WorkerSession | undefined; - -const projectRootPaths = new Map(); - -// END GLOBALS -// BEGIN misc internals -const indent: (str: string) => string = (ts as any).server.indent; -const setSys: (s: ts.System) => void = (ts as any).setSys; -const combinePaths: (path: string, ...paths: (string | undefined)[]) => string = (ts as any).combinePaths; -const byteOrderMarkIndicator = '\uFEFF'; -const matchFiles: ( - path: string, - extensions: readonly string[] | undefined, - excludes: readonly string[] | undefined, - includes: readonly string[] | undefined, - useCaseSensitiveFileNames: boolean, - currentDirectory: string, - depth: number | undefined, - getFileSystemEntries: (path: string) => { files: readonly string[]; directories: readonly string[] }, - realpath: (path: string) => string -) => string[] = (ts as any).matchFiles; -const generateDjb2Hash = (ts as any).generateDjb2Hash; -// End misc internals - -function fromResource(extensionUri: URI, uri: URI) { - if (uri.scheme === extensionUri.scheme - && uri.authority === extensionUri.authority - && uri.path.startsWith(extensionUri.path + '/dist/browser/typescript/lib.') - && uri.path.endsWith('.d.ts')) { - return uri.path; - } - return `/${uri.scheme}/${uri.authority}${uri.path}`; -} - -function updateWatch(event: 'create' | 'change' | 'delete', uri: URI, extensionUri: URI) { - const kind = toTsWatcherKind(event); - const path = fromResource(extensionUri, uri); - - const fileWatcher = watchFiles.get(path); - if (fileWatcher) { - fileWatcher.callback(path, kind); - return; - } - - for (const watch of Array.from(watchDirectories.keys()).filter(dir => path.startsWith(dir))) { - watchDirectories.get(watch)!.callback(path); - return; - } - - console.error(`no watcher found for ${path}`); -} - -function toTsWatcherKind(event: 'create' | 'change' | 'delete') { - if (event === 'create') { - return ts.FileWatcherEventKind.Created; - } else if (event === 'change') { - return ts.FileWatcherEventKind.Changed; - } else if (event === 'delete') { - return ts.FileWatcherEventKind.Deleted; - } - throw new Error(`Unknown event: ${event}`); -} - -class AccessOutsideOfRootError extends Error { - constructor( - public readonly filepath: string, - public readonly projectRootPaths: readonly string[] - ) { - super(`Could not read file outside of project root ${filepath}`); - } -} - -type ServerHostWithImport = ts.server.ServerHost & { importPlugin(root: string, moduleName: string): Promise }; - -function createServerHost(extensionUri: URI, logger: ts.server.Logger, apiClient: ApiClient | undefined, args: string[], fsWatcher: MessagePort, enabledExperimentalTypeAcquisition: boolean): ServerHostWithImport { - const currentDirectory = '/'; - const fs = apiClient?.vscode.workspace.fileSystem; - let watchId = 0; - - // Legacy web - const memoize: (callback: () => T) => () => T = (ts as any).memoize; - const ensureTrailingDirectorySeparator: (path: string) => string = (ts as any).ensureTrailingDirectorySeparator; - const getDirectoryPath: (path: string) => string = (ts as any).getDirectoryPath; - const directorySeparator: string = (ts as any).directorySeparator; - const executingFilePath = findArgument(args, '--executingFilePath') || location + ''; - const getExecutingDirectoryPath = memoize(() => memoize(() => ensureTrailingDirectorySeparator(getDirectoryPath(executingFilePath)))); - const getWebPath = (path: string) => path.startsWith(directorySeparator) ? path.replace(directorySeparator, getExecutingDirectoryPath()) : undefined; - - const textDecoder = new TextDecoder(); - const textEncoder = new TextEncoder(); - - const log = (level: ts.server.LogLevel, message: string, data?: any) => { - if (logger.hasLevel(level)) { - logger.info(message + (data ? ' ' + JSON.stringify(data) : '')); - } - }; - - const logNormal = log.bind(null, ts.server.LogLevel.normal); - const logVerbose = log.bind(null, ts.server.LogLevel.verbose); - - const noopWatcher: ts.FileWatcher = { close() { } }; - return { - watchFile(path: string, callback: ts.FileWatcherCallback, pollingInterval?: number, options?: ts.WatchOptions): ts.FileWatcher { - if (looksLikeLibDtsPath(path)) { // We don't support watching lib files on web since they are readonly - return noopWatcher; - } - - console.log('watching file:', path); - - logVerbose('fs.watchFile', { path }); - - let uri: URI; - try { - uri = toResource(path); - } catch (e) { - console.error(e); - return noopWatcher; - } - - watchFiles.set(path, { path, callback, pollingInterval, options }); - const watchIds = [++watchId]; - fsWatcher.postMessage({ type: 'watchFile', uri: uri, id: watchIds[0] }); - if (enabledExperimentalTypeAcquisition && looksLikeNodeModules(path)) { - watchIds.push(++watchId); - fsWatcher.postMessage({ type: 'watchFile', uri: mapUri(uri, 'vscode-node-modules'), id: watchIds[1] }); - } - return { - close() { - logVerbose('fs.watchFile.close', { path }); - - watchFiles.delete(path); - for (const id of watchIds) { - fsWatcher.postMessage({ type: 'dispose', id }); - } - } - }; - }, - watchDirectory(path: string, callback: ts.DirectoryWatcherCallback, recursive?: boolean, options?: ts.WatchOptions): ts.FileWatcher { - logVerbose('fs.watchDirectory', { path }); - - let uri: URI; - try { - uri = toResource(path); - } catch (e) { - console.error(e); - return noopWatcher; - } - - watchDirectories.set(path, { path, callback, recursive, options }); - const watchIds = [++watchId]; - fsWatcher.postMessage({ type: 'watchDirectory', recursive, uri, id: watchId }); - return { - close() { - logVerbose('fs.watchDirectory.close', { path }); - - watchDirectories.delete(path); - for (const id of watchIds) { - fsWatcher.postMessage({ type: 'dispose', id }); - } - } - }; - }, - setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): any { - return setTimeout(callback, ms, ...args); - }, - clearTimeout(timeoutId: any): void { - clearTimeout(timeoutId); - }, - setImmediate(callback: (...args: any[]) => void, ...args: any[]): any { - return this.setTimeout(callback, 0, ...args); - }, - clearImmediate(timeoutId: any): void { - this.clearTimeout(timeoutId); - }, - importPlugin: async (root, moduleName) => { - const packageRoot = combinePaths(root, moduleName); - - let packageJson: any | undefined; - try { - const packageJsonResponse = await fetch(combinePaths(packageRoot, 'package.json')); - packageJson = await packageJsonResponse.json(); - } catch (e) { - return { module: undefined, error: new Error(`Could not load plugin. Could not load 'package.json'.`) }; - } - - const browser = packageJson.browser; - if (!browser) { - return { module: undefined, error: new Error(`Could not load plugin. No 'browser' field found in package.json.`) }; - } - - const scriptPath = combinePaths(packageRoot, browser); - try { - const { default: module } = await import(/* webpackIgnore: true */scriptPath); - return { module, error: undefined }; - } catch (e) { - return { module: undefined, error: e }; - } - }, - args, - newLine: '\n', - useCaseSensitiveFileNames: true, - write: s => { - apiClient?.vscode.terminal.write(s); - }, - writeOutputIsTTY() { - return true; - }, - readFile(path) { - logVerbose('fs.readFile', { path }); - - if (!fs) { - const webPath = getWebPath(path); - if (webPath) { - const request = new XMLHttpRequest(); - request.open('GET', webPath, /* asynchronous */ false); - request.send(); - return request.status === 200 ? request.responseText : undefined; - } else { - return undefined; - } - } - - let uri; - try { - uri = toResource(path); - } catch (e) { - return undefined; - } - - let contents: Uint8Array | undefined; - try { - // We need to slice the bytes since we can't pass a shared array to text decoder - contents = fs.readFile(uri); - } catch (error) { - if (!enabledExperimentalTypeAcquisition) { - return undefined; - } - try { - contents = fs.readFile(mapUri(uri, 'vscode-node-modules')); - } catch (e) { - return undefined; - } - } - return textDecoder.decode(contents.slice()); - }, - getFileSize(path) { - logVerbose('fs.getFileSize', { path }); - - if (!fs) { - throw new Error('not supported'); - } - - const uri = toResource(path); - let ret = 0; - try { - ret = fs.stat(uri).size; - } catch (_error) { - if (enabledExperimentalTypeAcquisition) { - try { - ret = fs.stat(mapUri(uri, 'vscode-node-modules')).size; - } catch (_error) { - } - } - } - return ret; - }, - writeFile(path, data, writeByteOrderMark) { - logVerbose('fs.writeFile', { path }); - - if (!fs) { - throw new Error('not supported'); - } - - if (writeByteOrderMark) { - data = byteOrderMarkIndicator + data; - } - - let uri; - try { - uri = toResource(path); - } catch (e) { - return; - } - const encoded = textEncoder.encode(data); - try { - fs.writeFile(uri, encoded); - const name = basename(uri.path); - if (uri.scheme !== 'vscode-global-typings' && (name === 'package.json' || name === 'package-lock.json' || name === 'package-lock.kdl')) { - fs.writeFile(mapUri(uri, 'vscode-node-modules'), encoded); - } - } catch (error) { - console.error('fs.writeFile', { path, error }); - } - }, - resolvePath(path: string): string { - return path; - }, - fileExists(path: string): boolean { - logVerbose('fs.fileExists', { path }); - - if (!fs) { - const webPath = getWebPath(path); - if (!webPath) { - return false; - } - - const request = new XMLHttpRequest(); - request.open('HEAD', webPath, /* asynchronous */ false); - request.send(); - return request.status === 200; - } - - let uri; - try { - uri = toResource(path); - } catch (e) { - return false; - } - let ret = false; - try { - ret = fs.stat(uri).type === FileType.File; - } catch (_error) { - if (enabledExperimentalTypeAcquisition) { - try { - ret = fs.stat(mapUri(uri, 'vscode-node-modules')).type === FileType.File; - } catch (_error) { - } - } - } - return ret; - }, - directoryExists(path: string): boolean { - logVerbose('fs.directoryExists', { path }); - - if (!fs) { - return false; - } - - let uri; - try { - uri = toResource(path); - } catch (_error) { - return false; - } - - let stat: FileStat | undefined = undefined; - try { - stat = fs.stat(uri); - } catch (_error) { - if (enabledExperimentalTypeAcquisition) { - try { - stat = fs.stat(mapUri(uri, 'vscode-node-modules')); - } catch (_error) { - } - } - } - if (stat) { - if (path.startsWith('/https') && !path.endsWith('.d.ts')) { - // TODO: Hack, https "file system" can't actually tell what is a file vs directory - return stat.type === FileType.File || stat.type === FileType.Directory; - } - - return stat.type === FileType.Directory; - } else { - return false; - } - }, - createDirectory(path: string): void { - logVerbose('fs.createDirectory', { path }); - - if (!fs) { - throw new Error('not supported'); - } - - try { - fs.createDirectory(toResource(path)); - } catch (error) { - logNormal('Error fs.createDirectory', { path, error: error + '' }); - } - }, - getExecutingFilePath(): string { - return currentDirectory; - }, - getCurrentDirectory(): string { - return currentDirectory; - }, - getDirectories(path: string): string[] { - logVerbose('fs.getDirectories', { path }); - - return getAccessibleFileSystemEntries(path).directories.slice(); - }, - readDirectory(path: string, extensions?: readonly string[], excludes?: readonly string[], includes?: readonly string[], depth?: number): string[] { - logVerbose('fs.readDirectory', { path }); - - return matchFiles(path, extensions, excludes, includes, /*useCaseSensitiveFileNames*/ true, currentDirectory, depth, getAccessibleFileSystemEntries, realpath); - }, - getModifiedTime(path: string): Date | undefined { - logVerbose('fs.getModifiedTime', { path }); - - if (!fs) { - throw new Error('not supported'); - } - - const uri = toResource(path); - let s: FileStat | undefined = undefined; - try { - s = fs.stat(uri); - } catch (_e) { - if (enabledExperimentalTypeAcquisition) { - try { - s = fs.stat(mapUri(uri, 'vscode-node-modules')); - } catch (_e) { - } - } - } - return s && new Date(s.mtime); - }, - deleteFile(path: string): void { - logVerbose('fs.deleteFile', { path }); - - if (!fs) { - throw new Error('not supported'); - } - - try { - fs.delete(toResource(path)); - } catch (error) { - logNormal('Error fs.deleteFile', { path, error: error + '' }); - } - }, - createHash: generateDjb2Hash, - /** This must be cryptographically secure. - The browser implementation, crypto.subtle.digest, is async so not possible to call from tsserver. */ - createSHA256Hash: undefined, - exit(): void { - removeEventListener('message', listener); - }, - realpath, - base64decode: input => Buffer.from(input, 'base64').toString('utf8'), - base64encode: input => Buffer.from(input).toString('base64'), - }; - - // For module resolution only. `node_modules` is also automatically mapped - // as if all node_modules-like paths are symlinked. - function realpath(path: string): string { - const isNm = looksLikeNodeModules(path) && !path.startsWith('/vscode-global-typings/'); - // skip paths without .. or ./ or /. And things that look like node_modules - if (!isNm && !path.match(/\.\.|\/\.|\.\//)) { - return path; - } - - let uri = toResource(path); - if (isNm) { - uri = mapUri(uri, 'vscode-node-modules'); - } - const out = [uri.scheme]; - if (uri.authority) { out.push(uri.authority); } - for (const part of uri.path.split('/')) { - switch (part) { - case '': - case '.': - break; - case '..': - //delete if there is something there to delete - out.pop(); - break; - default: - out.push(part); - } - } - return '/' + out.join('/'); - } - - function getAccessibleFileSystemEntries(path: string): { files: readonly string[]; directories: readonly string[] } { - if (!fs) { - throw new Error('not supported'); - } - - const uri = toResource(path || '.'); - let entries: [string, FileType][] = []; - const files: string[] = []; - const directories: string[] = []; - try { - entries = fs.readDirectory(uri); - } catch (_e) { - try { - entries = fs.readDirectory(mapUri(uri, 'vscode-node-modules')); - } catch (_e) { - } - } - for (const [entry, type] of entries) { - // This is necessary because on some file system node fails to exclude - // '.' and '..'. See https://github.com/nodejs/node/issues/4002 - if (entry === '.' || entry === '..') { - continue; - } - - if (type === FileType.File) { - files.push(entry); - } - else if (type === FileType.Directory) { - directories.push(entry); - } - } - files.sort(); - directories.sort(); - return { files, directories }; - } - - /** - * Copied from toResource in typescriptServiceClient.ts - */ - function toResource(filepath: string): URI { - if (looksLikeLibDtsPath(filepath)) { - return URI.from({ - scheme: extensionUri.scheme, - authority: extensionUri.authority, - path: extensionUri.path + '/dist/browser/typescript/' + filepath.slice(1) - }); - } - - const uri = filePathToResourceUri(filepath); - if (!uri) { - throw new Error(`Could not parse path ${filepath}`); - } - - // Check if TS is trying to read a file outside of the project root. - // We allow reading files on unknown scheme as these may be loose files opened by the user. - // However we block reading files on schemes that are on a known file system with an unknown root - let allowRead: 'implicit' | 'block' | 'allow' = 'implicit'; - for (const projectRoot of projectRootPaths.values()) { - if (uri.scheme === projectRoot.scheme) { - if (uri.toString().startsWith(projectRoot.toString())) { - allowRead = 'allow'; - break; - } - - // Tentatively block the read but a future loop may allow it - allowRead = 'block'; - } - } - - if (allowRead === 'block') { - throw new AccessOutsideOfRootError(filepath, Array.from(projectRootPaths.keys())); - } - - return uri; - } -} - -function looksLikeLibDtsPath(filepath: string) { - return filepath.startsWith('/lib.') && filepath.endsWith('.d.ts'); -} - -function looksLikeNodeModules(filepath: string) { - return filepath.includes('/node_modules'); -} - -function filePathToResourceUri(filepath: string): URI | undefined { - const parts = filepath.match(/^\/([^\/]+)\/([^\/]*)(?:\/(.+))?$/); - if (!parts) { - return undefined; - } - - const scheme = parts[1]; - const authority = parts[2] === 'ts-nul-authority' ? '' : parts[2]; - const path = parts[3]; - return URI.from({ scheme, authority, path: (path ? '/' + path : path) }); -} - -class WasmCancellationToken implements ts.server.ServerCancellationToken { - shouldCancel: (() => boolean) | undefined; - currentRequestId: number | undefined = undefined; - - setRequest(requestId: number) { - this.currentRequestId = requestId; - } - - resetRequest(requestId: number) { - if (requestId === this.currentRequestId) { - this.currentRequestId = undefined; - } else { - throw new Error(`Mismatched request id, expected ${this.currentRequestId} but got ${requestId}`); - } - } - - isCancellationRequested(): boolean { - return this.currentRequestId !== undefined && !!this.shouldCancel && this.shouldCancel(); - } -} - -interface StartSessionOptions { - readonly globalPlugins: ts.server.SessionOptions['globalPlugins']; - readonly pluginProbeLocations: ts.server.SessionOptions['pluginProbeLocations']; - readonly allowLocalPluginLoads: ts.server.SessionOptions['allowLocalPluginLoads']; - readonly useSingleInferredProject: ts.server.SessionOptions['useSingleInferredProject']; - readonly useInferredProjectPerProjectRoot: ts.server.SessionOptions['useInferredProjectPerProjectRoot']; - readonly suppressDiagnosticEvents: ts.server.SessionOptions['suppressDiagnosticEvents']; - readonly noGetErrOnBackgroundUpdate: ts.server.SessionOptions['noGetErrOnBackgroundUpdate']; - readonly serverMode: ts.server.SessionOptions['serverMode']; - readonly disableAutomaticTypingAcquisition: boolean; -} - -class WorkerSession extends ts.server.Session<{}> { - - readonly wasmCancellationToken: WasmCancellationToken; - readonly listener: (message: any) => void; - - constructor( - host: ts.server.ServerHost, - fs: FileSystem | undefined, - options: StartSessionOptions, - private readonly port: MessagePort, - logger: ts.server.Logger, - hrtime: ts.server.SessionOptions['hrtime'] - ) { - const cancellationToken = new WasmCancellationToken(); - const typingsInstaller = options.disableAutomaticTypingAcquisition || !fs ? ts.server.nullTypingsInstaller : new WebTypingsInstaller(host, '/vscode-global-typings/ts-nul-authority/projects'); - - super({ - host, - cancellationToken, - ...options, - typingsInstaller, - byteLength: () => { throw new Error('Not implemented'); }, // Formats the message text in send of Session which is overridden in this class so not needed - hrtime, - logger, - canUseEvents: true, - }); - this.wasmCancellationToken = cancellationToken; - - this.listener = (message: any) => { - // TEMP fix since Cancellation.retrieveCheck is not correct - function retrieveCheck2(data: any) { - if (!globalThis.crossOriginIsolated || !(data.$cancellationData instanceof SharedArrayBuffer)) { - return () => false; - } - const typedArray = new Int32Array(data.$cancellationData, 0, 1); - return () => { - return Atomics.load(typedArray, 0) === 1; - }; - } - - const shouldCancel = retrieveCheck2(message.data); - if (shouldCancel) { - this.wasmCancellationToken.shouldCancel = shouldCancel; - } - - try { - if (message.data.command === 'updateOpen') { - const args = message.data.arguments as ts.server.protocol.UpdateOpenRequestArgs; - for (const open of args.openFiles ?? []) { - if (open.projectRootPath) { - const uri = filePathToResourceUri(open.projectRootPath); - if (uri) { - projectRootPaths.set(open.projectRootPath, uri); - } - } - } - } - } catch { - // Noop - } - - this.onMessage(message.data); - }; - } - - public override send(msg: ts.server.protocol.Message) { - if (msg.type === 'event' && !this.canUseEvents) { - if (this.logger.hasLevel(ts.server.LogLevel.verbose)) { - this.logger.info(`Session does not support events: ignored event: ${JSON.stringify(msg)}`); - } - return; - } - if (this.logger.hasLevel(ts.server.LogLevel.verbose)) { - this.logger.info(`${msg.type}:${indent(JSON.stringify(msg))}`); - } - this.port.postMessage(msg); - } - - protected override parseMessage(message: {}): ts.server.protocol.Request { - return message as ts.server.protocol.Request; - } - - protected override toStringMessage(message: {}) { - return JSON.stringify(message, undefined, 2); - } - - override exit() { - this.logger.info('Exiting...'); - this.port.removeEventListener('message', this.listener); - this.projectService.closeLog(); - close(); - } - - listen() { - this.logger.info(`webServer.ts: tsserver starting to listen for messages on 'message'...`); - this.port.onmessage = this.listener; - } -} - -function parseServerMode(args: string[]): ts.LanguageServiceMode | string | undefined { - const mode = findArgument(args, '--serverMode'); - if (!mode) { return undefined; } - - switch (mode.toLowerCase()) { - case 'semantic': - return ts.LanguageServiceMode.Semantic; - case 'partialsemantic': - return ts.LanguageServiceMode.PartialSemantic; - case 'syntactic': - return ts.LanguageServiceMode.Syntactic; - default: - return mode; - } -} - -function hrtime(previous?: [number, number]): [number, number] { - const now = self.performance.now() * 1e-3; - let seconds = Math.floor(now); - let nanoseconds = Math.floor((now % 1) * 1e9); - // NOTE: This check is added probably because it's missed without strictFunctionTypes on - if (previous?.[0] !== undefined && previous?.[1] !== undefined) { - seconds = seconds - previous[0]; - nanoseconds = nanoseconds - previous[1]; - if (nanoseconds < 0) { - seconds--; - nanoseconds += 1e9; - } - } - return [seconds, nanoseconds]; -} - -function hasArgument(args: readonly string[], name: string): boolean { - return args.indexOf(name) >= 0; -} - -function findArgument(args: readonly string[], name: string): string | undefined { - const index = args.indexOf(name); - return 0 <= index && index < args.length - 1 - ? args[index + 1] - : undefined; -} - -function findArgumentStringArray(args: readonly string[], name: string): readonly string[] { - const arg = findArgument(args, name); - return arg === undefined ? [] : arg.split(',').filter(name => name !== ''); -} - -async function initializeSession(args: string[], extensionUri: URI, ports: { tsserver: MessagePort; sync: MessagePort; watcher: MessagePort }, logger: ts.server.Logger): Promise { - const modeOrUnknown = parseServerMode(args); - const serverMode = typeof modeOrUnknown === 'number' ? modeOrUnknown : undefined; - const unknownServerMode = typeof modeOrUnknown === 'string' ? modeOrUnknown : undefined; - logger.info(`Starting TS Server`); - logger.info(`Version: 0.0.0`); - logger.info(`Arguments: ${args.join(' ')}`); - logger.info(`ServerMode: ${serverMode} unknownServerMode: ${unknownServerMode}`); - const options: StartSessionOptions = { - globalPlugins: findArgumentStringArray(args, '--globalPlugins'), - pluginProbeLocations: findArgumentStringArray(args, '--pluginProbeLocations'), - allowLocalPluginLoads: hasArgument(args, '--allowLocalPluginLoads'), - useSingleInferredProject: hasArgument(args, '--useSingleInferredProject'), - useInferredProjectPerProjectRoot: hasArgument(args, '--useInferredProjectPerProjectRoot'), - suppressDiagnosticEvents: hasArgument(args, '--suppressDiagnosticEvents'), - noGetErrOnBackgroundUpdate: hasArgument(args, '--noGetErrOnBackgroundUpdate'), - serverMode, - disableAutomaticTypingAcquisition: hasArgument(args, '--disableAutomaticTypingAcquisition'), - }; - - - let sys: ServerHostWithImport; - let fs: FileSystem | undefined; - if (hasArgument(args, '--enableProjectWideIntelliSenseOnWeb')) { - const enabledExperimentalTypeAcquisition = hasArgument(args, '--experimentalTypeAcquisition'); - const connection = new ClientConnection(ports.sync); - await connection.serviceReady(); - - const apiClient = new ApiClient(connection); - fs = apiClient.vscode.workspace.fileSystem; - sys = createServerHost(extensionUri, logger, apiClient, args, ports.watcher, enabledExperimentalTypeAcquisition); - } else { - sys = createServerHost(extensionUri, logger, undefined, args, ports.watcher, false); - } - - setSys(sys); - session = new WorkerSession(sys, fs, options, ports.tsserver, logger, hrtime); - session.listen(); -} - -function parseLogLevel(input: string | undefined): ts.server.LogLevel | undefined { - switch (input) { - case 'normal': return ts.server.LogLevel.normal; - case 'terse': return ts.server.LogLevel.terse; - case 'verbose': return ts.server.LogLevel.verbose; - default: return undefined; - } -} - -let hasInitialized = false; -const listener = async (e: any) => { - if (!hasInitialized) { - hasInitialized = true; - if ('args' in e.data) { - const args = e.data.args; - - const logLevel = parseLogLevel(findArgument(args, '--logVerbosity')); - const doLog = typeof logLevel === 'undefined' - ? (_message: string) => { } - : (message: string) => { postMessage({ type: 'log', body: message }); }; - - const logger: ts.server.Logger = { - close: () => { }, - hasLevel: level => typeof logLevel === 'undefined' ? false : level <= logLevel, - loggingEnabled: () => true, - perftrc: () => { }, - info: doLog, - msg: doLog, - startGroup: () => { }, - endGroup: () => { }, - getLogFileName: () => undefined - }; - - const [sync, tsserver, watcher] = e.ports as MessagePort[]; - const extensionUri = URI.from(e.data.extensionUri); - watcher.onmessage = (e: any) => updateWatch(e.data.event, URI.from(e.data.uri), extensionUri); - await initializeSession(args, extensionUri, { sync, tsserver, watcher }, logger); - } else { - console.error('unexpected message in place of initial message: ' + JSON.stringify(e.data)); - } - return; - } - console.error(`unexpected message on main channel: ${JSON.stringify(e)}`); -}; -addEventListener('message', listener); - -function mapUri(uri: URI, mappedScheme: string): URI { - if (uri.scheme === 'vscode-global-typings') { - throw new Error('can\'t map vscode-global-typings'); - } - if (!uri.authority) { - uri = uri.with({ authority: 'ts-nul-authority' }); - } - uri = uri.with({ scheme: mappedScheme, path: `/${uri.scheme}/${uri.authority || 'ts-nul-authority'}${uri.path}` }); - - return uri; -} diff --git a/extensions/typescript-language-features/yarn.lock b/extensions/typescript-language-features/yarn.lock index a42d4db720a..e825c13b1ca 100644 --- a/extensions/typescript-language-features/yarn.lock +++ b/extensions/typescript-language-features/yarn.lock @@ -140,17 +140,45 @@ resolved "https://registry.yarnpkg.com/@vscode/ts-package-manager/-/ts-package-manager-0.0.2.tgz#d1cade5ff0d01da8c5b5b00bf79d80e7156771cf" integrity sha512-cXPxGbPVTkEQI8mUiWYUwB6j3ga6M9i7yubUOCrjgZ01GeZPMSnaWRprfJ09uuy81wJjY2gfHgLsOgwrGvUBTw== -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" +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== -follow-redirects@^1.14.8: - version "1.15.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" - integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== +axios@^1.6.1: + version "1.6.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.2.tgz#de67d42c755b571d3e698df1b6504cde9b0ee9f2" + integrity sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + +follow-redirects@^1.15.0: + version "1.15.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" + integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q== + +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" jsonc-parser@^3.2.0: version "3.2.0" @@ -164,6 +192,23 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.12: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + semver@7.5.2: version "7.5.2" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb" @@ -171,19 +216,19 @@ semver@7.5.2: dependencies: lru-cache "^6.0.0" -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== +tas-client@0.1.73: + version "0.1.73" + resolved "https://registry.yarnpkg.com/tas-client/-/tas-client-0.1.73.tgz#2dacf68547a37989ef1554c6510dc108a1ea7a71" + integrity sha512-UDdUF9kV2hYdlv+7AgqP2kXarVSUhjK7tg1BUflIRGEgND0/QoNpN64rcEuhEcM8AIbW65yrCopJWqRhLZ3m8w== dependencies: - axios "^0.26.1" + axios "^1.6.1" 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== + version "0.1.75" + resolved "https://registry.yarnpkg.com/vscode-tas-client/-/vscode-tas-client-0.1.75.tgz#771780a9a178163028299f52d41973300060dd38" + integrity sha512-/+ALFWPI4U3obeRvLFSt39guT7P9bZQrkmcLoiS+2HtzJ/7iPKNt5Sj+XTiitGlPYVFGFc0plxX8AAp6Uxs0xQ== dependencies: - tas-client "0.1.58" + tas-client "0.1.73" 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 401b9a4da03..fc973ba6541 100644 --- a/extensions/vscode-api-tests/package.json +++ b/extensions/vscode-api-tests/package.json @@ -34,7 +34,6 @@ "readonlyMessage", "languageStatusText", "resolvers", - "saveEditor", "scmActionButton", "scmSelectedProvider", "scmTextDocument", @@ -53,8 +52,7 @@ "workspaceTrust", "telemetry", "testingActiveProfile", - "windowActivity", - "interactiveUserActions" + "windowActivity" ], "private": true, "activationEvents": [], diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts index 561f040dedb..1d1da2658c3 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; import 'mocha'; -import { CancellationToken, chat, ChatAgentRequest, ChatVariableLevel, CompletionItemKind, Disposable, interactive, InteractiveProgress, InteractiveRequest, InteractiveResponseForProgress, InteractiveSession, InteractiveSessionState, Progress, ProviderResult } from 'vscode'; +import { CancellationToken, chat, ChatAgentRequest, ChatVariableLevel, Disposable, interactive, InteractiveSession, ProviderResult } from 'vscode'; import { assertNoRpc, closeAllEditors, DeferredPromise, disposeAll } from '../utils'; suite('chat', () => { @@ -22,24 +22,12 @@ suite('chat', () => { function getDeferredForRequest(): DeferredPromise { disposables.push(interactive.registerInteractiveSessionProvider('provider', { - prepareSession: (_initialState: InteractiveSessionState | undefined, _token: CancellationToken): ProviderResult => { + prepareSession: (_token: CancellationToken): ProviderResult => { return { requester: { name: 'test' }, responder: { name: 'test' }, }; }, - - provideResponseWithProgress: (_request: InteractiveRequest, _progress: Progress, _token: CancellationToken): ProviderResult => { - return null; - }, - - provideSlashCommands: (_session, _token) => { - return [{ command: 'hello', title: 'Hello', kind: CompletionItemKind.Text }]; - }, - - removeRequest: (_session: InteractiveSession, _requestId: string): void => { - throw new Error('Function not implemented.'); - } })); const deferred = new DeferredPromise(); diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/interactive.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/interactive.test.ts deleted file mode 100644 index b6b5623a7fb..00000000000 --- a/extensions/vscode-api-tests/src/singlefolder-tests/interactive.test.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 assert from 'assert'; -import 'mocha'; -import { CancellationToken, CompletionItemKind, Disposable, interactive, InteractiveProgress, InteractiveRequest, InteractiveResponseForProgress, InteractiveSession, InteractiveSessionState, Progress, ProviderResult } from 'vscode'; -import { assertNoRpc, closeAllEditors, DeferredPromise, disposeAll } from '../utils'; - -suite('InteractiveSessionProvider', () => { - let disposables: Disposable[] = []; - setup(async () => { - disposables = []; - }); - - teardown(async function () { - assertNoRpc(); - await closeAllEditors(); - disposeAll(disposables); - }); - - function getDeferredForRequest(): DeferredPromise { - const deferred = new DeferredPromise(); - disposables.push(interactive.registerInteractiveSessionProvider('provider', { - prepareSession: (_initialState: InteractiveSessionState | undefined, _token: CancellationToken): ProviderResult => { - return { - requester: { name: 'test' }, - responder: { name: 'test' }, - }; - }, - - provideResponseWithProgress: (request: InteractiveRequest, _progress: Progress, _token: CancellationToken): ProviderResult => { - deferred.complete(request); - return null; - }, - - provideSlashCommands: (_session, _token) => { - return [{ command: 'hello', title: 'Hello', kind: CompletionItemKind.Text }]; - }, - - removeRequest: (_session: InteractiveSession, _requestId: string): void => { - throw new Error('Function not implemented.'); - } - })); - return deferred; - } - - test('plain text query', async () => { - const deferred = getDeferredForRequest(); - interactive.sendInteractiveRequestToProvider('provider', { message: 'hello' }); - const lastResult = await deferred.p; - assert.strictEqual(lastResult.message, 'hello'); - }); - - test('slash command', async () => { - const deferred = getDeferredForRequest(); - interactive.sendInteractiveRequestToProvider('provider', { message: '/hello' }); - const lastResult = await deferred.p; - assert.strictEqual(lastResult.message, '/hello'); - }); -}); 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 38a79e12ff6..66807538fed 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json @@ -45,28 +45,28 @@ "c": "@", "t": "source.css.less meta.selector.less meta.group.less meta.property-value.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "hm", "t": "source.css.less meta.selector.less meta.group.less meta.property-value.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-166781_rs.json b/extensions/vscode-colorize-tests/test/colorize-results/test-166781_rs.json index c5b1c10ad35..d32ea47f217 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test-166781_rs.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test-166781_rs.json @@ -3,1316 +3,1316 @@ "c": "let", "t": "source.rust keyword.other.rust storage.type.rust", "r": { - "dark_modern": "storage.type: #569CD6", - "light_modern": "storage.type: #0000FF", "dark_plus": "storage.type: #569CD6", "light_plus": "storage.type: #0000FF", "dark_vs": "storage.type: #569CD6", "light_vs": "storage.type: #0000FF", "hc_black": "storage.type: #569CD6", - "hc_light": "storage.type: #0F4A85" + "dark_modern": "storage.type: #569CD6", + "hc_light": "storage.type: #0F4A85", + "light_modern": "storage.type: #0000FF" } }, { "c": " ", "t": "source.rust", "r": { - "dark_modern": "default: #CCCCCC", - "light_modern": "default: #3B3B3B", "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_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { "c": "_", "t": "source.rust variable.other.rust", "r": { - "dark_modern": "variable: #9CDCFE", - "light_modern": "variable: #001080", "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_modern": "variable: #9CDCFE", + "hc_light": "variable: #001080", + "light_modern": "variable: #001080" } }, { "c": " ", "t": "source.rust", "r": { - "dark_modern": "default: #CCCCCC", - "light_modern": "default: #3B3B3B", "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_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { "c": "=", "t": "source.rust keyword.operator.assignment.equal.rust", "r": { - "dark_modern": "keyword.operator: #D4D4D4", - "light_modern": "keyword.operator: #000000", "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_modern": "keyword.operator: #D4D4D4", + "hc_light": "keyword.operator: #000000", + "light_modern": "keyword.operator: #000000" } }, { "c": " ", "t": "source.rust", "r": { - "dark_modern": "default: #CCCCCC", - "light_modern": "default: #3B3B3B", "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_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { "c": "b", "t": "source.rust string.quoted.double.rust string.quoted.byte.raw.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\"", "t": "source.rust string.quoted.double.rust punctuation.definition.string.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x00", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x01", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x02", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x03", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x04", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x05", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x06", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x07", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x08", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x09", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x0a", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x0b", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x0c", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x0d", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x0e", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x0f", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "a0", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "a1", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "a2", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "a3", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "a4", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "a5", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "a6", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "a7", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "a8", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "a9", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "aa", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "ab", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "ac", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "ad", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "ae", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "x", "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "af\\", "t": "source.rust string.quoted.double.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": "\\", "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.backslash.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "n", - "t": "source.rust string.quoted.double.rust constant.character.escape.rust constant.character.escape.bit.rust", + "t": "source.rust string.quoted.double.rust constant.character.escape.rust", "r": { - "dark_modern": "constant.character.escape: #D7BA7D", - "light_modern": "constant.character.escape: #EE0000", "dark_plus": "constant.character.escape: #D7BA7D", "light_plus": "constant.character.escape: #EE0000", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6", - "hc_light": "constant.character.escape: #EE0000" + "dark_modern": "constant.character.escape: #D7BA7D", + "hc_light": "constant.character.escape: #EE0000", + "light_modern": "constant.character.escape: #EE0000" } }, { "c": "\"", "t": "source.rust string.quoted.double.rust punctuation.definition.string.rust", "r": { - "dark_modern": "string: #CE9178", - "light_modern": "string: #A31515", "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "string: #CE9178", - "hc_light": "string: #0F4A85" + "dark_modern": "string: #CE9178", + "hc_light": "string: #0F4A85", + "light_modern": "string: #A31515" } }, { "c": ";", "t": "source.rust punctuation.semi.rust", "r": { - "dark_modern": "default: #CCCCCC", - "light_modern": "default: #3B3B3B", "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_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } } -] +] \ No newline at end of file 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 ebeff26f98f..e78169f5e01 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 @@ -73,14 +73,14 @@ "c": "--spacing-unit", "t": "source.css.scss meta.property-list.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -171,14 +171,14 @@ "c": "--cell-padding", "t": "source.css.scss meta.property-list.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -311,14 +311,14 @@ "c": "--spacing-unit", "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -591,14 +591,14 @@ "c": "--spacing-unit", "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { 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 b87252f2279..a20f8fe4a3b 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 @@ -73,14 +73,14 @@ "c": "--spacing-unit", "t": "source.css meta.property-list.css variable.css", "r": { - "dark_plus": "variable.css: #9CDCFE", - "light_plus": "variable.css: #E50000", - "dark_vs": "variable.css: #9CDCFE", - "light_vs": "variable.css: #E50000", - "hc_black": "variable.css: #D4D4D4", - "dark_modern": "variable.css: #9CDCFE", - "hc_light": "variable.css: #264F78", - "light_modern": "variable.css: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -171,14 +171,14 @@ "c": "--cell-padding", "t": "source.css meta.property-list.css variable.css", "r": { - "dark_plus": "variable.css: #9CDCFE", - "light_plus": "variable.css: #E50000", - "dark_vs": "variable.css: #9CDCFE", - "light_vs": "variable.css: #E50000", - "hc_black": "variable.css: #D4D4D4", - "dark_modern": "variable.css: #9CDCFE", - "hc_light": "variable.css: #264F78", - "light_modern": "variable.css: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -283,14 +283,14 @@ "c": "--spacing-unit", "t": "source.css meta.property-list.css meta.property-value.css meta.function.variable.css variable.argument.css", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -563,14 +563,14 @@ "c": "--spacing-unit", "t": "source.css meta.property-list.css meta.property-value.css meta.function.calc.css meta.function.variable.css variable.argument.css", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { 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 0510fc82cd2..8d4b8a2a981 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_css.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_css.json @@ -1501,14 +1501,14 @@ "c": "blossoms.jpg", "t": "source.css meta.property-list.css meta.property-value.css meta.function.url.css variable.parameter.url.css", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -5071,14 +5071,14 @@ "c": "zen-bg.jpg", "t": "source.css meta.property-list.css meta.property-value.css meta.function.url.css variable.parameter.url.css", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -6023,14 +6023,14 @@ "c": "h1.gif", "t": "source.css meta.property-list.css meta.property-value.css meta.function.url.css variable.parameter.url.css", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -9929,14 +9929,14 @@ "c": "paper-bg.jpg", "t": "source.css meta.property-list.css meta.property-value.css meta.function.url.css variable.parameter.url.css", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -11049,14 +11049,14 @@ "c": "cr2.gif", "t": "source.css meta.property-list.css meta.property-value.css meta.function.url.css variable.parameter.url.css", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json b/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json index a559ba6edfc..95926189723 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json @@ -182,35 +182,7 @@ } }, { - "c": "queena", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " queenb", + "c": "queena, queenb", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -392,35 +364,7 @@ } }, { - "c": "queena", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " queenb", + "c": "queena, queenb", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -602,35 +546,7 @@ } }, { - "c": "queena", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " queenb", + "c": "queena, queenb", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -1050,35 +966,7 @@ } }, { - "c": "qa", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " qb", + "c": "qa, qb", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -1176,35 +1064,7 @@ } }, { - "c": "qa", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " qb", + "c": "qa, qb", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -1302,35 +1162,7 @@ } }, { - "c": "qa", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " qb", + "c": "qa, qb", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -1428,35 +1260,7 @@ } }, { - "c": "qa", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " qb", + "c": "qa, qb", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -1512,35 +1316,7 @@ } }, { - "c": "testqueen", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " queens", + "c": "testqueen, queens", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -1708,7 +1484,7 @@ } }, { - "c": "testqueen", + "c": "testqueen, q", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -1722,7 +1498,7 @@ } }, { - "c": ",", + "c": ")", "t": "source.julia meta.bracket.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -1736,35 +1512,7 @@ } }, { - "c": " q", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": "),", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " queens", + "c": ", queens", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -1848,91 +1596,7 @@ } }, { - "c": "nsquaresx", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " nsquaresy", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " nqueens", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " presqueens ", + "c": "nsquaresx, nsquaresy, nqueens, presqueens ", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -2408,35 +2072,7 @@ } }, { - "c": "xsquare", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " ysquare", + "c": "xsquare, ysquare", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -2548,35 +2184,7 @@ } }, { - "c": "testqueen", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " presqueens", + "c": "testqueen, presqueens", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -2688,21 +2296,7 @@ } }, { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " testqueen", + "c": ", testqueen", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -2800,63 +2394,7 @@ } }, { - "c": "nsquaresx", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " nsquaresy", - "t": "source.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " nqueens ", + "c": "nsquaresx, nsquaresy, nqueens ", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", @@ -2912,21 +2450,7 @@ } }, { - "c": ",", - "t": "source.julia meta.bracket.julia", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF", - "dark_modern": "default: #CCCCCC", - "hc_light": "default: #292929", - "light_modern": "default: #3B3B3B" - } - }, - { - "c": " tryqueens", + "c": ", tryqueens", "t": "source.julia", "r": { "dark_plus": "default: #D4D4D4", 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 3ab58551bd3..08d8b9f4fb5 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_less.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_less.json @@ -451,28 +451,28 @@ "c": "@", "t": "source.css.less meta.property-value.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "base", "t": "source.css.less meta.property-value.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -591,28 +591,28 @@ "c": "@", "t": "source.css.less meta.selector.less meta.group.less meta.property-value.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "style", "t": "source.css.less meta.selector.less meta.group.less meta.property-value.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -647,28 +647,28 @@ "c": "@", "t": "source.css.less meta.selector.less meta.group.less meta.property-value.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "c", "t": "source.css.less meta.selector.less meta.group.less meta.property-value.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -773,28 +773,28 @@ "c": "@", "t": "source.css.less meta.selector.less meta.conditional.guarded-namespace.less meta.group.less meta.function-call.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "c", "t": "source.css.less meta.selector.less meta.conditional.guarded-namespace.less meta.group.less meta.function-call.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -913,70 +913,70 @@ "c": "@", "t": "source.css.less meta.property-list.less meta.property-value.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "style", "t": "source.css.less meta.property-list.less meta.property-value.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": " ", "t": "source.css.less meta.property-list.less meta.property-value.less variable.other.readwrite.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "@", "t": "source.css.less meta.property-list.less meta.property-value.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "c", "t": "source.css.less meta.property-list.less meta.property-value.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -1053,28 +1053,28 @@ "c": "@", "t": "source.css.less meta.selector.less meta.group.less meta.property-value.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "style", "t": "source.css.less meta.selector.less meta.group.less meta.property-value.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -1109,28 +1109,28 @@ "c": "@", "t": "source.css.less meta.selector.less meta.group.less meta.property-value.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "alpha", "t": "source.css.less meta.selector.less meta.group.less meta.property-value.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -1291,28 +1291,28 @@ "c": "@", "t": "source.css.less meta.selector.less meta.conditional.guarded-namespace.less meta.group.less meta.function-call.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "alpha", "t": "source.css.less meta.selector.less meta.conditional.guarded-namespace.less meta.group.less meta.function-call.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -1431,28 +1431,28 @@ "c": "@", "t": "source.css.less meta.property-list.less meta.selector.less meta.group.less meta.property-value.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "style", "t": "source.css.less meta.property-list.less meta.selector.less meta.group.less meta.property-value.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -1641,28 +1641,28 @@ "c": "@", "t": "source.css.less meta.property-list.less meta.selector.less meta.group.less meta.property-value.less meta.function-call.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "alpha", "t": "source.css.less meta.property-list.less meta.selector.less meta.group.less meta.property-value.less meta.function-call.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -1865,28 +1865,28 @@ "c": "@", "t": "source.css.less meta.property-list.less meta.property-value.less meta.function-call.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "base", "t": "source.css.less meta.property-list.less meta.property-value.less meta.function-call.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -2061,28 +2061,28 @@ "c": "@", "t": "source.css.less meta.property-list.less meta.property-value.less meta.function-call.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "base", "t": "source.css.less meta.property-list.less meta.property-value.less meta.function-call.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -3405,28 +3405,28 @@ "c": "@", "t": "source.css.less meta.property-value.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "the-border", "t": "source.css.less meta.property-value.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -3503,28 +3503,28 @@ "c": "@", "t": "source.css.less meta.property-value.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "base-color", "t": "source.css.less meta.property-value.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -3601,28 +3601,28 @@ "c": "@", "t": "source.css.less meta.property-value.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "red", "t": "source.css.less meta.property-value.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -3825,28 +3825,28 @@ "c": "@", "t": "source.css.less meta.property-list.less meta.property-value.less meta.group.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "base-color", "t": "source.css.less meta.property-list.less meta.property-value.less meta.group.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -3993,28 +3993,28 @@ "c": "@", "t": "source.css.less meta.property-list.less meta.property-value.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "the-border", "t": "source.css.less meta.property-list.less meta.property-value.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -4105,28 +4105,28 @@ "c": "@", "t": "source.css.less meta.property-list.less meta.property-value.less meta.group.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "the-border", "t": "source.css.less meta.property-list.less meta.property-value.less meta.group.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -4357,28 +4357,28 @@ "c": "@", "t": "source.css.less meta.property-list.less meta.property-value.less meta.group.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "base-color", "t": "source.css.less meta.property-list.less meta.property-value.less meta.group.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -4553,28 +4553,28 @@ "c": "@", "t": "source.css.less meta.property-list.less meta.property-value.less meta.function-call.less variable.other.readwrite.less punctuation.definition.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "red", "t": "source.css.less meta.property-list.less meta.property-value.less meta.function-call.less variable.other.readwrite.less support.other.variable.less", "r": { - "dark_plus": "source.css.less variable.other: #9CDCFE", - "light_plus": "source.css.less variable.other: #E50000", - "dark_vs": "source.css.less variable.other: #9CDCFE", - "light_vs": "source.css.less variable.other: #E50000", - "hc_black": "source.css.less variable.other: #D4D4D4", - "dark_modern": "source.css.less variable.other: #9CDCFE", - "hc_light": "source.css.less variable.other: #264F78", - "light_modern": "source.css.less variable.other: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { 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 b316b8a0531..933ebf2ba5c 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json @@ -3615,14 +3615,14 @@ "c": "$width", "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -3699,14 +3699,14 @@ "c": "$width", "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -3895,14 +3895,14 @@ "c": "$localvar", "t": "source.css.scss meta.property-list.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -4035,14 +4035,14 @@ "c": "$width", "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -4077,14 +4077,14 @@ "c": "$font-size", "t": "source.css.scss meta.property-list.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -4175,14 +4175,14 @@ "c": "$line-height", "t": "source.css.scss meta.property-list.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -4315,42 +4315,42 @@ "c": "#{", "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.interpolation.scss punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$font-size", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.interpolation.scss punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -4371,42 +4371,42 @@ "c": "#{", "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.interpolation.scss punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$line-height", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.interpolation.scss punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -4441,14 +4441,14 @@ "c": "$name", "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -4497,14 +4497,14 @@ "c": "$attr", "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -4595,42 +4595,42 @@ "c": "#{", "t": "source.css.scss entity.other.attribute-name.class.css variable.interpolation.scss punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", - "light_vs": "entity.other.attribute-name.class.css: #800000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$name", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "t": "source.css.scss entity.other.attribute-name.class.css variable.interpolation.scss punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", - "light_vs": "entity.other.attribute-name.class.css: #800000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -4679,42 +4679,42 @@ "c": "#{", "t": "source.css.scss meta.property-list.scss variable.interpolation.scss punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$attr", "t": "source.css.scss meta.property-list.scss variable.interpolation.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "t": "source.css.scss meta.property-list.scss variable.interpolation.scss punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -4875,14 +4875,14 @@ "c": "$grid-background-column-color", "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -6093,14 +6093,14 @@ "c": "#{", "t": "source.css.scss meta.property-list.scss meta.property-value.scss string.quoted.double.scss variable.interpolation.scss punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "string: #CE9178", - "light_vs": "string: #A31515", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -6121,14 +6121,14 @@ "c": " ", "t": "source.css.scss meta.property-list.scss meta.property-value.scss string.quoted.double.scss variable.interpolation.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "string: #CE9178", - "light_vs": "string: #A31515", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -6149,14 +6149,14 @@ "c": " ", "t": "source.css.scss meta.property-list.scss meta.property-value.scss string.quoted.double.scss variable.interpolation.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "string: #CE9178", - "light_vs": "string: #A31515", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -6177,14 +6177,14 @@ "c": "}", "t": "source.css.scss meta.property-list.scss meta.property-value.scss string.quoted.double.scss variable.interpolation.scss punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "string: #CE9178", - "light_vs": "string: #A31515", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -6555,28 +6555,28 @@ "c": "$hue", "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": ":", "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.parameter.url.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -6639,28 +6639,28 @@ "c": "$saturation", "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": ":", "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.parameter.url.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -6737,28 +6737,28 @@ "c": "$lightness", "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": ":", "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.parameter.url.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -6891,14 +6891,14 @@ "c": "$grid-width", "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -6975,14 +6975,14 @@ "c": "$gutter-width", "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -7129,14 +7129,14 @@ "c": "$n", "t": "source.css.scss meta.at-rule.function.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -7241,14 +7241,14 @@ "c": "$n", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -7297,14 +7297,14 @@ "c": "$grid-width", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -7367,14 +7367,14 @@ "c": "$n", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -7493,14 +7493,14 @@ "c": "$gutter-width", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -7885,14 +7885,14 @@ "c": "$family", "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -8179,42 +8179,42 @@ "c": "#{", "t": "source.css.scss meta.at-rule.import.scss string.quoted.double.scss variable.interpolation.scss punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "string: #CE9178", - "light_vs": "string: #A31515", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$family", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "t": "source.css.scss meta.at-rule.import.scss string.quoted.double.scss variable.interpolation.scss punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "string: #CE9178", - "light_vs": "string: #A31515", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -10363,14 +10363,14 @@ "c": "$x", "t": "source.css.scss meta.at-rule.mixin.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -10391,14 +10391,14 @@ "c": "$y", "t": "source.css.scss meta.at-rule.mixin.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -10531,14 +10531,14 @@ "c": "$x", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -10671,42 +10671,42 @@ "c": "#{", "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.at-rule.warn.scss string.quoted.double.scss variable.interpolation.scss punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "string: #CE9178", - "light_vs": "string: #A31515", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$x", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.at-rule.warn.scss string.quoted.double.scss variable.interpolation.scss punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "string: #CE9178", - "light_vs": "string: #A31515", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -10769,14 +10769,14 @@ "c": "$x", "t": "source.css.scss meta.property-list.scss meta.property-list.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -10881,14 +10881,14 @@ "c": "$x", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -11021,14 +11021,14 @@ "c": "$y", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -11161,42 +11161,42 @@ "c": "#{", "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.at-rule.warn.scss string.quoted.double.scss variable.interpolation.scss punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "string: #CE9178", - "light_vs": "string: #A31515", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$y", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.at-rule.warn.scss string.quoted.double.scss variable.interpolation.scss punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "string: #CE9178", - "light_vs": "string: #A31515", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -11259,14 +11259,14 @@ "c": "$y", "t": "source.css.scss meta.property-list.scss meta.property-list.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -11371,14 +11371,14 @@ "c": "$y", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -11567,14 +11567,14 @@ "c": "$x", "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -11651,14 +11651,14 @@ "c": "$y", "t": "source.css.scss meta.property-list.scss meta.property-value.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -12771,14 +12771,14 @@ "c": "$type", "t": "source.css.scss meta.definition.variable.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -12925,14 +12925,14 @@ "c": "$type", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -13373,14 +13373,14 @@ "c": "$i", "t": "source.css.scss meta.at-rule.for.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -13569,42 +13569,42 @@ "c": "#{", "t": "source.css.scss meta.property-list.scss entity.other.attribute-name.class.css variable.interpolation.scss punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", - "light_vs": "entity.other.attribute-name.class.css: #800000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$i", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "t": "source.css.scss meta.property-list.scss entity.other.attribute-name.class.css variable.interpolation.scss punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", - "light_vs": "entity.other.attribute-name.class.css: #800000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -13765,14 +13765,14 @@ "c": "$i", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -13919,14 +13919,14 @@ "c": "$animal", "t": "source.css.scss meta.at-rule.each.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -14045,42 +14045,42 @@ "c": "#{", "t": "source.css.scss meta.at-rule.each.scss meta.property-list.scss entity.other.attribute-name.class.css variable.interpolation.scss punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", - "light_vs": "entity.other.attribute-name.class.css: #800000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$animal", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "t": "source.css.scss meta.at-rule.each.scss meta.property-list.scss entity.other.attribute-name.class.css variable.interpolation.scss punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", - "light_vs": "entity.other.attribute-name.class.css: #800000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -14241,42 +14241,42 @@ "c": "#{", "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 punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "string: #CE9178", - "light_vs": "string: #A31515", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$animal", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "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 punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "string: #CE9178", - "light_vs": "string: #A31515", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -14423,14 +14423,14 @@ "c": "$i", "t": "source.css.scss meta.at-rule.each.scss variable.scss", "r": { - "dark_plus": "variable.scss: #9CDCFE", - "light_plus": "variable.scss: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -14521,14 +14521,14 @@ "c": "$i", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -14661,42 +14661,42 @@ "c": "#{", "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 punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", - "light_vs": "entity.other.attribute-name.class.css: #800000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$i", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "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 punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", - "light_vs": "entity.other.attribute-name.class.css: #800000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -14857,14 +14857,14 @@ "c": "$i", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -14927,14 +14927,14 @@ "c": "$i", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -14969,14 +14969,14 @@ "c": "$i", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -15179,14 +15179,14 @@ "c": "$total", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -15221,14 +15221,14 @@ "c": "$a", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -15333,14 +15333,14 @@ "c": "$i", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -15445,14 +15445,14 @@ "c": "$total", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -15585,14 +15585,14 @@ "c": "$a", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -15739,14 +15739,14 @@ "c": "$i", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -15781,14 +15781,14 @@ "c": "$total", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -15907,14 +15907,14 @@ "c": "$z", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -16215,14 +16215,14 @@ "c": "$grid", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -17209,14 +17209,14 @@ "c": "$color", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -17237,14 +17237,14 @@ "c": "$width", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -17461,14 +17461,14 @@ "c": "$color", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -17545,14 +17545,14 @@ "c": "$width", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -18007,14 +18007,14 @@ "c": "$shadows", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -18133,14 +18133,14 @@ "c": "$shadows", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -18217,14 +18217,14 @@ "c": "$shadows", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -18301,14 +18301,14 @@ "c": "$shadows", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -18959,14 +18959,14 @@ "c": "$text", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -18987,14 +18987,14 @@ "c": "$background", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -19015,14 +19015,14 @@ "c": "$border", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -19127,14 +19127,14 @@ "c": "$text", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -19211,14 +19211,14 @@ "c": "$background", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -19295,14 +19295,14 @@ "c": "$border", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -19337,14 +19337,14 @@ "c": "$values", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -19631,14 +19631,14 @@ "c": "$values", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -20247,14 +20247,14 @@ "c": "logo.gif", "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.parameter.url.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -20373,14 +20373,14 @@ "c": "$attr", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -21423,14 +21423,14 @@ "c": "$foo", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -22543,14 +22543,14 @@ "c": "$a", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -22697,42 +22697,42 @@ "c": "#{", "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 punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", - "light_vs": "entity.other.attribute-name.class.css: #800000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$a", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "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 punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", - "light_vs": "entity.other.attribute-name.class.css: #800000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -22809,42 +22809,42 @@ "c": "#{", "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 punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$a", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "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 punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -23831,42 +23831,42 @@ "c": "#{", "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 punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", - "light_vs": "entity.other.attribute-name.class.css: #800000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$d", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "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 punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "entity.other.attribute-name.class.css: #D7BA7D", - "light_vs": "entity.other.attribute-name.class.css: #800000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -23929,42 +23929,42 @@ "c": "#{", "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 punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$d", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "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 punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -24069,42 +24069,42 @@ "c": "#{", "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 punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$d", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "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 punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -24181,42 +24181,42 @@ "c": "#{", "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 punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$d", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "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 punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -24237,42 +24237,42 @@ "c": "#{", "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 punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$d", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "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 punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -24363,42 +24363,42 @@ "c": "#{", "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 punctuation.definition.interpolation.begin.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "$d", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { "c": "}", "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 punctuation.definition.interpolation.end.bracket.curly.scss", "r": { - "dark_plus": "variable: #9CDCFE", - "light_plus": "variable: #001080", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "variable: #9CDCFE", - "dark_modern": "variable: #9CDCFE", - "hc_light": "variable: #001080", - "light_modern": "variable: #001080" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -26505,14 +26505,14 @@ "c": "$var1", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { @@ -26603,14 +26603,14 @@ "c": "$var2", "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: #E50000", - "dark_vs": "variable.scss: #9CDCFE", - "light_vs": "variable.scss: #E50000", - "hc_black": "variable.scss: #D4D4D4", - "dark_modern": "variable.scss: #9CDCFE", - "hc_light": "variable.scss: #264F78", - "light_modern": "variable.scss: #E50000" + "dark_plus": "source.css variable: #9CDCFE", + "light_plus": "source.css variable: #E50000", + "dark_vs": "source.css variable: #9CDCFE", + "light_vs": "source.css variable: #E50000", + "hc_black": "source.css variable: #D4D4D4", + "dark_modern": "source.css variable: #9CDCFE", + "hc_light": "source.css variable: #264F78", + "light_modern": "source.css variable: #E50000" } }, { diff --git a/extensions/xml/xml.language-configuration.json b/extensions/xml/xml.language-configuration.json index 4706ceec5fb..66524ab3682 100644 --- a/extensions/xml/xml.language-configuration.json +++ b/extensions/xml/xml.language-configuration.json @@ -14,8 +14,7 @@ { "open": "(", "close": ")" }, { "open": "\"", "close": "\"", "notIn": ["string"] }, { "open": "'", "close": "'", "notIn": ["string"] }, - { "open": "", "notIn": [ "comment", "string" ]}, - { "open": "", "notIn": [ "comment", "string" ]} + { "open": "", "notIn": [ "comment", "string" ]} ], "surroundingPairs": [ { "open": "'", "close": "'" }, diff --git a/extensions/yaml/package.json b/extensions/yaml/package.json index fbbabd81709..15739573f41 100644 --- a/extensions/yaml/package.json +++ b/extensions/yaml/package.json @@ -40,7 +40,10 @@ ".eyaml", ".eyml", ".yaml", - ".cff" + ".cff", + ".yaml-tmlanguage", + ".yaml-tmpreferences", + ".yaml-tmtheme" ], "firstLine": "^#cloud-config", "configuration": "./language-configuration.json" diff --git a/extensions/yarn.lock b/extensions/yarn.lock index 504c8370b1d..8f166d8e04e 100644 --- a/extensions/yarn.lock +++ b/extensions/yarn.lock @@ -228,10 +228,10 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -typescript@^5.3.1-rc: - version "5.3.1-rc" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.1-rc.tgz#c307d4b69ea0c1c2cd17d4dd7700d30f7197f829" - integrity sha512-NVq/AufFc6KVjmVPcuVwdCkhTQlTcMEyRYJPvaGhPvj+X80MYUF+90qf0//uvINPb2ULg9m91/gbdIOhN2cZqA== +typescript@5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.2.tgz#00d1c7c1c46928c5845c1ee8d0cc2791031d4c43" + integrity sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ== vscode-grammar-updater@^1.1.0: version "1.1.0" diff --git a/package.json b/package.json index 35a85347013..fec8a4166e0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", - "version": "1.85.0", - "distro": "cbc81496e34eafbc771b8f008e6a742d755968c9", + "version": "1.86.0", + "distro": "9d1271fd1c2cf545a209fb8aaf409f75da726c4c", "author": { "name": "Microsoft Corporation" }, @@ -71,8 +71,8 @@ "@parcel/watcher": "2.1.0", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/policy-watcher": "^1.1.4", - "@vscode/proxy-agent": "^0.17.5", - "@vscode/ripgrep": "^1.15.6", + "@vscode/proxy-agent": "^0.18.2", + "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.13.12", "@vscode/sqlite3": "5.1.6-vscode", "@vscode/sudo-prompt": "9.3.1", @@ -80,14 +80,14 @@ "@vscode/windows-mutex": "^0.4.4", "@vscode/windows-process-tree": "^0.5.0", "@vscode/windows-registry": "^1.1.0", - "@xterm/addon-canvas": "0.6.0-beta.14", - "@xterm/addon-image": "0.7.0-beta.12", - "@xterm/addon-search": "0.14.0-beta.14", - "@xterm/addon-serialize": "0.12.0-beta.14", - "@xterm/addon-unicode11": "0.7.0-beta.14", - "@xterm/addon-webgl": "0.17.0-beta.14", - "@xterm/headless": "5.4.0-beta.14", - "@xterm/xterm": "5.4.0-beta.14", + "@xterm/addon-canvas": "0.6.0-beta.20", + "@xterm/addon-image": "0.7.0-beta.18", + "@xterm/addon-search": "0.14.0-beta.20", + "@xterm/addon-serialize": "0.12.0-beta.20", + "@xterm/addon-unicode11": "0.7.0-beta.20", + "@xterm/addon-webgl": "0.17.0-beta.20", + "@xterm/headless": "5.4.0-beta.20", + "@xterm/xterm": "5.4.0-beta.20", "graceful-fs": "4.2.11", "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.2", @@ -99,7 +99,6 @@ "native-watchdog": "^1.4.1", "node-pty": "1.1.0-beta5", "tas-client-umd": "0.1.8", - "util": "^0.12.4", "v8-inspect-profiler": "^0.1.0", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", @@ -108,7 +107,7 @@ "yazl": "^2.4.3" }, "devDependencies": { - "@playwright/test": "^1.37.1", + "@playwright/test": "^1.40.1", "@swc/core": "1.3.62", "@types/cookie": "^0.3.3", "@types/cssnano": "^4.0.0", @@ -135,11 +134,12 @@ "@typescript-eslint/experimental-utils": "^5.57.0", "@typescript-eslint/parser": "^5.57.0", "@vscode/gulp-electron": "^1.36.0", - "@vscode/l10n-dev": "0.0.21", - "@vscode/telemetry-extractor": "^1.9.10", + "@vscode/l10n-dev": "0.0.30", + "@vscode/telemetry-extractor": "^1.10.2", "@vscode/test-cli": "^0.0.3", - "@vscode/test-electron": "^2.3.5", - "@vscode/test-web": "^0.0.42", + "@vscode/test-electron": "^2.3.8", + "@vscode/test-web": "^0.0.50", + "@vscode/v8-heap-parser": "^0.1.0", "@vscode/vscode-perf": "^0.0.14", "ansi-colors": "^3.2.3", "asar": "^3.0.3", @@ -150,7 +150,7 @@ "cssnano": "^4.1.11", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "25.9.2", + "electron": "27.1.3", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0", @@ -180,7 +180,7 @@ "husky": "^0.13.1", "innosetup": "6.0.5", "istanbul-lib-coverage": "^3.2.0", - "istanbul-lib-instrument": "^5.2.0", + "istanbul-lib-instrument": "^6.0.1", "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.1", "istanbul-reports": "^3.1.5", @@ -208,8 +208,9 @@ "ts-loader": "^9.4.2", "ts-node": "^10.9.1", "tsec": "0.2.7", - "typescript": "^5.3.0-dev.20231030", + "typescript": "^5.4.0-dev.20231116", "typescript-formatter": "7.1.0", + "util": "^0.12.4", "vscode-nls-dev": "^3.3.1", "webpack": "^5.77.0", "webpack-cli": "^5.0.1", diff --git a/product.json b/product.json index 605d8f117ee..49b692f2c2f 100644 --- a/product.json +++ b/product.json @@ -50,8 +50,8 @@ }, { "name": "ms-vscode.js-debug", - "version": "1.84.0", - "sha256": "a57691eb4440e549edba7472c0313e94f24d46ebe1ede18784b552fc5d11e596", + "version": "1.85.0", + "sha256": "85a97d373a6f92359f5db7bfc5a2fa6c5763b22c6ad07c962dfe32c84a079f3b", "repo": "https://github.com/microsoft/vscode-js-debug", "metadata": { "id": "25629058-ddac-4e17-abba-74678e126c5d", @@ -66,8 +66,8 @@ }, { "name": "ms-vscode.vscode-js-profile-table", - "version": "1.0.3", - "sha256": "b9dab017506d9e6a469a0f82b392e4cb1d7a25a4843f1db8ba396cbee209cfc5", + "version": "1.0.8", + "sha256": "ca30069e21fbf576b49638ff8ff7c316b028c2faca924c23526737c65b8762bf", "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 ea44260d51d..45af692342a 100644 --- a/remote/.yarnrc +++ b/remote/.yarnrc @@ -1,5 +1,5 @@ disturl "https://nodejs.org/dist" -target "18.15.0" -ms_build_id "234519" +target "18.17.1" +ms_build_id "241679" runtime "node" build_from_source "true" diff --git a/remote/package.json b/remote/package.json index 2a4dcf858e1..07d070cc8f2 100644 --- a/remote/package.json +++ b/remote/package.json @@ -7,20 +7,20 @@ "@microsoft/1ds-post-js": "^3.2.13", "@parcel/watcher": "2.1.0", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/proxy-agent": "^0.17.5", - "@vscode/ripgrep": "^1.15.6", + "@vscode/proxy-agent": "^0.18.2", + "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.13.12", "@vscode/vscode-languagedetection": "1.0.21", "@vscode/windows-process-tree": "^0.5.0", "@vscode/windows-registry": "^1.1.0", - "@xterm/addon-canvas": "0.6.0-beta.14", - "@xterm/addon-image": "0.7.0-beta.12", - "@xterm/addon-search": "0.14.0-beta.14", - "@xterm/addon-serialize": "0.12.0-beta.14", - "@xterm/addon-unicode11": "0.7.0-beta.14", - "@xterm/addon-webgl": "0.17.0-beta.14", - "@xterm/headless": "5.4.0-beta.14", - "@xterm/xterm": "5.4.0-beta.14", + "@xterm/addon-canvas": "0.6.0-beta.20", + "@xterm/addon-image": "0.7.0-beta.18", + "@xterm/addon-search": "0.14.0-beta.20", + "@xterm/addon-serialize": "0.12.0-beta.20", + "@xterm/addon-unicode11": "0.7.0-beta.20", + "@xterm/addon-webgl": "0.17.0-beta.20", + "@xterm/headless": "5.4.0-beta.20", + "@xterm/xterm": "5.4.0-beta.20", "cookie": "^0.4.0", "graceful-fs": "4.2.11", "http-proxy-agent": "^7.0.0", diff --git a/remote/web/package.json b/remote/web/package.json index a056b0f158e..8bedb5c4f10 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -7,13 +7,13 @@ "@microsoft/1ds-post-js": "^3.2.13", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/vscode-languagedetection": "1.0.21", - "@xterm/addon-canvas": "0.6.0-beta.14", - "@xterm/addon-image": "0.7.0-beta.12", - "@xterm/addon-search": "0.14.0-beta.14", - "@xterm/addon-serialize": "0.12.0-beta.14", - "@xterm/addon-unicode11": "0.7.0-beta.14", - "@xterm/addon-webgl": "0.17.0-beta.14", - "@xterm/xterm": "5.4.0-beta.14", + "@xterm/addon-canvas": "0.6.0-beta.20", + "@xterm/addon-image": "0.7.0-beta.18", + "@xterm/addon-search": "0.14.0-beta.20", + "@xterm/addon-serialize": "0.12.0-beta.20", + "@xterm/addon-unicode11": "0.7.0-beta.20", + "@xterm/addon-webgl": "0.17.0-beta.20", + "@xterm/xterm": "5.4.0-beta.20", "jschardet": "3.0.0", "tas-client-umd": "0.1.8", "vscode-oniguruma": "1.7.0", diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index b93751d612a..f540fcee68f 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -48,40 +48,40 @@ resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3" integrity sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g== -"@xterm/addon-canvas@0.6.0-beta.14": - version "0.6.0-beta.14" - resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.14.tgz#5a4022edf80e4b62348c11e56a0c7247b38ac946" - integrity sha512-J2+XfgTV+1ee48awyajh4maJDfzSbtF0FkOoxIUUDaw2fAPOBqeUqTDHxOyvzoYwAHlaJ98AA5HaYjrTkXqXlg== +"@xterm/addon-canvas@0.6.0-beta.20": + version "0.6.0-beta.20" + resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.20.tgz#078dddef70caf880b2cb121fdda37d301fc13156" + integrity sha512-tHhsuqElE7LNiDJPbZzgVpmbcG2Dk6i2vh1EI+DzSByUWScDqLoeJbVPE5Xd2UW2garo24lxErpnIAlsytcA3A== -"@xterm/addon-image@0.7.0-beta.12": - version "0.7.0-beta.12" - resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.7.0-beta.12.tgz#b1ed300492429a1394c94385fb0c61ed36ad2041" - integrity sha512-MseIv99qlQ0u113a4PFAfSv4vQi+16HC6S9oAcS/CSAHeSySYqPPLdZXAMqLZo0n/vIESmSFXlX4bm2k3YIhoQ== +"@xterm/addon-image@0.7.0-beta.18": + version "0.7.0-beta.18" + resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.7.0-beta.18.tgz#588ea2d0841cff48c63bde1bfcdf56e9494dc6af" + integrity sha512-+HQ+IBmHPelzjRJ5zO3XkjbeQNr2Zrf5wAlbPhy4EGSD0mDCqHJSfzZ8wKrhx7t8qpfiA8eTpWu/M76WsEnlnA== -"@xterm/addon-search@0.14.0-beta.14": - version "0.14.0-beta.14" - resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.14.tgz#09da64dfea88315e1e07f95e5d8ec371fe986edb" - integrity sha512-SOIUqIakxLCT2jyn0GEidmd1KJRqGbuOITWXx8loBeiBb/Omo01nqhtHFU0HTdCRwFbOhMRMDTKKr2nQxaoPEQ== +"@xterm/addon-search@0.14.0-beta.20": + version "0.14.0-beta.20" + resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.20.tgz#cac366b1be1eb02cf9fe9537933f26f227d030c8" + integrity sha512-1LOL/OzWSrCBpndiBeeE2S1rxtKKgU1ucYFSG3P68W0J4VQz/Ksci1BgDKsgspj9jzpsGhdql3zwa5WEM7n4Pg== -"@xterm/addon-serialize@0.12.0-beta.14": - version "0.12.0-beta.14" - resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.14.tgz#a02553b318f2f9863cadb072e3e671ba34985e3b" - integrity sha512-zHNc6gKxHG8D+oZRWopHRCZXGt/eTBGUbVKc3Jk0h5zuWrNATZCztljQ7Zy/VOwhxQRpFrV6MXE4vb2cBLdmvw== +"@xterm/addon-serialize@0.12.0-beta.20": + version "0.12.0-beta.20" + resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.20.tgz#5fe126194ff4dc466b92a0946e081e039a14ad21" + integrity sha512-GdRCQDjLyVNBxCFnhfCWsMmuqv2PryUkOaNl4z5MqB5lBUkiEnRNY0u/s5f34+2zrijp3h0O/f9JDLW4gSUQgw== -"@xterm/addon-unicode11@0.7.0-beta.14": - version "0.7.0-beta.14" - resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.14.tgz#37f672945b59c62676a76f9afa292973bff13763" - integrity sha512-L1Maeye7mPYgllIOaD8b3J70B73SoC0deNrlhiMkry/8ue2Q48JzQnOGVWKIOZC+owB1aQRWZbQZbQaAiLKz4A== +"@xterm/addon-unicode11@0.7.0-beta.20": + version "0.7.0-beta.20" + resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.20.tgz#5d3c97320898dd6766f2dc127deb4f071c8698c2" + integrity sha512-4/uwJ6lV/xJplT7hJc7sO4Im4XNvEXHnUEFIs03FFp8ZUfu3U6wcBk6/GoKMwJKJtGVNxotiD6ZzJ5v8IBH6nA== -"@xterm/addon-webgl@0.17.0-beta.14": - version "0.17.0-beta.14" - resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.14.tgz#767057842d72258656be990b85718f01cf53ab55" - integrity sha512-FZoC0gk/H0hpQFrPEp2LM4qllj4a1MR/6sIg0TY6L83KS++8gxQLonTxDQoAmb9Ld5816s7ynLZJSTJUyDWRpg== +"@xterm/addon-webgl@0.17.0-beta.20": + version "0.17.0-beta.20" + resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.20.tgz#443845ac5ac755cf762b105ed237b30426b07137" + integrity sha512-iqvXNSTfKIcO9FBraNwdO/ixPrTHok8CBN/wjlnGLv0ZMc4zLAiKE8+PHyg9ZY38QJfS+4Ouo8KsuZwoOYfnNA== -"@xterm/xterm@5.4.0-beta.14": - version "5.4.0-beta.14" - resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.14.tgz#fa0902f457fe799c65dec6ff784538a087f611d9" - integrity sha512-69E++VxeLPxBRhR3EGpkDe3R+EhpEZILo0m6TcN+atC4Zm5+WgcqXBCrBhkvpnBA2AhZp51w+hLC/OCwaHE0rg== +"@xterm/xterm@5.4.0-beta.20": + version "5.4.0-beta.20" + resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.20.tgz#28bbbbc73eceb6ef3e1e095de195cf849d0cbfb6" + integrity sha512-nkY91qBy5pe1HlW9LOoLcyG6v4teEsliEtUVshAO42NrJDaPniSn28O5m5832UjZOdjLCY58QlcBkZUquODGrQ== jschardet@3.0.0: version "3.0.0" diff --git a/remote/yarn.lock b/remote/yarn.lock index c83c555aa64..81546b79451 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -58,10 +58,10 @@ resolved "https://registry.yarnpkg.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz#d2f1e0664ee6036408f9743fee264ea0699b0e48" integrity sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg== -"@vscode/proxy-agent@^0.17.5": - version "0.17.5" - resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.17.5.tgz#a59f6087a39795425b2601c9ee95bcb0338154e6" - integrity sha512-plKfR1i9ce09aro1/yvK3Ckiu84Cj5ViuLqJ/7VRT6E9w5xP2YUPcgrCy+u7FGorKZmJb+wQ1L6f/cdJ7axulw== +"@vscode/proxy-agent@^0.18.2": + version "0.18.2" + resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.18.2.tgz#8b2872849b6c6779cd655ce369a4556c6804a9f7" + integrity sha512-yDj/JI9otEEUVU36dKOWNitGk4tBcriIeE6uvVGEdvKbpVD7L9UMNvL/wCoHCOqBnf2g5jUhWSURWDVyAhJn2Q== dependencies: "@tootallnate/once" "^3.0.0" agent-base "^7.0.1" @@ -72,13 +72,14 @@ optionalDependencies: "@vscode/windows-ca-certs" "^0.3.1" -"@vscode/ripgrep@^1.15.6": - version "1.15.6" - resolved "https://registry.yarnpkg.com/@vscode/ripgrep/-/ripgrep-1.15.6.tgz#17bdffc1fd0c4a034dc3e1e8203b8d07add96c0d" - integrity sha512-mCtfHqZ/g+75qDDeIPB9ST1xyJDaJornaSujuRKkB0SMZ6FMVtuKUdvvvOITR+DcKo5KOwUVuOUUpt75jOY+Yw== +"@vscode/ripgrep@^1.15.9": + version "1.15.9" + resolved "https://registry.yarnpkg.com/@vscode/ripgrep/-/ripgrep-1.15.9.tgz#92279f7f28e1e49ad9a89603e10b17a4c7f9f5f1" + integrity sha512-4q2PXRvUvr3bF+LsfrifmUZgSPmCNcUZo6SbEAZgArIChchkezaxLoIeQMJe/z3CCKStvaVKpBXLxN3Z8lQjFQ== dependencies: https-proxy-agent "^7.0.2" proxy-from-env "^1.1.0" + yauzl "^2.9.2" "@vscode/spdlog@^0.13.12": version "0.13.12" @@ -113,45 +114,45 @@ resolved "https://registry.yarnpkg.com/@vscode/windows-registry/-/windows-registry-1.1.0.tgz#03dace7c29c46f658588b9885b9580e453ad21f9" integrity sha512-5AZzuWJpGscyiMOed0IuyEwt6iKmV5Us7zuwCDCFYMIq7tsvooO9BUiciywsvuthGz6UG4LSpeDeCxvgMVhnIw== -"@xterm/addon-canvas@0.6.0-beta.14": - version "0.6.0-beta.14" - resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.14.tgz#5a4022edf80e4b62348c11e56a0c7247b38ac946" - integrity sha512-J2+XfgTV+1ee48awyajh4maJDfzSbtF0FkOoxIUUDaw2fAPOBqeUqTDHxOyvzoYwAHlaJ98AA5HaYjrTkXqXlg== +"@xterm/addon-canvas@0.6.0-beta.20": + version "0.6.0-beta.20" + resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.20.tgz#078dddef70caf880b2cb121fdda37d301fc13156" + integrity sha512-tHhsuqElE7LNiDJPbZzgVpmbcG2Dk6i2vh1EI+DzSByUWScDqLoeJbVPE5Xd2UW2garo24lxErpnIAlsytcA3A== -"@xterm/addon-image@0.7.0-beta.12": - version "0.7.0-beta.12" - resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.7.0-beta.12.tgz#b1ed300492429a1394c94385fb0c61ed36ad2041" - integrity sha512-MseIv99qlQ0u113a4PFAfSv4vQi+16HC6S9oAcS/CSAHeSySYqPPLdZXAMqLZo0n/vIESmSFXlX4bm2k3YIhoQ== +"@xterm/addon-image@0.7.0-beta.18": + version "0.7.0-beta.18" + resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.7.0-beta.18.tgz#588ea2d0841cff48c63bde1bfcdf56e9494dc6af" + integrity sha512-+HQ+IBmHPelzjRJ5zO3XkjbeQNr2Zrf5wAlbPhy4EGSD0mDCqHJSfzZ8wKrhx7t8qpfiA8eTpWu/M76WsEnlnA== -"@xterm/addon-search@0.14.0-beta.14": - version "0.14.0-beta.14" - resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.14.tgz#09da64dfea88315e1e07f95e5d8ec371fe986edb" - integrity sha512-SOIUqIakxLCT2jyn0GEidmd1KJRqGbuOITWXx8loBeiBb/Omo01nqhtHFU0HTdCRwFbOhMRMDTKKr2nQxaoPEQ== +"@xterm/addon-search@0.14.0-beta.20": + version "0.14.0-beta.20" + resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.20.tgz#cac366b1be1eb02cf9fe9537933f26f227d030c8" + integrity sha512-1LOL/OzWSrCBpndiBeeE2S1rxtKKgU1ucYFSG3P68W0J4VQz/Ksci1BgDKsgspj9jzpsGhdql3zwa5WEM7n4Pg== -"@xterm/addon-serialize@0.12.0-beta.14": - version "0.12.0-beta.14" - resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.14.tgz#a02553b318f2f9863cadb072e3e671ba34985e3b" - integrity sha512-zHNc6gKxHG8D+oZRWopHRCZXGt/eTBGUbVKc3Jk0h5zuWrNATZCztljQ7Zy/VOwhxQRpFrV6MXE4vb2cBLdmvw== +"@xterm/addon-serialize@0.12.0-beta.20": + version "0.12.0-beta.20" + resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.20.tgz#5fe126194ff4dc466b92a0946e081e039a14ad21" + integrity sha512-GdRCQDjLyVNBxCFnhfCWsMmuqv2PryUkOaNl4z5MqB5lBUkiEnRNY0u/s5f34+2zrijp3h0O/f9JDLW4gSUQgw== -"@xterm/addon-unicode11@0.7.0-beta.14": - version "0.7.0-beta.14" - resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.14.tgz#37f672945b59c62676a76f9afa292973bff13763" - integrity sha512-L1Maeye7mPYgllIOaD8b3J70B73SoC0deNrlhiMkry/8ue2Q48JzQnOGVWKIOZC+owB1aQRWZbQZbQaAiLKz4A== +"@xterm/addon-unicode11@0.7.0-beta.20": + version "0.7.0-beta.20" + resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.20.tgz#5d3c97320898dd6766f2dc127deb4f071c8698c2" + integrity sha512-4/uwJ6lV/xJplT7hJc7sO4Im4XNvEXHnUEFIs03FFp8ZUfu3U6wcBk6/GoKMwJKJtGVNxotiD6ZzJ5v8IBH6nA== -"@xterm/addon-webgl@0.17.0-beta.14": - version "0.17.0-beta.14" - resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.14.tgz#767057842d72258656be990b85718f01cf53ab55" - integrity sha512-FZoC0gk/H0hpQFrPEp2LM4qllj4a1MR/6sIg0TY6L83KS++8gxQLonTxDQoAmb9Ld5816s7ynLZJSTJUyDWRpg== +"@xterm/addon-webgl@0.17.0-beta.20": + version "0.17.0-beta.20" + resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.20.tgz#443845ac5ac755cf762b105ed237b30426b07137" + integrity sha512-iqvXNSTfKIcO9FBraNwdO/ixPrTHok8CBN/wjlnGLv0ZMc4zLAiKE8+PHyg9ZY38QJfS+4Ouo8KsuZwoOYfnNA== -"@xterm/headless@5.4.0-beta.14": - version "5.4.0-beta.14" - resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.4.0-beta.14.tgz#22f56a23bff9434b586a09771ac0c1dc06d72330" - integrity sha512-W1OPpSuKJqaJUXIi6GjOYRYzmmeB1SX6o2YIuYLJTzZx3cQzg6/gecYbGL1VKp7WzouAb8yJSlSkSQRIUMDRYg== +"@xterm/headless@5.4.0-beta.20": + version "5.4.0-beta.20" + resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.4.0-beta.20.tgz#af26d3d0e2cdd615ccfac4a8660181fee19898fd" + integrity sha512-H/as1d67J43/CB8xt1Yg/eJMbq1yopwG1bDBKdsf2ro8A1PmJFXNzaDB+wSgoH42fCusSpLJvXtUvDLtqfvBTg== -"@xterm/xterm@5.4.0-beta.14": - version "5.4.0-beta.14" - resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.14.tgz#fa0902f457fe799c65dec6ff784538a087f611d9" - integrity sha512-69E++VxeLPxBRhR3EGpkDe3R+EhpEZILo0m6TcN+atC4Zm5+WgcqXBCrBhkvpnBA2AhZp51w+hLC/OCwaHE0rg== +"@xterm/xterm@5.4.0-beta.20": + version "5.4.0-beta.20" + resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.20.tgz#28bbbbc73eceb6ef3e1e095de195cf849d0cbfb6" + integrity sha512-nkY91qBy5pe1HlW9LOoLcyG6v4teEsliEtUVshAO42NrJDaPniSn28O5m5832UjZOdjLCY58QlcBkZUquODGrQ== agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0: version "7.1.0" diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh index 5fe68cb4f3e..eb48bf8fcfc 100755 --- a/resources/linux/bin/code.sh +++ b/resources/linux/bin/code.sh @@ -33,7 +33,7 @@ if [ "$(id -u)" = "0" ]; then for i in "$@" do case "$i" in - --user-data-dir | --user-data-dir=* | --file-write ) + --user-data-dir | --user-data-dir=* | --file-write | tunnel | serve-web ) CAN_LAUNCH_AS_ROOT=1 ;; esac diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop index 72488b67700..e2e3f534751 100755 --- a/resources/linux/code.desktop +++ b/resources/linux/code.desktop @@ -14,5 +14,14 @@ Keywords=vscode; [Desktop Action new-empty-window] Name=New Empty Window +Name[de]=Neues leeres Fenster +Name[es]=Nueva ventana vacía +Name[fr]=Nouvelle fenêtre vide +Name[it]=Nuova finestra vuota +Name[ja]=新しい空のウィンドウ +Name[ko]=새 빈 창 +Name[ru]=Новое пустое окно +Name[zh_CN]=新建空窗口 +Name[zh_TW]=開新空視窗 Exec=@@EXEC@@ --new-window %F Icon=@@ICON@@ diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat index 4786c7f7a6d..facf82828f1 100644 --- a/scripts/test-integration.bat +++ b/scripts/test-integration.bat @@ -49,7 +49,7 @@ if %errorlevel% neq 0 exit /b %errorlevel% echo. echo ### Colorize tests -call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-colorize-tests\test --extensionDevelopmentPath=%~dp0\..\extensions\vscode-colorize-tests --extensionTestsPath=%~dp0\..\extensions\vscode-colorize-tests\out %API_TESTS_EXTRA_ARGS% +call yarn test-extension -l vscode-colorize-tests if %errorlevel% neq 0 exit /b %errorlevel% echo. @@ -89,7 +89,7 @@ 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% +call yarn test-extension -l configuration-editing if %errorlevel% neq 0 exit /b %errorlevel% echo. diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh index ab32efc798f..483fb5507c5 100755 --- a/scripts/test-integration.sh +++ b/scripts/test-integration.sh @@ -67,7 +67,7 @@ kill_app echo echo "### Colorize tests" echo -"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-colorize-tests/test --extensionDevelopmentPath=$ROOT/extensions/vscode-colorize-tests --extensionTestsPath=$ROOT/extensions/vscode-colorize-tests/out $API_TESTS_EXTRA_ARGS +yarn test-extension -l vscode-colorize-tests kill_app echo @@ -109,7 +109,7 @@ 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 +yarn test-extension -l configuration-editing kill_app echo diff --git a/scripts/update-xterm.ps1 b/scripts/update-xterm.ps1 deleted file mode 100644 index 6ee7ef8f91e..00000000000 --- a/scripts/update-xterm.ps1 +++ /dev/null @@ -1 +0,0 @@ -node $PSScriptRoot\update-xterm.js (Get-Location) diff --git a/scripts/xterm-symlink.ps1 b/scripts/xterm-symlink.ps1 new file mode 100644 index 00000000000..06e44dc7da7 --- /dev/null +++ b/scripts/xterm-symlink.ps1 @@ -0,0 +1,34 @@ +<# +.SYNOPSIS + Symlinks ./node_modules/xterm to provided $XtermFolder. +#> + +Param( + [Parameter(Mandatory=$True)] + $XtermFolder +) + +$TargetFolder = "./node_modules/@xterm/xterm" + +if (Test-Path $TargetFolder -PathType Container) +{ + Write-Host -ForegroundColor Green ":: Deleting $TargetFolder`n" + Remove-Item -Path $TargetFolder +} + +if (Test-Path $XtermFolder -PathType Container) +{ + Write-Host -ForegroundColor Green "`n:: Creating symlink $TargetFolder -> $XtermFolder`n" + New-Item -Path $TargetFolder -ItemType SymbolicLink -Value $XtermFolder + + Write-Host -ForegroundColor Green "`n:: Packaging xterm.js`n" + Set-Location $TargetFolder + yarn package -- --mode development + Set-Location - + + Write-Host -ForegroundColor Green "`n:: Finished! To watch changes, open the VS Code terminal in the xterm.js repo and run:`n`n yarn package -- --mode development --watch" +} +else +{ + Write-Error -ForegroundColor Red "`n:: $XtermFolder is not a valid folder" +} diff --git a/scripts/update-xterm.js b/scripts/xterm-update.js similarity index 100% rename from scripts/update-xterm.js rename to scripts/xterm-update.js diff --git a/scripts/xterm-update.ps1 b/scripts/xterm-update.ps1 new file mode 100644 index 00000000000..11c282de888 --- /dev/null +++ b/scripts/xterm-update.ps1 @@ -0,0 +1 @@ +node $PSScriptRoot\xterm-update.js (Get-Location) diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js index 036522f23ce..9de1e6f0d15 100644 --- a/src/bootstrap-fork.js +++ b/src/bootstrap-fork.js @@ -56,6 +56,9 @@ function pipeLoggingToParent() { * @param {ArrayLike} args */ function safeToArray(args) { + /** + * @type {string[]} + */ const seen = []; const argsArray = []; @@ -178,7 +181,7 @@ function pipeLoggingToParent() { Object.defineProperty(stream, 'write', { set: () => { }, - get: () => (chunk, encoding, callback) => { + get: () => (/** @type {string | Buffer | Uint8Array} */ chunk, /** @type {BufferEncoding | undefined} */ encoding, /** @type {((err?: Error | undefined) => void) | undefined} */ callback) => { buf += chunk.toString(encoding); const eol = buf.length > MAX_STREAM_BUFFER_LENGTH ? buf.length : buf.lastIndexOf('\n'); if (eol !== -1) { @@ -239,7 +242,9 @@ function configureCrashReporter() { const crashReporterProcessType = process.env['VSCODE_CRASH_REPORTER_PROCESS_TYPE']; if (crashReporterProcessType) { try { + // @ts-ignore if (process['crashReporter'] && typeof process['crashReporter'].addExtraParameter === 'function' /* Electron only */) { + // @ts-ignore process['crashReporter'].addExtraParameter('processType', crashReporterProcessType); } } catch (error) { diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js index 6334d62afc5..85409cc5a21 100644 --- a/src/bootstrap-window.js +++ b/src/bootstrap-window.js @@ -20,6 +20,7 @@ // Browser else { + // @ts-ignore globalThis.MonacoBootstrapWindow = factory(); } }(this, function () { @@ -71,12 +72,16 @@ }; const isDev = !!safeProcess.env['VSCODE_DEV']; const enableDeveloperKeybindings = isDev || forceEnableDeveloperKeybindings; + /** + * @type {() => void | undefined} + */ let developerDeveloperKeybindingsDisposable; if (enableDeveloperKeybindings) { developerDeveloperKeybindingsDisposable = registerDeveloperKeybindings(disallowReloadKeybinding); } // Get the nls configuration into the process.env as early as possible + // @ts-ignore const nlsConfig = globalThis.MonacoBootstrap.setupNLS(); let locale = nlsConfig.availableLanguages['*'] || 'en'; @@ -90,6 +95,10 @@ window['MonacoEnvironment'] = {}; + /** + * @typedef {any} LoaderConfig + */ + /** @type {LoaderConfig} */ const loaderConfig = { baseUrl: `${bootstrapLib.fileUriFromPath(configuration.appRoot, { isWindows: safeProcess.platform === 'win32', scheme: 'vscode-file', fallbackAuthority: 'vscode-app' })}/out`, 'vs/nls': nlsConfig, diff --git a/src/cli.js b/src/cli.js index dd5ea5351ec..a8aaa1f0d54 100644 --- a/src/cli.js +++ b/src/cli.js @@ -19,6 +19,7 @@ const bootstrapNode = require('./bootstrap-node'); const product = require('../product.json'); // Enable portable support +// @ts-ignore bootstrapNode.configurePortable(product); // Enable ASAR support diff --git a/src/main.js b/src/main.js index 7087474bcee..17507dc73da 100644 --- a/src/main.js +++ b/src/main.js @@ -24,6 +24,7 @@ const { getUserDataPath } = require('./vs/platform/environment/node/userDataPath const { stripComments } = require('./vs/base/common/stripComments'); const { getUNCHost, addUNCHostToAllowlist } = require('./vs/base/node/unc'); /** @type {Partial} */ +// @ts-ignore const product = require('../product.json'); const { app, protocol, crashReporter, Menu } = require('electron'); @@ -513,6 +514,7 @@ function registerListeners() { * @type {string[]} */ const macOpenFiles = []; + // @ts-ignore global['macOpenFiles'] = macOpenFiles; app.on('open-file', function (event, path) { macOpenFiles.push(path); @@ -539,6 +541,7 @@ function registerListeners() { app.on('open-url', onOpenUrl); }); + // @ts-ignore global['getOpenUrls'] = function () { app.removeListener('open-url', onOpenUrl); diff --git a/src/tsconfig.json b/src/tsconfig.json index 56ca209276b..1e0c8b14a1a 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -25,7 +25,13 @@ "include": [ "./bootstrap.js", "./bootstrap-amd.js", + "./bootstrap-fork.js", + "./bootstrap-node.js", + "./bootstrap-window.js", + "./cli.js", + "./main.js", "./server-main.js", + "./server-cli.js", "./typings", "./vs/**/*.ts", "vscode-dts/vscode.proposed.*.d.ts", diff --git a/src/tsconfig.monaco.json b/src/tsconfig.monaco.json index b7c5d7468b5..988f0485713 100644 --- a/src/tsconfig.monaco.json +++ b/src/tsconfig.monaco.json @@ -11,7 +11,7 @@ "moduleResolution": "classic", "removeComments": false, "preserveConstEnums": true, - "target": "es6", + "target": "es2018", "sourceMap": false, "declaration": true }, diff --git a/src/tsec.exemptions.json b/src/tsec.exemptions.json index eb8405c96cb..5fef171569e 100644 --- a/src/tsec.exemptions.json +++ b/src/tsec.exemptions.json @@ -14,6 +14,7 @@ "vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts" ], "ban-trustedtypes-createpolicy": [ + "bootstrap-window.js", "vs/amdX.ts", "vs/base/browser/trustedTypes.ts", "vs/base/worker/workerMain.ts", diff --git a/src/vs/base/browser/browser.ts b/src/vs/base/browser/browser.ts index de37d415e03..5020e44a36b 100644 --- a/src/vs/base/browser/browser.ts +++ b/src/vs/base/browser/browser.ts @@ -3,52 +3,67 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { $window } from 'vs/base/browser/window'; +import { $window, CodeWindow, mainWindow } from 'vs/base/browser/window'; import { Emitter, Event } from 'vs/base/common/event'; import { Disposable, markAsSingleton } from 'vs/base/common/lifecycle'; class WindowManager { - public static readonly INSTANCE = new WindowManager(); + static readonly INSTANCE = new WindowManager(); // --- Zoom Level - private _zoomLevel: number = 0; - public getZoomLevel(): number { - return this._zoomLevel; + private readonly mapWindowIdToZoomLevel = new Map(); + + private readonly _onDidChangeZoomLevel = new Emitter(); + readonly onDidChangeZoomLevel = this._onDidChangeZoomLevel.event; + + getZoomLevel(targetWindow: Window): number { + return this.mapWindowIdToZoomLevel.get(this.getWindowId(targetWindow)) ?? 0; } - public setZoomLevel(zoomLevel: number): void { - if (this._zoomLevel === zoomLevel) { + setZoomLevel(zoomLevel: number, targetWindow: Window): void { + if (this.getZoomLevel(targetWindow) === zoomLevel) { return; } - this._zoomLevel = zoomLevel; + + const targetWindowId = this.getWindowId(targetWindow); + this.mapWindowIdToZoomLevel.set(targetWindowId, zoomLevel); + this._onDidChangeZoomLevel.fire(targetWindowId); } // --- Zoom Factor - private _zoomFactor: number = 1; - public getZoomFactor(): number { - return this._zoomFactor; + private readonly mapWindowIdToZoomFactor = new Map(); + + getZoomFactor(targetWindow: Window): number { + return this.mapWindowIdToZoomFactor.get(this.getWindowId(targetWindow)) ?? 1; } - public setZoomFactor(zoomFactor: number): void { - this._zoomFactor = zoomFactor; + setZoomFactor(zoomFactor: number, targetWindow: Window): void { + this.mapWindowIdToZoomFactor.set(this.getWindowId(targetWindow), zoomFactor); } // --- Fullscreen - private _fullscreen: boolean = false; - private readonly _onDidChangeFullscreen = new Emitter(); - public readonly onDidChangeFullscreen: Event = this._onDidChangeFullscreen.event; - public setFullscreen(fullscreen: boolean): void { - if (this._fullscreen === fullscreen) { + private readonly _onDidChangeFullscreen = new Emitter(); + readonly onDidChangeFullscreen = this._onDidChangeFullscreen.event; + + private readonly mapWindowIdToFullScreen = new Map(); + + setFullscreen(fullscreen: boolean, targetWindow: Window): void { + if (this.isFullscreen(targetWindow) === fullscreen) { return; } - this._fullscreen = fullscreen; - this._onDidChangeFullscreen.fire(); + const windowId = this.getWindowId(targetWindow); + this.mapWindowIdToFullScreen.set(windowId, fullscreen); + this._onDidChangeFullscreen.fire(windowId); } - public isFullscreen(): boolean { - return this._fullscreen; + isFullscreen(targetWindow: Window): boolean { + return !!this.mapWindowIdToFullScreen.get(this.getWindowId(targetWindow)); + } + + private getWindowId(targetWindow: Window): number { + return (targetWindow as CodeWindow).vscodeWindowId; } } @@ -58,7 +73,7 @@ class WindowManager { class DevicePixelRatioMonitor extends Disposable { private readonly _onDidChange = this._register(new Emitter()); - public readonly onDidChange = this._onDidChange.event; + readonly onDidChange = this._onDidChange.event; private readonly _listener: () => void; private _mediaQueryList: MediaQueryList | null; @@ -86,11 +101,11 @@ class DevicePixelRatioMonitor extends Disposable { class PixelRatioImpl extends Disposable { private readonly _onDidChange = this._register(new Emitter()); - public readonly onDidChange = this._onDidChange.event; + readonly onDidChange = this._onDidChange.event; private _value: number; - public get value(): number { + get value(): number { return this._value; } @@ -131,21 +146,21 @@ class PixelRatioFacade { /** * Get the current value. */ - public get value(): number { + get value(): number { return this._getOrCreatePixelRatioMonitor().value; } /** * Listen for changes. */ - public get onDidChange(): Event { + get onDidChange(): Event { return this._getOrCreatePixelRatioMonitor().onDidChange; } } -export function addMatchMediaChangeListener(query: string | MediaQueryList, callback: (this: MediaQueryList, ev: MediaQueryListEvent) => any): void { +export function addMatchMediaChangeListener(targetWindow: Window, query: string | MediaQueryList, callback: (this: MediaQueryList, ev: MediaQueryListEvent) => any): void { if (typeof query === 'string') { - query = $window.matchMedia(query); + query = targetWindow.matchMedia(query); } query.addEventListener('change', callback); } @@ -160,26 +175,27 @@ export function addMatchMediaChangeListener(query: string | MediaQueryList, call export const PixelRatio = new PixelRatioFacade(); /** A zoom index, e.g. 1, 2, 3 */ -export function setZoomLevel(zoomLevel: number): void { - WindowManager.INSTANCE.setZoomLevel(zoomLevel); +export function setZoomLevel(zoomLevel: number, targetWindow: Window): void { + WindowManager.INSTANCE.setZoomLevel(zoomLevel, targetWindow); } -export function getZoomLevel(): number { - return WindowManager.INSTANCE.getZoomLevel(); +export function getZoomLevel(targetWindow: Window): number { + return WindowManager.INSTANCE.getZoomLevel(targetWindow); } +export const onDidChangeZoomLevel = WindowManager.INSTANCE.onDidChangeZoomLevel; /** The zoom scale for an index, e.g. 1, 1.2, 1.4 */ -export function getZoomFactor(): number { - return WindowManager.INSTANCE.getZoomFactor(); +export function getZoomFactor(targetWindow: Window): number { + return WindowManager.INSTANCE.getZoomFactor(targetWindow); } -export function setZoomFactor(zoomFactor: number): void { - WindowManager.INSTANCE.setZoomFactor(zoomFactor); +export function setZoomFactor(zoomFactor: number, targetWindow: Window): void { + WindowManager.INSTANCE.setZoomFactor(zoomFactor, targetWindow); } -export function setFullscreen(fullscreen: boolean): void { - WindowManager.INSTANCE.setFullscreen(fullscreen); +export function setFullscreen(fullscreen: boolean, targetWindow: Window): void { + WindowManager.INSTANCE.setFullscreen(fullscreen, targetWindow); } -export function isFullscreen(): boolean { - return WindowManager.INSTANCE.isFullscreen(); +export function isFullscreen(targetWindow: Window): boolean { + return WindowManager.INSTANCE.isFullscreen(targetWindow); } export const onDidChangeFullscreen = WindowManager.INSTANCE.onDidChangeFullscreen; @@ -194,11 +210,11 @@ export const isElectron = (userAgent.indexOf('Electron/') >= 0); export const isAndroid = (userAgent.indexOf('Android') >= 0); let standalone = false; -if ($window.matchMedia) { - const standaloneMatchMedia = $window.matchMedia('(display-mode: standalone) or (display-mode: window-controls-overlay)'); - const fullScreenMatchMedia = $window.matchMedia('(display-mode: fullscreen)'); +if (typeof mainWindow.matchMedia === 'function') { + const standaloneMatchMedia = mainWindow.matchMedia('(display-mode: standalone) or (display-mode: window-controls-overlay)'); + const fullScreenMatchMedia = mainWindow.matchMedia('(display-mode: fullscreen)'); standalone = standaloneMatchMedia.matches; - addMatchMediaChangeListener(standaloneMatchMedia, ({ matches }) => { + addMatchMediaChangeListener(mainWindow, 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) { diff --git a/src/vs/base/browser/canIUse.ts b/src/vs/base/browser/canIUse.ts index c126a33b45b..60261a974d0 100644 --- a/src/vs/base/browser/canIUse.ts +++ b/src/vs/base/browser/canIUse.ts @@ -43,5 +43,5 @@ export const BrowserFeatures = { // 'ontouchstart' in window always evaluates to true with typescript's modern typings. This causes `window` to be // `never` later in `window.navigator`. That's why we need the explicit `window as Window` cast touch: 'ontouchstart' in mainWindow || navigator.maxTouchPoints > 0, - pointerEvents: mainWindow.PointerEvent && ('ontouchstart' in mainWindow || navigator.maxTouchPoints > 0 || navigator.maxTouchPoints > 0) + pointerEvents: mainWindow.PointerEvent && ('ontouchstart' in mainWindow || navigator.maxTouchPoints > 0) }; diff --git a/src/vs/base/browser/defaultWorkerFactory.ts b/src/vs/base/browser/defaultWorkerFactory.ts index 4f42810f0bd..71391b063f3 100644 --- a/src/vs/base/browser/defaultWorkerFactory.ts +++ b/src/vs/base/browser/defaultWorkerFactory.ts @@ -7,6 +7,7 @@ import { createTrustedTypesPolicy } from 'vs/base/browser/trustedTypes'; import { onUnexpectedError } from 'vs/base/common/errors'; import { COI } from 'vs/base/common/network'; import { IWorker, IWorkerCallback, IWorkerFactory, logOnceWebWorkerWarning } from 'vs/base/common/worker/simpleWorker'; +import { Disposable, toDisposable } from 'vs/base/common/lifecycle'; const ttPolicy = createTrustedTypesPolicy('defaultWorkerFactory', { createScriptURL: value => value }); @@ -84,13 +85,14 @@ function isPromiseLike(obj: any): obj is PromiseLike { * A worker that uses HTML5 web workers so that is has * its own global scope and its own thread. */ -class WebWorker implements IWorker { +class WebWorker extends Disposable implements IWorker { private readonly id: number; private readonly label: string; private worker: Promise | null; constructor(moduleId: string, id: number, label: string, onMessageCallback: IWorkerCallback, onErrorCallback: (err: any) => void) { + super(); this.id = id; this.label = label; const workerOrPromise = getWorker(label); @@ -109,6 +111,15 @@ class WebWorker implements IWorker { w.addEventListener('error', onErrorCallback); } }); + this._register(toDisposable(() => { + this.worker?.then(w => { + w.onmessage = null; + w.onmessageerror = null; + w.removeEventListener('error', onErrorCallback); + w.terminate(); + }); + this.worker = null; + })); } public getId(): number { @@ -126,10 +137,7 @@ class WebWorker implements IWorker { }); } - public dispose(): void { - this.worker?.then(w => w.terminate()); - this.worker = null; - } + } export class DefaultWorkerFactory implements IWorkerFactory { diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts index cca41a8fbf9..112ed1854d2 100644 --- a/src/vs/base/browser/dom.ts +++ b/src/vs/base/browser/dom.ts @@ -17,21 +17,31 @@ import { FileAccess, RemoteAuthorities, Schemas } from 'vs/base/common/network'; import * as platform from 'vs/base/common/platform'; import { URI } from 'vs/base/common/uri'; import { hash } from 'vs/base/common/hash'; -import { CodeWindow, mainWindow } from 'vs/base/browser/window'; +import { CodeWindow, ensureCodeWindow, mainWindow } from 'vs/base/browser/window'; -interface IRegisteredCodeWindow { +export interface IRegisteredCodeWindow { readonly window: CodeWindow; readonly disposables: DisposableStore; } -export const { registerWindow, getWindows, getWindowsCount, getWindowId, onDidRegisterWindow, onWillUnregisterWindow, onDidUnregisterWindow } = (function () { +//# region Multi-Window Support Utilities + +export const { + registerWindow, + getWindow, + getDocument, + getWindows, + getWindowsCount, + getWindowId, + getWindowById, + hasWindow, + onDidRegisterWindow, + onWillUnregisterWindow, + onDidUnregisterWindow +} = (function () { const windows = new Map(); - if (typeof mainWindow.vscodeWindowId !== 'number') { - Object.defineProperty(mainWindow, 'vscodeWindowId', { - get: () => 1 - }); - } + ensureCodeWindow(mainWindow, 1); windows.set(mainWindow.vscodeWindowId, { window: mainWindow, disposables: new DisposableStore() }); const onDidRegisterWindow = new event.Emitter(); @@ -76,10 +86,35 @@ export const { registerWindow, getWindows, getWindowsCount, getWindowId, onDidRe }, getWindowId(targetWindow: Window): number { return (targetWindow as CodeWindow).vscodeWindowId; + }, + hasWindow(windowId: number): boolean { + return windows.has(windowId); + }, + getWindowById(windowId: number): IRegisteredCodeWindow | undefined { + return windows.get(windowId); + }, + getWindow(e: Node | UIEvent | undefined | null): CodeWindow { + const candidateNode = e as Node | undefined | null; + if (candidateNode?.ownerDocument?.defaultView) { + return candidateNode.ownerDocument.defaultView.window as CodeWindow; + } + + const candidateEvent = e as UIEvent | undefined | null; + if (candidateEvent?.view) { + return candidateEvent.view.window as CodeWindow; + } + + return mainWindow; + }, + getDocument(e: Node | UIEvent | undefined | null): Document { + const candidateNode = e as Node | undefined | null; + return getWindow(candidateNode).document; } }; })(); +//#endregion + export function clearNode(node: HTMLElement): void { while (node.firstChild) { node.firstChild.remove(); @@ -101,7 +136,7 @@ class DomListener implements IDisposable { this._node.addEventListener(this._type, this._handler, this._options); } - public dispose(): void { + dispose(): void { if (!this._handler) { // Already disposed return; @@ -133,9 +168,9 @@ export interface IAddStandardDisposableListenerSignature { (node: HTMLElement, type: 'pointerup', handler: (event: PointerEvent) => void, useCapture?: boolean): IDisposable; (node: HTMLElement, type: string, handler: (event: any) => void, useCapture?: boolean): IDisposable; } -function _wrapAsStandardMouseEvent(handler: (e: IMouseEvent) => void): (e: MouseEvent) => void { +function _wrapAsStandardMouseEvent(targetWindow: Window, handler: (e: IMouseEvent) => void): (e: MouseEvent) => void { return function (e: MouseEvent) { - return handler(new StandardMouseEvent(e)); + return handler(new StandardMouseEvent(targetWindow, e)); }; } function _wrapAsStandardKeyboardEvent(handler: (e: IKeyboardEvent) => void): (e: KeyboardEvent) => void { @@ -147,7 +182,7 @@ export const addStandardDisposableListener: IAddStandardDisposableListenerSignat let wrapHandler = handler; if (type === 'click' || type === 'mousedown') { - wrapHandler = _wrapAsStandardMouseEvent(handler); + wrapHandler = _wrapAsStandardMouseEvent(getWindow(node), handler); } else if (type === 'keydown' || type === 'keypress' || type === 'keyup') { wrapHandler = _wrapAsStandardKeyboardEvent(handler); } @@ -156,13 +191,13 @@ export const addStandardDisposableListener: IAddStandardDisposableListenerSignat }; export const addStandardDisposableGenericMouseDownListener = function addStandardDisposableListener(node: HTMLElement, handler: (event: any) => void, useCapture?: boolean): IDisposable { - const wrapHandler = _wrapAsStandardMouseEvent(handler); + const wrapHandler = _wrapAsStandardMouseEvent(getWindow(node), handler); return addDisposableGenericMouseDownListener(node, wrapHandler, useCapture); }; export const addStandardDisposableGenericMouseUpListener = function addStandardDisposableListener(node: HTMLElement, handler: (event: any) => void, useCapture?: boolean): IDisposable { - const wrapHandler = _wrapAsStandardMouseEvent(handler); + const wrapHandler = _wrapAsStandardMouseEvent(getWindow(node), handler); return addDisposableGenericMouseUpListener(node, wrapHandler, useCapture); }; @@ -178,7 +213,6 @@ export function addDisposableGenericMouseUpListener(node: EventTarget, handler: return addDisposableListener(node, platform.isIOS && BrowserFeatures.pointerEvents ? EventType.POINTER_UP : EventType.MOUSE_UP, handler, useCapture); } - /** * Execute the callback the next time the browser is idle, returning an * {@link IDisposable} that will cancel the callback when disposed. This wraps @@ -212,7 +246,6 @@ export class WindowIdleValue extends AbstractIdleValue { } } - /** * Schedule a callback to be run at the next animation frame. * This allows multiple parties to register callbacks that should run at the next animation frame. @@ -228,7 +261,7 @@ export let runAtThisOrScheduleAtNextAnimationFrame: (targetWindow: Window, runne */ export let scheduleAtNextAnimationFrame: (targetWindow: Window, runner: () => void, priority?: number) => IDisposable; -export function disposableWindowInterval(targetWindow: Window & typeof globalThis, handler: () => void | boolean /* stop interval */ | Promise, interval: number, iterations?: number): IDisposable { +export function disposableWindowInterval(targetWindow: Window, handler: () => void | boolean /* stop interval */ | Promise, interval: number, iterations?: number): IDisposable { let iteration = 0; const timer = targetWindow.setInterval(() => { iteration++; @@ -261,11 +294,11 @@ class AnimationFrameQueueItem implements IDisposable { this._canceled = false; } - public dispose(): void { + dispose(): void { this._canceled = true; } - public execute(): void { + execute(): void { if (this._canceled) { return; } @@ -278,7 +311,7 @@ class AnimationFrameQueueItem implements IDisposable { } // Sort by priority (largest to lowest) - public static sort(a: AnimationFrameQueueItem, b: AnimationFrameQueueItem): number { + static sort(a: AnimationFrameQueueItem, b: AnimationFrameQueueItem): number { return b.priority - a.priority; } } @@ -408,13 +441,12 @@ export function addDisposableThrottledListener(node: } export function getComputedStyle(el: HTMLElement): CSSStyleDeclaration { - return el.ownerDocument.defaultView!.getComputedStyle(el, null); + return getWindow(el).getComputedStyle(el, null); } -export function getClientArea(element: HTMLElement): Dimension { - - const elDocument = element.ownerDocument; - const elWindow = elDocument.defaultView?.window; +export function getClientArea(element: HTMLElement, fallback?: HTMLElement): Dimension { + const elWindow = getWindow(element); + const elDocument = elWindow.document; // Try with DOM clientWidth / clientHeight if (element !== elDocument.body) { @@ -441,6 +473,10 @@ export function getClientArea(element: HTMLElement): Dimension { return new Dimension(elDocument.documentElement.clientWidth, elDocument.documentElement.clientHeight); } + if (fallback) { + return getClientArea(fallback); + } + throw new Error('Unable to figure out browser width and height'); } @@ -510,8 +546,8 @@ export class Dimension implements IDimension { static readonly None = new Dimension(0, 0); constructor( - public readonly width: number, - public readonly height: number, + readonly width: number, + readonly height: number, ) { } with(width: number = this.width, height: number = this.height): Dimension { @@ -626,9 +662,10 @@ export function position(element: HTMLElement, top: number, right?: number, bott */ export function getDomNodePagePosition(domNode: HTMLElement): IDomNodePagePosition { const bb = domNode.getBoundingClientRect(); + const window = getWindow(domNode); return { - left: bb.left + (domNode.ownerDocument.defaultView?.scrollX ?? 0), - top: bb.top + (domNode.ownerDocument.defaultView?.scrollY ?? 0), + left: bb.left + window.scrollX, + top: bb.top + window.scrollY, width: bb.width, height: bb.height }; @@ -803,8 +840,9 @@ export function getShadowRoot(domNode: Node): ShadowRoot | null { } /** - * Returns the active element across all child windows. - * Use this instead of `document.activeElement` to handle multiple windows. + * Returns the active element across all child windows + * based on document focus. Falls back to the main + * window if no window has focus. */ export function getActiveElement(): Element | null { let result = getActiveDocument().activeElement; @@ -817,66 +855,57 @@ export function getActiveElement(): Element | null { } /** - * Returns whether the active element of the `document` that owns - * the `element` is `element`. + * Returns true if the focused window active element matches + * the provided element. Falls back to the main window if no + * window has focus. */ export function isActiveElement(element: Element): boolean { - return element.ownerDocument.activeElement === element; + return getActiveElement() === element; } /** - * Returns whether the active element of the `document` that owns - * the `ancestor` is contained in `ancestor`. + * Returns true if the focused window active element is contained in + * `ancestor`. Falls back to the main window if no window has focus. */ export function isAncestorOfActiveElement(ancestor: Element): boolean { - return isAncestor(ancestor.ownerDocument.activeElement, ancestor); + return isAncestor(getActiveElement(), ancestor); } /** - * Returns whether the element is in the active `document`. + * Returns whether the element is in the active `document`. The active + * document has focus or will be the main windows document. */ export function isActiveDocument(element: Element): boolean { return element.ownerDocument === getActiveDocument(); } /** - * Returns the active document across all child windows. - * Use this instead of `document` when reacting to dom - * events to handle multiple windows. + * Returns the active document across main and child windows. + * Prefers the window with focus, otherwise falls back to + * the main windows document. */ export function getActiveDocument(): Document { if (getWindowsCount() <= 1) { - return document; + return mainWindow.document; } const documents = Array.from(getWindows()).map(({ window }) => window.document); - return documents.find(doc => doc.hasFocus()) ?? document; + return documents.find(doc => doc.hasFocus()) ?? mainWindow.document; } +/** + * Returns the active window across main and child windows. + * Prefers the window with focus, otherwise falls back to + * the main window. + */ export function getActiveWindow(): CodeWindow { const document = getActiveDocument(); return (document.defaultView?.window ?? mainWindow) as CodeWindow; } -export function getWindow(element: Node | undefined | null): CodeWindow; -export function getWindow(event: UIEvent | undefined | null): CodeWindow; -export function getWindow(e: unknown): CodeWindow { - const candidateNode = e as Node | undefined | null; - if (candidateNode?.ownerDocument?.defaultView) { - return candidateNode.ownerDocument.defaultView.window as CodeWindow; - } - - const candidateEvent = e as UIEvent | undefined | null; - if (candidateEvent?.view) { - return candidateEvent.view.window as CodeWindow; - } - - return mainWindow; -} - export function focusWindow(element: Node): void { const window = getWindow(element); - if (window !== getActiveWindow()) { + if (!window.document.hasFocus()) { window.focus(); } } @@ -1002,9 +1031,17 @@ export const sharedMutationObserver = new class { }; export function createMetaElement(container: HTMLElement = mainWindow.document.head): HTMLMetaElement { - const meta = document.createElement('meta'); - container.appendChild(meta); - return meta; + return createHeadElement('meta', container) as HTMLMetaElement; +} + +export function createLinkElement(container: HTMLElement = mainWindow.document.head): HTMLLinkElement { + return createHeadElement('link', container) as HTMLLinkElement; +} + +function createHeadElement(tagName: string, container: HTMLElement = mainWindow.document.head): HTMLElement { + const element = document.createElement(tagName); + container.appendChild(element); + return element; } let _sharedStyleSheet: HTMLStyleElement | null = null; @@ -1172,8 +1209,8 @@ export const EventHelper = { }; export interface IFocusTracker extends Disposable { - onDidFocus: event.Event; - onDidBlur: event.Event; + readonly onDidFocus: event.Event; + readonly onDidBlur: event.Event; refreshState(): void; } @@ -1198,10 +1235,10 @@ export function restoreParentsScrollTop(node: Element, state: number[]): void { class FocusTracker extends Disposable implements IFocusTracker { private readonly _onDidFocus = this._register(new event.Emitter()); - public readonly onDidFocus: event.Event = this._onDidFocus.event; + readonly onDidFocus = this._onDidFocus.event; private readonly _onDidBlur = this._register(new event.Emitter()); - public readonly onDidBlur: event.Event = this._onDidBlur.event; + readonly onDidBlur = this._onDidBlur.event; private _refreshStateHandler: () => void; @@ -1780,6 +1817,7 @@ export const basicMarkupHtmlTags = Object.freeze([ 'hr', 'i', 'img', + 'input', 'ins', 'kbd', 'label', diff --git a/src/vs/base/browser/markdownRenderer.ts b/src/vs/base/browser/markdownRenderer.ts index d7f6d0502cf..fa4352fd344 100644 --- a/src/vs/base/browser/markdownRenderer.ts +++ b/src/vs/base/browser/markdownRenderer.ts @@ -12,7 +12,7 @@ import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels'; import { onUnexpectedError } from 'vs/base/common/errors'; import { Event } from 'vs/base/common/event'; -import { IMarkdownString, escapeDoubleQuotes, parseHrefAndDimensions, removeMarkdownEscapes, MarkdownStringTrustedOptions } from 'vs/base/common/htmlContent'; +import { escapeDoubleQuotes, IMarkdownString, MarkdownStringTrustedOptions, parseHrefAndDimensions, removeMarkdownEscapes } from 'vs/base/common/htmlContent'; import { markdownEscapeEscapedIcons } from 'vs/base/common/iconLabels'; import { defaultGenerator } from 'vs/base/common/idGenerator'; import { KeyCode } from 'vs/base/common/keyCodes'; @@ -80,7 +80,8 @@ const defaultMarkedRenderers = Object.freeze({ .replace(/>/g, '>') .replace(/"/g, '"') .replace(/'/g, '''); - return `${text}`; + + return `${text}`; }, }); @@ -195,7 +196,7 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende const onClick = options.actionHandler.disposables.add(new DomEmitter(element, 'click')); const onAuxClick = options.actionHandler.disposables.add(new DomEmitter(element, 'auxclick')); options.actionHandler.disposables.add(Event.any(onClick.event, onAuxClick.event)(e => { - const mouseEvent = new StandardMouseEvent(e); + const mouseEvent = new StandardMouseEvent(DOM.getWindow(element), e); if (!mouseEvent.leftButton && !mouseEvent.middleButton) { return; } @@ -387,9 +388,26 @@ function sanitizeRenderedMarkdown( } e.keepAttr = false; return; + } else if (element.tagName === 'INPUT' && element.attributes.getNamedItem('type')?.value === 'checkbox') { + if ((e.attrName === 'type' && e.attrValue === 'checkbox') || e.attrName === 'disabled' || e.attrName === 'checked') { + e.keepAttr = true; + return; + } + e.keepAttr = false; } }); + dompurify.addHook('uponSanitizeElement', (element, e) => { + if (e.tagName === 'input') { + if (element.attributes.getNamedItem('type')?.value === 'checkbox') { + element.setAttribute('disabled', ''); + } else { + element.parentElement?.removeChild(element); + } + } + }); + + const hook = DOM.hookDomPurifyHrefAndSrcSanitizer(allowedSchemes); try { @@ -404,10 +422,13 @@ export const allowedMarkdownAttr = [ 'align', 'autoplay', 'alt', + 'checked', 'class', 'controls', 'data-code', 'data-href', + 'disabled', + 'draggable', 'height', 'href', 'loop', @@ -418,6 +439,7 @@ export const allowedMarkdownAttr = [ 'style', 'target', 'title', + 'type', 'width', 'start', ]; diff --git a/src/vs/base/browser/mouseEvent.ts b/src/vs/base/browser/mouseEvent.ts index d1f172433a6..b4ae34ad5ec 100644 --- a/src/vs/base/browser/mouseEvent.ts +++ b/src/vs/base/browser/mouseEvent.ts @@ -5,7 +5,6 @@ import * as browser from 'vs/base/browser/browser'; import { IframeUtils } from 'vs/base/browser/iframe'; -import { $window } from 'vs/base/browser/window'; import * as platform from 'vs/base/common/platform'; export interface IMouseEvent { @@ -46,7 +45,7 @@ export class StandardMouseEvent implements IMouseEvent { public readonly metaKey: boolean; public readonly timestamp: number; - constructor(e: MouseEvent) { + constructor(targetWindow: Window, e: MouseEvent) { this.timestamp = Date.now(); this.browserEvent = e; this.leftButton = e.button === 0; @@ -75,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. - const iframeOffsets = IframeUtils.getPositionOfChildWindowRelativeToAncestorWindow($window, e.view); + const iframeOffsets = IframeUtils.getPositionOfChildWindowRelativeToAncestorWindow(targetWindow, e.view); this.posx -= iframeOffsets.left; this.posy -= iframeOffsets.top; } @@ -93,8 +92,8 @@ export class DragMouseEvent extends StandardMouseEvent { public readonly dataTransfer: DataTransfer; - constructor(e: MouseEvent) { - super(e); + constructor(targetWindow: Window, e: MouseEvent) { + super(targetWindow, e); this.dataTransfer = (e).dataTransfer; } } diff --git a/src/vs/base/browser/ui/actionbar/actionViewItems.ts b/src/vs/base/browser/ui/actionbar/actionViewItems.ts index a317f1c1d3e..906c437b325 100644 --- a/src/vs/base/browser/ui/actionbar/actionViewItems.ts +++ b/src/vs/base/browser/ui/actionbar/actionViewItems.ts @@ -210,6 +210,10 @@ export class BaseActionViewItem extends Disposable implements IActionViewItem { // implement in subclass } + protected getClass(): string | undefined { + return this.action.class; + } + protected getTooltip(): string | undefined { return this.action.tooltip; } @@ -369,9 +373,8 @@ export class ActionViewItem extends BaseActionViewItem { if (this.cssClass && this.label) { this.label.classList.remove(...this.cssClass.split(' ')); } - if (this.options.icon) { - this.cssClass = this.action.class; + this.cssClass = this.getClass(); if (this.label) { this.label.classList.add('codicon'); @@ -419,7 +422,7 @@ export class ActionViewItem extends BaseActionViewItem { this.label.setAttribute('role', 'checkbox'); } else { this.label.classList.remove('checked'); - this.label.setAttribute('aria-checked', ''); + this.label.removeAttribute('aria-checked'); this.label.setAttribute('role', this.getDefaultAriaRole()); } } diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts index 8cd46c5c4ca..fafc3417f8b 100644 --- a/src/vs/base/browser/ui/actionbar/actionbar.ts +++ b/src/vs/base/browser/ui/actionbar/actionbar.ts @@ -201,7 +201,7 @@ export class ActionBar extends Disposable implements IActionRunner { } // Recompute focused item - else if (event.equals(KeyCode.Tab) || event.equals(KeyMod.Shift | KeyCode.Tab)) { + else if (event.equals(KeyCode.Tab) || event.equals(KeyMod.Shift | KeyCode.Tab) || event.equals(KeyCode.UpArrow) || event.equals(KeyCode.DownArrow) || event.equals(KeyCode.LeftArrow) || event.equals(KeyCode.RightArrow)) { this.updateFocusedItem(); } })); @@ -235,7 +235,7 @@ export class ActionBar extends Disposable implements IActionRunner { } private refreshRole(): void { - if (this.length() >= 2) { + if (this.length() >= 1) { this.actionsList.setAttribute('role', this.options.ariaRole || 'toolbar'); } else { this.actionsList.setAttribute('role', 'presentation'); @@ -561,9 +561,6 @@ export class ActionBar extends Disposable implements IActionRunner { if (actionViewItem.action.id === Separator.ID) { focusItem = false; } - if (focusItem) { - actionViewItem.showHover?.(); - } if (!focusItem) { this.actionsList.focus({ preventScroll }); this.previouslyFocusedItem = undefined; @@ -571,6 +568,9 @@ export class ActionBar extends Disposable implements IActionRunner { actionViewItem.focus(fromRight); this.previouslyFocusedItem = this.focusedItem; } + if (focusItem) { + actionViewItem.showHover?.(); + } } } diff --git a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts index 7e130b71d09..7094cc9c41e 100644 --- a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts +++ b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts @@ -14,7 +14,7 @@ import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import 'vs/css!./breadcrumbsWidget'; export abstract class BreadcrumbsItem { - dispose(): void { } + abstract dispose(): void; abstract equals(other: BreadcrumbsItem): boolean; abstract render(container: HTMLElement): void; } diff --git a/src/vs/base/browser/ui/button/button.css b/src/vs/base/browser/ui/button/button.css index 14a189bd0fc..2517cd3571c 100644 --- a/src/vs/base/browser/ui/button/button.css +++ b/src/vs/base/browser/ui/button/button.css @@ -101,6 +101,8 @@ border: 1px solid var(--vscode-button-border, transparent); border-left-width: 0 !important; border-radius: 0 2px 2px 0; + display: flex; + align-items: center; } .monaco-button-dropdown > .monaco-button.monaco-text-button { diff --git a/src/vs/base/browser/ui/centered/centeredViewLayout.ts b/src/vs/base/browser/ui/centered/centeredViewLayout.ts index 1fef73f19da..db13907259a 100644 --- a/src/vs/base/browser/ui/centered/centeredViewLayout.ts +++ b/src/vs/base/browser/ui/centered/centeredViewLayout.ts @@ -66,12 +66,12 @@ export class CenteredViewLayout implements IDisposable { private didLayout = false; private emptyViews: ISplitViewView<{ top: number; left: number }>[] | undefined; private readonly splitViewDisposables = new DisposableStore(); - private centeredLayoutFixedWidth = true; constructor( private container: HTMLElement, private view: IView, - public state: CenteredViewState = { ...defaultState } + public state: CenteredViewState = { ...defaultState }, + private centeredLayoutFixedWidth: boolean = false ) { this.container.appendChild(this.view.element); // Make sure to hide the split view overflow like sashes #52892 diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf index 0694339a3f8..8ccc035403b 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.ts b/src/vs/base/browser/ui/contextview/contextview.ts index d8156d1b3bb..239cc4171a2 100644 --- a/src/vs/base/browser/ui/contextview/contextview.ts +++ b/src/vs/base/browser/ui/contextview/contextview.ts @@ -136,29 +136,33 @@ export class ContextView extends Disposable { private container: HTMLElement | null = null; private view: HTMLElement; - private useFixedPosition: boolean; - private useShadowDOM: boolean; + private useFixedPosition = false; + private useShadowDOM = false; private delegate: IDelegate | null = null; private toDisposeOnClean: IDisposable = Disposable.None; private toDisposeOnSetContainer: IDisposable = Disposable.None; private shadowRoot: ShadowRoot | null = null; private shadowRootHostElement: HTMLElement | null = null; - constructor(container: HTMLElement | null, domPosition: ContextViewDOMPosition) { + constructor(container: HTMLElement, domPosition: ContextViewDOMPosition) { super(); this.view = DOM.$('.context-view'); - this.useFixedPosition = false; - this.useShadowDOM = false; - DOM.hide(this.view); this.setContainer(container, domPosition); - this._register(toDisposable(() => this.setContainer(null, ContextViewDOMPosition.ABSOLUTE))); } setContainer(container: HTMLElement | null, domPosition: ContextViewDOMPosition): void { + this.useFixedPosition = domPosition !== ContextViewDOMPosition.ABSOLUTE; + const usedShadowDOM = this.useShadowDOM; + this.useShadowDOM = domPosition === ContextViewDOMPosition.FIXED_SHADOW; + + if (container === this.container && usedShadowDOM === this.useShadowDOM) { + return; // container is the same and no shadow DOM usage has changed + } + if (this.container) { this.toDisposeOnSetContainer.dispose(); @@ -173,12 +177,10 @@ export class ContextView extends Disposable { this.container = null; } + if (container) { this.container = container; - this.useFixedPosition = domPosition !== ContextViewDOMPosition.ABSOLUTE; - this.useShadowDOM = domPosition === ContextViewDOMPosition.FIXED_SHADOW; - if (this.useShadowDOM) { this.shadowRootHostElement = DOM.$('.shadow-root-host'); this.container.appendChild(this.shadowRootHostElement); diff --git a/src/vs/base/browser/ui/iconLabel/iconHoverDelegate.ts b/src/vs/base/browser/ui/iconLabel/iconHoverDelegate.ts index e649c8f0c4a..74fcd97d4a9 100644 --- a/src/vs/base/browser/ui/iconLabel/iconHoverDelegate.ts +++ b/src/vs/base/browser/ui/iconLabel/iconHoverDelegate.ts @@ -26,21 +26,6 @@ export interface IHoverDelegateOptions extends IUpdatableHoverOptions { * dispose method is required. */ target: IHoverDelegateTarget | HTMLElement; - /** - * Position of the hover. The default is to show above the target. This option will be ignored - * if there is not enough room to layout the hover in the specified position, unless the - * forcePosition option is set. - */ - hoverPosition?: HoverPosition; - /** - * Whether to show the hover pointer - */ - showPointer?: boolean; - /** - * Whether to skip the fade in animation, this should be used when hovering from one hover to - * another in the same group so it looks like the hover is moving from one element to the other. - */ - skipFadeInAnimation?: boolean; /** * The container to pass to {@link IContextViewProvider.showContextView} which renders the hover * in. This is particularly useful for more natural tab focusing behavior, where the hover is @@ -48,6 +33,28 @@ export interface IHoverDelegateOptions extends IUpdatableHoverOptions { * element's container hiding on `focusout`. */ container?: HTMLElement; + /** + * Options that defines where the hover is positioned. + */ + position?: { + /** + * Position of the hover. The default is to show above the target. This option will be ignored + * if there is not enough room to layout the hover in the specified position, unless the + * forcePosition option is set. + */ + hoverPosition?: HoverPosition; + }; + appearance?: { + /** + * Whether to show the hover pointer + */ + showPointer?: boolean; + /** + * Whether to skip the fade in animation, this should be used when hovering from one hover to + * another in the same group so it looks like the hover is moving from one element to the other. + */ + skipFadeInAnimation?: boolean; + }; } export interface IHoverDelegate { diff --git a/src/vs/base/browser/ui/iconLabel/iconLabelHover.ts b/src/vs/base/browser/ui/iconLabel/iconLabelHover.ts index a36088fccc3..23878f78ea8 100644 --- a/src/vs/base/browser/ui/iconLabel/iconLabelHover.ts +++ b/src/vs/base/browser/ui/iconLabel/iconLabelHover.ts @@ -124,9 +124,13 @@ class UpdatableHoverWidget implements IDisposable { const hoverOptions: IHoverDelegateOptions = { content, 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 + appearance: { + showPointer: this.hoverDelegate.placement === 'element', + skipFadeInAnimation: !this.fadeInAnimation || !!oldHoverWidget, // do not fade in if the hover is already showing + }, + position: { + hoverPosition: HoverPosition.BELOW, + }, ...options }; @@ -187,6 +191,19 @@ export function setupCustomHover(hoverDelegate: IHoverDelegate, htmlElement: HTM }, delay); }; + let isMouseDown = false; + const mouseDownEmitter = dom.addDisposableListener(htmlElement, dom.EventType.MOUSE_DOWN, () => { + isMouseDown = true; + hideHover(true, true); + }, true); + const mouseUpEmitter = dom.addDisposableListener(htmlElement, dom.EventType.MOUSE_UP, () => { + isMouseDown = false; + }, true); + const mouseLeaveEmitter = dom.addDisposableListener(htmlElement, dom.EventType.MOUSE_LEAVE, (e: MouseEvent) => { + isMouseDown = false; + hideHover(false, (e).fromElement === htmlElement); + }, true); + const onMouseOver = () => { if (hoverPreparation) { return; @@ -194,12 +211,6 @@ export function setupCustomHover(hoverDelegate: IHoverDelegate, htmlElement: HTM const toDispose: DisposableStore = new DisposableStore(); - const onMouseLeave = (e: MouseEvent) => hideHover(false, (e).fromElement === htmlElement); - toDispose.add(dom.addDisposableListener(htmlElement, dom.EventType.MOUSE_LEAVE, onMouseLeave, true)); - - const onMouseDown = () => hideHover(true, true); - toDispose.add(dom.addDisposableListener(htmlElement, dom.EventType.MOUSE_DOWN, onMouseDown, true)); - const target: IHoverDelegateTarget = { targetElements: [htmlElement], dispose: () => { } @@ -219,6 +230,22 @@ export function setupCustomHover(hoverDelegate: IHoverDelegate, htmlElement: HTM hoverPreparation = toDispose; }; const mouseOverDomEmitter = dom.addDisposableListener(htmlElement, dom.EventType.MOUSE_OVER, onMouseOver, true); + + const onFocus = () => { + if (isMouseDown || hoverPreparation) { + return; + } + const target: IHoverDelegateTarget = { + targetElements: [htmlElement], + dispose: () => { } + }; + const toDispose: DisposableStore = new DisposableStore(); + const onBlur = () => hideHover(true, true); + toDispose.add(dom.addDisposableListener(htmlElement, dom.EventType.BLUR, onBlur, true)); + toDispose.add(triggerShowHover(hoverDelegate.delay, false, target)); + hoverPreparation = toDispose; + }; + const focusDomEmitter = dom.addDisposableListener(htmlElement, dom.EventType.FOCUS, onFocus, true); const hover: ICustomHover = { show: focus => { hideHover(false, true); // terminate a ongoing mouse over preparation @@ -233,6 +260,10 @@ export function setupCustomHover(hoverDelegate: IHoverDelegate, htmlElement: HTM }, dispose: () => { mouseOverDomEmitter.dispose(); + mouseLeaveEmitter.dispose(); + mouseDownEmitter.dispose(); + mouseUpEmitter.dispose(); + focusDomEmitter.dispose(); hideHover(true, true); } }; diff --git a/src/vs/base/browser/ui/iconLabel/iconlabel.css b/src/vs/base/browser/ui/iconLabel/iconlabel.css index c847aecee2f..47f8891703c 100644 --- a/src/vs/base/browser/ui/iconLabel/iconlabel.css +++ b/src/vs/base/browser/ui/iconLabel/iconlabel.css @@ -51,7 +51,7 @@ opacity: 0.5; } -.monaco-icon-label>.monaco-icon-label-container>.monaco-icon-suffix-container>.label-suffix { +.monaco-icon-label > .monaco-icon-label-container > .monaco-icon-suffix-container > .label-suffix { opacity: .7; white-space: pre; } diff --git a/src/vs/base/browser/ui/list/list.css b/src/vs/base/browser/ui/list/list.css index ccde136e12f..be273a61823 100644 --- a/src/vs/base/browser/ui/list/list.css +++ b/src/vs/base/browser/ui/list/list.css @@ -42,6 +42,12 @@ touch-action: none; } +/* Make sure the scrollbar renders above overlays (sticky scroll) */ +.monaco-list .monaco-scrollable-element > .scrollbar.vertical, +.monaco-pane-view > .monaco-split-view2.vertical > .monaco-scrollable-element > .scrollbar.vertical { + z-index: 14; +} + /* for OS X ballistic scrolling */ .monaco-list-row.scrolling { display: none !important; diff --git a/src/vs/base/browser/ui/list/list.ts b/src/vs/base/browser/ui/list/list.ts index a12d3fb4515..707d4b6199c 100644 --- a/src/vs/base/browser/ui/list/list.ts +++ b/src/vs/base/browser/ui/list/list.ts @@ -7,6 +7,7 @@ import { IDragAndDropData } from 'vs/base/browser/dnd'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { IMouseEvent } from 'vs/base/browser/mouseEvent'; import { GestureEvent } from 'vs/base/browser/touch'; +import { ListViewTargetSector } from 'vs/base/browser/ui/list/listView'; import { IDisposable } from 'vs/base/common/lifecycle'; export interface IListVirtualDelegate { @@ -57,6 +58,7 @@ export interface IListDragEvent { readonly browserEvent: DragEvent; readonly element: T | undefined; readonly index: number | undefined; + readonly sector: ListViewTargetSector | undefined; } export interface IListContextMenuEvent { @@ -84,11 +86,22 @@ export interface IKeyboardNavigationDelegate { mightProducePrintableCharacter(event: IKeyboardEvent): boolean; } -export const enum ListDragOverEffect { +export const enum ListDragOverEffectType { Copy, Move } +export const enum ListDragOverEffectPosition { + Over = 'drop-target', + Before = 'drop-target-before', + After = 'drop-target-after' +} + +export interface ListDragOverEffect { + type: ListDragOverEffectType; + position?: ListDragOverEffectPosition; +} + export interface IListDragOverReaction { accept: boolean; effect?: ListDragOverEffect; @@ -108,9 +121,9 @@ export interface IListDragAndDrop extends IDisposable { getDragURI(element: T): string | null; getDragLabel?(elements: T[], originalEvent: DragEvent): string | undefined; onDragStart?(data: IDragAndDropData, originalEvent: DragEvent): void; - onDragOver(data: IDragAndDropData, targetElement: T | undefined, targetIndex: number | undefined, originalEvent: DragEvent): boolean | IListDragOverReaction; + onDragOver(data: IDragAndDropData, targetElement: T | undefined, targetIndex: number | undefined, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent): boolean | IListDragOverReaction; onDragLeave?(data: IDragAndDropData, targetElement: T | undefined, targetIndex: number | undefined, originalEvent: DragEvent): void; - drop(data: IDragAndDropData, targetElement: T | undefined, targetIndex: number | undefined, originalEvent: DragEvent): void; + drop(data: IDragAndDropData, targetElement: T | undefined, targetIndex: number | undefined, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent): void; onDragEnd?(originalEvent: DragEvent): void; } diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts index af760c78a6d..4f8ab395ce6 100644 --- a/src/vs/base/browser/ui/list/listView.ts +++ b/src/vs/base/browser/ui/list/listView.ts @@ -17,7 +17,7 @@ import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/ 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'; -import { IListDragAndDrop, IListDragEvent, IListGestureEvent, IListMouseEvent, IListRenderer, IListTouchEvent, IListVirtualDelegate, ListDragOverEffect } from 'vs/base/browser/ui/list/list'; +import { IListDragAndDrop, IListDragEvent, IListGestureEvent, IListMouseEvent, IListRenderer, IListTouchEvent, IListVirtualDelegate, ListDragOverEffectPosition, ListDragOverEffectType } from 'vs/base/browser/ui/list/list'; 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'; @@ -48,6 +48,14 @@ export interface IListViewDragAndDrop extends IListDragAndDrop { getDragElements(element: T): T[]; } +export const enum ListViewTargetSector { + // drop position relative to the top of the item + TOP = 0, // [0%-25%) + CENTER_TOP = 1, // [25%-50%) + CENTER_BOTTOM = 2, // [50%-75%) + BOTTOM = 3 // [75%-100%) +} + export interface IListViewAccessibilityProvider { getSetSize?(element: T, index: number, listLength: number): number; getPosInSet?(element: T, index: number): number; @@ -227,6 +235,7 @@ export interface IListView extends ISpliceable, IDisposable { readonly renderHeight: number; readonly scrollHeight: number; readonly firstVisibleIndex: number; + readonly firstMostlyVisibleIndex: number; readonly lastVisibleIndex: number; onDidScroll: Event; onWillScroll: Event; @@ -308,6 +317,7 @@ export class ListView implements IListView { private canDrop: boolean = false; private currentDragData: IDragAndDropData | undefined; private currentDragFeedback: number[] | undefined; + private currentDragFeedbackPosition: ListDragOverEffectPosition | undefined; private currentDragFeedbackDisposable: IDisposable = Disposable.None; private onDragLeaveTimeout: IDisposable = Disposable.None; @@ -753,16 +763,21 @@ export class ListView implements IListView { get firstVisibleIndex(): number { const range = this.getRenderRange(this.lastRenderTop, this.lastRenderHeight); - const firstElTop = this.rangeMap.positionAt(range.start); - const nextElTop = this.rangeMap.positionAt(range.start + 1); + return range.start; + } + + get firstMostlyVisibleIndex(): number { + const firstVisibleIndex = this.firstVisibleIndex; + const firstElTop = this.rangeMap.positionAt(firstVisibleIndex); + const nextElTop = this.rangeMap.positionAt(firstVisibleIndex + 1); if (nextElTop !== -1) { const firstElMidpoint = (nextElTop - firstElTop) / 2 + firstElTop; if (firstElMidpoint < this.scrollTop) { - return range.start + 1; + return firstVisibleIndex + 1; } } - return range.start; + return firstVisibleIndex; } get lastVisibleIndex(): number { @@ -1077,7 +1092,8 @@ export class ListView implements IListView { const index = this.getItemIndexFromEventTarget(browserEvent.target || null); const item = typeof index === 'undefined' ? undefined : this.items[index]; const element = item && item.element; - return { browserEvent, index, element }; + const sector = this.getTargetSector(browserEvent, index); + return { browserEvent, index, element, sector }; } private onScroll(e: ScrollEvent): void { @@ -1178,7 +1194,7 @@ export class ListView implements IListView { } } - const result = this.dnd.onDragOver(this.currentDragData, event.element, event.index, event.browserEvent); + const result = this.dnd.onDragOver(this.currentDragData, event.element, event.index, event.sector, event.browserEvent); this.canDrop = typeof result === 'boolean' ? result : result.accept; if (!this.canDrop) { @@ -1187,7 +1203,7 @@ export class ListView implements IListView { return false; } - event.browserEvent.dataTransfer.dropEffect = (typeof result !== 'boolean' && result.effect === ListDragOverEffect.Copy) ? 'copy' : 'move'; + event.browserEvent.dataTransfer.dropEffect = (typeof result !== 'boolean' && result.effect?.type === ListDragOverEffectType.Copy) ? 'copy' : 'move'; let feedback: number[]; @@ -1205,26 +1221,34 @@ export class ListView implements IListView { feedback = distinct(feedback).filter(i => i >= -1 && i < this.length).sort((a, b) => a - b); feedback = feedback[0] === -1 ? [-1] : feedback; - if (equalsDragFeedback(this.currentDragFeedback, feedback)) { + const dragOverEffectPosition = typeof result !== 'boolean' && result.effect && result.effect.position ? result.effect.position : ListDragOverEffectPosition.Over; + + if (equalsDragFeedback(this.currentDragFeedback, feedback) && this.currentDragFeedbackPosition === dragOverEffectPosition) { return true; } this.currentDragFeedback = feedback; + this.currentDragFeedbackPosition = dragOverEffectPosition; this.currentDragFeedbackDisposable.dispose(); if (feedback[0] === -1) { // entire list feedback - this.domNode.classList.add('drop-target'); - this.rowsContainer.classList.add('drop-target'); + this.domNode.classList.add(dragOverEffectPosition); + this.rowsContainer.classList.add(dragOverEffectPosition); this.currentDragFeedbackDisposable = toDisposable(() => { - this.domNode.classList.remove('drop-target'); - this.rowsContainer.classList.remove('drop-target'); + this.domNode.classList.remove(dragOverEffectPosition); + this.rowsContainer.classList.remove(dragOverEffectPosition); }); } else { + + if (feedback.length > 1 && dragOverEffectPosition !== ListDragOverEffectPosition.Over) { + throw new Error('Can\'t use multiple feedbacks with position different than \'over\''); + } + for (const index of feedback) { const item = this.items[index]!; item.dropTarget = true; - item.row?.domNode.classList.add('drop-target'); + item.row?.domNode.classList.add(dragOverEffectPosition); } this.currentDragFeedbackDisposable = toDisposable(() => { @@ -1232,7 +1256,7 @@ export class ListView implements IListView { const item = this.items[index]!; item.dropTarget = false; - item.row?.domNode.classList.remove('drop-target'); + item.row?.domNode.classList.remove(dragOverEffectPosition); } }); } @@ -1266,7 +1290,7 @@ export class ListView implements IListView { event.browserEvent.preventDefault(); dragData.update(event.browserEvent.dataTransfer); - this.dnd.drop(dragData, event.element, event.index, event.browserEvent); + this.dnd.drop(dragData, event.element, event.index, event.sector, event.browserEvent); } private onDragEnd(event: DragEvent): void { @@ -1282,6 +1306,7 @@ export class ListView implements IListView { private clearDragOverFeedback(): void { this.currentDragFeedback = undefined; + this.currentDragFeedbackPosition = undefined; this.currentDragFeedbackDisposable.dispose(); this.currentDragFeedbackDisposable = Disposable.None; } @@ -1331,6 +1356,15 @@ export class ListView implements IListView { // Util + private getTargetSector(browserEvent: DragEvent, targetIndex: number | undefined): ListViewTargetSector | undefined { + if (targetIndex === undefined) { + return undefined; + } + + const relativePosition = browserEvent.offsetY / this.items[targetIndex].size; + return Math.floor(relativePosition / 0.25); + } + private getItemIndexFromEventTarget(target: EventTarget | null): number | undefined { const scrollableElement = this.scrollableElement.getDomNode(); let element: HTMLElement | null = target as (HTMLElement | null); diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts index 3e9303d586d..46321069256 100644 --- a/src/vs/base/browser/ui/list/listWidget.ts +++ b/src/vs/base/browser/ui/list/listWidget.ts @@ -26,7 +26,7 @@ import { ISpliceable } from 'vs/base/common/sequence'; import { isNumber } from 'vs/base/common/types'; import 'vs/css!./list'; import { IIdentityProvider, IKeyboardNavigationDelegate, IKeyboardNavigationLabelProvider, IListContextMenuEvent, IListDragAndDrop, IListDragOverReaction, IListEvent, IListGestureEvent, IListMouseEvent, IListRenderer, IListTouchEvent, IListVirtualDelegate, ListError } from './list'; -import { IListView, IListViewAccessibilityProvider, IListViewDragAndDrop, IListViewOptions, IListViewOptionsUpdate, ListView } from './listView'; +import { IListView, IListViewAccessibilityProvider, IListViewDragAndDrop, IListViewOptions, IListViewOptionsUpdate, ListViewTargetSector, ListView } from './listView'; import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; interface ITraitChangeEvent { @@ -109,9 +109,8 @@ class TraitRenderer implements IListRenderer class Trait implements ISpliceable, IDisposable { - private length = 0; - private indexes: number[] = []; - private sortedIndexes: number[] = []; + protected indexes: number[] = []; + protected sortedIndexes: number[] = []; private readonly _onChange = new Emitter(); readonly onChange: Event = this._onChange.event; @@ -126,8 +125,6 @@ class Trait implements ISpliceable, IDisposable { constructor(private _trait: string) { } splice(start: number, deleteCount: number, elements: boolean[]): void { - deleteCount = Math.max(0, Math.min(deleteCount, this.length - start)); - const diff = elements.length - deleteCount; const end = start + deleteCount; const sortedIndexes: number[] = []; @@ -147,16 +144,8 @@ class Trait implements ISpliceable, IDisposable { sortedIndexes.push(this.sortedIndexes[i++] + diff); } - const length = this.length + diff; - - if (this.sortedIndexes.length > 0 && sortedIndexes.length === 0 && length > 0) { - const first = this.sortedIndexes.find(index => index >= start) ?? length - 1; - sortedIndexes.push(Math.min(first, length - 1)); - } - this.renderer.splice(start, deleteCount, elements.length); this._set(sortedIndexes, sortedIndexes); - this.length = length; } renderIndex(index: number, container: HTMLElement): void { @@ -256,8 +245,8 @@ export function isInputElement(e: HTMLElement): boolean { return e.tagName === 'INPUT' || e.tagName === 'TEXTAREA'; } -export function isMonacoEditor(e: HTMLElement): boolean { - if (e.classList.contains('monaco-editor')) { +function isListElementDescendantOfClass(e: HTMLElement, className: string): boolean { + if (e.classList.contains(className)) { return true; } @@ -269,7 +258,27 @@ export function isMonacoEditor(e: HTMLElement): boolean { return false; } - return isMonacoEditor(e.parentElement); + return isListElementDescendantOfClass(e.parentElement, className); +} + +export function isMonacoEditor(e: HTMLElement): boolean { + return isListElementDescendantOfClass(e, 'monaco-editor'); +} + +export function isMonacoCustomToggle(e: HTMLElement): boolean { + return isListElementDescendantOfClass(e, 'monaco-custom-toggle'); +} + +export function isActionItem(e: HTMLElement): boolean { + return isListElementDescendantOfClass(e, 'action-item'); +} + +export function isMonacoTwistie(e: HTMLElement): boolean { + return isListElementDescendantOfClass(e, 'monaco-tl-twistie'); +} + +export function isStickyScrollElement(e: HTMLElement): boolean { + return isListElementDescendantOfClass(e, 'monaco-tree-sticky-row'); } export function isButton(e: HTMLElement): boolean { @@ -956,14 +965,30 @@ export class DefaultStyleController implements IStyleController { content.push(`.monaco-list${suffix} .monaco-list-row:hover { outline: 1px dashed ${styles.listHoverOutline}; outline-offset: -1px; }`); } - if (styles.listDropBackground) { + if (styles.listDropOverBackground) { content.push(` .monaco-list${suffix}.drop-target, .monaco-list${suffix} .monaco-list-rows.drop-target, - .monaco-list${suffix} .monaco-list-row.drop-target { background-color: ${styles.listDropBackground} !important; color: inherit !important; } + .monaco-list${suffix} .monaco-list-row.drop-target { background-color: ${styles.listDropOverBackground} !important; color: inherit !important; } `); } + if (styles.listDropBetweenBackground) { + content.push(` + .monaco-list${suffix} .monaco-list-rows.drop-target-before .monaco-list-row:first-child::before, + .monaco-list${suffix} .monaco-list-row.drop-target-after + .monaco-list-row::before, + .monaco-list${suffix} .monaco-list-row.drop-target-before::before { + content: ""; position: absolute; top: 0px; left: 0px; width: 100%; height: 1px; + background-color: ${styles.listDropBetweenBackground}; + }`); + content.push(` + .monaco-list${suffix} .monaco-list-rows.drop-target-after .monaco-list-row:last-child::after, + .monaco-list${suffix} .monaco-list-row:last-child.drop-target-after::after { + content: ""; position: absolute; bottom: 0px; left: 0px; width: 100%; height: 1px; + background-color: ${styles.listDropBetweenBackground}; + }`); + } + if (styles.tableColumnsBorder) { content.push(` .monaco-table > .monaco-split-view2, @@ -1050,7 +1075,8 @@ export interface IListStyles { listInactiveFocusBackground: string | undefined; listHoverBackground: string | undefined; listHoverForeground: string | undefined; - listDropBackground: string | undefined; + listDropOverBackground: string | undefined; + listDropBetweenBackground: string | undefined; listFocusOutline: string | undefined; listInactiveFocusOutline: string | undefined; listSelectionOutline: string | undefined; @@ -1072,7 +1098,8 @@ export const unthemedListStyles: IListStyles = { listInactiveSelectionBackground: '#3F3F46', listInactiveSelectionIconForeground: '#FFFFFF', listHoverBackground: '#2A2D2E', - listDropBackground: '#383B3D', + listDropOverBackground: '#383B3D', + listDropBetweenBackground: '#EEEEEE', treeIndentGuidesStroke: '#a9a9a9', treeInactiveIndentGuidesStroke: Color.fromHex('#a9a9a9').transparent(0.4).toString(), tableColumnsBorder: Color.fromHex('#cccccc').transparent(0.2).toString(), @@ -1284,8 +1311,8 @@ class ListViewDragAndDrop implements IListViewDragAndDrop { this.dnd.onDragStart?.(data, originalEvent); } - onDragOver(data: IDragAndDropData, targetElement: T, targetIndex: number, originalEvent: DragEvent): boolean | IListDragOverReaction { - return this.dnd.onDragOver(data, targetElement, targetIndex, originalEvent); + onDragOver(data: IDragAndDropData, targetElement: T, targetIndex: number, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent): boolean | IListDragOverReaction { + return this.dnd.onDragOver(data, targetElement, targetIndex, targetSector, originalEvent); } onDragLeave(data: IDragAndDropData, targetElement: T, targetIndex: number, originalEvent: DragEvent): void { @@ -1296,8 +1323,8 @@ class ListViewDragAndDrop implements IListViewDragAndDrop { this.dnd.onDragEnd?.(originalEvent); } - drop(data: IDragAndDropData, targetElement: T, targetIndex: number, originalEvent: DragEvent): void { - this.dnd.drop(data, targetElement, targetIndex, originalEvent); + drop(data: IDragAndDropData, targetElement: T, targetIndex: number, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent): void { + this.dnd.drop(data, targetElement, targetIndex, targetSector, originalEvent); } dispose(): void { @@ -1390,7 +1417,7 @@ export class List implements ISpliceable, IDisposable { const fromMouse = Event.chain(this.view.onContextMenu, $ => $.filter(_ => !didJustPressContextMenuKey) - .map(({ element, index, browserEvent }) => ({ element, index, anchor: new StandardMouseEvent(browserEvent), browserEvent })) + .map(({ element, index, browserEvent }) => ({ element, index, anchor: new StandardMouseEvent(getWindow(this.view.domNode), browserEvent), browserEvent })) ); return Event.any>(fromKeyDown, fromKeyUp, fromMouse); @@ -1598,6 +1625,10 @@ export class List implements ISpliceable, IDisposable { return this.view.firstVisibleIndex; } + get firstMostlyVisibleIndex(): number { + return this.view.firstMostlyVisibleIndex; + } + get lastVisibleIndex(): number { return this.view.lastVisibleIndex; } @@ -1830,7 +1861,7 @@ export class List implements ISpliceable, IDisposable { return this.getFocus().map(i => this.view.element(i)); } - reveal(index: number, relativeTop?: number): void { + reveal(index: number, relativeTop?: number, paddingTop: number = 0): void { if (index < 0 || index >= this.length) { throw new ListError(this.user, `Invalid index ${index}`); } @@ -1841,16 +1872,16 @@ export class List implements ISpliceable, IDisposable { if (isNumber(relativeTop)) { // y = mx + b - const m = elementHeight - this.view.renderHeight; - this.view.setScrollTop(m * clamp(relativeTop, 0, 1) + elementTop); + const m = elementHeight - this.view.renderHeight + paddingTop; + this.view.setScrollTop(m * clamp(relativeTop, 0, 1) + elementTop - paddingTop); } else { const viewItemBottom = elementTop + elementHeight; const scrollBottom = scrollTop + this.view.renderHeight; - if (elementTop < scrollTop && viewItemBottom >= scrollBottom) { + if (elementTop < scrollTop + paddingTop && viewItemBottom >= scrollBottom) { // The element is already overflowing the viewport, no-op - } else if (elementTop < scrollTop || (viewItemBottom >= scrollBottom && elementHeight >= this.view.renderHeight)) { - this.view.setScrollTop(elementTop); + } else if (elementTop < scrollTop + paddingTop || (viewItemBottom >= scrollBottom && elementHeight >= this.view.renderHeight)) { + this.view.setScrollTop(elementTop - paddingTop); } else if (viewItemBottom >= scrollBottom) { this.view.setScrollTop(viewItemBottom - this.view.renderHeight); } @@ -1861,7 +1892,7 @@ export class List implements ISpliceable, IDisposable { * Returns the relative position of an element rendered in the list. * Returns `null` if the element isn't *entirely* in the visible viewport. */ - getRelativeTop(index: number): number | null { + getRelativeTop(index: number, paddingTop: number = 0): number | null { if (index < 0 || index >= this.length) { throw new ListError(this.user, `Invalid index ${index}`); } @@ -1870,13 +1901,13 @@ export class List implements ISpliceable, IDisposable { const elementTop = this.view.elementTop(index); const elementHeight = this.view.elementHeight(index); - if (elementTop < scrollTop || elementTop + elementHeight > scrollTop + this.view.renderHeight) { + if (elementTop < scrollTop + paddingTop || elementTop + elementHeight > scrollTop + this.view.renderHeight) { return null; } // y = mx + b - const m = elementHeight - this.view.renderHeight; - return Math.abs((scrollTop - elementTop) / m); + const m = elementHeight - this.view.renderHeight + paddingTop; + return Math.abs((scrollTop + paddingTop - elementTop) / m); } isDOMFocused(): boolean { @@ -1887,10 +1918,18 @@ export class List implements ISpliceable, IDisposable { return this.view.domNode; } + getScrollableElement(): HTMLElement { + return this.view.scrollableElementDomNode; + } + getElementID(index: number): string { return this.view.getElementDomId(index); } + getElementTop(index: number): number { + return this.view.elementTop(index); + } + style(styles: IListStyles): void { this.styleController.style(styles); } diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts index 5d47bfdb09d..0a4415803db 100644 --- a/src/vs/base/browser/ui/menu/menu.ts +++ b/src/vs/base/browser/ui/menu/menu.ts @@ -478,7 +478,7 @@ class BaseMenuActionViewItem extends BaseActionViewItem { // => to get the Copy and Paste context menu actions working on Firefox, // there should be no timeout here if (isFirefox) { - const mouseEvent = new StandardMouseEvent(e); + const mouseEvent = new StandardMouseEvent(getWindow(this.element), e); // Allowing right click to trigger the event causes the issue described below, // but since the solution below does not work in FF, we must disable right click diff --git a/src/vs/base/browser/ui/menu/menubar.ts b/src/vs/base/browser/ui/menu/menubar.ts index 199189dadf4..feadeb47651 100644 --- a/src/vs/base/browser/ui/menu/menubar.ts +++ b/src/vs/base/browser/ui/menu/menubar.ts @@ -17,11 +17,12 @@ import { ThemeIcon } from 'vs/base/common/themables'; import { Emitter, Event } from 'vs/base/common/event'; import { KeyCode, KeyMod, ScanCode, ScanCodeUtils } from 'vs/base/common/keyCodes'; import { ResolvedKeybinding } from 'vs/base/common/keybindings'; -import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle'; +import { Disposable, DisposableStore, dispose, IDisposable } from 'vs/base/common/lifecycle'; import { isMacintosh } from 'vs/base/common/platform'; import * as strings from 'vs/base/common/strings'; import 'vs/css!./menubar'; import * as nls from 'vs/nls'; +import { mainWindow } from 'vs/base/browser/window'; const $ = DOM.$; @@ -87,6 +88,8 @@ export class MenuBar extends Disposable { private numMenusShown: number = 0; private overflowLayoutScheduled: IDisposable | undefined = undefined; + private readonly menuDisposables = this._register(new DisposableStore()); + constructor(private container: HTMLElement, private options: IMenuBarOptions, private menuStyle: IMenuStyles) { super(); @@ -258,7 +261,7 @@ export class MenuBar extends Disposable { this._register(DOM.addDisposableListener(buttonElement, DOM.EventType.MOUSE_DOWN, (e: MouseEvent) => { // Ignore non-left-click - const mouseEvent = new StandardMouseEvent(e); + const mouseEvent = new StandardMouseEvent(DOM.getWindow(buttonElement), e); if (!mouseEvent.leftButton) { e.preventDefault(); return; @@ -367,7 +370,7 @@ export class MenuBar extends Disposable { this._register(DOM.addDisposableListener(buttonElement, DOM.EventType.MOUSE_DOWN, (e) => { // Ignore non-left-click - const mouseEvent = new StandardMouseEvent(e); + const mouseEvent = new StandardMouseEvent(DOM.getWindow(buttonElement), e); if (!mouseEvent.leftButton) { e.preventDefault(); return; @@ -751,6 +754,7 @@ export class MenuBar extends Disposable { } if (this.focusedMenu) { + this.cleanupCustomMenu(); this.showCustomMenu(this.focusedMenu.index, this.openedViaKeyboard); } break; @@ -783,7 +787,7 @@ export class MenuBar extends Disposable { private setUnfocusedState(): void { if (this.options.visibility === 'toggle' || this.options.visibility === 'hidden') { this.focusState = MenubarState.HIDDEN; - } else if (this.options.visibility === 'classic' && browser.isFullscreen()) { + } else if (this.options.visibility === 'classic' && browser.isFullscreen(mainWindow)) { this.focusState = MenubarState.HIDDEN; } else { this.focusState = MenubarState.VISIBLE; @@ -985,6 +989,7 @@ export class MenuBar extends Disposable { this.focusedMenu = { index: this.focusedMenu.index }; } + this.menuDisposables.clear(); } private showCustomMenu(menuIndex: number, selectFirst = true): void { @@ -1025,9 +1030,8 @@ export class MenuBar extends Disposable { useEventAsContext: true }; - const menuWidget = this._register(new Menu(menuHolder, customMenu.actions, menuOptions, this.menuStyle)); - - this._register(menuWidget.onDidCancel(() => { + const menuWidget = this.menuDisposables.add(new Menu(menuHolder, customMenu.actions, menuOptions, this.menuStyle)); + this.menuDisposables.add(menuWidget.onDidCancel(() => { this.focusState = MenubarState.FOCUSED; })); diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts index ea8a90ea6c0..85253acf938 100644 --- a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts +++ b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts @@ -87,7 +87,8 @@ export class MouseWheelClassifier { } public acceptStandardWheelEvent(e: StandardWheelEvent): void { - const osZoomFactor = dom.getWindow(e.browserEvent).devicePixelRatio / getZoomFactor(); + const targetWindow = dom.getWindow(e.browserEvent); + const osZoomFactor = targetWindow.devicePixelRatio / getZoomFactor(targetWindow); if (platform.isWindows || platform.isLinux) { // On Windows and Linux, the incoming delta events are multiplied with the OS zoom factor. // The OS zoom factor can be reverse engineered by using the device pixel ratio and the configured zoom factor into account. diff --git a/src/vs/base/browser/ui/toggle/toggle.css b/src/vs/base/browser/ui/toggle/toggle.css index 9b1968b4b5d..1b13a3b19e8 100644 --- a/src/vs/base/browser/ui/toggle/toggle.css +++ b/src/vs/base/browser/ui/toggle/toggle.css @@ -49,6 +49,19 @@ background-size: 16px !important; } +.monaco-action-bar .checkbox-action-item { + display: flex; + align-items: center; +} + +.monaco-action-bar .checkbox-action-item > .monaco-custom-toggle.monaco-checkbox { + margin-right: 4px; +} + +.monaco-action-bar .checkbox-action-item > .checkbox-label { + font-size: 12px; +} + /* hide check when unchecked */ .monaco-custom-toggle.monaco-checkbox:not(.checked)::before { visibility: hidden; diff --git a/src/vs/base/browser/ui/toggle/toggle.ts b/src/vs/base/browser/ui/toggle/toggle.ts index db5523e63b7..4146f24d141 100644 --- a/src/vs/base/browser/ui/toggle/toggle.ts +++ b/src/vs/base/browser/ui/toggle/toggle.ts @@ -12,7 +12,7 @@ import { ThemeIcon } from 'vs/base/common/themables'; import { Emitter, Event } from 'vs/base/common/event'; import { KeyCode } from 'vs/base/common/keyCodes'; import 'vs/css!./toggle'; -import { isActiveElement } from 'vs/base/browser/dom'; +import { isActiveElement, $, addDisposableListener, EventType } from 'vs/base/browser/dom'; export interface IToggleOpts extends IToggleStyles { readonly actionClassName?: string; @@ -219,6 +219,10 @@ export class Toggle extends Widget { } export class Checkbox extends Widget { + + private readonly _onChange = this._register(new Emitter()); + readonly onChange: Event = this._onChange.event; + private checkbox: Toggle; private styles: ICheckboxStyles; @@ -235,7 +239,10 @@ export class Checkbox extends Widget { this.applyStyles(); - this._register(this.checkbox.onChange(() => this.applyStyles())); + this._register(this.checkbox.onChange(keyboard => { + this.applyStyles(); + this._onChange.fire(keyboard); + })); } get checked(): boolean { @@ -256,9 +263,100 @@ export class Checkbox extends Widget { return isActiveElement(this.domNode); } + enable(): void { + this.checkbox.enable(); + } + + disable(): void { + this.checkbox.disable(); + } + protected applyStyles(): void { this.domNode.style.color = this.styles.checkboxForeground || ''; this.domNode.style.backgroundColor = this.styles.checkboxBackground || ''; this.domNode.style.borderColor = this.styles.checkboxBorder || ''; } } + +export interface ICheckboxActionViewItemOptions extends IActionViewItemOptions { + checkboxStyles: ICheckboxStyles; +} + +export class CheckboxActionViewItem extends BaseActionViewItem { + + protected readonly toggle: Checkbox; + private cssClass?: string; + + constructor(context: any, action: IAction, options: ICheckboxActionViewItemOptions) { + super(context, action, options); + + this.toggle = this._register(new Checkbox(this._action.label, !!this._action.checked, options.checkboxStyles)); + this._register(this.toggle.onChange(() => this.onChange())); + } + + override render(container: HTMLElement): void { + this.element = container; + this.element.classList.add('checkbox-action-item'); + this.element.appendChild(this.toggle.domNode); + if ((this.options).label && this._action.label) { + const label = this.element.appendChild($('span.checkbox-label', undefined, this._action.label)); + this._register(addDisposableListener(label, EventType.CLICK, (e: MouseEvent) => { + this.toggle.checked = !this.toggle.checked; + e.stopPropagation(); + e.preventDefault(); + this.onChange(); + })); + } + + this.updateEnabled(); + this.updateClass(); + this.updateChecked(); + } + + private onChange(): void { + this._action.checked = !!this.toggle && this.toggle.checked; + this.actionRunner.run(this._action, this._context); + } + + protected override updateEnabled(): void { + if (this.isEnabled()) { + this.toggle.enable(); + } else { + this.toggle.disable(); + } + if (this.action.enabled) { + this.element?.classList.remove('disabled'); + } else { + this.element?.classList.add('disabled'); + } + } + + protected override updateChecked(): void { + this.toggle.checked = !!this._action.checked; + } + + protected override updateClass(): void { + if (this.cssClass) { + this.toggle.domNode.classList.remove(...this.cssClass.split(' ')); + } + this.cssClass = this.getClass(); + if (this.cssClass) { + this.toggle.domNode.classList.add(...this.cssClass.split(' ')); + } + } + + override focus(): void { + this.toggle.domNode.tabIndex = 0; + this.toggle.focus(); + } + + override blur(): void { + this.toggle.domNode.tabIndex = -1; + this.toggle.domNode.blur(); + } + + override setFocusable(focusable: boolean): void { + this.toggle.domNode.tabIndex = focusable ? 0 : -1; + } + +} diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts index 8d0e2f48d03..2f46a692357 100644 --- a/src/vs/base/browser/ui/toolbar/toolbar.ts +++ b/src/vs/base/browser/ui/toolbar/toolbar.ts @@ -85,7 +85,8 @@ export class ToolBar extends Disposable { classNames: ThemeIcon.asClassNameArray(options.moreIcon ?? Codicon.toolBarMore), anchorAlignmentProvider: this.options.anchorAlignmentProvider, menuAsChild: !!this.options.renderDropdownAsChildElement, - skipTelemetry: this.options.skipTelemetry + skipTelemetry: this.options.skipTelemetry, + isMenu: true } ); this.toggleMenuActionViewItem.setActionContext(this.actionBar.context); diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts index 4377e0dcde9..8bfae8ea917 100644 --- a/src/vs/base/browser/ui/tree/abstractTree.ts +++ b/src/vs/base/browser/ui/tree/abstractTree.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IDragAndDropData } from 'vs/base/browser/dnd'; -import { $, append, clearNode, createStyleSheet, getWindow, h, hasParentWithClass, isActiveElement } from 'vs/base/browser/dom'; +import { $, append, clearNode, createStyleSheet, getWindow, h, hasParentWithClass, isActiveElement, isKeyboardEvent } from 'vs/base/browser/dom'; import { DomEmitter } from 'vs/base/browser/event'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; @@ -12,8 +12,8 @@ import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview import { FindInput } from 'vs/base/browser/ui/findinput/findInput'; import { IInputBoxStyles, IMessage, MessageType, unthemedInboxStyles } 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 { IListOptions, IListStyles, isButton, isInputElement, isMonacoEditor, List, MouseController, TypeNavigationMode } from 'vs/base/browser/ui/list/listWidget'; +import { ElementsDragAndDropData, ListViewTargetSector } from 'vs/base/browser/ui/list/listView'; +import { IListOptions, IListStyles, isActionItem, isButton, isInputElement, isMonacoCustomToggle, isMonacoEditor, isStickyScrollElement, List, MouseController, TypeNavigationMode } from 'vs/base/browser/ui/list/listWidget'; import { IToggleStyles, Toggle, unthemedToggleStyles } 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'; @@ -81,8 +81,8 @@ class TreeNodeListDragAndDrop implements IListDragAndDrop< this.dnd.onDragStart?.(asTreeDragAndDropData(data), originalEvent); } - onDragOver(data: IDragAndDropData, targetNode: ITreeNode | undefined, targetIndex: number | undefined, originalEvent: DragEvent, raw = true): boolean | IListDragOverReaction { - const result = this.dnd.onDragOver(asTreeDragAndDropData(data), targetNode && targetNode.element, targetIndex, originalEvent); + onDragOver(data: IDragAndDropData, targetNode: ITreeNode | undefined, targetIndex: number | undefined, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent, raw = true): boolean | IListDragOverReaction { + const result = this.dnd.onDragOver(asTreeDragAndDropData(data), targetNode && targetNode.element, targetIndex, targetSector, originalEvent); const didChangeAutoExpandNode = this.autoExpandNode !== targetNode; if (didChangeAutoExpandNode) { @@ -124,7 +124,7 @@ class TreeNodeListDragAndDrop implements IListDragAndDrop< const parentNode = model.getNode(parentRef); const parentIndex = parentRef && model.getListIndex(parentRef); - return this.onDragOver(data, parentNode, parentIndex, originalEvent, false); + return this.onDragOver(data, parentNode, parentIndex, targetSector, originalEvent, false); } const model = this.modelProvider(); @@ -135,11 +135,11 @@ class TreeNodeListDragAndDrop implements IListDragAndDrop< return { ...result, feedback: range(start, start + length) }; } - drop(data: IDragAndDropData, targetNode: ITreeNode | undefined, targetIndex: number | undefined, originalEvent: DragEvent): void { + drop(data: IDragAndDropData, targetNode: ITreeNode | undefined, targetIndex: number | undefined, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent): void { this.autoExpandDisposable.dispose(); this.autoExpandNode = undefined; - this.dnd.drop(asTreeDragAndDropData(data), targetNode && targetNode.element, targetIndex, originalEvent); + this.dnd.drop(asTreeDragAndDropData(data), targetNode && targetNode.element, targetIndex, targetSector, originalEvent); } onDragEnd(originalEvent: DragEvent): void { @@ -327,7 +327,7 @@ class EventCollection implements Collection, IDisposable { } } -class TreeRenderer implements IListRenderer, ITreeListTemplateData> { +export class TreeRenderer implements IListRenderer, ITreeListTemplateData> { private static readonly DefaultIndent = 8; @@ -1148,7 +1148,7 @@ class FindController implements IDisposable { } shouldAllowFocus(node: ITreeNode): boolean { - if (!this.widget || !this.pattern || this._mode === TreeFindMode.Filter) { + if (!this.widget || !this.pattern) { return true; } @@ -1172,6 +1172,416 @@ class FindController implements IDisposable { } } +interface StickyScrollNode { + readonly node: ITreeNode; + readonly startIndex: number; + readonly endIndex: number; + readonly height: number; + readonly position: number; +} + +function stickyScrollNodeEquals(node1: StickyScrollNode, node2: StickyScrollNode) { + return node1.position === node2.position && + node1.node.element === node2.node.element && + node1.startIndex === node2.startIndex && + node1.height === node2.height && + node1.endIndex === node2.endIndex; +} + +class StickyScrollState extends Disposable { + + constructor( + readonly stickyNodes: StickyScrollNode[] = [] + ) { + super(); + } + + get count(): number { return this.stickyNodes.length; } + + equal(state: StickyScrollState): boolean { + return equals(this.stickyNodes, state.stickyNodes, stickyScrollNodeEquals); + } + + addDisposable(disposable: IDisposable): void { + this._register(disposable); + } +} + +class StickyScrollController extends Disposable { + + private stickyScrollMaxItemCount: number; + private readonly maxWidgetViewRatio = 0.4; + + private readonly _widget: StickyScrollWidget; + + private get firstVisibleNode() { + const index = this.view.firstVisibleIndex; + + if (index < 0 || index >= this.view.length) { + return undefined; + } + + return this.view.element(index); + } + + constructor( + private readonly tree: AbstractTree, + private readonly model: ITreeModel, + private readonly view: List>, + renderers: TreeRenderer[], + private readonly treeDelegate: IListVirtualDelegate>, + options: IAbstractTreeOptions = {}, + ) { + super(); + + const stickyScrollOptions = this.validateStickySettings(options); + this.stickyScrollMaxItemCount = stickyScrollOptions.stickyScrollMaxItemCount; + + this._widget = this._register(new StickyScrollWidget(view.getScrollableElement(), view, model, renderers, treeDelegate)); + + this._register(view.onDidScroll(() => this.update())); + this._register(view.onDidChangeContentHeight(() => this.update())); + this._register(tree.onDidChangeCollapseState(() => this.update())); + + this.update(); + } + + get height(): number { + return this._widget.height; + } + + get count(): number { + return this._widget.count; + } + + getNode(node: ITreeNode): StickyScrollNode | undefined { + return this._widget.getNode(node); + } + + private update() { + const firstVisibleNode = this.firstVisibleNode; + + // Don't render anything if there are no elements + if (!firstVisibleNode || this.tree.scrollTop === 0) { + this._widget.setState(undefined); + return; + } + + const stickyState = this.findStickyState(firstVisibleNode); + this._widget.setState(stickyState); + } + + private findStickyState(firstVisibleNode: ITreeNode): StickyScrollState | undefined { + const stickyNodes: StickyScrollNode[] = []; + const maximumStickyWidgetHeight = this.view.renderHeight * this.maxWidgetViewRatio; + let firstVisibleNodeUnderWidget: ITreeNode | undefined = firstVisibleNode; + let stickyNodesHeight = 0; + + let nextStickyNode = this.getNextStickyNode(firstVisibleNodeUnderWidget, undefined, stickyNodesHeight); + while (nextStickyNode && stickyNodesHeight + nextStickyNode.height < maximumStickyWidgetHeight) { + + stickyNodes.push(nextStickyNode); + stickyNodesHeight += nextStickyNode.height; + + if (stickyNodes.length >= this.stickyScrollMaxItemCount) { + break; + } + + firstVisibleNodeUnderWidget = this.getNextVisibleNode(firstVisibleNodeUnderWidget); + if (!firstVisibleNodeUnderWidget) { + break; + } + + nextStickyNode = this.getNextStickyNode(firstVisibleNodeUnderWidget, nextStickyNode.node, stickyNodesHeight); + } + + return stickyNodes.length ? new StickyScrollState(stickyNodes) : undefined; + } + + private getNextVisibleNode(node: ITreeNode): ITreeNode | undefined { + const nodeIndex = this.getNodeIndex(node); + if (nodeIndex === -1 || nodeIndex === this.view.length - 1) { + return undefined; + } + const nextNode = this.view.element(nodeIndex + 1); + return nextNode; + } + + private getNextStickyNode(firstVisibleNodeUnderWidget: ITreeNode, previousStickyNode: ITreeNode | undefined, stickyNodesHeight: number): StickyScrollNode | undefined { + const nextStickyNode = this.getAncestorUnderPrevious(firstVisibleNodeUnderWidget, previousStickyNode); + if (!nextStickyNode) { + return undefined; + } + + if (nextStickyNode === firstVisibleNodeUnderWidget) { + if (!this.nodeIsUncollapsedParent(firstVisibleNodeUnderWidget)) { + return undefined; + } + + if (this.nodeTopAlignsWithStickyNodesBottom(firstVisibleNodeUnderWidget, stickyNodesHeight)) { + return undefined; + } + } + + return this.createStickyScrollNode(nextStickyNode, stickyNodesHeight); + } + + private nodeTopAlignsWithStickyNodesBottom(node: ITreeNode, stickyNodesHeight: number): boolean { + const nodeIndex = this.getNodeIndex(node); + const elementTop = this.view.getElementTop(nodeIndex); + const stickyPosition = stickyNodesHeight; + return this.view.scrollTop === elementTop - stickyPosition; + } + + private createStickyScrollNode(node: ITreeNode, currentStickyNodesHeight: number): StickyScrollNode { + const height = this.treeDelegate.getHeight(node); + const { startIndex, endIndex } = this.getNodeRange(node); + + const position = this.calculateStickyNodePosition(endIndex, currentStickyNodesHeight); + + return { node, position, height, startIndex, endIndex }; + } + + private getAncestorUnderPrevious(node: ITreeNode, previousAncestor: ITreeNode | undefined = undefined): ITreeNode | undefined { + let currentAncestor: ITreeNode = node; + let parentOfcurrentAncestor: ITreeNode | undefined = this.getParentNode(currentAncestor); + + while (parentOfcurrentAncestor) { + if (parentOfcurrentAncestor === previousAncestor) { + return currentAncestor; + } + currentAncestor = parentOfcurrentAncestor; + parentOfcurrentAncestor = this.getParentNode(currentAncestor); + } + + if (previousAncestor === undefined) { + return currentAncestor; + } + + return undefined; + } + + private calculateStickyNodePosition(lastDescendantIndex: number, stickyRowPositionTop: number): number { + let lastChildRelativeTop = this.view.getRelativeTop(lastDescendantIndex); + + // If the last descendant is only partially visible at the top of the view, getRelativeTop() returns null + // In that case, utilize the next node's relative top to calculate the sticky node's position + if (lastChildRelativeTop === null && this.view.firstVisibleIndex === lastDescendantIndex && lastDescendantIndex + 1 < this.view.length) { + const nodeHeight = this.treeDelegate.getHeight(this.view.element(lastDescendantIndex)); + const nextNodeRelativeTop = this.view.getRelativeTop(lastDescendantIndex + 1); + lastChildRelativeTop = nextNodeRelativeTop ? nextNodeRelativeTop - nodeHeight / this.view.renderHeight : null; + } + + if (lastChildRelativeTop === null) { + return stickyRowPositionTop; + } + + const lastChildNode = this.view.element(lastDescendantIndex); + const lastChildHeight = this.treeDelegate.getHeight(lastChildNode); + const topOfLastChild = lastChildRelativeTop * this.view.renderHeight; + const bottomOfLastChild = topOfLastChild + lastChildHeight; + + if (stickyRowPositionTop > topOfLastChild && stickyRowPositionTop <= bottomOfLastChild) { + return topOfLastChild; + } + + return stickyRowPositionTop; + } + + private getParentNode(node: ITreeNode): ITreeNode | undefined { + const nodeLocation = this.model.getNodeLocation(node); + const parentLocation = this.model.getParentNodeLocation(nodeLocation); + return parentLocation ? this.model.getNode(parentLocation) : undefined; + } + + private nodeIsUncollapsedParent(node: ITreeNode): boolean { + const nodeLocation = this.model.getNodeLocation(node); + return this.model.getListRenderCount(nodeLocation) > 1; + } + + private getNodeIndex(node: ITreeNode, nodeLocation?: TRef): number { + if (nodeLocation === undefined) { + nodeLocation = this.model.getNodeLocation(node); + } + const nodeIndex = this.model.getListIndex(nodeLocation); + return nodeIndex; + } + + private getNodeRange(node: ITreeNode): { startIndex: number; endIndex: number } { + const nodeLocation = this.model.getNodeLocation(node); + const startIndex = this.model.getListIndex(nodeLocation); + + if (startIndex < 0) { + throw new Error('Node not found in tree'); + } + + const renderCount = this.model.getListRenderCount(nodeLocation); + const endIndex = startIndex + renderCount - 1; + + return { startIndex, endIndex }; + } + + nodePositionTopBelowWidget(node: ITreeNode): number { + const ancestors = []; + let currentAncestor = this.getParentNode(node); + while (currentAncestor) { + ancestors.push(currentAncestor); + currentAncestor = this.getParentNode(currentAncestor); + } + + let widgetHeight = 0; + for (let i = 0; i < ancestors.length && i < this.stickyScrollMaxItemCount; i++) { + widgetHeight += this.treeDelegate.getHeight(ancestors[i]); + } + return widgetHeight; + } + + updateOptions(optionsUpdate: IAbstractTreeOptionsUpdate = {}): void { + const validatedOptions = this.validateStickySettings(optionsUpdate); + if (this.stickyScrollMaxItemCount !== validatedOptions.stickyScrollMaxItemCount) { + this.stickyScrollMaxItemCount = validatedOptions.stickyScrollMaxItemCount; + this.update(); + } + } + + validateStickySettings(options: IAbstractTreeOptionsUpdate): { stickyScrollMaxItemCount: number } { + let stickyScrollMaxItemCount = 5; + if (typeof options.stickyScrollMaxItemCount === 'number') { + stickyScrollMaxItemCount = Math.max(options.stickyScrollMaxItemCount, 1); + } + return { stickyScrollMaxItemCount }; + } +} + +class StickyScrollWidget implements IDisposable { + + private readonly _rootDomNode: HTMLElement; + private _previousState: StickyScrollState | undefined; + + constructor( + container: HTMLElement, + private readonly view: List>, + private readonly model: ITreeModel, + private readonly treeRenderers: TreeRenderer[], + private readonly treeDelegate: IListVirtualDelegate> + ) { + + this._rootDomNode = document.createElement('div'); + this._rootDomNode.classList.add('monaco-tree-sticky-container'); + container.appendChild(this._rootDomNode); + } + + get height(): number { + if (!this._previousState) { + return 0; + } + const lastElement = this._previousState.stickyNodes[this._previousState.count - 1]; + return lastElement.position + lastElement.height; + } + + get count(): number { + return this._previousState?.count ?? 0; + } + + getNode(node: ITreeNode): StickyScrollNode | undefined { + return this._previousState?.stickyNodes.find(stickyNode => stickyNode.node === node); + } + + setState(state: StickyScrollState | undefined): void { + + const wasVisible = !!this._previousState && this._previousState.count > 0; + const isVisible = !!state && state.count > 0; + + // If state has not changed, do nothing + if ((!wasVisible && !isVisible) || (wasVisible && isVisible && this._previousState!.equal(state!))) { + return; + } + + // Update visibility of the widget if changed + if (wasVisible !== isVisible) { + this.setVisible(isVisible); + } + + // Remove previous state + this._previousState?.dispose(); + this._previousState = state; + + if (!isVisible) { + return; + } + + for (let stickyIndex = state.count - 1; stickyIndex >= 0; stickyIndex--) { + const stickyNode = state.stickyNodes[stickyIndex]; + const previousStickyNode = stickyIndex ? state.stickyNodes[stickyIndex - 1] : undefined; + const currentWidgetHieght = previousStickyNode ? previousStickyNode.position + previousStickyNode.height : 0; + + const { element, disposable } = this.createElement(stickyNode, currentWidgetHieght); + + this._rootDomNode.appendChild(element); + state.addDisposable(disposable); + } + + // Add shadow element to the end of the widget + const shadow = $('.monaco-tree-sticky-container-shadow'); + this._rootDomNode.appendChild(shadow); + state.addDisposable(toDisposable(() => shadow.remove())); + + // Set the height of the widget to the bottom of the last sticky node + const lastStickyNode = state.stickyNodes[state.count - 1]; + this._rootDomNode.style.height = `${lastStickyNode.position + lastStickyNode.height}px`; + } + + private createElement(stickyNode: StickyScrollNode, currentWidgetHeight: number): { element: HTMLElement; disposable: IDisposable } { + + const nodeLocation = this.model.getNodeLocation(stickyNode.node); + const nodeIndex = this.model.getListIndex(nodeLocation); + + // Sticky element container + const stickyElement = document.createElement('div'); + stickyElement.style.top = `${stickyNode.position}px`; + stickyElement.style.height = `${stickyNode.height}px`; + stickyElement.style.lineHeight = `${stickyNode.height}px`; + + stickyElement.classList.add('monaco-tree-sticky-row'); + stickyElement.classList.add('monaco-list-row'); + + stickyElement.setAttribute('data-index', `${nodeIndex}`); + stickyElement.setAttribute('data-parity', nodeIndex % 2 === 0 ? 'even' : 'odd'); + stickyElement.setAttribute('id', this.view.getElementID(nodeIndex)); + + // Get the renderer for the node + const nodeTemplateId = this.treeDelegate.getTemplateId(stickyNode.node); + const renderer = this.treeRenderers.find((renderer) => renderer.templateId === nodeTemplateId); + if (!renderer) { + throw new Error(`No renderer found for template id ${nodeTemplateId}`); + } + + const nodeCopy = new Proxy(stickyNode.node, {}); + + // Render the element + const templateData = renderer.renderTemplate(stickyElement); + renderer.renderElement(nodeCopy, stickyNode.startIndex, templateData, stickyNode.height); + + // Remove the element from the DOM when state is disposed + const disposable = toDisposable(() => { + renderer.disposeElement(nodeCopy, stickyNode.startIndex, templateData, stickyNode.height); + renderer.disposeTemplate(templateData); + stickyElement.remove(); + }); + + return { element: stickyElement, disposable }; + } + + private setVisible(visible: boolean): void { + this._rootDomNode.style.display = visible ? 'block' : 'none'; + } + + dispose(): void { + this._previousState?.dispose(); + this._rootDomNode.remove(); + } +} + function asTreeMouseEvent(event: IListMouseEvent>): ITreeMouseEvent { let target: TreeMouseEventTarget = TreeMouseEventTarget.Unknown; @@ -1212,6 +1622,8 @@ export interface IAbstractTreeOptionsUpdate extends ITreeRendererOptions { readonly fastScrollSensitivity?: number; readonly expandOnDoubleClick?: boolean; readonly expandOnlyOnTwistieClick?: boolean | ((e: any) => boolean); // e is T + readonly enableStickyScroll?: boolean; + readonly stickyScrollMaxItemCount?: number; } export interface IAbstractTreeOptions extends IAbstractTreeOptionsUpdate, IListOptions { @@ -1349,7 +1761,11 @@ class Trait { class TreeNodeListMouseController extends MouseController> { - constructor(list: TreeNodeList, private tree: AbstractTree) { + constructor( + list: TreeNodeList, + private tree: AbstractTree, + private stickyScrollProvider: () => StickyScrollController | undefined + ) { super(list); } @@ -1377,24 +1793,32 @@ class TreeNodeListMouseController extends MouseController< const target = e.browserEvent.target as HTMLElement; const onTwistie = target.classList.contains('monaco-tl-twistie') || (target.classList.contains('monaco-icon-label') && target.classList.contains('folder-icon') && e.browserEvent.offsetX < 16); + const isStickyElement = isStickyScrollElement(e.browserEvent.target as HTMLElement); let expandOnlyOnTwistieClick = false; - if (typeof this.tree.expandOnlyOnTwistieClick === 'function') { + if (isStickyElement) { + expandOnlyOnTwistieClick = true; + } + else if (typeof this.tree.expandOnlyOnTwistieClick === 'function') { expandOnlyOnTwistieClick = this.tree.expandOnlyOnTwistieClick(node.element); } else { expandOnlyOnTwistieClick = !!this.tree.expandOnlyOnTwistieClick; } - if (expandOnlyOnTwistieClick && !onTwistie && e.browserEvent.detail !== 2) { - return super.onViewPointer(e); + if (!isStickyElement) { + if (expandOnlyOnTwistieClick && !onTwistie && e.browserEvent.detail !== 2) { + return super.onViewPointer(e); + } + + if (!this.tree.expandOnDoubleClick && e.browserEvent.detail === 2) { + return super.onViewPointer(e); + } + } else { + this.handleStickyScrollMouseEvent(e, node); } - if (!this.tree.expandOnDoubleClick && e.browserEvent.detail === 2) { - return super.onViewPointer(e); - } - - if (node.collapsible) { + if (node.collapsible && (!isStickyElement || onTwistie)) { const location = this.tree.getNodeLocation(node); const recursive = e.browserEvent.altKey; this.tree.setFocus([location]); @@ -1407,7 +1831,27 @@ class TreeNodeListMouseController extends MouseController< } } - super.onViewPointer(e); + if (!isStickyElement) { + super.onViewPointer(e); + } + } + + private handleStickyScrollMouseEvent(e: IListMouseEvent>, node: ITreeNode): void { + if (isMonacoCustomToggle(e.browserEvent.target as HTMLElement) || isActionItem(e.browserEvent.target as HTMLElement)) { + return; + } + + const stickyScrollController = this.stickyScrollProvider(); + if (!stickyScrollController) { + throw new Error('Sticky scroll controller not found'); + } + + const nodeIndex = this.list.indexOf(node); + const elementScrollTop = this.list.getElementTop(nodeIndex); + const elementTargetViewTop = stickyScrollController.nodePositionTopBelowWidget(node); + this.tree.scrollTop = elementScrollTop - elementTargetViewTop; + this.list.setFocus([nodeIndex]); + this.list.setSelection([nodeIndex]); } protected override onDoubleClick(e: IListMouseEvent>): void { @@ -1427,6 +1871,7 @@ class TreeNodeListMouseController extends MouseController< interface ITreeNodeListOptions extends IListOptions> { readonly tree: AbstractTree; + readonly stickyScrollProvider: () => StickyScrollController | undefined; } /** @@ -1449,7 +1894,7 @@ class TreeNodeList extends List> } protected override createMouseController(options: ITreeNodeListOptions): MouseController> { - return new TreeNodeListMouseController(this, options.tree); + return new TreeNodeListMouseController(this, options.tree, options.stickyScrollProvider); } override splice(start: number, deleteCount: number, elements: readonly ITreeNode[] = []): void { @@ -1524,6 +1969,7 @@ export abstract class AbstractTree implements IDisposable protected view: TreeNodeList; private renderers: TreeRenderer[]; protected model: ITreeModel; + private treeDelegate: ComposedTreeDelegate>; private focus: Trait; private selection: Trait; private anchor: Trait; @@ -1531,6 +1977,7 @@ export abstract class AbstractTree implements IDisposable private findController?: FindController; readonly onDidChangeFindOpenState: Event = Event.None; private focusNavigationFilter: ((node: ITreeNode) => boolean) | undefined; + private stickyScrollController?: StickyScrollController; private styleElement: HTMLStyleElement; protected readonly disposables = new DisposableStore(); @@ -1584,7 +2031,7 @@ export abstract class AbstractTree implements IDisposable renderers: ITreeRenderer[], private _options: IAbstractTreeOptions = {} ) { - const treeDelegate = new ComposedTreeDelegate>(delegate); + this.treeDelegate = new ComposedTreeDelegate>(delegate); const onDidChangeCollapseStateRelay = new Relay>(); const onDidChangeActiveNodes = new Relay[]>(); @@ -1606,7 +2053,7 @@ export abstract class AbstractTree implements IDisposable this.focus = new Trait(() => this.view.getFocusedElements()[0], _options.identityProvider); this.selection = new Trait(() => this.view.getSelectedElements()[0], _options.identityProvider); this.anchor = new Trait(() => this.view.getAnchorElement(), _options.identityProvider); - this.view = new TreeNodeList(_user, container, treeDelegate, this.renderers, this.focus, this.selection, this.anchor, { ...asListOptions(() => this.model, _options), tree: this }); + this.view = new TreeNodeList(_user, container, this.treeDelegate, this.renderers, this.focus, this.selection, this.anchor, { ...asListOptions(() => this.model, _options), tree: this, stickyScrollProvider: () => this.stickyScrollController }); this.model = this.createModel(_user, this.view, _options); onDidChangeCollapseStateRelay.input = this.model.onDidChangeCollapseState; @@ -1668,6 +2115,10 @@ export abstract class AbstractTree implements IDisposable this.onDidChangeFindMatchType = Event.None; } + if (_options.enableStickyScroll) { + this.stickyScrollController = new StickyScrollController(this, this.model, this.view, this.renderers, this.treeDelegate, _options); + } + this.styleElement = createStyleSheet(this.view.getHTMLElement()); this.getHTMLElement().classList.toggle('always', this._options.renderIndentGuides === RenderIndentGuides.Always); } @@ -1681,6 +2132,7 @@ export abstract class AbstractTree implements IDisposable this.view.updateOptions(this._options); this.findController?.updateOptions(optionsUpdate); + this.updateStickyScroll(optionsUpdate); this._onDidUpdateOptions.fire(this._options); @@ -1691,6 +2143,16 @@ export abstract class AbstractTree implements IDisposable return this._options; } + private updateStickyScroll(optionsUpdate: IAbstractTreeOptionsUpdate) { + if (!this.stickyScrollController && this._options.enableStickyScroll) { + this.stickyScrollController = new StickyScrollController(this, this.model, this.view, this.renderers, this.treeDelegate, this._options); + } else if (this.stickyScrollController && !this._options.enableStickyScroll) { + this.stickyScrollController.dispose(); + this.stickyScrollController = undefined; + } + this.stickyScrollController?.updateOptions(optionsUpdate); + } + updateWidth(element: TRef): void { const index = this.model.getListIndex(element); @@ -1748,7 +2210,11 @@ export abstract class AbstractTree implements IDisposable } get firstVisibleElement(): T | undefined { - const index = this.view.firstVisibleIndex; + let index = this.view.firstVisibleIndex; + + if (this.stickyScrollController) { + index += this.stickyScrollController.count; + } if (index < 0 || index >= this.view.length) { return undefined; @@ -1801,6 +2267,11 @@ export abstract class AbstractTree implements IDisposable content.push(`.monaco-list${suffix} .monaco-tl-indent > .indent-guide.active { border-color: ${styles.treeIndentGuidesStroke}; }`); } + if (styles.listBackground) { + content.push(`.monaco-list${suffix} .monaco-scrollable-element .monaco-tree-sticky-container { background-color: ${styles.listBackground}; }`); + content.push(`.monaco-list${suffix} .monaco-scrollable-element .monaco-tree-sticky-container .monaco-tree-sticky-row { background-color: ${styles.listBackground}; }`); + } + this.styleElement.textContent = content.join('\n'); this.view.style(styles); @@ -1886,14 +2357,16 @@ export abstract class AbstractTree implements IDisposable return this.view.setAnchor(undefined); } - const node = this.model.getNode(element); - this.anchor.set([node]); + this.eventBufferer.bufferEvents(() => { + const node = this.model.getNode(element); + this.anchor.set([node]); - const index = this.model.getListIndex(element); + const index = this.model.getListIndex(element); - if (index > -1) { - this.view.setAnchor(index, true); - } + if (index > -1) { + this.view.setAnchor(index, true); + } + }); } getAnchor(): T | undefined { @@ -1901,11 +2374,13 @@ export abstract class AbstractTree implements IDisposable } setSelection(elements: TRef[], browserEvent?: UIEvent): void { - const nodes = elements.map(e => this.model.getNode(e)); - this.selection.set(nodes, browserEvent); + this.eventBufferer.bufferEvents(() => { + const nodes = elements.map(e => this.model.getNode(e)); + this.selection.set(nodes, browserEvent); - const indexes = elements.map(e => this.model.getListIndex(e)).filter(i => i > -1); - this.view.setSelection(indexes, browserEvent, true); + const indexes = elements.map(e => this.model.getListIndex(e)).filter(i => i > -1); + this.view.setSelection(indexes, browserEvent, true); + }); } getSelection(): T[] { @@ -1913,34 +2388,36 @@ export abstract class AbstractTree implements IDisposable } setFocus(elements: TRef[], browserEvent?: UIEvent): void { - const nodes = elements.map(e => this.model.getNode(e)); - this.focus.set(nodes, browserEvent); + this.eventBufferer.bufferEvents(() => { + const nodes = elements.map(e => this.model.getNode(e)); + this.focus.set(nodes, browserEvent); - const indexes = elements.map(e => this.model.getListIndex(e)).filter(i => i > -1); - this.view.setFocus(indexes, browserEvent, true); + const indexes = elements.map(e => this.model.getListIndex(e)).filter(i => i > -1); + this.view.setFocus(indexes, browserEvent, true); + }); } - focusNext(n = 1, loop = false, browserEvent?: UIEvent, filter = this.focusNavigationFilter): void { + focusNext(n = 1, loop = false, browserEvent?: UIEvent, filter = (isKeyboardEvent(browserEvent) && browserEvent.altKey) ? undefined : this.focusNavigationFilter): void { this.view.focusNext(n, loop, browserEvent, filter); } - focusPrevious(n = 1, loop = false, browserEvent?: UIEvent, filter = this.focusNavigationFilter): void { + focusPrevious(n = 1, loop = false, browserEvent?: UIEvent, filter = (isKeyboardEvent(browserEvent) && browserEvent.altKey) ? undefined : this.focusNavigationFilter): void { this.view.focusPrevious(n, loop, browserEvent, filter); } - focusNextPage(browserEvent?: UIEvent, filter = this.focusNavigationFilter): Promise { + focusNextPage(browserEvent?: UIEvent, filter = (isKeyboardEvent(browserEvent) && browserEvent.altKey) ? undefined : this.focusNavigationFilter): Promise { return this.view.focusNextPage(browserEvent, filter); } - focusPreviousPage(browserEvent?: UIEvent, filter = this.focusNavigationFilter): Promise { + focusPreviousPage(browserEvent?: UIEvent, filter = (isKeyboardEvent(browserEvent) && browserEvent.altKey) ? undefined : this.focusNavigationFilter): Promise { return this.view.focusPreviousPage(browserEvent, filter); } - focusLast(browserEvent?: UIEvent, filter = this.focusNavigationFilter): void { + focusLast(browserEvent?: UIEvent, filter = (isKeyboardEvent(browserEvent) && browserEvent.altKey) ? undefined : this.focusNavigationFilter): void { this.view.focusLast(browserEvent, filter); } - focusFirst(browserEvent?: UIEvent, filter = this.focusNavigationFilter): void { + focusFirst(browserEvent?: UIEvent, filter = (isKeyboardEvent(browserEvent) && browserEvent.altKey) ? undefined : this.focusNavigationFilter): void { this.view.focusFirst(browserEvent, filter); } @@ -1957,7 +2434,12 @@ export abstract class AbstractTree implements IDisposable return; } - this.view.reveal(index, relativeTop); + if (!this.stickyScrollController) { + this.view.reveal(index, relativeTop); + } else { + const paddingTop = this.stickyScrollController.nodePositionTopBelowWidget(this.getNode(location)); + this.view.reveal(index, relativeTop, paddingTop); + } } /** @@ -1971,7 +2453,8 @@ export abstract class AbstractTree implements IDisposable return null; } - return this.view.getRelativeTop(index); + const stickyScrollNode = this.stickyScrollController?.getNode(this.getNode(location)); + return this.view.getRelativeTop(index, stickyScrollNode?.position ?? this.stickyScrollController?.height); } getViewState(identityProvider = this.options.identityProvider): AbstractTreeViewState { @@ -2086,6 +2569,7 @@ export abstract class AbstractTree implements IDisposable dispose(): void { dispose(this.disposables); + this.stickyScrollController?.dispose(); this.view.dispose(); } } diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts index 929c5442036..bd86417690c 100644 --- a/src/vs/base/browser/ui/tree/asyncDataTree.ts +++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts @@ -5,13 +5,13 @@ 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 { ElementsDragAndDropData, ListViewTargetSector } from 'vs/base/browser/ui/list/listView'; import { IListStyles } from 'vs/base/browser/ui/list/listWidget'; -import { ComposedTreeDelegate, TreeFindMode as TreeFindMode, IAbstractTreeOptions, IAbstractTreeOptionsUpdate } from 'vs/base/browser/ui/tree/abstractTree'; +import { ComposedTreeDelegate, TreeFindMode as TreeFindMode, IAbstractTreeOptions, IAbstractTreeOptionsUpdate, TreeFindMatchType } 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'; -import { IAsyncDataSource, ICollapseStateChangeEvent, IObjectTreeElement, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeEvent, ITreeFilter, ITreeMouseEvent, ITreeNode, ITreeRenderer, ITreeSorter, TreeError, TreeFilterResult, TreeVisibility, WeakMapper } from 'vs/base/browser/ui/tree/tree'; +import { IAsyncDataSource, ICollapseStateChangeEvent, IObjectTreeElement, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeEvent, ITreeFilter, ITreeMouseEvent, ITreeNode, ITreeRenderer, ITreeSorter, ObjectTreeElementCollapseState, TreeError, TreeFilterResult, TreeVisibility, WeakMapper } from 'vs/base/browser/ui/tree/tree'; import { CancelablePromise, createCancelablePromise, Promises, timeout } from 'vs/base/common/async'; import { Codicon } from 'vs/base/common/codicons'; import { ThemeIcon } from 'vs/base/common/themables'; @@ -31,13 +31,15 @@ interface IAsyncDataTreeNode { hasChildren: boolean; stale: boolean; slow: boolean; - collapsedByDefault: boolean | undefined; + readonly defaultCollapseState: undefined | ObjectTreeElementCollapseState.PreserveOrCollapsed | ObjectTreeElementCollapseState.PreserveOrExpanded; + forceExpanded: boolean; } interface IAsyncDataTreeNodeRequiredProps extends Partial> { readonly element: TInput | T; readonly parent: IAsyncDataTreeNode | null; readonly hasChildren: boolean; + readonly defaultCollapseState: undefined | ObjectTreeElementCollapseState.PreserveOrCollapsed | ObjectTreeElementCollapseState.PreserveOrExpanded; } function createAsyncDataTreeNode(props: IAsyncDataTreeNodeRequiredProps): IAsyncDataTreeNode { @@ -47,7 +49,7 @@ function createAsyncDataTreeNode(props: IAsyncDataTreeNodeRequiredPro refreshPromise: undefined, stale: true, slow: false, - collapsedByDefault: undefined + forceExpanded: false }; } @@ -197,12 +199,12 @@ class AsyncDataTreeNodeListDragAndDrop implements IListDragAndDrop | undefined, targetIndex: number | undefined, originalEvent: DragEvent, raw = true): boolean | IListDragOverReaction { - return this.dnd.onDragOver(asAsyncDataTreeDragAndDropData(data), targetNode && targetNode.element as T, targetIndex, originalEvent); + onDragOver(data: IDragAndDropData, targetNode: IAsyncDataTreeNode | undefined, targetIndex: number | undefined, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent, raw = true): boolean | IListDragOverReaction { + return this.dnd.onDragOver(asAsyncDataTreeDragAndDropData(data), targetNode && targetNode.element as T, targetIndex, targetSector, originalEvent); } - drop(data: IDragAndDropData, targetNode: IAsyncDataTreeNode | undefined, targetIndex: number | undefined, originalEvent: DragEvent): void { - this.dnd.drop(asAsyncDataTreeDragAndDropData(data), targetNode && targetNode.element as T, targetIndex, originalEvent); + drop(data: IDragAndDropData, targetNode: IAsyncDataTreeNode | undefined, targetIndex: number | undefined, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent): void { + this.dnd.drop(asAsyncDataTreeDragAndDropData(data), targetNode && targetNode.element as T, targetIndex, targetSector, originalEvent); } onDragEnd(originalEvent: DragEvent): void { @@ -321,7 +323,7 @@ export class AsyncDataTree implements IDisposable protected readonly root: IAsyncDataTreeNode; private readonly nodes = new Map>(); private readonly sorter?: ITreeSorter; - private readonly collapseByDefault?: { (e: T): boolean }; + private readonly getDefaultCollapseState: { (e: T): undefined | ObjectTreeElementCollapseState.PreserveOrCollapsed | ObjectTreeElementCollapseState.PreserveOrExpanded }; private readonly subTreeRefreshPromises = new Map, Promise>(); private readonly refreshPromises = new Map, CancelablePromise>>(); @@ -365,6 +367,10 @@ export class AsyncDataTree implements IDisposable set findMode(mode: TreeFindMode) { this.tree.findMode = mode; } readonly onDidChangeFindMode: Event; + get findMatchType(): TreeFindMatchType { return this.tree.findMatchType; } + set findMatchType(matchType: TreeFindMatchType) { this.tree.findMatchType = matchType; } + readonly onDidChangeFindMatchType: Event; + get expandOnlyOnTwistieClick(): boolean | ((e: T) => boolean) { if (typeof this.tree.expandOnlyOnTwistieClick === 'boolean') { return this.tree.expandOnlyOnTwistieClick; @@ -387,15 +393,17 @@ export class AsyncDataTree implements IDisposable this.identityProvider = options.identityProvider; this.autoExpandSingleChildren = typeof options.autoExpandSingleChildren === 'undefined' ? false : options.autoExpandSingleChildren; this.sorter = options.sorter; - this.collapseByDefault = options.collapseByDefault; + this.getDefaultCollapseState = e => options.collapseByDefault ? (options.collapseByDefault(e) ? ObjectTreeElementCollapseState.PreserveOrCollapsed : ObjectTreeElementCollapseState.PreserveOrExpanded) : undefined; this.tree = this.createTree(user, container, delegate, renderers, options); this.onDidChangeFindMode = this.tree.onDidChangeFindMode; + this.onDidChangeFindMatchType = this.tree.onDidChangeFindMatchType; this.root = createAsyncDataTreeNode({ element: undefined!, parent: null, - hasChildren: true + hasChildren: true, + defaultCollapseState: undefined }); if (this.identityProvider) { @@ -783,6 +791,9 @@ export class AsyncDataTree implements IDisposable private async refreshAndRenderNode(node: IAsyncDataTreeNode, recursive: boolean, viewStateContext?: IAsyncDataTreeViewStateContext, options?: IAsyncDataTreeUpdateChildrenOptions): Promise { await this.refreshNode(node, recursive, viewStateContext); + if (this.disposables.isDisposed) { + return; // tree disposed during refresh (#199264) + } this.render(node, viewStateContext, options); } @@ -932,10 +943,9 @@ export class AsyncDataTree implements IDisposable const hasChildren = !!this.dataSource.hasChildren(element); if (!this.identityProvider) { - const asyncDataTreeNode = createAsyncDataTreeNode({ element, parent: node, hasChildren }); + const asyncDataTreeNode = createAsyncDataTreeNode({ element, parent: node, hasChildren, defaultCollapseState: this.getDefaultCollapseState(element) }); - if (hasChildren && this.collapseByDefault && !this.collapseByDefault(element)) { - asyncDataTreeNode.collapsedByDefault = false; + if (hasChildren && asyncDataTreeNode.defaultCollapseState === ObjectTreeElementCollapseState.PreserveOrExpanded) { childrenToRefresh.push(asyncDataTreeNode); } @@ -963,15 +973,14 @@ export class AsyncDataTree implements IDisposable } else { childrenToRefresh.push(asyncDataTreeNode); } - } else if (hasChildren && this.collapseByDefault && !this.collapseByDefault(element)) { - asyncDataTreeNode.collapsedByDefault = false; + } else if (hasChildren && !result.collapsed) { childrenToRefresh.push(asyncDataTreeNode); } return asyncDataTreeNode; } - const childAsyncDataTreeNode = createAsyncDataTreeNode({ element, parent: node, id, hasChildren }); + const childAsyncDataTreeNode = createAsyncDataTreeNode({ element, parent: node, id, hasChildren, defaultCollapseState: this.getDefaultCollapseState(element) }); if (viewStateContext && viewStateContext.viewState.focus && viewStateContext.viewState.focus.indexOf(id) > -1) { viewStateContext.focus.push(childAsyncDataTreeNode); @@ -983,8 +992,7 @@ export class AsyncDataTree implements IDisposable if (viewStateContext && viewStateContext.viewState.expanded && viewStateContext.viewState.expanded.indexOf(id) > -1) { childrenToRefresh.push(childAsyncDataTreeNode); - } else if (hasChildren && this.collapseByDefault && !this.collapseByDefault(element)) { - childAsyncDataTreeNode.collapsedByDefault = false; + } else if (hasChildren && childAsyncDataTreeNode.defaultCollapseState === ObjectTreeElementCollapseState.PreserveOrExpanded) { childrenToRefresh.push(childAsyncDataTreeNode); } @@ -1003,7 +1011,7 @@ export class AsyncDataTree implements IDisposable // TODO@joao this doesn't take filter into account if (node !== this.root && this.autoExpandSingleChildren && children.length === 1 && childrenToRefresh.length === 0) { - children[0].collapsedByDefault = false; + children[0].forceExpanded = true; childrenToRefresh.push(children[0]); } @@ -1039,16 +1047,17 @@ export class AsyncDataTree implements IDisposable }; } - let collapsed: boolean | undefined; + let collapsed: boolean | ObjectTreeElementCollapseState.PreserveOrCollapsed | ObjectTreeElementCollapseState.PreserveOrExpanded | undefined; if (viewStateContext && viewStateContext.viewState.expanded && node.id && viewStateContext.viewState.expanded.indexOf(node.id) > -1) { collapsed = false; + } else if (node.forceExpanded) { + collapsed = false; + node.forceExpanded = false; } else { - collapsed = node.collapsedByDefault; + collapsed = node.defaultCollapseState; } - node.collapsedByDefault = undefined; - return { element: node, children: node.hasChildren ? Iterable.map(node.children, child => this.asTreeElement(child, viewStateContext)) : [], @@ -1277,7 +1286,7 @@ export class CompressibleAsyncDataTree extends As return { focus, selection, expanded, scrollTop: this.scrollTop }; } - protected override render(node: IAsyncDataTreeNode, viewStateContext?: IAsyncDataTreeViewStateContext): void { + protected override render(node: IAsyncDataTreeNode, viewStateContext?: IAsyncDataTreeViewStateContext, options?: IAsyncDataTreeUpdateChildrenOptions): void { if (!this.identityProvider) { return super.render(node, viewStateContext); } @@ -1307,7 +1316,7 @@ export class CompressibleAsyncDataTree extends As const oldSelection = getUncompressedIds(this.tree.getSelection() as IAsyncDataTreeNode[]); const oldFocus = getUncompressedIds(this.tree.getFocus() as IAsyncDataTreeNode[]); - super.render(node, viewStateContext); + super.render(node, viewStateContext, options); const selection = this.getSelection(); let didChangeSelection = false; diff --git a/src/vs/base/browser/ui/tree/indexTreeModel.ts b/src/vs/base/browser/ui/tree/indexTreeModel.ts index ba745b069cb..4e83338804b 100644 --- a/src/vs/base/browser/ui/tree/indexTreeModel.ts +++ b/src/vs/base/browser/ui/tree/indexTreeModel.ts @@ -238,7 +238,6 @@ export class IndexTreeModel, TFilterData = voi const nodesToInsertIterator = Iterable.map(toInsert, el => this.createTreeNode(el, parentNode, parentNode.visible ? TreeVisibility.Visible : TreeVisibility.Hidden, revealed, treeListElementsToInsert, onDidCreateNode)); const lastIndex = location[location.length - 1]; - const lastHadChildren = parentNode.children.length > 0; // figure out what's the visible child start index right before the // splice point @@ -317,11 +316,6 @@ export class IndexTreeModel, TFilterData = voi this._onDidSplice.fire({ insertedNodes: nodesToInsert, deletedNodes }); - const currentlyHasChildren = parentNode.children.length > 0; - if (lastHadChildren !== currentlyHasChildren) { - this.setCollapsible(location.slice(0, -1), currentlyHasChildren); - } - let node: IIndexTreeNode | undefined = parentNode; while (node) { diff --git a/src/vs/base/browser/ui/tree/media/tree.css b/src/vs/base/browser/ui/tree/media/tree.css index a83a0a84e31..1c9aa292e0f 100644 --- a/src/vs/base/browser/ui/tree/media/tree.css +++ b/src/vs/base/browser/ui/tree/media/tree.css @@ -128,3 +128,39 @@ .monaco-tree-type-filter-actionbar .monaco-action-bar .action-label { padding: 2px; } + +.monaco-list .monaco-scrollable-element .monaco-tree-sticky-container{ + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 0; + z-index: 13; /* Settings editor uses z-index: 12 */ + + /* TODO@benibenj temporary solution, all lists should provide their background */ + background-color: var(--vscode-sideBar-background); +} + +.monaco-list .monaco-scrollable-element .monaco-tree-sticky-container .monaco-tree-sticky-row.monaco-list-row{ + position: absolute; + width: 100%; + opacity: 1 !important; /* Settings editor uses opacity < 1 */ + overflow: hidden; + + /* TODO@benibenj temporary solution, all lists should provide their background */ + background-color: var(--vscode-sideBar-background); +} + +.monaco-list .monaco-scrollable-element .monaco-tree-sticky-container .monaco-tree-sticky-row:hover{ + background-color: var(--vscode-list-hoverBackground) !important; + cursor: pointer; +} + +.monaco-list .monaco-scrollable-element .monaco-tree-sticky-container .monaco-tree-sticky-container-shadow{ + position: absolute; + bottom: -3px; + left: 0px; + height: 3px; + width: 100%; + box-shadow: var(--vscode-scrollbar-shadow) 0 6px 6px -6px inset; +} diff --git a/src/vs/base/browser/ui/tree/tree.ts b/src/vs/base/browser/ui/tree/tree.ts index e929dc7de09..0a073ad57fd 100644 --- a/src/vs/base/browser/ui/tree/tree.ts +++ b/src/vs/base/browser/ui/tree/tree.ts @@ -5,7 +5,8 @@ import { IDragAndDropData } from 'vs/base/browser/dnd'; import { IMouseEvent } from 'vs/base/browser/mouseEvent'; -import { IListDragAndDrop, IListDragOverReaction, IListRenderer, ListDragOverEffect } from 'vs/base/browser/ui/list/list'; +import { IListDragAndDrop, IListDragOverReaction, IListRenderer, ListDragOverEffectPosition, ListDragOverEffectType } from 'vs/base/browser/ui/list/list'; +import { ListViewTargetSector } from 'vs/base/browser/ui/list/listView'; import { Event } from 'vs/base/common/event'; export const enum TreeVisibility { @@ -212,12 +213,12 @@ export interface ITreeDragOverReaction extends IListDragOverReaction { export const TreeDragOverReactions = { acceptBubbleUp(): ITreeDragOverReaction { return { accept: true, bubble: TreeDragOverBubble.Up }; }, acceptBubbleDown(autoExpand = false): ITreeDragOverReaction { return { accept: true, bubble: TreeDragOverBubble.Down, autoExpand }; }, - acceptCopyBubbleUp(): ITreeDragOverReaction { return { accept: true, bubble: TreeDragOverBubble.Up, effect: ListDragOverEffect.Copy }; }, - acceptCopyBubbleDown(autoExpand = false): ITreeDragOverReaction { return { accept: true, bubble: TreeDragOverBubble.Down, effect: ListDragOverEffect.Copy, autoExpand }; } + acceptCopyBubbleUp(): ITreeDragOverReaction { return { accept: true, bubble: TreeDragOverBubble.Up, effect: { type: ListDragOverEffectType.Copy, position: ListDragOverEffectPosition.Over } }; }, + acceptCopyBubbleDown(autoExpand = false): ITreeDragOverReaction { return { accept: true, bubble: TreeDragOverBubble.Down, effect: { type: ListDragOverEffectType.Copy, position: ListDragOverEffectPosition.Over }, autoExpand }; } }; export interface ITreeDragAndDrop extends IListDragAndDrop { - onDragOver(data: IDragAndDropData, targetElement: T | undefined, targetIndex: number | undefined, originalEvent: DragEvent): boolean | ITreeDragOverReaction; + onDragOver(data: IDragAndDropData, targetElement: T | undefined, targetIndex: number | undefined, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent): boolean | ITreeDragOverReaction; } export class TreeError extends Error { diff --git a/src/vs/base/browser/ui/widget.ts b/src/vs/base/browser/ui/widget.ts index 2586cce024e..440a9ace259 100644 --- a/src/vs/base/browser/ui/widget.ts +++ b/src/vs/base/browser/ui/widget.ts @@ -12,19 +12,19 @@ import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; export abstract class Widget extends Disposable { protected onclick(domNode: HTMLElement, listener: (e: IMouseEvent) => void): void { - this._register(dom.addDisposableListener(domNode, dom.EventType.CLICK, (e: MouseEvent) => listener(new StandardMouseEvent(e)))); + this._register(dom.addDisposableListener(domNode, dom.EventType.CLICK, (e: MouseEvent) => listener(new StandardMouseEvent(dom.getWindow(domNode), e)))); } protected onmousedown(domNode: HTMLElement, listener: (e: IMouseEvent) => void): void { - this._register(dom.addDisposableListener(domNode, dom.EventType.MOUSE_DOWN, (e: MouseEvent) => listener(new StandardMouseEvent(e)))); + this._register(dom.addDisposableListener(domNode, dom.EventType.MOUSE_DOWN, (e: MouseEvent) => listener(new StandardMouseEvent(dom.getWindow(domNode), e)))); } protected onmouseover(domNode: HTMLElement, listener: (e: IMouseEvent) => void): void { - this._register(dom.addDisposableListener(domNode, dom.EventType.MOUSE_OVER, (e: MouseEvent) => listener(new StandardMouseEvent(e)))); + this._register(dom.addDisposableListener(domNode, dom.EventType.MOUSE_OVER, (e: MouseEvent) => listener(new StandardMouseEvent(dom.getWindow(domNode), 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)))); + this._register(dom.addDisposableListener(domNode, dom.EventType.MOUSE_LEAVE, (e: MouseEvent) => listener(new StandardMouseEvent(dom.getWindow(domNode), e)))); } protected onkeydown(domNode: HTMLElement, listener: (e: IKeyboardEvent) => void): void { diff --git a/src/vs/base/browser/window.ts b/src/vs/base/browser/window.ts index dde39958ff4..fe715d6f2c2 100644 --- a/src/vs/base/browser/window.ts +++ b/src/vs/base/browser/window.ts @@ -7,6 +7,16 @@ export type CodeWindow = Window & typeof globalThis & { readonly vscodeWindowId: number; }; +export function ensureCodeWindow(targetWindow: Window, fallbackWindowId: number): asserts targetWindow is CodeWindow { + const codeWindow = targetWindow as Partial; + + if (typeof codeWindow.vscodeWindowId !== 'number') { + Object.defineProperty(codeWindow, 'vscodeWindowId', { + get: () => fallbackWindowId + }); + } +} + // eslint-disable-next-line no-restricted-globals export const mainWindow = window as CodeWindow; @@ -16,3 +26,13 @@ export const mainWindow = window as CodeWindow; * or `DOM.getActiveWindow()` to obtain the correct window for the context you are in. */ export const $window = mainWindow; + +export function isAuxiliaryWindow(obj: Window): obj is CodeWindow { + if (obj === mainWindow) { + return false; + } + + const candidate = obj as CodeWindow | undefined; + + return typeof candidate?.vscodeWindowId === 'number'; +} diff --git a/src/vs/base/common/actions.ts b/src/vs/base/common/actions.ts index bb71e5555d6..36ed201bdc5 100644 --- a/src/vs/base/common/actions.ts +++ b/src/vs/base/common/actions.ts @@ -258,11 +258,11 @@ export class EmptySubmenuAction extends Action { } } -export function toAction(props: { id: string; label: string; enabled?: boolean; checked?: boolean; run: Function }): IAction { +export function toAction(props: { id: string; label: string; enabled?: boolean; checked?: boolean; class?: string; run: Function }): IAction { return { id: props.id, label: props.label, - class: undefined, + class: props.class, enabled: props.enabled ?? true, checked: props.checked ?? false, run: async (...args: unknown[]) => props.run(...args), diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts index 14cad1ec215..a997633ffe2 100644 --- a/src/vs/base/common/async.ts +++ b/src/vs/base/common/async.ts @@ -4,13 +4,14 @@ *--------------------------------------------------------------------------------------------*/ import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation'; -import { CancellationError } from 'vs/base/common/errors'; +import { BugIndicatingError, CancellationError } from 'vs/base/common/errors'; import { Emitter, Event } from 'vs/base/common/event'; import { Disposable, DisposableMap, DisposableStore, IDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { extUri as defaultExtUri, IExtUri } from 'vs/base/common/resources'; import { URI } from 'vs/base/common/uri'; import { setTimeout0 } from 'vs/base/common/platform'; import { MicrotaskDelay } from './symbols'; +import { Lazy } from 'vs/base/common/lazy'; export function isThenable(obj: unknown): obj is Promise { return !!obj && typeof (obj as unknown as Promise).then === 'function'; @@ -27,7 +28,6 @@ export function createCancelablePromise(callback: (token: CancellationToken) const promise = new Promise((resolve, reject) => { const subscription = source.token.onCancellationRequested(() => { subscription.dispose(); - source.dispose(); reject(new CancellationError()); }); Promise.resolve(thenable).then(value => { @@ -44,6 +44,7 @@ export function createCancelablePromise(callback: (token: CancellationToken) return >new class { cancel() { source.cancel(); + source.dispose(); } then(resolve?: ((value: T) => TResult1 | Promise) | undefined | null, reject?: ((reason: any) => TResult2 | Promise) | undefined | null): Promise { return promise.then(resolve, reject); @@ -425,7 +426,6 @@ export class ThrottledDelayer { * A barrier that is initially closed and then becomes opened permanently. */ export class Barrier { - private _isOpen: boolean; private _promise: Promise; private _completePromise!: (v: boolean) => void; @@ -632,7 +632,7 @@ export interface ILimiter { * A helper to queue N promises and run them all with a max degree of parallelism. The helper * ensures that at any time no more than M promises are running at the same time. */ -export class Limiter implements ILimiter{ +export class Limiter implements ILimiter { private _size = 0; private runningPromises: number; @@ -1624,6 +1624,67 @@ export namespace Promises { } } +export class StatefulPromise { + private _value: T | undefined = undefined; + get value(): T | undefined { return this._value; } + + private _error: unknown = undefined; + get error(): unknown { return this._error; } + + private _isResolved = false; + get isResolved() { return this._isResolved; } + + public readonly promise: Promise; + + constructor(promise: Promise) { + this.promise = promise.then( + value => { + this._value = value; + this._isResolved = true; + return value; + }, + error => { + this._error = error; + this._isResolved = true; + throw error; + } + ); + } + + public requireValue(): T { + if (!this._isResolved) { + throw new BugIndicatingError('Promise is not resolved yet'); + } + if (this._error) { + throw this._error; + } + return this._value!; + } +} + +export class LazyStatefulPromise { + private _promise = new Lazy(() => new StatefulPromise(this._compute())); + + constructor( + private readonly _compute: () => Promise, + ) { } + + /** + * Returns the resolved value. + * Crashes if the promise is not resolved yet. + */ + public requireValue(): T { + return this._promise.value.requireValue(); + } + + /** + * Returns the promise (and triggers a computation of the promise if not yet done so). + */ + public getPromise(): Promise { + return this._promise.value.promise; + } +} + //#endregion //#region diff --git a/src/vs/base/common/codicons.ts b/src/vs/base/common/codicons.ts index c314f5169b4..dcaf8a435aa 100644 --- a/src/vs/base/common/codicons.ts +++ b/src/vs/base/common/codicons.ts @@ -580,6 +580,13 @@ export const Codicon = { micFilled: register('mic-filled', 0xec1c), gitFetch: register('git-fetch', 0xec1d), copilot: register('copilot', 0xec1e), + lightbulbSparkle: register('lightbulb-sparkle', 0xec1f), + lightbulbSparkleAutofix: register('lightbulb-sparkle-autofix', 0xec1f), + robot: register('robot', 0xec20), + sparkleFilled: register('sparkle-filled', 0xec21), + diffSingle: register('diff-single', 0xec22), + diffMultiple: register('diff-multiple', 0xec23), + surroundWith: register('surround-with', 0xec24), // derived icons, that could become separate icons diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts index 07f7846157a..e0070330e1d 100644 --- a/src/vs/base/common/event.ts +++ b/src/vs/base/common/event.ts @@ -708,7 +708,7 @@ export namespace Event { * Each listener is attached to the observable directly. */ export function fromObservableLight(observable: IObservable): Event { - return (listener) => { + return (listener, thisArgs, disposables) => { let count = 0; let didChange = false; const observer: IObserver = { @@ -721,7 +721,7 @@ export namespace Event { observable.reportChanges(); if (didChange) { didChange = false; - listener(); + listener.call(thisArgs); } } }, @@ -734,11 +734,19 @@ export namespace Event { }; observable.addObserver(observer); observable.reportChanges(); - return { + const disposable = { dispose() { observable.removeObserver(observer); } }; + + if (disposables instanceof DisposableStore) { + disposables.add(disposable); + } else if (Array.isArray(disposables)) { + disposables.push(disposable); + } + + return disposable; }; } } diff --git a/src/vs/base/common/filters.ts b/src/vs/base/common/filters.ts index 4810526f6a1..f7f0a43972f 100644 --- a/src/vs/base/common/filters.ts +++ b/src/vs/base/common/filters.ts @@ -5,6 +5,7 @@ import { CharCode } from 'vs/base/common/charCode'; import { LRUCache } from 'vs/base/common/map'; +import { getKoreanAltChars } from 'vs/base/common/naturalLanguage/korean'; import * as strings from 'vs/base/common/strings'; export interface IFilter { @@ -134,6 +135,33 @@ function charactersMatch(codeA: number, codeB: number): boolean { return (codeA === codeB) || (isWordSeparator(codeA) && isWordSeparator(codeB)); } +const alternateCharsCache: Map | undefined> = new Map(); +/** + * Gets alternative codes to the character code passed in. This comes in the + * form of an array of character codes, all of which must match _in order_ to + * successfully match. + * + * @param code The character code to check. + */ +function getAlternateCodes(code: number): ArrayLike | undefined { + if (alternateCharsCache.has(code)) { + return alternateCharsCache.get(code); + } + + // NOTE: This function is written in such a way that it can be extended in + // the future, but right now the return type takes into account it's only + // supported by a single "alt codes provider". + // `ArrayLike>` is a more appropriate type if changed. + let result: ArrayLike | undefined; + const codes = getKoreanAltChars(code); + if (codes) { + result = codes; + } + + alternateCharsCache.set(code, result); + return result; +} + function isAlphanumeric(code: number): boolean { return isLower(code) || isUpper(code) || isNumber(code); } @@ -288,47 +316,72 @@ export function matchesWords(word: string, target: string, contiguous: boolean = } let result: IMatch[] | null = null; - let i = 0; + let targetIndex = 0; word = word.toLowerCase(); target = target.toLowerCase(); - while (i < target.length && (result = _matchesWords(word, target, 0, i, contiguous)) === null) { - i = nextWord(target, i + 1); + while (targetIndex < target.length) { + result = _matchesWords(word, target, 0, targetIndex, contiguous); + if (result !== null) { + break; + } + targetIndex = nextWord(target, targetIndex + 1); } return result; } -function _matchesWords(word: string, target: string, i: number, j: number, contiguous: boolean): IMatch[] | null { - if (i === word.length) { - return []; - } else if (j === target.length) { - return null; - } else if (!charactersMatch(word.charCodeAt(i), target.charCodeAt(j))) { - return null; - } else { - let result: IMatch[] | null = null; - let nextWordIndex = j + 1; - result = _matchesWords(word, target, i + 1, j + 1, contiguous); - if (!contiguous) { - while (!result && (nextWordIndex = nextWord(target, nextWordIndex)) < target.length) { - result = _matchesWords(word, target, i + 1, nextWordIndex, contiguous); - nextWordIndex++; - } - } +function _matchesWords(word: string, target: string, wordIndex: number, targetIndex: number, contiguous: boolean): IMatch[] | null { + let targetIndexOffset = 0; - if (!result) { + if (wordIndex === word.length) { + return []; + } else if (targetIndex === target.length) { + return null; + } else if (!charactersMatch(word.charCodeAt(wordIndex), target.charCodeAt(targetIndex))) { + // Verify alternate characters before exiting + const altChars = getAlternateCodes(word.charCodeAt(wordIndex)); + if (!altChars) { return null; } + for (let k = 0; k < altChars.length; k++) { + if (!charactersMatch(altChars[k], target.charCodeAt(targetIndex + k))) { + return null; + } + } + targetIndexOffset += altChars.length - 1; + } - // 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)) { + let result: IMatch[] | null = null; + let nextWordIndex = targetIndex + targetIndexOffset + 1; + result = _matchesWords(word, target, wordIndex + 1, nextWordIndex, contiguous); + if (!contiguous) { + while (!result && (nextWordIndex = nextWord(target, nextWordIndex)) < target.length) { + result = _matchesWords(word, target, wordIndex + 1, nextWordIndex, contiguous); + nextWordIndex++; + } + } + + 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(wordIndex) !== target.charCodeAt(targetIndex)) { + // Verify alternate characters before exiting + const altChars = getAlternateCodes(word.charCodeAt(wordIndex)); + if (!altChars) { return result; } - - return join({ start: j, end: j + 1 }, result); + for (let k = 0; k < altChars.length; k++) { + if (altChars[k] !== target.charCodeAt(targetIndex + k)) { + return result; + } + } } + + return join({ start: targetIndex, end: targetIndex + targetIndexOffset + 1 }, result); } function nextWord(word: string, start: number): number { diff --git a/src/vs/base/common/functional.ts b/src/vs/base/common/functional.ts index a70a748e08c..d580cf37f18 100644 --- a/src/vs/base/common/functional.ts +++ b/src/vs/base/common/functional.ts @@ -6,7 +6,7 @@ /** * Given a function, returns a function that is only calling that function once. */ -export function createSingleCallFunction(this: unknown, fn: T): T { +export function createSingleCallFunction(this: unknown, fn: T, fnDidRunCallback?: () => void): T { const _this = this; let didCall = false; let result: unknown; @@ -17,7 +17,15 @@ export function createSingleCallFunction(this: unknown, fn: } didCall = true; - result = fn.apply(_this, arguments); + if (fnDidRunCallback) { + try { + result = fn.apply(_this, arguments); + } finally { + fnDidRunCallback(); + } + } else { + result = fn.apply(_this, arguments); + } return result; } as unknown as T; diff --git a/src/vs/base/common/hotReload.ts b/src/vs/base/common/hotReload.ts index 3544ff2c514..194e60da372 100644 --- a/src/vs/base/common/hotReload.ts +++ b/src/vs/base/common/hotReload.ts @@ -7,7 +7,7 @@ import { IDisposable } from 'vs/base/common/lifecycle'; import { env } from 'vs/base/common/process'; export function isHotReloadEnabled(): boolean { - return !!env['VSCODE_DEV']; + return env && !!env['VSCODE_DEV']; } export function registerHotReloadHandler(handler: HotReloadHandler): IDisposable { if (!isHotReloadEnabled()) { diff --git a/src/vs/base/common/htmlContent.ts b/src/vs/base/common/htmlContent.ts index d16621579af..0b57e625295 100644 --- a/src/vs/base/common/htmlContent.ts +++ b/src/vs/base/common/htmlContent.ts @@ -71,11 +71,7 @@ export class MarkdownString implements IMarkdownString { } appendCodeblock(langId: string, code: string): MarkdownString { - this.value += '\n```'; - this.value += langId; - this.value += '\n'; - this.value += code; - this.value += '\n```\n'; + this.value += `\n${appendEscapedMarkdownCodeBlockFence(code, langId)}\n`; return this; } @@ -143,6 +139,24 @@ export function escapeMarkdownSyntaxTokens(text: string): string { return text.replace(/[\\`*_{}[\]()#+\-!~]/g, '\\$&'); // CodeQL [SM02383] Backslash is escaped in the character class } +/** + * @see https://github.com/microsoft/vscode/issues/193746 + */ +export function appendEscapedMarkdownCodeBlockFence(code: string, langId: string) { + const longestFenceLength = + code.match(/^`+/gm)?.reduce((a, b) => (a.length > b.length ? a : b)).length ?? + 0; + const desiredFenceLength = + longestFenceLength >= 3 ? longestFenceLength + 1 : 3; + + // the markdown result + return [ + `${'`'.repeat(desiredFenceLength)}${langId}`, + code, + `${'`'.repeat(desiredFenceLength)}`, + ].join('\n'); +} + export function escapeDoubleQuotes(input: string) { return input.replace(/"/g, '"'); } diff --git a/src/vs/base/common/iterator.ts b/src/vs/base/common/iterator.ts index c05887f9a70..0bbc2413bb5 100644 --- a/src/vs/base/common/iterator.ts +++ b/src/vs/base/common/iterator.ts @@ -84,9 +84,7 @@ export namespace Iterable { export function* concat(...iterables: Iterable[]): Iterable { for (const iterable of iterables) { - for (const element of iterable) { - yield element; - } + yield* iterable; } } @@ -142,4 +140,12 @@ export namespace Iterable { return [consumed, { [Symbol.iterator]() { return iterator; } }]; } + + export async function asyncToArray(iterable: AsyncIterable): Promise { + const result: T[] = []; + for await (const item of iterable) { + result.push(item); + } + return Promise.resolve(result); + } } diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts index 1229b7f59e8..992bdfdc995 100644 --- a/src/vs/base/common/labels.ts +++ b/src/vs/base/common/labels.ts @@ -436,15 +436,17 @@ export function unmnemonicLabel(label: string): string { } /** - * Splits a recent label in name and parent path, supporting both '/' and '\' and workspace suffixes + * Splits a recent label in name and parent path, supporting both '/' and '\' and workspace suffixes. + * If the location is remote, the remote name is included in the name part. */ -export function splitRecentLabel(recentLabel: string) { +export function splitRecentLabel(recentLabel: string): { name: string; parentPath: string } { if (recentLabel.endsWith(']')) { // label with workspace suffix const lastIndexOfSquareBracket = recentLabel.lastIndexOf(' [', recentLabel.length - 2); if (lastIndexOfSquareBracket !== -1) { const split = splitName(recentLabel.substring(0, lastIndexOfSquareBracket)); - return { name: split.name, parentPath: split.parentPath + recentLabel.substring(lastIndexOfSquareBracket) }; + const remoteNameWithSpace = recentLabel.substring(lastIndexOfSquareBracket); + return { name: split.name + remoteNameWithSpace, parentPath: split.parentPath }; } } return splitName(recentLabel); diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts index fedbb85a6cf..4e5aed3d277 100644 --- a/src/vs/base/common/lifecycle.ts +++ b/src/vs/base/common/lifecycle.ts @@ -556,6 +556,35 @@ export class MutableDisposable implements IDisposable { } } +/** + * Manages the lifecycle of a disposable value that may be changed like {@link MutableDisposable}, but the value must + * exist and cannot be undefined. + */ +export class MandatoryMutableDisposable implements IDisposable { + private _disposable = new MutableDisposable(); + private _isDisposed = false; + + constructor(initialValue: T) { + this._disposable.value = initialValue; + } + + get value(): T { + return this._disposable.value!; + } + + set value(value: T) { + if (this._isDisposed || value === this._disposable.value) { + return; + } + this._disposable.value = value; + } + + dispose() { + this._isDisposed = true; + this._disposable.dispose(); + } +} + export class RefCountedDisposable { private _counter: number = 1; @@ -752,6 +781,10 @@ export class DisposableMap implements ID return this._store.keys(); } + values(): IterableIterator { + return this._store.values(); + } + [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 9249bf9af0c..ce3c968fc3f 100644 --- a/src/vs/base/common/map.ts +++ b/src/vs/base/common/map.ts @@ -790,3 +790,27 @@ export class SetMap { return values; } } + +export function mapsStrictEqualIgnoreOrder(a: Map, b: Map): boolean { + if (a === b) { + return true; + } + + if (a.size !== b.size) { + return false; + } + + for (const [key, value] of a) { + if (!b.has(key) || b.get(key) !== value) { + return false; + } + } + + for (const [key] of b) { + if (!a.has(key)) { + return false; + } + } + + return true; +} diff --git a/src/vs/base/common/naturalLanguage/korean.ts b/src/vs/base/common/naturalLanguage/korean.ts new file mode 100644 index 00000000000..37d69eadca4 --- /dev/null +++ b/src/vs/base/common/naturalLanguage/korean.ts @@ -0,0 +1,423 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +// allow-any-unicode-comment-file + +/** + * Gets alternative Korean characters for the character code. This will return the ascii + * character code(s) that a Hangul character may have been input with using a qwerty layout. + * + * This only aims to cover modern (not archaic) Hangul syllables. + * + * @param code The character code to get alternate characters for + */ +export function getKoreanAltChars(code: number): ArrayLike | undefined { + const result = disassembleKorean(code); + if (result && result.length > 0) { + return new Uint32Array(result); + } + return undefined; +} + +let codeBufferLength = 0; +const codeBuffer = new Uint32Array(10); +function disassembleKorean(code: number): Uint32Array | undefined { + codeBufferLength = 0; + + // Initial consonants (초성) + getCodesFromArray(code, modernConsonants, HangulRangeStartCode.InitialConsonant); + if (codeBufferLength > 0) { + return codeBuffer.subarray(0, codeBufferLength); + } + + // Vowels (중성) + getCodesFromArray(code, modernVowels, HangulRangeStartCode.Vowel); + if (codeBufferLength > 0) { + return codeBuffer.subarray(0, codeBufferLength); + } + + // Final consonants (종성) + getCodesFromArray(code, modernFinalConsonants, HangulRangeStartCode.FinalConsonant); + if (codeBufferLength > 0) { + return codeBuffer.subarray(0, codeBufferLength); + } + + // Hangul Compatibility Jamo + getCodesFromArray(code, compatibilityJamo, HangulRangeStartCode.CompatibilityJamo); + if (codeBufferLength) { + return codeBuffer.subarray(0, codeBufferLength); + } + + // Hangul Syllables + if (code >= 0xAC00 && code <= 0xD7A3) { + const hangulIndex = code - 0xAC00; + const vowelAndFinalConsonantProduct = hangulIndex % 588; + + // 0-based starting at 0x1100 + const initialConsonantIndex = Math.floor(hangulIndex / 588); + // 0-based starting at 0x1161 + const vowelIndex = Math.floor(vowelAndFinalConsonantProduct / 28); + // 0-based starting at 0x11A8 + // Subtract 1 as the standard algorithm uses the 0 index to represent no + // final consonant + const finalConsonantIndex = vowelAndFinalConsonantProduct % 28 - 1; + + if (initialConsonantIndex < modernConsonants.length) { + getCodesFromArray(initialConsonantIndex, modernConsonants, 0); + } else if (HangulRangeStartCode.InitialConsonant + initialConsonantIndex - HangulRangeStartCode.CompatibilityJamo < compatibilityJamo.length) { + getCodesFromArray(HangulRangeStartCode.InitialConsonant + initialConsonantIndex, compatibilityJamo, HangulRangeStartCode.CompatibilityJamo); + } + + if (vowelIndex < modernVowels.length) { + getCodesFromArray(vowelIndex, modernVowels, 0); + } else if (HangulRangeStartCode.Vowel + vowelIndex - HangulRangeStartCode.CompatibilityJamo < compatibilityJamo.length) { + getCodesFromArray(HangulRangeStartCode.Vowel + vowelIndex - HangulRangeStartCode.CompatibilityJamo, compatibilityJamo, HangulRangeStartCode.CompatibilityJamo); + } + + if (finalConsonantIndex >= 0) { + if (finalConsonantIndex < modernFinalConsonants.length) { + getCodesFromArray(finalConsonantIndex, modernFinalConsonants, 0); + } else if (HangulRangeStartCode.FinalConsonant + finalConsonantIndex - HangulRangeStartCode.CompatibilityJamo < compatibilityJamo.length) { + getCodesFromArray(HangulRangeStartCode.FinalConsonant + finalConsonantIndex - HangulRangeStartCode.CompatibilityJamo, compatibilityJamo, HangulRangeStartCode.CompatibilityJamo); + } + } + + if (codeBufferLength > 0) { + return codeBuffer.subarray(0, codeBufferLength); + } + } + return undefined; +} + +function getCodesFromArray(code: number, array: ArrayLike, arrayStartIndex: number): void { + // Verify the code is within the array's range + if (code >= arrayStartIndex && code < arrayStartIndex + array.length) { + addCodesToBuffer(array[code - arrayStartIndex]); + } +} + +function addCodesToBuffer(codes: number): void { + // NUL is ignored, this is used for archaic characters to avoid using a Map + // for the data + if (codes === AsciiCode.NUL) { + return; + } + // Number stored in format: OptionalThirdCode << 16 | OptionalSecondCode << 8 | Code + codeBuffer[codeBufferLength++] = codes & 0xFF; + if (codes >> 8) { + codeBuffer[codeBufferLength++] = (codes >> 8) & 0xFF; + } + if (codes >> 16) { + codeBuffer[codeBufferLength++] = (codes >> 16) & 0xFF; + } +} + +const enum HangulRangeStartCode { + InitialConsonant = 0x1100, + Vowel = 0x1161, + FinalConsonant = 0x11A8, + CompatibilityJamo = 0x3131, +} + +const enum AsciiCode { + NUL = 0, + A = 65, + B = 66, + C = 67, + D = 68, + E = 69, + F = 70, + G = 71, + H = 72, + I = 73, + J = 74, + K = 75, + L = 76, + M = 77, + N = 78, + O = 79, + P = 80, + Q = 81, + R = 82, + S = 83, + T = 84, + U = 85, + V = 86, + W = 87, + X = 88, + Y = 89, + Z = 90, + a = 97, + b = 98, + c = 99, + d = 100, + e = 101, + f = 102, + g = 103, + h = 104, + i = 105, + j = 106, + k = 107, + l = 108, + m = 109, + n = 110, + o = 111, + p = 112, + q = 113, + r = 114, + s = 115, + t = 116, + u = 117, + v = 118, + w = 119, + x = 120, + y = 121, + z = 122, +} + +/** + * Numbers that represent multiple ascii codes. These are precomputed at compile time to reduce + * bundle and runtime overhead. + */ +const enum AsciiCodeCombo { + fa = AsciiCode.a << 8 | AsciiCode.f, + fg = AsciiCode.g << 8 | AsciiCode.f, + fq = AsciiCode.q << 8 | AsciiCode.f, + fr = AsciiCode.r << 8 | AsciiCode.f, + ft = AsciiCode.t << 8 | AsciiCode.f, + fv = AsciiCode.v << 8 | AsciiCode.f, + fx = AsciiCode.x << 8 | AsciiCode.f, + hk = AsciiCode.k << 8 | AsciiCode.h, + hl = AsciiCode.l << 8 | AsciiCode.h, + ho = AsciiCode.o << 8 | AsciiCode.h, + ml = AsciiCode.l << 8 | AsciiCode.m, + nj = AsciiCode.j << 8 | AsciiCode.n, + nl = AsciiCode.l << 8 | AsciiCode.n, + np = AsciiCode.p << 8 | AsciiCode.n, + qt = AsciiCode.t << 8 | AsciiCode.q, + rt = AsciiCode.t << 8 | AsciiCode.r, + sg = AsciiCode.g << 8 | AsciiCode.s, + sw = AsciiCode.w << 8 | AsciiCode.s, +} + +/** + * Hangul Jamo - Modern consonants #1 + * + * Range U+1100..U+1112 + * + * | | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | A | B | C | D | E | F | + * |--------|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---| + * | U+110x | ᄀ | ᄁ | ᄂ | ᄃ | ᄄ | ᄅ | ᄆ | ᄇ | ᄈ | ᄉ | ᄊ | ᄋ | ᄌ | ᄍ | ᄎ | ᄏ | + * | U+111x | ᄐ | ᄑ | ᄒ | + */ +const modernConsonants = new Uint8Array([ + AsciiCode.r, // ㄱ + AsciiCode.R, // ㄲ + AsciiCode.s, // ㄴ + AsciiCode.e, // ㄷ + AsciiCode.E, // ㄸ + AsciiCode.f, // ㄹ + AsciiCode.a, // ㅁ + AsciiCode.q, // ㅂ + AsciiCode.Q, // ㅃ + AsciiCode.t, // ㅅ + AsciiCode.T, // ㅆ + AsciiCode.d, // ㅇ + AsciiCode.w, // ㅈ + AsciiCode.W, // ㅉ + AsciiCode.c, // ㅊ + AsciiCode.z, // ㅋ + AsciiCode.x, // ㅌ + AsciiCode.v, // ㅍ + AsciiCode.g, // ㅎ +]); + +/** + * Hangul Jamo - Modern Vowels + * + * Range U+1161..U+1175 + * + * | | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | A | B | C | D | E | F | + * |--------|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---| + * | U+116x | | ᅡ | ᅢ | ᅣ | ᅤ | ᅥ | ᅦ | ᅧ | ᅨ | ᅩ | ᅪ | ᅫ | ᅬ | ᅭ | ᅮ | ᅯ | + * | U+117x | ᅰ | ᅱ | ᅲ | ᅳ | ᅴ | ᅵ | + */ +const modernVowels = new Uint16Array([ + AsciiCode.k, // -> ㅏ + AsciiCode.o, // -> ㅐ + AsciiCode.i, // -> ㅑ + AsciiCode.O, // -> ㅒ + AsciiCode.j, // -> ㅓ + AsciiCode.p, // -> ㅔ + AsciiCode.u, // -> ㅕ + AsciiCode.P, // -> ㅖ + AsciiCode.h, // -> ㅗ + AsciiCodeCombo.hk, // -> ㅘ + AsciiCodeCombo.ho, // -> ㅙ + AsciiCodeCombo.hl, // -> ㅚ + AsciiCode.y, // -> ㅛ + AsciiCode.n, // -> ㅜ + AsciiCodeCombo.nj, // -> ㅝ + AsciiCodeCombo.np, // -> ㅞ + AsciiCodeCombo.nl, // -> ㅟ + AsciiCode.b, // -> ㅠ + AsciiCode.m, // -> ㅡ + AsciiCodeCombo.ml, // -> ㅢ + AsciiCode.l, // -> ㅣ +]); + +/** + * Hangul Jamo - Modern Consonants #2 + * + * Range U+11A8..U+11C2 + * + * | | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | A | B | C | D | E | F | + * |--------|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---| + * | U+11Ax | | | | | | | | | ᆨ | ᆩ | ᆪ | ᆫ | ᆬ | ᆭ | ᆮ | ᆯ | + * | U+11Bx | ᆰ | ᆱ | ᆲ | ᆳ | ᆴ | ᆵ | ᆶ | ᆷ | ᆸ | ᆹ | ᆺ | ᆻ | ᆼ | ᆽ | ᆾ | ᆿ | + * | U+11Cx | ᇀ | ᇁ | ᇂ | + */ +const modernFinalConsonants = new Uint16Array([ + AsciiCode.r, // ㄱ + AsciiCode.R, // ㄲ + AsciiCodeCombo.rt, // ㄳ + AsciiCode.s, // ㄴ + AsciiCodeCombo.sw, // ㄵ + AsciiCodeCombo.sg, // ㄶ + AsciiCode.e, // ㄷ + AsciiCode.f, // ㄹ + AsciiCodeCombo.fr, // ㄺ + AsciiCodeCombo.fa, // ㄻ + AsciiCodeCombo.fq, // ㄼ + AsciiCodeCombo.ft, // ㄽ + AsciiCodeCombo.fx, // ㄾ + AsciiCodeCombo.fv, // ㄿ + AsciiCodeCombo.fg, // ㅀ + AsciiCode.a, // ㅁ + AsciiCode.q, // ㅂ + AsciiCodeCombo.qt, // ㅄ + AsciiCode.t, // ㅅ + AsciiCode.T, // ㅆ + AsciiCode.d, // ㅇ + AsciiCode.w, // ㅈ + AsciiCode.c, // ㅊ + AsciiCode.z, // ㅋ + AsciiCode.x, // ㅌ + AsciiCode.v, // ㅍ + AsciiCode.g, // ㅎ +]); + +/** + * Hangul Compatibility Jamo + * + * Range U+3131..U+318F + * + * This includes range includes archaic jamo which we don't consider, these are + * given the NUL character code in order to be ignored. + * + * | | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | A | B | C | D | E | F | + * |--------|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---| + * | U+313x | | ㄱ | ㄲ | ㄳ | ㄴ | ㄵ | ㄶ | ㄷ | ㄸ | ㄹ | ㄺ | ㄻ | ㄼ | ㄽ | ㄾ | ㄿ | + * | U+314x | ㅀ | ㅁ | ㅂ | ㅃ | ㅄ | ㅅ | ㅆ | ㅇ | ㅈ | ㅉ | ㅊ | ㅋ | ㅌ | ㅍ | ㅎ | ㅏ | + * | U+315x | ㅐ | ㅑ | ㅒ | ㅓ | ㅔ | ㅕ | ㅖ | ㅗ | ㅘ | ㅙ | ㅚ | ㅛ | ㅜ | ㅝ | ㅞ | ㅟ | + * | U+316x | ㅠ | ㅡ | ㅢ | ㅣ | HF | ㅥ | ㅦ | ㅧ | ㅨ | ㅩ | ㅪ | ㅫ | ㅬ | ㅭ | ㅮ | ㅯ | + * | U+317x | ㅰ | ㅱ | ㅲ | ㅳ | ㅴ | ㅵ | ㅶ | ㅷ | ㅸ | ㅹ | ㅺ | ㅻ | ㅼ | ㅽ | ㅾ | ㅿ | + * | U+318x | ㆀ | ㆁ | ㆂ | ㆃ | ㆄ | ㆅ | ㆆ | ㆇ | ㆈ | ㆉ | ㆊ | ㆋ | ㆌ | ㆍ | ㆎ | + */ +const compatibilityJamo = new Uint16Array([ + AsciiCode.r, // ㄱ + AsciiCode.R, // ㄲ + AsciiCodeCombo.rt, // ㄳ + AsciiCode.s, // ㄴ + AsciiCodeCombo.sw, // ㄵ + AsciiCodeCombo.sg, // ㄶ + AsciiCode.e, // ㄷ + AsciiCode.E, // ㄸ + AsciiCode.f, // ㄹ + AsciiCodeCombo.fr, // ㄺ + AsciiCodeCombo.fa, // ㄻ + AsciiCodeCombo.fq, // ㄼ + AsciiCodeCombo.ft, // ㄽ + AsciiCodeCombo.fx, // ㄾ + AsciiCodeCombo.fv, // ㄿ + AsciiCodeCombo.fg, // ㅀ + AsciiCode.a, // ㅁ + AsciiCode.q, // ㅂ + AsciiCode.Q, // ㅃ + AsciiCodeCombo.qt, // ㅄ + AsciiCode.t, // ㅅ + AsciiCode.T, // ㅆ + AsciiCode.d, // ㅇ + AsciiCode.w, // ㅈ + AsciiCode.W, // ㅉ + AsciiCode.c, // ㅊ + AsciiCode.z, // ㅋ + AsciiCode.x, // ㅌ + AsciiCode.v, // ㅍ + AsciiCode.g, // ㅎ + AsciiCode.k, // ㅏ + AsciiCode.o, // ㅐ + AsciiCode.i, // ㅑ + AsciiCode.O, // ㅒ + AsciiCode.j, // ㅓ + AsciiCode.p, // ㅔ + AsciiCode.u, // ㅕ + AsciiCode.P, // ㅖ + AsciiCode.h, // ㅗ + AsciiCodeCombo.hk, // ㅘ + AsciiCodeCombo.ho, // ㅙ + AsciiCodeCombo.hl, // ㅚ + AsciiCode.y, // ㅛ + AsciiCode.n, // ㅜ + AsciiCodeCombo.nj, // ㅝ + AsciiCodeCombo.np, // ㅞ + AsciiCodeCombo.nl, // ㅟ + AsciiCode.b, // ㅠ + AsciiCode.m, // ㅡ + AsciiCodeCombo.ml, // ㅢ + AsciiCode.l, // ㅣ + // HF: Hangul Filler (everything after this is archaic) + // ㅥ + // ㅦ + // ㅧ + // ㅨ + // ㅩ + // ㅪ + // ㅫ + // ㅬ + // ㅮ + // ㅯ + // ㅰ + // ㅱ + // ㅲ + // ㅳ + // ㅴ + // ㅵ + // ㅶ + // ㅷ + // ㅸ + // ㅹ + // ㅺ + // ㅻ + // ㅼ + // ㅽ + // ㅾ + // ㅿ + // ㆀ + // ㆁ + // ㆂ + // ㆃ + // ㆄ + // ㆅ + // ㆆ + // ㆇ + // ㆈ + // ㆉ + // ㆊ + // ㆋ + // ㆌ + // ㆍ + // ㆎ +]); diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts index ad4808472c6..00ad27c3d55 100644 --- a/src/vs/base/common/network.ts +++ b/src/vs/base/common/network.ts @@ -5,6 +5,7 @@ import * as errors from 'vs/base/common/errors'; import * as platform from 'vs/base/common/platform'; +import { equalsIgnoreCase, startsWithIgnoreCase } from 'vs/base/common/strings'; import { URI } from 'vs/base/common/uri'; export namespace Schemas { @@ -109,6 +110,18 @@ export namespace Schemas { export const vscodeSourceControl = 'vscode-scm'; } +export function matchesScheme(target: URI | string, scheme: string): boolean { + if (URI.isUri(target)) { + return equalsIgnoreCase(target.scheme, scheme); + } else { + return startsWithIgnoreCase(target, scheme + ':'); + } +} + +export function matchesSomeScheme(target: URI | string, ...schemes: string[]): boolean { + return schemes.some(scheme => matchesScheme(target, scheme)); +} + export const connectionTokenCookieName = 'vscode-tkn'; export const connectionTokenQueryName = 'tkn'; diff --git a/src/vs/base/common/paging.ts b/src/vs/base/common/paging.ts index 07599e730bc..c13957cc0d8 100644 --- a/src/vs/base/common/paging.ts +++ b/src/vs/base/common/paging.ts @@ -5,7 +5,7 @@ import { range } from 'vs/base/common/arrays'; import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation'; -import { canceled } from 'vs/base/common/errors'; +import { CancellationError } from 'vs/base/common/errors'; /** * A Pager is a stateless abstraction over a paged collection. @@ -91,7 +91,7 @@ export class PagedModel implements IPagedModel { resolve(index: number, cancellationToken: CancellationToken): Promise { if (cancellationToken.isCancellationRequested) { - return Promise.reject(canceled()); + return Promise.reject(new CancellationError()); } const pageIndex = Math.floor(index / this.pager.pageSize); @@ -154,12 +154,12 @@ export class DelayedPagedModel implements IPagedModel { resolve(index: number, cancellationToken: CancellationToken): Promise { return new Promise((c, e) => { if (cancellationToken.isCancellationRequested) { - return e(canceled()); + return e(new CancellationError()); } const timer = setTimeout(() => { if (cancellationToken.isCancellationRequested) { - return e(canceled()); + return e(new CancellationError()); } timeoutCancellation.dispose(); @@ -169,7 +169,7 @@ export class DelayedPagedModel implements IPagedModel { const timeoutCancellation = cancellationToken.onCancellationRequested(() => { clearTimeout(timer); timeoutCancellation.dispose(); - e(canceled()); + e(new CancellationError()); }); }); } diff --git a/src/vs/base/common/platform.ts b/src/vs/base/common/platform.ts index 5c52adbfcd5..3893fbc6fcd 100644 --- a/src/vs/base/common/platform.ts +++ b/src/vs/base/common/platform.ts @@ -75,31 +75,8 @@ interface INavigator { } declare const navigator: INavigator; -// Web environment -if (typeof navigator === 'object' && !isElectronRenderer) { - _userAgent = navigator.userAgent; - _isWindows = _userAgent.indexOf('Windows') >= 0; - _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; - - 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; - _platformLocale = navigator.language; -} - // Native environment -else if (typeof nodeProcess === 'object') { +if (typeof nodeProcess === 'object') { _isWindows = (nodeProcess.platform === 'win32'); _isMacintosh = (nodeProcess.platform === 'darwin'); _isLinux = (nodeProcess.platform === 'linux'); @@ -124,6 +101,29 @@ else if (typeof nodeProcess === 'object') { _isNative = true; } +// Web environment +else if (typeof navigator === 'object' && !isElectronRenderer) { + _userAgent = navigator.userAgent; + _isWindows = _userAgent.indexOf('Windows') >= 0; + _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; + + 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; + _platformLocale = navigator.language; +} + // Unknown environment else { console.error('Unable to resolve platform.'); @@ -289,3 +289,7 @@ export const isFirefox = !!(userAgent && userAgent.indexOf('Firefox') >= 0); export const isSafari = !!(!isChrome && (userAgent && userAgent.indexOf('Safari') >= 0)); export const isEdge = !!(userAgent && userAgent.indexOf('Edg/') >= 0); export const isAndroid = !!(userAgent && userAgent.indexOf('Android') >= 0); + +export function isBigSurOrNewer(osVersion: string): boolean { + return parseFloat(osVersion) >= 20; +} diff --git a/src/vs/base/common/prefixTree.ts b/src/vs/base/common/prefixTree.ts index 20ef79000e2..69ba2d82597 100644 --- a/src/vs/base/common/prefixTree.ts +++ b/src/vs/base/common/prefixTree.ts @@ -3,8 +3,18 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { Iterable } from 'vs/base/common/iterator'; + const unset = Symbol('unset'); +export interface IPrefixTreeNode { + /** Possible children of the node. */ + children?: ReadonlyMap>; + + /** The value if data exists for this node in the tree. Mutable. */ + value: T | undefined; +} + /** * A simple prefix tree implementation where a value is stored based on * well-defined prefix segments. @@ -17,14 +27,23 @@ export class WellDefinedPrefixTree { return this._size; } - /** Inserts a new value in the prefix tree. */ - insert(key: Iterable, value: V): void { - this.opNode(key, n => n.value = value); + /** Gets the top-level nodes of the tree */ + public get nodes(): Iterable> { + return this.root.children?.values() || Iterable.empty(); + } + + /** + * Inserts a new value in the prefix tree. + * @param onNode - called for each node as we descend to the insertion point, + * including the insertion point itself. + */ + insert(key: Iterable, value: V, onNode?: (n: IPrefixTreeNode) => void): void { + this.opNode(key, n => n._value = value, onNode); } /** Mutates a value in the prefix tree. */ mutate(key: Iterable, mutate: (value?: V) => V): void { - this.opNode(key, n => n.value = mutate(n.value === unset ? undefined : n.value)); + this.opNode(key, n => n._value = mutate(n._value === unset ? undefined : n._value)); } /** Deletes a node from the prefix tree, returning the value it contained. */ @@ -41,7 +60,7 @@ export class WellDefinedPrefixTree { i++; } - const value = path[i].node.value; + const value = path[i].node._value; if (value === unset) { return; // not actually a real node } @@ -50,7 +69,7 @@ export class WellDefinedPrefixTree { for (; i > 0; i--) { const parent = path[i - 1]; parent.node.children!.delete(path[i].part); - if (parent.node.children!.size > 0 || parent.node.value !== unset) { + if (parent.node.children!.size > 0 || parent.node._value !== unset) { break; } } @@ -70,7 +89,7 @@ export class WellDefinedPrefixTree { node = next; } - return node.value === unset ? undefined : node.value; + return node._value === unset ? undefined : node._value; } /** Gets whether the tree has the key, or a parent of the key, already inserted. */ @@ -81,7 +100,7 @@ export class WellDefinedPrefixTree { if (!next) { return false; } - if (next.value !== unset) { + if (next._value !== unset) { return true; } @@ -118,10 +137,10 @@ export class WellDefinedPrefixTree { node = next; } - return node.value !== unset; + return node._value !== unset; } - private opNode(key: Iterable, fn: (node: Node) => void): void { + private opNode(key: Iterable, fn: (node: Node) => void, onDescend?: (node: Node) => void): void { let node = this.root; for (const part of key) { if (!node.children) { @@ -135,9 +154,10 @@ export class WellDefinedPrefixTree { } else { node = node.children.get(part)!; } + onDescend?.(node); } - if (node.value === unset) { + if (node._value === unset) { this._size++; } @@ -149,8 +169,8 @@ export class WellDefinedPrefixTree { const stack = [this.root]; while (stack.length > 0) { const node = stack.pop()!; - if (node.value !== unset) { - yield node.value; + if (node._value !== unset) { + yield node._value; } if (node.children) { @@ -162,7 +182,16 @@ export class WellDefinedPrefixTree { } } -class Node { +class Node implements IPrefixTreeNode { public children?: Map>; - public value: T | typeof unset = unset; + + public get value() { + return this._value === unset ? undefined : this._value; + } + + public set value(value: T | undefined) { + this._value = value === undefined ? unset : value; + } + + public _value: T | typeof unset = unset; } diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts index 61a1623d76d..cbd573fdc72 100644 --- a/src/vs/base/common/product.ts +++ b/src/vs/base/common/product.ts @@ -40,7 +40,7 @@ export type ConfigurationSyncStore = { url: string; insidersUrl: string; stableUrl: string; - canSwitch: boolean; + canSwitch?: boolean; authenticationProviders: IStringDictionary<{ scopes: string[] }>; }; @@ -203,7 +203,7 @@ export interface IExtensionRecommendations { } export interface ISettingsEditorOpenCondition { - readonly prerelease: boolean | string; + readonly prerelease?: boolean | string; } export interface IExtensionRecommendationCondition { @@ -226,8 +226,11 @@ export type IFileContentCondition = (IFileLanguageCondition | IFilePathCondition export interface IAppCenterConfiguration { readonly 'win32-x64': string; + readonly 'win32-arm64': string; readonly 'linux-x64': string; readonly 'darwin': string; + readonly 'darwin-universal': string; + readonly 'darwin-arm64': string; } export interface IConfigBasedExtensionTip { diff --git a/src/vs/base/common/strings.ts b/src/vs/base/common/strings.ts index 7e354e3bce5..230e6eb7bdd 100644 --- a/src/vs/base/common/strings.ts +++ b/src/vs/base/common/strings.ts @@ -48,6 +48,25 @@ export function format2(template: string, values: Record): stri return template.replace(_format2Regexp, (match, group) => (values[group] ?? match) as string); } +/** + * Encodes the given value so that it can be used as literal value in html attributes. + * + * In other words, computes `$val`, such that `attr` in `
` has the runtime value `value`. + * This prevents XSS injection. + */ +export function htmlAttributeEncodeValue(value: string): string { + return value.replace(/[<>"'&]/g, ch => { + switch (ch) { + case '<': return '<'; + case '>': return '>'; + case '"': return '"'; + case '\'': return '''; + case '&': return '&'; + } + return ch; + }); +} + /** * Converts HTML characters inside the string to use entities instead. Makes the string safe from * being used e.g. in HTMLElement.innerHTML. @@ -92,6 +111,17 @@ export function truncate(value: string, maxLength: number, suffix = '…'): stri return `${value.substr(0, maxLength)}${suffix}`; } +export function truncateMiddle(value: string, maxLength: number, suffix = '…'): string { + if (value.length <= maxLength) { + return value; + } + + const prefixLength = Math.ceil(maxLength / 2) - suffix.length / 2; + const suffixLength = Math.floor(maxLength / 2) - suffix.length / 2; + + return `${value.substr(0, prefixLength)}${suffix}${value.substr(value.length - suffixLength)}`; +} + /** * Removes all occurrences of needle from the beginning and end of haystack. * @param haystack string to trim @@ -699,16 +729,19 @@ export function isEmojiImprecise(x: number): boolean { /** * Given a string and a max length returns a shorted version. Shorting * happens at favorable positions - such as whitespace or punctuation characters. + * The return value can be longer than the given value of `n`. Leading whitespace is always trimmed. */ -export function lcut(text: string, n: number) { - if (text.length < n) { - return text; +export function lcut(text: string, n: number, prefix = '') { + const trimmed = text.trimStart(); + + if (trimmed.length < n) { + return trimmed; } const re = /\b/g; let i = 0; - while (re.test(text)) { - if (text.length - re.lastIndex < n) { + while (re.test(trimmed)) { + if (trimmed.length - re.lastIndex < n) { break; } @@ -716,7 +749,11 @@ export function lcut(text: string, n: number) { re.lastIndex += 1; } - return text.substring(i).replace(/^\s/, ''); + if (i === 0) { + return trimmed; + } + + return prefix + trimmed.substring(i).trimStart(); } // Escape codes, compiled from https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h3-Functions-using-CSI-_-ordered-by-the-final-character_s_ diff --git a/src/vs/base/common/tfIdf.ts b/src/vs/base/common/tfIdf.ts index 993f41b5a78..45042759613 100644 --- a/src/vs/base/common/tfIdf.ts +++ b/src/vs/base/common/tfIdf.ts @@ -88,8 +88,7 @@ export class TfIdfCalculator { for (const [word] of input.matchAll(/\b\p{Letter}[\p{Letter}\d]{2,}\b/gu)) { yield normalize(word); - // eslint-disable-next-line local/code-no-look-behind-regex - const camelParts = word.split(/(?<=[a-z])(?=[A-Z])/g); + const camelParts = word.replace(/([a-z])([A-Z])/g, '$1 $2').split(/\s+/g); if (camelParts.length > 1) { for (const part of camelParts) { // Require at least 3 letters in the parts of a camel case word diff --git a/src/vs/base/node/crypto.ts b/src/vs/base/node/crypto.ts index 7631aac0524..910d492e8ff 100644 --- a/src/vs/base/node/crypto.ts +++ b/src/vs/base/node/crypto.ts @@ -7,10 +7,10 @@ import * as crypto from 'crypto'; import * as fs from 'fs'; import { createSingleCallFunction } from 'vs/base/common/functional'; -export async function checksum(path: string, sha1hash: string | undefined): Promise { +export async function checksum(path: string, sha256hash: string | undefined): Promise { const checksumPromise = new Promise((resolve, reject) => { const input = fs.createReadStream(path); - const hash = crypto.createHash('sha1'); + const hash = crypto.createHash('sha256'); input.pipe(hash); const done = createSingleCallFunction((err?: Error, result?: string) => { @@ -32,7 +32,7 @@ export async function checksum(path: string, sha1hash: string | undefined): Prom const hash = await checksumPromise; - if (hash !== sha1hash) { + if (hash !== sha256hash) { throw new Error('Hash mismatch'); } } diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts index 9e409829cae..e41bcab40bb 100644 --- a/src/vs/base/node/pfs.ts +++ b/src/vs/base/node/pfs.ts @@ -608,7 +608,6 @@ async function doCopy(source: string, target: string, payload: ICopyPayload): Pr return await doCopySymlink(source, target, payload); } catch (error) { // in any case of an error fallback to normal copy via dereferencing - console.warn('[node.js fs] copy of symlink failed: ', error); } } diff --git a/src/vs/base/node/zip.ts b/src/vs/base/node/zip.ts index cc4c65a625f..3cb7bc9795b 100644 --- a/src/vs/base/node/zip.ts +++ b/src/vs/base/node/zip.ts @@ -11,8 +11,7 @@ import * as path from 'vs/base/common/path'; import { assertIsDefined } from 'vs/base/common/types'; import { Promises } from 'vs/base/node/pfs'; import * as nls from 'vs/nls'; -import { Entry, open as _openZip, ZipFile } from 'yauzl'; -import * as yazl from 'yazl'; +import type { Entry, ZipFile } from 'yauzl'; export const CorruptZipMessage: string = 'end of central directory record signature not found'; const CORRUPT_ZIP_PATTERN = new RegExp(CorruptZipMessage); @@ -161,9 +160,11 @@ function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions, tok }).finally(() => listener.dispose()); } -function openZip(zipFile: string, lazy: boolean = false): Promise { +async function openZip(zipFile: string, lazy: boolean = false): Promise { + const { open } = await import('yauzl'); + return new Promise((resolve, reject) => { - _openZip(zipFile, lazy ? { lazyEntries: true } : undefined!, (error?: Error, zipfile?: ZipFile) => { + open(zipFile, lazy ? { lazyEntries: true } : undefined!, (error?: Error, zipfile?: ZipFile) => { if (error) { reject(toExtractError(error)); } else { @@ -191,9 +192,11 @@ export interface IFile { localPath?: string; } -export function zip(zipPath: string, files: IFile[]): Promise { +export async function zip(zipPath: string, files: IFile[]): Promise { + const { ZipFile } = await import('yazl'); + return new Promise((c, e) => { - const zip = new yazl.ZipFile(); + const zip = new ZipFile(); files.forEach(f => { if (f.contents) { zip.addBuffer(typeof f.contents === 'string' ? Buffer.from(f.contents, 'utf8') : f.contents, f.path); diff --git a/src/vs/base/parts/ipc/common/ipc.mp.ts b/src/vs/base/parts/ipc/common/ipc.mp.ts index 14b7e210e8e..9abf1d9b3e9 100644 --- a/src/vs/base/parts/ipc/common/ipc.mp.ts +++ b/src/vs/base/parts/ipc/common/ipc.mp.ts @@ -41,7 +41,12 @@ export interface MessagePort { */ export class Protocol implements IMessagePassingProtocol { - readonly onMessage = Event.fromDOMEventEmitter(this.port, 'message', (e: MessageEvent) => VSBuffer.wrap(e.data)); + readonly onMessage = Event.fromDOMEventEmitter(this.port, 'message', (e: MessageEvent) => { + if (e.data) { + return VSBuffer.wrap(e.data); + } + return VSBuffer.alloc(0); + }); constructor(private port: MessagePort) { diff --git a/src/vs/base/parts/ipc/electron-sandbox/ipc.electron.ts b/src/vs/base/parts/ipc/electron-sandbox/ipc.electron.ts index a394bf8a874..9b95f2b4c63 100644 --- a/src/vs/base/parts/ipc/electron-sandbox/ipc.electron.ts +++ b/src/vs/base/parts/ipc/electron-sandbox/ipc.electron.ts @@ -34,5 +34,6 @@ export class Client extends IPCClient implements IDisposable { override dispose(): void { this.protocol.disconnect(); + super.dispose(); } } diff --git a/src/vs/base/parts/ipc/node/ipc.mp.ts b/src/vs/base/parts/ipc/node/ipc.mp.ts index b1648d260d6..73fdfe1edc1 100644 --- a/src/vs/base/parts/ipc/node/ipc.mp.ts +++ b/src/vs/base/parts/ipc/node/ipc.mp.ts @@ -16,7 +16,12 @@ import { firstOrDefault } from 'vs/base/common/arrays'; */ class Protocol implements IMessagePassingProtocol { - readonly onMessage = Event.fromNodeEventEmitter(this.port, 'message', (e: MessageEvent) => VSBuffer.wrap(e.data)); + readonly onMessage = Event.fromNodeEventEmitter(this.port, 'message', (e: MessageEvent) => { + if (e.data) { + return VSBuffer.wrap(e.data); + } + return VSBuffer.alloc(0); + }); constructor(private port: MessagePortMain) { diff --git a/src/vs/base/parts/ipc/node/ipc.net.ts b/src/vs/base/parts/ipc/node/ipc.net.ts index e47b6c70b23..7d57ca6cb47 100644 --- a/src/vs/base/parts/ipc/node/ipc.net.ts +++ b/src/vs/base/parts/ipc/node/ipc.net.ts @@ -785,11 +785,12 @@ export function createRandomIPCHandle(): string { } export function createStaticIPCHandle(directoryPath: string, type: string, version: string): string { - const scope = createHash('md5').update(directoryPath).digest('hex'); + const scope = createHash('sha256').update(directoryPath).digest('hex'); + const scopeForSocket = scope.substr(0, 8); // Windows: use named pipe if (process.platform === 'win32') { - return `\\\\.\\pipe\\${scope}-${version}-${type}-sock`; + return `\\\\.\\pipe\\${scopeForSocket}-${version}-${type}-sock`; } // Mac & Unix: Use socket file @@ -799,7 +800,6 @@ export function createStaticIPCHandle(directoryPath: string, type: string, versi const versionForSocket = version.substr(0, 4); const typeForSocket = type.substr(0, 6); - const scopeForSocket = scope.substr(0, 8); let result: string; if (process.platform !== 'darwin' && XDG_RUNTIME_DIR && !process.env['VSCODE_PORTABLE']) { diff --git a/src/vs/base/parts/ipc/test/node/ipc.net.test.ts b/src/vs/base/parts/ipc/test/node/ipc.net.test.ts index 8255c780ccf..0e018300cea 100644 --- a/src/vs/base/parts/ipc/test/node/ipc.net.test.ts +++ b/src/vs/base/parts/ipc/test/node/ipc.net.test.ts @@ -571,6 +571,8 @@ flakySuite('IPC, create handle', () => { suite('WebSocketNodeSocket', () => { + const ds = ensureNoDisposablesAreLeakedInTestSuite(); + function toUint8Array(data: number[]): Uint8Array { const result = new Uint8Array(data.length); for (let i = 0; i < data.length; i++) { @@ -724,15 +726,15 @@ suite('WebSocketNodeSocket', () => { server.close(); const webSocketNodeSocket = new WebSocketNodeSocket(new NodeSocket(socket), true, null, false); - webSocketNodeSocket.onData((data) => { + ds.add(webSocketNodeSocket.onData((data) => { receivingSideOnDataCallCount++; receivingSideTotalBytes += data.byteLength; - }); + })); - webSocketNodeSocket.onClose(() => { + ds.add(webSocketNodeSocket.onClose(() => { webSocketNodeSocket.dispose(); receivingSideSocketClosedBarrier.open(); - }); + })); }); const socket = connect({ diff --git a/src/vs/base/test/browser/dom.test.ts b/src/vs/base/test/browser/dom.test.ts index 4af44d2f442..601f75d3523 100644 --- a/src/vs/base/test/browser/dom.test.ts +++ b/src/vs/base/test/browser/dom.test.ts @@ -4,10 +4,11 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import { $, asCssValueWithDefault, h, multibyteAwareBtoa, trackAttributes, copyAttributes, disposableWindowInterval } from 'vs/base/browser/dom'; -import { mainWindow } from 'vs/base/browser/window'; +import { $, asCssValueWithDefault, h, multibyteAwareBtoa, trackAttributes, copyAttributes, disposableWindowInterval, getWindows, getWindowsCount, getWindowId, getWindowById, hasWindow, getWindow, getDocument } from 'vs/base/browser/dom'; +import { ensureCodeWindow, isAuxiliaryWindow, mainWindow } from 'vs/base/browser/window'; import { DeferredPromise, timeout } from 'vs/base/common/async'; import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; suite('dom', () => { test('hasClass', () => { @@ -338,6 +339,27 @@ suite('dom', () => { }); }); + test('window utilities', () => { + const windows = Array.from(getWindows()); + assert.strictEqual(windows.length, 1); + assert.strictEqual(getWindowsCount(), 1); + const windowId = getWindowId(mainWindow); + assert.ok(typeof windowId === 'number'); + assert.strictEqual(getWindowById(windowId)?.window, mainWindow); + assert.strictEqual(hasWindow(windowId), true); + assert.strictEqual(isAuxiliaryWindow(mainWindow), false); + ensureCodeWindow(mainWindow, 1); + assert.ok(typeof mainWindow.vscodeWindowId === 'number'); + + const div = document.createElement('div'); + assert.strictEqual(getWindow(div), mainWindow); + assert.strictEqual(getDocument(div), mainWindow.document); + + const event = document.createEvent('MouseEvent'); + assert.strictEqual(getWindow(event), mainWindow); + assert.strictEqual(getDocument(event), mainWindow.document); + }); + suite('disposableWindowInterval', () => { test('basics', async () => { let count = 0; @@ -383,4 +405,6 @@ suite('dom', () => { assert.strictEqual(count, 0); }); }); + + ensureNoDisposablesAreLeakedInTestSuite(); }); diff --git a/src/vs/base/test/browser/formattedTextRenderer.test.ts b/src/vs/base/test/browser/formattedTextRenderer.test.ts index f5bcc1b2d5d..12acef6e7b8 100644 --- a/src/vs/base/test/browser/formattedTextRenderer.test.ts +++ b/src/vs/base/test/browser/formattedTextRenderer.test.ts @@ -6,6 +6,7 @@ import * as assert from 'assert'; import { renderFormattedText, renderText } from 'vs/base/browser/formattedTextRenderer'; import { DisposableStore } from 'vs/base/common/lifecycle'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; suite('FormattedTextRenderer', () => { const store = new DisposableStore(); @@ -127,4 +128,6 @@ suite('FormattedTextRenderer', () => { assert.strictEqual(result.children.length, 0); assert.strictEqual(result.innerHTML, '**bold**'); }); + + ensureNoDisposablesAreLeakedInTestSuite(); }); diff --git a/src/vs/base/test/browser/iconLabels.test.ts b/src/vs/base/test/browser/iconLabels.test.ts index 292ec6b0bf8..c076d4ec38e 100644 --- a/src/vs/base/test/browser/iconLabels.test.ts +++ b/src/vs/base/test/browser/iconLabels.test.ts @@ -5,6 +5,7 @@ import * as assert from 'assert'; import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; suite('renderLabelWithIcons', () => { @@ -49,4 +50,6 @@ suite('renderLabelWithIcons', () => { .map(elem => elem instanceof HTMLElement ? elem.outerHTML : elem) .reduce((a, b) => a + b, ''); }; + + ensureNoDisposablesAreLeakedInTestSuite(); }); diff --git a/src/vs/base/test/browser/markdownRenderer.test.ts b/src/vs/base/test/browser/markdownRenderer.test.ts index 1da026b5174..a394e18e001 100644 --- a/src/vs/base/test/browser/markdownRenderer.test.ts +++ b/src/vs/base/test/browser/markdownRenderer.test.ts @@ -166,7 +166,7 @@ suite('MarkdownRenderer', () => { mds.appendMarkdown(`[$(zap)-link](#link)`); const result: HTMLElement = store.add(renderMarkdown(mds)).element; - assert.strictEqual(result.innerHTML, `

-link

`); + assert.strictEqual(result.innerHTML, `

-link

`); }); test('render icon in table', () => { @@ -186,7 +186,7 @@ suite('MarkdownRenderer', () => { --link +-link `); @@ -253,7 +253,7 @@ suite('MarkdownRenderer', () => { }); const result: HTMLElement = store.add(renderMarkdown(md)).element; - assert.strictEqual(result.innerHTML, `

command1 command2

`); + assert.strictEqual(result.innerHTML, `

command1 command2

`); }); suite('PlaintextMarkdownRender', () => { diff --git a/src/vs/base/test/browser/ui/contextview/contextview.test.ts b/src/vs/base/test/browser/ui/contextview/contextview.test.ts index 4b49df18555..c302c358937 100644 --- a/src/vs/base/test/browser/ui/contextview/contextview.test.ts +++ b/src/vs/base/test/browser/ui/contextview/contextview.test.ts @@ -5,6 +5,7 @@ import * as assert from 'assert'; import { layout, LayoutAnchorPosition } from 'vs/base/browser/ui/contextview/contextview'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; suite('Contextview', function () { @@ -25,4 +26,6 @@ suite('Contextview', function () { assert.strictEqual(layout(200, 20, { offset: 50, size: 50, position: LayoutAnchorPosition.After }), 30); assert.strictEqual(layout(200, 20, { offset: 150, size: 50, position: LayoutAnchorPosition.After }), 130); }); + + ensureNoDisposablesAreLeakedInTestSuite(); }); diff --git a/src/vs/base/test/browser/ui/list/rangeMap.test.ts b/src/vs/base/test/browser/ui/list/rangeMap.test.ts index 0171250324b..5b3b4a6c65f 100644 --- a/src/vs/base/test/browser/ui/list/rangeMap.test.ts +++ b/src/vs/base/test/browser/ui/list/rangeMap.test.ts @@ -361,6 +361,8 @@ suite('RangeMap', () => { suite('RangeMap with top padding', () => { + ensureNoDisposablesAreLeakedInTestSuite(); + test('empty', () => { const rangeMap = new RangeMap(10); assert.strictEqual(rangeMap.size, 10); 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 9a552a91b83..24640e6cf65 100644 --- a/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts +++ b/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts @@ -5,8 +5,10 @@ import * as assert from 'assert'; import { IIdentityProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list/list'; -import { AsyncDataTree } from 'vs/base/browser/ui/tree/asyncDataTree'; -import { IAsyncDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree'; +import { AsyncDataTree, CompressibleAsyncDataTree, ITreeCompressionDelegate } from 'vs/base/browser/ui/tree/asyncDataTree'; +import { ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel'; +import { ICompressibleTreeRenderer } from 'vs/base/browser/ui/tree/objectTree'; +import { IAsyncDataSource, ITreeNode } from 'vs/base/browser/ui/tree/tree'; import { timeout } from 'vs/base/common/async'; import { Iterable } from 'vs/base/common/iterator'; import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; @@ -37,7 +39,7 @@ function find(element: Element, id: string): Element | undefined { return undefined; } -class Renderer implements ITreeRenderer { +class Renderer implements ICompressibleTreeRenderer { readonly templateId = 'default'; renderTemplate(container: HTMLElement): HTMLElement { return container; @@ -48,6 +50,15 @@ class Renderer implements ITreeRenderer { disposeTemplate(templateData: HTMLElement): void { // noop } + renderCompressedElements(node: ITreeNode, void>, index: number, templateData: HTMLElement, height: number | undefined): void { + const result: string[] = []; + + for (const element of node.element.elements) { + result.push(element.id + (element.suffix || '')); + } + + templateData.textContent = result.join('/'); + } } class IdentityProvider implements IIdentityProvider { @@ -440,6 +451,31 @@ suite('AsyncDataTree', function () { assert.deepStrictEqual(Array.from(container.querySelectorAll('.monaco-list-row')).map(e => e.textContent), ['a', 'b2']); }); + test('issue #199264 - dispose during render', async () => { + const container = document.createElement('div'); + const model1 = new Model({ + id: 'root', + children: [{ + id: 'a', children: [{ id: 'aa' }, { id: 'ab' }, { id: 'ac' }] + }] + }); + const model2 = new Model({ + id: 'root', + children: [{ + id: 'a', children: [{ id: 'aa' }, { id: 'ab' }, { id: 'ac' }] + }] + }); + + const tree = store.add(new AsyncDataTree('test', container, new VirtualDelegate(), [new Renderer()], new DataSource(), { identityProvider: new IdentityProvider() })); + tree.layout(200); + + await tree.setInput(model1.root); + const input = tree.setInput(model2.root); + tree.dispose(); + await input; + assert.strictEqual(container.innerHTML, ''); + }); + test('issue #121567', async () => { const container = document.createElement('div'); @@ -495,4 +531,49 @@ suite('AsyncDataTree', function () { assert(tree.isCollapsible(a), 'a is still collapsible'); assert(!tree.isCollapsed(a), 'a is expanded'); }); + + test('issue #199441', async () => { + const container = document.createElement('div'); + + const dataSource = new class implements IAsyncDataSource { + hasChildren(element: Element): boolean { + return !!element.children && element.children.length > 0; + } + async getChildren(element: Element) { + return element.children ?? Iterable.empty(); + } + }; + + const compressionDelegate = new class implements ITreeCompressionDelegate { + isIncompressible(element: Element): boolean { + return !dataSource.hasChildren(element); + } + }; + + const model = new Model({ + id: 'root', + children: [{ + id: 'a', children: [{ + id: 'b', + children: [{ id: 'b.txt' }] + }] + }] + }); + + const collapseByDefault = (element: Element) => false; + + const tree = store.add(new CompressibleAsyncDataTree('test', container, new VirtualDelegate(), compressionDelegate, [new Renderer()], dataSource, { identityProvider: new IdentityProvider(), collapseByDefault })); + tree.layout(200); + + await tree.setInput(model.root); + assert.deepStrictEqual(Array.from(container.querySelectorAll('.monaco-list-row')).map(e => e.textContent), ['a/b', 'b.txt']); + + model.get('a').children!.push({ + id: 'c', + children: [{ id: 'c.txt' }] + }); + + await tree.updateChildren(model.root, true); + assert.deepStrictEqual(Array.from(container.querySelectorAll('.monaco-list-row')).map(e => e.textContent), ['a', 'b', 'b.txt', 'c', 'c.txt']); + }); }); 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 008da2a3ea0..5657e458849 100644 --- a/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts +++ b/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts @@ -313,36 +313,6 @@ suite('IndexTreeModel', () => { assert.deepStrictEqual(list[2].depth, 1); })); - test('updates collapsible', () => withSmartSplice(options => { - const list: ITreeNode[] = []; - const model = new IndexTreeModel('test', toList(list), -1); - - model.splice([0], 0, [ - { - element: 0, children: [ - { element: 1 }, - ] - }, - ], options); - - assert.strictEqual(list[0].collapsible, true); - assert.strictEqual(list[1].collapsible, false); - - model.splice([0, 0], 1, [], options); - { - const [first, second] = list; - assert.strictEqual(first.collapsible, false); - assert.strictEqual(second, undefined); - } - - model.splice([0, 0], 0, [{ element: 1 }], options); - { - const [first, second] = list; - assert.strictEqual(first.collapsible, true); - assert.strictEqual(second.collapsible, false); - } - })); - test('expand', () => withSmartSplice(options => { const list: ITreeNode[] = []; const model = new IndexTreeModel('test', toList(list), -1); diff --git a/src/vs/base/test/browser/ui/tree/objectTree.test.ts b/src/vs/base/test/browser/ui/tree/objectTree.test.ts index a3e39846a5b..05594bf561a 100644 --- a/src/vs/base/test/browser/ui/tree/objectTree.test.ts +++ b/src/vs/base/test/browser/ui/tree/objectTree.test.ts @@ -250,12 +250,14 @@ suite('CompressibleObjectTree', function () { disposeTemplate(): void { } } + const ds = ensureNoDisposablesAreLeakedInTestSuite(); + test('empty', function () { const container = document.createElement('div'); container.style.width = '200px'; container.style.height = '200px'; - const tree = new CompressibleObjectTree('test', container, new Delegate(), [new Renderer()]); + const tree = ds.add(new CompressibleObjectTree('test', container, new Delegate(), [new Renderer()])); tree.layout(200); assert.strictEqual(getRowsTextContent(container).length, 0); @@ -266,7 +268,7 @@ suite('CompressibleObjectTree', function () { container.style.width = '200px'; container.style.height = '200px'; - const tree = new CompressibleObjectTree('test', container, new Delegate(), [new Renderer()]); + const tree = ds.add(new CompressibleObjectTree('test', container, new Delegate(), [new Renderer()])); tree.layout(200); tree.setChildren(null, [ @@ -289,7 +291,7 @@ suite('CompressibleObjectTree', function () { container.style.width = '200px'; container.style.height = '200px'; - const tree = new CompressibleObjectTree('test', container, new Delegate(), [new Renderer()]); + const tree = ds.add(new CompressibleObjectTree('test', container, new Delegate(), [new Renderer()])); tree.layout(200); tree.setChildren(null, [ @@ -341,7 +343,7 @@ suite('CompressibleObjectTree', function () { container.style.width = '200px'; container.style.height = '200px'; - const tree = new CompressibleObjectTree('test', container, new Delegate(), [new Renderer()]); + const tree = ds.add(new CompressibleObjectTree('test', container, new Delegate(), [new Renderer()])); tree.layout(200); tree.setChildren(null, [ diff --git a/src/vs/base/test/common/assert.test.ts b/src/vs/base/test/common/assert.test.ts index a925cd0437a..ed4e60e8222 100644 --- a/src/vs/base/test/common/assert.test.ts +++ b/src/vs/base/test/common/assert.test.ts @@ -5,6 +5,7 @@ import * as assert from 'assert'; import { ok } from 'vs/base/common/assert'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; suite('Assert', () => { test('ok', () => { @@ -31,4 +32,6 @@ suite('Assert', () => { ok({}); ok(5); }); + + ensureNoDisposablesAreLeakedInTestSuite(); }); diff --git a/src/vs/base/test/common/assertHeap.ts b/src/vs/base/test/common/assertHeap.ts new file mode 100644 index 00000000000..c77bae321ec --- /dev/null +++ b/src/vs/base/test/common/assertHeap.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. + *--------------------------------------------------------------------------------------------*/ + + +declare const __analyzeSnapshotInTests: (currentTest: string, classes: readonly string[]) => Promise<({ done: Promise; file: string })>; + +let currentTest: Mocha.Test | undefined; + +const snapshotsToAssert: ({ counts: Promise; file: string; test: string; opts: ISnapshotAssertOptions })[] = []; + +setup(function () { + currentTest = this.currentTest; +}); + +suiteTeardown(async () => { + await Promise.all(snapshotsToAssert.map(async snap => { + const counts = await snap.counts; + + const asserts = Object.entries(snap.opts.classes); + if (asserts.length !== counts.length) { + throw new Error(`expected class counts to equal assertions length for ${snap.test}`); + } + + for (const [i, [name, doAssert]] of asserts.entries()) { + try { + doAssert(counts[i]); + } catch (e) { + throw new Error(`Unexpected number of ${name} instances (${counts[i]}) after "${snap.test}":\n\n${e.message}\n\nSnapshot saved at: ${snap.file}`); + } + } + })); + + snapshotsToAssert.length = 0; +}); + +export interface ISnapshotAssertOptions { + classes: Record void>; +} + +const snapshotMinTime = 20_000; + +/** + * Takes a heap snapshot, and asserts the state of classes in memory. This + * works in Node and the Electron sandbox, but is a no-op in the browser. + * Snapshots are process asynchronously and will report failures at the end of + * the suite. + * + * This method should be used sparingly (e.g. once at the end of a suite to + * ensure nothing leaked before), as gathering a heap snapshot is fairly + * slow, at least until V8 11.5.130 (https://v8.dev/blog/speeding-up-v8-heap-snapshots). + * + * Takes options containing a mapping of class names, and assertion functions + * to run on the number of retained instances of that class. For example: + * + * ```ts + * assertSnapshot({ + * classes: { + * ShouldNeverLeak: count => assert.strictEqual(count, 0), + * SomeSingleton: count => assert(count <= 1), + * } + *}); + * ``` + */ +export async function assertHeap(opts: ISnapshotAssertOptions) { + if (!currentTest) { + throw new Error('assertSnapshot can only be used when a test is running'); + } + + // snapshotting can take a moment, ensure the test timeout is decently long + // so it doesn't immediately fail. + if (currentTest.timeout() < snapshotMinTime) { + currentTest.timeout(snapshotMinTime); + } + + if (typeof __analyzeSnapshotInTests === 'undefined') { + return; // running in browser, no-op + } + + const { done, file } = await __analyzeSnapshotInTests(currentTest.fullTitle(), Object.keys(opts.classes)); + snapshotsToAssert.push({ counts: done, file, test: currentTest.fullTitle(), opts }); +} + diff --git a/src/vs/base/test/common/async.test.ts b/src/vs/base/test/common/async.test.ts index bd6ec6a4bcc..69f1ab5f56f 100644 --- a/src/vs/base/test/common/async.test.ts +++ b/src/vs/base/test/common/async.test.ts @@ -93,6 +93,27 @@ suite('Async', () => { return promise.then(() => assert.deepStrictEqual(order, ['in callback', 'afterCreate', 'cancelled', 'afterCancel', 'finally'])); }); + test('execution order (async with late listener)', async function () { + const order: string[] = []; + + const cancellablePromise = async.createCancelablePromise(async token => { + order.push('in callback'); + + await async.timeout(0); + store.add(token.onCancellationRequested(_ => order.push('cancelled'))); + cancellablePromise.cancel(); + order.push('afterCancel'); + }); + + order.push('afterCreate'); + + const promise = cancellablePromise + .then(undefined, err => null) + .then(() => order.push('finally')); + + return promise.then(() => assert.deepStrictEqual(order, ['in callback', 'afterCreate', 'cancelled', 'afterCancel', 'finally'])); + }); + test('get inner result', async function () { const promise = async.createCancelablePromise(token => { return async.timeout(12).then(_ => 1234); diff --git a/src/vs/base/test/common/console.test.ts b/src/vs/base/test/common/console.test.ts index 36439bc820d..86842d1dcd1 100644 --- a/src/vs/base/test/common/console.test.ts +++ b/src/vs/base/test/common/console.test.ts @@ -6,8 +6,10 @@ import * as assert from 'assert'; import { getFirstFrame } from 'vs/base/common/console'; import { normalize } from 'vs/base/common/path'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; suite('Console', () => { + ensureNoDisposablesAreLeakedInTestSuite(); test('getFirstFrame', () => { let stack = 'at vscode.commands.registerCommand (/Users/someone/Desktop/test-ts/out/src/extension.js:18:17)'; diff --git a/src/vs/base/test/common/event.test.ts b/src/vs/base/test/common/event.test.ts index 2231acac008..df7aac4363d 100644 --- a/src/vs/base/test/common/event.test.ts +++ b/src/vs/base/test/common/event.test.ts @@ -40,11 +40,17 @@ namespace Samples { this._onDidChange.fire(value); } + dispose() { + this._onDidChange.dispose(); + } + } } suite('Event utils dispose', function () { + const ds = ensureNoDisposablesAreLeakedInTestSuite(); + let tracker = new DisposableTracker(); function assertDisposablesCount(expected: number | Array) { @@ -75,7 +81,7 @@ suite('Event utils dispose', function () { test('no leak with snapshot-utils', function () { const store = new DisposableStore(); - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const evens = Event.filter(emitter.event, n => n % 2 === 0, store); assertDisposablesCount(1); // snaphot only listen when `evens` is being listened on @@ -91,7 +97,7 @@ suite('Event utils dispose', function () { test('no leak with debounce-util', function () { const store = new DisposableStore(); - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const debounced = Event.debounce(emitter.event, (l) => 0, undefined, undefined, undefined, undefined, store); assertDisposablesCount(1); // debounce only listens when `debounce` is being listened on @@ -109,13 +115,15 @@ suite('Event utils dispose', function () { suite('Event', function () { + const ds = ensureNoDisposablesAreLeakedInTestSuite(); + const counter = new Samples.EventCounter(); setup(() => counter.reset()); test('Emitter plain', function () { - const doc = new Samples.Document3(); + const doc = ds.add(new Samples.Document3()); const subscription = doc.onDidChange(counter.onEvent, counter); @@ -133,10 +141,10 @@ suite('Event', function () { const a = (v: string) => calls.push(`a${v}`); const b = (v: string) => calls.push(`b${v}`); - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); - emitter.event(a); - emitter.event(b); + ds.add(emitter.event(a)); + ds.add(emitter.event(b)); const s2 = emitter.event(a); emitter.fire('1'); @@ -150,14 +158,14 @@ suite('Event', function () { test('Emitter, dispose listener during emission', () => { for (let keepFirstMod = 1; keepFirstMod < 4; keepFirstMod++) { - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const calls: number[] = []; - const disposables = Array.from({ length: 25 }, (_, n) => emitter.event(() => { + const disposables = Array.from({ length: 25 }, (_, n) => ds.add(emitter.event(() => { if (n % keepFirstMod === 0) { disposables[n].dispose(); } calls.push(n); - })); + }))); emitter.fire(); assert.deepStrictEqual(calls, Array.from({ length: 25 }, (_, n) => n)); @@ -165,14 +173,14 @@ suite('Event', function () { }); test('Emitter, dispose emitter during emission', () => { - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const calls: number[] = []; - const disposables = Array.from({ length: 25 }, (_, n) => emitter.event(() => { + const disposables = Array.from({ length: 25 }, (_, n) => ds.add(emitter.event(() => { if (n === 10) { emitter.dispose(); } calls.push(n); - })); + }))); emitter.fire(); disposables.forEach(d => d.dispose()); @@ -181,15 +189,15 @@ suite('Event', function () { test('Emitter, shared delivery queue', () => { const deliveryQueue = createEventDeliveryQueue(); - const emitter1 = new Emitter({ deliveryQueue }); - const emitter2 = new Emitter({ deliveryQueue }); + const emitter1 = ds.add(new Emitter({ deliveryQueue })); + const emitter2 = ds.add(new Emitter({ deliveryQueue })); const calls: string[] = []; - emitter1.event(d => { calls.push(`${d}a`); if (d === 1) { emitter2.fire(2); } }); - emitter1.event(d => { calls.push(`${d}b`); }); + ds.add(emitter1.event(d => { calls.push(`${d}a`); if (d === 1) { emitter2.fire(2); } })); + ds.add(emitter1.event(d => { calls.push(`${d}b`); })); - emitter2.event(d => { calls.push(`${d}c`); emitter1.dispose(); }); - emitter2.event(d => { calls.push(`${d}d`); }); + ds.add(emitter2.event(d => { calls.push(`${d}c`); emitter1.dispose(); })); + ds.add(emitter2.event(d => { calls.push(`${d}d`); })); emitter1.fire(1); @@ -201,13 +209,13 @@ suite('Event', function () { test('Emitter, handles removal during 3', () => { const fn1 = stub(); const fn2 = stub(); - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); - emitter.event(fn1); + ds.add(emitter.event(fn1)); const h = emitter.event(() => { h.dispose(); }); - emitter.event(fn2); + ds.add(emitter.event(fn2)); emitter.fire('foo'); assert.deepStrictEqual(fn2.args, [['foo']]); @@ -216,9 +224,9 @@ suite('Event', function () { test('Emitter, handles removal during 2', () => { const fn1 = stub(); - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); - emitter.event(fn1); + ds.add(emitter.event(fn1)); const h = emitter.event(() => { h.dispose(); }); @@ -230,7 +238,7 @@ suite('Event', function () { test('Emitter, bucket', function () { const bucket: IDisposable[] = []; - const doc = new Samples.Document3(); + const doc = ds.add(new Samples.Document3()); const subscription = doc.onDidChange(counter.onEvent, counter, bucket); doc.setText('far'); @@ -251,8 +259,8 @@ suite('Event', function () { test('Emitter, store', function () { - const bucket = new DisposableStore(); - const doc = new Samples.Document3(); + const bucket = ds.add(new DisposableStore()); + const doc = ds.add(new Samples.Document3()); const subscription = doc.onDidChange(counter.onEvent, counter, bucket); doc.setText('far'); @@ -273,16 +281,16 @@ suite('Event', function () { let firstCount = 0; let lastCount = 0; - const a = new Emitter({ + const a = ds.add(new Emitter({ onWillAddFirstListener() { firstCount += 1; }, onDidRemoveLastListener() { lastCount += 1; } - }); + })); assert.strictEqual(firstCount, 0); assert.strictEqual(lastCount, 0); - let subscription1 = a.event(function () { }); - const subscription2 = a.event(function () { }); + let subscription1 = ds.add(a.event(function () { })); + const subscription2 = ds.add(a.event(function () { })); assert.strictEqual(firstCount, 1); assert.strictEqual(lastCount, 0); @@ -294,26 +302,26 @@ suite('Event', function () { assert.strictEqual(firstCount, 1); assert.strictEqual(lastCount, 1); - subscription1 = a.event(function () { }); + subscription1 = ds.add(a.event(function () { })); assert.strictEqual(firstCount, 2); assert.strictEqual(lastCount, 1); }); test('onWillRemoveListener', () => { let count = 0; - const a = new Emitter({ + const a = ds.add(new Emitter({ onWillRemoveListener() { count += 1; } - }); + })); assert.strictEqual(count, 0); - let subscription = a.event(function () { }); + let subscription = ds.add(a.event(function () { })); assert.strictEqual(count, 0); subscription.dispose(); assert.strictEqual(count, 1); - subscription = a.event(function () { }); + subscription = ds.add(a.event(function () { })); assert.strictEqual(count, 1); }); @@ -322,15 +330,15 @@ suite('Event', function () { setUnexpectedErrorHandler(() => null); try { - const a = new Emitter(); + const a = ds.add(new Emitter()); let hit = false; - a.event(function () { + ds.add(a.event(function () { // eslint-disable-next-line no-throw-literal throw 9; - }); - a.event(function () { + })); + ds.add(a.event(function () { hit = true; - }); + })); a.fire(undefined); assert.strictEqual(hit, true); @@ -343,17 +351,17 @@ suite('Event', function () { const allError: any[] = []; - const a = new Emitter({ + const a = ds.add(new Emitter({ onListenerError(e) { allError.push(e); } - }); + })); let hit = false; - a.event(function () { + ds.add(a.event(function () { // eslint-disable-next-line no-throw-literal throw 9; - }); - a.event(function () { + })); + ds.add(a.event(function () { hit = true; - }); + })); a.fire(undefined); assert.strictEqual(hit, true); assert.deepStrictEqual(allError, [9]); @@ -367,7 +375,7 @@ suite('Event', function () { } const context = {}; - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const reg1 = emitter.event(listener, context); const reg2 = emitter.event(listener, context); @@ -395,7 +403,7 @@ suite('Event', function () { } }); - emitter.event(e => { sum = e; }); + ds.add(emitter.event(e => { sum = e; })); const p = Event.toPromise(emitter.event); @@ -433,18 +441,18 @@ suite('Event', function () { }); test('Emitter - In Order Delivery', function () { - const a = new Emitter(); + const a = ds.add(new Emitter()); const listener2Events: string[] = []; - a.event(function listener1(event) { + ds.add(a.event(function listener1(event) { if (event === 'e1') { a.fire('e2'); // assert that all events are delivered at this point assert.deepStrictEqual(listener2Events, ['e1', 'e2']); } - }); - a.event(function listener2(event) { + })); + ds.add(a.event(function listener2(event) { listener2Events.push(event); - }); + })); a.fire('e1'); // assert that all events are delivered in order @@ -452,25 +460,25 @@ suite('Event', function () { }); test('Emitter, - In Order Delivery 3x', function () { - const a = new Emitter(); + const a = ds.add(new Emitter()); const listener2Events: string[] = []; - a.event(function listener1(event) { + ds.add(a.event(function listener1(event) { if (event === 'e2') { a.fire('e3'); // assert that all events are delivered at this point assert.deepStrictEqual(listener2Events, ['e1', 'e2', 'e3']); } - }); - a.event(function listener1(event) { + })); + ds.add(a.event(function listener1(event) { if (event === 'e1') { a.fire('e2'); // assert that all events are delivered at this point assert.deepStrictEqual(listener2Events, ['e1', 'e2', 'e3']); } - }); - a.event(function listener2(event) { + })); + ds.add(a.event(function listener2(event) { listener2Events.push(event); - }); + })); a.fire('e1'); // assert that all events are delivered in order @@ -478,7 +486,7 @@ suite('Event', function () { }); test('Cannot read property \'_actual\' of undefined #142204', function () { - const e = new Emitter(); + const e = ds.add(new Emitter()); const dispo = e.event(() => { }); dispo.dispose.call(undefined); // assert that disposable can be called with this }); @@ -486,6 +494,8 @@ suite('Event', function () { suite('AsyncEmitter', function () { + const ds = ensureNoDisposablesAreLeakedInTestSuite(); + test('event has waitUntil-function', async function () { interface E extends IWaitUntil { @@ -495,11 +505,11 @@ suite('AsyncEmitter', function () { const emitter = new AsyncEmitter(); - emitter.event(e => { + ds.add(emitter.event(e => { assert.strictEqual(e.foo, true); assert.strictEqual(e.bar, 1); assert.strictEqual(typeof e.waitUntil, 'function'); - }); + })); emitter.fireAsync({ foo: true, bar: 1, }, CancellationToken.None); emitter.dispose(); @@ -515,19 +525,19 @@ suite('AsyncEmitter', function () { let globalState = 0; const emitter = new AsyncEmitter(); - emitter.event(e => { + ds.add(emitter.event(e => { e.waitUntil(timeout(10).then(_ => { assert.strictEqual(globalState, 0); globalState += 1; })); - }); + })); - emitter.event(e => { + ds.add(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); @@ -545,7 +555,7 @@ suite('AsyncEmitter', function () { const emitter = new AsyncEmitter(); // e1 - emitter.event(e => { + ds.add(emitter.event(e => { e.waitUntil(timeout(10).then(async _ => { if (e.foo === 1) { await emitter.fireAsync({ foo: 2 }, CancellationToken.None); @@ -553,13 +563,13 @@ suite('AsyncEmitter', function () { done = true; } })); - }); + })); // e2 - emitter.event(e => { + ds.add(emitter.event(e => { events.push(e.foo); e.waitUntil(timeout(7)); - }); + })); await emitter.fireAsync({ foo: 1 }, CancellationToken.None); assert.ok(done); @@ -577,16 +587,16 @@ suite('AsyncEmitter', function () { let globalState = 0; const emitter = new AsyncEmitter(); - emitter.event(e => { + ds.add(emitter.event(e => { globalState += 1; e.waitUntil(new Promise((_r, reject) => reject(new Error()))); - }); + })); - emitter.event(e => { + ds.add(emitter.event(e => { globalState += 1; e.waitUntil(timeout(10)); e.waitUntil(timeout(20).then(() => globalState++)); // multiple `waitUntil` are supported and awaited on - }); + })); await emitter.fireAsync({ foo: true }, CancellationToken.None).then(() => { assert.strictEqual(globalState, 3); @@ -601,11 +611,13 @@ suite('AsyncEmitter', function () { suite('PausableEmitter', function () { + const ds = ensureNoDisposablesAreLeakedInTestSuite(); + test('basic', function () { const data: number[] = []; - const emitter = new PauseableEmitter(); + const emitter = ds.add(new PauseableEmitter()); - emitter.event(e => data.push(e)); + ds.add(emitter.event(e => data.push(e))); emitter.fire(1); emitter.fire(2); @@ -614,9 +626,9 @@ suite('PausableEmitter', function () { test('pause/resume - no merge', function () { const data: number[] = []; - const emitter = new PauseableEmitter(); + const emitter = ds.add(new PauseableEmitter()); - emitter.event(e => data.push(e)); + ds.add(emitter.event(e => data.push(e))); emitter.fire(1); emitter.fire(2); assert.deepStrictEqual(data, [1, 2]); @@ -634,9 +646,9 @@ suite('PausableEmitter', function () { test('pause/resume - merge', function () { const data: number[] = []; - const emitter = new PauseableEmitter({ merge: (a) => a.reduce((p, c) => p + c, 0) }); + const emitter = ds.add(new PauseableEmitter({ merge: (a) => a.reduce((p, c) => p + c, 0) })); - emitter.event(e => data.push(e)); + ds.add(emitter.event(e => data.push(e))); emitter.fire(1); emitter.fire(2); assert.deepStrictEqual(data, [1, 2]); @@ -655,9 +667,9 @@ suite('PausableEmitter', function () { test('double pause/resume', function () { const data: number[] = []; - const emitter = new PauseableEmitter(); + const emitter = ds.add(new PauseableEmitter()); - emitter.event(e => data.push(e)); + ds.add(emitter.event(e => data.push(e))); emitter.fire(1); emitter.fire(2); assert.deepStrictEqual(data, [1, 2]); @@ -680,9 +692,9 @@ suite('PausableEmitter', function () { test('resume, no pause', function () { const data: number[] = []; - const emitter = new PauseableEmitter(); + const emitter = ds.add(new PauseableEmitter()); - emitter.event(e => data.push(e)); + ds.add(emitter.event(e => data.push(e))); emitter.fire(1); emitter.fire(2); assert.deepStrictEqual(data, [1, 2]); @@ -694,20 +706,20 @@ suite('PausableEmitter', function () { test('nested pause', function () { const data: number[] = []; - const emitter = new PauseableEmitter(); + const emitter = ds.add(new PauseableEmitter()); let once = true; - emitter.event(e => { + ds.add(emitter.event(e => { data.push(e); if (once) { emitter.pause(); once = false; } - }); - emitter.event(e => { + })); + ds.add(emitter.event(e => { data.push(e); - }); + })); emitter.pause(); emitter.fire(1); @@ -727,8 +739,8 @@ suite('PausableEmitter', function () { test('empty pause with merge', function () { const data: number[] = []; - const emitter = new PauseableEmitter({ merge: a => a[0] }); - emitter.event(e => data.push(1)); + const emitter = ds.add(new PauseableEmitter({ merge: a => a[0] })); + ds.add(emitter.event(e => data.push(1))); emitter.pause(); emitter.resume(); @@ -766,12 +778,14 @@ suite('Event utils - ensureNoDisposablesAreLeakedInTestSuite', function () { suite('Event utils', () => { + const ds = ensureNoDisposablesAreLeakedInTestSuite(); + suite('EventBufferer', () => { test('should not buffer when not wrapped', () => { const bufferer = new EventBufferer(); const counter = new Samples.EventCounter(); - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const event = bufferer.wrapEvent(emitter.event); const listener = event(counter.onEvent, counter); @@ -789,7 +803,7 @@ suite('Event utils', () => { test('should buffer when wrapped', () => { const bufferer = new EventBufferer(); const counter = new Samples.EventCounter(); - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const event = bufferer.wrapEvent(emitter.event); const listener = event(counter.onEvent, counter); @@ -812,7 +826,7 @@ suite('Event utils', () => { }); test('once', () => { - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); let counter1 = 0, counter2 = 0, counter3 = 0; @@ -844,7 +858,7 @@ suite('Event utils', () => { test('should buffer events', () => { const result: number[] = []; - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const event = emitter.event; const bufferedEvent = Event.buffer(event); @@ -866,7 +880,7 @@ suite('Event utils', () => { test('should buffer events on next tick', async () => { const result: number[] = []; - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const event = emitter.event; const bufferedEvent = Event.buffer(event, true); @@ -888,7 +902,7 @@ suite('Event utils', () => { test('should fire initial buffer events', () => { const result: number[] = []; - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const event = emitter.event; const bufferedEvent = Event.buffer(event, false, [-2, -1, 0]); @@ -897,7 +911,7 @@ suite('Event utils', () => { emitter.fire(3); assert.deepStrictEqual(result, [] as number[]); - bufferedEvent(num => result.push(num)); + ds.add(bufferedEvent(num => result.push(num))); assert.deepStrictEqual(result, [-2, -1, 0, 1, 2, 3]); }); }); @@ -907,10 +921,10 @@ suite('Event utils', () => { test('works', () => { const result: number[] = []; const m = new EventMultiplexer(); - m.event(r => result.push(r)); + ds.add(m.event(r => result.push(r))); - const e1 = new Emitter(); - m.add(e1.event); + const e1 = ds.add(new Emitter()); + ds.add(m.add(e1.event)); assert.deepStrictEqual(result, []); @@ -921,10 +935,10 @@ suite('Event utils', () => { test('multiplexer dispose works', () => { const result: number[] = []; const m = new EventMultiplexer(); - m.event(r => result.push(r)); + ds.add(m.event(r => result.push(r))); - const e1 = new Emitter(); - m.add(e1.event); + const e1 = ds.add(new Emitter()); + ds.add(m.add(e1.event)); assert.deepStrictEqual(result, []); @@ -941,10 +955,10 @@ suite('Event utils', () => { test('event dispose works', () => { const result: number[] = []; const m = new EventMultiplexer(); - m.event(r => result.push(r)); + ds.add(m.event(r => result.push(r))); - const e1 = new Emitter(); - m.add(e1.event); + const e1 = ds.add(new Emitter()); + ds.add(m.add(e1.event)); assert.deepStrictEqual(result, []); @@ -961,9 +975,9 @@ suite('Event utils', () => { test('mutliplexer event dispose works', () => { const result: number[] = []; const m = new EventMultiplexer(); - m.event(r => result.push(r)); + ds.add(m.event(r => result.push(r))); - const e1 = new Emitter(); + const e1 = ds.add(new Emitter()); const l1 = m.add(e1.event); assert.deepStrictEqual(result, []); @@ -981,14 +995,14 @@ suite('Event utils', () => { test('hot start works', () => { const result: number[] = []; const m = new EventMultiplexer(); - m.event(r => result.push(r)); + ds.add(m.event(r => result.push(r))); - const e1 = new Emitter(); - m.add(e1.event); - const e2 = new Emitter(); - m.add(e2.event); - const e3 = new Emitter(); - m.add(e3.event); + const e1 = ds.add(new Emitter()); + ds.add(m.add(e1.event)); + const e2 = ds.add(new Emitter()); + ds.add(m.add(e2.event)); + const e3 = ds.add(new Emitter()); + ds.add(m.add(e3.event)); e1.fire(1); e2.fire(2); @@ -1000,14 +1014,14 @@ suite('Event utils', () => { const result: number[] = []; const m = new EventMultiplexer(); - const e1 = new Emitter(); - m.add(e1.event); - const e2 = new Emitter(); - m.add(e2.event); - const e3 = new Emitter(); - m.add(e3.event); + const e1 = ds.add(new Emitter()); + ds.add(m.add(e1.event)); + const e2 = ds.add(new Emitter()); + ds.add(m.add(e2.event)); + const e3 = ds.add(new Emitter()); + ds.add(m.add(e3.event)); - m.event(r => result.push(r)); + ds.add(m.event(r => result.push(r))); e1.fire(1); e2.fire(2); @@ -1019,18 +1033,18 @@ suite('Event utils', () => { const result: number[] = []; const m = new EventMultiplexer(); - const e1 = new Emitter(); - m.add(e1.event); - const e2 = new Emitter(); - m.add(e2.event); + const e1 = ds.add(new Emitter()); + ds.add(m.add(e1.event)); + const e2 = ds.add(new Emitter()); + ds.add(m.add(e2.event)); - m.event(r => result.push(r)); + ds.add(m.event(r => result.push(r))); e1.fire(1); e2.fire(2); - const e3 = new Emitter(); - m.add(e3.event); + const e3 = ds.add(new Emitter()); + ds.add(m.add(e3.event)); e3.fire(3); assert.deepStrictEqual(result, [1, 2, 3]); @@ -1040,17 +1054,17 @@ suite('Event utils', () => { const result: number[] = []; const m = new EventMultiplexer(); - const e1 = new Emitter(); - m.add(e1.event); - const e2 = new Emitter(); - m.add(e2.event); + const e1 = ds.add(new Emitter()); + ds.add(m.add(e1.event)); + const e2 = ds.add(new Emitter()); + ds.add(m.add(e2.event)); - m.event(r => result.push(r)); + ds.add(m.event(r => result.push(r))); e1.fire(1); e2.fire(2); - const e3 = new Emitter(); + const e3 = ds.add(new Emitter()); const l3 = m.add(e3.event); e3.fire(3); assert.deepStrictEqual(result, [1, 2, 3]); @@ -1066,22 +1080,24 @@ suite('Event utils', () => { }); suite('DynamicListEventMultiplexer', () => { + let addEmitter: Emitter; + let removeEmitter: Emitter; const recordedEvents: number[] = []; - const addEmitter = new Emitter(); - const removeEmitter = new Emitter(); class TestItem { - readonly onTestEventEmitter = new Emitter(); + readonly onTestEventEmitter = ds.add(new Emitter()); readonly onTestEvent = this.onTestEventEmitter.event; } let items: TestItem[]; let m: DynamicListEventMultiplexer; setup(() => { + addEmitter = ds.add(new Emitter()); + removeEmitter = ds.add(new Emitter()); items = [new TestItem(), new TestItem()]; for (const [i, item] of items.entries()) { - item.onTestEvent(e => `${i}:${e}`); + ds.add(item.onTestEvent(e => `${i}:${e}`)); } m = new DynamicListEventMultiplexer(items, addEmitter.event, removeEmitter.event, e => e.onTestEvent); - m.event(e => recordedEvents.push(e)); + ds.add(m.event(e => recordedEvents.push(e))); recordedEvents.length = 0; }); teardown(() => m.dispose()); @@ -1112,11 +1128,11 @@ suite('Event utils', () => { }); test('latch', () => { - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const event = Event.latch(emitter.event); const result: number[] = []; - const listener = event(num => result.push(num)); + const listener = ds.add(event(num => result.push(num))); assert.deepStrictEqual(result, []); @@ -1148,11 +1164,11 @@ suite('Event utils', () => { }); test('dispose is reentrant', () => { - const emitter = new Emitter({ + const emitter = ds.add(new Emitter({ onDidRemoveLastListener: () => { emitter.dispose(); } - }); + })); const listener = emitter.event(() => undefined); listener.dispose(); // should not crash @@ -1164,17 +1180,17 @@ suite('Event utils', () => { return new Promise(resolve => { let promise = new DeferredPromise(); - Event.fromPromise(promise.p)(e => { + ds.add(Event.fromPromise(promise.p)(e => { assert.strictEqual(e, 1); promise = new DeferredPromise(); - Event.fromPromise(promise.p)(() => { + ds.add(Event.fromPromise(promise.p)(() => { resolve(); - }); + })); promise.error(undefined); - }); + })); promise.complete(1); }); @@ -1185,16 +1201,16 @@ suite('Event utils', () => { let promise = new DeferredPromise(); promise.complete(1); - Event.fromPromise(promise.p)(e => { + ds.add(Event.fromPromise(promise.p)(e => { assert.strictEqual(e, 1); promise = new DeferredPromise(); promise.error(undefined); - Event.fromPromise(promise.p)(() => { + ds.add(Event.fromPromise(promise.p)(() => { resolve(); - }); - }); + })); + })); }); }); @@ -1202,8 +1218,8 @@ suite('Event utils', () => { suite('Relay', () => { test('should input work', () => { - const e1 = new Emitter(); - const e2 = new Emitter(); + const e1 = ds.add(new Emitter()); + const e2 = ds.add(new Emitter()); const relay = new Relay(); const result: number[] = []; @@ -1229,13 +1245,13 @@ suite('Event utils', () => { }); test('should Relay dispose work', () => { - const e1 = new Emitter(); - const e2 = new Emitter(); + const e1 = ds.add(new Emitter()); + const e2 = ds.add(new Emitter()); const relay = new Relay(); const result: number[] = []; const listener = (num: number) => result.push(num); - relay.event(listener); + ds.add(relay.event(listener)); e1.fire(1); assert.deepStrictEqual(result, []); @@ -1257,7 +1273,7 @@ suite('Event utils', () => { }); test('runAndSubscribeWithStore', () => { - const eventEmitter = new Emitter(); + const eventEmitter = ds.add(new Emitter()); const event = eventEmitter.event; let i = 0; @@ -1288,14 +1304,14 @@ suite('Event utils', () => { suite('accumulate', () => { test('should not fire after a listener is disposed with undefined or []', async () => { - const eventEmitter = new Emitter(); + const eventEmitter = ds.add(new Emitter()); const event = eventEmitter.event; const accumulated = Event.accumulate(event, 0); const calls1: number[][] = []; const calls2: number[][] = []; - const listener1 = accumulated((e) => calls1.push(e)); - accumulated((e) => calls2.push(e)); + const listener1 = ds.add(accumulated((e) => calls1.push(e))); + ds.add(accumulated((e) => calls2.push(e))); eventEmitter.fire(1); await timeout(1); @@ -1308,29 +1324,29 @@ suite('Event utils', () => { assert.deepStrictEqual(calls2, [[1]], 'should not fire after a listener is disposed with undefined or []'); }); test('should accumulate a single event', async () => { - const eventEmitter = new Emitter(); + const eventEmitter = ds.add(new Emitter()); const event = eventEmitter.event; const accumulated = Event.accumulate(event, 0); const results1 = await new Promise(r => { - accumulated(r); + ds.add(accumulated(r)); eventEmitter.fire(1); }); assert.deepStrictEqual(results1, [1]); const results2 = await new Promise(r => { - accumulated(r); + ds.add(accumulated(r)); eventEmitter.fire(2); }); assert.deepStrictEqual(results2, [2]); }); test('should accumulate multiple events', async () => { - const eventEmitter = new Emitter(); + const eventEmitter = ds.add(new Emitter()); const event = eventEmitter.event; const accumulated = Event.accumulate(event, 0); const results1 = await new Promise(r => { - accumulated(r); + ds.add(accumulated(r)); eventEmitter.fire(1); eventEmitter.fire(2); eventEmitter.fire(3); @@ -1338,7 +1354,7 @@ suite('Event utils', () => { assert.deepStrictEqual(results1, [1, 2, 3]); const results2 = await new Promise(r => { - accumulated(r); + ds.add(accumulated(r)); eventEmitter.fire(4); eventEmitter.fire(5); eventEmitter.fire(6); @@ -1351,7 +1367,7 @@ suite('Event utils', () => { suite('debounce', () => { test('simple', function (done: () => void) { - const doc = new Samples.Document3(); + const doc = ds.add(new Samples.Document3()); const onDocDidChange = Event.debounce(doc.onDidChange, (prev: string[] | undefined, cur) => { if (!prev) { @@ -1364,7 +1380,7 @@ suite('Event utils', () => { let count = 0; - onDocDidChange(keys => { + ds.add(onDocDidChange(keys => { count++; assert.ok(keys, 'was not expecting keys.'); if (count === 1) { @@ -1374,7 +1390,7 @@ suite('Event utils', () => { assert.deepStrictEqual(keys, ['4']); done(); } - }); + })); doc.setText('1'); doc.setText('2'); @@ -1383,7 +1399,7 @@ suite('Event utils', () => { test('microtask', function (done: () => void) { - const doc = new Samples.Document3(); + const doc = ds.add(new Samples.Document3()); const onDocDidChange = Event.debounce(doc.onDidChange, (prev: string[] | undefined, cur) => { if (!prev) { @@ -1396,7 +1412,7 @@ suite('Event utils', () => { let count = 0; - onDocDidChange(keys => { + ds.add(onDocDidChange(keys => { count++; assert.ok(keys, 'was not expecting keys.'); if (count === 1) { @@ -1406,7 +1422,7 @@ suite('Event utils', () => { assert.deepStrictEqual(keys, ['4']); done(); } - }); + })); doc.setText('1'); doc.setText('2'); @@ -1415,13 +1431,13 @@ suite('Event utils', () => { test('leading', async function () { - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const debounced = Event.debounce(emitter.event, (l, e) => e, 0, /*leading=*/true); let calls = 0; - debounced(() => { + ds.add(debounced(() => { calls++; - }); + })); // If the source event is fired once, the debounced (on the leading edge) event should be fired only once emitter.fire(); @@ -1431,13 +1447,13 @@ suite('Event utils', () => { }); test('leading (2)', async function () { - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const debounced = Event.debounce(emitter.event, (l, e) => e, 0, /*leading=*/true); let calls = 0; - debounced(() => { + ds.add(debounced(() => { calls++; - }); + })); // If the source event is fired multiple times, the debounced (on the leading edge) event should be fired twice emitter.fire(); @@ -1448,11 +1464,11 @@ suite('Event utils', () => { }); test('leading reset', async function () { - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const debounced = Event.debounce(emitter.event, (l, e) => l ? l + 1 : 1, 0, /*leading=*/true); const calls: number[] = []; - debounced((e) => calls.push(e)); + ds.add(debounced((e) => calls.push(e))); emitter.fire(1); emitter.fire(1); @@ -1462,11 +1478,11 @@ suite('Event utils', () => { }); test('should not flush events when a listener is disposed', async () => { - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const debounced = Event.debounce(emitter.event, (l, e) => l ? l + 1 : 1, 0); const calls: number[] = []; - const listener = debounced((e) => calls.push(e)); + const listener = ds.add(debounced((e) => calls.push(e))); emitter.fire(1); listener.dispose(); @@ -1478,11 +1494,11 @@ suite('Event utils', () => { }); test('flushOnListenerRemove - should flush events when a listener is disposed', async () => { - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const debounced = Event.debounce(emitter.event, (l, e) => l ? l + 1 : 1, 0, undefined, true); const calls: number[] = []; - const listener = debounced((e) => calls.push(e)); + const listener = ds.add(debounced((e) => calls.push(e))); emitter.fire(1); listener.dispose(); @@ -1494,11 +1510,11 @@ suite('Event utils', () => { }); test('should flush events when the emitter is disposed', async () => { - const emitter = new Emitter(); + const emitter = ds.add(new Emitter()); const debounced = Event.debounce(emitter.event, (l, e) => l ? l + 1 : 1, 0); const calls: number[] = []; - debounced((e) => calls.push(e)); + ds.add(debounced((e) => calls.push(e))); emitter.fire(1); emitter.dispose(); @@ -1509,26 +1525,17 @@ suite('Event utils', () => { }); suite('chain2', () => { - let store: DisposableStore; let em: Emitter; let calls: number[]; - teardown(() => { - store.dispose(); - }); - - ensureNoDisposablesAreLeakedInTestSuite(); - setup(() => { - store = new DisposableStore(); - em = new Emitter(); - store.add(em); + em = ds.add(new Emitter()); calls = []; }); test('maps', () => { const ev = Event.chain(em.event, $ => $.map(v => v * 2)); - store.add(ev(v => calls.push(v))); + ds.add(ev(v => calls.push(v))); em.fire(1); em.fire(2); em.fire(3); @@ -1537,7 +1544,7 @@ suite('Event utils', () => { test('filters', () => { const ev = Event.chain(em.event, $ => $.filter(v => v % 2 === 0)); - store.add(ev(v => calls.push(v))); + ds.add(ev(v => calls.push(v))); em.fire(1); em.fire(2); em.fire(3); @@ -1547,7 +1554,7 @@ suite('Event utils', () => { test('reduces', () => { const ev = Event.chain(em.event, $ => $.reduce((acc, v) => acc + v, 0)); - store.add(ev(v => calls.push(v))); + ds.add(ev(v => calls.push(v))); em.fire(1); em.fire(2); em.fire(3); @@ -1557,7 +1564,7 @@ suite('Event utils', () => { test('latches', () => { const ev = Event.chain(em.event, $ => $.latch()); - store.add(ev(v => calls.push(v))); + ds.add(ev(v => calls.push(v))); em.fire(1); em.fire(1); em.fire(2); @@ -1576,7 +1583,7 @@ suite('Event utils', () => { .latch() ); - store.add(ev(v => calls.push(v))); + ds.add(ev(v => calls.push(v))); em.fire(1); em.fire(2); em.fire(3); diff --git a/src/vs/base/test/common/filters.test.ts b/src/vs/base/test/common/filters.test.ts index c80a6f84132..df8d25f3dab 100644 --- a/src/vs/base/test/common/filters.test.ts +++ b/src/vs/base/test/common/filters.test.ts @@ -498,6 +498,11 @@ suite('Filters', () => { assertTopScore(fuzzyScore, '_lineS', 0, '_lineS', '_lines'); }); + test.skip('Bad completion ranking changes valid variable name to class name when pressing "." #187055', function () { + assertTopScore(fuzzyScore, 'a', 1, 'A', 'a'); + assertTopScore(fuzzyScore, 'theme', 1, 'Theme', 'theme'); + }); + test('HTML closing tag proposal filtered out #38880', function () { assertMatches('\t\t<', '\t\t', '^\t^\t^', fuzzyScore, { patternPos: 0 }); assertMatches('\t\t<', '\t\t', '\t\t^', fuzzyScore, { patternPos: 2 }); diff --git a/src/vs/base/test/common/history.test.ts b/src/vs/base/test/common/history.test.ts index eae79bb5afa..39143609b88 100644 --- a/src/vs/base/test/common/history.test.ts +++ b/src/vs/base/test/common/history.test.ts @@ -184,6 +184,8 @@ suite('History Navigator', () => { suite('History Navigator 2', () => { + ensureNoDisposablesAreLeakedInTestSuite(); + test('constructor', () => { const testObject = new HistoryNavigator2(['1', '2', '3', '4']); diff --git a/src/vs/base/test/common/iconLabels.test.ts b/src/vs/base/test/common/iconLabels.test.ts index 33aee64d860..b8352069e1c 100644 --- a/src/vs/base/test/common/iconLabels.test.ts +++ b/src/vs/base/test/common/iconLabels.test.ts @@ -6,6 +6,7 @@ import * as assert from 'assert'; import { IMatch } from 'vs/base/common/filters'; import { escapeIcons, getCodiconAriaLabel, IParsedLabelWithIcons, markdownEscapeEscapedIcons, matchesFuzzyIconAware, parseLabelWithIcons, stripIcons } from 'vs/base/common/iconLabels'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; interface IIconFilter { // Returns null if word doesn't match. @@ -110,4 +111,6 @@ suite('Icon Labels', () => { assert.strictEqual(markdownEscapeEscapedIcons('$(Hello) World'), '$(Hello) World'); assert.strictEqual(markdownEscapeEscapedIcons('\\$(Hello) World'), '\\\\$(Hello) World'); }); + + ensureNoDisposablesAreLeakedInTestSuite(); }); diff --git a/src/vs/base/test/common/lazy.test.ts b/src/vs/base/test/common/lazy.test.ts index e3a8d66459c..361e3305d43 100644 --- a/src/vs/base/test/common/lazy.test.ts +++ b/src/vs/base/test/common/lazy.test.ts @@ -5,6 +5,7 @@ import * as assert from 'assert'; import { Lazy } from 'vs/base/common/lazy'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; suite('Lazy', () => { @@ -27,4 +28,6 @@ suite('Lazy', () => { assert.strictEqual(value.hasValue, true); assert.throws(() => value.value, /\b1\b/); }); + + ensureNoDisposablesAreLeakedInTestSuite(); }); diff --git a/src/vs/base/test/common/lifecycle.test.ts b/src/vs/base/test/common/lifecycle.test.ts index 22e8ff77e0f..103009b5219 100644 --- a/src/vs/base/test/common/lifecycle.test.ts +++ b/src/vs/base/test/common/lifecycle.test.ts @@ -13,8 +13,9 @@ class Disposable implements IDisposable { dispose() { this.isDisposed = true; } } +// Leaks are allowed here since we test lifecycle stuff: +// eslint-disable-next-line local/code-ensure-no-disposables-leak-in-test suite('Lifecycle', () => { - test('dispose single disposable', () => { const disposable = new Disposable(); @@ -129,6 +130,8 @@ suite('Lifecycle', () => { }); suite('DisposableStore', () => { + ensureNoDisposablesAreLeakedInTestSuite(); + test('dispose should call all child disposes even if a child throws on dispose', () => { const disposedValues = new Set(); @@ -221,6 +224,8 @@ suite('DisposableStore', () => { }); suite('Reference Collection', () => { + ensureNoDisposablesAreLeakedInTestSuite(); + class Collection extends ReferenceCollection { private _count = 0; get count() { return this._count; } diff --git a/src/vs/base/test/common/map.test.ts b/src/vs/base/test/common/map.test.ts index 8793b24dcd1..399307b69bf 100644 --- a/src/vs/base/test/common/map.test.ts +++ b/src/vs/base/test/common/map.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import { BidirectionalMap, LinkedMap, LRUCache, ResourceMap, SetMap, Touch } from 'vs/base/common/map'; +import { BidirectionalMap, LinkedMap, LRUCache, mapsStrictEqualIgnoreOrder, ResourceMap, SetMap, Touch } from 'vs/base/common/map'; import { extUriIgnorePathCase } from 'vs/base/common/resources'; import { URI } from 'vs/base/common/uri'; @@ -483,6 +483,25 @@ suite('Map', () => { assert.deepStrictEqual(Array.from(map.keys()).map(String), [fileAUpper].map(String)); assert.deepStrictEqual(Array.from(map), [[fileAUpper, 1]]); }); + + test('mapsStrictEqualIgnoreOrder', () => { + const map1 = new Map(); + const map2 = new Map(); + + assert.strictEqual(mapsStrictEqualIgnoreOrder(map1, map2), true); + + map1.set('foo', 'bar'); + assert.strictEqual(mapsStrictEqualIgnoreOrder(map1, map2), false); + + map2.set('foo', 'bar'); + assert.strictEqual(mapsStrictEqualIgnoreOrder(map1, map2), true); + + map2.set('bar', 'foo'); + assert.strictEqual(mapsStrictEqualIgnoreOrder(map1, map2), false); + + map1.set('bar', 'foo'); + assert.strictEqual(mapsStrictEqualIgnoreOrder(map1, map2), true); + }); }); suite('BidirectionalMap', () => { diff --git a/src/vs/base/test/common/markdownString.test.ts b/src/vs/base/test/common/markdownString.test.ts index b008091a46f..a23573f610a 100644 --- a/src/vs/base/test/common/markdownString.test.ts +++ b/src/vs/base/test/common/markdownString.test.ts @@ -62,6 +62,51 @@ suite('MarkdownString', () => { ); }); + suite('appendCodeBlock', () => { + function assertCodeBlock(lang: string, code: string, result: string) { + const mds = new MarkdownString(); + mds.appendCodeblock(lang, code); + assert.strictEqual(mds.value, result); + } + + test('common cases', () => { + // no backticks + assertCodeBlock('ts', 'const a = 1;', `\n${[ + '```ts', + 'const a = 1;', + '```' + ].join('\n')}\n`); + // backticks + assertCodeBlock('ts', 'const a = `1`;', `\n${[ + '```ts', + 'const a = `1`;', + '```' + ].join('\n')}\n`); + }); + + // @see https://github.com/microsoft/vscode/issues/193746 + test('escape fence', () => { + // fence in the first line + assertCodeBlock('md', '```\n```', `\n${[ + '````md', + '```\n```', + '````' + ].join('\n')}\n`); + // fence in the middle of code + assertCodeBlock('md', '\n\n```\n```', `\n${[ + '````md', + '\n\n```\n```', + '````' + ].join('\n')}\n`); + // longer fence at the end of code + assertCodeBlock('md', '```\n```\n````\n````', `\n${[ + '`````md', + '```\n```\n````\n````', + '`````' + ].join('\n')}\n`); + }); + }); + suite('ThemeIcons', () => { suite('Support On', () => { diff --git a/src/vs/base/test/common/mime.test.ts b/src/vs/base/test/common/mime.test.ts index f403db8a960..fce56646ff8 100644 --- a/src/vs/base/test/common/mime.test.ts +++ b/src/vs/base/test/common/mime.test.ts @@ -5,6 +5,7 @@ import * as assert from 'assert'; import { normalizeMimeType } from 'vs/base/common/mime'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; suite('Mime', () => { @@ -16,4 +17,6 @@ suite('Mime', () => { assert.strictEqual(normalizeMimeType('Text/plain;UPPER'), 'text/plain;UPPER'); assert.strictEqual(normalizeMimeType('Text/plain;lower'), 'text/plain;lower'); }); + + ensureNoDisposablesAreLeakedInTestSuite(); }); diff --git a/src/vs/base/test/common/naturalLanguage/korean.test.ts b/src/vs/base/test/common/naturalLanguage/korean.test.ts new file mode 100644 index 00000000000..6543d15cb75 --- /dev/null +++ b/src/vs/base/test/common/naturalLanguage/korean.test.ts @@ -0,0 +1,278 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +// allow-any-unicode-file + +import { strictEqual } from 'assert'; +import { getKoreanAltChars } from 'vs/base/common/naturalLanguage/korean'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; + +function getKoreanAltCharsForString(text: string): string { + let result = ''; + for (let i = 0; i < text.length; i++) { + const chars = getKoreanAltChars(text.charCodeAt(i)); + if (chars) { + result += String.fromCharCode(...Array.from(chars)); + } else { + result += text.charAt(i); + } + } + return result; +} + +suite('Korean', () => { + ensureNoDisposablesAreLeakedInTestSuite(); + + suite('getKoreanAltChars', () => { + test('Modern initial consonants', () => { + const cases = new Map([ + ['ᄀ', 'r'], + ['ᄁ', 'R'], + ['ᄂ', 's'], + ['ᄃ', 'e'], + ['ᄄ', 'E'], + ['ᄅ', 'f'], + ['ᄆ', 'a'], + ['ᄇ', 'q'], + ['ᄈ', 'Q'], + ['ᄉ', 't'], + ['ᄊ', 'T'], + ['ᄋ', 'd'], + ['ᄌ', 'w'], + ['ᄍ', 'W'], + ['ᄎ', 'c'], + ['ᄏ', 'z'], + ['ᄐ', 'x'], + ['ᄑ', 'v'], + ['ᄒ', 'g'], + ]); + for (const [hangul, alt] of cases.entries()) { + strictEqual(getKoreanAltCharsForString(hangul), alt, `"${hangul}" should result in "${alt}"`); + } + }); + + test('Modern latter consonants', () => { + const cases = new Map([ + ['ᆨ', 'r'], + ['ᆩ', 'R'], + ['ᆪ', 'rt'], + ['ᆫ', 's'], + ['ᆬ', 'sw'], + ['ᆭ', 'sg'], + ['ᆮ', 'e'], + ['ᆯ', 'f'], + ['ᆰ', 'fr'], + ['ᆱ', 'fa'], + ['ᆲ', 'fq'], + ['ᆳ', 'ft'], + ['ᆴ', 'fx'], + ['ᆵ', 'fv'], + ['ᆶ', 'fg'], + ['ᆷ', 'a'], + ['ᆸ', 'q'], + ['ᆹ', 'qt'], + ['ᆺ', 't'], + ['ᆻ', 'T'], + ['ᆼ', 'd'], + ['ᆽ', 'w'], + ['ᆾ', 'c'], + ['ᆿ', 'z'], + ['ᇀ', 'x'], + ['ᇁ', 'v'], + ['ᇂ', 'g'], + ]); + for (const [hangul, alt] of cases.entries()) { + strictEqual(getKoreanAltCharsForString(hangul), alt, `"${hangul}" (0x${hangul.charCodeAt(0).toString(16)}) should result in "${alt}"`); + } + }); + + test('Modern vowels', () => { + const cases = new Map([ + ['ᅡ', 'k'], + ['ᅢ', 'o'], + ['ᅣ', 'i'], + ['ᅤ', 'O'], + ['ᅥ', 'j'], + ['ᅦ', 'p'], + ['ᅧ', 'u'], + ['ᅨ', 'P'], + ['ᅩ', 'h'], + ['ᅪ', 'hk'], + ['ᅫ', 'ho'], + ['ᅬ', 'hl'], + ['ᅭ', 'y'], + ['ᅮ', 'n'], + ['ᅯ', 'nj'], + ['ᅰ', 'np'], + ['ᅱ', 'nl'], + ['ᅲ', 'b'], + ['ᅳ', 'm'], + ['ᅴ', 'ml'], + ['ᅵ', 'l'], + ]); + for (const [hangul, alt] of cases.entries()) { + strictEqual(getKoreanAltCharsForString(hangul), alt, `"${hangul}" (0x${hangul.charCodeAt(0).toString(16)}) should result in "${alt}"`); + } + }); + + test('Compatibility Jamo', () => { + const cases = new Map([ + ['ㄱ', 'r'], + ['ㄲ', 'R'], + ['ㄳ', 'rt'], + ['ㄴ', 's'], + ['ㄵ', 'sw'], + ['ㄶ', 'sg'], + ['ㄷ', 'e'], + ['ㄸ', 'E'], + ['ㄹ', 'f'], + ['ㄺ', 'fr'], + ['ㄻ', 'fa'], + ['ㄼ', 'fq'], + ['ㄽ', 'ft'], + ['ㄾ', 'fx'], + ['ㄿ', 'fv'], + ['ㅀ', 'fg'], + ['ㅁ', 'a'], + ['ㅂ', 'q'], + ['ㅃ', 'Q'], + ['ㅄ', 'qt'], + ['ㅅ', 't'], + ['ㅆ', 'T'], + ['ㅇ', 'd'], + ['ㅈ', 'w'], + ['ㅉ', 'W'], + ['ㅊ', 'c'], + ['ㅋ', 'z'], + ['ㅌ', 'x'], + ['ㅍ', 'v'], + ['ㅎ', 'g'], + ['ㅏ', 'k'], + ['ㅐ', 'o'], + ['ㅑ', 'i'], + ['ㅒ', 'O'], + ['ㅓ', 'j'], + ['ㅔ', 'p'], + ['ㅕ', 'u'], + ['ㅖ', 'P'], + ['ㅗ', 'h'], + ['ㅘ', 'hk'], + ['ㅙ', 'ho'], + ['ㅚ', 'hl'], + ['ㅛ', 'y'], + ['ㅜ', 'n'], + ['ㅝ', 'nj'], + ['ㅞ', 'np'], + ['ㅟ', 'nl'], + ['ㅠ', 'b'], + ['ㅡ', 'm'], + ['ㅢ', 'ml'], + ['ㅣ', 'l'], + // HF: Hangul Filler (everything after this is archaic) + ]); + for (const [hangul, alt] of cases.entries()) { + strictEqual(getKoreanAltCharsForString(hangul), alt, `"${hangul}" (0x${hangul.charCodeAt(0).toString(16)}) should result in "${alt}"`); + } + }); + + // There are too many characters to test exhaustively, so select some + // real world use cases from this code base (workbench contrib names) + test('Composed samples', () => { + const cases = new Map([ + ['ㅁㅊㅊㄷㄴ냐ㅠㅑㅣㅑ쇼', 'accessibility'], + ['ㅁㅊ채ㅕㅜㅅ뚜샤시드둣ㄴ', 'accountEntitlements'], + ['며야ㅐ쳗ㄴ', 'audioCues'], + ['ㅠㄱㅁ찯셰먁채ㅣㅐ걐ㄷㄱ2ㅆ디듣ㅅ교', 'bracketPairColorizer2Telemetry'], + ['ㅠㅕㅣㅏㄸ얏', 'bulkEdit'], + ['ㅊ미ㅣㅗㅑㄷㄱㅁㄱ초ㅛ', 'callHierarchy'], + ['촘ㅅ', 'chat'], + ['챙ㄷㅁㅊ샤ㅐㅜㄴ', 'codeActions'], + ['챙ㄷㄸ야색', 'codeEditor'], + ['채ㅡㅡ뭉ㄴ', 'commands'], + ['채ㅡㅡ둣ㄴ', 'comments'], + ['채ㅜ럏ㄸ테ㅐㄳㄷㄱ', 'configExporter'], + ['채ㅜㅅㄷㅌ스두ㅕ', 'contextmenu'], + ['쳔새ㅡㄸ야색', 'customEditor'], + ['ㅇ듀ㅕㅎ', 'debug'], + ['ㅇ덱ㄷㅊㅁㅅㄷㅇㄸㅌㅅ두냐ㅐㅜㅡㅑㅎㄱㅁ색', 'deprecatedExtensionMigrator'], + ['ㄷ얏ㄴㄷㄴ냐ㅐㅜㄴ', 'editSessions'], + ['드ㅡㄷㅅ', 'emmet'], + ['ㄷㅌㅅ두냐ㅐㅜㄴ', 'extensions'], + ['ㄷㅌㅅㄷ구밌ㄷ그ㅑㅜ미', 'externalTerminal'], + ['ㄷㅌㅅㄷ구미ㅕ갸ㅒㅔ둗ㄱ', 'externalUriOpener'], + ['랴ㅣㄷㄴ', 'files'], + ['래ㅣ야ㅜㅎ', 'folding'], + ['래금ㅅ', 'format'], + ['ㅑㅟ묘ㅗㅑㅜㅅㄴ', 'inlayHints'], + ['ㅑㅟㅑㅜㄷ촘ㅅ', 'inlineChat'], + ['ㅑㅜㅅㄷㄱㅁㅊ샾ㄷ', 'interactive'], + ['ㅑㄴ녇', 'issue'], + ['ㅏ됴ㅠㅑㅜ야ㅜㅎㄴ', 'keybindings'], + ['ㅣ무혐ㅎㄷㅇㄷㅅㄷㅊ샤ㅐㅜ', 'languageDetection'], + ['ㅣ무혐ㅎㄷㄴㅅㅁ션', 'languageStatus'], + ['ㅣㅑㅡㅑ샤ㅜ얓ㅁ색', 'limitIndicator'], + ['ㅣㅑㄴㅅ', 'list'], + ['ㅣㅐㅊ미ㅗㅑㄴ새교', 'localHistory'], + ['ㅣㅐㅊ미ㅑㅋㅁ샤ㅐㅜ', 'localization'], + ['ㅣㅐㅎㄴ', 'logs'], + ['ㅡ메ㅔㄷㅇㄸ얏ㄴ', 'mappedEdits'], + ['ㅡㅁ가애주', 'markdown'], + ['ㅡㅁ갇ㄱㄴ', 'markers'], + ['ㅡㄷㄱㅎㄷㄸ야색', 'mergeEditor'], + ['ㅡㅕㅣ샤얄ㄹㄸ야색', 'multiDiffEditor'], + ['ㅜㅐㅅ듀ㅐㅐㅏ', 'notebook'], + ['ㅐㅕ시ㅑㅜㄷ', 'outline'], + ['ㅐㅕ세ㅕㅅ', 'output'], + ['ㅔㄷㄱ래그뭋ㄷ', 'performance'], + ['ㅔㄱㄷㄹㄷㄱ둧ㄷㄴ', 'preferences'], + ['벼ㅑ참ㅊㅊㄷㄴㄴ', 'quickaccess'], + ['ㄱ디며ㅜ촏ㄱ', 'relauncher'], + ['ㄱ드ㅐㅅㄷ', 'remote'], + ['ㄱ드ㅐㅅㄷ쎠ㅜㅜ디', 'remoteTunnel'], + ['ㄴㅁ노', 'sash'], + ['ㄴ츠', 'scm'], + ['ㄴㄷㅁㄱ초', 'search'], + ['ㄴㄷㅁㄱ초ㄸ야색', 'searchEditor'], + ['놈ㄱㄷ', 'share'], + ['누ㅑㅔㅔㄷㅅㄴ', 'snippets'], + ['넫ㄷ초', 'speech'], + ['네ㅣㅁ노', 'splash'], + ['녁ㅍ됸', 'surveys'], + ['ㅅㅁㅎㄴ', 'tags'], + ['ㅅㅁ난', 'tasks'], + ['ㅅ디듣ㅅ교', 'telemetry'], + ['ㅅㄷ그ㅑㅜ미', 'terminal'], + ['ㅅㄷ그ㅑㅜ미채ㅜㅅ갸ㅠ', 'terminalContrib'], + ['ㅅㄷㄴ샤ㅜㅎ', 'testing'], + ['소듣ㄴ', 'themes'], + ['샤ㅡ디ㅑㅜㄷ', 'timeline'], + ['쇼ㅔ도ㅑㄷㄱㅁㄱ초ㅛ', 'typeHierarchy'], + ['ㅕㅔㅇㅁㅅㄷ', 'update'], + ['ㅕ기', 'url'], + ['ㅕㄴㄷㄱㅇㅁㅅ몌개랴ㅣㄷ', 'userDataProfile'], + ['ㅕㄴㄷㄱㅇㅁㅅㅁ뇨ㅜㅊ', 'userDataSync'], + ['ㅈ듀퍋ㅈ', 'webview'], + ['ㅈ듀퍋졔무디', 'webviewPanel'], + ['ㅈ듀퍋ㅈ퍋ㅈ', 'webviewView'], + ['ㅈ디채ㅡ듀무ㅜㄷㄱ', 'welcomeBanner'], + ['ㅈ디채ㅡㄷ야미ㅐㅎ', 'welcomeDialog'], + ['ㅈ디채ㅡㄷㅎㄷㅅ샤ㅜㅎㄴㅅㅁㄳㄷㅇ', 'welcomeGettingStarted'], + ['ㅈ디채ㅡㄷ퍋ㅈㄴ', 'welcomeViews'], + ['ㅈ디채ㅡㄷㅉ미ㅏ소개ㅕ호', 'welcomeWalkthrough'], + ['재가넴ㅊㄷ', 'workspace'], + ['재가넴ㅊㄷㄴ', 'workspaces'], + ]); + for (const [hangul, alt] of cases.entries()) { + // Compare with lower case as some cases do not have + // corresponding hangul inputs + strictEqual( + getKoreanAltCharsForString(hangul).toLowerCase(), + alt.toLowerCase(), + `"${hangul}" (0x${hangul.charCodeAt(0).toString(16)}) should result in "${alt}"` + ); + } + }); + }); +}); diff --git a/src/vs/base/test/common/normalization.test.ts b/src/vs/base/test/common/normalization.test.ts index 4f08e4721d8..65b44eb652c 100644 --- a/src/vs/base/test/common/normalization.test.ts +++ b/src/vs/base/test/common/normalization.test.ts @@ -5,8 +5,10 @@ import * as assert from 'assert'; import { removeAccents } from 'vs/base/common/normalization'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; suite('Normalization', () => { + ensureNoDisposablesAreLeakedInTestSuite(); test('removeAccents', function () { assert.strictEqual(removeAccents('joào'), 'joao'); diff --git a/src/vs/base/test/common/objects.test.ts b/src/vs/base/test/common/objects.test.ts index 867615abce6..2b98c775baa 100644 --- a/src/vs/base/test/common/objects.test.ts +++ b/src/vs/base/test/common/objects.test.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; import * as objects from 'vs/base/common/objects'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; const check = (one: any, other: any, msg: string) => { assert(objects.equals(one, other), msg); @@ -17,6 +18,8 @@ const checkNot = (one: any, other: any, msg: string) => { suite('Objects', () => { + ensureNoDisposablesAreLeakedInTestSuite(); + test('equals', () => { check(null, null, 'null'); check(undefined, undefined, 'undefined'); diff --git a/src/vs/base/test/common/prefixTree.test.ts b/src/vs/base/test/common/prefixTree.test.ts index b93921810d3..1973e6a8b5d 100644 --- a/src/vs/base/test/common/prefixTree.test.ts +++ b/src/vs/base/test/common/prefixTree.test.ts @@ -5,10 +5,13 @@ import { WellDefinedPrefixTree } from 'vs/base/common/prefixTree'; import * as assert from 'assert'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; suite('WellDefinedPrefixTree', () => { let tree: WellDefinedPrefixTree; + ensureNoDisposablesAreLeakedInTestSuite(); + setup(() => { tree = new WellDefinedPrefixTree(); }); diff --git a/src/vs/base/test/common/strings.test.ts b/src/vs/base/test/common/strings.test.ts index 18e53a2e5d0..766380ac8ec 100644 --- a/src/vs/base/test/common/strings.test.ts +++ b/src/vs/base/test/common/strings.test.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; import * as strings from 'vs/base/common/strings'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; suite('Strings', () => { test('equalsIgnoreCase', () => { @@ -132,8 +133,26 @@ suite('Strings', () => { assert.strictEqual(strings.lcut('foo bar', 5), 'foo bar'); assert.strictEqual(strings.lcut('test string 0.1.2.3', 3), '2.3'); + assert.strictEqual(strings.lcut('foo bar', 0, '…'), '…'); + assert.strictEqual(strings.lcut('foo bar', 1, '…'), '…bar'); + assert.strictEqual(strings.lcut('foo bar', 3, '…'), '…bar'); + assert.strictEqual(strings.lcut('foo bar', 4, '…'), '…bar'); // Leading whitespace trimmed + assert.strictEqual(strings.lcut('foo bar', 5, '…'), 'foo bar'); + assert.strictEqual(strings.lcut('test string 0.1.2.3', 3, '…'), '…2.3'); + assert.strictEqual(strings.lcut('', 10), ''); assert.strictEqual(strings.lcut('a', 10), 'a'); + assert.strictEqual(strings.lcut(' a', 10), 'a'); + assert.strictEqual(strings.lcut(' a', 10), 'a'); + assert.strictEqual(strings.lcut(' bbbb a', 10), 'bbbb a'); + assert.strictEqual(strings.lcut('............a', 10), '............a'); + + assert.strictEqual(strings.lcut('', 10, '…'), ''); + assert.strictEqual(strings.lcut('a', 10, '…'), 'a'); + assert.strictEqual(strings.lcut(' a', 10, '…'), 'a'); + assert.strictEqual(strings.lcut(' a', 10, '…'), 'a'); + assert.strictEqual(strings.lcut(' bbbb a', 10, '…'), 'bbbb a'); + assert.strictEqual(strings.lcut('............a', 10, '…'), '............a'); }); test('escape', () => { @@ -371,6 +390,11 @@ suite('Strings', () => { assert.strictEqual('hello…', strings.truncate('hello world', 5)); }); + test('truncateMiddle', () => { + assert.strictEqual('hello world', strings.truncateMiddle('hello world', 100)); + assert.strictEqual('he…ld', strings.truncateMiddle('hello world', 5)); + }); + test('replaceAsync', async () => { let i = 0; assert.strictEqual(await strings.replaceAsync('abcabcabcabc', /b(.)/g, async (match, after) => { @@ -505,4 +529,16 @@ suite('Strings', () => { assert.strictEqual(strings.removeAnsiEscapeCodes(`hello${sequence}world`), 'helloworld', `expect to remove ${JSON.stringify(sequence)}`); } }); + + ensureNoDisposablesAreLeakedInTestSuite(); +}); + +test('htmlAttributeEncodeValue', () => { + assert.strictEqual(strings.htmlAttributeEncodeValue(''), ''); + assert.strictEqual(strings.htmlAttributeEncodeValue('abc'), 'abc'); + assert.strictEqual(strings.htmlAttributeEncodeValue(''), '<script>alert("Hello")</script>'); + assert.strictEqual(strings.htmlAttributeEncodeValue('Hello & World'), 'Hello & World'); + assert.strictEqual(strings.htmlAttributeEncodeValue('"Hello"'), '"Hello"'); + assert.strictEqual(strings.htmlAttributeEncodeValue('\'Hello\''), ''Hello''); + assert.strictEqual(strings.htmlAttributeEncodeValue('<>&\'"'), '<>&'"'); }); diff --git a/src/vs/base/test/common/tfIdf.test.ts b/src/vs/base/test/common/tfIdf.test.ts index 69c094759eb..3a423f253a3 100644 --- a/src/vs/base/test/common/tfIdf.test.ts +++ b/src/vs/base/test/common/tfIdf.test.ts @@ -6,6 +6,7 @@ import * as assert from 'assert'; import { CancellationToken } from 'vs/base/common/cancellation'; import { TfIdfCalculator, TfIdfDocument, TfIdfScore } from 'vs/base/common/tfIdf'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; /** * Generates all permutations of an array. @@ -39,6 +40,7 @@ function assertScoreOrdersEqual(actualScores: TfIdfScore[], expectedScoreKeys: s } suite('TF-IDF Calculator', function () { + ensureNoDisposablesAreLeakedInTestSuite(); test('Should return no scores when no documents are given', () => { const tfidf = new TfIdfCalculator(); const scores = tfidf.calculateScores('something', CancellationToken.None); diff --git a/src/vs/base/test/node/crypto.test.ts b/src/vs/base/test/node/crypto.test.ts index 95a04d6a113..f61fe475b7a 100644 --- a/src/vs/base/test/node/crypto.test.ts +++ b/src/vs/base/test/node/crypto.test.ts @@ -27,6 +27,6 @@ flakySuite('Crypto', () => { const testFile = join(testDir, 'checksum.txt'); await Promises.writeFile(testFile, 'Hello World'); - await checksum(testFile, '0a4d55a8d778e5022fab701977c5d840bbc486d0'); + await checksum(testFile, 'a591a6d40bf420404a011733cfb7b190d62c65bf0bcda32b57b277d9ad9f146e'); }); }); diff --git a/src/vs/base/test/node/id.test.ts b/src/vs/base/test/node/id.test.ts index bdec456edde..47580ff957c 100644 --- a/src/vs/base/test/node/id.test.ts +++ b/src/vs/base/test/node/id.test.ts @@ -7,8 +7,10 @@ import * as assert from 'assert'; import { getMachineId, getSqmMachineId } from 'vs/base/node/id'; import { getMac } from 'vs/base/node/macAddress'; import { flakySuite } from 'vs/base/test/node/testUtils'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; flakySuite('ID', () => { + ensureNoDisposablesAreLeakedInTestSuite(); test('getMachineId', async function () { const errors = []; diff --git a/src/vs/base/test/node/nodeStreams.test.ts b/src/vs/base/test/node/nodeStreams.test.ts index 620f817dfc9..8cab1cc8420 100644 --- a/src/vs/base/test/node/nodeStreams.test.ts +++ b/src/vs/base/test/node/nodeStreams.test.ts @@ -7,8 +7,11 @@ import { Writable } from 'stream'; import * as assert from 'assert'; import { StreamSplitter } from 'vs/base/node/nodeStreams'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; suite('StreamSplitter', () => { + ensureNoDisposablesAreLeakedInTestSuite(); + test('should split a stream on a single character splitter', (done) => { const chunks: string[] = []; const splitter = new StreamSplitter('\n'); diff --git a/src/vs/base/test/node/port.test.ts b/src/vs/base/test/node/port.test.ts index 120044651b5..9230dc84684 100644 --- a/src/vs/base/test/node/port.test.ts +++ b/src/vs/base/test/node/port.test.ts @@ -6,6 +6,7 @@ import * as assert from 'assert'; import * as net from 'net'; import * as ports from 'vs/base/node/ports'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; import { flakySuite } from 'vs/base/test/node/testUtils'; flakySuite('Ports', () => { @@ -29,4 +30,6 @@ flakySuite('Ports', () => { }); }, err => done(err)); }); + + ensureNoDisposablesAreLeakedInTestSuite(); }); diff --git a/src/vs/base/test/node/powershell.test.ts b/src/vs/base/test/node/powershell.test.ts index a93a88fc746..a710bb80c46 100644 --- a/src/vs/base/test/node/powershell.test.ts +++ b/src/vs/base/test/node/powershell.test.ts @@ -6,6 +6,7 @@ import * as assert from 'assert'; import * as fs from 'fs'; import * as platform from 'vs/base/common/platform'; import { enumeratePowerShellInstallations, getFirstAvailablePowerShellInstallation, IPowerShellExeDetails } from 'vs/base/node/powershell'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; function checkPath(exePath: string) { // Check to see if the path exists @@ -28,7 +29,7 @@ function checkPath(exePath: string) { if (platform.isWindows) { suite('PowerShell finder', () => { - + ensureNoDisposablesAreLeakedInTestSuite(); test('Can find first available PowerShell', async () => { const pwshExe = await getFirstAvailablePowerShellInstallation(); const exePath = pwshExe?.exePath; diff --git a/src/vs/base/test/node/unc.test.ts b/src/vs/base/test/node/unc.test.ts index 82eaf25860d..acbc3203536 100644 --- a/src/vs/base/test/node/unc.test.ts +++ b/src/vs/base/test/node/unc.test.ts @@ -5,6 +5,7 @@ import { strictEqual } from 'assert'; import { getUNCHost } from 'vs/base/node/unc'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; suite('UNC', () => { @@ -43,4 +44,6 @@ suite('UNC', () => { strictEqual(getUNCHost('\\\\.\\UNC\\localhost\\a'), 'localhost'); strictEqual(getUNCHost('\\\\?\\UNC\\localhost\\a'), 'localhost'); }); + + ensureNoDisposablesAreLeakedInTestSuite(); }); diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts index dee15a5f132..16c18d0e0ac 100644 --- a/src/vs/code/browser/workbench/workbench.ts +++ b/src/vs/code/browser/workbench/workbench.ts @@ -17,9 +17,8 @@ import { URI, UriComponents } from 'vs/base/common/uri'; import product from 'vs/platform/product/common/product'; import { ISecretStorageProvider } from 'vs/platform/secrets/common/secrets'; import { isFolderToOpen, isWorkspaceToOpen } from 'vs/platform/window/common/window'; -import type { IWorkbenchConstructionOptions } from 'vs/workbench/browser/web.api'; +import type { IWorkbenchConstructionOptions, IWorkspace, IWorkspaceProvider } from 'vs/workbench/browser/web.api'; import { AuthenticationSessionInfo } from 'vs/workbench/services/authentication/browser/authenticationService'; -import type { IWorkspace, IWorkspaceProvider } from 'vs/workbench/services/host/browser/browserHostService'; import type { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService'; import { create } from 'vs/workbench/workbench.web.main'; diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index 42e165b8517..6f02aa6fc22 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -301,6 +301,24 @@ export class CodeApplication extends Disposable { //#endregion + //#region Allow CORS for the PRSS CDN + + // https://github.com/microsoft/vscode-remote-release/issues/9246 + session.defaultSession.webRequest.onHeadersReceived((details, callback) => { + if (details.url.startsWith('https://vscode.download.prss.microsoft.com/')) { + const responseHeaders = details.responseHeaders ?? Object.create(null); + + if (responseHeaders['Access-Control-Allow-Origin'] === undefined) { + responseHeaders['Access-Control-Allow-Origin'] = ['*']; + return callback({ cancel: false, responseHeaders }); + } + } + + return callback({ cancel: false }); + }); + + //#endregion + //#region Code Cache type SessionWithCodeCachePathSupport = Session & { @@ -498,6 +516,13 @@ export class CodeApplication extends Disposable { validatedIpcMain.on('vscode:reloadWindow', event => event.sender.reload()); + validatedIpcMain.handle('vscode:notifyZoomLevel', async (event, zoomLevel: number | undefined) => { + const window = this.windowsMainService?.getWindowById(event.sender.id); + if (window) { + window.notifyZoomLevel(zoomLevel); + } + }); + //#endregion } diff --git a/src/vs/code/electron-sandbox/issue/issueReporterService.ts b/src/vs/code/electron-sandbox/issue/issueReporterService.ts index d7f98f666b9..896747af279 100644 --- a/src/vs/code/electron-sandbox/issue/issueReporterService.ts +++ b/src/vs/code/electron-sandbox/issue/issueReporterService.ts @@ -71,7 +71,6 @@ export class IssueReporter extends Disposable { }); //TODO: Handle case where extension is not activated - const issueReporterElement = this.getElementById('issue-reporter'); if (issueReporterElement) { this.previewButton = new Button(issueReporterElement, unthemedButtonStyles); @@ -127,12 +126,17 @@ export class IssueReporter extends Disposable { this.setUpTypes(); this.setEventHandlers(); - applyZoom(configuration.data.zoomLevel); + applyZoom(configuration.data.zoomLevel, mainWindow); this.applyStyles(configuration.data.styles); this.handleExtensionData(configuration.data.enabledExtensions); this.updateExperimentsInfo(configuration.data.experiments); this.updateRestrictedMode(configuration.data.restrictedMode); this.updateUnsupportedMode(configuration.data.isUnsupported); + + // Handle case where extension is pre-selected through the command + if (configuration.data.command && targetExtension) { + this.updateExtensionStatus(targetExtension); + } } render(): void { @@ -435,12 +439,12 @@ export class IssueReporter extends Disposable { // Cmd/Ctrl + zooms in if (cmdOrCtrlKey && e.keyCode === 187) { - zoomIn(); + zoomIn(mainWindow); } // Cmd/Ctrl - zooms out if (cmdOrCtrlKey && e.keyCode === 189) { - zoomOut(); + zoomOut(mainWindow); } // With latest electron upgrade, cmd+a is no longer propagating correctly for inputs in this window on mac @@ -772,7 +776,6 @@ export class IssueReporter extends Disposable { hide(workspaceBlock); hide(extensionsBlock); hide(experimentsBlock); - hide(problemSource); hide(extensionSelector); hide(extensionDataTextArea); hide(extensionDataBlock); @@ -785,7 +788,7 @@ export class IssueReporter extends Disposable { show(extensionSelector); } - if (fileOnExtension && selectedExtension?.hasIssueUriRequestHandler) { + if (fileOnExtension && selectedExtension?.hasIssueUriRequestHandler && !selectedExtension.hasIssueDataProviders) { hide(titleTextArea); hide(descriptionTextArea); reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VS Code")); @@ -890,8 +893,10 @@ export class IssueReporter extends Disposable { } private async createIssue(): Promise { + const hasUri = this.issueReporterModel.getData().selectedExtension?.hasIssueUriRequestHandler; + const hasData = this.issueReporterModel.getData().selectedExtension?.hasIssueDataProviders; // Short circuit if the extension provides a custom issue handler - if (this.issueReporterModel.getData().selectedExtension?.hasIssueUriRequestHandler) { + if (hasUri && !hasData) { const url = this.getExtensionBugsUrl(); if (url) { this.hasBeenSubmitted = true; @@ -934,7 +939,10 @@ export class IssueReporter extends Disposable { const issueTitle = (this.getElementById('issue-title')).value; const issueBody = this.issueReporterModel.serialize(); - const issueUrl = this.getIssueUrl(); + const issueUrl = hasUri ? this.getExtensionBugsUrl() : this.getIssueUrl(); + if (!issueUrl) { + return false; + } const gitHubDetails = this.parseGitHubUrl(issueUrl); if (this.configuration.data.githubAccessToken && gitHubDetails) { return this.submitToGitHub(issueTitle, issueBody, gitHubDetails); @@ -1141,49 +1149,13 @@ export class IssueReporter extends Disposable { const extensions = this.issueReporterModel.getData().allExtensions; const matches = extensions.filter(extension => extension.id === selectedExtensionId); if (matches.length) { - this.issueReporterModel.update({ selectedExtension: matches[0] }); - - // if extension does not have provider/handles, will check for either. If extension is already active, IPC will return [false, false] and will proceed as normal. - if (!matches[0].hasIssueDataProviders && !matches[0].hasIssueUriRequestHandler) { - const toActivate = await this.getReporterStatus(matches[0]); - matches[0].hasIssueDataProviders = toActivate[0]; - matches[0].hasIssueUriRequestHandler = toActivate[1]; - this.renderBlocks(); - } - - if (matches[0].hasIssueUriRequestHandler) { - this.updateIssueReporterUri(matches[0]); - } else if (matches[0].hasIssueDataProviders) { - const template = await this.getIssueTemplateFromExtension(matches[0]); - const descriptionTextArea = this.getElementById('description')!; - const descriptionText = (descriptionTextArea as HTMLTextAreaElement).value; - if (descriptionText === '' || !descriptionText.includes(template)) { - const fullTextArea = descriptionText + (descriptionText === '' ? '' : '\n') + template; - (descriptionTextArea as HTMLTextAreaElement).value = fullTextArea; - this.issueReporterModel.update({ issueDescription: fullTextArea }); - } - const extensionDataBlock = mainWindow.document.querySelector('.block-extension-data')!; - show(extensionDataBlock); - - // Start loading for extension data. - const iconElement = document.createElement('span'); - iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin'); - this.setLoading(iconElement); - await this.getIssueDataFromExtension(matches[0]); - this.removeLoading(iconElement); - } else { - this.validateSelectedExtension(); - this.issueReporterModel.update({ extensionData: undefined }); - const title = (this.getElementById('issue-title')).value; - this.searchExtensionIssues(title); - } + this.updateExtensionStatus(matches[0]); } else { this.issueReporterModel.update({ selectedExtension: undefined }); this.clearSearchResults(); this.validateSelectedExtension(); } - this.updatePreviewButtonState(); - this.renderBlocks(); + }); } @@ -1192,6 +1164,73 @@ export class IssueReporter extends Disposable { }); } + private async updateExtensionStatus(extension: IssueReporterExtensionData) { + this.issueReporterModel.update({ selectedExtension: extension }); + + // if extension does not have provider/handles, will check for either. If extension is already active, IPC will return [false, false] and will proceed as normal. + if (!extension.hasIssueDataProviders && !extension.hasIssueUriRequestHandler) { + const toActivate = await this.getReporterStatus(extension); + extension.hasIssueDataProviders = toActivate[0]; + extension.hasIssueUriRequestHandler = toActivate[1]; + this.renderBlocks(); + } + + if (extension.hasIssueUriRequestHandler && extension.hasIssueDataProviders) { + // update this first + const template = await this.getIssueTemplateFromExtension(extension); + const descriptionTextArea = this.getElementById('description')!; + const descriptionText = (descriptionTextArea as HTMLTextAreaElement).value; + if (descriptionText === '' || !descriptionText.includes(template)) { + const fullTextArea = descriptionText + (descriptionText === '' ? '' : '\n') + template; + (descriptionTextArea as HTMLTextAreaElement).value = fullTextArea; + this.issueReporterModel.update({ issueDescription: fullTextArea }); + } + const extensionDataBlock = mainWindow.document.querySelector('.block-extension-data')!; + show(extensionDataBlock); + + // Start loading for extension data. + const iconElement = document.createElement('span'); + iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin'); + this.setLoading(iconElement); + await this.getIssueDataFromExtension(extension); + this.removeLoading(iconElement); + + // then update this + this.updateIssueReporterUri(extension); + + // reset to false so issue url is updated, but won't be affected later. + // extension.hasIssueUriRequestHandler = false; + } else if (extension.hasIssueUriRequestHandler) { + this.updateIssueReporterUri(extension); + } else if (extension.hasIssueDataProviders) { + const template = await this.getIssueTemplateFromExtension(extension); + const descriptionTextArea = this.getElementById('description')!; + const descriptionText = (descriptionTextArea as HTMLTextAreaElement).value; + if (descriptionText === '' || !descriptionText.includes(template)) { + const fullTextArea = descriptionText + (descriptionText === '' ? '' : '\n') + template; + (descriptionTextArea as HTMLTextAreaElement).value = fullTextArea; + this.issueReporterModel.update({ issueDescription: fullTextArea }); + } + const extensionDataBlock = mainWindow.document.querySelector('.block-extension-data')!; + show(extensionDataBlock); + + // Start loading for extension data. + const iconElement = document.createElement('span'); + iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin'); + this.setLoading(iconElement); + await this.getIssueDataFromExtension(extension); + this.removeLoading(iconElement); + } else { + this.validateSelectedExtension(); + this.issueReporterModel.update({ extensionData: undefined }); + const title = (this.getElementById('issue-title')).value; + this.searchExtensionIssues(title); + } + + this.updatePreviewButtonState(); + this.renderBlocks(); + } + private validateSelectedExtension(): void { const extensionValidationMessage = this.getElementById('extension-selection-validation-error')!; const extensionValidationNoUrlsMessage = this.getElementById('extension-selection-validation-error-no-url')!; @@ -1205,7 +1244,7 @@ export class IssueReporter extends Disposable { } const hasValidGitHubUrl = this.getExtensionGitHubUrl(); - if (hasValidGitHubUrl || extension.hasIssueUriRequestHandler) { + if (hasValidGitHubUrl || (extension.hasIssueUriRequestHandler && !extension.hasIssueDataProviders)) { this.previewButton.enabled = true; } else { this.setExtensionValidationMessage(); diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts b/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts index 522c418ffaa..91bb7854340 100644 --- a/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts +++ b/src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts @@ -245,7 +245,7 @@ class ProcessExplorer { this.setEventHandlers(data); ipcRenderer.on('vscode:pidToNameResponse', (event: unknown, pidToNames: [number, string][]) => { - this.mapPidToName = new Map(); + this.mapPidToName.clear(); for (const [pid, name] of pidToNames) { this.mapPidToName.set(pid, name); @@ -288,12 +288,12 @@ class ProcessExplorer { // Cmd/Ctrl + zooms in if (cmdOrCtrlKey && e.keyCode === 187) { - zoomIn(); + zoomIn(mainWindow); } // Cmd/Ctrl - zooms out if (cmdOrCtrlKey && e.keyCode === 189) { - zoomOut(); + zoomOut(mainWindow); } }; } @@ -595,7 +595,7 @@ export function startup(configuration: ProcessExplorerWindowConfiguration): void const platformClass = configuration.data.platform === 'win32' ? 'windows' : configuration.data.platform === 'linux' ? 'linux' : 'mac'; mainWindow.document.body.classList.add(platformClass); // used by our fonts createCodiconStyleSheet(); - applyZoom(configuration.data.zoomLevel); + applyZoom(configuration.data.zoomLevel, mainWindow); new ProcessExplorer(configuration.windowId, configuration.data); } diff --git a/src/vs/code/electron-sandbox/workbench/workbench-dev.html b/src/vs/code/electron-sandbox/workbench/workbench-dev.html index 02f40f0b97e..a92bea242a4 100644 --- a/src/vs/code/electron-sandbox/workbench/workbench-dev.html +++ b/src/vs/code/electron-sandbox/workbench/workbench-dev.html @@ -42,6 +42,7 @@ 'self' vscode-remote-resource: vscode-managed-remote-resource: + https://*.vscode-unpkg.net ; require-trusted-types-for 'script' diff --git a/src/vs/code/electron-sandbox/workbench/workbench.html b/src/vs/code/electron-sandbox/workbench/workbench.html index c787d56e30b..eb525bd59f6 100644 --- a/src/vs/code/electron-sandbox/workbench/workbench.html +++ b/src/vs/code/electron-sandbox/workbench/workbench.html @@ -42,6 +42,7 @@ 'self' vscode-remote-resource: vscode-managed-remote-resource: + https://*.vscode-unpkg.net ; require-trusted-types-for 'script' diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts index 89265911347..0ecdbb32e77 100644 --- a/src/vs/code/node/cli.ts +++ b/src/vs/code/node/cli.ts @@ -27,6 +27,7 @@ import { FileAccess } from 'vs/base/common/network'; import { cwd } from 'vs/base/common/process'; import { addUNCHostToAllowlist } from 'vs/base/node/unc'; import { URI } from 'vs/base/common/uri'; +import { DeferredPromise } from 'vs/base/common/async'; function shouldSpawnCliProcess(argv: NativeParsedArgs): boolean { return !!argv['install-source'] @@ -204,7 +205,7 @@ export async function main(argv: string[]): Promise { }); } - const hasReadStdinArg = args._.some(a => a === '-'); + const hasReadStdinArg = args._.some(arg => arg === '-'); if (hasReadStdinArg) { // remove the "-" argument when we read from stdin args._ = args._.filter(a => a !== '-'); @@ -221,17 +222,14 @@ export async function main(argv: string[]): Promise { if (hasReadStdinArg) { stdinFilePath = getStdinFilePath(); - // returns a file path where stdin input is written into (write in progress). try { - await readFromStdin(stdinFilePath, !!args.verbose); // throws error if file can not be written + const readFromStdinDone = new DeferredPromise(); + await readFromStdin(stdinFilePath, !!args.verbose, () => readFromStdinDone.complete()); + processCallbacks.push(() => readFromStdinDone.p); - // Make sure to open tmp file + // Make sure to open tmp file as editor but ignore it in the "recently open" list addArg(argv, stdinFilePath); - - // Enable --wait to get all data and ignore adding this to history - addArg(argv, '--wait'); addArg(argv, '--skip-add-to-recently-opened'); - args.wait = true; console.log(`Reading from stdin via: ${stdinFilePath}`); } catch (e) { @@ -388,8 +386,7 @@ export async function main(argv: string[]): Promise { const extHost = await extHostProfileRequest; const renderer = await rendererProfileRequest; - // wait for the renderer to delete the - // marker file + // wait for the renderer to delete the marker file await whenDeleted(filenamePrefix); // stop profiling 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 66e759a6fc3..be9c47d5bc4 100644 --- a/src/vs/code/test/electron-sandbox/issue/testReporterModel.test.ts +++ b/src/vs/code/test/electron-sandbox/issue/testReporterModel.test.ts @@ -4,12 +4,13 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; +import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; import { IssueReporterModel } from 'vs/code/electron-sandbox/issue/issueReporterModel'; import { IssueType } from 'vs/platform/issue/common/issue'; import { normalizeGitHubUrl } from 'vs/platform/issue/common/issueReporterUtil'; suite('IssueReporter', () => { - + ensureNoDisposablesAreLeakedInTestSuite(); test('sets defaults to include all data', () => { const issueReporterModel = new IssueReporterModel(); assert.deepStrictEqual(issueReporterModel.getData(), { diff --git a/src/vs/editor/browser/config/elementSizeObserver.ts b/src/vs/editor/browser/config/elementSizeObserver.ts index 9dd5af8e6d3..33eefc3aba8 100644 --- a/src/vs/editor/browser/config/elementSizeObserver.ts +++ b/src/vs/editor/browser/config/elementSizeObserver.ts @@ -47,10 +47,10 @@ export class ElementSizeObserver extends Disposable { // Otherwise we will postpone to the next animation frame. // We'll use `observeContentRect` to store the content rect we received. - let observeContentRect: DOMRectReadOnly | null = null; + let observedDimenstion: IDimension | null = null; const observeNow = () => { - if (observeContentRect) { - this.observe({ width: observeContentRect.width, height: observeContentRect.height }); + if (observedDimenstion) { + this.observe({ width: observedDimenstion.width, height: observedDimenstion.height }); } else { this.observe(); } @@ -75,7 +75,11 @@ export class ElementSizeObserver extends Disposable { }; this._resizeObserver = new ResizeObserver((entries) => { - observeContentRect = (entries && entries[0] && entries[0].contentRect ? entries[0].contentRect : null); + if (entries && entries[0] && entries[0].contentRect) { + observedDimenstion = { width: entries[0].contentRect.width, height: entries[0].contentRect.height }; + } else { + observedDimenstion = null; + } shouldObserve = true; update(); }); diff --git a/src/vs/editor/browser/config/migrateOptions.ts b/src/vs/editor/browser/config/migrateOptions.ts index 6c3d926ff36..c98f644a339 100644 --- a/src/vs/editor/browser/config/migrateOptions.ts +++ b/src/vs/editor/browser/config/migrateOptions.ts @@ -91,6 +91,8 @@ registerSimpleEditorSettingMigration('autoIndent', [[false, 'advanced'], [true, registerSimpleEditorSettingMigration('matchBrackets', [[true, 'always'], [false, 'never']]); registerSimpleEditorSettingMigration('renderFinalNewline', [[true, 'on'], [false, 'off']]); registerSimpleEditorSettingMigration('cursorSmoothCaretAnimation', [[true, 'on'], [false, 'off']]); +registerSimpleEditorSettingMigration('occurrencesHighlight', [[true, 'singleFile'], [false, 'off']]); +registerSimpleEditorSettingMigration('wordBasedSuggestions', [[true, 'matchingDocuments'], [false, 'off']]); registerEditorSettingMigration('autoClosingBrackets', (value, read, write) => { if (value === false) { @@ -194,23 +196,23 @@ registerEditorSettingMigration('experimental.stickyScroll.maxLineCount', (value, }); // Code Actions on Save -// registerEditorSettingMigration('codeActionsOnSave', (value, read, write) => { -// if (value && typeof value === 'object') { -// let toBeModified = false; -// const newValue = {} as any; -// for (const entry of Object.entries(value)) { -// if (typeof entry[1] === 'boolean') { -// toBeModified = true; -// newValue[entry[0]] = entry[1] ? 'explicit' : 'never'; -// } else { -// newValue[entry[0]] = entry[1]; -// } -// } -// if (toBeModified) { -// write(`codeActionsOnSave`, newValue); -// } -// } -// }); +registerEditorSettingMigration('codeActionsOnSave', (value, read, write) => { + if (value && typeof value === 'object') { + let toBeModified = false; + const newValue = {} as any; + for (const entry of Object.entries(value)) { + if (typeof entry[1] === 'boolean') { + toBeModified = true; + newValue[entry[0]] = entry[1] ? 'explicit' : 'never'; + } else { + newValue[entry[0]] = entry[1]; + } + } + if (toBeModified) { + write(`codeActionsOnSave`, newValue); + } + } +}); // Migrate Quick Fix Settings registerEditorSettingMigration('codeActionWidget.includeNearbyQuickfixes', (value, read, write) => { @@ -221,3 +223,11 @@ registerEditorSettingMigration('codeActionWidget.includeNearbyQuickfixes', (valu } } }); + +// Migrate the lightbulb settings +registerEditorSettingMigration('lightbulb.enabled', (value, read, write) => { + if (typeof value === 'boolean') { + write('lightbulb.enabled', value ? undefined : 'off'); + } +}); + diff --git a/src/vs/editor/browser/controller/mouseHandler.ts b/src/vs/editor/browser/controller/mouseHandler.ts index e4551a39cbe..55d58d6eef9 100644 --- a/src/vs/editor/browser/controller/mouseHandler.ts +++ b/src/vs/editor/browser/controller/mouseHandler.ts @@ -687,6 +687,7 @@ class TopBottomDragScrollingOperation extends Disposable { public override dispose(): void { this._animationFrameDisposable.dispose(); + super.dispose(); } public setPosition(position: IMouseTargetOutsideEditor, mouseEvent: EditorMouseEvent): void { diff --git a/src/vs/editor/browser/controller/mouseTarget.ts b/src/vs/editor/browser/controller/mouseTarget.ts index 4b7929cd8ed..b6bb7881850 100644 --- a/src/vs/editor/browser/controller/mouseTarget.ts +++ b/src/vs/editor/browser/controller/mouseTarget.ts @@ -219,6 +219,13 @@ class ElementPath { && path[1] === PartFingerprint.OverlayWidgets ); } + + public static isChildOfOverflowingOverlayWidgets(path: Uint8Array): boolean { + return ( + path.length >= 1 + && path[0] === PartFingerprint.OverflowingOverlayWidgets + ); + } } export class HitTestContext { @@ -490,7 +497,7 @@ export class MouseTargetFactory { } // Is it an overlay widget? - if (ElementPath.isChildOfOverlayWidgets(path)) { + if (ElementPath.isChildOfOverlayWidgets(path) || ElementPath.isChildOfOverflowingOverlayWidgets(path)) { return true; } @@ -545,7 +552,7 @@ export class MouseTargetFactory { let result: IMouseTarget | null = null; - if (!ElementPath.isChildOfOverflowGuard(request.targetPath) && !ElementPath.isChildOfOverflowingContentWidgets(request.targetPath)) { + if (!ElementPath.isChildOfOverflowGuard(request.targetPath) && !ElementPath.isChildOfOverflowingContentWidgets(request.targetPath) && !ElementPath.isChildOfOverflowingOverlayWidgets(request.targetPath)) { // We only render dom nodes inside the overflow guard or in the overflowing content widgets result = result || request.fulfillUnknown(); } @@ -579,7 +586,7 @@ export class MouseTargetFactory { private static _hitTestOverlayWidget(ctx: HitTestContext, request: ResolvedHitTestRequest): IMouseTarget | null { // Is it an overlay widget? - if (ElementPath.isChildOfOverlayWidgets(request.targetPath)) { + if (ElementPath.isChildOfOverlayWidgets(request.targetPath) || ElementPath.isChildOfOverflowingOverlayWidgets(request.targetPath)) { const widgetId = ctx.findAttribute(request.target, 'widgetId'); if (widgetId) { return request.fulfillOverlayWidget(widgetId); diff --git a/src/vs/editor/browser/controller/pointerHandler.ts b/src/vs/editor/browser/controller/pointerHandler.ts index b21e9fb821b..1ae9ecab361 100644 --- a/src/vs/editor/browser/controller/pointerHandler.ts +++ b/src/vs/editor/browser/controller/pointerHandler.ts @@ -3,19 +3,19 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { BrowserFeatures } from 'vs/base/browser/canIUse'; import * as dom from 'vs/base/browser/dom'; -import * as platform from 'vs/base/common/platform'; import { EventType, Gesture, GestureEvent } from 'vs/base/browser/touch'; +import { mainWindow } from 'vs/base/browser/window'; import { Disposable } from 'vs/base/common/lifecycle'; +import * as platform from 'vs/base/common/platform'; import { IPointerHandlerHelper, MouseHandler } from 'vs/editor/browser/controller/mouseHandler'; +import { TextAreaSyntethicEvents } from 'vs/editor/browser/controller/textAreaInput'; +import { NavigationCommandRevealType } from 'vs/editor/browser/coreCommands'; import { IMouseTarget, MouseTargetType } from 'vs/editor/browser/editorBrowser'; import { EditorMouseEvent, EditorPointerEventFactory } from 'vs/editor/browser/editorDom'; 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'; -import { mainWindow } from 'vs/base/browser/window'; /** * Currently only tested on iOS 13/ iPadOS. @@ -60,22 +60,32 @@ export class PointerEventHandler extends MouseHandler { event.preventDefault(); this.viewHelper.focusTextArea(); - const target = this._createMouseTarget(new EditorMouseEvent(event, false, this.viewHelper.viewDomNode), false); + this._dispatchGesture(event, /*inSelectionMode*/false); + } + private onChange(event: GestureEvent): void { + if (this._lastPointerType === 'touch') { + this._context.viewModel.viewLayout.deltaScrollNow(-event.translationX, -event.translationY); + } + if (this._lastPointerType === 'pen') { + this._dispatchGesture(event, /*inSelectionMode*/true); + } + } + + private _dispatchGesture(event: GestureEvent, inSelectionMode: boolean): void { + const target = this._createMouseTarget(new EditorMouseEvent(event, false, this.viewHelper.viewDomNode), false); if (target.position) { - // this.viewController.moveTo(target.position); this.viewController.dispatchMouse({ position: target.position, mouseColumn: target.position.column, startedOnLineNumbers: false, revealType: NavigationCommandRevealType.Minimal, mouseDownCount: event.tapCount, - inSelectionMode: false, + inSelectionMode, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false, - leftButton: false, middleButton: false, onInjectedText: target.type === MouseTargetType.CONTENT_TEXT && target.detail.injectedText !== null @@ -83,12 +93,6 @@ export class PointerEventHandler extends MouseHandler { } } - private onChange(e: GestureEvent): void { - if (this._lastPointerType === 'touch') { - this._context.viewModel.viewLayout.deltaScrollNow(-e.translationX, -e.translationY); - } - } - protected override _onMouseDown(e: EditorMouseEvent, pointerId: number): void { if ((e.browserEvent as any).pointerType === 'touch') { return; @@ -137,7 +141,8 @@ export class PointerHandler extends Disposable { constructor(context: ViewContext, viewController: ViewController, viewHelper: IPointerHandlerHelper) { super(); - if ((platform.isIOS && BrowserFeatures.pointerEvents)) { + const isPhone = platform.isIOS || (platform.isAndroid && platform.isMobile); + if (isPhone && BrowserFeatures.pointerEvents) { this.handler = this._register(new PointerEventHandler(context, viewController, viewHelper)); } else if (mainWindow.TouchEvent) { this.handler = this._register(new TouchHandler(context, viewController, viewHelper)); diff --git a/src/vs/editor/browser/controller/textAreaHandler.ts b/src/vs/editor/browser/controller/textAreaHandler.ts index e7f16198870..f1661da1fc4 100644 --- a/src/vs/editor/browser/controller/textAreaHandler.ts +++ b/src/vs/editor/browser/controller/textAreaHandler.ts @@ -36,6 +36,7 @@ import { ColorId, ITokenPresentation } from 'vs/editor/common/encodedTokenAttrib import { Color } from 'vs/base/common/color'; import { IME } from 'vs/base/common/ime'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; +import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; export interface IVisibleRangeProvider { visibleRangeForPosition(position: Position): HorizontalPosition | null; @@ -145,7 +146,8 @@ export class TextAreaHandler extends ViewPart { context: ViewContext, viewController: ViewController, visibleRangeProvider: IVisibleRangeProvider, - @IKeybindingService private readonly _keybindingService: IKeybindingService + @IKeybindingService private readonly _keybindingService: IKeybindingService, + @IInstantiationService private readonly _instantiationService: IInstantiationService ) { super(context); @@ -303,7 +305,7 @@ export class TextAreaHandler extends ViewPart { }; const textAreaWrapper = this._register(new TextAreaWrapper(this.textArea.domNode)); - this._textAreaInput = this._register(new TextAreaInput(textAreaInputHost, textAreaWrapper, platform.OS, { + this._textAreaInput = this._register(this._instantiationService.createInstance(TextAreaInput, textAreaInputHost, textAreaWrapper, platform.OS, { isAndroid: browser.isAndroid, isChrome: browser.isChrome, isFirefox: browser.isFirefox, @@ -478,7 +480,7 @@ export class TextAreaHandler extends ViewPart { } public writeScreenReaderContent(reason: string): void { - this._textAreaInput.writeScreenReaderContent(reason); + this._textAreaInput.writeNativeTextAreaContent(reason); } public override dispose(): void { @@ -629,7 +631,7 @@ export class TextAreaHandler extends ViewPart { } if (e.hasChanged(EditorOption.accessibilitySupport)) { - this._textAreaInput.writeScreenReaderContent('strategy changed'); + this._textAreaInput.writeNativeTextAreaContent('strategy changed'); } return true; @@ -639,7 +641,7 @@ export class TextAreaHandler extends ViewPart { this._modelSelections = e.modelSelections.slice(0); // We must update the