diff --git a/.eslintplugin/vscode-dts-string-type-literals.ts b/.eslintplugin/vscode-dts-string-type-literals.ts new file mode 100644 index 00000000000000..8c3ead14427f3e --- /dev/null +++ b/.eslintplugin/vscode-dts-string-type-literals.ts @@ -0,0 +1,34 @@ +/*--------------------------------------------------------------------------------------------- + * 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 { TSESTree } from '@typescript-eslint/experimental-utils'; + +export = new class ApiTypeDiscrimination implements eslint.Rule.RuleModule { + + readonly meta: eslint.Rule.RuleMetaData = { + docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines' }, + messages: { + noTypeDiscrimination: 'Do not use type descrimination properties' + } + }; + + create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener { + return { + ['TSPropertySignature[optional=undefined] TSTypeAnnotation TSLiteralType Literal']: (node: any) => { + + const raw = String((node).raw) + + if (/^('|").*\1$/.test(raw)) { + + context.report({ + node: node, + messageId: 'noTypeDiscrimination' + }); + } + } + } + } +}; diff --git a/.eslintrc.json b/.eslintrc.json index 1d9cfd88a3821c..fe7a11558d7fa2 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -130,6 +130,7 @@ "rules": { "local/vscode-dts-create-func": "warn", "local/vscode-dts-literal-or-types": "warn", + "local/vscode-dts-string-type-literals": "warn", "local/vscode-dts-interface-naming": "warn", "local/vscode-dts-cancellation": "warn", "local/vscode-dts-use-thenable": "warn", diff --git a/.vscode/notebooks/my-endgame.github-issues b/.vscode/notebooks/my-endgame.github-issues index 6dfff2b6c2ddf3..4df2627dd2a637 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" + "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" }, { "kind": 1, diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index ea245ea51e211f..053d76c7c061ca 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -1275,7 +1275,7 @@ SOFTWARE. --------------------------------------------------------- -jeff-hykin/better-shell-syntax 1.5.0 - MIT +jeff-hykin/better-shell-syntax 1.5.4 - MIT https://github.com/jeff-hykin/better-shell-syntax MIT License @@ -2278,7 +2278,7 @@ SOFTWARE. --------------------------------------------------------- -microsoft/vscode-mssql 1.17.0 - MIT +microsoft/vscode-mssql 1.19.0 - MIT https://github.com/microsoft/vscode-mssql ------------------------------------------ START OF LICENSE ----------------------------------------- diff --git a/build/azure-pipelines/alpine/product-build-alpine.yml b/build/azure-pipelines/alpine/product-build-alpine.yml index b9e075f3fe4d6d..c3dae009184b40 100644 --- a/build/azure-pipelines/alpine/product-build-alpine.yml +++ b/build/azure-pipelines/alpine/product-build-alpine.yml @@ -39,7 +39,7 @@ steps: cacheHitVar: NODE_MODULES_RESTORED displayName: Restore node_modules cache - - script: tar -xvzf .build/node_modules_cache/cache.tgz + - script: tar -xzf .build/node_modules_cache/cache.tgz condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true')) displayName: Extract node_modules cache @@ -93,7 +93,7 @@ steps: set -e node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt mkdir -p .build/node_modules_cache - tar -cvzf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt + tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) displayName: Create node_modules archive diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index 796ba776ed8795..c315dbb3d3fe4d 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -53,7 +53,7 @@ steps: cacheHitVar: NODE_MODULES_RESTORED displayName: Restore node_modules cache - - script: tar -xvzf .build/node_modules_cache/cache.tgz + - script: tar -xzf .build/node_modules_cache/cache.tgz condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true')) displayName: Extract node_modules cache @@ -100,7 +100,7 @@ steps: set -e node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt mkdir -p .build/node_modules_cache - tar -cvzf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt + tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) displayName: Create node_modules archive diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml index 8a81c7488ea8af..a3c47d8e15e93b 100644 --- a/build/azure-pipelines/linux/product-build-linux.yml +++ b/build/azure-pipelines/linux/product-build-linux.yml @@ -65,7 +65,7 @@ steps: cacheHitVar: NODE_MODULES_RESTORED displayName: Restore node_modules cache - - script: tar -xvzf .build/node_modules_cache/cache.tgz + - script: tar -xzf .build/node_modules_cache/cache.tgz condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true')) displayName: Extract node_modules cache @@ -178,7 +178,7 @@ steps: set -e node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt mkdir -p .build/node_modules_cache - tar -cvzf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt + tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) displayName: Create node_modules archive diff --git a/build/azure-pipelines/oss/product-build-pr-cache-linux.yml b/build/azure-pipelines/oss/product-build-pr-cache-linux.yml index 39d3f43875f9e8..97eba56abc3c71 100644 --- a/build/azure-pipelines/oss/product-build-pr-cache-linux.yml +++ b/build/azure-pipelines/oss/product-build-pr-cache-linux.yml @@ -21,7 +21,7 @@ steps: cacheHitVar: NODE_MODULES_RESTORED displayName: Restore node_modules cache - - script: tar -xvzf .build/node_modules_cache/cache.tgz + - script: tar -xzf .build/node_modules_cache/cache.tgz condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true')) displayName: Extract node_modules cache @@ -60,6 +60,6 @@ steps: set -e node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt mkdir -p .build/node_modules_cache - tar -cvzf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt + tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) displayName: Create node_modules archive diff --git a/build/azure-pipelines/oss/product-build-pr-cache-win32.yml b/build/azure-pipelines/oss/product-build-pr-cache-win32.yml index fb9566c60b81ae..61b0bf37d258b1 100644 --- a/build/azure-pipelines/oss/product-build-pr-cache-win32.yml +++ b/build/azure-pipelines/oss/product-build-pr-cache-win32.yml @@ -23,7 +23,7 @@ steps: cacheHitVar: NODE_MODULES_RESTORED displayName: Restore node_modules cache - - powershell: 7z.exe x .build/node_modules_cache/cache.7z -aoa -bb + - powershell: 7z.exe x .build/node_modules_cache/cache.7z -aoa condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true')) displayName: Extract node_modules cache @@ -61,6 +61,6 @@ steps: $ErrorActionPreference = "Stop" exec { node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt } exec { mkdir -Force .build/node_modules_cache } - exec { 7z.exe a .build/node_modules_cache/cache.7z -mx3 -bb `@.build/node_modules_list.txt } + exec { 7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt } condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) displayName: Create node_modules archive diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml index 4e35286e232bbb..94a48b43255a06 100644 --- a/build/azure-pipelines/product-compile.yml +++ b/build/azure-pipelines/product-compile.yml @@ -31,7 +31,7 @@ steps: cacheHitVar: NODE_MODULES_RESTORED displayName: Restore node_modules cache - - script: tar -xvzf .build/node_modules_cache/cache.tgz + - script: tar -xzf .build/node_modules_cache/cache.tgz condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true')) displayName: Extract node_modules cache @@ -79,7 +79,7 @@ steps: set -e node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt mkdir -p .build/node_modules_cache - tar -cvzf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt + tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) displayName: Create node_modules archive diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml index 5420db92175244..556f1f23efabb6 100644 --- a/build/azure-pipelines/web/product-build-web.yml +++ b/build/azure-pipelines/web/product-build-web.yml @@ -35,7 +35,7 @@ steps: cacheHitVar: NODE_MODULES_RESTORED displayName: Restore node_modules cache - - script: tar -xvzf .build/node_modules_cache/cache.tgz + - script: tar -xzf .build/node_modules_cache/cache.tgz condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true')) displayName: Extract node_modules cache @@ -78,7 +78,7 @@ steps: set -e node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt mkdir -p .build/node_modules_cache - tar -cvzf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt + tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) displayName: Create node_modules archive diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index 3cbd999d8673dc..ab985554bb75c0 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -63,7 +63,7 @@ steps: cacheHitVar: NODE_MODULES_RESTORED displayName: Restore node_modules cache - - powershell: 7z.exe x .build/node_modules_cache/cache.7z -aoa -bb + - powershell: 7z.exe x .build/node_modules_cache/cache.7z -aoa condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true')) displayName: Extract node_modules cache @@ -124,7 +124,7 @@ steps: $ErrorActionPreference = "Stop" exec { node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt } exec { mkdir -Force .build/node_modules_cache } - exec { 7z.exe a .build/node_modules_cache/cache.7z -mx3 -bb `@.build/node_modules_list.txt } + exec { 7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt } condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) displayName: Create node_modules archive diff --git a/build/lib/i18n.js b/build/lib/i18n.js index 046e48a1980e98..2b5bac57aa842b 100644 --- a/build/lib/i18n.js +++ b/build/lib/i18n.js @@ -878,4 +878,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=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 diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json index b5ce6c6eabc7f5..e49ba1d7778609 100644 --- a/build/lib/i18n.resources.json +++ b/build/lib/i18n.resources.json @@ -513,6 +513,10 @@ { "name": "vs/workbench/services/localization", "project": "vscode-workbench" + }, + { + "name": "vs/workbench/contrib/accessibility", + "project": "vscode-workbench" } ] } diff --git a/build/lib/treeshaking.js b/build/lib/treeshaking.js index 0b4cb2f62224fa..96e58dd23ac366 100644 --- a/build/lib/treeshaking.js +++ b/build/lib/treeshaking.js @@ -13,7 +13,7 @@ var ShakeLevel; ShakeLevel[ShakeLevel["Files"] = 0] = "Files"; ShakeLevel[ShakeLevel["InnerFile"] = 1] = "InnerFile"; ShakeLevel[ShakeLevel["ClassMembers"] = 2] = "ClassMembers"; -})(ShakeLevel = exports.ShakeLevel || (exports.ShakeLevel = {})); +})(ShakeLevel || (exports.ShakeLevel = ShakeLevel = {})); function toStringShakeLevel(shakeLevel) { switch (shakeLevel) { case 0 /* ShakeLevel.Files */: @@ -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=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 diff --git a/build/lib/tsb/builder.js b/build/lib/tsb/builder.js index e785ed24ec9861..31267d21fd0055 100644 --- a/build/lib/tsb/builder.js +++ b/build/lib/tsb/builder.js @@ -18,7 +18,7 @@ var CancellationToken; CancellationToken.None = { isCancellationRequested() { return false; } }; -})(CancellationToken = exports.CancellationToken || (exports.CancellationToken = {})); +})(CancellationToken || (exports.CancellationToken = CancellationToken = {})); function normalize(path) { return path.replace(/\\/g, '/'); } @@ -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=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 diff --git a/build/lib/tsb/transpiler.js b/build/lib/tsb/transpiler.js index 71fb5e18a02a70..0cf14b45469d41 100644 --- a/build/lib/tsb/transpiler.js +++ b/build/lib/tsb/transpiler.js @@ -321,4 +321,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=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 diff --git a/build/lib/tsb/utils.js b/build/lib/tsb/utils.js index 040104ea550fbc..fe4b3dd260b0d9 100644 --- a/build/lib/tsb/utils.js +++ b/build/lib/tsb/utils.js @@ -44,7 +44,7 @@ var collections; return hasOwnProperty.call(collection, key); } collections.contains = contains; -})(collections = exports.collections || (exports.collections = {})); +})(collections || (exports.collections = collections = {})); var strings; (function (strings) { /** @@ -59,7 +59,7 @@ var strings; }); } strings.format = format; -})(strings = exports.strings || (exports.strings = {})); +})(strings || (exports.strings = strings = {})); var graph; (function (graph) { function newNode(data) { @@ -122,5 +122,5 @@ var graph; } } graph.Graph = Graph; -})(graph = exports.graph || (exports.graph = {})); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ1dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyxJQUFjLFdBQVcsQ0FzQ3hCO0FBdENELFdBQWMsV0FBVztJQUVyQixNQUFNLGNBQWMsR0FBRyxNQUFNLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQztJQUV2RCxTQUFnQixNQUFNLENBQUksVUFBaUMsRUFBRSxHQUFXO1FBQ3BFLElBQUksY0FBYyxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsR0FBRyxDQUFDLEVBQUU7WUFDdEMsT0FBTyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDMUI7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNoQixDQUFDO0lBTGUsa0JBQU0sU0FLckIsQ0FBQTtJQUVELFNBQWdCLE1BQU0sQ0FBSSxVQUFpQyxFQUFFLEdBQVcsRUFBRSxLQUFRO1FBQzlFLFVBQVUsQ0FBQyxHQUFHLENBQUMsR0FBRyxLQUFLLENBQUM7SUFDNUIsQ0FBQztJQUZlLGtCQUFNLFNBRXJCLENBQUE7SUFFRCxTQUFnQixjQUFjLENBQUksVUFBaUMsRUFBRSxHQUFXLEVBQUUsS0FBUTtRQUN0RixJQUFJLGNBQWMsQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLEdBQUcsQ0FBQyxFQUFFO1lBQ3RDLE9BQU8sVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQzFCO2FBQU07WUFDSCxVQUFVLENBQUMsR0FBRyxDQUFDLEdBQUcsS0FBSyxDQUFDO1lBQ3hCLE9BQU8sS0FBSyxDQUFDO1NBQ2hCO0lBQ0wsQ0FBQztJQVBlLDBCQUFjLGlCQU83QixDQUFBO0lBRUQsU0FBZ0IsT0FBTyxDQUFJLFVBQWlDLEVBQUUsUUFBb0Q7UUFDOUcsS0FBSyxNQUFNLEdBQUcsSUFBSSxVQUFVLEVBQUU7WUFDMUIsSUFBSSxjQUFjLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsRUFBRTtnQkFDdEMsUUFBUSxDQUFDO29CQUNMLEdBQUcsRUFBRSxHQUFHO29CQUNSLEtBQUssRUFBRSxVQUFVLENBQUMsR0FBRyxDQUFDO2lCQUN6QixDQUFDLENBQUM7YUFDTjtTQUNKO0lBQ0wsQ0FBQztJQVRlLG1CQUFPLFVBU3RCLENBQUE7SUFFRCxTQUFnQixRQUFRLENBQUMsVUFBbUMsRUFBRSxHQUFXO1FBQ3JFLE9BQU8sY0FBYyxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDaEQsQ0FBQztJQUZlLG9CQUFRLFdBRXZCLENBQUE7QUFDTCxDQUFDLEVBdENhLFdBQVcsR0FBWCxtQkFBVyxLQUFYLG1CQUFXLFFBc0N4QjtBQUVELElBQWMsT0FBTyxDQWVwQjtBQWZELFdBQWMsT0FBTztJQUVqQjs7T0FFRztJQUNVLGFBQUssR0FBRyxFQUFFLENBQUM7SUFFWCxlQUFPLEdBQUcsTUFBTSxDQUFDO0lBRTlCLFNBQWdCLE1BQU0sQ0FBQyxLQUFhLEVBQUUsR0FBRyxJQUFXO1FBQ2hELE9BQU8sS0FBSyxDQUFDLE9BQU8sQ0FBQyxVQUFVLEVBQUUsVUFBVSxLQUFLO1lBQzVDLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDM0QsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLElBQUksS0FBSyxDQUFDO1FBQ3hDLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztJQUxlLGNBQU0sU0FLckIsQ0FBQTtBQUNMLENBQUMsRUFmYSxPQUFPLEdBQVAsZUFBTyxLQUFQLGVBQU8sUUFlcEI7QUFFRCxJQUFjLEtBQUssQ0E2RWxCO0FBN0VELFdBQWMsS0FBSztJQVFmLFNBQWdCLE9BQU8sQ0FBSSxJQUFPO1FBQzlCLE9BQU87WUFDSCxJQUFJLEVBQUUsSUFBSTtZQUNWLFFBQVEsRUFBRSxFQUFFO1lBQ1osUUFBUSxFQUFFLEVBQUU7U0FDZixDQUFDO0lBQ04sQ0FBQztJQU5lLGFBQU8sVUFNdEIsQ0FBQTtJQUVELE1BQWEsS0FBSztRQUlNO1FBRlosTUFBTSxHQUErQixFQUFFLENBQUM7UUFFaEQsWUFBb0IsT0FBK0I7WUFBL0IsWUFBTyxHQUFQLE9BQU8sQ0FBd0I7WUFDL0MsUUFBUTtRQUNaLENBQUM7UUFFRCxRQUFRLENBQUMsS0FBUSxFQUFFLE9BQWdCLEVBQUUsUUFBMkI7WUFDNUQsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNyQyxJQUFJLENBQUMsU0FBUyxFQUFFO2dCQUNaLE9BQU87YUFDVjtZQUNELElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxFQUFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDckQsQ0FBQztRQUVPLFNBQVMsQ0FBQyxJQUFhLEVBQUUsT0FBZ0IsRUFBRSxJQUFnQyxFQUFFLFFBQTJCO1lBQzVHLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3BDLElBQUksV0FBVyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLEVBQUU7Z0JBQ2pDLE9BQU87YUFDVjtZQUNELElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUM7WUFDakIsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNwQixNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUM7WUFDdEQsV0FBVyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDaEcsQ0FBQztRQUVELFNBQVMsQ0FBQyxJQUFPLEVBQUUsRUFBSztZQUNwQixNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDL0MsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLGtCQUFrQixDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBRTNDLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQyxHQUFHLE1BQU0sQ0FBQztZQUM3QyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxRQUFRLENBQUM7UUFDbkQsQ0FBQztRQUVELFVBQVUsQ0FBQyxJQUFPO1lBQ2QsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUMvQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDeEIsV0FBVyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7Z0JBQ3ZDLE9BQU8sS0FBSyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQ2pDLE9BQU8sS0FBSyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDckMsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDO1FBRUQsa0JBQWtCLENBQUMsSUFBTztZQUN0QixNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQy9CLElBQUksSUFBSSxHQUFHLFdBQVcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUMsQ0FBQztZQUVoRCxJQUFJLENBQUMsSUFBSSxFQUFFO2dCQUNQLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ3JCLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDO2FBQzNCO1lBRUQsT0FBTyxJQUFJLENBQUM7UUFDaEIsQ0FBQztRQUVELE1BQU0sQ0FBQyxJQUFPO1lBQ1YsT0FBTyxXQUFXLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1FBQy9ELENBQUM7S0FDSjtJQTNEWSxXQUFLLFFBMkRqQixDQUFBO0FBRUwsQ0FBQyxFQTdFYSxLQUFLLEdBQUwsYUFBSyxLQUFMLGFBQUssUUE2RWxCIn0= \ No newline at end of file +})(graph || (exports.graph = graph = {})); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ1dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztnR0FHZ0c7OztBQUVoRyxJQUFjLFdBQVcsQ0FzQ3hCO0FBdENELFdBQWMsV0FBVztJQUVyQixNQUFNLGNBQWMsR0FBRyxNQUFNLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQztJQUV2RCxTQUFnQixNQUFNLENBQUksVUFBaUMsRUFBRSxHQUFXO1FBQ3BFLElBQUksY0FBYyxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsR0FBRyxDQUFDLEVBQUU7WUFDdEMsT0FBTyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDMUI7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNoQixDQUFDO0lBTGUsa0JBQU0sU0FLckIsQ0FBQTtJQUVELFNBQWdCLE1BQU0sQ0FBSSxVQUFpQyxFQUFFLEdBQVcsRUFBRSxLQUFRO1FBQzlFLFVBQVUsQ0FBQyxHQUFHLENBQUMsR0FBRyxLQUFLLENBQUM7SUFDNUIsQ0FBQztJQUZlLGtCQUFNLFNBRXJCLENBQUE7SUFFRCxTQUFnQixjQUFjLENBQUksVUFBaUMsRUFBRSxHQUFXLEVBQUUsS0FBUTtRQUN0RixJQUFJLGNBQWMsQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLEdBQUcsQ0FBQyxFQUFFO1lBQ3RDLE9BQU8sVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQzFCO2FBQU07WUFDSCxVQUFVLENBQUMsR0FBRyxDQUFDLEdBQUcsS0FBSyxDQUFDO1lBQ3hCLE9BQU8sS0FBSyxDQUFDO1NBQ2hCO0lBQ0wsQ0FBQztJQVBlLDBCQUFjLGlCQU83QixDQUFBO0lBRUQsU0FBZ0IsT0FBTyxDQUFJLFVBQWlDLEVBQUUsUUFBb0Q7UUFDOUcsS0FBSyxNQUFNLEdBQUcsSUFBSSxVQUFVLEVBQUU7WUFDMUIsSUFBSSxjQUFjLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsRUFBRTtnQkFDdEMsUUFB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 \ No newline at end of file diff --git a/build/monaco/monaco.usage.recipe b/build/monaco/monaco.usage.recipe index 3fab91065aae40..e3c8cdd09163af 100644 --- a/build/monaco/monaco.usage.recipe +++ b/build/monaco/monaco.usage.recipe @@ -1,6 +1,8 @@ // This file is adding references to various symbols which should not be removed via tree shaking +import { IObservable } from './vs/base/common/observable'; + import { ServiceIdentifier } from './vs/platform/instantiation/common/instantiation'; import { create as create1 } from './vs/base/common/worker/simpleWorker'; import { create as create2 } from './vs/editor/common/services/editorSimpleWorker'; @@ -32,4 +34,7 @@ import * as editorAPI from './vs/editor/editor.api'; a = editorAPI.Token; a = editorAPI.editor; a = editorAPI.languages; + + const o: IObservable = null!; + o.TChange; })(); diff --git a/cli/src/tunnels/dev_tunnels.rs b/cli/src/tunnels/dev_tunnels.rs index 010afbdb4338f1..67a7a5e46e229f 100644 --- a/cli/src/tunnels/dev_tunnels.rs +++ b/cli/src/tunnels/dev_tunnels.rs @@ -384,10 +384,11 @@ impl DevTunnels { ) -> Result { let (mut tunnel, persisted) = match self.launcher_tunnel.load() { Some(mut persisted) => { - let as_lowercase = persisted.name.to_ascii_lowercase(); - let preferred_name = preferred_name.unwrap_or(&as_lowercase); - if persisted.name != preferred_name { - (_, persisted) = self.update_tunnel_name(persisted, preferred_name).await?; + if let Some(preferred_name) = preferred_name.map(|n| n.to_ascii_lowercase()) { + if persisted.name.to_ascii_lowercase() != preferred_name { + (_, persisted) = + self.update_tunnel_name(persisted, &preferred_name).await?; + } } let (tunnel, persisted, _) = self diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json index 76254594586449..7527b230e5dd5a 100644 --- a/extensions/css-language-features/package.json +++ b/extensions/css-language-features/package.json @@ -6,7 +6,7 @@ "publisher": "vscode", "license": "MIT", "engines": { - "vscode": "^1.29.0" + "vscode": "^1.77.0" }, "icon": "icons/css.png", "activationEvents": [ @@ -994,7 +994,7 @@ ] }, "dependencies": { - "vscode-languageclient": "^8.1.0", + "vscode-languageclient": "^8.2.0-next.0", "vscode-uri": "^3.0.7" }, "devDependencies": { diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json index 0a3fe4774b5e7c..e5c464c56e89d7 100644 --- a/extensions/css-language-features/server/package.json +++ b/extensions/css-language-features/server/package.json @@ -10,9 +10,9 @@ "main": "./out/node/cssServerMain", "browser": "./dist/browser/cssServerMain", "dependencies": { - "@vscode/l10n": "^0.0.11", - "vscode-css-languageservice": "^6.2.4", - "vscode-languageserver": "^8.1.0", + "@vscode/l10n": "^0.0.13", + "vscode-css-languageservice": "^6.2.5", + "vscode-languageserver": "^8.2.0-next.0", "vscode-uri": "^3.0.7" }, "devDependencies": { diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock index 68c72ebc59cac4..84c18a291731ef 100644 --- a/extensions/css-language-features/server/yarn.lock +++ b/extensions/css-language-features/server/yarn.lock @@ -12,50 +12,55 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== -"@vscode/l10n@^0.0.11": - version "0.0.11" - resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.11.tgz#325d7beb2cfb87162bc624d16c4d546de6a73b72" - integrity sha512-ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA== - -vscode-css-languageservice@^6.2.4: - version "6.2.4" - resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.4.tgz#d03ca783ad922cb903602ca1478f5161e5e5de54" - integrity sha512-9UG0s3Ss8rbaaPZL1AkGzdjrGY8F+P+Ne9snsrvD9gxltDGhsn8C2dQpqQewHrMW37OvlqJoI8sUU2AWDb+qNw== +"@vscode/l10n@^0.0.13": + version "0.0.13" + resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.13.tgz#f51ff130b8c98f189476c5f812d214b8efb09590" + integrity sha512-A3uY356uOU9nGa+TQIT/i3ziWUgJjVMUrGGXSrtRiTwklyCFjGVWIOHoEIHbJpiyhDkJd9kvIWUOfXK1IkK8XQ== + +vscode-css-languageservice@^6.2.5: + version "6.2.5" + resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.5.tgz#bcea53dac7b61c1ff483668a7403042779ab27b0" + integrity sha512-/1oyBZK3jfx6A0cA46FCUpy6OlqEsMT47LUIldCIP1YMKRYezJ9No+aNj9IM0AqhRZ92DxZ1DmU5lJ+biuiacA== dependencies: - "@vscode/l10n" "^0.0.11" + "@vscode/l10n" "^0.0.13" vscode-languageserver-textdocument "^1.0.8" vscode-languageserver-types "^3.17.3" vscode-uri "^3.0.7" -vscode-jsonrpc@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz#cb9989c65e219e18533cc38e767611272d274c94" - integrity sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw== +vscode-jsonrpc@8.2.0-next.0: + version "8.2.0-next.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz#41409413c8cebf10f2f1b7cc87e330f0e292814c" + integrity sha512-13jYzaFQpTz5qQ2P+l5c/iTVsj1wUpflP0CR/v4XaEpM0oToLEXZBTcuuox1WaGIbu3Av3xxmGNU4Hydl1iNKg== -vscode-languageserver-protocol@3.17.3: - version "3.17.3" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz#6d0d54da093f0c0ee3060b81612cce0f11060d57" - integrity sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA== +vscode-languageserver-protocol@3.17.4-next.0: + version "3.17.4-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.0.tgz#21e4dce218c1cf0ee65ea7fdb62a2c08e075ee8b" + integrity sha512-l//t/BY+GHkH9N0VrHN0zLB+KV42LD0EDtzjGL+p/6xqUVEZegbsZg+6ubvqjE8LhyWcTtpA6pLRaczua6+3GQ== dependencies: - vscode-jsonrpc "8.1.0" - vscode-languageserver-types "3.17.3" + vscode-jsonrpc "8.2.0-next.0" + vscode-languageserver-types "3.17.4-next.0" vscode-languageserver-textdocument@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz#9eae94509cbd945ea44bca8dcfe4bb0c15bb3ac0" integrity sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q== -vscode-languageserver-types@3.17.3, vscode-languageserver-types@^3.17.3: +vscode-languageserver-types@3.17.4-next.0: + version "3.17.4-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4-next.0.tgz#4b5238d21cceaeb836d36a05d23c61a8c0238de2" + integrity sha512-2FPKboHnT04xYjfM8JpJVBz4a/tryMw58jmzucaabZMZN5hzoFBrhc97jNG4n6edr9JUb9+QSwwcAcYpDTAoag== + +vscode-languageserver-types@^3.17.3: version "3.17.3" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz#72d05e47b73be93acb84d6e311b5786390f13f64" integrity sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA== -vscode-languageserver@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.1.0.tgz#5024253718915d84576ce6662dd46a791498d827" - integrity sha512-eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw== +vscode-languageserver@^8.2.0-next.0: + version "8.2.0-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.2.0-next.0.tgz#ad9bcef650e0bae9d32591ebbda3eb5e548418a7" + integrity sha512-Pw1pdR+hZvaeeVvbmEscUJG0SMMa5//iV+OnFuv4cPPvk+ohe4mtrVAcI06Z9HIMxDu+2McqY1b8JbVvyRKFtg== dependencies: - vscode-languageserver-protocol "3.17.3" + vscode-languageserver-protocol "3.17.4-next.0" vscode-uri@^3.0.7: version "3.0.7" diff --git a/extensions/css-language-features/yarn.lock b/extensions/css-language-features/yarn.lock index 6bcdcdd34feed8..f9d868af01fea2 100644 --- a/extensions/css-language-features/yarn.lock +++ b/extensions/css-language-features/yarn.lock @@ -40,32 +40,32 @@ semver@^7.3.7: dependencies: lru-cache "^6.0.0" -vscode-jsonrpc@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz#cb9989c65e219e18533cc38e767611272d274c94" - integrity sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw== +vscode-jsonrpc@8.2.0-next.0: + version "8.2.0-next.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz#41409413c8cebf10f2f1b7cc87e330f0e292814c" + integrity sha512-13jYzaFQpTz5qQ2P+l5c/iTVsj1wUpflP0CR/v4XaEpM0oToLEXZBTcuuox1WaGIbu3Av3xxmGNU4Hydl1iNKg== -vscode-languageclient@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.1.0.tgz#3e67d5d841481ac66ddbdaa55b4118742f6a9f3f" - integrity sha512-GL4QdbYUF/XxQlAsvYWZRV3V34kOkpRlvV60/72ghHfsYFnS/v2MANZ9P6sHmxFcZKOse8O+L9G7Czg0NUWing== +vscode-languageclient@^8.2.0-next.0: + version "8.2.0-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.2.0-next.0.tgz#7415c831c4c1e38cc08e710e744c36c5d2251bd8" + integrity sha512-Gqr47Up5VDuRT8JrfB0QFGXR9ngQDkfIJfbT0xmM4OIsISqH3uUgXHTAhekRtS4N6aER3UvGXUrrRWQUaBGYHA== dependencies: minimatch "^5.1.0" semver "^7.3.7" - vscode-languageserver-protocol "3.17.3" + vscode-languageserver-protocol "3.17.4-next.0" -vscode-languageserver-protocol@3.17.3: - version "3.17.3" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz#6d0d54da093f0c0ee3060b81612cce0f11060d57" - integrity sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA== +vscode-languageserver-protocol@3.17.4-next.0: + version "3.17.4-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.0.tgz#21e4dce218c1cf0ee65ea7fdb62a2c08e075ee8b" + integrity sha512-l//t/BY+GHkH9N0VrHN0zLB+KV42LD0EDtzjGL+p/6xqUVEZegbsZg+6ubvqjE8LhyWcTtpA6pLRaczua6+3GQ== dependencies: - vscode-jsonrpc "8.1.0" - vscode-languageserver-types "3.17.3" + vscode-jsonrpc "8.2.0-next.0" + vscode-languageserver-types "3.17.4-next.0" -vscode-languageserver-types@3.17.3: - version "3.17.3" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz#72d05e47b73be93acb84d6e311b5786390f13f64" - integrity sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA== +vscode-languageserver-types@3.17.4-next.0: + version "3.17.4-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4-next.0.tgz#4b5238d21cceaeb836d36a05d23c61a8c0238de2" + integrity sha512-2FPKboHnT04xYjfM8JpJVBz4a/tryMw58jmzucaabZMZN5hzoFBrhc97jNG4n6edr9JUb9+QSwwcAcYpDTAoag== vscode-uri@^3.0.7: version "3.0.7" diff --git a/extensions/css/cgmanifest.json b/extensions/css/cgmanifest.json index 871e828facbc9a..e64ba7e11ae1cb 100644 --- a/extensions/css/cgmanifest.json +++ b/extensions/css/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "microsoft/vscode-css", "repositoryUrl": "https://github.com/microsoft/vscode-css", - "commitHash": "4a6dc90f332bfa72c88192513435a64013d9aad4" + "commitHash": "1452547185a1793c946cf67f8c7c9001716e32c3" } }, "licenseDetail": [ @@ -46,7 +46,7 @@ ], "license": "MIT License", "description": "The file syntaxes/css.tmLanguage.json was derived from https://github.com/atom/language-css which was originally converted from the TextMate bundle https://github.com/textmate/css.tmbundle.", - "version": "0.45.1" + "version": "0.0.0" } ], "version": 1 diff --git a/extensions/css/syntaxes/css.tmLanguage.json b/extensions/css/syntaxes/css.tmLanguage.json index ad32f487161a31..c50611017c2ba3 100644 --- a/extensions/css/syntaxes/css.tmLanguage.json +++ b/extensions/css/syntaxes/css.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-css/commit/4a6dc90f332bfa72c88192513435a64013d9aad4", + "version": "https://github.com/microsoft/vscode-css/commit/1452547185a1793c946cf67f8c7c9001716e32c3", "name": "CSS", "scopeName": "source.css", "patterns": [ @@ -1198,7 +1198,7 @@ ] }, { - "begin": "(?i)((:)(?:not|has|matches))(\\()", + "begin": "(?i)((:)(?:not|has|matches|where|is))(\\()", "beginCaptures": { "1": { "name": "entity.other.attribute-name.pseudo-class.css" diff --git a/extensions/github-authentication/src/githubServer.ts b/extensions/github-authentication/src/githubServer.ts index dc7278f6d4f71c..3662719cfc8425 100644 --- a/extensions/github-authentication/src/githubServer.ts +++ b/extensions/github-authentication/src/githubServer.ts @@ -16,6 +16,13 @@ import { fetching } from './node/fetch'; const CLIENT_ID = '01ab8ac9400c4e429b23'; const GITHUB_TOKEN_URL = 'https://vscode.dev/codeExchangeProxyEndpoints/github/login/oauth/access_token'; + +// This is the error message that we throw if the login was cancelled for any reason. Extensions +// calling `getSession` can handle this error to know that the user cancelled the login. +const CANCELLATION_ERROR = 'Cancelled'; +// These error messages are internal and should not be shown to the user in any way. +const TIMED_OUT_ERROR = 'Timed out'; +const USER_CANCELLATION_ERROR = 'User Cancelled'; const NETWORK_ERROR = 'network error'; const REDIRECT_URL_STABLE = 'https://vscode.dev/redirect'; @@ -122,17 +129,17 @@ export class GitHubServer implements IGitHubServer { let userCancelled: boolean | undefined; const yes = vscode.l10n.t('Yes'); const no = vscode.l10n.t('No'); - const promptToContinue = async () => { + const promptToContinue = async (mode: string) => { if (userCancelled === undefined) { // We haven't had a failure yet so wait to prompt return; } const message = userCancelled - ? vscode.l10n.t('Having trouble logging in? Would you like to try a different way?') - : vscode.l10n.t('You have not yet finished authorizing this extension to use GitHub. Would you like to keep trying?'); + ? vscode.l10n.t('Having trouble logging in? Would you like to try a different way? ({0})', mode) + : vscode.l10n.t('You have not yet finished authorizing this extension to use GitHub. Would you like to try a different way? ({0})', mode); const result = await vscode.window.showWarningMessage(message, yes, no); if (result !== yes) { - throw new Error('Cancelled'); + throw new Error(CANCELLATION_ERROR); } }; @@ -146,7 +153,7 @@ export class GitHubServer implements IGitHubServer { return await this.doLoginWithoutLocalServer(scopes, nonce, callbackUri); } catch (e) { this._logger.error(e); - userCancelled = e.message ?? e === 'User Cancelled'; + userCancelled = e.message ?? e === USER_CANCELLATION_ERROR; } } @@ -160,22 +167,20 @@ export class GitHubServer implements IGitHubServer { supportedTarget ) { try { - await promptToContinue(); + await promptToContinue(vscode.l10n.t('local server')); return await this.doLoginWithLocalServer(scopes); } catch (e) { - this._logger.error(e); - userCancelled = e.message ?? e === 'User Cancelled'; + userCancelled = this.processLoginError(e); } } // We only can use the Device Code flow when we have a full node environment because of CORS. if (typeof navigator === 'undefined') { try { - await promptToContinue(); + await promptToContinue(vscode.l10n.t('device code')); return await this.doLoginDeviceCodeFlow(scopes); } catch (e) { - this._logger.error(e); - userCancelled = e.message ?? e === 'User Cancelled'; + userCancelled = this.processLoginError(e); } } @@ -183,15 +188,14 @@ export class GitHubServer implements IGitHubServer { // With that said, GitHub Enterprise isn't used by Settings Sync so we can use PATs for that. if (!supportedClient || this._type === AuthProviderType.githubEnterprise) { try { - await promptToContinue(); + await promptToContinue(vscode.l10n.t('personal access token')); return await this.doLoginWithPat(scopes); } catch (e) { - this._logger.error(e); - userCancelled = e.message ?? e === 'User Cancelled'; + userCancelled = this.processLoginError(e); } } - throw new Error(userCancelled ? 'Cancelled' : 'No auth flow succeeded.'); + throw new Error(userCancelled ? CANCELLATION_ERROR : 'No auth flow succeeded.'); } private async doLoginWithoutLocalServer(scopes: string, nonce: string, callbackUri: vscode.Uri): Promise { @@ -232,8 +236,8 @@ export class GitHubServer implements IGitHubServer { try { return await Promise.race([ codeExchangePromise.promise, - new Promise((_, reject) => setTimeout(() => reject('Timed out'), 300_000)), // 5min timeout - promiseFromEvent(token.onCancellationRequested, (_, __, reject) => { reject('User Cancelled'); }).promise + new Promise((_, reject) => setTimeout(() => reject(TIMED_OUT_ERROR), 300_000)), // 5min timeout + promiseFromEvent(token.onCancellationRequested, (_, __, reject) => { reject(USER_CANCELLATION_ERROR); }).promise ]); } finally { this._pendingNonces.delete(scopes); @@ -273,8 +277,8 @@ export class GitHubServer implements IGitHubServer { vscode.env.openExternal(vscode.Uri.parse(`http://127.0.0.1:${port}/signin?nonce=${encodeURIComponent(server.nonce)}`)); const { code } = await Promise.race([ server.waitForOAuthResponse(), - new Promise((_, reject) => setTimeout(() => reject('Timed out'), 300_000)), // 5min timeout - promiseFromEvent(token.onCancellationRequested, (_, __, reject) => { reject('User Cancelled'); }).promise + new Promise((_, reject) => setTimeout(() => reject(TIMED_OUT_ERROR), 300_000)), // 5min timeout + promiseFromEvent(token.onCancellationRequested, (_, __, reject) => { reject(USER_CANCELLATION_ERROR); }).promise ]); codeToExchange = code; } finally { @@ -317,7 +321,7 @@ export class GitHubServer implements IGitHubServer { }, button); if (modalResult !== button) { - throw new Error('User Cancelled'); + throw new Error(USER_CANCELLATION_ERROR); } await vscode.env.clipboard.writeText(json.user_code); @@ -340,14 +344,14 @@ export class GitHubServer implements IGitHubServer { }, button); if (modalResult !== button) { - throw new Error('User Cancelled'); + throw new Error(USER_CANCELLATION_ERROR); } const description = `${vscode.env.appName} (${scopes})`; const uriToOpen = await vscode.env.asExternalUri(this.baseUri.with({ path: '/settings/tokens/new', query: `description=${description}&scopes=${scopes.split(' ').join(',')}` })); await vscode.env.openExternal(uriToOpen); const token = await vscode.window.showInputBox({ placeHolder: `ghp_1a2b3c4...`, prompt: `GitHub Personal Access Token - ${scopes}`, ignoreFocusOut: true }); - if (!token) { throw new Error('User Cancelled'); } + if (!token) { throw new Error(USER_CANCELLATION_ERROR); } const tokenScopes = await getScopes(token, this.getServerUri('/'), this._logger); // Example: ['repo', 'user'] const scopesList = scopes.split(' '); // Example: 'read:user repo user:email' @@ -392,7 +396,7 @@ export class GitHubServer implements IGitHubServer { for (let i = 0; i < attempts; i++) { await new Promise(resolve => setTimeout(resolve, json.interval * 1000)); if (token.isCancellationRequested) { - throw new Error('User Cancelled'); + throw new Error(USER_CANCELLATION_ERROR); } let accessTokenResult; try { @@ -423,7 +427,7 @@ export class GitHubServer implements IGitHubServer { return accessTokenJson.access_token; } - throw new Error('Cancelled'); + throw new Error(TIMED_OUT_ERROR); }); } @@ -641,4 +645,12 @@ export class GitHubServer implements IGitHubServer { // No-op } } + + private processLoginError(error: Error): boolean { + if (error.message === CANCELLATION_ERROR) { + throw error; + } + this._logger.error(error.message ?? error); + return error.message === USER_CANCELLATION_ERROR; + } } diff --git a/extensions/github/src/branchProtection.ts b/extensions/github/src/branchProtection.ts index 023bc20f257f72..3ed94616a86448 100644 --- a/extensions/github/src/branchProtection.ts +++ b/extensions/github/src/branchProtection.ts @@ -101,11 +101,16 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider } private async initializeBranchProtection(): Promise { - // Branch protection (HEAD) - await this.updateHEADBranchProtection(); + try { + // Branch protection (HEAD) + await this.updateHEADBranchProtection(); - // Branch protection (remotes) - await this.updateRepositoryBranchProtection(); + // Branch protection (remotes) + await this.updateRepositoryBranchProtection(); + } catch (err) { + // noop + this.logger.warn(`Failed to initialize branch protection: ${this.formatErrorMessage(err)}`); + } } private async hasPushPermission(repository: { owner: string; repo: string }): Promise { @@ -115,8 +120,8 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider return response.data.permissions?.push === true; } catch (err) { - this.logger.warn(`Failed to get repository permissions for repository (${repository.owner}/${repository.repo}): ${err.message} (${err.status})`); - return false; + this.logger.warn(`Failed to get repository permissions for repository (${repository.owner}/${repository.repo}): ${this.formatErrorMessage(err)}`); + throw err; } } @@ -132,8 +137,8 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider }); return response.data as RepositoryRule[]; } catch (err) { - this.logger.warn(`Failed to get branch rules for repository (${repository.owner}/${repository.repo}), branch (${branch}): ${err.message} (${err.status})`); - return []; + this.logger.warn(`Failed to get branch rules for repository (${repository.owner}/${repository.repo}), branch (${branch}): ${this.formatErrorMessage(err)}`); + throw err; } } @@ -170,8 +175,8 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider return rulesets; } catch (err) { - this.logger.warn(`Failed to get repository rulesets for repository (${repository.owner}/${repository.repo}): ${err.message} (${err.status})`); - return []; + this.logger.warn(`Failed to get repository rulesets for repository (${repository.owner}/${repository.repo}): ${this.formatErrorMessage(err)}`); + throw err; } } @@ -208,8 +213,8 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider this.branchProtection = [{ remote: remote.name, rules: [{ include: [HEAD.name] }] }]; this._onDidChangeBranchProtection.fire(this.repository.rootUri); } catch (err) { - // noop - this.logger.warn(`Failed to update HEAD branch protection: ${err.message} (${err.status})`); + this.logger.warn(`Failed to update HEAD branch protection: ${this.formatErrorMessage(err)}`); + throw err; } } @@ -264,9 +269,12 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider // Save branch protection to global state await this.globalState.update(this.globalStateKey, branchProtection); } catch (err) { - // noop - this.logger.warn(`Failed to update repository branch protection: ${err.message} (${err.status})`); + this.logger.warn(`Failed to update repository branch protection: ${this.formatErrorMessage(err)}`); + throw err; } } + private formatErrorMessage(err: any): string { + return `${err.message ?? ''}${err.status ? ` (${err.status})` : ''}`; + } } diff --git a/extensions/github/src/commands.ts b/extensions/github/src/commands.ts index b43f7b1cf11e09..8a653e523c4ab6 100644 --- a/extensions/github/src/commands.ts +++ b/extensions/github/src/commands.ts @@ -17,7 +17,7 @@ async function copyVscodeDevLink(gitAPI: GitAPI, useSelection: boolean, context: try { const permalink = getLink(gitAPI, useSelection, getVscodeDevHost(), 'headlink', context, includeRange); if (permalink) { - return vscode.env.clipboard.writeText(encodeURI(permalink)); + return vscode.env.clipboard.writeText(permalink); } } catch (err) { vscode.window.showErrorMessage(err.message); diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json index ab8a75627585cd..40fdf48929e0af 100644 --- a/extensions/html-language-features/package.json +++ b/extensions/html-language-features/package.json @@ -7,7 +7,7 @@ "license": "MIT", "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255", "engines": { - "vscode": "0.10.x" + "vscode": "^1.77.0" }, "icon": "icons/html.png", "activationEvents": [ @@ -259,7 +259,7 @@ }, "dependencies": { "@vscode/extension-telemetry": "^0.7.5", - "vscode-languageclient": "^8.1.0", + "vscode-languageclient": "^8.2.0-next.0", "vscode-uri": "^3.0.7" }, "devDependencies": { diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json index 7fc2795e590d4d..90af54bc21cc98 100644 --- a/extensions/html-language-features/server/package.json +++ b/extensions/html-language-features/server/package.json @@ -9,10 +9,10 @@ }, "main": "./out/node/htmlServerMain", "dependencies": { - "@vscode/l10n": "^0.0.11", - "vscode-css-languageservice": "^6.2.4", - "vscode-html-languageservice": "^5.0.4", - "vscode-languageserver": "^8.1.0", + "@vscode/l10n": "^0.0.13", + "vscode-css-languageservice": "^6.2.5", + "vscode-html-languageservice": "^5.0.5", + "vscode-languageserver": "^8.2.0-next.0", "vscode-languageserver-textdocument": "^1.0.8", "vscode-uri": "^3.0.7" }, diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock index 20056d64263a2e..88d6991226a988 100644 --- a/extensions/html-language-features/server/yarn.lock +++ b/extensions/html-language-features/server/yarn.lock @@ -12,65 +12,65 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== -"@vscode/l10n@^0.0.11": - version "0.0.11" - resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.11.tgz#325d7beb2cfb87162bc624d16c4d546de6a73b72" - integrity sha512-ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA== +"@vscode/l10n@^0.0.13": + version "0.0.13" + resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.13.tgz#f51ff130b8c98f189476c5f812d214b8efb09590" + integrity sha512-A3uY356uOU9nGa+TQIT/i3ziWUgJjVMUrGGXSrtRiTwklyCFjGVWIOHoEIHbJpiyhDkJd9kvIWUOfXK1IkK8XQ== -vscode-css-languageservice@^6.2.4: - version "6.2.4" - resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.4.tgz#d03ca783ad922cb903602ca1478f5161e5e5de54" - integrity sha512-9UG0s3Ss8rbaaPZL1AkGzdjrGY8F+P+Ne9snsrvD9gxltDGhsn8C2dQpqQewHrMW37OvlqJoI8sUU2AWDb+qNw== +vscode-css-languageservice@^6.2.5: + version "6.2.5" + resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-6.2.5.tgz#bcea53dac7b61c1ff483668a7403042779ab27b0" + integrity sha512-/1oyBZK3jfx6A0cA46FCUpy6OlqEsMT47LUIldCIP1YMKRYezJ9No+aNj9IM0AqhRZ92DxZ1DmU5lJ+biuiacA== dependencies: - "@vscode/l10n" "^0.0.11" + "@vscode/l10n" "^0.0.13" vscode-languageserver-textdocument "^1.0.8" vscode-languageserver-types "^3.17.3" vscode-uri "^3.0.7" -vscode-html-languageservice@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-5.0.4.tgz#f27a616a4058a2d4d00e4a68e48ad8ba5371aeec" - integrity sha512-tvrySfpglu4B2rQgWGVO/IL+skvU7kBkQotRlxA7ocSyRXOZUd6GA13XHkxo8LPe07KWjeoBlN1aVGqdfTK4xA== +vscode-html-languageservice@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-5.0.5.tgz#3c7c7fdcea8f93914dfd8762a40dbfbe770e2243" + integrity sha512-7788ZT+I7/UhFoI4+bzaAiGGZEW7X39kTeuytLtw6jJA6W7ez85bWKYoFDcwrPNmywj3n/IkU9Op9asaje44jg== dependencies: - "@vscode/l10n" "^0.0.11" + "@vscode/l10n" "^0.0.13" vscode-languageserver-textdocument "^1.0.8" - vscode-languageserver-types "^3.17.2" + vscode-languageserver-types "^3.17.3" vscode-uri "^3.0.7" -vscode-jsonrpc@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz#cb9989c65e219e18533cc38e767611272d274c94" - integrity sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw== +vscode-jsonrpc@8.2.0-next.0: + version "8.2.0-next.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz#41409413c8cebf10f2f1b7cc87e330f0e292814c" + integrity sha512-13jYzaFQpTz5qQ2P+l5c/iTVsj1wUpflP0CR/v4XaEpM0oToLEXZBTcuuox1WaGIbu3Av3xxmGNU4Hydl1iNKg== -vscode-languageserver-protocol@3.17.3: - version "3.17.3" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz#6d0d54da093f0c0ee3060b81612cce0f11060d57" - integrity sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA== +vscode-languageserver-protocol@3.17.4-next.0: + version "3.17.4-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.0.tgz#21e4dce218c1cf0ee65ea7fdb62a2c08e075ee8b" + integrity sha512-l//t/BY+GHkH9N0VrHN0zLB+KV42LD0EDtzjGL+p/6xqUVEZegbsZg+6ubvqjE8LhyWcTtpA6pLRaczua6+3GQ== dependencies: - vscode-jsonrpc "8.1.0" - vscode-languageserver-types "3.17.3" + vscode-jsonrpc "8.2.0-next.0" + vscode-languageserver-types "3.17.4-next.0" vscode-languageserver-textdocument@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz#9eae94509cbd945ea44bca8dcfe4bb0c15bb3ac0" integrity sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q== -vscode-languageserver-types@3.17.3, vscode-languageserver-types@^3.17.3: +vscode-languageserver-types@3.17.4-next.0: + version "3.17.4-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4-next.0.tgz#4b5238d21cceaeb836d36a05d23c61a8c0238de2" + integrity sha512-2FPKboHnT04xYjfM8JpJVBz4a/tryMw58jmzucaabZMZN5hzoFBrhc97jNG4n6edr9JUb9+QSwwcAcYpDTAoag== + +vscode-languageserver-types@^3.17.3: version "3.17.3" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz#72d05e47b73be93acb84d6e311b5786390f13f64" integrity sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA== -vscode-languageserver-types@^3.17.2: - version "3.17.2" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz#b2c2e7de405ad3d73a883e91989b850170ffc4f2" - integrity sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA== - -vscode-languageserver@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.1.0.tgz#5024253718915d84576ce6662dd46a791498d827" - integrity sha512-eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw== +vscode-languageserver@^8.2.0-next.0: + version "8.2.0-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.2.0-next.0.tgz#ad9bcef650e0bae9d32591ebbda3eb5e548418a7" + integrity sha512-Pw1pdR+hZvaeeVvbmEscUJG0SMMa5//iV+OnFuv4cPPvk+ohe4mtrVAcI06Z9HIMxDu+2McqY1b8JbVvyRKFtg== dependencies: - vscode-languageserver-protocol "3.17.3" + vscode-languageserver-protocol "3.17.4-next.0" vscode-uri@^3.0.7: version "3.0.7" diff --git a/extensions/html-language-features/yarn.lock b/extensions/html-language-features/yarn.lock index 4b4415ab4840b9..19aecf2506034e 100644 --- a/extensions/html-language-features/yarn.lock +++ b/extensions/html-language-features/yarn.lock @@ -380,32 +380,32 @@ uuid@^8.3.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -vscode-jsonrpc@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz#cb9989c65e219e18533cc38e767611272d274c94" - integrity sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw== +vscode-jsonrpc@8.2.0-next.0: + version "8.2.0-next.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz#41409413c8cebf10f2f1b7cc87e330f0e292814c" + integrity sha512-13jYzaFQpTz5qQ2P+l5c/iTVsj1wUpflP0CR/v4XaEpM0oToLEXZBTcuuox1WaGIbu3Av3xxmGNU4Hydl1iNKg== -vscode-languageclient@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.1.0.tgz#3e67d5d841481ac66ddbdaa55b4118742f6a9f3f" - integrity sha512-GL4QdbYUF/XxQlAsvYWZRV3V34kOkpRlvV60/72ghHfsYFnS/v2MANZ9P6sHmxFcZKOse8O+L9G7Czg0NUWing== +vscode-languageclient@^8.2.0-next.0: + version "8.2.0-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.2.0-next.0.tgz#7415c831c4c1e38cc08e710e744c36c5d2251bd8" + integrity sha512-Gqr47Up5VDuRT8JrfB0QFGXR9ngQDkfIJfbT0xmM4OIsISqH3uUgXHTAhekRtS4N6aER3UvGXUrrRWQUaBGYHA== dependencies: minimatch "^5.1.0" semver "^7.3.7" - vscode-languageserver-protocol "3.17.3" + vscode-languageserver-protocol "3.17.4-next.0" -vscode-languageserver-protocol@3.17.3: - version "3.17.3" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz#6d0d54da093f0c0ee3060b81612cce0f11060d57" - integrity sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA== +vscode-languageserver-protocol@3.17.4-next.0: + version "3.17.4-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.0.tgz#21e4dce218c1cf0ee65ea7fdb62a2c08e075ee8b" + integrity sha512-l//t/BY+GHkH9N0VrHN0zLB+KV42LD0EDtzjGL+p/6xqUVEZegbsZg+6ubvqjE8LhyWcTtpA6pLRaczua6+3GQ== dependencies: - vscode-jsonrpc "8.1.0" - vscode-languageserver-types "3.17.3" + vscode-jsonrpc "8.2.0-next.0" + vscode-languageserver-types "3.17.4-next.0" -vscode-languageserver-types@3.17.3: - version "3.17.3" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz#72d05e47b73be93acb84d6e311b5786390f13f64" - integrity sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA== +vscode-languageserver-types@3.17.4-next.0: + version "3.17.4-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4-next.0.tgz#4b5238d21cceaeb836d36a05d23c61a8c0238de2" + integrity sha512-2FPKboHnT04xYjfM8JpJVBz4a/tryMw58jmzucaabZMZN5hzoFBrhc97jNG4n6edr9JUb9+QSwwcAcYpDTAoag== vscode-uri@^3.0.7: version "3.0.7" diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json index 46b1b5564ff4cd..c87a6832422e7c 100644 --- a/extensions/json-language-features/package.json +++ b/extensions/json-language-features/package.json @@ -7,7 +7,7 @@ "license": "MIT", "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255", "engines": { - "vscode": "0.10.x" + "vscode": "^1.77.0" }, "enabledApiProposals": [], "icon": "icons/json.png", @@ -160,7 +160,7 @@ "dependencies": { "@vscode/extension-telemetry": "^0.7.5", "request-light": "^0.7.0", - "vscode-languageclient": "^8.1.0" + "vscode-languageclient": "^8.2.0-next.0" }, "devDependencies": { "@types/node": "16.x" diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json index aef443f6a905ab..368eb7c6b27652 100644 --- a/extensions/json-language-features/server/package.json +++ b/extensions/json-language-features/server/package.json @@ -12,11 +12,11 @@ }, "main": "./out/node/jsonServerMain", "dependencies": { - "@vscode/l10n": "^0.0.11", + "@vscode/l10n": "^0.0.13", "jsonc-parser": "^3.2.0", "request-light": "^0.7.0", - "vscode-json-languageservice": "^5.3.2", - "vscode-languageserver": "^8.1.0", + "vscode-json-languageservice": "^5.3.4", + "vscode-languageserver": "^8.2.0-next.0", "vscode-uri": "^3.0.7" }, "devDependencies": { diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock index e6bc6982cc2f65..7db8794c153f52 100644 --- a/extensions/json-language-features/server/yarn.lock +++ b/extensions/json-language-features/server/yarn.lock @@ -12,10 +12,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== -"@vscode/l10n@^0.0.11": - version "0.0.11" - resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.11.tgz#325d7beb2cfb87162bc624d16c4d546de6a73b72" - integrity sha512-ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA== +"@vscode/l10n@^0.0.13": + version "0.0.13" + resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.13.tgz#f51ff130b8c98f189476c5f812d214b8efb09590" + integrity sha512-A3uY356uOU9nGa+TQIT/i3ziWUgJjVMUrGGXSrtRiTwklyCFjGVWIOHoEIHbJpiyhDkJd9kvIWUOfXK1IkK8XQ== jsonc-parser@^3.2.0: version "3.2.0" @@ -27,46 +27,51 @@ request-light@^0.7.0: resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.7.0.tgz#885628bb2f8040c26401ebf258ec51c4ae98ac2a" integrity sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q== -vscode-json-languageservice@^5.3.2: - version "5.3.2" - resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-5.3.2.tgz#11e530ba9ec541eaeb421dc274a22efdb5d580ef" - integrity sha512-5td6olfoNdtyxnNA4uocq7V9jdTJt63o9mGEntQb6cbD2HiObZW2XgbSj6nRaebWwBCiYdWpFklNjm6Wz6Xy1Q== +vscode-json-languageservice@^5.3.4: + version "5.3.4" + resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-5.3.4.tgz#a37c8443ab458e0141d83bb080ce9c363b0fed8b" + integrity sha512-GSsHCrv1XBXJDI5DrCi8adEjv+yqZi21TsWs1pJo0cIEmiSVnf3V+v/kiVt0DHvSm9MuRYNjvMfDTW8m5Zpi8Q== dependencies: - "@vscode/l10n" "^0.0.11" + "@vscode/l10n" "^0.0.13" jsonc-parser "^3.2.0" vscode-languageserver-textdocument "^1.0.8" vscode-languageserver-types "^3.17.3" vscode-uri "^3.0.7" -vscode-jsonrpc@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz#cb9989c65e219e18533cc38e767611272d274c94" - integrity sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw== +vscode-jsonrpc@8.2.0-next.0: + version "8.2.0-next.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz#41409413c8cebf10f2f1b7cc87e330f0e292814c" + integrity sha512-13jYzaFQpTz5qQ2P+l5c/iTVsj1wUpflP0CR/v4XaEpM0oToLEXZBTcuuox1WaGIbu3Av3xxmGNU4Hydl1iNKg== -vscode-languageserver-protocol@3.17.3: - version "3.17.3" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz#6d0d54da093f0c0ee3060b81612cce0f11060d57" - integrity sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA== +vscode-languageserver-protocol@3.17.4-next.0: + version "3.17.4-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.0.tgz#21e4dce218c1cf0ee65ea7fdb62a2c08e075ee8b" + integrity sha512-l//t/BY+GHkH9N0VrHN0zLB+KV42LD0EDtzjGL+p/6xqUVEZegbsZg+6ubvqjE8LhyWcTtpA6pLRaczua6+3GQ== dependencies: - vscode-jsonrpc "8.1.0" - vscode-languageserver-types "3.17.3" + vscode-jsonrpc "8.2.0-next.0" + vscode-languageserver-types "3.17.4-next.0" vscode-languageserver-textdocument@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz#9eae94509cbd945ea44bca8dcfe4bb0c15bb3ac0" integrity sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q== -vscode-languageserver-types@3.17.3, vscode-languageserver-types@^3.17.3: +vscode-languageserver-types@3.17.4-next.0: + version "3.17.4-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4-next.0.tgz#4b5238d21cceaeb836d36a05d23c61a8c0238de2" + integrity sha512-2FPKboHnT04xYjfM8JpJVBz4a/tryMw58jmzucaabZMZN5hzoFBrhc97jNG4n6edr9JUb9+QSwwcAcYpDTAoag== + +vscode-languageserver-types@^3.17.3: version "3.17.3" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz#72d05e47b73be93acb84d6e311b5786390f13f64" integrity sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA== -vscode-languageserver@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.1.0.tgz#5024253718915d84576ce6662dd46a791498d827" - integrity sha512-eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw== +vscode-languageserver@^8.2.0-next.0: + version "8.2.0-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-8.2.0-next.0.tgz#ad9bcef650e0bae9d32591ebbda3eb5e548418a7" + integrity sha512-Pw1pdR+hZvaeeVvbmEscUJG0SMMa5//iV+OnFuv4cPPvk+ohe4mtrVAcI06Z9HIMxDu+2McqY1b8JbVvyRKFtg== dependencies: - vscode-languageserver-protocol "3.17.3" + vscode-languageserver-protocol "3.17.4-next.0" vscode-uri@^3.0.7: version "3.0.7" diff --git a/extensions/json-language-features/yarn.lock b/extensions/json-language-features/yarn.lock index afa4409e71830a..e9eef45f314378 100644 --- a/extensions/json-language-features/yarn.lock +++ b/extensions/json-language-features/yarn.lock @@ -385,32 +385,32 @@ uuid@^8.3.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -vscode-jsonrpc@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz#cb9989c65e219e18533cc38e767611272d274c94" - integrity sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw== +vscode-jsonrpc@8.2.0-next.0: + version "8.2.0-next.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz#41409413c8cebf10f2f1b7cc87e330f0e292814c" + integrity sha512-13jYzaFQpTz5qQ2P+l5c/iTVsj1wUpflP0CR/v4XaEpM0oToLEXZBTcuuox1WaGIbu3Av3xxmGNU4Hydl1iNKg== -vscode-languageclient@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.1.0.tgz#3e67d5d841481ac66ddbdaa55b4118742f6a9f3f" - integrity sha512-GL4QdbYUF/XxQlAsvYWZRV3V34kOkpRlvV60/72ghHfsYFnS/v2MANZ9P6sHmxFcZKOse8O+L9G7Czg0NUWing== +vscode-languageclient@^8.2.0-next.0: + version "8.2.0-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.2.0-next.0.tgz#7415c831c4c1e38cc08e710e744c36c5d2251bd8" + integrity sha512-Gqr47Up5VDuRT8JrfB0QFGXR9ngQDkfIJfbT0xmM4OIsISqH3uUgXHTAhekRtS4N6aER3UvGXUrrRWQUaBGYHA== dependencies: minimatch "^5.1.0" semver "^7.3.7" - vscode-languageserver-protocol "3.17.3" + vscode-languageserver-protocol "3.17.4-next.0" -vscode-languageserver-protocol@3.17.3: - version "3.17.3" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz#6d0d54da093f0c0ee3060b81612cce0f11060d57" - integrity sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA== +vscode-languageserver-protocol@3.17.4-next.0: + version "3.17.4-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.0.tgz#21e4dce218c1cf0ee65ea7fdb62a2c08e075ee8b" + integrity sha512-l//t/BY+GHkH9N0VrHN0zLB+KV42LD0EDtzjGL+p/6xqUVEZegbsZg+6ubvqjE8LhyWcTtpA6pLRaczua6+3GQ== dependencies: - vscode-jsonrpc "8.1.0" - vscode-languageserver-types "3.17.3" + vscode-jsonrpc "8.2.0-next.0" + vscode-languageserver-types "3.17.4-next.0" -vscode-languageserver-types@3.17.3: - version "3.17.3" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz#72d05e47b73be93acb84d6e311b5786390f13f64" - integrity sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA== +vscode-languageserver-types@3.17.4-next.0: + version "3.17.4-next.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4-next.0.tgz#4b5238d21cceaeb836d36a05d23c61a8c0238de2" + integrity sha512-2FPKboHnT04xYjfM8JpJVBz4a/tryMw58jmzucaabZMZN5hzoFBrhc97jNG4n6edr9JUb9+QSwwcAcYpDTAoag== yallist@^4.0.0: version "4.0.0" diff --git a/extensions/latex/cgmanifest.json b/extensions/latex/cgmanifest.json index a0b3f87945c231..c3031ee87cb841 100644 --- a/extensions/latex/cgmanifest.json +++ b/extensions/latex/cgmanifest.json @@ -6,11 +6,11 @@ "git": { "name": "jlelong/vscode-latex-basics", "repositoryUrl": "https://github.com/jlelong/vscode-latex-basics", - "commitHash": "d80a1a5dcff9b85217e174242dd3d0e2210b94a0" + "commitHash": "580c019674f82ef887a6dcce7bfc75ab0b58486d" } }, "license": "MIT", - "version": "1.5.1", + "version": "1.5.2", "description": "The files in syntaxes/ were originally part of https://github.com/James-Yu/LaTeX-Workshop. They have been extracted in the hope that they can useful outside of the LaTeX-Workshop extension.", "licenseDetail": [ "Copyright (c) vscode-latex-basics authors", diff --git a/extensions/latex/syntaxes/Bibtex.tmLanguage.json b/extensions/latex/syntaxes/Bibtex.tmLanguage.json index d1e6a3c22240a7..c5d2f337972bc4 100644 --- a/extensions/latex/syntaxes/Bibtex.tmLanguage.json +++ b/extensions/latex/syntaxes/Bibtex.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/jlelong/vscode-latex-basics/commit/d80a1a5dcff9b85217e174242dd3d0e2210b94a0", + "version": "https://github.com/jlelong/vscode-latex-basics/commit/4b19be579cb4a3c680f8b4bb613dcebfac826f8b", "name": "BibTeX", "scopeName": "text.bibtex", "comment": "Grammar based on description from http://artis.imag.fr/~Xavier.Decoret/resources/xdkbibtex/bibtex_summary.html#comment\n\t\n\tTODO: Does not support @preamble\n\t", @@ -27,7 +27,7 @@ ] }, { - "begin": "((@)(?i:string))\\s*(\\{)\\s*([a-zA-Z]*)", + "begin": "((@)(?i:string))\\s*(\\{)\\s*([a-zA-Z0-9\\!\\$\\&\\*\\+\\-\\.\\/\\:\\;\\<\\>\\?\\[\\]\\^\\_\\`\\|]+)", "beginCaptures": { "1": { "name": "keyword.other.string-constant.bibtex" @@ -56,7 +56,7 @@ ] }, { - "begin": "((@)(?i:string))\\s*(\\()\\s*([a-zA-Z]*)", + "begin": "((@)(?i:string))\\s*(\\()\\s*([a-zA-Z0-9\\!\\$\\&\\*\\+\\-\\.\\/\\:\\;\\<\\>\\?\\[\\]\\^\\_\\`\\|]+)", "beginCaptures": { "1": { "name": "keyword.other.string-constant.bibtex" @@ -131,13 +131,13 @@ "include": "#percentage_comment" }, { - "include": "#string_var" + "include": "#integer" }, { "include": "#string_content" }, { - "include": "#integer" + "include": "#string_var" } ] } @@ -190,13 +190,13 @@ "include": "#percentage_comment" }, { - "include": "#string_var" + "include": "#integer" }, { "include": "#string_content" }, { - "include": "#integer" + "include": "#string_var" } ] } @@ -210,8 +210,12 @@ ], "repository": { "integer": { - "match": "\\d+", - "name": "constant.numeric.bibtex" + "match": "\\s*(\\d+)\\s*", + "captures": { + "1": { + "name": "constant.numeric.bibtex" + } + } }, "nested_braces": { "begin": "(?\\?\\[\\]\\^\\_\\`\\|]+)\\s*(#)?", "captures": { "1": { "name": "keyword.operator.bibtex" diff --git a/extensions/latex/syntaxes/LaTeX.tmLanguage.json b/extensions/latex/syntaxes/LaTeX.tmLanguage.json index 945a803dbe9f35..3955e47cb8d195 100644 --- a/extensions/latex/syntaxes/LaTeX.tmLanguage.json +++ b/extensions/latex/syntaxes/LaTeX.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/jlelong/vscode-latex-basics/commit/eed5b817b757aab3695af437409fcbfdd37bbc59", + "version": "https://github.com/jlelong/vscode-latex-basics/commit/580c019674f82ef887a6dcce7bfc75ab0b58486d", "name": "LaTeX", "scopeName": "text.tex.latex", "patterns": [ @@ -1205,16 +1205,32 @@ "name": "punctuation.definition.function.latex" }, "3": { - "name": "punctuation.definition.arguments.begin.latex" + "patterns": [ + { + "include": "#optional-arg" + } + ] }, "4": { - "name": "markup.underline.link.latex" + "name": "punctuation.definition.arguments.begin.latex" }, "5": { + "name": "markup.underline.link.latex" + }, + "6": { + "name": "punctuation.definition.arguments.end.latex" + }, + "7": { + "name": "punctuation.definition.arguments.begin.latex" + }, + "8": { + "name": "entity.name.hyperlink.latex" + }, + "9": { "name": "punctuation.definition.arguments.end.latex" } }, - "match": "(?:\\s*)((\\\\)(?:url|href))(\\{)([^}]*)(\\})", + "match": "(?:\\s*)((\\\\)(?:url|href|hyperref|hyperimage))(\\[[^\\[]*?\\])?(\\{)([^}]*)(\\})(?:\\{[^}]*\\}){2}?(?:(\\{)([^}]*)(\\}))?", "name": "meta.function.link.url.latex" }, { @@ -1737,7 +1753,7 @@ "match": "((%).*)$" }, { - "match": "[\\p{Alphabetic}:.-]+", + "match": "[\\p{Alphabetic}\\p{Number}:.-]+", "name": "constant.other.reference.citation.latex" } ] @@ -1764,7 +1780,7 @@ "name": "meta.citation.latex", "patterns": [ { - "match": "[\\p{Alphabetic}:.]+", + "match": "[\\p{Alphabetic}\\p{Number}:.]+", "name": "constant.other.reference.citation.latex" } ] @@ -2054,6 +2070,30 @@ } ] }, + { + "name": "string.quoted.double.latex", + "match": "(?|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", + "begin": "((?|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { "name": "meta.head.class.cpp" @@ -634,7 +640,7 @@ "11": { "patterns": [ { - "match": "((?|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { @@ -1395,41 +1401,25 @@ "name": "comment.block.cpp punctuation.definition.comment.end.cpp" }, "10": { - "patterns": [ - { - "include": "#inline_comment" - } - ] - }, - "11": { - "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" - }, - "12": { - "name": "comment.block.cpp" - }, - "13": { - "name": "comment.block.cpp punctuation.definition.comment.end.cpp" - }, - "14": { "name": "storage.type.modifier.calling-convention.cpp" }, - "15": { + "11": { "patterns": [ { "include": "#inline_comment" } ] }, - "16": { + "12": { "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" }, - "17": { + "13": { "name": "comment.block.cpp" }, - "18": { + "14": { "name": "comment.block.cpp punctuation.definition.comment.end.cpp" }, - "19": { + "15": { "name": "entity.name.function.constructor.cpp entity.name.function.definition.special.constructor.cpp" } }, @@ -1451,7 +1441,7 @@ "include": "#ever_present_context" }, { - "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))", + "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(default)|(delete))", "captures": { "1": { "name": "keyword.operator.assignment.cpp" @@ -1494,7 +1484,7 @@ "endCaptures": {}, "patterns": [ { - "begin": "((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?(\\()", + "begin": "((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(\\()", "end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "1": { @@ -1628,48 +1618,32 @@ ] }, "constructor_root": { - "begin": "\\s*+((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)(((?>(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)(((?>(?|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { "name": "meta.head.function.definition.special.constructor.cpp" }, "1": { - "patterns": [ - { - "include": "#inline_comment" - } - ] - }, - "2": { - "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" - }, - "3": { - "name": "comment.block.cpp" - }, - "4": { - "name": "comment.block.cpp punctuation.definition.comment.end.cpp" - }, - "5": { "name": "storage.type.modifier.calling-convention.cpp" }, - "6": { + "2": { "patterns": [ { "include": "#inline_comment" } ] }, - "7": { + "3": { "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" }, - "8": { + "4": { "name": "comment.block.cpp" }, - "9": { + "5": { "name": "comment.block.cpp punctuation.definition.comment.end.cpp" }, - "10": { + "6": { "patterns": [ { "match": "::", @@ -1684,15 +1658,15 @@ } ] }, - "11": { + "7": { "patterns": [ { "include": "#template_call_range" } ] }, - "12": {}, - "13": { + "8": {}, + "9": { "patterns": [ { "match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?=:)", @@ -1708,53 +1682,53 @@ } ] }, - "14": {}, - "15": { + "10": {}, + "11": { "patterns": [ { "include": "#inline_comment" } ] }, - "16": { + "12": { "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" }, - "17": { + "13": { "name": "comment.block.cpp" }, - "18": { + "14": { "name": "comment.block.cpp punctuation.definition.comment.end.cpp" }, - "19": { + "15": { "patterns": [ { "include": "#inline_comment" } ] }, - "20": { + "16": { "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" }, - "21": { + "17": { "name": "comment.block.cpp" }, - "22": { + "18": { "name": "comment.block.cpp punctuation.definition.comment.end.cpp" }, - "23": { + "19": { "patterns": [ { "include": "#inline_comment" } ] }, - "24": { + "20": { "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" }, - "25": { + "21": { "name": "comment.block.cpp" }, - "26": { + "22": { "name": "comment.block.cpp punctuation.definition.comment.end.cpp" } }, @@ -1776,7 +1750,7 @@ "include": "#ever_present_context" }, { - "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))", + "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(default)|(delete))", "captures": { "1": { "name": "keyword.operator.assignment.cpp" @@ -1819,7 +1793,7 @@ "endCaptures": {}, "patterns": [ { - "begin": "((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?(\\()", + "begin": "((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(\\()", "end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "1": { @@ -1953,7 +1927,7 @@ ] }, "control_flow_keywords": { - "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\{)", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\{)", "end": "\\}|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "1": { @@ -2226,7 +2206,7 @@ ] }, "d9bc4796b0b_module_import": { - "match": "^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((import))(?:(?:\\s)+)?(?:(?:(?:((<)[^>]*(>?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/)))|((\\\")[^\\\"]*((?:\\\")?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/))))|(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\.(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)*((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;)))))|((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;))))(?:(?:\\s)+)?(;?)", + "match": "^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((import))(?:\\s+)?(?:(?:(?:((<)[^>]*(>?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=\\/\\/)))|((\\\")[^\\\"]*(\\\"?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=\\/\\/))))|(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\.(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)*((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=(?:\\/\\/|;)))))|((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=(?:\\/\\/|;))))(?:\\s+)?(;?)", "captures": { "1": { "patterns": [ @@ -2420,7 +2400,7 @@ "endCaptures": {}, "patterns": [ { - "match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { @@ -2801,64 +2781,48 @@ "name": "comment.block.cpp punctuation.definition.comment.end.cpp" }, "5": { - "patterns": [ - { - "include": "#inline_comment" - } - ] - }, - "6": { - "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" - }, - "7": { - "name": "comment.block.cpp" - }, - "8": { - "name": "comment.block.cpp punctuation.definition.comment.end.cpp" - }, - "9": { "name": "storage.type.modifier.calling-convention.cpp" }, - "10": { + "6": { "patterns": [ { "include": "#inline_comment" } ] }, - "11": { + "7": { "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" }, - "12": { + "8": { "name": "comment.block.cpp" }, - "13": { + "9": { "name": "comment.block.cpp punctuation.definition.comment.end.cpp" }, - "14": { + "10": { "patterns": [ { "include": "#functional_specifiers_pre_parameters" } ] }, - "15": { + "11": { "patterns": [ { "include": "#inline_comment" } ] }, - "16": { + "12": { "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" }, - "17": { + "13": { "name": "comment.block.cpp" }, - "18": { + "14": { "name": "comment.block.cpp punctuation.definition.comment.end.cpp" }, - "19": { + "15": { "name": "entity.name.function.destructor.cpp entity.name.function.definition.special.member.destructor.cpp" } }, @@ -2880,7 +2844,7 @@ "include": "#ever_present_context" }, { - "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))", + "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(default)|(delete))", "captures": { "1": { "name": "keyword.operator.assignment.cpp" @@ -2964,7 +2928,7 @@ ] }, "destructor_root": { - "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)(((?>(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)(((?>(?|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { @@ -3112,7 +3076,7 @@ "include": "#ever_present_context" }, { - "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))", + "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(default)|(delete))", "captures": { "1": { "name": "keyword.operator.assignment.cpp" @@ -3196,7 +3160,7 @@ ] }, "diagnostic": { - "begin": "(^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?((?:error|warning)))\\b(?:(?:\\s)+)?", + "begin": "(^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(#)(?:\\s+)?((?:error|warning)))\\b(?:\\s+)?", "end": "(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?(::))?(?:(?:\\s)+)?((?|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", + "begin": "((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::))?(?:\\s+)?((?|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { "name": "meta.head.enum.cpp" @@ -3463,7 +3427,7 @@ ] }, "enum_declare": { - "match": "((?|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", + "begin": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(extern)(?=\\s*\\\")", + "end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { "name": "meta.head.extern.cpp" @@ -3992,7 +3956,7 @@ ] }, "function_call": { - "begin": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?(\\()", + "begin": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(\\()", "end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "1": { @@ -4066,7 +4030,7 @@ ] }, "function_definition": { - "begin": "(?:(?:^|\\G|(?<=;|\\}))|(?<=>|\\*\\/))\\s*+(?:((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?|\\*\\/))\\s*+(?:((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { @@ -4104,7 +4068,7 @@ "7": { "patterns": [ { - "match": "((?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))", + "match": "(?<=^|\\))(?:\\s+)?(->)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))", "captures": { "1": { "name": "punctuation.definition.function.return-type.cpp" @@ -4696,8 +4644,8 @@ ] }, "function_pointer": { - "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", - "end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()(\\*)(?:\\s+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:\\s+)?(?:(\\[)(\\w*)(\\])(?:\\s+)?)*(\\))(?:\\s+)?(\\()", + "end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "1": { "name": "meta.qualified_type.cpp", @@ -4843,7 +4791,7 @@ "name": "storage.modifier.pointer.cpp" }, { - "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&", + "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&", "captures": { "1": { "patterns": [ @@ -4975,8 +4923,8 @@ ] }, "function_pointer_parameter": { - "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", - "end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()(\\*)(?:\\s+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:\\s+)?(?:(\\[)(\\w*)(\\])(?:\\s+)?)*(\\))(?:\\s+)?(\\()", + "end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "1": { "name": "meta.qualified_type.cpp", @@ -5122,7 +5070,7 @@ "name": "storage.modifier.pointer.cpp" }, { - "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&", + "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&", "captures": { "1": { "patterns": [ @@ -5286,11 +5234,14 @@ }, { "include": "#string_context" + }, + { + "include": "#ever_present_context" } ] }, { - "match": "(using)(?:\\s)+((?]*(>?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/)))|((\\\")[^\\\"]*((?:\\\")?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/))))|(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\.(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)*((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;)))))|((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;))))", + "match": "^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((#)(?:\\s+)?((?:include|include_next))\\b)(?:\\s+)?(?:(?:(?:((<)[^>]*(>?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=\\/\\/)))|((\\\")[^\\\"]*(\\\"?)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=\\/\\/))))|(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\.(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)*((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=(?:\\/\\/|;)))))|((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:\\n|$)|(?=(?:\\/\\/|;))))", "captures": { "1": { "patterns": [ @@ -5586,7 +5540,7 @@ "name": "storage.type.modifier.virtual.cpp" }, { - "match": "(?<=protected|virtual|private|public|,|:)(?:(?:\\s)+)?(?!(?:(?:(?:protected)|(?:private)|(?:public))|virtual))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))", + "match": "(?<=protected|virtual|private|public|,|:)(?:\\s+)?(?!(?:(?:(?:protected)|(?:private)|(?:public))|virtual))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))", "captures": { "1": { "name": "meta.qualified_type.cpp", @@ -5757,7 +5711,7 @@ ] }, "inline_builtin_storage_type": { - "match": "(?:\\s)*+(?])|(?<=\\Wreturn|^return))(?:(?:\\s)+)?(\\[(?!\\[| *+\"| *+\\d))((?:[^\\[\\]]|((??)++\\]))*+)(\\](?!((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))[\\[\\];]))", + "begin": "(?:(?<=[^\\s]|^)(?])|(?<=\\Wreturn|^return))(?:\\s+)?(\\[(?!\\[| *+\"| *+\\d))((?:[^\\[\\]]|((??)++\\]))*+)(\\](?!((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))[\\[\\];=]))", "end": "(?<=[;}])|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "1": { @@ -5866,7 +5820,7 @@ "include": "#the_this_keyword" }, { - "match": "((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?=\\]|\\z|$)|(,))|(\\=))", + "match": "((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?=\\]|\\z|$)|(,))|(\\=))", "captures": { "1": { "name": "variable.parameter.capture.cpp" @@ -5993,7 +5947,7 @@ "name": "constant.language.$0.cpp" }, "line": { - "begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?line\\b", + "begin": "^((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(#)(?:\\s+)?line\\b", "end": "(?\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:(?:\\s)+)?(?:(?:\\.\\*|\\.)|(?:->\\*|->))(?:(?:\\s)+)?)*)(?:(?:\\s)+)?(\\b(?!uint_least32_t[^\\w]|uint_least16_t[^\\w]|uint_least64_t[^\\w]|int_least32_t[^\\w]|int_least64_t[^\\w]|uint_fast32_t[^\\w]|uint_fast64_t[^\\w]|uint_least8_t[^\\w]|uint_fast16_t[^\\w]|int_least16_t[^\\w]|int_fast16_t[^\\w]|int_least8_t[^\\w]|uint_fast8_t[^\\w]|int_fast64_t[^\\w]|int_fast32_t[^\\w]|int_fast8_t[^\\w]|suseconds_t[^\\w]|useconds_t[^\\w]|in_addr_t[^\\w]|uintmax_t[^\\w]|uintmax_t[^\\w]|uintmax_t[^\\w]|in_port_t[^\\w]|uintptr_t[^\\w]|blksize_t[^\\w]|uint32_t[^\\w]|uint64_t[^\\w]|u_quad_t[^\\w]|intmax_t[^\\w]|intmax_t[^\\w]|unsigned[^\\w]|blkcnt_t[^\\w]|uint16_t[^\\w]|intptr_t[^\\w]|swblk_t[^\\w]|wchar_t[^\\w]|u_short[^\\w]|qaddr_t[^\\w]|caddr_t[^\\w]|daddr_t[^\\w]|fixpt_t[^\\w]|nlink_t[^\\w]|segsz_t[^\\w]|clock_t[^\\w]|ssize_t[^\\w]|int16_t[^\\w]|int32_t[^\\w]|int64_t[^\\w]|uint8_t[^\\w]|int8_t[^\\w]|mode_t[^\\w]|quad_t[^\\w]|ushort[^\\w]|u_long[^\\w]|u_char[^\\w]|double[^\\w]|signed[^\\w]|time_t[^\\w]|size_t[^\\w]|key_t[^\\w]|div_t[^\\w]|ino_t[^\\w]|uid_t[^\\w]|gid_t[^\\w]|off_t[^\\w]|pid_t[^\\w]|float[^\\w]|dev_t[^\\w]|u_int[^\\w]|short[^\\w]|bool[^\\w]|id_t[^\\w]|uint[^\\w]|long[^\\w]|char[^\\w]|void[^\\w]|auto[^\\w]|id_t[^\\w]|int[^\\w])(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b(?!\\())", + "match": "(?:((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\s+)?(?:(?:\\.\\*|\\.)|(?:->\\*|->))(?:\\s+)?)*)(?:\\s+)?(\\b(?!uint_least32_t[^\\w]|uint_least16_t[^\\w]|uint_least64_t[^\\w]|int_least32_t[^\\w]|int_least64_t[^\\w]|uint_fast32_t[^\\w]|uint_fast64_t[^\\w]|uint_least8_t[^\\w]|uint_fast16_t[^\\w]|int_least16_t[^\\w]|int_fast16_t[^\\w]|int_least8_t[^\\w]|uint_fast8_t[^\\w]|int_fast64_t[^\\w]|int_fast32_t[^\\w]|int_fast8_t[^\\w]|suseconds_t[^\\w]|useconds_t[^\\w]|in_addr_t[^\\w]|uintmax_t[^\\w]|uintmax_t[^\\w]|uintmax_t[^\\w]|in_port_t[^\\w]|uintptr_t[^\\w]|blksize_t[^\\w]|uint32_t[^\\w]|uint64_t[^\\w]|u_quad_t[^\\w]|intmax_t[^\\w]|intmax_t[^\\w]|unsigned[^\\w]|blkcnt_t[^\\w]|uint16_t[^\\w]|intptr_t[^\\w]|swblk_t[^\\w]|wchar_t[^\\w]|u_short[^\\w]|qaddr_t[^\\w]|caddr_t[^\\w]|daddr_t[^\\w]|fixpt_t[^\\w]|nlink_t[^\\w]|segsz_t[^\\w]|clock_t[^\\w]|ssize_t[^\\w]|int16_t[^\\w]|int32_t[^\\w]|int64_t[^\\w]|uint8_t[^\\w]|int8_t[^\\w]|mode_t[^\\w]|quad_t[^\\w]|ushort[^\\w]|u_long[^\\w]|u_char[^\\w]|double[^\\w]|signed[^\\w]|time_t[^\\w]|size_t[^\\w]|key_t[^\\w]|div_t[^\\w]|ino_t[^\\w]|uid_t[^\\w]|gid_t[^\\w]|off_t[^\\w]|pid_t[^\\w]|float[^\\w]|dev_t[^\\w]|u_int[^\\w]|short[^\\w]|bool[^\\w]|id_t[^\\w]|uint[^\\w]|long[^\\w]|char[^\\w]|void[^\\w]|auto[^\\w]|id_t[^\\w]|int[^\\w])(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b(?!\\())", "captures": { "1": { "patterns": [ @@ -6184,7 +6138,7 @@ "7": { "patterns": [ { - "match": "(?<=(?:\\.\\*|\\.|->|->\\*))(?:(?:\\s)+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?\\*|->)))", + "match": "(?<=(?:\\.\\*|\\.|->|->\\*))(?:\\s+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?\\*|->)))", "captures": { "1": { "patterns": [ @@ -6217,7 +6171,7 @@ } }, { - "match": "(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?\\*|->)))", + "match": "(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?\\*|->)))", "captures": { "1": { "patterns": [ @@ -6263,7 +6217,7 @@ } }, "memory_operators": { - "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:(?:(delete)(?:(?:\\s)+)?(\\[\\])|(delete))|(new))(?!\\w))", + "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:(?:(delete)(?:\\s+)?(\\[\\])|(delete))|(new))(?!\\w))", "captures": { "1": { "patterns": [ @@ -6308,7 +6262,7 @@ } }, "method_access": { - "begin": "(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:(?:\\s)+)?(?:(?:\\.\\*|\\.)|(?:->\\*|->))(?:(?:\\s)+)?)*)(?:(?:\\s)+)?(~?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:(?:\\s)+)?(\\()", + "begin": "(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\s+)?(?:(?:\\.\\*|\\.)|(?:->\\*|->))(?:\\s+)?)*)(?:\\s+)?(~?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:\\s+)?(\\()", "end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "1": { @@ -6342,7 +6296,7 @@ "9": { "patterns": [ { - "match": "(?<=(?:\\.\\*|\\.|->|->\\*))(?:(?:\\s)+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?\\*|->)))", + "match": "(?<=(?:\\.\\*|\\.|->|->\\*))(?:\\s+)?(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?\\*|->)))", "captures": { "1": { "patterns": [ @@ -6375,7 +6329,7 @@ } }, { - "match": "(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?\\*|->)))", + "match": "(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?\\*|->)))", "captures": { "1": { "patterns": [ @@ -6434,7 +6388,7 @@ ] }, "misc_keywords": { - "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)(?:\\s+)?((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)(?:(?:\\s)+)?((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)(?:\\s+)?((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)(operator)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)(?:(?:((?:(?:delete\\[\\])|(?:delete)|(?:new\\[\\])|(?:<=>)|(?:<<=)|(?:new)|(?:>>=)|(?:\\->\\*)|(?:\\/=)|(?:%=)|(?:&=)|(?:>=)|(?:\\|=)|(?:\\+\\+)|(?:\\-\\-)|(?:\\(\\))|(?:\\[\\])|(?:\\->)|(?:\\+\\+)|(?:<<)|(?:>>)|(?:\\-\\-)|(?:<=)|(?:\\^=)|(?:==)|(?:!=)|(?:&&)|(?:\\|\\|)|(?:\\+=)|(?:\\-=)|(?:\\*=)|,|(?:\\+)|(?:\\-)|!|~|(?:\\*)|&|(?:\\*)|(?:\\/)|%|(?:\\+)|(?:\\-)|<|>|&|(?:\\^)|(?:\\|)|=))|((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)(operator)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)(?:(?:((?:(?:delete\\[\\])|(?:delete)|(?:new\\[\\])|(?:<=>)|(?:<<=)|(?:new)|(?:>>=)|(?:\\->\\*)|(?:\\/=)|(?:%=)|(?:&=)|(?:>=)|(?:\\|=)|(?:\\+\\+)|(?:\\-\\-)|(?:\\(\\))|(?:\\[\\])|(?:\\->)|(?:\\+\\+)|(?:<<)|(?:>>)|(?:\\-\\-)|(?:<=)|(?:\\^=)|(?:==)|(?:!=)|(?:&&)|(?:\\|\\|)|(?:\\+=)|(?:\\-=)|(?:\\*=)|,|\\+|\\-|!|~|\\*|&|\\*|\\/|%|\\+|\\-|<|>|&|\\^|\\||=))|((?|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { "name": "meta.head.function.definition.special.operator-overload.cpp" }, "1": { + "patterns": [ + { + "include": "#inline_comment" + } + ] + }, + "2": { + "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" + }, + "3": { + "name": "comment.block.cpp" + }, + "4": { + "name": "comment.block.cpp punctuation.definition.comment.end.cpp" + }, + "5": { "name": "meta.qualified_type.cpp", "patterns": [ { @@ -7040,7 +7016,7 @@ } ] }, - "2": { + "6": { "patterns": [ { "include": "#attributes_context" @@ -7050,39 +7026,39 @@ } ] }, - "3": { + "7": { "patterns": [ { "include": "#inline_comment" } ] }, - "4": { + "8": { "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" }, - "5": { + "9": { "name": "comment.block.cpp" }, - "6": { + "10": { "name": "comment.block.cpp punctuation.definition.comment.end.cpp" }, - "7": { + "11": { "patterns": [ { "include": "#inline_comment" } ] }, - "8": { + "12": { "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" }, - "9": { + "13": { "name": "comment.block.cpp" }, - "10": { + "14": { "name": "comment.block.cpp punctuation.definition.comment.end.cpp" }, - "11": { + "15": { "patterns": [ { "match": "::", @@ -7097,39 +7073,39 @@ } ] }, - "12": { + "16": { "patterns": [ { "include": "#template_call_range" } ] }, - "13": {}, - "14": { + "17": {}, + "18": { "patterns": [ { "include": "#inline_comment" } ] }, - "15": { + "19": { "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" }, - "16": { + "20": { "name": "comment.block.cpp" }, - "17": { + "21": { "name": "comment.block.cpp punctuation.definition.comment.end.cpp" }, - "18": {}, - "19": { + "22": {}, + "23": { "patterns": [ { "match": "\\*", "name": "storage.modifier.pointer.cpp" }, { - "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&", + "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&", "captures": { "1": { "patterns": [ @@ -7156,22 +7132,6 @@ } ] }, - "20": { - "patterns": [ - { - "include": "#inline_comment" - } - ] - }, - "21": { - "name": "comment.block.cpp punctuation.definition.comment.begin.cpp" - }, - "22": { - "name": "comment.block.cpp" - }, - "23": { - "name": "comment.block.cpp punctuation.definition.comment.end.cpp" - }, "24": { "patterns": [ { @@ -7333,7 +7293,7 @@ "name": "entity.name.operator.type.pointer.cpp" }, { - "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&", + "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&", "captures": { "1": { "patterns": [ @@ -7497,7 +7457,7 @@ "include": "#qualifiers_and_specifiers_post_parameters" }, { - "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))", + "match": "(\\=)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(default)|(delete))", "captures": { "1": { "name": "keyword.operator.assignment.cpp" @@ -7564,7 +7524,7 @@ "operators": { "patterns": [ { - "begin": "((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.])", + "match": "\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.])", "captures": { "0": { "patterns": [ @@ -10897,12 +10863,12 @@ "name": "meta.qualified_type.cpp" }, "qualifiers_and_specifiers_post_parameters": { - "match": "((?:(?:(?:(?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -10952,7 +10918,7 @@ } }, "scope_resolution_function_call": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -10974,7 +10940,7 @@ } }, "scope_resolution_function_call_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)", "captures": { "1": { "patterns": [ @@ -11021,7 +10987,7 @@ } }, "scope_resolution_function_definition": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -11043,7 +11009,7 @@ } }, "scope_resolution_function_definition_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)", "captures": { "1": { "patterns": [ @@ -11090,7 +11056,7 @@ } }, "scope_resolution_function_definition_operator_overload": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -11112,7 +11078,7 @@ } }, "scope_resolution_function_definition_operator_overload_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)", "captures": { "1": { "patterns": [ @@ -11159,7 +11125,7 @@ } }, "scope_resolution_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)", "captures": { "1": { "patterns": [ @@ -11206,7 +11172,7 @@ } }, "scope_resolution_namespace_alias": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -11228,7 +11194,7 @@ } }, "scope_resolution_namespace_alias_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)", "captures": { "1": { "patterns": [ @@ -11275,7 +11241,7 @@ } }, "scope_resolution_namespace_block": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -11297,7 +11263,7 @@ } }, "scope_resolution_namespace_block_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)", "captures": { "1": { "patterns": [ @@ -11344,7 +11310,7 @@ } }, "scope_resolution_namespace_using": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -11366,7 +11332,7 @@ } }, "scope_resolution_namespace_using_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)", "captures": { "1": { "patterns": [ @@ -11413,7 +11379,7 @@ } }, "scope_resolution_parameter": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -11435,7 +11401,7 @@ } }, "scope_resolution_parameter_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)", "captures": { "1": { "patterns": [ @@ -11482,7 +11448,7 @@ } }, "scope_resolution_template_call": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -11504,7 +11470,7 @@ } }, "scope_resolution_template_call_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)", "captures": { "1": { "patterns": [ @@ -11551,7 +11517,7 @@ } }, "scope_resolution_template_definition": { - "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+", + "match": "(::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+", "captures": { "0": { "patterns": [ @@ -11573,7 +11539,7 @@ } }, "scope_resolution_template_definition_inner_generated": { - "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?(::)", + "match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)((?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?(::)", "captures": { "1": { "patterns": [ @@ -11624,7 +11590,7 @@ "name": "punctuation.terminator.statement.cpp" }, "simple_type": { - "match": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?", + "match": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?", "captures": { "1": { "name": "meta.qualified_type.cpp", @@ -11797,7 +11763,7 @@ "name": "storage.modifier.pointer.cpp" }, { - "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&", + "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&", "captures": { "1": { "patterns": [ @@ -11877,7 +11843,7 @@ } }, "single_line_macro": { - "match": "^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))#define.*(?|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", + "begin": "((?|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { "name": "meta.head.struct.cpp" @@ -13131,7 +13097,7 @@ "11": { "patterns": [ { - "match": "((?|\\?\\?>)|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { @@ -13612,7 +13578,7 @@ ] }, "template_argument_defaulted": { - "match": "(?<=<|,)(?:(?:\\s)+)?((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:\\s)+((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(\\=)", + "match": "(?<=<|,)(?:\\s+)?((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s+((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:\\s+)?(\\=)", "captures": { "1": { "name": "storage.type.template.argument.$1.cpp" @@ -13660,7 +13626,7 @@ ] }, "template_call_innards": { - "match": "((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+", + "match": "((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+", "captures": { "0": { "patterns": [ @@ -13702,7 +13668,7 @@ ] }, "template_definition": { - "begin": "(?|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "1": { @@ -13720,7 +13686,7 @@ "name": "meta.template.definition.cpp", "patterns": [ { - "begin": "(?<=\\w)(?:(?:\\s)+)?<", + "begin": "(?<=\\w)(?:\\s+)?<", "end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { @@ -13744,7 +13710,7 @@ ] }, "template_definition_argument": { - "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?:(?:(?:((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?:\\s)+)+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))|((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:(?:\\s)+)?(\\.\\.\\.)(?:(?:\\s)+)?((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))|(?)(?:(?:\\s)+)?(class|typename)(?:(?:\\s)+((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))?)(?:(?:\\s)+)?(?:(\\=)(?:(?:\\s)+)?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?(?:(,)|(?=>|$))", + "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s+)+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))|((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)(?:\\s+)?(\\.\\.\\.)(?:\\s+)?((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))|(?)(?:\\s+)?(class|typename)(?:\\s+((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))?)(?:\\s+)?(?:(\\=)(?:\\s+)?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?(?:(,)|(?=>|$))", "captures": { "1": { "patterns": [ @@ -13843,7 +13809,7 @@ ] }, "template_explicit_instantiation": { - "match": "(?)(?:(?:\\s)+)?$", + "match": "(?)(?:\\s+)?$", "captures": { "1": { "name": "storage.type.template.cpp" @@ -13972,7 +13938,7 @@ "applyEndPatternLast": 1 }, "the_this_keyword": { - "match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))|(.*(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))|(.*(?|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", + "begin": "((?|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { "name": "meta.head.class.cpp" @@ -14450,7 +14416,7 @@ "11": { "patterns": [ { - "match": "((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(\\()(\\*)(?:(?:\\s)+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:(?:\\s)+)?(?:(\\[)(\\w*)(\\])(?:(?:\\s)+)?)*(\\))(?:(?:\\s)+)?(\\()", - "end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})", + "begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()(\\*)(?:\\s+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)(?:\\s+)?(?:(\\[)(\\w*)(\\])(?:\\s+)?)*(\\))(?:\\s+)?(\\()", + "end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "1": { "name": "meta.qualified_type.cpp", @@ -14886,7 +14852,7 @@ "name": "storage.modifier.pointer.cpp" }, { - "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))){2,}\\&", + "match": "(?:\\&((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))){2,}\\&", "captures": { "1": { "patterns": [ @@ -15020,7 +14986,7 @@ ] }, "typedef_struct": { - "begin": "((?|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", + "begin": "((?|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { "name": "meta.head.struct.cpp" @@ -15084,7 +15050,7 @@ "11": { "patterns": [ { - "match": "((?|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", + "begin": "((?|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { "name": "meta.head.union.cpp" @@ -15427,7 +15393,7 @@ "11": { "patterns": [ { - "match": "((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z))))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))", + "match": "(((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))", "captures": { "1": { "name": "storage.modifier.cpp" @@ -15967,7 +15933,7 @@ } }, "undef": { - "match": "(^((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?undef\\b)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|(?:\\A)|(?:\\Z)))((?|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", + "begin": "((?|\\?\\?>)(?:\\s+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=\\\\end\\{(?:minted|cppcode)\\})", "beginCaptures": { "0": { "name": "meta.head.union.cpp" @@ -16086,7 +16052,7 @@ "11": { "patterns": [ { - "match": "((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)(?:\\s)*+)?::)*\\s*+)?((?|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*\\s*+)?((?) ?" }, "fenced_code_block_css": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(css|css.erb)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(css|css.erb)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -99,7 +99,7 @@ ] }, "fenced_code_block_basic": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(html|htm|shtml|xhtml|inc|tmpl|tpl)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(html|htm|shtml|xhtml|inc|tmpl|tpl)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -132,7 +132,7 @@ ] }, "fenced_code_block_ini": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(ini|conf)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(ini|conf)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -165,7 +165,7 @@ ] }, "fenced_code_block_java": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(java|bsh)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(java|bsh)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -198,7 +198,7 @@ ] }, "fenced_code_block_lua": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(lua)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(lua)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -231,7 +231,7 @@ ] }, "fenced_code_block_makefile": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(Makefile|makefile|GNUmakefile|OCamlMakefile)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(Makefile|makefile|GNUmakefile|OCamlMakefile)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -264,7 +264,7 @@ ] }, "fenced_code_block_perl": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(perl|pl|pm|pod|t|PL|psgi|vcl)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(perl|pl|pm|pod|t|PL|psgi|vcl)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -297,7 +297,7 @@ ] }, "fenced_code_block_r": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(R|r|s|S|Rprofile|\\{\\.r.+?\\})((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(R|r|s|S|Rprofile|\\{\\.r.+?\\})((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -330,7 +330,7 @@ ] }, "fenced_code_block_ruby": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(ruby|rb|rbx|rjs|Rakefile|rake|cgi|fcgi|gemspec|irbrc|Capfile|ru|prawn|Cheffile|Gemfile|Guardfile|Hobofile|Vagrantfile|Appraisals|Rantfile|Berksfile|Berksfile.lock|Thorfile|Puppetfile)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(ruby|rb|rbx|rjs|Rakefile|rake|cgi|fcgi|gemspec|irbrc|Capfile|ru|prawn|Cheffile|Gemfile|Guardfile|Hobofile|Vagrantfile|Appraisals|Rantfile|Berksfile|Berksfile.lock|Thorfile|Puppetfile)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -363,7 +363,7 @@ ] }, "fenced_code_block_php": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(php|php3|php4|php5|phpt|phtml|aw|ctp)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(php|php3|php4|php5|phpt|phtml|aw|ctp)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -399,7 +399,7 @@ ] }, "fenced_code_block_sql": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(sql|ddl|dml)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(sql|ddl|dml)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -432,7 +432,7 @@ ] }, "fenced_code_block_vs_net": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(vb)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(vb)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -465,7 +465,7 @@ ] }, "fenced_code_block_xml": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(xml|xsd|tld|jsp|pt|cpt|dtml|rss|opml)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(xml|xsd|tld|jsp|pt|cpt|dtml|rss|opml)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -498,7 +498,7 @@ ] }, "fenced_code_block_xsl": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(xsl|xslt)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(xsl|xslt)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -531,7 +531,7 @@ ] }, "fenced_code_block_yaml": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(yaml|yml)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(yaml|yml)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -564,7 +564,7 @@ ] }, "fenced_code_block_dosbatch": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(bat|batch)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(bat|batch)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -597,7 +597,7 @@ ] }, "fenced_code_block_clojure": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(clj|cljs|clojure)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(clj|cljs|clojure)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -630,7 +630,7 @@ ] }, "fenced_code_block_coffee": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(coffee|Cakefile|coffee.erb)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(coffee|Cakefile|coffee.erb)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -663,7 +663,7 @@ ] }, "fenced_code_block_c": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(c|h)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(c|h)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -696,7 +696,7 @@ ] }, "fenced_code_block_cpp": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(cpp|c\\+\\+|cxx)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(cpp|c\\+\\+|cxx)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -729,7 +729,7 @@ ] }, "fenced_code_block_diff": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(patch|diff|rej)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(patch|diff|rej)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -762,7 +762,7 @@ ] }, "fenced_code_block_dockerfile": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(dockerfile|Dockerfile)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(dockerfile|Dockerfile)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -795,7 +795,7 @@ ] }, "fenced_code_block_git_commit": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(COMMIT_EDITMSG|MERGE_MSG)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(COMMIT_EDITMSG|MERGE_MSG)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -828,7 +828,7 @@ ] }, "fenced_code_block_git_rebase": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(git-rebase-todo)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(git-rebase-todo)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -861,7 +861,7 @@ ] }, "fenced_code_block_go": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(go|golang)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(go|golang)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -894,7 +894,7 @@ ] }, "fenced_code_block_groovy": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(groovy|gvy)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(groovy|gvy)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -927,7 +927,7 @@ ] }, "fenced_code_block_pug": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(jade|pug)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(jade|pug)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -960,7 +960,7 @@ ] }, "fenced_code_block_js": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(js|jsx|javascript|es6|mjs|cjs|dataviewjs|\\{\\.js.+?\\})((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(js|jsx|javascript|es6|mjs|cjs|dataviewjs|\\{\\.js.+?\\})((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -993,7 +993,7 @@ ] }, "fenced_code_block_js_regexp": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(regexp)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(regexp)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1026,7 +1026,7 @@ ] }, "fenced_code_block_json": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(json|json5|sublime-settings|sublime-menu|sublime-keymap|sublime-mousemap|sublime-theme|sublime-build|sublime-project|sublime-completions)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(json|json5|sublime-settings|sublime-menu|sublime-keymap|sublime-mousemap|sublime-theme|sublime-build|sublime-project|sublime-completions)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1059,7 +1059,7 @@ ] }, "fenced_code_block_jsonc": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(jsonc)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(jsonc)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1092,7 +1092,7 @@ ] }, "fenced_code_block_less": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(less)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(less)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1125,7 +1125,7 @@ ] }, "fenced_code_block_objc": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(objectivec|objective-c|mm|objc|obj-c|m|h)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(objectivec|objective-c|mm|objc|obj-c|m|h)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1158,7 +1158,7 @@ ] }, "fenced_code_block_swift": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(swift)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(swift)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1191,7 +1191,7 @@ ] }, "fenced_code_block_scss": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(scss)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(scss)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1224,7 +1224,7 @@ ] }, "fenced_code_block_perl6": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(perl6|p6|pl6|pm6|nqp)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(perl6|p6|pl6|pm6|nqp)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1257,7 +1257,7 @@ ] }, "fenced_code_block_powershell": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(powershell|ps1|psm1|psd1)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(powershell|ps1|psm1|psd1)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1290,7 +1290,7 @@ ] }, "fenced_code_block_python": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(python|py|py3|rpy|pyw|cpy|SConstruct|Sconstruct|sconstruct|SConscript|gyp|gypi|\\{\\.python.+?\\})((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(python|py|py3|rpy|pyw|cpy|SConstruct|Sconstruct|sconstruct|SConscript|gyp|gypi|\\{\\.python.+?\\})((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1323,7 +1323,7 @@ ] }, "fenced_code_block_julia": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(julia|\\{\\.julia.+?\\})((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(julia|\\{\\.julia.+?\\})((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1356,7 +1356,7 @@ ] }, "fenced_code_block_regexp_python": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(re)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(re)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1389,7 +1389,7 @@ ] }, "fenced_code_block_rust": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(rust|rs|\\{\\.rust.+?\\})((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(rust|rs|\\{\\.rust.+?\\})((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1422,7 +1422,7 @@ ] }, "fenced_code_block_scala": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(scala|sbt)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(scala|sbt)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1455,7 +1455,7 @@ ] }, "fenced_code_block_shell": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(shell|sh|bash|zsh|bashrc|bash_profile|bash_login|profile|bash_logout|.textmate_init|\\{\\.bash.+?\\})((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(shell|sh|bash|zsh|bashrc|bash_profile|bash_login|profile|bash_logout|.textmate_init|\\{\\.bash.+?\\})((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1488,7 +1488,7 @@ ] }, "fenced_code_block_ts": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(typescript|ts)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(typescript|ts)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1521,7 +1521,7 @@ ] }, "fenced_code_block_tsx": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(tsx)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(tsx)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1554,7 +1554,7 @@ ] }, "fenced_code_block_csharp": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(cs|csharp|c#)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(cs|csharp|c#)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1587,7 +1587,7 @@ ] }, "fenced_code_block_fsharp": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(fs|fsharp|f#)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(fs|fsharp|f#)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1620,7 +1620,7 @@ ] }, "fenced_code_block_dart": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(dart)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(dart)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1653,7 +1653,7 @@ ] }, "fenced_code_block_handlebars": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(handlebars|hbs)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(handlebars|hbs)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1686,7 +1686,7 @@ ] }, "fenced_code_block_markdown": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(markdown|md)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(markdown|md)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1719,7 +1719,7 @@ ] }, "fenced_code_block_log": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(log)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(log)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1752,7 +1752,7 @@ ] }, "fenced_code_block_erlang": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(erlang)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(erlang)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1785,7 +1785,7 @@ ] }, "fenced_code_block_elixir": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(elixir)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(elixir)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1818,7 +1818,7 @@ ] }, "fenced_code_block_latex": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(latex|tex)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(latex|tex)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1851,7 +1851,7 @@ ] }, "fenced_code_block_bibtex": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(bibtex)((\\s+|:|,|\\{|\\?)[^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(bibtex)((\\s+|:|,|\\{|\\?)[^`]*)?$)", "name": "markup.fenced_code.block.markdown", "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", "beginCaptures": { @@ -1883,6 +1883,39 @@ } ] }, + "fenced_code_block_twig": { + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(twig)((\\s+|:|,|\\{|\\?)[^`]*)?$)", + "name": "markup.fenced_code.block.markdown", + "end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$", + "beginCaptures": { + "3": { + "name": "punctuation.definition.markdown" + }, + "4": { + "name": "fenced_code.block.language.markdown" + }, + "5": { + "name": "fenced_code.block.language.attributes.markdown" + } + }, + "endCaptures": { + "3": { + "name": "punctuation.definition.markdown" + } + }, + "patterns": [ + { + "begin": "(^|\\G)(\\s*)(.*)", + "while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)", + "contentName": "meta.embedded.block.twig", + "patterns": [ + { + "include": "source.twig" + } + ] + } + ] + }, "fenced_code_block": { "patterns": [ { @@ -2050,13 +2083,16 @@ { "include": "#fenced_code_block_bibtex" }, + { + "include": "#fenced_code_block_twig" + }, { "include": "#fenced_code_block_unknown" } ] }, "fenced_code_block_unknown": { - "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?=([^`~]*)?$)", + "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?=([^`]*)?$)", "beginCaptures": { "3": { "name": "punctuation.definition.markdown" diff --git a/extensions/lua/cgmanifest.json b/extensions/lua/cgmanifest.json index d8e50c4e8c63d3..a67ee9d9177011 100644 --- a/extensions/lua/cgmanifest.json +++ b/extensions/lua/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "sumneko/lua.tmbundle", "repositoryUrl": "https://github.com/sumneko/lua.tmbundle", - "commitHash": "dfdf6c33f33b7d478c474afbe1b6b3cd2e99b716" + "commitHash": "d0d89a3734dd36938d8498a3c16bc734291727cb" } }, "licenseDetail": [ diff --git a/extensions/lua/syntaxes/lua.tmLanguage.json b/extensions/lua/syntaxes/lua.tmLanguage.json index 8393d1a356ee5a..66be422796705f 100644 --- a/extensions/lua/syntaxes/lua.tmLanguage.json +++ b/extensions/lua/syntaxes/lua.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/sumneko/lua.tmbundle/commit/dfdf6c33f33b7d478c474afbe1b6b3cd2e99b716", + "version": "https://github.com/sumneko/lua.tmbundle/commit/d0d89a3734dd36938d8498a3c16bc734291727cb", "name": "Lua", "scopeName": "source.lua", "patterns": [ @@ -60,7 +60,7 @@ "end": "(?=[\\),])", "patterns": [ { - "include": "#luadoc.type" + "include": "#emmydoc.type" } ] } @@ -184,7 +184,7 @@ }, { "match": "\\b(and|or|not|\\|\\||\\&\\&|\\!)\\b", - "name": "keyword.operator.lua" + "name": "keyword.operator.logical.lua" }, { "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*(?:[({\"']|\\[\\[))", @@ -369,7 +369,12 @@ "name": "punctuation.definition.comment.end.lua" } }, - "name": "comment.block.lua" + "name": "comment.block.lua", + "patterns": [ + { + "include": "#comment_documentation_bracket" + } + ] }, { "begin": "----", @@ -389,10 +394,13 @@ } }, "end": "\\n", - "name": "comment.line.double-dash.doc.lua", + "name": "comment.line.double-dash.documentation.lua", "patterns": [ { - "include": "#luadoc" + "include": "#emmydoc" + }, + { + "include": "#ldoc_tag" } ] }, @@ -404,7 +412,12 @@ } }, "end": "\\n", - "name": "comment.line.double-dash.lua" + "name": "comment.line.double-dash.lua", + "patterns": [ + { + "include": "#ldoc_tag" + } + ] } ] }, @@ -421,14 +434,43 @@ "name": "punctuation.definition.comment.end.lua" } }, - "name": "comment.block.lua" + "name": "comment.block.lua", + "patterns": [ + { + "include": "#comment_documentation_asterisk" + } + ] } ] }, - "luadoc": { + "comment_documentation_asterisk": { + "begin": "(?<=/\\*\\*)([^*]|\\*(?!/))*$", + " ": "^[ \\t]*\\*(?!/)(?=([^*]|[*](?!/))*$)", "patterns": [ { - "begin": "(?<=---\\s*)@class", + "include": "#emmydoc" + }, + { + "include": "#ldoc_tag" + } + ] + }, + "comment_documentation_bracket": { + "begin": "(?<=--\\[\\[)([^-]|\\-(?!\\]\\]))*$", + "while": "^[ \\t]*-*(?!\\]\\])(?=([^-]|[-](?!\\]\\]))*$)", + "patterns": [ + { + "include": "#emmydoc" + }, + { + "include": "#ldoc_tag" + } + ] + }, + "emmydoc": { + "patterns": [ + { + "begin": "(?<=---[ \\t]*)@class", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -447,7 +489,7 @@ ] }, { - "begin": "(?<=---\\s*)@enum", + "begin": "(?<=---[ \\t]*)@enum", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -467,7 +509,7 @@ ] }, { - "begin": "(?<=---\\s*)@type", + "begin": "(?<=---[ \\t]*)@type", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -476,12 +518,12 @@ "end": "(?=[\\n@#])", "patterns": [ { - "include": "#luadoc.type" + "include": "#emmydoc.type" } ] }, { - "begin": "(?<=---\\s*)@alias", + "begin": "(?<=---[ \\t]*)@alias", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -499,14 +541,14 @@ "end": "(?=[\\n#])", "patterns": [ { - "include": "#luadoc.type" + "include": "#emmydoc.type" } ] } ] }, { - "begin": "(?<=---\\s*)(@operator)\\s*(\\b[a-z]+)?", + "begin": "(?<=---[ \\t]*)(@operator)\\s*(\\b[a-z]+)?", "beginCaptures": { "1": { "name": "storage.type.annotation.lua" @@ -518,12 +560,12 @@ "end": "(?=[\\n@#])", "patterns": [ { - "include": "#luadoc.type" + "include": "#emmydoc.type" } ] }, { - "begin": "(?<=---\\s*)@cast", + "begin": "(?<=---[ \\t]*)@cast", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -541,7 +583,7 @@ "end": "(?=\\n)", "patterns": [ { - "include": "#luadoc.type" + "include": "#emmydoc.type" }, { "match": "([+-|])", @@ -552,7 +594,7 @@ ] }, { - "begin": "(?<=---\\s*)@param", + "begin": "(?<=---[ \\t]*)@param", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -573,14 +615,14 @@ "end": "(?=[\\n#])", "patterns": [ { - "include": "#luadoc.type" + "include": "#emmydoc.type" } ] } ] }, { - "begin": "(?<=---\\s*)@return", + "begin": "(?<=---[ \\t]*)@return", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -593,12 +635,12 @@ "name": "keyword.operator.lua" }, { - "include": "#luadoc.type" + "include": "#emmydoc.type" } ] }, { - "begin": "(?<=---\\s*)@field", + "begin": "(?<=---[ \\t]*)@field", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -622,7 +664,7 @@ "include": "#string" }, { - "include": "#luadoc.type" + "include": "#emmydoc.type" }, { "match": "\\]", @@ -633,7 +675,7 @@ ] }, { - "begin": "(?<=---\\s*)@generic", + "begin": "(?<=---[ \\t]*)@generic", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -660,14 +702,14 @@ "name": "keyword.operator.lua" }, { - "include": "#luadoc.type" + "include": "#emmydoc.type" } ] } ] }, { - "begin": "(?<=---\\s*)@vararg", + "begin": "(?<=---[ \\t]*)@vararg", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -676,12 +718,12 @@ "end": "(?=[\\n@#])", "patterns": [ { - "include": "#luadoc.type" + "include": "#emmydoc.type" } ] }, { - "begin": "(?<=---\\s*)@overload", + "begin": "(?<=---[ \\t]*)@overload", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -690,12 +732,12 @@ "end": "(?=[\\n@#])", "patterns": [ { - "include": "#luadoc.type" + "include": "#emmydoc.type" } ] }, { - "begin": "(?<=---\\s*)@deprecated", + "begin": "(?<=---[ \\t]*)@deprecated", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -704,7 +746,7 @@ "end": "(?=[\\n@#])" }, { - "begin": "(?<=---\\s*)@meta", + "begin": "(?<=---[ \\t]*)@meta", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -713,7 +755,7 @@ "end": "(?=[\\n@#])" }, { - "begin": "(?<=---\\s*)@private", + "begin": "(?<=---[ \\t]*)@private", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -722,7 +764,7 @@ "end": "(?=[\\n@#])" }, { - "begin": "(?<=---\\s*)@protected", + "begin": "(?<=---[ \\t]*)@protected", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -731,7 +773,7 @@ "end": "(?=[\\n@#])" }, { - "begin": "(?<=---\\s*)@package", + "begin": "(?<=---[ \\t]*)@package", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -740,7 +782,7 @@ "end": "(?=[\\n@#])" }, { - "begin": "(?<=---\\s*)@version", + "begin": "(?<=---[ \\t]*)@version", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -759,7 +801,7 @@ ] }, { - "begin": "(?<=---\\s*)@see", + "begin": "(?<=---[ \\t]*)@see", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -778,7 +820,7 @@ ] }, { - "begin": "(?<=---\\s*)@diagnostic", + "begin": "(?<=---[ \\t]*)@diagnostic", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -811,7 +853,7 @@ ] }, { - "begin": "(?<=---\\s*)@module", + "begin": "(?<=---[ \\t]*)@module", "beginCaptures": { "0": { "name": "storage.type.annotation.lua" @@ -825,7 +867,7 @@ ] }, { - "match": "(?<=---\\s*)@(async|nodiscard)", + "match": "(?<=---[ \\t]*)@(async|nodiscard)", "name": "storage.type.annotation.lua" }, { @@ -844,7 +886,7 @@ } ] }, - "luadoc.type": { + "emmydoc.type": { "patterns": [ { "begin": "\\bfun\\b", @@ -864,7 +906,7 @@ "name": "entity.name.variable.lua" }, { - "include": "#luadoc.type" + "include": "#emmydoc.type" }, { "include": "#string" @@ -901,6 +943,18 @@ ] } ] + }, + "ldoc_tag": { + "match": "\\G[ \\t]*(@)(alias|annotation|author|charset|class|classmod|comment|constructor|copyright|description|example|export|factory|field|file|fixme|function|include|lfunction|license|local|module|name|param|pragma|private|raise|release|return|script|section|see|set|static|submodule|summary|tfield|thread|tparam|treturn|todo|topic|type|usage|warning|within)\\b", + "end": "(?!@)\\b", + "captures": { + "1": { + "name": "punctuation.definition.block.tag.ldoc" + }, + "2": { + "name": "storage.type.class.ldoc" + } + } } } } \ No newline at end of file diff --git a/extensions/notebook-renderers/src/index.ts b/extensions/notebook-renderers/src/index.ts index 973e65b3f9a092..d4a9ba9202be1e 100644 --- a/extensions/notebook-renderers/src/index.ts +++ b/extensions/notebook-renderers/src/index.ts @@ -126,7 +126,8 @@ type DisposableStore = ReturnType; function renderError( outputInfo: OutputItem, outputElement: HTMLElement, - ctx: IRichRenderContext + ctx: IRichRenderContext, + trustHTML: boolean ): IDisposable { const disposableStore = createDisposableStore(); @@ -146,7 +147,7 @@ function renderError( outputElement.classList.add('traceback'); const outputScrolling = scrollingEnabled(outputInfo, ctx.settings); - const content = createOutputContent(outputInfo.id, [err.stack ?? ''], ctx.settings.lineLimit, outputScrolling, true); + const content = createOutputContent(outputInfo.id, [err.stack ?? ''], ctx.settings.lineLimit, outputScrolling, trustHTML); const contentParent = document.createElement('div'); contentParent.classList.toggle('word-wrap', ctx.settings.outputWordWrap); disposableStore.push(ctx.onDidChangeSettings(e => { @@ -205,11 +206,13 @@ function initializeScroll(scrollableElement: HTMLElement, disposables: Disposabl scrollableElement.scrollTop = scrollTop !== undefined ? scrollTop : scrollableElement.scrollHeight; scrollableElement.addEventListener('scroll', onScrollHandler); disposables.push({ dispose: () => scrollableElement.removeEventListener('scroll', onScrollHandler) }); + scrollableElement.tabIndex = 0; } } // Find the scrollTop of the existing scrollable output, return undefined if at the bottom or element doesn't exist -function findScrolledHeight(scrollableElement: HTMLElement): number | undefined { +function findScrolledHeight(container: HTMLElement): number | undefined { + const scrollableElement = container.querySelector('.' + scrollableClass); if (scrollableElement && scrollableElement.scrollHeight - scrollableElement.scrollTop - scrollableElement.clientHeight > 2) { // not scrolled to the bottom return scrollableElement.scrollTop; @@ -351,6 +354,10 @@ export const activate: ActivationFunction = (ctx) => { #container div.output .scrollable.scrollbar-visible { border-color: var(--vscode-editorWidget-border); } + #container div.output .scrollable.scrollbar-visible:focus{ + outline: 0; + border-color: var(--theme-input-focus-border-color); + } .output-plaintext .code-bold, .output-stream .code-bold, .traceback .code-bold { @@ -407,7 +414,7 @@ export const activate: ActivationFunction = (ctx) => { case 'application/vnd.code.notebook.error': { disposables.get(outputInfo.id)?.dispose(); - const disposable = renderError(outputInfo, element, latestContext); + const disposable = renderError(outputInfo, element, latestContext, ctx.workspace.isTrusted); disposables.set(outputInfo.id, disposable); } break; diff --git a/extensions/notebook-renderers/src/textHelper.ts b/extensions/notebook-renderers/src/textHelper.ts index 06f8ac109b4aa9..8cc03fd543e40c 100644 --- a/extensions/notebook-renderers/src/textHelper.ts +++ b/extensions/notebook-renderers/src/textHelper.ts @@ -15,7 +15,7 @@ function generateViewMoreElement(outputId: string) { const container = document.createElement('div'); container.classList.add('truncation-message'); const first = document.createElement('span'); - first.textContent = 'Output is Truncated. View as a '; + first.textContent = 'Output is truncated. View as a '; container.appendChild(first); const viewAsScrollableLink = document.createElement('a'); @@ -39,11 +39,15 @@ function generateViewMoreElement(outputId: string) { container.appendChild(third); const layoutSettingsLink = document.createElement('a'); - layoutSettingsLink.textContent = 'settings...'; + layoutSettingsLink.textContent = 'settings'; layoutSettingsLink.href = `command:workbench.action.openSettings?%5B%22%40tag%3AnotebookOutputLayout%22%5D`; layoutSettingsLink.ariaLabel = 'notebook output settings'; container.appendChild(layoutSettingsLink); + const fourth = document.createElement('span'); + fourth.textContent = '...'; + container.appendChild(fourth); + return container; } diff --git a/extensions/restructuredtext/cgmanifest.json b/extensions/restructuredtext/cgmanifest.json index 8ff3f8a76d9096..29c269c36119ec 100644 --- a/extensions/restructuredtext/cgmanifest.json +++ b/extensions/restructuredtext/cgmanifest.json @@ -6,11 +6,11 @@ "git": { "name": "trond-snekvik/vscode-rst", "repositoryUrl": "https://github.com/trond-snekvik/vscode-rst", - "commitHash": "f0fe19ffde6509be52ad9267a57e1b3df665f072" + "commitHash": "4f6f1a8f94e0d16e30dddc9c4e359d062b715408" } }, "license": "MIT", - "version": "1.5.1" + "version": "1.5.2" } ], "version": 1 diff --git a/extensions/restructuredtext/syntaxes/rst.tmLanguage.json b/extensions/restructuredtext/syntaxes/rst.tmLanguage.json index ce4b5d1282dbe3..093db90796258d 100644 --- a/extensions/restructuredtext/syntaxes/rst.tmLanguage.json +++ b/extensions/restructuredtext/syntaxes/rst.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/trond-snekvik/vscode-rst/commit/f0fe19ffde6509be52ad9267a57e1b3df665f072", + "version": "https://github.com/trond-snekvik/vscode-rst/commit/4f6f1a8f94e0d16e30dddc9c4e359d062b715408", "scopeName": "source.rst", "patterns": [ { @@ -312,9 +312,16 @@ ] }, "block-comment": { - "begin": "^(\\s*)\\.{2}", - "while": "^\\1(?=\\s)|^\\s*$", - "name": "comment.block" + "begin": "^(\\s*)\\.{2}(\\s+|$)", + "end": "^(?=\\S)|^\\s*$", + "name": "comment.block", + "patterns": [ + { + "begin": "^\\s{3,}(?=\\S)", + "while": "^\\s{3}.*|^\\s*$", + "name": "comment.block" + } + ] }, "literal-block": { "begin": "^(\\s*)(.*)(::)\\s*$", diff --git a/extensions/theme-defaults/package.json b/extensions/theme-defaults/package.json index c7e4d25aeaf980..7716571721b006 100644 --- a/extensions/theme-defaults/package.json +++ b/extensions/theme-defaults/package.json @@ -20,7 +20,7 @@ "path": "./themes/dark_plus.json" }, { - "id": "Default Dark+ Experimental", + "id": "Default Dark Modern", "label": "%darkPlusExperimentalColorThemeLabel%", "uiTheme": "vs-dark", "path": "./themes/dark_plus_experimental.json" @@ -32,7 +32,7 @@ "path": "./themes/light_plus.json" }, { - "id": "Default Light+ Experimental", + "id": "Default Light Modern", "label": "%lightPlusExperimentalColorThemeLabel%", "uiTheme": "vs", "path": "./themes/light_plus_experimental.json" diff --git a/extensions/theme-defaults/package.nls.json b/extensions/theme-defaults/package.nls.json index d96a488ae59166..b39b054ff35bea 100644 --- a/extensions/theme-defaults/package.nls.json +++ b/extensions/theme-defaults/package.nls.json @@ -2,9 +2,9 @@ "displayName": "Default Themes", "description": "The default Visual Studio light and dark themes", "darkPlusColorThemeLabel": "Dark+", - "darkPlusExperimentalColorThemeLabel": "Dark+ Experimental", + "darkPlusExperimentalColorThemeLabel": "Dark Modern", "lightPlusColorThemeLabel": "Light+", - "lightPlusExperimentalColorThemeLabel": "Light+ Experimental", + "lightPlusExperimentalColorThemeLabel": "Light Modern", "darkColorThemeLabel": "Dark (Visual Studio)", "lightColorThemeLabel": "Light (Visual Studio)", "hcColorThemeLabel": "Dark High Contrast", diff --git a/extensions/theme-defaults/themes/dark_plus_experimental.json b/extensions/theme-defaults/themes/dark_plus_experimental.json index f5a1647f43c2e1..d5623cc1a5b7a4 100644 --- a/extensions/theme-defaults/themes/dark_plus_experimental.json +++ b/extensions/theme-defaults/themes/dark_plus_experimental.json @@ -1,6 +1,6 @@ { "$schema": "vscode://schemas/color-theme", - "name": "Dark+ (Experimental)", + "name": "Default Dark Modern", "include": "./dark_plus.json", "colors": { "activityBar.activeBorder": "#0078d4", diff --git a/extensions/theme-defaults/themes/light_plus_experimental.json b/extensions/theme-defaults/themes/light_plus_experimental.json index 73d42822fccc46..1bd197f460676d 100644 --- a/extensions/theme-defaults/themes/light_plus_experimental.json +++ b/extensions/theme-defaults/themes/light_plus_experimental.json @@ -1,6 +1,6 @@ { "$schema": "vscode://schemas/color-theme", - "name": "Light+ (Experimental)", + "name": "Default Light Modern", "include": "./light_plus.json", "colors": { "activityBar.activeBorder": "#005FB8", diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json index ca0d972a26382f..efae7f481376f2 100644 --- a/extensions/typescript-language-features/package.json +++ b/extensions/typescript-language-features/package.json @@ -920,9 +920,9 @@ "js" ], "enumItemLabels": [ - "%typescript.preferences.importModuleSpecifierEnding.label.auto%", - "%typescript.preferences.importModuleSpecifierEnding.label.minimal%", - "%typescript.preferences.importModuleSpecifierEnding.label.index%", + null, + null, + null, "%typescript.preferences.importModuleSpecifierEnding.label.js%" ], "markdownEnumDescriptions": [ diff --git a/extensions/typescript-language-features/src/commands/index.ts b/extensions/typescript-language-features/src/commands/index.ts index 919b1b749c592f..7130f2019759de 100644 --- a/extensions/typescript-language-features/src/commands/index.ts +++ b/extensions/typescript-language-features/src/commands/index.ts @@ -3,14 +3,15 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { PluginManager } from '../tsServer/plugins'; import TypeScriptServiceClientHost from '../typeScriptServiceClientHost'; import { ActiveJsTsEditorTracker } from '../ui/activeJsTsEditorTracker'; import { Lazy } from '../utils/lazy'; -import { PluginManager } from '../tsServer/plugins'; import { CommandManager } from './commandManager'; import { ConfigurePluginCommand } from './configurePlugin'; import { JavaScriptGoToProjectConfigCommand, TypeScriptGoToProjectConfigCommand } from './goToProjectConfiguration'; import { LearnMoreAboutRefactoringsCommand } from './learnMoreAboutRefactorings'; +import { OpenJsDocLinkCommand } from './openJsDocLink'; import { OpenTsServerLogCommand } from './openTsServerLog'; import { ReloadJavaScriptProjectsCommand, ReloadTypeScriptProjectsCommand } from './reloadProject'; import { RestartTsServerCommand } from './restartTsServer'; @@ -33,4 +34,5 @@ export function registerBaseCommands( commandManager.register(new ConfigurePluginCommand(pluginManager)); commandManager.register(new LearnMoreAboutRefactoringsCommand()); commandManager.register(new TSServerRequestCommand(lazyClientHost)); + commandManager.register(new OpenJsDocLinkCommand()); } diff --git a/extensions/typescript-language-features/src/commands/openJsDocLink.ts b/extensions/typescript-language-features/src/commands/openJsDocLink.ts new file mode 100644 index 00000000000000..10a480a4bd3939 --- /dev/null +++ b/extensions/typescript-language-features/src/commands/openJsDocLink.ts @@ -0,0 +1,28 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as vscode from 'vscode'; +import { Command } from './commandManager'; + +export interface OpenJsDocLinkCommand_Args { + readonly file: vscode.Uri; + readonly position: vscode.Position; +} + +/** + * Proxy command for opening links in jsdoc comments. + * + * This is needed to avoid incorrectly rewriting uris. + */ +export class OpenJsDocLinkCommand implements Command { + public static readonly id = '_typescript.openJsDocLink'; + public readonly id = OpenJsDocLinkCommand.id; + + public async execute(args: OpenJsDocLinkCommand_Args): Promise { + await vscode.commands.executeCommand('vscode.open', vscode.Uri.from(args.file), { + selection: new vscode.Range(args.position, args.position), + }); + } +} diff --git a/extensions/typescript-language-features/src/languageFeatures/refactor.ts b/extensions/typescript-language-features/src/languageFeatures/refactor.ts index 2c7586169e6429..ec7dfc332c54ac 100644 --- a/extensions/typescript-language-features/src/languageFeatures/refactor.ts +++ b/extensions/typescript-language-features/src/languageFeatures/refactor.ts @@ -149,14 +149,14 @@ class MoveToFileRefactorCommand implements Command { return; } - const fileSuggestionArgs: Proto.GetEditsForMoveToFileRefactorRequestArgs = { + const fileSuggestionArgs: Proto.GetEditsForRefactorRequestArgs = { ...typeConverters.Range.toFileRangeRequestArgs(file, args.range), - filepath: targetFile, action: 'Move to file', refactor: 'Move to file', + interactiveRefactorArguments: { targetFile }, }; - const response = await this.client.execute('getEditsForMoveToFileRefactor', fileSuggestionArgs, nulToken); + const response = await this.client.execute('getEditsForRefactor', fileSuggestionArgs, nulToken); if (response.type !== 'response' || !response.body) { return; } @@ -175,16 +175,18 @@ class MoveToFileRefactorCommand implements Command { if (response.type !== 'response' || !response.body) { return; } + const defaultUri = vscode.Uri.joinPath(Utils.dirname(document.uri), response.body.newFileName); - const selectFileItem: vscode.QuickPickItem = { - label: vscode.l10n.t("Select file..."), - detail: vscode.l10n.t("Select file or enter new file path..."), + const selectExistingFileItem: vscode.QuickPickItem = { + label: vscode.l10n.t("Select existing file..."), + }; + const selectNewFileItem: vscode.QuickPickItem = { + label: vscode.l10n.t("Enter new file path..."), }; - type DestinationItem = vscode.QuickPickItem & { file: string }; + type DestinationItem = vscode.QuickPickItem & { readonly file: string }; const workspaceFolder = vscode.workspace.getWorkspaceFolder(document.uri); - const destinationItems = response.body.files.map((file): DestinationItem => { const uri = this.client.toResource(file); const parentDir = Utils.dirname(uri); @@ -208,7 +210,8 @@ class MoveToFileRefactorCommand implements Command { }); const picked = await vscode.window.showQuickPick([ - selectFileItem, + selectExistingFileItem, + selectNewFileItem, { label: vscode.l10n.t("Destination Files"), kind: vscode.QuickPickItemKind.Separator }, ...destinationItems ], { @@ -219,16 +222,23 @@ class MoveToFileRefactorCommand implements Command { return; } - if (picked === selectFileItem) { + if (picked === selectExistingFileItem) { + const picked = await vscode.window.showOpenDialog({ + title: vscode.l10n.t("Select move destination"), + openLabel: vscode.l10n.t("Move to File"), + defaultUri + }); + return picked?.length ? this.client.toTsFilePath(picked[0]) : undefined; + } else if (picked === selectNewFileItem) { const picked = await vscode.window.showSaveDialog({ title: vscode.l10n.t("Select move destination"), saveLabel: vscode.l10n.t("Move to File"), - defaultUri: vscode.Uri.joinPath(Utils.dirname(document.uri), response.body.newFilename) + defaultUri, }); return picked ? this.client.toTsFilePath(picked) : undefined; + } else { + return (picked as DestinationItem).file; } - - return (picked as DestinationItem).file; } } @@ -467,10 +477,11 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider { { "text": "}", "kind": "link" }, { "text": " b", "kind": "text" } ], noopToResource), - 'a [`dog`](file:///path/file.ts#L7%2C5) b'); + 'a [`dog`](command:_typescript.openJsDocLink?%5B%7B%22file%22%3A%7B%22path%22%3A%22%2Fpath%2Ffile.ts%22%2C%22scheme%22%3A%22file%22%7D%2C%22position%22%3A%7B%22line%22%3A6%2C%22character%22%3A4%7D%7D%5D) b'); }); test('Should render @linkcode text as code', async () => { @@ -173,6 +173,6 @@ suite('typescript.previewer', () => { { "text": "}", "kind": "link" }, { "text": " b", "kind": "text" } ], noopToResource), - 'a [`husky`](file:///path/file.ts#L7%2C5) b'); + 'a [`husky`](command:_typescript.openJsDocLink?%5B%7B%22file%22%3A%7B%22path%22%3A%22%2Fpath%2Ffile.ts%22%2C%22scheme%22%3A%22file%22%7D%2C%22position%22%3A%7B%22line%22%3A6%2C%22character%22%3A4%7D%7D%5D) b'); }); }); 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 dfcacb777a94cb..c310f8645b36b2 100644 --- a/extensions/typescript-language-features/src/tsServer/protocol/protocol.d.ts +++ b/extensions/typescript-language-features/src/tsServer/protocol/protocol.d.ts @@ -20,38 +20,6 @@ declare module 'typescript/lib/tsserverlibrary' { readonly _serverType?: ServerType; } - interface GetMoveToRefactoringFileSuggestionsRequest extends Request { - command: 'getMoveToRefactoringFileSuggestions'; - arguments: GetMoveToRefactoringFileSuggestionsRequestArgs; - } - - type GetMoveToRefactoringFileSuggestionsRequestArgs = FileLocationOrRangeRequestArgs & { - triggerReason?: RefactorTriggerReason; - kind?: string; - }; - - interface GetMoveToRefactoringFileSuggestionsResponse extends Response { - body?: { - newFilename: string; - files: string[]; - }; - } - - interface GetEditsForMoveToFileRefactorRequest extends Request { - command: 'getEditsForMoveToFileRefactor'; - arguments: GetEditsForMoveToFileRefactorRequestArgs; - } - - interface GetEditsForMoveToFileRefactorResponse extends Response { - body?: RefactorEditInfo; - } - - type GetEditsForMoveToFileRefactorRequestArgs = FileLocationOrRangeRequestArgs & { - refactor: string; - action: string; - filepath: string; - }; - interface LinkedEditingRangesBody { ranges: TextSpan[]; wordPattern?: string; diff --git a/extensions/typescript-language-features/src/typescriptService.ts b/extensions/typescript-language-features/src/typescriptService.ts index 1050fc2e2a4843..e562a8349c1ba0 100644 --- a/extensions/typescript-language-features/src/typescriptService.ts +++ b/extensions/typescript-language-features/src/typescriptService.ts @@ -74,8 +74,7 @@ interface StandardTsServerRequests { 'provideInlayHints': [Proto.InlayHintsRequestArgs, Proto.InlayHintsResponse]; 'encodedSemanticClassifications-full': [Proto.EncodedSemanticClassificationsRequestArgs, Proto.EncodedSemanticClassificationsResponse]; 'findSourceDefinition': [Proto.FileLocationRequestArgs, Proto.DefinitionResponse]; - 'getMoveToRefactoringFileSuggestions': [Proto.GetMoveToRefactoringFileSuggestionsRequestArgs, Proto.GetMoveToRefactoringFileSuggestionsResponse]; - 'getEditsForMoveToFileRefactor': [Proto.GetEditsForMoveToFileRefactorRequestArgs, Proto.GetEditsForMoveToFileRefactorResponse]; + 'getMoveToRefactoringFileSuggestions': [Proto.GetMoveToRefactoringFileSuggestionsRequestArgs, Proto.GetMoveToRefactoringFileSuggestions]; 'linkedEditingRange': [Proto.FileLocationRequestArgs, Proto.LinkedEditingRangeResponse]; } diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.fs.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.fs.test.ts index 16e7c793f8ea48..ff632e956ebc6d 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.fs.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.fs.test.ts @@ -57,7 +57,7 @@ suite('vscode API - workspace-fs', () => { } }); - test('fs.write/stat/delete', async function () { + test('fs.write/stat/read/delete', async function () { const uri = root.with({ path: posix.join(root.path, 'new.file') }); await vscode.workspace.fs.writeFile(uri, Buffer.from('HELLO')); @@ -65,6 +65,9 @@ suite('vscode API - workspace-fs', () => { const stat = await vscode.workspace.fs.stat(uri); assert.strictEqual(stat.type, vscode.FileType.File); + const contents = await vscode.workspace.fs.readFile(uri); + assert.strictEqual(Buffer.from(contents).toString(), 'HELLO'); + await vscode.workspace.fs.delete(uri); try { @@ -122,7 +125,7 @@ suite('vscode API - workspace-fs', () => { } }); - test('throws FileSystemError', async function () { + test('throws FileSystemError (1)', async function () { try { await vscode.workspace.fs.stat(vscode.Uri.file(`/c468bf16-acfd-4591-825e-2bcebba508a3/71b1f274-91cb-4c19-af00-8495eaab4b73/4b60cb48-a6f2-40ea-9085-0936f4a8f59a.tx6`)); @@ -133,7 +136,7 @@ suite('vscode API - workspace-fs', () => { } }); - test('throws FileSystemError', async function () { + test('throws FileSystemError (2)', async function () { try { await vscode.workspace.fs.stat(vscode.Uri.parse('foo:/bar')); @@ -144,7 +147,7 @@ suite('vscode API - workspace-fs', () => { } }); - test('vscode.workspace.fs.remove() (and copy()) succeed unexpectedly. #84177', async function () { + test('vscode.workspace.fs.remove() (and copy()) succeed unexpectedly. #84177 (1)', async function () { const entries = await vscode.workspace.fs.readDirectory(root); assert.ok(entries.length > 0); @@ -158,7 +161,7 @@ suite('vscode API - workspace-fs', () => { } }); - test('vscode.workspace.fs.remove() (and copy()) succeed unexpectedly. #84177', async function () { + test('vscode.workspace.fs.remove() (and copy()) succeed unexpectedly. #84177 (2)', async function () { const entries = await vscode.workspace.fs.readDirectory(root); assert.ok(entries.length > 0); diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json b/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json index bbeafc1d9997fb..708ad1de07e0af 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json @@ -1261,7 +1261,7 @@ }, { "c": " :module: mod", - "t": "source.rst comment.block", + "t": "source.rst comment.block comment.block", "r": { "dark_plus": "comment: #6A9955", "light_plus": "comment: #008000", diff --git a/package.json b/package.json index a1747cf81f10be..ffa60acf347075 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", - "version": "1.78.0", - "distro": "19c7b8bfd54bd30518f7aeb946db6763ba030e82", + "version": "1.79.0", + "distro": "54f126e6c7f3e817114a498598f554e799ec32ab", "author": { "name": "Microsoft Corporation" }, @@ -203,7 +203,7 @@ "ts-loader": "^9.4.2", "ts-node": "^10.9.1", "tsec": "0.1.4", - "typescript": "^5.1.0-dev.20230417", + "typescript": "^5.1.0-dev.20230424", "typescript-formatter": "7.1.0", "underscore": "^1.12.1", "util": "^0.12.4", diff --git a/product.json b/product.json index dea50c078a1406..56048315511d1f 100644 --- a/product.json +++ b/product.json @@ -50,7 +50,7 @@ }, { "name": "ms-vscode.js-debug", - "version": "1.77.2", + "version": "1.78.0", "repo": "https://github.com/microsoft/vscode-js-debug", "metadata": { "id": "25629058-ddac-4e17-abba-74678e126c5d", diff --git a/src/vs/base/common/dataTransfer.ts b/src/vs/base/common/dataTransfer.ts index 054d84dd12e4fa..917997ca2e095d 100644 --- a/src/vs/base/common/dataTransfer.ts +++ b/src/vs/base/common/dataTransfer.ts @@ -85,7 +85,7 @@ export class VSDataTransfer { } // Wildcard, such as `image/*` - const wildcard = this.toKey(mimeTypeGlob).match(/^([a-z]+)$\/([a-z]+|\*)/i); + const wildcard = this.toKey(mimeTypeGlob).match(/^([a-z]+)\/([a-z]+|\*)$/i); if (!wildcard) { return false; } diff --git a/src/vs/base/common/htmlContent.ts b/src/vs/base/common/htmlContent.ts index 107ee2c4feb07d..c3b79a8e2e076b 100644 --- a/src/vs/base/common/htmlContent.ts +++ b/src/vs/base/common/htmlContent.ts @@ -118,7 +118,7 @@ export function isMarkdownString(thing: any): thing is IMarkdownString { return true; } else if (thing && typeof thing === 'object') { return typeof (thing).value === 'string' - && (typeof (thing).isTrusted === 'boolean' || (thing).isTrusted === undefined) + && (typeof (thing).isTrusted === 'boolean' || typeof (thing).isTrusted === 'object' || (thing).isTrusted === undefined) && (typeof (thing).supportThemeIcons === 'boolean' || (thing).supportThemeIcons === undefined); } return false; diff --git a/src/vs/base/common/keyCodes.ts b/src/vs/base/common/keyCodes.ts index 4f204f40435af2..005735d1c37422 100644 --- a/src/vs/base/common/keyCodes.ts +++ b/src/vs/base/common/keyCodes.ts @@ -97,6 +97,11 @@ export const enum KeyCode { F17, F18, F19, + F20, + F21, + F22, + F23, + F24, NumLock, ScrollLock, @@ -485,247 +490,247 @@ for (let i = 0; i <= KeyCode.MAX_VALUE; i++) { // See https://github.com/microsoft/node-native-keymap/blob/master/deps/chromium/keyboard_codes_win.h const empty = ''; - type IMappingEntry = [number, 0 | 1, ScanCode, string, KeyCode, string, number, string, string, string]; + type IMappingEntry = [0 | 1, ScanCode, string, KeyCode, string, number, string, string, string]; const mappings: IMappingEntry[] = [ - // keyCodeOrd, immutable, scanCode, scanCodeStr, keyCode, keyCodeStr, eventKeyCode, vkey, usUserSettingsLabel, generalUserSettingsLabel - [0, 1, ScanCode.None, 'None', KeyCode.Unknown, 'unknown', 0, 'VK_UNKNOWN', empty, empty], - [0, 1, ScanCode.Hyper, 'Hyper', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Super, 'Super', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Fn, 'Fn', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.FnLock, 'FnLock', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Suspend, 'Suspend', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Resume, 'Resume', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Turbo, 'Turbo', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Sleep, 'Sleep', KeyCode.Unknown, empty, 0, 'VK_SLEEP', empty, empty], - [0, 1, ScanCode.WakeUp, 'WakeUp', KeyCode.Unknown, empty, 0, empty, empty, empty], - [31, 0, ScanCode.KeyA, 'KeyA', KeyCode.KeyA, 'A', 65, 'VK_A', empty, empty], - [32, 0, ScanCode.KeyB, 'KeyB', KeyCode.KeyB, 'B', 66, 'VK_B', empty, empty], - [33, 0, ScanCode.KeyC, 'KeyC', KeyCode.KeyC, 'C', 67, 'VK_C', empty, empty], - [34, 0, ScanCode.KeyD, 'KeyD', KeyCode.KeyD, 'D', 68, 'VK_D', empty, empty], - [35, 0, ScanCode.KeyE, 'KeyE', KeyCode.KeyE, 'E', 69, 'VK_E', empty, empty], - [36, 0, ScanCode.KeyF, 'KeyF', KeyCode.KeyF, 'F', 70, 'VK_F', empty, empty], - [37, 0, ScanCode.KeyG, 'KeyG', KeyCode.KeyG, 'G', 71, 'VK_G', empty, empty], - [38, 0, ScanCode.KeyH, 'KeyH', KeyCode.KeyH, 'H', 72, 'VK_H', empty, empty], - [39, 0, ScanCode.KeyI, 'KeyI', KeyCode.KeyI, 'I', 73, 'VK_I', empty, empty], - [40, 0, ScanCode.KeyJ, 'KeyJ', KeyCode.KeyJ, 'J', 74, 'VK_J', empty, empty], - [41, 0, ScanCode.KeyK, 'KeyK', KeyCode.KeyK, 'K', 75, 'VK_K', empty, empty], - [42, 0, ScanCode.KeyL, 'KeyL', KeyCode.KeyL, 'L', 76, 'VK_L', empty, empty], - [43, 0, ScanCode.KeyM, 'KeyM', KeyCode.KeyM, 'M', 77, 'VK_M', empty, empty], - [44, 0, ScanCode.KeyN, 'KeyN', KeyCode.KeyN, 'N', 78, 'VK_N', empty, empty], - [45, 0, ScanCode.KeyO, 'KeyO', KeyCode.KeyO, 'O', 79, 'VK_O', empty, empty], - [46, 0, ScanCode.KeyP, 'KeyP', KeyCode.KeyP, 'P', 80, 'VK_P', empty, empty], - [47, 0, ScanCode.KeyQ, 'KeyQ', KeyCode.KeyQ, 'Q', 81, 'VK_Q', empty, empty], - [48, 0, ScanCode.KeyR, 'KeyR', KeyCode.KeyR, 'R', 82, 'VK_R', empty, empty], - [49, 0, ScanCode.KeyS, 'KeyS', KeyCode.KeyS, 'S', 83, 'VK_S', empty, empty], - [50, 0, ScanCode.KeyT, 'KeyT', KeyCode.KeyT, 'T', 84, 'VK_T', empty, empty], - [51, 0, ScanCode.KeyU, 'KeyU', KeyCode.KeyU, 'U', 85, 'VK_U', empty, empty], - [52, 0, ScanCode.KeyV, 'KeyV', KeyCode.KeyV, 'V', 86, 'VK_V', empty, empty], - [53, 0, ScanCode.KeyW, 'KeyW', KeyCode.KeyW, 'W', 87, 'VK_W', empty, empty], - [54, 0, ScanCode.KeyX, 'KeyX', KeyCode.KeyX, 'X', 88, 'VK_X', empty, empty], - [55, 0, ScanCode.KeyY, 'KeyY', KeyCode.KeyY, 'Y', 89, 'VK_Y', empty, empty], - [56, 0, ScanCode.KeyZ, 'KeyZ', KeyCode.KeyZ, 'Z', 90, 'VK_Z', empty, empty], - [22, 0, ScanCode.Digit1, 'Digit1', KeyCode.Digit1, '1', 49, 'VK_1', empty, empty], - [23, 0, ScanCode.Digit2, 'Digit2', KeyCode.Digit2, '2', 50, 'VK_2', empty, empty], - [24, 0, ScanCode.Digit3, 'Digit3', KeyCode.Digit3, '3', 51, 'VK_3', empty, empty], - [25, 0, ScanCode.Digit4, 'Digit4', KeyCode.Digit4, '4', 52, 'VK_4', empty, empty], - [26, 0, ScanCode.Digit5, 'Digit5', KeyCode.Digit5, '5', 53, 'VK_5', empty, empty], - [27, 0, ScanCode.Digit6, 'Digit6', KeyCode.Digit6, '6', 54, 'VK_6', empty, empty], - [28, 0, ScanCode.Digit7, 'Digit7', KeyCode.Digit7, '7', 55, 'VK_7', empty, empty], - [29, 0, ScanCode.Digit8, 'Digit8', KeyCode.Digit8, '8', 56, 'VK_8', empty, empty], - [30, 0, ScanCode.Digit9, 'Digit9', KeyCode.Digit9, '9', 57, 'VK_9', empty, empty], - [21, 0, ScanCode.Digit0, 'Digit0', KeyCode.Digit0, '0', 48, 'VK_0', empty, empty], - [3, 1, ScanCode.Enter, 'Enter', KeyCode.Enter, 'Enter', 13, 'VK_RETURN', empty, empty], - [9, 1, ScanCode.Escape, 'Escape', KeyCode.Escape, 'Escape', 27, 'VK_ESCAPE', empty, empty], - [1, 1, ScanCode.Backspace, 'Backspace', KeyCode.Backspace, 'Backspace', 8, 'VK_BACK', empty, empty], - [2, 1, ScanCode.Tab, 'Tab', KeyCode.Tab, 'Tab', 9, 'VK_TAB', empty, empty], - [10, 1, ScanCode.Space, 'Space', KeyCode.Space, 'Space', 32, 'VK_SPACE', empty, empty], - [83, 0, ScanCode.Minus, 'Minus', KeyCode.Minus, '-', 189, 'VK_OEM_MINUS', '-', 'OEM_MINUS'], - [81, 0, ScanCode.Equal, 'Equal', KeyCode.Equal, '=', 187, 'VK_OEM_PLUS', '=', 'OEM_PLUS'], - [87, 0, ScanCode.BracketLeft, 'BracketLeft', KeyCode.BracketLeft, '[', 219, 'VK_OEM_4', '[', 'OEM_4'], - [89, 0, ScanCode.BracketRight, 'BracketRight', KeyCode.BracketRight, ']', 221, 'VK_OEM_6', ']', 'OEM_6'], - [88, 0, ScanCode.Backslash, 'Backslash', KeyCode.Backslash, '\\', 220, 'VK_OEM_5', '\\', 'OEM_5'], - [0, 0, ScanCode.IntlHash, 'IntlHash', KeyCode.Unknown, empty, 0, empty, empty, empty], // has been dropped from the w3c spec - [80, 0, ScanCode.Semicolon, 'Semicolon', KeyCode.Semicolon, ';', 186, 'VK_OEM_1', ';', 'OEM_1'], - [90, 0, ScanCode.Quote, 'Quote', KeyCode.Quote, '\'', 222, 'VK_OEM_7', '\'', 'OEM_7'], - [86, 0, ScanCode.Backquote, 'Backquote', KeyCode.Backquote, '`', 192, 'VK_OEM_3', '`', 'OEM_3'], - [82, 0, ScanCode.Comma, 'Comma', KeyCode.Comma, ',', 188, 'VK_OEM_COMMA', ',', 'OEM_COMMA'], - [84, 0, ScanCode.Period, 'Period', KeyCode.Period, '.', 190, 'VK_OEM_PERIOD', '.', 'OEM_PERIOD'], - [85, 0, ScanCode.Slash, 'Slash', KeyCode.Slash, '/', 191, 'VK_OEM_2', '/', 'OEM_2'], - [8, 1, ScanCode.CapsLock, 'CapsLock', KeyCode.CapsLock, 'CapsLock', 20, 'VK_CAPITAL', empty, empty], - [59, 1, ScanCode.F1, 'F1', KeyCode.F1, 'F1', 112, 'VK_F1', empty, empty], - [60, 1, ScanCode.F2, 'F2', KeyCode.F2, 'F2', 113, 'VK_F2', empty, empty], - [61, 1, ScanCode.F3, 'F3', KeyCode.F3, 'F3', 114, 'VK_F3', empty, empty], - [62, 1, ScanCode.F4, 'F4', KeyCode.F4, 'F4', 115, 'VK_F4', empty, empty], - [63, 1, ScanCode.F5, 'F5', KeyCode.F5, 'F5', 116, 'VK_F5', empty, empty], - [64, 1, ScanCode.F6, 'F6', KeyCode.F6, 'F6', 117, 'VK_F6', empty, empty], - [65, 1, ScanCode.F7, 'F7', KeyCode.F7, 'F7', 118, 'VK_F7', empty, empty], - [66, 1, ScanCode.F8, 'F8', KeyCode.F8, 'F8', 119, 'VK_F8', empty, empty], - [67, 1, ScanCode.F9, 'F9', KeyCode.F9, 'F9', 120, 'VK_F9', empty, empty], - [68, 1, ScanCode.F10, 'F10', KeyCode.F10, 'F10', 121, 'VK_F10', empty, empty], - [69, 1, ScanCode.F11, 'F11', KeyCode.F11, 'F11', 122, 'VK_F11', empty, empty], - [70, 1, ScanCode.F12, 'F12', KeyCode.F12, 'F12', 123, 'VK_F12', empty, empty], - [0, 1, ScanCode.PrintScreen, 'PrintScreen', KeyCode.Unknown, empty, 0, empty, empty, empty], - [79, 1, ScanCode.ScrollLock, 'ScrollLock', KeyCode.ScrollLock, 'ScrollLock', 145, 'VK_SCROLL', empty, empty], - [7, 1, ScanCode.Pause, 'Pause', KeyCode.PauseBreak, 'PauseBreak', 19, 'VK_PAUSE', empty, empty], - [19, 1, ScanCode.Insert, 'Insert', KeyCode.Insert, 'Insert', 45, 'VK_INSERT', empty, empty], - [14, 1, ScanCode.Home, 'Home', KeyCode.Home, 'Home', 36, 'VK_HOME', empty, empty], - [11, 1, ScanCode.PageUp, 'PageUp', KeyCode.PageUp, 'PageUp', 33, 'VK_PRIOR', empty, empty], - [20, 1, ScanCode.Delete, 'Delete', KeyCode.Delete, 'Delete', 46, 'VK_DELETE', empty, empty], - [13, 1, ScanCode.End, 'End', KeyCode.End, 'End', 35, 'VK_END', empty, empty], - [12, 1, ScanCode.PageDown, 'PageDown', KeyCode.PageDown, 'PageDown', 34, 'VK_NEXT', empty, empty], - [17, 1, ScanCode.ArrowRight, 'ArrowRight', KeyCode.RightArrow, 'RightArrow', 39, 'VK_RIGHT', 'Right', empty], - [15, 1, ScanCode.ArrowLeft, 'ArrowLeft', KeyCode.LeftArrow, 'LeftArrow', 37, 'VK_LEFT', 'Left', empty], - [18, 1, ScanCode.ArrowDown, 'ArrowDown', KeyCode.DownArrow, 'DownArrow', 40, 'VK_DOWN', 'Down', empty], - [16, 1, ScanCode.ArrowUp, 'ArrowUp', KeyCode.UpArrow, 'UpArrow', 38, 'VK_UP', 'Up', empty], - [78, 1, ScanCode.NumLock, 'NumLock', KeyCode.NumLock, 'NumLock', 144, 'VK_NUMLOCK', empty, empty], - [108, 1, ScanCode.NumpadDivide, 'NumpadDivide', KeyCode.NumpadDivide, 'NumPad_Divide', 111, 'VK_DIVIDE', empty, empty], - [103, 1, ScanCode.NumpadMultiply, 'NumpadMultiply', KeyCode.NumpadMultiply, 'NumPad_Multiply', 106, 'VK_MULTIPLY', empty, empty], - [106, 1, ScanCode.NumpadSubtract, 'NumpadSubtract', KeyCode.NumpadSubtract, 'NumPad_Subtract', 109, 'VK_SUBTRACT', empty, empty], - [104, 1, ScanCode.NumpadAdd, 'NumpadAdd', KeyCode.NumpadAdd, 'NumPad_Add', 107, 'VK_ADD', empty, empty], - [3, 1, ScanCode.NumpadEnter, 'NumpadEnter', KeyCode.Enter, empty, 0, empty, empty, empty], - [94, 1, ScanCode.Numpad1, 'Numpad1', KeyCode.Numpad1, 'NumPad1', 97, 'VK_NUMPAD1', empty, empty], - [95, 1, ScanCode.Numpad2, 'Numpad2', KeyCode.Numpad2, 'NumPad2', 98, 'VK_NUMPAD2', empty, empty], - [96, 1, ScanCode.Numpad3, 'Numpad3', KeyCode.Numpad3, 'NumPad3', 99, 'VK_NUMPAD3', empty, empty], - [97, 1, ScanCode.Numpad4, 'Numpad4', KeyCode.Numpad4, 'NumPad4', 100, 'VK_NUMPAD4', empty, empty], - [98, 1, ScanCode.Numpad5, 'Numpad5', KeyCode.Numpad5, 'NumPad5', 101, 'VK_NUMPAD5', empty, empty], - [99, 1, ScanCode.Numpad6, 'Numpad6', KeyCode.Numpad6, 'NumPad6', 102, 'VK_NUMPAD6', empty, empty], - [100, 1, ScanCode.Numpad7, 'Numpad7', KeyCode.Numpad7, 'NumPad7', 103, 'VK_NUMPAD7', empty, empty], - [101, 1, ScanCode.Numpad8, 'Numpad8', KeyCode.Numpad8, 'NumPad8', 104, 'VK_NUMPAD8', empty, empty], - [102, 1, ScanCode.Numpad9, 'Numpad9', KeyCode.Numpad9, 'NumPad9', 105, 'VK_NUMPAD9', empty, empty], - [93, 1, ScanCode.Numpad0, 'Numpad0', KeyCode.Numpad0, 'NumPad0', 96, 'VK_NUMPAD0', empty, empty], - [107, 1, ScanCode.NumpadDecimal, 'NumpadDecimal', KeyCode.NumpadDecimal, 'NumPad_Decimal', 110, 'VK_DECIMAL', empty, empty], - [92, 0, ScanCode.IntlBackslash, 'IntlBackslash', KeyCode.IntlBackslash, 'OEM_102', 226, 'VK_OEM_102', empty, empty], - [58, 1, ScanCode.ContextMenu, 'ContextMenu', KeyCode.ContextMenu, 'ContextMenu', 93, empty, empty, empty], - [0, 1, ScanCode.Power, 'Power', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.NumpadEqual, 'NumpadEqual', KeyCode.Unknown, empty, 0, empty, empty, empty], - [71, 1, ScanCode.F13, 'F13', KeyCode.F13, 'F13', 124, 'VK_F13', empty, empty], - [72, 1, ScanCode.F14, 'F14', KeyCode.F14, 'F14', 125, 'VK_F14', empty, empty], - [73, 1, ScanCode.F15, 'F15', KeyCode.F15, 'F15', 126, 'VK_F15', empty, empty], - [74, 1, ScanCode.F16, 'F16', KeyCode.F16, 'F16', 127, 'VK_F16', empty, empty], - [75, 1, ScanCode.F17, 'F17', KeyCode.F17, 'F17', 128, 'VK_F17', empty, empty], - [76, 1, ScanCode.F18, 'F18', KeyCode.F18, 'F18', 129, 'VK_F18', empty, empty], - [77, 1, ScanCode.F19, 'F19', KeyCode.F19, 'F19', 130, 'VK_F19', empty, empty], - [0, 1, ScanCode.F20, 'F20', KeyCode.Unknown, empty, 0, 'VK_F20', empty, empty], - [0, 1, ScanCode.F21, 'F21', KeyCode.Unknown, empty, 0, 'VK_F21', empty, empty], - [0, 1, ScanCode.F22, 'F22', KeyCode.Unknown, empty, 0, 'VK_F22', empty, empty], - [0, 1, ScanCode.F23, 'F23', KeyCode.Unknown, empty, 0, 'VK_F23', empty, empty], - [0, 1, ScanCode.F24, 'F24', KeyCode.Unknown, empty, 0, 'VK_F24', empty, empty], - [0, 1, ScanCode.Open, 'Open', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Help, 'Help', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Select, 'Select', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Again, 'Again', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Undo, 'Undo', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Cut, 'Cut', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Copy, 'Copy', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Paste, 'Paste', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Find, 'Find', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.AudioVolumeMute, 'AudioVolumeMute', KeyCode.AudioVolumeMute, 'AudioVolumeMute', 173, 'VK_VOLUME_MUTE', empty, empty], - [0, 1, ScanCode.AudioVolumeUp, 'AudioVolumeUp', KeyCode.AudioVolumeUp, 'AudioVolumeUp', 175, 'VK_VOLUME_UP', empty, empty], - [0, 1, ScanCode.AudioVolumeDown, 'AudioVolumeDown', KeyCode.AudioVolumeDown, 'AudioVolumeDown', 174, 'VK_VOLUME_DOWN', empty, empty], - [105, 1, ScanCode.NumpadComma, 'NumpadComma', KeyCode.NUMPAD_SEPARATOR, 'NumPad_Separator', 108, 'VK_SEPARATOR', empty, empty], - [110, 0, ScanCode.IntlRo, 'IntlRo', KeyCode.ABNT_C1, 'ABNT_C1', 193, 'VK_ABNT_C1', empty, empty], - [0, 1, ScanCode.KanaMode, 'KanaMode', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 0, ScanCode.IntlYen, 'IntlYen', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Convert, 'Convert', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.NonConvert, 'NonConvert', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Lang1, 'Lang1', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Lang2, 'Lang2', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Lang3, 'Lang3', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Lang4, 'Lang4', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Lang5, 'Lang5', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Abort, 'Abort', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.Props, 'Props', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.NumpadParenLeft, 'NumpadParenLeft', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.NumpadParenRight, 'NumpadParenRight', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.NumpadBackspace, 'NumpadBackspace', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.NumpadMemoryStore, 'NumpadMemoryStore', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.NumpadMemoryRecall, 'NumpadMemoryRecall', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.NumpadMemoryClear, 'NumpadMemoryClear', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.NumpadMemoryAdd, 'NumpadMemoryAdd', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.NumpadMemorySubtract, 'NumpadMemorySubtract', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.NumpadClear, 'NumpadClear', KeyCode.Clear, 'Clear', 12, 'VK_CLEAR', empty, empty], - [0, 1, ScanCode.NumpadClearEntry, 'NumpadClearEntry', KeyCode.Unknown, empty, 0, empty, empty, empty], - [5, 1, ScanCode.None, empty, KeyCode.Ctrl, 'Ctrl', 17, 'VK_CONTROL', empty, empty], - [4, 1, ScanCode.None, empty, KeyCode.Shift, 'Shift', 16, 'VK_SHIFT', empty, empty], - [6, 1, ScanCode.None, empty, KeyCode.Alt, 'Alt', 18, 'VK_MENU', empty, empty], - [57, 1, ScanCode.None, empty, KeyCode.Meta, 'Meta', 91, 'VK_COMMAND', empty, empty], - [5, 1, ScanCode.ControlLeft, 'ControlLeft', KeyCode.Ctrl, empty, 0, 'VK_LCONTROL', empty, empty], - [4, 1, ScanCode.ShiftLeft, 'ShiftLeft', KeyCode.Shift, empty, 0, 'VK_LSHIFT', empty, empty], - [6, 1, ScanCode.AltLeft, 'AltLeft', KeyCode.Alt, empty, 0, 'VK_LMENU', empty, empty], - [57, 1, ScanCode.MetaLeft, 'MetaLeft', KeyCode.Meta, empty, 0, 'VK_LWIN', empty, empty], - [5, 1, ScanCode.ControlRight, 'ControlRight', KeyCode.Ctrl, empty, 0, 'VK_RCONTROL', empty, empty], - [4, 1, ScanCode.ShiftRight, 'ShiftRight', KeyCode.Shift, empty, 0, 'VK_RSHIFT', empty, empty], - [6, 1, ScanCode.AltRight, 'AltRight', KeyCode.Alt, empty, 0, 'VK_RMENU', empty, empty], - [57, 1, ScanCode.MetaRight, 'MetaRight', KeyCode.Meta, empty, 0, 'VK_RWIN', empty, empty], - [0, 1, ScanCode.BrightnessUp, 'BrightnessUp', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.BrightnessDown, 'BrightnessDown', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.MediaPlay, 'MediaPlay', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.MediaRecord, 'MediaRecord', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.MediaFastForward, 'MediaFastForward', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.MediaRewind, 'MediaRewind', KeyCode.Unknown, empty, 0, empty, empty, empty], - [114, 1, ScanCode.MediaTrackNext, 'MediaTrackNext', KeyCode.MediaTrackNext, 'MediaTrackNext', 176, 'VK_MEDIA_NEXT_TRACK', empty, empty], - [115, 1, ScanCode.MediaTrackPrevious, 'MediaTrackPrevious', KeyCode.MediaTrackPrevious, 'MediaTrackPrevious', 177, 'VK_MEDIA_PREV_TRACK', empty, empty], - [116, 1, ScanCode.MediaStop, 'MediaStop', KeyCode.MediaStop, 'MediaStop', 178, 'VK_MEDIA_STOP', empty, empty], - [0, 1, ScanCode.Eject, 'Eject', KeyCode.Unknown, empty, 0, empty, empty, empty], - [117, 1, ScanCode.MediaPlayPause, 'MediaPlayPause', KeyCode.MediaPlayPause, 'MediaPlayPause', 179, 'VK_MEDIA_PLAY_PAUSE', empty, empty], - [0, 1, ScanCode.MediaSelect, 'MediaSelect', KeyCode.LaunchMediaPlayer, 'LaunchMediaPlayer', 181, 'VK_MEDIA_LAUNCH_MEDIA_SELECT', empty, empty], - [0, 1, ScanCode.LaunchMail, 'LaunchMail', KeyCode.LaunchMail, 'LaunchMail', 180, 'VK_MEDIA_LAUNCH_MAIL', empty, empty], - [0, 1, ScanCode.LaunchApp2, 'LaunchApp2', KeyCode.LaunchApp2, 'LaunchApp2', 183, 'VK_MEDIA_LAUNCH_APP2', empty, empty], - [0, 1, ScanCode.LaunchApp1, 'LaunchApp1', KeyCode.Unknown, empty, 0, 'VK_MEDIA_LAUNCH_APP1', empty, empty], - [0, 1, ScanCode.SelectTask, 'SelectTask', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.LaunchScreenSaver, 'LaunchScreenSaver', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.BrowserSearch, 'BrowserSearch', KeyCode.BrowserSearch, 'BrowserSearch', 170, 'VK_BROWSER_SEARCH', empty, empty], - [0, 1, ScanCode.BrowserHome, 'BrowserHome', KeyCode.BrowserHome, 'BrowserHome', 172, 'VK_BROWSER_HOME', empty, empty], - [112, 1, ScanCode.BrowserBack, 'BrowserBack', KeyCode.BrowserBack, 'BrowserBack', 166, 'VK_BROWSER_BACK', empty, empty], - [113, 1, ScanCode.BrowserForward, 'BrowserForward', KeyCode.BrowserForward, 'BrowserForward', 167, 'VK_BROWSER_FORWARD', empty, empty], - [0, 1, ScanCode.BrowserStop, 'BrowserStop', KeyCode.Unknown, empty, 0, 'VK_BROWSER_STOP', empty, empty], - [0, 1, ScanCode.BrowserRefresh, 'BrowserRefresh', KeyCode.Unknown, empty, 0, 'VK_BROWSER_REFRESH', empty, empty], - [0, 1, ScanCode.BrowserFavorites, 'BrowserFavorites', KeyCode.Unknown, empty, 0, 'VK_BROWSER_FAVORITES', empty, empty], - [0, 1, ScanCode.ZoomToggle, 'ZoomToggle', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.MailReply, 'MailReply', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.MailForward, 'MailForward', KeyCode.Unknown, empty, 0, empty, empty, empty], - [0, 1, ScanCode.MailSend, 'MailSend', KeyCode.Unknown, empty, 0, empty, empty, empty], + // immutable, scanCode, scanCodeStr, keyCode, keyCodeStr, eventKeyCode, vkey, usUserSettingsLabel, generalUserSettingsLabel + [1, ScanCode.None, 'None', KeyCode.Unknown, 'unknown', 0, 'VK_UNKNOWN', empty, empty], + [1, ScanCode.Hyper, 'Hyper', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Super, 'Super', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Fn, 'Fn', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.FnLock, 'FnLock', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Suspend, 'Suspend', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Resume, 'Resume', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Turbo, 'Turbo', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Sleep, 'Sleep', KeyCode.Unknown, empty, 0, 'VK_SLEEP', empty, empty], + [1, ScanCode.WakeUp, 'WakeUp', KeyCode.Unknown, empty, 0, empty, empty, empty], + [0, ScanCode.KeyA, 'KeyA', KeyCode.KeyA, 'A', 65, 'VK_A', empty, empty], + [0, ScanCode.KeyB, 'KeyB', KeyCode.KeyB, 'B', 66, 'VK_B', empty, empty], + [0, ScanCode.KeyC, 'KeyC', KeyCode.KeyC, 'C', 67, 'VK_C', empty, empty], + [0, ScanCode.KeyD, 'KeyD', KeyCode.KeyD, 'D', 68, 'VK_D', empty, empty], + [0, ScanCode.KeyE, 'KeyE', KeyCode.KeyE, 'E', 69, 'VK_E', empty, empty], + [0, ScanCode.KeyF, 'KeyF', KeyCode.KeyF, 'F', 70, 'VK_F', empty, empty], + [0, ScanCode.KeyG, 'KeyG', KeyCode.KeyG, 'G', 71, 'VK_G', empty, empty], + [0, ScanCode.KeyH, 'KeyH', KeyCode.KeyH, 'H', 72, 'VK_H', empty, empty], + [0, ScanCode.KeyI, 'KeyI', KeyCode.KeyI, 'I', 73, 'VK_I', empty, empty], + [0, ScanCode.KeyJ, 'KeyJ', KeyCode.KeyJ, 'J', 74, 'VK_J', empty, empty], + [0, ScanCode.KeyK, 'KeyK', KeyCode.KeyK, 'K', 75, 'VK_K', empty, empty], + [0, ScanCode.KeyL, 'KeyL', KeyCode.KeyL, 'L', 76, 'VK_L', empty, empty], + [0, ScanCode.KeyM, 'KeyM', KeyCode.KeyM, 'M', 77, 'VK_M', empty, empty], + [0, ScanCode.KeyN, 'KeyN', KeyCode.KeyN, 'N', 78, 'VK_N', empty, empty], + [0, ScanCode.KeyO, 'KeyO', KeyCode.KeyO, 'O', 79, 'VK_O', empty, empty], + [0, ScanCode.KeyP, 'KeyP', KeyCode.KeyP, 'P', 80, 'VK_P', empty, empty], + [0, ScanCode.KeyQ, 'KeyQ', KeyCode.KeyQ, 'Q', 81, 'VK_Q', empty, empty], + [0, ScanCode.KeyR, 'KeyR', KeyCode.KeyR, 'R', 82, 'VK_R', empty, empty], + [0, ScanCode.KeyS, 'KeyS', KeyCode.KeyS, 'S', 83, 'VK_S', empty, empty], + [0, ScanCode.KeyT, 'KeyT', KeyCode.KeyT, 'T', 84, 'VK_T', empty, empty], + [0, ScanCode.KeyU, 'KeyU', KeyCode.KeyU, 'U', 85, 'VK_U', empty, empty], + [0, ScanCode.KeyV, 'KeyV', KeyCode.KeyV, 'V', 86, 'VK_V', empty, empty], + [0, ScanCode.KeyW, 'KeyW', KeyCode.KeyW, 'W', 87, 'VK_W', empty, empty], + [0, ScanCode.KeyX, 'KeyX', KeyCode.KeyX, 'X', 88, 'VK_X', empty, empty], + [0, ScanCode.KeyY, 'KeyY', KeyCode.KeyY, 'Y', 89, 'VK_Y', empty, empty], + [0, ScanCode.KeyZ, 'KeyZ', KeyCode.KeyZ, 'Z', 90, 'VK_Z', empty, empty], + [0, ScanCode.Digit1, 'Digit1', KeyCode.Digit1, '1', 49, 'VK_1', empty, empty], + [0, ScanCode.Digit2, 'Digit2', KeyCode.Digit2, '2', 50, 'VK_2', empty, empty], + [0, ScanCode.Digit3, 'Digit3', KeyCode.Digit3, '3', 51, 'VK_3', empty, empty], + [0, ScanCode.Digit4, 'Digit4', KeyCode.Digit4, '4', 52, 'VK_4', empty, empty], + [0, ScanCode.Digit5, 'Digit5', KeyCode.Digit5, '5', 53, 'VK_5', empty, empty], + [0, ScanCode.Digit6, 'Digit6', KeyCode.Digit6, '6', 54, 'VK_6', empty, empty], + [0, ScanCode.Digit7, 'Digit7', KeyCode.Digit7, '7', 55, 'VK_7', empty, empty], + [0, ScanCode.Digit8, 'Digit8', KeyCode.Digit8, '8', 56, 'VK_8', empty, empty], + [0, ScanCode.Digit9, 'Digit9', KeyCode.Digit9, '9', 57, 'VK_9', empty, empty], + [0, ScanCode.Digit0, 'Digit0', KeyCode.Digit0, '0', 48, 'VK_0', empty, empty], + [1, ScanCode.Enter, 'Enter', KeyCode.Enter, 'Enter', 13, 'VK_RETURN', empty, empty], + [1, ScanCode.Escape, 'Escape', KeyCode.Escape, 'Escape', 27, 'VK_ESCAPE', empty, empty], + [1, ScanCode.Backspace, 'Backspace', KeyCode.Backspace, 'Backspace', 8, 'VK_BACK', empty, empty], + [1, ScanCode.Tab, 'Tab', KeyCode.Tab, 'Tab', 9, 'VK_TAB', empty, empty], + [1, ScanCode.Space, 'Space', KeyCode.Space, 'Space', 32, 'VK_SPACE', empty, empty], + [0, ScanCode.Minus, 'Minus', KeyCode.Minus, '-', 189, 'VK_OEM_MINUS', '-', 'OEM_MINUS'], + [0, ScanCode.Equal, 'Equal', KeyCode.Equal, '=', 187, 'VK_OEM_PLUS', '=', 'OEM_PLUS'], + [0, ScanCode.BracketLeft, 'BracketLeft', KeyCode.BracketLeft, '[', 219, 'VK_OEM_4', '[', 'OEM_4'], + [0, ScanCode.BracketRight, 'BracketRight', KeyCode.BracketRight, ']', 221, 'VK_OEM_6', ']', 'OEM_6'], + [0, ScanCode.Backslash, 'Backslash', KeyCode.Backslash, '\\', 220, 'VK_OEM_5', '\\', 'OEM_5'], + [0, ScanCode.IntlHash, 'IntlHash', KeyCode.Unknown, empty, 0, empty, empty, empty], // has been dropped from the w3c spec + [0, ScanCode.Semicolon, 'Semicolon', KeyCode.Semicolon, ';', 186, 'VK_OEM_1', ';', 'OEM_1'], + [0, ScanCode.Quote, 'Quote', KeyCode.Quote, '\'', 222, 'VK_OEM_7', '\'', 'OEM_7'], + [0, ScanCode.Backquote, 'Backquote', KeyCode.Backquote, '`', 192, 'VK_OEM_3', '`', 'OEM_3'], + [0, ScanCode.Comma, 'Comma', KeyCode.Comma, ',', 188, 'VK_OEM_COMMA', ',', 'OEM_COMMA'], + [0, ScanCode.Period, 'Period', KeyCode.Period, '.', 190, 'VK_OEM_PERIOD', '.', 'OEM_PERIOD'], + [0, ScanCode.Slash, 'Slash', KeyCode.Slash, '/', 191, 'VK_OEM_2', '/', 'OEM_2'], + [1, ScanCode.CapsLock, 'CapsLock', KeyCode.CapsLock, 'CapsLock', 20, 'VK_CAPITAL', empty, empty], + [1, ScanCode.F1, 'F1', KeyCode.F1, 'F1', 112, 'VK_F1', empty, empty], + [1, ScanCode.F2, 'F2', KeyCode.F2, 'F2', 113, 'VK_F2', empty, empty], + [1, ScanCode.F3, 'F3', KeyCode.F3, 'F3', 114, 'VK_F3', empty, empty], + [1, ScanCode.F4, 'F4', KeyCode.F4, 'F4', 115, 'VK_F4', empty, empty], + [1, ScanCode.F5, 'F5', KeyCode.F5, 'F5', 116, 'VK_F5', empty, empty], + [1, ScanCode.F6, 'F6', KeyCode.F6, 'F6', 117, 'VK_F6', empty, empty], + [1, ScanCode.F7, 'F7', KeyCode.F7, 'F7', 118, 'VK_F7', empty, empty], + [1, ScanCode.F8, 'F8', KeyCode.F8, 'F8', 119, 'VK_F8', empty, empty], + [1, ScanCode.F9, 'F9', KeyCode.F9, 'F9', 120, 'VK_F9', empty, empty], + [1, ScanCode.F10, 'F10', KeyCode.F10, 'F10', 121, 'VK_F10', empty, empty], + [1, ScanCode.F11, 'F11', KeyCode.F11, 'F11', 122, 'VK_F11', empty, empty], + [1, ScanCode.F12, 'F12', KeyCode.F12, 'F12', 123, 'VK_F12', empty, empty], + [1, ScanCode.PrintScreen, 'PrintScreen', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.ScrollLock, 'ScrollLock', KeyCode.ScrollLock, 'ScrollLock', 145, 'VK_SCROLL', empty, empty], + [1, ScanCode.Pause, 'Pause', KeyCode.PauseBreak, 'PauseBreak', 19, 'VK_PAUSE', empty, empty], + [1, ScanCode.Insert, 'Insert', KeyCode.Insert, 'Insert', 45, 'VK_INSERT', empty, empty], + [1, ScanCode.Home, 'Home', KeyCode.Home, 'Home', 36, 'VK_HOME', empty, empty], + [1, ScanCode.PageUp, 'PageUp', KeyCode.PageUp, 'PageUp', 33, 'VK_PRIOR', empty, empty], + [1, ScanCode.Delete, 'Delete', KeyCode.Delete, 'Delete', 46, 'VK_DELETE', empty, empty], + [1, ScanCode.End, 'End', KeyCode.End, 'End', 35, 'VK_END', empty, empty], + [1, ScanCode.PageDown, 'PageDown', KeyCode.PageDown, 'PageDown', 34, 'VK_NEXT', empty, empty], + [1, ScanCode.ArrowRight, 'ArrowRight', KeyCode.RightArrow, 'RightArrow', 39, 'VK_RIGHT', 'Right', empty], + [1, ScanCode.ArrowLeft, 'ArrowLeft', KeyCode.LeftArrow, 'LeftArrow', 37, 'VK_LEFT', 'Left', empty], + [1, ScanCode.ArrowDown, 'ArrowDown', KeyCode.DownArrow, 'DownArrow', 40, 'VK_DOWN', 'Down', empty], + [1, ScanCode.ArrowUp, 'ArrowUp', KeyCode.UpArrow, 'UpArrow', 38, 'VK_UP', 'Up', empty], + [1, ScanCode.NumLock, 'NumLock', KeyCode.NumLock, 'NumLock', 144, 'VK_NUMLOCK', empty, empty], + [1, ScanCode.NumpadDivide, 'NumpadDivide', KeyCode.NumpadDivide, 'NumPad_Divide', 111, 'VK_DIVIDE', empty, empty], + [1, ScanCode.NumpadMultiply, 'NumpadMultiply', KeyCode.NumpadMultiply, 'NumPad_Multiply', 106, 'VK_MULTIPLY', empty, empty], + [1, ScanCode.NumpadSubtract, 'NumpadSubtract', KeyCode.NumpadSubtract, 'NumPad_Subtract', 109, 'VK_SUBTRACT', empty, empty], + [1, ScanCode.NumpadAdd, 'NumpadAdd', KeyCode.NumpadAdd, 'NumPad_Add', 107, 'VK_ADD', empty, empty], + [1, ScanCode.NumpadEnter, 'NumpadEnter', KeyCode.Enter, empty, 0, empty, empty, empty], + [1, ScanCode.Numpad1, 'Numpad1', KeyCode.Numpad1, 'NumPad1', 97, 'VK_NUMPAD1', empty, empty], + [1, ScanCode.Numpad2, 'Numpad2', KeyCode.Numpad2, 'NumPad2', 98, 'VK_NUMPAD2', empty, empty], + [1, ScanCode.Numpad3, 'Numpad3', KeyCode.Numpad3, 'NumPad3', 99, 'VK_NUMPAD3', empty, empty], + [1, ScanCode.Numpad4, 'Numpad4', KeyCode.Numpad4, 'NumPad4', 100, 'VK_NUMPAD4', empty, empty], + [1, ScanCode.Numpad5, 'Numpad5', KeyCode.Numpad5, 'NumPad5', 101, 'VK_NUMPAD5', empty, empty], + [1, ScanCode.Numpad6, 'Numpad6', KeyCode.Numpad6, 'NumPad6', 102, 'VK_NUMPAD6', empty, empty], + [1, ScanCode.Numpad7, 'Numpad7', KeyCode.Numpad7, 'NumPad7', 103, 'VK_NUMPAD7', empty, empty], + [1, ScanCode.Numpad8, 'Numpad8', KeyCode.Numpad8, 'NumPad8', 104, 'VK_NUMPAD8', empty, empty], + [1, ScanCode.Numpad9, 'Numpad9', KeyCode.Numpad9, 'NumPad9', 105, 'VK_NUMPAD9', empty, empty], + [1, ScanCode.Numpad0, 'Numpad0', KeyCode.Numpad0, 'NumPad0', 96, 'VK_NUMPAD0', empty, empty], + [1, ScanCode.NumpadDecimal, 'NumpadDecimal', KeyCode.NumpadDecimal, 'NumPad_Decimal', 110, 'VK_DECIMAL', empty, empty], + [0, ScanCode.IntlBackslash, 'IntlBackslash', KeyCode.IntlBackslash, 'OEM_102', 226, 'VK_OEM_102', empty, empty], + [1, ScanCode.ContextMenu, 'ContextMenu', KeyCode.ContextMenu, 'ContextMenu', 93, empty, empty, empty], + [1, ScanCode.Power, 'Power', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.NumpadEqual, 'NumpadEqual', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.F13, 'F13', KeyCode.F13, 'F13', 124, 'VK_F13', empty, empty], + [1, ScanCode.F14, 'F14', KeyCode.F14, 'F14', 125, 'VK_F14', empty, empty], + [1, ScanCode.F15, 'F15', KeyCode.F15, 'F15', 126, 'VK_F15', empty, empty], + [1, ScanCode.F16, 'F16', KeyCode.F16, 'F16', 127, 'VK_F16', empty, empty], + [1, ScanCode.F17, 'F17', KeyCode.F17, 'F17', 128, 'VK_F17', empty, empty], + [1, ScanCode.F18, 'F18', KeyCode.F18, 'F18', 129, 'VK_F18', empty, empty], + [1, ScanCode.F19, 'F19', KeyCode.F19, 'F19', 130, 'VK_F19', empty, empty], + [1, ScanCode.F20, 'F20', KeyCode.F20, 'F20', 0, 'VK_F20', empty, empty], + [1, ScanCode.F21, 'F21', KeyCode.F21, 'F21', 0, 'VK_F21', empty, empty], + [1, ScanCode.F22, 'F22', KeyCode.F22, 'F22', 0, 'VK_F22', empty, empty], + [1, ScanCode.F23, 'F23', KeyCode.F23, 'F23', 0, 'VK_F23', empty, empty], + [1, ScanCode.F24, 'F24', KeyCode.F24, 'F24', 0, 'VK_F24', empty, empty], + [1, ScanCode.Open, 'Open', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Help, 'Help', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Select, 'Select', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Again, 'Again', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Undo, 'Undo', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Cut, 'Cut', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Copy, 'Copy', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Paste, 'Paste', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Find, 'Find', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.AudioVolumeMute, 'AudioVolumeMute', KeyCode.AudioVolumeMute, 'AudioVolumeMute', 173, 'VK_VOLUME_MUTE', empty, empty], + [1, ScanCode.AudioVolumeUp, 'AudioVolumeUp', KeyCode.AudioVolumeUp, 'AudioVolumeUp', 175, 'VK_VOLUME_UP', empty, empty], + [1, ScanCode.AudioVolumeDown, 'AudioVolumeDown', KeyCode.AudioVolumeDown, 'AudioVolumeDown', 174, 'VK_VOLUME_DOWN', empty, empty], + [1, ScanCode.NumpadComma, 'NumpadComma', KeyCode.NUMPAD_SEPARATOR, 'NumPad_Separator', 108, 'VK_SEPARATOR', empty, empty], + [0, ScanCode.IntlRo, 'IntlRo', KeyCode.ABNT_C1, 'ABNT_C1', 193, 'VK_ABNT_C1', empty, empty], + [1, ScanCode.KanaMode, 'KanaMode', KeyCode.Unknown, empty, 0, empty, empty, empty], + [0, ScanCode.IntlYen, 'IntlYen', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Convert, 'Convert', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.NonConvert, 'NonConvert', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Lang1, 'Lang1', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Lang2, 'Lang2', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Lang3, 'Lang3', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Lang4, 'Lang4', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Lang5, 'Lang5', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Abort, 'Abort', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.Props, 'Props', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.NumpadParenLeft, 'NumpadParenLeft', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.NumpadParenRight, 'NumpadParenRight', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.NumpadBackspace, 'NumpadBackspace', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.NumpadMemoryStore, 'NumpadMemoryStore', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.NumpadMemoryRecall, 'NumpadMemoryRecall', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.NumpadMemoryClear, 'NumpadMemoryClear', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.NumpadMemoryAdd, 'NumpadMemoryAdd', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.NumpadMemorySubtract, 'NumpadMemorySubtract', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.NumpadClear, 'NumpadClear', KeyCode.Clear, 'Clear', 12, 'VK_CLEAR', empty, empty], + [1, ScanCode.NumpadClearEntry, 'NumpadClearEntry', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.None, empty, KeyCode.Ctrl, 'Ctrl', 17, 'VK_CONTROL', empty, empty], + [1, ScanCode.None, empty, KeyCode.Shift, 'Shift', 16, 'VK_SHIFT', empty, empty], + [1, ScanCode.None, empty, KeyCode.Alt, 'Alt', 18, 'VK_MENU', empty, empty], + [1, ScanCode.None, empty, KeyCode.Meta, 'Meta', 91, 'VK_COMMAND', empty, empty], + [1, ScanCode.ControlLeft, 'ControlLeft', KeyCode.Ctrl, empty, 0, 'VK_LCONTROL', empty, empty], + [1, ScanCode.ShiftLeft, 'ShiftLeft', KeyCode.Shift, empty, 0, 'VK_LSHIFT', empty, empty], + [1, ScanCode.AltLeft, 'AltLeft', KeyCode.Alt, empty, 0, 'VK_LMENU', empty, empty], + [1, ScanCode.MetaLeft, 'MetaLeft', KeyCode.Meta, empty, 0, 'VK_LWIN', empty, empty], + [1, ScanCode.ControlRight, 'ControlRight', KeyCode.Ctrl, empty, 0, 'VK_RCONTROL', empty, empty], + [1, ScanCode.ShiftRight, 'ShiftRight', KeyCode.Shift, empty, 0, 'VK_RSHIFT', empty, empty], + [1, ScanCode.AltRight, 'AltRight', KeyCode.Alt, empty, 0, 'VK_RMENU', empty, empty], + [1, ScanCode.MetaRight, 'MetaRight', KeyCode.Meta, empty, 0, 'VK_RWIN', empty, empty], + [1, ScanCode.BrightnessUp, 'BrightnessUp', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.BrightnessDown, 'BrightnessDown', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.MediaPlay, 'MediaPlay', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.MediaRecord, 'MediaRecord', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.MediaFastForward, 'MediaFastForward', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.MediaRewind, 'MediaRewind', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.MediaTrackNext, 'MediaTrackNext', KeyCode.MediaTrackNext, 'MediaTrackNext', 176, 'VK_MEDIA_NEXT_TRACK', empty, empty], + [1, ScanCode.MediaTrackPrevious, 'MediaTrackPrevious', KeyCode.MediaTrackPrevious, 'MediaTrackPrevious', 177, 'VK_MEDIA_PREV_TRACK', empty, empty], + [1, ScanCode.MediaStop, 'MediaStop', KeyCode.MediaStop, 'MediaStop', 178, 'VK_MEDIA_STOP', empty, empty], + [1, ScanCode.Eject, 'Eject', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.MediaPlayPause, 'MediaPlayPause', KeyCode.MediaPlayPause, 'MediaPlayPause', 179, 'VK_MEDIA_PLAY_PAUSE', empty, empty], + [1, ScanCode.MediaSelect, 'MediaSelect', KeyCode.LaunchMediaPlayer, 'LaunchMediaPlayer', 181, 'VK_MEDIA_LAUNCH_MEDIA_SELECT', empty, empty], + [1, ScanCode.LaunchMail, 'LaunchMail', KeyCode.LaunchMail, 'LaunchMail', 180, 'VK_MEDIA_LAUNCH_MAIL', empty, empty], + [1, ScanCode.LaunchApp2, 'LaunchApp2', KeyCode.LaunchApp2, 'LaunchApp2', 183, 'VK_MEDIA_LAUNCH_APP2', empty, empty], + [1, ScanCode.LaunchApp1, 'LaunchApp1', KeyCode.Unknown, empty, 0, 'VK_MEDIA_LAUNCH_APP1', empty, empty], + [1, ScanCode.SelectTask, 'SelectTask', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.LaunchScreenSaver, 'LaunchScreenSaver', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.BrowserSearch, 'BrowserSearch', KeyCode.BrowserSearch, 'BrowserSearch', 170, 'VK_BROWSER_SEARCH', empty, empty], + [1, ScanCode.BrowserHome, 'BrowserHome', KeyCode.BrowserHome, 'BrowserHome', 172, 'VK_BROWSER_HOME', empty, empty], + [1, ScanCode.BrowserBack, 'BrowserBack', KeyCode.BrowserBack, 'BrowserBack', 166, 'VK_BROWSER_BACK', empty, empty], + [1, ScanCode.BrowserForward, 'BrowserForward', KeyCode.BrowserForward, 'BrowserForward', 167, 'VK_BROWSER_FORWARD', empty, empty], + [1, ScanCode.BrowserStop, 'BrowserStop', KeyCode.Unknown, empty, 0, 'VK_BROWSER_STOP', empty, empty], + [1, ScanCode.BrowserRefresh, 'BrowserRefresh', KeyCode.Unknown, empty, 0, 'VK_BROWSER_REFRESH', empty, empty], + [1, ScanCode.BrowserFavorites, 'BrowserFavorites', KeyCode.Unknown, empty, 0, 'VK_BROWSER_FAVORITES', empty, empty], + [1, ScanCode.ZoomToggle, 'ZoomToggle', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.MailReply, 'MailReply', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.MailForward, 'MailForward', KeyCode.Unknown, empty, 0, empty, empty, empty], + [1, ScanCode.MailSend, 'MailSend', KeyCode.Unknown, empty, 0, empty, empty, empty], // See https://lists.w3.org/Archives/Public/www-dom/2010JulSep/att-0182/keyCode-spec.html // If an Input Method Editor is processing key input and the event is keydown, return 229. - [109, 1, ScanCode.None, empty, KeyCode.KEY_IN_COMPOSITION, 'KeyInComposition', 229, empty, empty, empty], - [111, 1, ScanCode.None, empty, KeyCode.ABNT_C2, 'ABNT_C2', 194, 'VK_ABNT_C2', empty, empty], - [91, 1, ScanCode.None, empty, KeyCode.OEM_8, 'OEM_8', 223, 'VK_OEM_8', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_KANA', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_HANGUL', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_JUNJA', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_FINAL', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_HANJA', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_KANJI', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_CONVERT', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_NONCONVERT', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_ACCEPT', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_MODECHANGE', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_SELECT', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_PRINT', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_EXECUTE', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_SNAPSHOT', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_HELP', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_APPS', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_PROCESSKEY', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_PACKET', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_DBE_SBCSCHAR', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_DBE_DBCSCHAR', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_ATTN', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_CRSEL', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_EXSEL', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_EREOF', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_PLAY', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_ZOOM', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_NONAME', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_PA1', empty, empty], - [0, 1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_OEM_CLEAR', empty, empty], + [1, ScanCode.None, empty, KeyCode.KEY_IN_COMPOSITION, 'KeyInComposition', 229, empty, empty, empty], + [1, ScanCode.None, empty, KeyCode.ABNT_C2, 'ABNT_C2', 194, 'VK_ABNT_C2', empty, empty], + [1, ScanCode.None, empty, KeyCode.OEM_8, 'OEM_8', 223, 'VK_OEM_8', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_KANA', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_HANGUL', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_JUNJA', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_FINAL', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_HANJA', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_KANJI', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_CONVERT', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_NONCONVERT', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_ACCEPT', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_MODECHANGE', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_SELECT', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_PRINT', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_EXECUTE', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_SNAPSHOT', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_HELP', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_APPS', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_PROCESSKEY', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_PACKET', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_DBE_SBCSCHAR', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_DBE_DBCSCHAR', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_ATTN', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_CRSEL', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_EXSEL', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_EREOF', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_PLAY', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_ZOOM', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_NONAME', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_PA1', empty, empty], + [1, ScanCode.None, empty, KeyCode.Unknown, empty, 0, 'VK_OEM_CLEAR', empty, empty], ]; const seenKeyCode: boolean[] = []; const seenScanCode: boolean[] = []; for (const mapping of mappings) { - const [_keyCodeOrd, immutable, scanCode, scanCodeStr, keyCode, keyCodeStr, eventKeyCode, vkey, usUserSettingsLabel, generalUserSettingsLabel] = mapping; + const [immutable, scanCode, scanCodeStr, keyCode, keyCodeStr, eventKeyCode, vkey, usUserSettingsLabel, generalUserSettingsLabel] = mapping; if (!seenScanCode[scanCode]) { seenScanCode[scanCode] = true; scanCodeIntToStr[scanCode] = scanCodeStr; diff --git a/src/vs/base/common/observableImpl/autorun.ts b/src/vs/base/common/observableImpl/autorun.ts index bff1ad7e4bcf48..23718e12328c60 100644 --- a/src/vs/base/common/observableImpl/autorun.ts +++ b/src/vs/base/common/observableImpl/autorun.ts @@ -67,19 +67,8 @@ export class AutorunObserver implements IObserver, IReader, IDisposable { private state = AutorunState.stale; private updateCount = 0; private disposed = false; - - /** - * The actual dependencies. - */ - private _dependencies = new Set>(); - public get dependencies() { - return this._dependencies; - } - - /** - * Dependencies that have to be removed when {@link runFn} ran through. - */ - private staleDependencies = new Set>(); + private dependencies = new Set>(); + private dependenciesToBeRemoved = new Set>(); constructor( public readonly debugName: string, @@ -87,22 +76,47 @@ export class AutorunObserver implements IObserver, IReader, IDisposable { private readonly _handleChange: ((context: IChangeContext) => boolean) | undefined ) { getLogger()?.handleAutorunCreated(this); - this.runIfNeeded(); + this._runIfNeeded(); } - public readObservable(observable: IObservable): T { - // In case the run action disposes the autorun - if (this.disposed) { - return observable.get(); + public dispose(): void { + this.disposed = true; + for (const o of this.dependencies) { + o.removeObserver(this); } + this.dependencies.clear(); + } - observable.addObserver(this); - const value = observable.get(); - this._dependencies.add(observable); - this.staleDependencies.delete(observable); - return value; + private _runIfNeeded() { + if (this.state === AutorunState.upToDate) { + return; + } + + const emptySet = this.dependenciesToBeRemoved; + this.dependenciesToBeRemoved = this.dependencies; + this.dependencies = emptySet; + + this.state = AutorunState.upToDate; + + getLogger()?.handleAutorunTriggered(this); + + try { + this.runFn(this); + } finally { + // We don't want our observed observables to think that they are (not even temporarily) not being observed. + // Thus, we only unsubscribe from observables that are definitely not read anymore. + for (const o of this.dependenciesToBeRemoved) { + o.removeObserver(this); + } + this.dependenciesToBeRemoved.clear(); + } } + public toString(): string { + return `Autorun<${this.debugName}>`; + } + + // IObserver implementation public beginUpdate(): void { if (this.state === AutorunState.upToDate) { this.state = AutorunState.dependenciesMightHaveChanged; @@ -115,7 +129,7 @@ export class AutorunObserver implements IObserver, IReader, IDisposable { do { if (this.state === AutorunState.dependenciesMightHaveChanged) { this.state = AutorunState.upToDate; - for (const d of this._dependencies) { + for (const d of this.dependencies) { d.reportChanges(); if (this.state as AutorunState === AutorunState.stale) { // The other dependencies will refresh on demand @@ -124,7 +138,7 @@ export class AutorunObserver implements IObserver, IReader, IDisposable { } } - this.runIfNeeded(); + this._runIfNeeded(); } while (this.state !== AutorunState.upToDate); } this.updateCount--; @@ -149,42 +163,18 @@ export class AutorunObserver implements IObserver, IReader, IDisposable { } } - private runIfNeeded() { - if (this.state === AutorunState.upToDate) { - return; - } - - // Assert: this.staleDependencies is an empty set. - const emptySet = this.staleDependencies; - this.staleDependencies = this._dependencies; - this._dependencies = emptySet; - - this.state = AutorunState.upToDate; - - getLogger()?.handleAutorunTriggered(this); - - try { - this.runFn(this); - } finally { - // We don't want our observed observables to think that they are (not even temporarily) not being observed. - // Thus, we only unsubscribe from observables that are definitely not read anymore. - for (const o of this.staleDependencies) { - o.removeObserver(this); - } - this.staleDependencies.clear(); - } - } - - public dispose(): void { - this.disposed = true; - for (const o of this._dependencies) { - o.removeObserver(this); + // IReader implementation + public readObservable(observable: IObservable): T { + // In case the run action disposes the autorun + if (this.disposed) { + return observable.get(); } - this._dependencies.clear(); - } - public toString(): string { - return `Autorun<${this.debugName}>`; + observable.addObserver(this); + const value = observable.get(); + this.dependencies.add(observable); + this.dependenciesToBeRemoved.delete(observable); + return value; } } diff --git a/src/vs/base/common/observableImpl/base.ts b/src/vs/base/common/observableImpl/base.ts index 8003e3d498698c..993afcb6742e65 100644 --- a/src/vs/base/common/observableImpl/base.ts +++ b/src/vs/base/common/observableImpl/base.ts @@ -8,71 +8,106 @@ import type { derived } from 'vs/base/common/observableImpl/derived'; import { getLogger } from 'vs/base/common/observableImpl/logging'; export interface IObservable { - readonly TChange: TChange; - /** - * Reads the current value. + * Returns the current value. * - * Must not be called from {@link IObserver.handleChange}. + * Calls {@link IObserver.handleChange} if the observable notices that the value changed. + * Must not be called from {@link IObserver.handleChange}! */ get(): T; + /** + * Forces the observable to check for and report changes. + * + * Has the same effect as calling {@link IObservable.get}, but does not force the observable + * to actually construct the value, e.g. if change deltas are used. + * Calls {@link IObserver.handleChange} if the observable notices that the value changed. + * Must not be called from {@link IObserver.handleChange}! + */ reportChanges(): void; + /** + * Adds the observer to the set of subscribed observers. + * This method is idempotent. + */ addObserver(observer: IObserver): void; + + /** + * Removes the observer from the set of subscribed observers. + * This method is idempotent. + */ removeObserver(observer: IObserver): void; /** - * Subscribes the reader to this observable and returns the current value of this observable. + * Reads the current value and subscribes to this observable. + * + * Just calls {@link IReader.readObservable} if a reader is given, otherwise {@link IObservable.get} + * (see {@link ConvenientObservable.read}). */ read(reader: IReader | undefined): T; + /** + * Creates a derived observable that depends on this observable. + * Use the reader to read other observables + * (see {@link ConvenientObservable.map}). + */ map(fn: (value: T, reader: IReader) => TNew): IObservable; + /** + * A human-readable name for debugging purposes. + */ readonly debugName: string; - /*get isPossiblyStale(): boolean; - - get isUpdating(): boolean;*/ + /** + * This property captures the type of the change object. Do not use it at runtime! + */ + readonly TChange: TChange; } export interface IReader { /** * Reads the value of an observable and subscribes to it. - * - * Is called by {@link IObservable.read}. */ readObservable(observable: IObservable): T; } +/** + * Represents an observer that can be subscribed to an observable. + * + * If an observer is subscribed to an observable and that observable didn't signal + * a change through one of the observer methods, the observer can assume that the + * observable didn't change. + * If an observable reported a possible change, {@link IObservable.reportChanges} forces + * the observable to report an actual change if there was one. + */ export interface IObserver { /** - * Indicates that calling {@link IObservable.get} might return a different value and the observable is in updating mode. - * Must not be called when the given observable has already been reported to be in updating mode. + * Signals that the given observable might have changed and a transaction potentially modifying that observable started. + * Before the given observable can call this method again, is must call {@link IObserver.endUpdate}. + * + * The method {@link IObservable.reportChanges} can be used to force the observable to report the changes. */ beginUpdate(observable: IObservable): void; /** - * Is called by a subscribed observable when it leaves updating mode and it doesn't expect changes anymore, - * i.e. when a transaction for that observable is over. - * - * Call {@link IObservable.reportChanges} to learn about possible changes (if they weren't reported yet). + * Signals that the transaction that potentially modified the given observable ended. */ endUpdate(observable: IObservable): void; + /** + * Signals that the given observable might have changed. + * The method {@link IObservable.reportChanges} can be used to force the observable to report the changes. + * + * Implementations must not call into other observables, as they might not have received this event yet! + * The change should be processed lazily or in {@link IObserver.endUpdate}. + */ handlePossibleChange(observable: IObservable): void; /** - * Is called by a subscribed observable immediately after it notices a change. - * - * When {@link IObservable.get} is called two times and no change was reported before the second call returns, - * there has been no change in between the two calls for that observable. - * - * If the update counter is zero for a subscribed observable and calling {@link IObservable.get} didn't trigger a change, - * subsequent calls to {@link IObservable.get} don't trigger a change either until the update counter is increased again. + * Signals that the given observable changed. * - * Implementations must not call into other observables! - * The change should be processed when all observed observables settled. + * Implementations must not call into other observables, as they might not have received this event yet! + * The change should be processed lazily or in {@link IObserver.endUpdate}. */ handleChange(observable: IObservable, change: TChange): void; } @@ -83,13 +118,10 @@ export interface ISettable { export interface ITransaction { /** - * Calls `Observer.beginUpdate` immediately - * and `Observer.endUpdate` when the transaction is complete. + * Calls {@link Observer.beginUpdate} immediately + * and {@link Observer.endUpdate} when the transaction ends. */ - updateObserver( - observer: IObserver, - observable: IObservable - ): void; + updateObserver(observer: IObserver, observable: IObservable): void; } let _derived: typeof derived; diff --git a/src/vs/base/common/observableImpl/derived.ts b/src/vs/base/common/observableImpl/derived.ts index 1145d9e2d485d6..b232fdbc892c08 100644 --- a/src/vs/base/common/observableImpl/derived.ts +++ b/src/vs/base/common/observableImpl/derived.ts @@ -3,6 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { BugIndicatingError } from 'vs/base/common/errors'; import { IReader, IObservable, BaseObservable, IObserver, _setDerived } from 'vs/base/common/observableImpl/base'; import { getLogger } from 'vs/base/common/observableImpl/logging'; @@ -24,8 +25,13 @@ const enum DerivedState { /** * A dependency changed and we need to recompute. + * After recomputation, we need to check the previous value to see if we changed as well. */ stale = 2, + + /** + * No change reported, our cached value is up to date. + */ upToDate = 3, } @@ -33,16 +39,8 @@ export class Derived extends BaseObservable implements IReader, IObs private state = DerivedState.initial; private value: T | undefined = undefined; private updateCount = 0; - - private _dependencies = new Set>(); - public get dependencies(): ReadonlySet> { - return this._dependencies; - } - - /** - * Dependencies that have to be removed when {@link runFn} ran through. - */ - private staleDependencies = new Set>(); + private dependencies = new Set>(); + private dependenciesToBeRemoved = new Set>(); public override get debugName(): string { return typeof this._debugName === 'function' ? this._debugName() : this._debugName; @@ -62,15 +60,15 @@ export class Derived extends BaseObservable implements IReader, IObs * We are not tracking changes anymore, thus we have to assume * that our cache is invalid. */ - this.state = DerivedState.stale; + this.state = DerivedState.initial; this.value = undefined; - for (const d of this._dependencies) { + for (const d of this.dependencies) { d.removeObserver(this); } - this._dependencies.clear(); + this.dependencies.clear(); } - public get(): T { + public override get(): T { if (this.observers.size === 0) { // Without observers, we don't know when to clean up stuff. // Thus, we don't cache anything to prevent memory leaks. @@ -85,7 +83,7 @@ export class Derived extends BaseObservable implements IReader, IObs // thus we also have to ask all our depedencies if they changed in this case. this.state = DerivedState.upToDate; - for (const d of this._dependencies) { + for (const d of this.dependencies) { /** might call {@link handleChange} indirectly, which could invalidate us */ d.reportChanges(); @@ -97,6 +95,7 @@ export class Derived extends BaseObservable implements IReader, IObs } this._recomputeIfNeeded(); + // In case recomputation changed one of our dependencies, we need to recompute again. } while (this.state !== DerivedState.upToDate); return this.value!; } @@ -106,9 +105,9 @@ export class Derived extends BaseObservable implements IReader, IObs if (this.state === DerivedState.upToDate) { return; } - const emptySet = this.staleDependencies; - this.staleDependencies = this._dependencies; - this._dependencies = emptySet; + const emptySet = this.dependenciesToBeRemoved; + this.dependenciesToBeRemoved = this.dependencies; + this.dependencies = emptySet; const hadValue = this.state !== DerivedState.initial; const oldValue = this.value; @@ -120,10 +119,10 @@ export class Derived extends BaseObservable implements IReader, IObs } finally { // We don't want our observed observables to think that they are (not even temporarily) not being observed. // Thus, we only unsubscribe from observables that are definitely not read anymore. - for (const o of this.staleDependencies) { + for (const o of this.dependenciesToBeRemoved) { o.removeObserver(this); } - this.staleDependencies.clear(); + this.dependenciesToBeRemoved.clear(); } const didChange = hadValue && oldValue !== this.value; @@ -142,49 +141,59 @@ export class Derived extends BaseObservable implements IReader, IObs } } + public override toString(): string { + return `LazyDerived<${this.debugName}>`; + } + // IObserver Implementation public beginUpdate(): void { - const prevState = this.state; + this.updateCount++; + const propagateBeginUpdate = this.updateCount === 1; if (this.state === DerivedState.upToDate) { this.state = DerivedState.dependenciesMightHaveChanged; - } - if (this.updateCount === 0) { - for (const r of this.observers) { - r.beginUpdate(this); + // If we propagate begin update, that will already signal a possible change. + if (!propagateBeginUpdate) { + for (const r of this.observers) { + r.handlePossibleChange(this); + } } - } else if (prevState === DerivedState.upToDate) { + } + if (propagateBeginUpdate) { for (const r of this.observers) { - r.handlePossibleChange(this); + r.beginUpdate(this); // This signals a possible change } } - this.updateCount++; } public endUpdate(): void { this.updateCount--; if (this.updateCount === 0) { - for (const r of this.observers) { + // End update could change the observer list. + const observers = [...this.observers]; + for (const r of observers) { r.endUpdate(this); } } + if (this.updateCount < 0) { + throw new BugIndicatingError(); + } } public handlePossibleChange(observable: IObservable): void { - if (this.state === DerivedState.upToDate && this._dependencies.has(observable)) { - // In all other states, observers already know that we might have changed. + // In all other states, observers already know that we might have changed. + if (this.state === DerivedState.upToDate && this.dependencies.has(observable)) { + this.state = DerivedState.dependenciesMightHaveChanged; for (const r of this.observers) { r.handlePossibleChange(this); } - this.state = DerivedState.dependenciesMightHaveChanged; } } public handleChange(observable: IObservable, _change: TChange): void { - if ((this.state === DerivedState.dependenciesMightHaveChanged || this.state === DerivedState.upToDate) && this._dependencies.has(observable)) { - const prevState = this.state; + const isUpToDate = this.state === DerivedState.upToDate; + if ((this.state === DerivedState.dependenciesMightHaveChanged || isUpToDate) && this.dependencies.has(observable)) { this.state = DerivedState.stale; - - if (prevState === DerivedState.upToDate) { + if (isUpToDate) { for (const r of this.observers) { r.handlePossibleChange(this); } @@ -199,12 +208,8 @@ export class Derived extends BaseObservable implements IReader, IObs /** This might call {@link handleChange} indirectly, which could invalidate us */ const value = observable.get(); // Which is why we only add the observable to the dependencies now. - this._dependencies.add(observable); - this.staleDependencies.delete(observable); + this.dependencies.add(observable); + this.dependenciesToBeRemoved.delete(observable); return value; } - - override toString(): string { - return `LazyDerived<${this.debugName}>`; - } } diff --git a/src/vs/base/common/observableImpl/utils.ts b/src/vs/base/common/observableImpl/utils.ts index 444e6919ac9025..c848dde53ff731 100644 --- a/src/vs/base/common/observableImpl/utils.ts +++ b/src/vs/base/common/observableImpl/utils.ts @@ -198,34 +198,34 @@ class FromEventObservableSignal extends BaseObservable { } } -export function observableSignal( +export function observableSignal( debugName: string -): IObservableSignal { - return new ObservableSignal(debugName); +): IObservableSignal { + return new ObservableSignal(debugName); } -export interface IObservableSignal extends IObservable { - trigger(tx: ITransaction | undefined): void; +export interface IObservableSignal extends IObservable { + trigger(tx: ITransaction | undefined, change: TChange): void; } -class ObservableSignal extends BaseObservable implements IObservableSignal { +class ObservableSignal extends BaseObservable implements IObservableSignal { constructor( public readonly debugName: string ) { super(); } - public trigger(tx: ITransaction | undefined): void { + public trigger(tx: ITransaction | undefined, change: TChange): void { if (!tx) { transaction(tx => { - this.trigger(tx); + this.trigger(tx, change); }, () => `Trigger signal ${this.debugName}`); return; } for (const o of this.observers) { tx.updateObserver(o, this); - o.handleChange(this, undefined); + o.handleChange(this, change); } } diff --git a/src/vs/base/common/strings.ts b/src/vs/base/common/strings.ts index 6e1d31bd91db95..5837c2f4c4975d 100644 --- a/src/vs/base/common/strings.ts +++ b/src/vs/base/common/strings.ts @@ -730,9 +730,12 @@ export function lcut(text: string, n: number) { // Escape codes, compiled from https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h3-Functions-using-CSI-_-ordered-by-the-final-character_s_ const CSI_SEQUENCE = /(:?\x1b\[|\x9B)[=?>!]?[\d;:]*["$#'* ]?[a-zA-Z@^`{}|~]/g; +// Plus additional markers for custom `\x1b]...\x07` instructions. +const CSI_CUSTOM_SEQUENCE = /\x1b\].*?\x07/g; + export function removeAnsiEscapeCodes(str: string): string { if (str) { - str = str.replace(CSI_SEQUENCE, ''); + str = str.replace(CSI_SEQUENCE, '').replace(CSI_CUSTOM_SEQUENCE, ''); } return str; diff --git a/src/vs/base/test/common/observable.test.ts b/src/vs/base/test/common/observable.test.ts index 44ddacf5b4554f..8c987c30e39f53 100644 --- a/src/vs/base/test/common/observable.test.ts +++ b/src/vs/base/test/common/observable.test.ts @@ -700,6 +700,41 @@ suite('observables', () => { assert.deepStrictEqual(log.getAndClearEntries(), ([])); }); + test('changing observables in endUpdate', () => { + const log = new Log(); + + const myObservable1 = new LoggingObservableValue('myObservable1', 0, log); + const myObservable2 = new LoggingObservableValue('myObservable2', 0, log); + + const myDerived1 = derived('myDerived1', (reader) => { + const val = myObservable1.read(reader); + log.log(`myDerived1.read(myObservable: ${val})`); + return val; + }); + + const myDerived2 = derived('myDerived2', (reader) => { + const val = myObservable2.read(reader); + if (val === 1) { + myDerived1.read(reader); + } + log.log(`myDerived2.read(myObservable: ${val})`); + return val; + }); + + autorun('myAutorun', (reader) => { + const myDerived1Val = myDerived1.read(reader); + const myDerived2Val = myDerived2.read(reader); + log.log(`myAutorun.run(myDerived1: ${myDerived1Val}, myDerived2: ${myDerived2Val})`); + }); + + transaction(tx => { + myObservable2.set(1, tx); + // end update of this observable will trigger endUpdate of myDerived1 and + // the autorun and the autorun will add myDerived2 as observer to myDerived1 + myObservable1.set(1, tx); + }); + }); + test('set dependency in derived', () => { const log = new Log(); diff --git a/src/vs/base/test/common/strings.test.ts b/src/vs/base/test/common/strings.test.ts index 168ff6bca5b340..f4bea3785b85e5 100644 --- a/src/vs/base/test/common/strings.test.ts +++ b/src/vs/base/test/common/strings.test.ts @@ -511,6 +511,10 @@ suite('Strings', () => { `${CSI}48;5;128m`, // 256 indexed color alt `${CSI}38:2:0:255:255:255m`, // truecolor `${CSI}38;2;255;255;255m`, // truecolor alt + + // Custom sequences: + '\x1b]633;SetMark;\x07', + '\x1b]633;P;Cwd=/foo\x07', ]; for (const sequence of sequences) { diff --git a/src/vs/code/electron-sandbox/issue/IssueReporterService.ts b/src/vs/code/electron-sandbox/issue/IssueReporterService.ts index bd741a3fdf7ab3..d0c47890e4bec9 100644 --- a/src/vs/code/electron-sandbox/issue/IssueReporterService.ts +++ b/src/vs/code/electron-sandbox/issue/IssueReporterService.ts @@ -20,7 +20,6 @@ import { normalizeGitHubUrl } from 'vs/platform/issue/common/issueReporterUtil'; import { INativeHostService } from 'vs/platform/native/common/native'; import { applyZoom, zoomIn, zoomOut } from 'vs/platform/window/electron-sandbox/window'; import { CancellationError } from 'vs/base/common/errors'; -import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation'; // GitHub has let us know that we could up our limit here to 8k. We chose 7500 to play it safe. // ref https://github.com/microsoft/vscode/issues/159191 @@ -91,7 +90,7 @@ export class IssueReporter extends Disposable { } } - this.issueMainService.getSystemInfo().then(info => { + this.issueMainService.$getSystemInfo().then(info => { this.issueReporterModel.update({ systemInfo: info }); this.receivedSystemInfo = true; @@ -99,7 +98,7 @@ export class IssueReporter extends Disposable { this.updatePreviewButtonState(); }); if (configuration.data.issueType === IssueType.PerformanceIssue) { - this.issueMainService.getPerformanceInfo().then(info => { + this.issueMainService.$getPerformanceInfo().then(info => { this.updatePerformanceInfo(info as Partial); }); } @@ -225,9 +224,9 @@ export class IssueReporter extends Disposable { this.updateExtensionSelector(installedExtensions); } - private async updateIssueReporterUri(extension: IssueReporterExtensionData, token: CancellationToken): Promise { + private async updateIssueReporterUri(extension: IssueReporterExtensionData): Promise { try { - const uri = await this.issueMainService.getIssueReporterUri(extension.id, token); + const uri = await this.issueMainService.$getIssueReporterUri(extension.id); extension.bugsUrl = uri.toString(true); } catch (e) { extension.hasIssueUriRequestHandler = false; @@ -241,7 +240,7 @@ export class IssueReporter extends Disposable { const issueType = parseInt((event.target).value); this.issueReporterModel.update({ issueType: issueType }); if (issueType === IssueType.PerformanceIssue && !this.receivedPerformanceInfo) { - this.issueMainService.getPerformanceInfo().then(info => { + this.issueMainService.$getPerformanceInfo().then(info => { this.updatePerformanceInfo(info as Partial); }); } @@ -340,7 +339,7 @@ export class IssueReporter extends Disposable { }); this.addEventListener('disableExtensions', 'click', () => { - this.issueMainService.reloadWithExtensionsDisabled(); + this.issueMainService.$reloadWithExtensionsDisabled(); }); this.addEventListener('extensionBugsLink', 'click', (e: Event) => { @@ -351,7 +350,7 @@ export class IssueReporter extends Disposable { this.addEventListener('disableExtensions', 'keydown', (e: Event) => { e.stopPropagation(); if ((e as KeyboardEvent).keyCode === 13 || (e as KeyboardEvent).keyCode === 32) { - this.issueMainService.reloadWithExtensionsDisabled(); + this.issueMainService.$reloadWithExtensionsDisabled(); } }); @@ -375,7 +374,7 @@ export class IssueReporter extends Disposable { const { issueDescription } = this.issueReporterModel.getData(); if (!this.hasBeenSubmitted && (issueTitle || issueDescription)) { // fire and forget - this.issueMainService.showConfirmCloseDialog(); + this.issueMainService.$showConfirmCloseDialog(); } else { this.close(); } @@ -505,7 +504,7 @@ export class IssueReporter extends Disposable { } private async close(): Promise { - await this.issueMainService.closeReporter(); + await this.issueMainService.$closeReporter(); } private clearSearchResults(): void { @@ -882,7 +881,7 @@ export class IssueReporter extends Disposable { } private async writeToClipboard(baseUrl: string, issueBody: string): Promise { - const shouldWrite = await this.issueMainService.showClipboardDialog(); + const shouldWrite = await this.issueMainService.$showClipboardDialog(); if (!shouldWrite) { throw new CancellationError(); } @@ -1058,23 +1057,19 @@ export class IssueReporter extends Disposable { const { selectedExtension } = this.issueReporterModel.getData(); reset(extensionsSelector, $('option'), ...extensionOptions.map(extension => makeOption(extension, selectedExtension))); - let tokenSource: CancellationTokenSource | undefined; this.addEventListener('extension-selector', 'change', (e: Event) => { - tokenSource?.cancel(); const selectedExtensionId = (e.target).value; const extensions = this.issueReporterModel.getData().allExtensions; const matches = extensions.filter(extension => extension.id === selectedExtensionId); if (matches.length) { this.issueReporterModel.update({ selectedExtension: matches[0] }); - this.validateSelectedExtension(); - if (matches[0].hasIssueUriRequestHandler) { - tokenSource = new CancellationTokenSource(); - this.updateIssueReporterUri(matches[0], tokenSource?.token); + this.updateIssueReporterUri(matches[0]); + } else { + this.validateSelectedExtension(); + const title = (this.getElementById('issue-title')).value; + this.searchExtensionIssues(title); } - - const title = (this.getElementById('issue-title')).value; - this.searchExtensionIssues(title); } else { this.issueReporterModel.update({ selectedExtension: undefined }); this.clearSearchResults(); @@ -1096,13 +1091,14 @@ export class IssueReporter extends Disposable { hide(extensionValidationMessage); hide(extensionValidationNoUrlsMessage); - if (!this.issueReporterModel.getData().selectedExtension) { + const extension = this.issueReporterModel.getData().selectedExtension; + if (!extension) { this.previewButton.enabled = true; return; } const hasValidGitHubUrl = this.getExtensionGitHubUrl(); - if (hasValidGitHubUrl) { + if (hasValidGitHubUrl || extension.hasIssueUriRequestHandler) { this.previewButton.enabled = true; } else { this.setExtensionValidationMessage(); diff --git a/src/vs/code/electron-sandbox/issue/media/issueReporter.css b/src/vs/code/electron-sandbox/issue/media/issueReporter.css index e3c6d8f355f8f2..20d2ebaec16639 100644 --- a/src/vs/code/electron-sandbox/issue/media/issueReporter.css +++ b/src/vs/code/electron-sandbox/issue/media/issueReporter.css @@ -73,6 +73,7 @@ textarea { padding: 4px 10px; align-self: flex-end; margin-bottom: 10px; + font-size: 13px; } select { diff --git a/src/vs/editor/browser/editorBrowser.ts b/src/vs/editor/browser/editorBrowser.ts index f11af397bb53dd..26059bb20880ab 100644 --- a/src/vs/editor/browser/editorBrowser.ts +++ b/src/vs/editor/browser/editorBrowser.ts @@ -38,11 +38,19 @@ export interface IViewZone { * This is relevant for wrapped lines. */ afterColumn?: number; - /** * If the `afterColumn` has multiple view columns, the affinity specifies which one to use. Defaults to `none`. */ afterColumnAffinity?: PositionAffinity; + /** + * Render the zone even when its line is hidden. + */ + showInHiddenAreas?: boolean; + /** + * Tiebreaker that is used when multiple view zones want to be after the same line. + * Defaults to `afterColumn` otherwise 10000; + */ + ordinal?: number; /** * Suppress mouse down events. * If set, the editor will attach a mouse down listener to the view zone and .preventDefault on it. diff --git a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts index 6f64f7a201731f..0b35f4b06edc5f 100644 --- a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts +++ b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts @@ -212,7 +212,7 @@ export class GlyphMarginOverlay extends DedupOverlay { const toRender = this._render(visibleStartLineNumber, visibleEndLineNumber, decorationsToRender, this._glyphMarginDecorationLaneCount); const lineHeight = this._lineHeight.toString(); - const width = this._glyphMarginWidth.toString(); + const width = (Math.round(this._glyphMarginWidth / this._glyphMarginDecorationLaneCount)).toString(); const common = '" style="width:' + width + 'px' + ';height:' + lineHeight + 'px;'; const output: string[] = []; diff --git a/src/vs/editor/browser/viewParts/viewZones/viewZones.ts b/src/vs/editor/browser/viewParts/viewZones/viewZones.ts index 60ce7277ff2504..e939f77440181c 100644 --- a/src/vs/editor/browser/viewParts/viewZones/viewZones.ts +++ b/src/vs/editor/browser/viewParts/viewZones/viewZones.ts @@ -137,12 +137,7 @@ export class ViewZones extends ViewPart { // ---- end view event handlers private _getZoneOrdinal(zone: IViewZone): number { - - if (typeof zone.afterColumn !== 'undefined') { - return zone.afterColumn; - } - - return 10000; + return zone.ordinal ?? zone.afterColumn ?? 10000; } private _computeWhitespaceProps(zone: IViewZone): IComputedViewZoneProps { @@ -187,7 +182,7 @@ export class ViewZones extends ViewPart { } const viewPosition = this._context.viewModel.coordinatesConverter.convertModelPositionToViewPosition(zoneAfterModelPosition, zone.afterColumnAffinity); - const isVisible = this._context.viewModel.coordinatesConverter.modelPositionIsVisible(zoneBeforeModelPosition); + const isVisible = zone.showInHiddenAreas || this._context.viewModel.coordinatesConverter.modelPositionIsVisible(zoneBeforeModelPosition); return { isInHiddenArea: !isVisible, afterViewLineNumber: viewPosition.lineNumber, diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts index b9976679517f88..bc2d3e3bd5f88d 100644 --- a/src/vs/editor/browser/widget/diffEditorWidget.ts +++ b/src/vs/editor/browser/widget/diffEditorWidget.ts @@ -286,6 +286,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE renderOverviewRuler: true, diffWordWrap: 'inherit', diffAlgorithm: 'advanced', + accessibilityVerbose: false }); if (typeof options.isInEmbeddedEditor !== 'undefined') { @@ -622,7 +623,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE })); // Revert change when an arrow is clicked. - this._register(editor.onMouseUp(event => { + this._register(editor.onMouseDown(event => { if (!event.event.rightButton && event.target.position && event.target.element?.className.includes('arrow-revert-change')) { const lineNumber = event.target.position.lineNumber; const viewZone = event.target as editorBrowser.IMouseTargetViewZone | undefined; @@ -1274,7 +1275,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE if (options.originalAriaLabel) { result.ariaLabel = options.originalAriaLabel; } - result.ariaLabel += ariaNavigationTip; + this._updateAriaLabel(result); result.readOnly = !this._options.originalEditable; result.dropIntoEditor = { enabled: !result.readOnly }; result.extraEditorClassName = 'original-in-monaco-diff-editor'; @@ -1287,12 +1288,22 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE }; } + private _updateAriaLabel(options: IEditorConstructionOptions): void { + let ariaLabel = options.ariaLabel; + if (this._options.accessibilityVerbose) { + ariaLabel += ariaNavigationTip; + } else if (ariaLabel) { + ariaLabel = ariaLabel.replaceAll(ariaNavigationTip, ''); + } + options.ariaLabel = ariaLabel; + } + private _adjustOptionsForRightHandSide(options: Readonly): IEditorConstructionOptions { const result = this._adjustOptionsForSubEditor(options); if (options.modifiedAriaLabel) { result.ariaLabel = options.modifiedAriaLabel; } - result.ariaLabel += ariaNavigationTip; + this._updateAriaLabel(result); result.wordWrapOverride1 = this._options.diffWordWrap; result.revealHorizontalRightPadding = EditorOptions.revealHorizontalRightPadding.defaultValue + DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH; result.scrollbar!.verticalHasArrows = false; @@ -2767,6 +2778,7 @@ function validateDiffEditorOptions(options: Readonly, defaul renderOverviewRuler: validateBooleanOption(options.renderOverviewRuler, defaults.renderOverviewRuler), diffWordWrap: validateDiffWordWrap(options.diffWordWrap, defaults.diffWordWrap), diffAlgorithm: validateStringSetOption(options.diffAlgorithm, defaults.diffAlgorithm, ['legacy', 'advanced'], { 'smart': 'legacy', 'experimental': 'advanced' }), + accessibilityVerbose: validateBooleanOption(options.accessibilityVerbose, defaults.accessibilityVerbose), }; } @@ -2784,6 +2796,7 @@ function changedDiffEditorOptions(a: ValidDiffEditorBaseOptions, b: ValidDiffEdi renderOverviewRuler: (a.renderOverviewRuler !== b.renderOverviewRuler), diffWordWrap: (a.diffWordWrap !== b.diffWordWrap), diffAlgorithm: (a.diffAlgorithm !== b.diffAlgorithm), + accessibilityVerbose: (a.accessibilityVerbose !== b.accessibilityVerbose), }; } diff --git a/src/vs/editor/browser/widget/diffReview.ts b/src/vs/editor/browser/widget/diffReview.ts index f768f14750ec3e..1d9316b02a6036 100644 --- a/src/vs/editor/browser/widget/diffReview.ts +++ b/src/vs/editor/browser/widget/diffReview.ts @@ -30,10 +30,11 @@ import { ThemeIcon } from 'vs/base/common/themables'; import { Constants } from 'vs/base/common/uint'; import { Codicon } from 'vs/base/common/codicons'; import { registerIcon } from 'vs/platform/theme/common/iconRegistry'; -import { ILanguageIdCodec } from 'vs/editor/common/languages'; import { ILanguageService } from 'vs/editor/common/languages/language'; -import { ILineChange } from 'vs/editor/common/diff/smartLinesDiffComputer'; import { AudioCue, IAudioCueService } from 'vs/platform/audioCues/browser/audioCueService'; +import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; +import { ILineChange } from 'vs/editor/common/diff/smartLinesDiffComputer'; +import { ILanguageIdCodec } from 'vs/editor/common/languages'; const DIFF_LINES_PADDING = 3; @@ -102,7 +103,8 @@ export class DiffReview extends Disposable { constructor( diffEditor: DiffEditorWidget, @ILanguageService private readonly _languageService: ILanguageService, - @IAudioCueService private readonly _audioCueService: IAudioCueService + @IAudioCueService private readonly _audioCueService: IAudioCueService, + @IConfigurationService private readonly _configurationService: IConfigurationService ) { super(); this._diffEditor = diffEditor; @@ -180,6 +182,11 @@ export class DiffReview extends Disposable { this.accept(); } })); + this._register(this._configurationService.onDidChangeConfiguration(e => { + if (e.affectsConfiguration('accessibility.verbosity.diff-editor')) { + this._diffEditor.updateOptions({ accessibilityVerbose: this._configurationService.getValue('accessibility.verbosity.diff-editor') }); + } + })); this._diffs = []; this._currentDiff = null; } diff --git a/src/vs/editor/browser/widget/inlineDiffMargin.ts b/src/vs/editor/browser/widget/inlineDiffMargin.ts index 700949147e855c..69dfd17560cb5a 100644 --- a/src/vs/editor/browser/widget/inlineDiffMargin.ts +++ b/src/vs/editor/browser/widget/inlineDiffMargin.ts @@ -190,7 +190,7 @@ export class InlineDiffMargin extends Disposable { } })); - this._register(editor.onMouseUp((e: IEditorMouseEvent) => { + this._register(editor.onMouseDown((e: IEditorMouseEvent) => { if (!e.event.rightButton) { return; } diff --git a/src/vs/editor/browser/widget/workerBasedDocumentDiffProvider.ts b/src/vs/editor/browser/widget/workerBasedDocumentDiffProvider.ts index 2b9b29571b46cf..7c6aae2fb460ce 100644 --- a/src/vs/editor/browser/widget/workerBasedDocumentDiffProvider.ts +++ b/src/vs/editor/browser/widget/workerBasedDocumentDiffProvider.ts @@ -5,9 +5,11 @@ import { Emitter, Event } from 'vs/base/common/event'; import { IDisposable } from 'vs/base/common/lifecycle'; +import { StopWatch } from 'vs/base/common/stopwatch'; import { IDocumentDiff, IDocumentDiffProvider, IDocumentDiffProviderOptions } from 'vs/editor/common/diff/documentDiffProvider'; import { ITextModel } from 'vs/editor/common/model'; import { DiffAlgorithmName, IEditorWorkerService } from 'vs/editor/common/services/editorWorker'; +import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; export class WorkerBasedDocumentDiffProvider implements IDocumentDiffProvider, IDisposable { private onDidChangeEventEmitter = new Emitter(); @@ -19,6 +21,7 @@ export class WorkerBasedDocumentDiffProvider implements IDocumentDiffProvider, I constructor( options: IWorkerBasedDocumentDiffProviderOptions, @IEditorWorkerService private readonly editorWorkerService: IEditorWorkerService, + @ITelemetryService private readonly telemetryService: ITelemetryService, ) { this.setOptions(options); } @@ -32,7 +35,25 @@ export class WorkerBasedDocumentDiffProvider implements IDocumentDiffProvider, I return this.diffAlgorithm.computeDiff(original, modified, options); } + const sw = StopWatch.create(true); const result = await this.editorWorkerService.computeDiff(original.uri, modified.uri, options, this.diffAlgorithm); + const timeMs = sw.elapsed(); + + this.telemetryService.publicLog2<{ + timeMs: number; + timedOut: boolean; + }, { + owner: 'hediet'; + + timeMs: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'To understand if the new diff algorithm is slower/faster than the old one' }; + timedOut: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'To understand how often the new diff algorithm times out' }; + + comment: 'This event gives insight about the performance of the new diff algorithm.'; + }>('diffEditor.computeDiff', { + timeMs, + timedOut: result?.quitEarly ?? true, + }); + if (!result) { throw new Error('no diff result available'); } diff --git a/src/vs/editor/common/config/editorConfigurationSchema.ts b/src/vs/editor/common/config/editorConfigurationSchema.ts index 22e77f9c91a91b..a6026bfbed30e3 100644 --- a/src/vs/editor/common/config/editorConfigurationSchema.ts +++ b/src/vs/editor/common/config/editorConfigurationSchema.ts @@ -195,11 +195,12 @@ const editorConfiguration: IConfigurationNode = { 'diffEditor.diffAlgorithm': { type: 'string', enum: ['legacy', 'advanced'], - default: 'advanced', + default: 'legacy', markdownEnumDescriptions: [ nls.localize('diffAlgorithm.legacy', "Uses the legacy diffing algorithm."), nls.localize('diffAlgorithm.advanced', "Uses the advanced diffing algorithm."), - ] + ], + tags: ['experimental'], }, } }; diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts index 7ed880cdcda84d..694189b90a2486 100644 --- a/src/vs/editor/common/config/editorOptions.ts +++ b/src/vs/editor/common/config/editorOptions.ts @@ -784,6 +784,11 @@ export interface IDiffEditorBaseOptions { * Diff Algorithm */ diffAlgorithm?: 'legacy' | 'advanced' | IDocumentDiffProvider; + + /** + * Whether the diff editor aria label should be verbose. + */ + accessibilityVerbose?: boolean; } /** @@ -4112,10 +4117,6 @@ export interface ISuggestOptions { * Enable graceful matching. Defaults to true. */ filterGraceful?: boolean; - /** - * Prevent quick suggestions when a snippet is active. Defaults to true. - */ - snippetsPreventQuickSuggestions?: boolean; /** * Favors words that appear close to the cursor. */ @@ -4277,7 +4278,6 @@ class EditorSuggest extends BaseEditorOption { if (node === SENTINEL) { return true; @@ -385,6 +385,7 @@ export class PieceTreeBase { const endPosition = other.nodeAt(offset + len); const val = other.getValueInRange2(startPosition, endPosition); + offset += len; return str === val; }); diff --git a/src/vs/editor/common/standalone/standaloneEnums.ts b/src/vs/editor/common/standalone/standaloneEnums.ts index 4552f43e072247..167dd8ed0fe961 100644 --- a/src/vs/editor/common/standalone/standaloneEnums.ts +++ b/src/vs/editor/common/standalone/standaloneEnums.ts @@ -496,116 +496,121 @@ export enum KeyCode { F17 = 75, F18 = 76, F19 = 77, - NumLock = 78, - ScrollLock = 79, + F20 = 78, + F21 = 79, + F22 = 80, + F23 = 81, + F24 = 82, + NumLock = 83, + ScrollLock = 84, /** * Used for miscellaneous characters; it can vary by keyboard. * For the US standard keyboard, the ';:' key */ - Semicolon = 80, + Semicolon = 85, /** * For any country/region, the '+' key * For the US standard keyboard, the '=+' key */ - Equal = 81, + Equal = 86, /** * For any country/region, the ',' key * For the US standard keyboard, the ',<' key */ - Comma = 82, + Comma = 87, /** * For any country/region, the '-' key * For the US standard keyboard, the '-_' key */ - Minus = 83, + Minus = 88, /** * For any country/region, the '.' key * For the US standard keyboard, the '.>' key */ - Period = 84, + Period = 89, /** * Used for miscellaneous characters; it can vary by keyboard. * For the US standard keyboard, the '/?' key */ - Slash = 85, + Slash = 90, /** * Used for miscellaneous characters; it can vary by keyboard. * For the US standard keyboard, the '`~' key */ - Backquote = 86, + Backquote = 91, /** * Used for miscellaneous characters; it can vary by keyboard. * For the US standard keyboard, the '[{' key */ - BracketLeft = 87, + BracketLeft = 92, /** * Used for miscellaneous characters; it can vary by keyboard. * For the US standard keyboard, the '\|' key */ - Backslash = 88, + Backslash = 93, /** * Used for miscellaneous characters; it can vary by keyboard. * For the US standard keyboard, the ']}' key */ - BracketRight = 89, + BracketRight = 94, /** * Used for miscellaneous characters; it can vary by keyboard. * For the US standard keyboard, the ''"' key */ - Quote = 90, + Quote = 95, /** * Used for miscellaneous characters; it can vary by keyboard. */ - OEM_8 = 91, + OEM_8 = 96, /** * Either the angle bracket key or the backslash key on the RT 102-key keyboard. */ - IntlBackslash = 92, - Numpad0 = 93, - Numpad1 = 94, - Numpad2 = 95, - Numpad3 = 96, - Numpad4 = 97, - Numpad5 = 98, - Numpad6 = 99, - Numpad7 = 100, - Numpad8 = 101, - Numpad9 = 102, - NumpadMultiply = 103, - NumpadAdd = 104, - NUMPAD_SEPARATOR = 105, - NumpadSubtract = 106, - NumpadDecimal = 107, - NumpadDivide = 108, + IntlBackslash = 97, + Numpad0 = 98, + Numpad1 = 99, + Numpad2 = 100, + Numpad3 = 101, + Numpad4 = 102, + Numpad5 = 103, + Numpad6 = 104, + Numpad7 = 105, + Numpad8 = 106, + Numpad9 = 107, + NumpadMultiply = 108, + NumpadAdd = 109, + NUMPAD_SEPARATOR = 110, + NumpadSubtract = 111, + NumpadDecimal = 112, + NumpadDivide = 113, /** * Cover all key codes when IME is processing input. */ - KEY_IN_COMPOSITION = 109, - ABNT_C1 = 110, - ABNT_C2 = 111, - AudioVolumeMute = 112, - AudioVolumeUp = 113, - AudioVolumeDown = 114, - BrowserSearch = 115, - BrowserHome = 116, - BrowserBack = 117, - BrowserForward = 118, - MediaTrackNext = 119, - MediaTrackPrevious = 120, - MediaStop = 121, - MediaPlayPause = 122, - LaunchMediaPlayer = 123, - LaunchMail = 124, - LaunchApp2 = 125, + KEY_IN_COMPOSITION = 114, + ABNT_C1 = 115, + ABNT_C2 = 116, + AudioVolumeMute = 117, + AudioVolumeUp = 118, + AudioVolumeDown = 119, + BrowserSearch = 120, + BrowserHome = 121, + BrowserBack = 122, + BrowserForward = 123, + MediaTrackNext = 124, + MediaTrackPrevious = 125, + MediaStop = 126, + MediaPlayPause = 127, + LaunchMediaPlayer = 128, + LaunchMail = 129, + LaunchApp2 = 130, /** * VK_CLEAR, 0x0C, CLEAR key */ - Clear = 126, + Clear = 131, /** * Placed last to cover the length of the enum. * Please do not depend on this value! */ - MAX_VALUE = 127 + MAX_VALUE = 132 } export enum MarkerSeverity { diff --git a/src/vs/editor/contrib/find/browser/findController.ts b/src/vs/editor/contrib/find/browser/findController.ts index 61eec7b6aa9ec8..38a9030adc7fd1 100644 --- a/src/vs/editor/contrib/find/browser/findController.ts +++ b/src/vs/editor/contrib/find/browser/findController.ts @@ -26,7 +26,7 @@ import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/con import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; -import { INotificationService } from 'vs/platform/notification/common/notification'; +import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput'; import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage'; import { IThemeService, themeColorFromId } from 'vs/platform/theme/common/themeService'; @@ -759,22 +759,46 @@ export class MoveToMatchFindAction extends EditorAction { public run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void | Promise { const controller = CommonFindController.get(editor); - if (!controller) { return; } + const matchesCount = controller.getState().matchesCount; + if (matchesCount < 1) { + const notificationService = accessor.get(INotificationService); + notificationService.notify({ + severity: Severity.Warning, + message: nls.localize('findMatchAction.noResults', "No matches. Try searching for something else.") + }); + return; + } + const quickInputService = accessor.get(IQuickInputService); const inputBox = quickInputService.createInputBox(); - inputBox.placeholder = nls.localize('findMatchAction.inputPlaceHolder', "Type a number to go to a specific match (between 1 and {0})", controller.getState().matchesCount); + inputBox.placeholder = nls.localize('findMatchAction.inputPlaceHolder', "Type a number to go to a specific match (between 1 and {0})", matchesCount); - const updatePickerAndEditor = (value: string) => { + const toFindMatchIndex = (value: string): number | undefined => { const index = parseInt(value); + if (isNaN(index)) { + return undefined; + } + + const matchCount = controller.getState().matchesCount; + if (index > 0 && index <= matchCount) { + return index - 1; // zero based + } else if (index < 0 && index >= -matchCount) { + return matchCount + index; + } - if (!isNaN(index) && index > 0 && index <= controller.getState().matchesCount) { + return undefined; + }; + + const updatePickerAndEditor = (value: string) => { + const index = toFindMatchIndex(value); + if (typeof index === 'number') { // valid inputBox.validationMessage = undefined; - controller.goToMatch(index - 1); + controller.goToMatch(index); const currentMatch = controller.getState().currentMatch; if (currentMatch) { this.addDecorations(editor, currentMatch); @@ -789,9 +813,9 @@ export class MoveToMatchFindAction extends EditorAction { }); inputBox.onDidAccept(() => { - const index = parseInt(inputBox.value); - if (!isNaN(index) && index > 0 && index <= controller.getState().matchesCount) { - controller.goToMatch(index - 1); + const index = toFindMatchIndex(inputBox.value); + if (typeof index === 'number') { + controller.goToMatch(index); inputBox.hide(); } else { inputBox.validationMessage = nls.localize('findMatchAction.inputValidationMessage', "Please type a number between 1 and {0}", controller.getState().matchesCount); diff --git a/src/vs/editor/contrib/format/browser/format.ts b/src/vs/editor/contrib/format/browser/format.ts index 4d64c886d09cbd..42d8cf3d87fe47 100644 --- a/src/vs/editor/contrib/format/browser/format.ts +++ b/src/vs/editor/contrib/format/browser/format.ts @@ -228,32 +228,33 @@ export async function formatDocumentRangesWithProvider( logService.trace(`[format][provideDocumentRangeFormattingEdits] (response)`, provider.extensionId?.value, result); rawEditsList.push(result); } else { + for (const range of ranges) { if (cts.token.isCancellationRequested) { return true; } rawEditsList.push(await computeEdits(range)); } - } - for (let i = 0; i < ranges.length; ++i) { - for (let j = i + 1; j < ranges.length; ++j) { - if (cts.token.isCancellationRequested) { - return true; - } - if (hasIntersectingEdit(rawEditsList[i], rawEditsList[j])) { - // Merge ranges i and j into a single range, recompute the associated edits - const mergedRange = Range.plusRange(ranges[i], ranges[j]); - const edits = await computeEdits(mergedRange); - ranges.splice(j, 1); - ranges.splice(i, 1); - ranges.push(mergedRange); - rawEditsList.splice(j, 1); - rawEditsList.splice(i, 1); - rawEditsList.push(edits); - // Restart scanning - i = 0; - j = 0; + for (let i = 0; i < ranges.length; ++i) { + for (let j = i + 1; j < ranges.length; ++j) { + if (cts.token.isCancellationRequested) { + return true; + } + if (hasIntersectingEdit(rawEditsList[i], rawEditsList[j])) { + // Merge ranges i and j into a single range, recompute the associated edits + const mergedRange = Range.plusRange(ranges[i], ranges[j]); + const edits = await computeEdits(mergedRange); + ranges.splice(j, 1); + ranges.splice(i, 1); + ranges.push(mergedRange); + rawEditsList.splice(j, 1); + rawEditsList.splice(i, 1); + rawEditsList.push(edits); + // Restart scanning + i = 0; + j = 0; + } } } } diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts index 60aa2a33a3ea64..319cbe3e52907a 100644 --- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts +++ b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts @@ -6,7 +6,7 @@ import { mapFind } from 'vs/base/common/arrays'; import { BugIndicatingError, onUnexpectedExternalError } from 'vs/base/common/errors'; import { Disposable } from 'vs/base/common/lifecycle'; -import { IObservable, IReader, ITransaction, autorun, autorunHandleChanges, derived, observableSignal, observableValue, transaction } from 'vs/base/common/observable'; +import { IObservable, ITransaction, autorun, autorunHandleChanges, derived, observableSignal, observableValue, transaction } from 'vs/base/common/observable'; import { isDefined } from 'vs/base/common/types'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { EditOperation } from 'vs/editor/common/core/editOperation'; @@ -34,6 +34,7 @@ export enum VersionIdChangeReason { export class InlineCompletionsModel extends Disposable { private readonly _source = this._register(this._instantiationService.createInstance(InlineCompletionsSource, this.textModel, this.textModelVersionId, this._debounceValue)); private readonly _isActive = observableValue('isActive', false); + private readonly _forceUpdate = observableSignal('forceUpdate'); private _isAcceptingPartially = false; public get isAcceptingPartially() { return this._isAcceptingPartially; } @@ -41,6 +42,8 @@ export class InlineCompletionsModel extends Disposable { private _isNavigatingCurrentInlineCompletion = false; public get isNavigatingCurrentInlineCompletion() { return this._isNavigatingCurrentInlineCompletion; } + private _updatePromise: Promise | undefined; // TODO make this a computed + constructor( public readonly textModel: ITextModel, public readonly selectedSuggestItem: IObservable, @@ -57,24 +60,58 @@ export class InlineCompletionsModel extends Disposable { ) { super(); - let preserveCurrentCompletion = false; const preserveCurrentCompletionReasons = new Set([ VersionIdChangeReason.Redo, VersionIdChangeReason.Undo, VersionIdChangeReason.AcceptWord, ]); + + // TODO implement ChangeHandler concept + let preserveCurrentCompletion = false; + let inlineCompletionTriggerKind = InlineCompletionTriggerKind.Automatic; + this._register(autorunHandleChanges('update', { - handleChange: ctx => { + handleChange: (ctx) => { if (ctx.didChange(this.textModelVersionId) && preserveCurrentCompletionReasons.has(ctx.change)) { preserveCurrentCompletion = true; + } else if (ctx.didChange(this._forceUpdate)) { + inlineCompletionTriggerKind = ctx.change; } return true; } - }, (reader) => { + }, reader => { + this._forceUpdate.read(reader); if ((this._enabled.read(reader) && this.selectedSuggestItem.read(reader)) || this._isActive.read(reader)) { - this._update(reader, InlineCompletionTriggerKind.Automatic, preserveCurrentCompletion); + const shouldPreserveCurrentCompletion = preserveCurrentCompletion || (this.selectedInlineCompletion.get()?.inlineCompletion.source.inlineCompletions.enableForwardStability ?? false); + + const suggestItem = this.selectedSuggestItem.read(reader); + const cursorPosition = this.cursorPosition.read(reader); + this.textModelVersionId.read(reader); + + const suggestWidgetInlineCompletions = this._source.suggestWidgetInlineCompletions.get(); + if (suggestWidgetInlineCompletions && !suggestItem) { + const inlineCompletions = this._source.inlineCompletions.get(); + if (inlineCompletions && suggestWidgetInlineCompletions.request.versionId > inlineCompletions.request.versionId) { + this._source.inlineCompletions.set(suggestWidgetInlineCompletions.clone(), undefined); + } + this._source.clearSuggestWidgetInlineCompletions(); + } + + this._updatePromise = this._source.update( + cursorPosition, + { + triggerKind: inlineCompletionTriggerKind, + selectedSuggestionInfo: suggestItem?.toSelectedSuggestionInfo() + }, + shouldPreserveCurrentCompletion ? this.selectedInlineCompletion.get() : undefined + ); + } else { + this._updatePromise = undefined; } + + // Reset local state preserveCurrentCompletion = false; + inlineCompletionTriggerKind = InlineCompletionTriggerKind.Automatic; })); let lastItem: InlineCompletionWithUpdatedRange | undefined = undefined; @@ -92,31 +129,17 @@ export class InlineCompletionsModel extends Disposable { })); } - private async _update(reader: IReader | undefined, triggerKind: InlineCompletionTriggerKind, preserveCurrentCompletion: boolean = false): Promise { - preserveCurrentCompletion = preserveCurrentCompletion || (this.selectedInlineCompletion.get()?.inlineCompletion.source.inlineCompletions.enableForwardStability ?? false); - - const suggestItem = this.selectedSuggestItem.read(reader); - const cursorPosition = this.cursorPosition.read(reader); - this.textModelVersionId.read(reader); - - const suggestWidgetInlineCompletions = this._source.suggestWidgetInlineCompletions.get(); - if (suggestWidgetInlineCompletions && !suggestItem) { - const inlineCompletions = this._source.inlineCompletions.get(); - if (inlineCompletions && suggestWidgetInlineCompletions.request.versionId > inlineCompletions.request.versionId) { - this._source.inlineCompletions.set(suggestWidgetInlineCompletions.clone(), undefined); - } - this._source.clearSuggestWidgetInlineCompletions(); - } - - await this._source.update( - cursorPosition, - { triggerKind, selectedSuggestionInfo: suggestItem?.toSelectedSuggestionInfo() }, - preserveCurrentCompletion ? this.selectedInlineCompletion.get() : undefined - ); + public async trigger(tx?: ITransaction): Promise { + this._isActive.set(true, tx); + await this._updatePromise; } - public trigger(tx?: ITransaction): void { - this._isActive.set(true, tx); + public async triggerExplicitly(): Promise { + transaction(tx => { + this._isActive.set(true, tx); + this._forceUpdate.trigger(tx, InlineCompletionTriggerKind.Explicit); + }); + await this._updatePromise; } public stop(tx?: ITransaction): void { @@ -170,7 +193,7 @@ export class InlineCompletionsModel extends Disposable { } }); - public readonly ghostTextAndCompletion = derived('ghostText', (reader) => { + public readonly ghostTextAndCompletion = derived('ghostTextAndCompletion', (reader) => { const model = this.textModel; const suggestItem = this.selectedSuggestItem.read(reader); @@ -222,10 +245,6 @@ export class InlineCompletionsModel extends Disposable { return v.ghostText; }); - public async triggerExplicitly(): Promise { - await this._update(undefined, InlineCompletionTriggerKind.Explicit); - } - private async deltaIndex(delta: 1 | -1): Promise { await this.triggerExplicitly(); diff --git a/src/vs/editor/contrib/suggest/browser/suggestController.ts b/src/vs/editor/contrib/suggest/browser/suggestController.ts index abd5d8b23bb7c0..1dbe9faa166020 100644 --- a/src/vs/editor/contrib/suggest/browser/suggestController.ts +++ b/src/vs/editor/contrib/suggest/browser/suggestController.ts @@ -249,11 +249,7 @@ export class SuggestController implements IEditorContribution { // don't "focus" item when configured to do so or when in snippet mode (and configured to do so) const options = this.editor.getOption(EditorOption.suggest); - if (options.snippetsPreventQuickSuggestions && SnippetController2.get(this.editor)?.isInSnippet()) { - // SPECIAL: in snippet mode, we never focus unless the user wants to - noFocus = true; - - } else if (options.selectionMode === 'never' || options.selectionMode === 'always') { + if (options.selectionMode === 'never' || options.selectionMode === 'always') { // simple: always or never noFocus = options.selectionMode === 'never'; @@ -775,7 +771,7 @@ registerEditorCommand(new SuggestCommand({ kbOpts: [{ // normal tab primary: KeyCode.Tab, - kbExpr: ContextKeyExpr.and(SuggestContext.Visible, EditorContextKeys.textInputFocus), + kbExpr: ContextKeyExpr.and(SuggestContext.Visible, EditorContextKeys.textInputFocus, SnippetController2.InSnippetMode.toNegated()), weight, }, { // accept on enter has special rules @@ -809,7 +805,7 @@ registerEditorCommand(new SuggestCommand({ precondition: ContextKeyExpr.and(SuggestContext.Visible, EditorContextKeys.textInputFocus, SuggestContext.HasFocusedSuggestion), kbOpts: { weight: weight, - kbExpr: EditorContextKeys.textInputFocus, + kbExpr: ContextKeyExpr.and(EditorContextKeys.textInputFocus, SnippetController2.InSnippetMode.toNegated()), primary: KeyMod.Shift | KeyCode.Enter, secondary: [KeyMod.Shift | KeyCode.Tab], }, diff --git a/src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts b/src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts index a9c013b4e7deea..c6ef5c58a06d04 100644 --- a/src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts +++ b/src/vs/editor/contrib/suggest/test/browser/completionModel.test.ts @@ -35,7 +35,6 @@ suite('CompletionModel', function () { const defaultOptions = { insertMode: 'insert', - snippetsPreventQuickSuggestions: true, filterGraceful: true, localityBonus: false, shareSuggestSelections: false, diff --git a/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts b/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts index d6195522780fa4..555877f6ac0cce 100644 --- a/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts +++ b/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts @@ -28,6 +28,9 @@ export interface IOptions { frameColor?: Color; arrowColor?: Color; keepEditorSelection?: boolean; + + ordinal?: number; + showInHiddenAreas?: boolean; } export interface IStyles { @@ -48,25 +51,31 @@ const defaultOptions: IOptions = { const WIDGET_ID = 'vs.editor.contrib.zoneWidget'; -export class ViewZoneDelegate implements IViewZone { +class ViewZoneDelegate implements IViewZone { domNode: HTMLElement; id: string = ''; // A valid zone id should be greater than 0 afterLineNumber: number; afterColumn: number; heightInLines: number; + readonly showInHiddenAreas: boolean | undefined; + readonly ordinal: number | undefined; private readonly _onDomNodeTop: (top: number) => void; private readonly _onComputedHeight: (height: number) => void; constructor(domNode: HTMLElement, afterLineNumber: number, afterColumn: number, heightInLines: number, onDomNodeTop: (top: number) => void, - onComputedHeight: (height: number) => void + onComputedHeight: (height: number) => void, + showInHiddenAreas: boolean | undefined, + ordinal: number | undefined ) { this.domNode = domNode; this.afterLineNumber = afterLineNumber; this.afterColumn = afterColumn; this.heightInLines = heightInLines; + this.showInHiddenAreas = showInHiddenAreas; + this.ordinal = ordinal; this._onDomNodeTop = onDomNodeTop; this._onComputedHeight = onComputedHeight; } @@ -388,7 +397,9 @@ export abstract class ZoneWidget implements IHorizontalSashLayoutProvider { position.column, heightInLines, (top: number) => this._onViewZoneTop(top), - (height: number) => this._onViewZoneHeight(height) + (height: number) => this._onViewZoneHeight(height), + this.options.showInHiddenAreas, + this.options.ordinal ); this._viewZone.id = accessor.addZone(this._viewZone); this._overlayWidget = new OverlayWidgetDelegate(WIDGET_ID + this._viewZone.id, this.domNode); diff --git a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts index d6382e4e7ac851..f1d417305460af 100644 --- a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts +++ b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts @@ -1595,6 +1595,12 @@ suite('buffer api', () => { assert(!a.equal(d)); }); + test('equal with more chunks', () => { + const a = createTextBuffer(['ab', 'cd', 'e']); + const b = createTextBuffer(['ab', 'c', 'de']); + assert(a.equal(b)); + }); + test('equal 2, empty buffer', () => { const a = createTextBuffer(['']); const b = createTextBuffer(['']); diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 15091d47c204f9..ca41e212ff2475 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -303,116 +303,121 @@ declare namespace monaco { F17 = 75, F18 = 76, F19 = 77, - NumLock = 78, - ScrollLock = 79, + F20 = 78, + F21 = 79, + F22 = 80, + F23 = 81, + F24 = 82, + NumLock = 83, + ScrollLock = 84, /** * Used for miscellaneous characters; it can vary by keyboard. * For the US standard keyboard, the ';:' key */ - Semicolon = 80, + Semicolon = 85, /** * For any country/region, the '+' key * For the US standard keyboard, the '=+' key */ - Equal = 81, + Equal = 86, /** * For any country/region, the ',' key * For the US standard keyboard, the ',<' key */ - Comma = 82, + Comma = 87, /** * For any country/region, the '-' key * For the US standard keyboard, the '-_' key */ - Minus = 83, + Minus = 88, /** * For any country/region, the '.' key * For the US standard keyboard, the '.>' key */ - Period = 84, + Period = 89, /** * Used for miscellaneous characters; it can vary by keyboard. * For the US standard keyboard, the '/?' key */ - Slash = 85, + Slash = 90, /** * Used for miscellaneous characters; it can vary by keyboard. * For the US standard keyboard, the '`~' key */ - Backquote = 86, + Backquote = 91, /** * Used for miscellaneous characters; it can vary by keyboard. * For the US standard keyboard, the '[{' key */ - BracketLeft = 87, + BracketLeft = 92, /** * Used for miscellaneous characters; it can vary by keyboard. * For the US standard keyboard, the '\|' key */ - Backslash = 88, + Backslash = 93, /** * Used for miscellaneous characters; it can vary by keyboard. * For the US standard keyboard, the ']}' key */ - BracketRight = 89, + BracketRight = 94, /** * Used for miscellaneous characters; it can vary by keyboard. * For the US standard keyboard, the ''"' key */ - Quote = 90, + Quote = 95, /** * Used for miscellaneous characters; it can vary by keyboard. */ - OEM_8 = 91, + OEM_8 = 96, /** * Either the angle bracket key or the backslash key on the RT 102-key keyboard. */ - IntlBackslash = 92, - Numpad0 = 93, - Numpad1 = 94, - Numpad2 = 95, - Numpad3 = 96, - Numpad4 = 97, - Numpad5 = 98, - Numpad6 = 99, - Numpad7 = 100, - Numpad8 = 101, - Numpad9 = 102, - NumpadMultiply = 103, - NumpadAdd = 104, - NUMPAD_SEPARATOR = 105, - NumpadSubtract = 106, - NumpadDecimal = 107, - NumpadDivide = 108, + IntlBackslash = 97, + Numpad0 = 98, + Numpad1 = 99, + Numpad2 = 100, + Numpad3 = 101, + Numpad4 = 102, + Numpad5 = 103, + Numpad6 = 104, + Numpad7 = 105, + Numpad8 = 106, + Numpad9 = 107, + NumpadMultiply = 108, + NumpadAdd = 109, + NUMPAD_SEPARATOR = 110, + NumpadSubtract = 111, + NumpadDecimal = 112, + NumpadDivide = 113, /** * Cover all key codes when IME is processing input. */ - KEY_IN_COMPOSITION = 109, - ABNT_C1 = 110, - ABNT_C2 = 111, - AudioVolumeMute = 112, - AudioVolumeUp = 113, - AudioVolumeDown = 114, - BrowserSearch = 115, - BrowserHome = 116, - BrowserBack = 117, - BrowserForward = 118, - MediaTrackNext = 119, - MediaTrackPrevious = 120, - MediaStop = 121, - MediaPlayPause = 122, - LaunchMediaPlayer = 123, - LaunchMail = 124, - LaunchApp2 = 125, + KEY_IN_COMPOSITION = 114, + ABNT_C1 = 115, + ABNT_C2 = 116, + AudioVolumeMute = 117, + AudioVolumeUp = 118, + AudioVolumeDown = 119, + BrowserSearch = 120, + BrowserHome = 121, + BrowserBack = 122, + BrowserForward = 123, + MediaTrackNext = 124, + MediaTrackPrevious = 125, + MediaStop = 126, + MediaPlayPause = 127, + LaunchMediaPlayer = 128, + LaunchMail = 129, + LaunchApp2 = 130, /** * VK_CLEAR, 0x0C, CLEAR key */ - Clear = 126, + Clear = 131, /** * Placed last to cover the length of the enum. * Please do not depend on this value! */ - MAX_VALUE = 127 + MAX_VALUE = 132 } export class KeyMod { static readonly CtrlCmd: number; @@ -3836,6 +3841,10 @@ declare namespace monaco.editor { * Diff Algorithm */ diffAlgorithm?: 'legacy' | 'advanced' | IDocumentDiffProvider; + /** + * Whether the diff editor aria label should be verbose. + */ + accessibilityVerbose?: boolean; } /** @@ -4501,10 +4510,6 @@ declare namespace monaco.editor { * Enable graceful matching. Defaults to true. */ filterGraceful?: boolean; - /** - * Prevent quick suggestions when a snippet is active. Defaults to true. - */ - snippetsPreventQuickSuggestions?: boolean; /** * Favors words that appear close to the cursor. */ @@ -5036,6 +5041,15 @@ declare namespace monaco.editor { * If the `afterColumn` has multiple view columns, the affinity specifies which one to use. Defaults to `none`. */ afterColumnAffinity?: PositionAffinity; + /** + * Render the zone even when its line is hidden. + */ + showInHiddenAreas?: boolean; + /** + * Tiebreaker that is used when multiple view zones want to be after the same line. + * Defaults to `afterColumn` otherwise 10000; + */ + ordinal?: number; /** * Suppress mouse down events. * If set, the editor will attach a mouse down listener to the view zone and .preventDefault on it. diff --git a/src/vs/platform/audioCues/browser/audioCueService.ts b/src/vs/platform/audioCues/browser/audioCueService.ts index 0aa362fd186b14..90a707db13aa10 100644 --- a/src/vs/platform/audioCues/browser/audioCueService.ts +++ b/src/vs/platform/audioCues/browser/audioCueService.ts @@ -74,6 +74,7 @@ export class AudioCueService extends Disposable implements IAudioCueService { const sound = this.sounds.get(url); if (sound) { sound.volume = this.getVolumeInPercent() / 100; + sound.currentTime = 0; await sound.play(); } else { const playedSound = await playAudio(url, this.getVolumeInPercent() / 100); diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts index fc64cd303ba107..a461dfe4fe720f 100644 --- a/src/vs/platform/contextkey/common/contextkey.ts +++ b/src/vs/platform/contextkey/common/contextkey.ts @@ -1524,7 +1524,7 @@ export class ContextKeyNotRegexExpr implements IContextKeyExpression { } public serialize(): string { - throw new Error('Method not implemented.'); + return `!(${this._actual.serialize()})`; } public keys(): string[] { diff --git a/src/vs/platform/issue/common/issue.ts b/src/vs/platform/issue/common/issue.ts index bb2dfd04791804..edc7d5b07f6336 100644 --- a/src/vs/platform/issue/common/issue.ts +++ b/src/vs/platform/issue/common/issue.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { CancellationToken } from 'vs/base/common/cancellation'; import { URI } from 'vs/base/common/uri'; import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes'; import { PerformanceInfo, SystemInfo } from 'vs/platform/diagnostics/common/diagnostics'; @@ -124,11 +123,11 @@ export interface IIssueMainService { // Used by the issue reporter - getSystemInfo(): Promise; - getPerformanceInfo(): Promise; - reloadWithExtensionsDisabled(): Promise; - showConfirmCloseDialog(): Promise; - showClipboardDialog(): Promise; - getIssueReporterUri(extensionId: string, token: CancellationToken): Promise; - closeReporter(): Promise; + $getSystemInfo(): Promise; + $getPerformanceInfo(): Promise; + $reloadWithExtensionsDisabled(): Promise; + $showConfirmCloseDialog(): Promise; + $showClipboardDialog(): Promise; + $getIssueReporterUri(extensionId: string): Promise; + $closeReporter(): Promise; } diff --git a/src/vs/platform/issue/electron-main/issueMainService.ts b/src/vs/platform/issue/electron-main/issueMainService.ts index 658d50b33be56d..92e294c03f6bee 100644 --- a/src/vs/platform/issue/electron-main/issueMainService.ts +++ b/src/vs/platform/issue/electron-main/issueMainService.ts @@ -27,7 +27,7 @@ import { randomPath } from 'vs/base/common/extpath'; import { withNullAsUndefined } from 'vs/base/common/types'; import { IStateService } from 'vs/platform/state/node/state'; import { UtilityProcess } from 'vs/platform/utilityProcess/electron-main/utilityProcess'; -import { CancellationToken } from 'vs/base/common/cancellation'; +import { CancellationTokenSource } from 'vs/base/common/cancellation'; import { URI } from 'vs/base/common/uri'; import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows'; import { Promises, timeout } from 'vs/base/common/async'; @@ -302,13 +302,13 @@ export class IssueMainService implements IIssueMainService { //#region used by issue reporter window - async getSystemInfo(): Promise { + async $getSystemInfo(): Promise { const [info, remoteData] = await Promise.all([this.diagnosticsMainService.getMainDiagnostics(), this.diagnosticsMainService.getRemoteDiagnostics({ includeProcesses: false, includeWorkspaceMetadata: false })]); const msg = await this.diagnosticsService.getSystemInfo(info, remoteData); return msg; } - async getPerformanceInfo(): Promise { + async $getPerformanceInfo(): Promise { try { const [info, remoteData] = await Promise.all([this.diagnosticsMainService.getMainDiagnostics(), this.diagnosticsMainService.getRemoteDiagnostics({ includeProcesses: true, includeWorkspaceMetadata: true })]); return await this.diagnosticsService.getPerformanceInfo(info, remoteData); @@ -319,7 +319,7 @@ export class IssueMainService implements IIssueMainService { } } - async reloadWithExtensionsDisabled(): Promise { + async $reloadWithExtensionsDisabled(): Promise { if (this.issueReporterParentWindow) { try { await this.nativeHostMainService.reload(this.issueReporterParentWindow.id, { disableExtensions: true }); @@ -329,7 +329,7 @@ export class IssueMainService implements IIssueMainService { } } - async showConfirmCloseDialog(): Promise { + async $showConfirmCloseDialog(): Promise { if (this.issueReporterWindow) { const { response } = await this.dialogMainService.showMessageBox({ type: 'warning', @@ -349,7 +349,7 @@ export class IssueMainService implements IIssueMainService { } } - async showClipboardDialog(): Promise { + async $showClipboardDialog(): Promise { if (this.issueReporterWindow) { const { response } = await this.dialogMainService.showMessageBox({ type: 'warning', @@ -366,7 +366,7 @@ export class IssueMainService implements IIssueMainService { return false; } - async getIssueReporterUri(extensionId: string, token: CancellationToken): Promise { + async $getIssueReporterUri(extensionId: string): Promise { if (!this.issueReporterParentWindow) { throw new Error('Issue reporter window not available'); } @@ -376,14 +376,17 @@ export class IssueMainService implements IIssueMainService { } const replyChannel = `vscode:triggerIssueUriRequestHandlerResponse${window.id}`; return Promises.withAsyncBody(async (resolve, reject) => { - window.sendWhenReady('vscode:triggerIssueUriRequestHandler', token, { replyChannel, extensionId }); + + const cts = new CancellationTokenSource(); + window.sendWhenReady('vscode:triggerIssueUriRequestHandler', cts.token, { replyChannel, extensionId }); validatedIpcMain.once(replyChannel, (_: unknown, data: string) => { resolve(URI.parse(data)); }); try { - await timeout(5000, token); + await timeout(5000); + cts.cancel(); reject(new Error('Timed out waiting for issue reporter URI')); } finally { validatedIpcMain.removeHandler(replyChannel); @@ -391,7 +394,7 @@ export class IssueMainService implements IIssueMainService { }); } - async closeReporter(): Promise { + async $closeReporter(): Promise { this.issueReporterWindow?.close(); } diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts index f761e2100aa579..51a55e1b8403d0 100644 --- a/src/vs/platform/product/common/product.ts +++ b/src/vs/platform/product/common/product.ts @@ -58,7 +58,7 @@ else { // Running out of sources if (Object.keys(product).length === 0) { Object.assign(product, { - version: '1.72.0-dev', + version: '1.78.0-dev', nameShort: 'Code - OSS Dev', nameLong: 'Code - OSS Dev', applicationName: 'code-oss', diff --git a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts index b3bb617994f277..d99ddc63b79ba1 100644 --- a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts +++ b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts @@ -6,6 +6,7 @@ import { timeout } from 'vs/base/common/async'; import { debounce } from 'vs/base/common/decorators'; import { Emitter } from 'vs/base/common/event'; +import { isWindows } from 'vs/base/common/platform'; import { ILogService } from 'vs/platform/log/common/log'; import { ICommandDetectionCapability, TerminalCapability, ITerminalCommand, IHandleCommandOptions, ICommandInvalidationRequest, CommandInvalidationReason, ISerializedCommand, ISerializedCommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/capabilities'; import { ITerminalOutputMatch, ITerminalOutputMatcher } from 'vs/platform/terminal/common/terminal'; @@ -491,7 +492,7 @@ export class CommandDetectionCapability implements ICommandDetectionCapability { commandStartLineContent: this._currentCommand.commandStartLineContent, hasOutput: () => !executedMarker?.isDisposed && !endMarker?.isDisposed && !!(executedMarker && endMarker && executedMarker?.line < endMarker!.line), getOutput: () => getOutputForCommand(executedMarker, endMarker, buffer), - getOutputMatch: (outputMatcher: ITerminalOutputMatcher) => getOutputMatchForCommand(executedMarker, endMarker, buffer, this._terminal.cols, outputMatcher), + getOutputMatch: (outputMatcher: ITerminalOutputMatcher) => getOutputMatchForCommand(isWindows ? this._currentCommand.commandStartMarker : executedMarker, endMarker, buffer, this._terminal.cols, outputMatcher), markProperties: options?.markProperties }; this._commands.push(newCommand); @@ -617,7 +618,7 @@ export class CommandDetectionCapability implements ICommandDetectionCapability { exitCode: e.exitCode, hasOutput: () => !executedMarker?.isDisposed && !endMarker?.isDisposed && !!(executedMarker && endMarker && executedMarker.line < endMarker.line), getOutput: () => getOutputForCommand(executedMarker, endMarker, buffer), - getOutputMatch: (outputMatcher: ITerminalOutputMatcher) => getOutputMatchForCommand(executedMarker, endMarker, buffer, this._terminal.cols, outputMatcher), + getOutputMatch: (outputMatcher: ITerminalOutputMatcher) => getOutputMatchForCommand(isWindows ? marker : executedMarker, endMarker, buffer, this._terminal.cols, outputMatcher), markProperties: e.markProperties, wasReplayed: true }; @@ -659,7 +660,6 @@ function getOutputMatchForCommand(executedMarker: IMarker | undefined, endMarker return undefined; } const startLine = Math.max(executedMarker.line, 0); - const matcher = outputMatcher.lineMatcher; const linesToCheck = typeof matcher === 'string' ? 1 : outputMatcher.length || countNewLines(matcher); const lines: string[] = []; diff --git a/src/vs/workbench/api/common/extHostConfiguration.ts b/src/vs/workbench/api/common/extHostConfiguration.ts index 68f363f19f0ac3..f3d7d2eb044c96 100644 --- a/src/vs/workbench/api/common/extHostConfiguration.ts +++ b/src/vs/workbench/api/common/extHostConfiguration.ts @@ -191,13 +191,13 @@ export class ExtHostConfigProvider { } else { let clonedConfig: any | undefined = undefined; const cloneOnWriteProxy = (target: any, accessor: string): any => { - let clonedTarget: any | undefined = undefined; - const cloneTarget = () => { - clonedConfig = clonedConfig ? clonedConfig : deepClone(config); - clonedTarget = clonedTarget ? clonedTarget : lookUp(clonedConfig, accessor); - }; - return isObject(target) ? - new Proxy(target, { + if (isObject(target)) { + let clonedTarget: any | undefined = undefined; + const cloneTarget = () => { + clonedConfig = clonedConfig ? clonedConfig : deepClone(config); + clonedTarget = clonedTarget ? clonedTarget : lookUp(clonedConfig, accessor); + }; + return new Proxy(target, { get: (target: any, property: PropertyKey) => { if (typeof property === 'string' && property.toLowerCase() === 'tojson') { cloneTarget(); @@ -234,7 +234,12 @@ export class ExtHostConfigProvider { } return true; } - }) : target; + }); + } + if (Array.isArray(target)) { + return deepClone(target); + } + return target; }; result = cloneOnWriteProxy(result, key); } diff --git a/src/vs/workbench/api/node/extHostDiskFileSystemProvider.ts b/src/vs/workbench/api/node/extHostDiskFileSystemProvider.ts new file mode 100644 index 00000000000000..23faa68ae2a1c9 --- /dev/null +++ b/src/vs/workbench/api/node/extHostDiskFileSystemProvider.ts @@ -0,0 +1,110 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as vscode from 'vscode'; +import { IExtHostConsumerFileSystem } from 'vs/workbench/api/common/extHostFileSystemConsumer'; +import { Schemas } from 'vs/base/common/network'; +import { ILogService } from 'vs/platform/log/common/log'; +import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider'; +import { FileSystemProviderError } from 'vs/platform/files/common/files'; +import { FileSystemError } from 'vs/workbench/api/common/extHostTypes'; + +export class ExtHostDiskFileSystemProvider { + + constructor( + @IExtHostConsumerFileSystem extHostConsumerFileSystem: IExtHostConsumerFileSystem, + @ILogService logService: ILogService + ) { + + // Register disk file system provider so that certain + // file operations can execute fast within the extension + // host without roundtripping. + extHostConsumerFileSystem.addFileSystemProvider(Schemas.file, new DiskFileSystemProviderAdapter(logService)); + } +} + +class DiskFileSystemProviderAdapter implements vscode.FileSystemProvider { + + private readonly impl = new DiskFileSystemProvider(this.logService); + + constructor(private readonly logService: ILogService) { } + + async stat(uri: vscode.Uri): Promise { + try { + return await this.impl.stat(uri); + } catch (error) { + this.handleError(error); + } + } + + async readDirectory(uri: vscode.Uri): Promise<[string, vscode.FileType][]> { + try { + return await this.impl.readdir(uri); + } catch (error) { + this.handleError(error); + } + } + + async createDirectory(uri: vscode.Uri): Promise { + try { + return await this.impl.mkdir(uri); + } catch (error) { + this.handleError(error); + } + } + + async readFile(uri: vscode.Uri): Promise { + try { + return await this.impl.readFile(uri); + } catch (error) { + this.handleError(error); + } + } + + async writeFile(uri: vscode.Uri, content: Uint8Array, options: { readonly create: boolean; readonly overwrite: boolean }): Promise { + try { + return await this.impl.writeFile(uri, content, { ...options, unlock: false }); + } catch (error) { + this.handleError(error); + } + } + + async delete(uri: vscode.Uri, options: { readonly recursive: boolean }): Promise { + try { + return await this.impl.delete(uri, { ...options, useTrash: false }); + } catch (error) { + this.handleError(error); + } + } + + async rename(oldUri: vscode.Uri, newUri: vscode.Uri, options: { readonly overwrite: boolean }): Promise { + try { + return await this.impl.rename(oldUri, newUri, options); + } catch (error) { + this.handleError(error); + } + } + + async copy(source: vscode.Uri, destination: vscode.Uri, options: { readonly overwrite: boolean }): Promise { + try { + return await this.impl.copy(source, destination, options); + } catch (error) { + this.handleError(error); + } + } + + private handleError(error: unknown): never { + if (error instanceof FileSystemProviderError) { + throw new FileSystemError(error.message, error.code); + } + + throw error; + } + + // --- Not Implemented --- + + get onDidChangeFile(): never { throw new Error('Method not implemented.'); } + watch(uri: vscode.Uri, options: { readonly recursive: boolean; readonly excludes: readonly string[] }): vscode.Disposable { throw new Error('Method not implemented.'); } +} diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts index 06f91272771e89..5ac0ddc7ec954b 100644 --- a/src/vs/workbench/api/node/extHostExtensionService.ts +++ b/src/vs/workbench/api/node/extHostExtensionService.ts @@ -17,6 +17,7 @@ import { ExtensionRuntime } from 'vs/workbench/api/common/extHostTypes'; import { CLIServer } from 'vs/workbench/api/node/extHostCLIServer'; import { realpathSync } from 'vs/base/node/extpath'; import { ExtHostConsoleForwarder } from 'vs/workbench/api/node/extHostConsoleForwarder'; +import { ExtHostDiskFileSystemProvider } from 'vs/workbench/api/node/extHostDiskFileSystemProvider'; class NodeModuleRequireInterceptor extends RequireInterceptor { @@ -74,6 +75,9 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService { process.env['VSCODE_IPC_HOOK_CLI'] = cliServer.ipcHandlePath; } + // Register local file system shortcut + this._instaService.createInstance(ExtHostDiskFileSystemProvider); + // Module loading tricks const interceptor = this._instaService.createInstance(NodeModuleRequireInterceptor, extensionApiFactory, { mine: this._myRegistry, all: this._globalRegistry }); await interceptor.install(); diff --git a/src/vs/workbench/api/test/browser/extHostConfiguration.test.ts b/src/vs/workbench/api/test/browser/extHostConfiguration.test.ts index a6dfdf8ccff890..8ba10f3b7fed77 100644 --- a/src/vs/workbench/api/test/browser/extHostConfiguration.test.ts +++ b/src/vs/workbench/api/test/browser/extHostConfiguration.test.ts @@ -771,6 +771,16 @@ suite('ExtHostConfiguration', function () { testObject.$acceptConfigurationChanged(newConfigData, configEventData); }); + test('get return instance of array value', function () { + const testObject = createExtHostConfiguration({ 'far': { 'boo': [] } }); + + const value: string[] = testObject.getConfiguration().get('far.boo', []); + value.push('a'); + + const actual = testObject.getConfiguration().get('far.boo', []); + assert.deepStrictEqual(actual, []); + }); + function aWorkspaceFolder(uri: URI, index: number, name: string = ''): IWorkspaceFolder { return new WorkspaceFolder({ uri, name, index }); } diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts index 5583dfd890f401..aedd503099350b 100644 --- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts @@ -36,6 +36,7 @@ import { Dimension, multibyteAwareBtoa } from 'vs/base/browser/dom'; import { ByteSize, FileOperationError, FileOperationResult, IFileService, TooLargeFileOperationError } from 'vs/platform/files/common/files'; import { IBoundarySashes } from 'vs/base/browser/ui/sash/sash'; import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences'; +import { StopWatch } from 'vs/base/common/stopwatch'; /** * The text editor that leverages the diff text editor for the editing experience. @@ -49,6 +50,8 @@ export class TextDiffEditor extends AbstractTextEditor imp private diffNavigator: DiffNavigator | undefined; private readonly diffNavigatorDisposables = this._register(new DisposableStore()); + private inputLifecycleStopWatch: StopWatch | undefined = undefined; + override get scopedContextKeyService(): IContextKeyService | undefined { if (!this.diffEditorControl) { return undefined; @@ -96,7 +99,8 @@ export class TextDiffEditor extends AbstractTextEditor imp override async setInput(input: DiffEditorInput, options: ITextEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise { - // Dispose previous diff navigator + // Cleanup previous things associated with the input + this.inputLifecycleStopWatch = undefined; this.diffNavigatorDisposables.clear(); // Set input and resolve @@ -149,6 +153,9 @@ export class TextDiffEditor extends AbstractTextEditor imp readOnly: resolvedDiffEditorModel.modifiedModel?.isReadonly(), originalEditable: !resolvedDiffEditorModel.originalModel?.isReadonly() }); + + // Start to measure input lifecycle + this.inputLifecycleStopWatch = new StopWatch(false); } catch (error) { await this.handleSetInputError(error, input, options); } @@ -299,6 +306,13 @@ export class TextDiffEditor extends AbstractTextEditor imp override clearInput(): void { super.clearInput(); + // Log input lifecycle telemetry + const inputLifecycleElapsed = this.inputLifecycleStopWatch?.elapsed(); + this.inputLifecycleStopWatch = undefined; + if (typeof inputLifecycleElapsed === 'number') { + this.logInputLifecycleTelemetry(inputLifecycleElapsed, this.getControl()?.getModel()?.modified?.getLanguageId()); + } + // Dispose previous diff navigator this.diffNavigatorDisposables.clear(); @@ -306,6 +320,21 @@ export class TextDiffEditor extends AbstractTextEditor imp this.diffEditorControl?.setModel(null); } + private logInputLifecycleTelemetry(duration: number, languageId: string | undefined): void { + this.telemetryService.publicLog2<{ + editorVisibleTimeMs: number; + languageId: string; + }, { + owner: 'hediet'; + editorVisibleTimeMs: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Indicates the time the diff editor was visible to the user' }; + languageId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Indicates for which language the diff editor was shown' }; + comment: 'This event gives insight about how long the diff editor was visible to the user.'; + }>('diffEditor.editorVisibleTime', { + editorVisibleTimeMs: duration, + languageId: languageId ?? '', + }); + } + getDiffNavigator(): DiffNavigator | undefined { return this.diffNavigator; } diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css b/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css index 434929c14b843c..b4ac21708ba878 100644 --- a/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css +++ b/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css @@ -57,13 +57,13 @@ /* Icons */ .monaco-workbench > .notifications-center .codicon.codicon-error { - color: var(--vscode-notificationsErrorIcon-foreground); + color: var(--vscode-notificationsErrorIcon-foreground) !important; } .monaco-workbench > .notifications-center .codicon.codicon-warning { - color: var(--vscode-notificationsWarningIcon-foreground); + color: var(--vscode-notificationsWarningIcon-foreground) !important; } .monaco-workbench > .notifications-center .codicon.codicon-info { - color: var(--vscode-notificationsInfoIcon-foreground); + color: var(--vscode-notificationsInfoIcon-foreground) !important; } diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.ts b/src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.ts new file mode 100644 index 00000000000000..0338c18d5183ed --- /dev/null +++ b/src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.ts @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { registerAccessibilityConfiguration } from 'vs/workbench/contrib/accessibility/browser/accessibilityContribution'; + +registerAccessibilityConfiguration(); diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibilityContribution.ts b/src/vs/workbench/contrib/accessibility/browser/accessibilityContribution.ts new file mode 100644 index 00000000000000..6f63998ec5c987 --- /dev/null +++ b/src/vs/workbench/contrib/accessibility/browser/accessibilityContribution.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 { localize } from 'vs/nls'; +import { Extensions, IConfigurationNode, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry'; +import { Registry } from 'vs/platform/registry/common/platform'; + +const configuration: IConfigurationNode = { + id: 'accessibility', + title: localize('accessibilityConfigurationTitle', "Accessibility"), + type: 'object', + properties: { + 'accessibility.verbosity.terminal': { + description: localize('verbosity.terminal.description', 'Provide information about how to access the terminal accessibility help menu when the terminal is focused'), + type: 'boolean', + default: true, + tags: ['accessibility'] + }, + 'accessibility.verbosity.diff-editor': { + description: localize('verbosity.diff-editor.description', 'Provide information about how to navigate changes in the diff editor when it is focused'), + type: 'boolean', + default: true, + tags: ['accessibility'] + } + } +}; + +export function registerAccessibilityConfiguration() { + const configurationRegistry = Registry.as(Extensions.Configuration); + configurationRegistry.registerConfiguration(configuration); +} diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts index 49ef23f954bd46..ff8fbd105f64ee 100644 --- a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts +++ b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts @@ -34,7 +34,7 @@ export const COMMENTEDITOR_DECORATION_KEY = 'commenteditordecoration'; export class CommentThreadWidget extends Disposable implements ICommentThreadWidget { private _header!: CommentThreadHeader; - private _body!: CommentThreadBody; + private _body: CommentThreadBody; private _commentReply?: CommentReply; private _additionalActions?: CommentThreadAdditionalActions; private _commentMenus: CommentMenus; @@ -274,7 +274,7 @@ export class CommentThreadWidget extends } getDimensions() { - return this._body?.getDimensions(); + return this._body.getDimensions(); } layout(widthInPixel?: number) { diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts index 26c40b0438568e..3de6392331c0c2 100644 --- a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts +++ b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts @@ -416,8 +416,12 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget this._commentThreadWidget.submitComment(); } - _refresh(dimensions?: dom.Dimension) { - if (this._isExpanded && dimensions) { + _refresh(dimensions: dom.Dimension) { + if (dimensions.height === 0 && dimensions.width === 0) { + this.commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Collapsed; + return; + } + if (this._isExpanded) { this._commentThreadWidget.layout(); const headHeight = Math.ceil(this.editor.getOption(EditorOption.lineHeight) * 1.2); diff --git a/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts index 33dbb1b2c4dad8..58aa738509680b 100644 --- a/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts +++ b/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts @@ -258,7 +258,14 @@ export class BreakpointEditorContribution implements IBreakpointEditorContributi } const model = this.editor.getModel(); - if (!e.target.position || !model || e.target.type !== MouseTargetType.GUTTER_GLYPH_MARGIN || e.target.detail.isAfterLines || !this.marginFreeFromNonDebugDecorations(e.target.position.lineNumber)) { + if (!e.target.position + || !model + || e.target.type !== MouseTargetType.GUTTER_GLYPH_MARGIN + || e.target.detail.isAfterLines + || !this.marginFreeFromNonDebugDecorations(e.target.position.lineNumber) + // don't return early if there's a breakpoint + && !e.target.element?.className.includes('breakpoint') + ) { return; } const canSetBreakpoints = this.debugService.canSetBreakpointsIn(model); @@ -468,7 +475,7 @@ export class BreakpointEditorContribution implements IBreakpointEditorContributi if (decorations) { for (const { options } of decorations) { const clz = options.glyphMarginClassName; - if (clz && (!clz.includes('codicon-') || clz.includes('codicon-testing-') || clz.includes('codicon-merge-') || clz.includes('codicon-arrow-'))) { + if (clz && (!clz.includes('codicon-') || clz.includes('codicon-testing-') || clz.includes('codicon-merge-') || clz.includes('codicon-arrow-') || clz.includes('codicon-loading'))) { return false; } } diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts index ca2ee9d49e4360..fbf7362e401d3d 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts @@ -327,6 +327,7 @@ CommandsRegistry.registerCommand({ }, handler: async (accessor, arg: string | UriComponents, options?: { installOnlyNewlyAddedFromExtensionPackVSIX?: boolean; installPreReleaseVersion?: boolean; donotSync?: boolean; context?: IStringDictionary }) => { const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService); + const extensionManagementService = accessor.get(IWorkbenchExtensionManagementService); try { if (typeof arg === 'string') { const [id, version] = getIdAndVersion(arg); @@ -338,6 +339,10 @@ CommandsRegistry.registerCommand({ installGivenVersion: !!version, context: options?.context }; + if (extension.gallery && extension.enablementState === EnablementState.DisabledByExtensionKind) { + await extensionManagementService.installFromGallery(extension.gallery, installOptions); + return; + } if (version) { await extensionsWorkbenchService.installVersion(extension, version, installOptions); } else { diff --git a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditor.contribution.ts b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditor.contribution.ts index 3845be69323eb5..65ab966e2e4802 100644 --- a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditor.contribution.ts +++ b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditor.contribution.ts @@ -24,6 +24,9 @@ registerAction2(interactiveEditorActions.ArrowOutDownAction); registerAction2(interactiveEditorActions.FocusInteractiveEditor); registerAction2(interactiveEditorActions.PreviousFromHistory); registerAction2(interactiveEditorActions.NextFromHistory); +registerAction2(interactiveEditorActions.ViewInChatAction); +registerAction2(interactiveEditorActions.ExpandMessageAction); +registerAction2(interactiveEditorActions.ContractMessageAction); registerAction2(interactiveEditorActions.UndoToClipboard); registerAction2(interactiveEditorActions.UndoToNewFile); diff --git a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditor.css b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditor.css index 02c45baa93de00..f4ec158ea48b81 100644 --- a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditor.css +++ b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditor.css @@ -100,36 +100,40 @@ display: none; } -.monaco-editor .interactive-editor .status .link { - color: var(--vscode-textLink-foreground); - cursor: pointer; - font-size: 12px; - white-space: nowrap; - /* margin-top: auto; */ -} - .monaco-editor .interactive-editor .status .label { overflow: hidden; - font-size: 12px; + padding-left: 10px; margin-left: auto; } -.monaco-editor .interactive-editor .status .label.message>span>p { - margin: 0px; +.monaco-editor .interactive-editor .status .label.hidden { + display: none; +} + +.monaco-editor .interactive-editor .markdownMessage { + padding-top: 10px; +} + +.monaco-editor .interactive-editor .markdownMessage.hidden { + display: none; +} + +.monaco-editor .interactive-editor .markdownMessage .message * { + margin: unset; +} + +.monaco-editor .interactive-editor .markdownMessage .message { + margin-left: 5px; -webkit-line-clamp: 3; -webkit-box-orient: vertical; overflow: hidden; display: -webkit-box; + -webkit-user-select: text; + user-select: text; } -.monaco-editor .interactive-editor .status .link .status-link { - padding-left: 10px; -} - -.monaco-editor .interactive-editor .status .link .status-link .codicon { - line-height: unset; - font-size: 12px; - padding-right: 4px; +.monaco-editor .interactive-editor .markdownMessage .messageActions { + direction: rtl; } .monaco-editor .interactive-editor .status .label A { diff --git a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorActions.ts b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorActions.ts index 31b7e907edfc02..88c6d103c6ca19 100644 --- a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorActions.ts +++ b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorActions.ts @@ -10,7 +10,7 @@ import { EditorAction2 } from 'vs/editor/browser/editorExtensions'; import { EmbeddedCodeEditorWidget, EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { InteractiveEditorController, InteractiveEditorRunOptions, Recording } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorController'; -import { CTX_INTERACTIVE_EDITOR_FOCUSED, CTX_INTERACTIVE_EDITOR_HAS_ACTIVE_REQUEST, CTX_INTERACTIVE_EDITOR_HAS_PROVIDER, CTX_INTERACTIVE_EDITOR_INNER_CURSOR_FIRST, CTX_INTERACTIVE_EDITOR_INNER_CURSOR_LAST, CTX_INTERACTIVE_EDITOR_EMPTY, CTX_INTERACTIVE_EDITOR_OUTER_CURSOR_POSITION, CTX_INTERACTIVE_EDITOR_VISIBLE, MENU_INTERACTIVE_EDITOR_WIDGET, CTX_INTERACTIVE_EDITOR_LAST_EDIT_TYPE, MENU_INTERACTIVE_EDITOR_WIDGET_UNDO, MENU_INTERACTIVE_EDITOR_WIDGET_STATUS, CTX_INTERACTIVE_EDITOR_LAST_FEEDBACK, CTX_INTERACTIVE_EDITOR_INLNE_DIFF, CTX_INTERACTIVE_EDITOR_EDIT_MODE, EditMode, CTX_INTERACTIVE_EDITOR_LAST_RESPONSE_TYPE } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor'; +import { CTX_INTERACTIVE_EDITOR_FOCUSED, CTX_INTERACTIVE_EDITOR_HAS_ACTIVE_REQUEST, CTX_INTERACTIVE_EDITOR_HAS_PROVIDER, CTX_INTERACTIVE_EDITOR_INNER_CURSOR_FIRST, CTX_INTERACTIVE_EDITOR_INNER_CURSOR_LAST, CTX_INTERACTIVE_EDITOR_EMPTY, CTX_INTERACTIVE_EDITOR_OUTER_CURSOR_POSITION, CTX_INTERACTIVE_EDITOR_VISIBLE, MENU_INTERACTIVE_EDITOR_WIDGET, CTX_INTERACTIVE_EDITOR_LAST_EDIT_TYPE, MENU_INTERACTIVE_EDITOR_WIDGET_UNDO, MENU_INTERACTIVE_EDITOR_WIDGET_STATUS, CTX_INTERACTIVE_EDITOR_LAST_FEEDBACK, CTX_INTERACTIVE_EDITOR_INLNE_DIFF, CTX_INTERACTIVE_EDITOR_EDIT_MODE, EditMode, CTX_INTERACTIVE_EDITOR_LAST_RESPONSE_TYPE, MENU_INTERACTIVE_EDITOR_WIDGET_MARKDOWN_MESSAGE, CTX_INTERACTIVE_EDITOR_MESSAGE_CROP_STATE } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor'; import { localize } from 'vs/nls'; import { IAction2Options } from 'vs/platform/actions/common/actions'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; @@ -23,6 +23,7 @@ import { IUntitledTextResourceEditorInput } from 'vs/workbench/common/editor'; import { ILogService } from 'vs/platform/log/common/log'; import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { Range } from 'vs/editor/common/core/range'; +import { fromNow } from 'vs/base/common/date'; export class StartSessionAction extends EditorAction2 { @@ -314,10 +315,10 @@ export class UndoCommand extends AbstractInteractiveEditorAction { title: localize('undo', 'Undo'), icon: Codicon.commentDiscussion, precondition: ContextKeyExpr.and(CTX_INTERACTIVE_EDITOR_VISIBLE, CTX_INTERACTIVE_EDITOR_LAST_EDIT_TYPE.isEqualTo('simple')), - keybinding: { - weight: KeybindingWeight.EditorContrib + 10, - primary: KeyMod.CtrlCmd | KeyCode.KeyZ, - }, + // keybinding: { + // weight: KeybindingWeight.EditorContrib + 10, + // primary: KeyMod.CtrlCmd | KeyCode.KeyZ, + // }, menu: { when: CTX_INTERACTIVE_EDITOR_LAST_EDIT_TYPE.isEqualTo('simple'), id: MENU_INTERACTIVE_EDITOR_WIDGET_UNDO, @@ -413,7 +414,6 @@ export class ApplyPreviewEdits extends AbstractInteractiveEditorAction { }, menu: { id: MENU_INTERACTIVE_EDITOR_WIDGET_STATUS, - when: CTX_INTERACTIVE_EDITOR_LAST_RESPONSE_TYPE.notEqualsTo('message'), group: '0_main', order: 0 } @@ -449,7 +449,6 @@ export class CancelSessionAction extends AbstractInteractiveEditorAction { }, menu: { id: MENU_INTERACTIVE_EDITOR_WIDGET_STATUS, - when: CTX_INTERACTIVE_EDITOR_LAST_RESPONSE_TYPE.notEqualsTo('message'), group: '0_main', order: 1 } @@ -478,26 +477,82 @@ export class CopyRecordings extends AbstractInteractiveEditorAction { const clipboardService = accessor.get(IClipboardService); const quickPickService = accessor.get(IQuickInputService); - const picks: (IQuickPickItem & { rec: Recording })[] = ctrl.recordings().map(rec => { + const recordings = ctrl.recordings().filter(r => r.exchanges.length > 0); + if (recordings.length === 0) { + return; + } + + const picks: (IQuickPickItem & { rec: Recording })[] = recordings.map(rec => { return { rec, - label: localize('label', "{0} messages, started {1}", rec.exchanges.length, rec.when.toLocaleTimeString()), - tooltip: rec.exchanges.map(ex => ex.req.prompt).join('\n'), + label: localize('label', "'{0}' and {1} follow ups ({2})", rec.exchanges[0].prompt, rec.exchanges.length - 1, fromNow(rec.when, true)), + tooltip: rec.exchanges.map(ex => ex.prompt).join('\n'), }; }); - if (picks.length === 0) { - return; - } - - let pick: typeof picks[number] | undefined; - if (picks.length === 1) { - pick = picks[0]; - } else { - pick = await quickPickService.pick(picks, { canPickMany: false }); - } + const pick = await quickPickService.pick(picks, { canPickMany: false }); if (pick) { clipboardService.writeText(JSON.stringify(pick.rec, undefined, 2)); } } } + +export class ViewInChatAction extends AbstractInteractiveEditorAction { + constructor() { + super({ + id: 'interactiveEditor.viewInChat', + title: localize('viewInChat', 'View in Chat'), + icon: Codicon.commentDiscussion, + precondition: CTX_INTERACTIVE_EDITOR_VISIBLE, + menu: { + id: MENU_INTERACTIVE_EDITOR_WIDGET_MARKDOWN_MESSAGE, + when: CTX_INTERACTIVE_EDITOR_LAST_RESPONSE_TYPE.isEqualTo('message'), + group: '1_viewInChat', + order: 1 + } + }); + } + override runInteractiveEditorCommand(_accessor: ServicesAccessor, ctrl: InteractiveEditorController, _editor: ICodeEditor, ..._args: any[]): void { + ctrl.viewInChat(); + } +} + +export class ExpandMessageAction extends AbstractInteractiveEditorAction { + constructor() { + super({ + id: 'interactiveEditor.expandMessageAction', + title: localize('expandMessage', 'Expand Message'), + icon: Codicon.chevronDown, + precondition: CTX_INTERACTIVE_EDITOR_VISIBLE, + menu: { + id: MENU_INTERACTIVE_EDITOR_WIDGET_MARKDOWN_MESSAGE, + when: ContextKeyExpr.and(CTX_INTERACTIVE_EDITOR_LAST_RESPONSE_TYPE.isEqualTo('message'), CTX_INTERACTIVE_EDITOR_MESSAGE_CROP_STATE.isEqualTo('cropped')), + group: '2_expandOrContract', + order: 1 + } + }); + } + override runInteractiveEditorCommand(_accessor: ServicesAccessor, ctrl: InteractiveEditorController, _editor: ICodeEditor, ..._args: any[]): void { + ctrl.updateExpansionState(true); + } +} + +export class ContractMessageAction extends AbstractInteractiveEditorAction { + constructor() { + super({ + id: 'interactiveEditor.contractMessageAction', + title: localize('contractMessage', 'Contract Message'), + icon: Codicon.chevronUp, + precondition: CTX_INTERACTIVE_EDITOR_VISIBLE, + menu: { + id: MENU_INTERACTIVE_EDITOR_WIDGET_MARKDOWN_MESSAGE, + when: ContextKeyExpr.and(CTX_INTERACTIVE_EDITOR_LAST_RESPONSE_TYPE.isEqualTo('message'), CTX_INTERACTIVE_EDITOR_MESSAGE_CROP_STATE.isEqualTo('expanded')), + group: '2_expandOrContract', + order: 1 + } + }); + } + override runInteractiveEditorCommand(_accessor: ServicesAccessor, ctrl: InteractiveEditorController, _editor: ICodeEditor, ..._args: any[]): void { + ctrl.updateExpansionState(false); + } +} diff --git a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorController.ts b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorController.ts index 95e583b308f082..5f2594d2e975f7 100644 --- a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorController.ts +++ b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorController.ts @@ -11,7 +11,6 @@ import { isCancellationError } from 'vs/base/common/errors'; import { Event } from 'vs/base/common/event'; import { Iterable } from 'vs/base/common/iterator'; import { DisposableStore } from 'vs/base/common/lifecycle'; -import { LRUCache } from 'vs/base/common/map'; import { isEqual } from 'vs/base/common/resources'; import { StopWatch } from 'vs/base/common/stopwatch'; import { URI } from 'vs/base/common/uri'; @@ -31,6 +30,7 @@ import { ModelDecorationOptions, createTextBufferFactoryFromSnapshot } from 'vs/ import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker'; import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures'; import { IModelService } from 'vs/editor/common/services/model'; +import { ITextModelService } from 'vs/editor/common/services/resolverService'; import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController'; import { localize } from 'vs/nls'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; @@ -41,39 +41,24 @@ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storag import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { InteractiveEditorDiffWidget } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorDiffWidget'; import { InteractiveEditorZoneWidget } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget'; -import { CTX_INTERACTIVE_EDITOR_HAS_ACTIVE_REQUEST, CTX_INTERACTIVE_EDITOR_INLNE_DIFF, CTX_INTERACTIVE_EDITOR_LAST_EDIT_TYPE as CTX_INTERACTIVE_EDITOR_LAST_EDIT_KIND, CTX_INTERACTIVE_EDITOR_LAST_FEEDBACK as CTX_INTERACTIVE_EDITOR_LAST_FEEDBACK_KIND, IInteractiveEditorBulkEditResponse, IInteractiveEditorEditResponse, IInteractiveEditorRequest, IInteractiveEditorResponse, IInteractiveEditorService, IInteractiveEditorSession, IInteractiveEditorSessionProvider, IInteractiveEditorSlashCommand, INTERACTIVE_EDITOR_ID, EditMode, InteractiveEditorResponseFeedbackKind, CTX_INTERACTIVE_EDITOR_LAST_RESPONSE_TYPE, InteractiveEditorResponseType } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor'; +import { CTX_INTERACTIVE_EDITOR_HAS_ACTIVE_REQUEST, CTX_INTERACTIVE_EDITOR_INLNE_DIFF, CTX_INTERACTIVE_EDITOR_LAST_EDIT_TYPE as CTX_INTERACTIVE_EDITOR_LAST_EDIT_KIND, CTX_INTERACTIVE_EDITOR_LAST_FEEDBACK as CTX_INTERACTIVE_EDITOR_LAST_FEEDBACK_KIND, IInteractiveEditorBulkEditResponse, IInteractiveEditorEditResponse, IInteractiveEditorRequest, IInteractiveEditorResponse, IInteractiveEditorService, IInteractiveEditorSession, IInteractiveEditorSessionProvider, IInteractiveEditorSlashCommand, INTERACTIVE_EDITOR_ID, EditMode, InteractiveEditorResponseFeedbackKind, CTX_INTERACTIVE_EDITOR_LAST_RESPONSE_TYPE, InteractiveEditorResponseType, IInteractiveEditorMessageResponse } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor'; import { IInteractiveSessionWidgetService } from 'vs/workbench/contrib/interactiveSession/browser/interactiveSessionWidget'; import { IInteractiveSessionService } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionService'; import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/services/notebookEditorService'; import { CellUri } from 'vs/workbench/contrib/notebook/common/notebookCommon'; -type Exchange = { req: IInteractiveEditorRequest; res: IInteractiveEditorResponse }; -export type Recording = { when: Date; session: IInteractiveEditorSession; value: string; exchanges: Exchange[] }; - -class SessionRecorder { - - private readonly _data = new LRUCache(3); - - add(session: IInteractiveEditorSession, model: ITextModel) { - this._data.set(session, { when: new Date(), session, value: model.getValue(), exchanges: [] }); - } - - addExchange(session: IInteractiveEditorSession, req: IInteractiveEditorRequest, res: IInteractiveEditorResponse) { - this._data.get(session)?.exchanges.push({ req, res }); - } - - getAll(): Recording[] { - return [...this._data.values()]; - } -} +export type Recording = { + when: Date; + session: IInteractiveEditorSession; + exchanges: { prompt: string; res: IInteractiveEditorResponse }[]; +}; type TelemetryData = { extension: string; rounds: string; undos: string; edits: boolean; - terminalEdits: boolean; startTime: string; endTime: string; editMode: string; @@ -86,7 +71,6 @@ type TelemetryDataClassification = { rounds: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of request that were made' }; undos: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Requests that have been undone' }; edits: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Did edits happen while the session was active' }; - terminalEdits: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Did edits terminal the session' }; startTime: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'When the session started' }; endTime: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'When the session ended' }; editMode: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'What edit mode was choosen: live, livePreview, preview' }; @@ -159,6 +143,14 @@ class InlineDiffDecorations { } } +export class SessionExchange { + constructor(readonly prompt: string, readonly response: MarkdownResponse | EditResponse) { } +} + +export class MarkdownResponse { + constructor(readonly localUri: URI, readonly raw: IInteractiveEditorMessageResponse) { } +} + export class EditResponse { readonly localEdits: TextEdit[] = []; @@ -217,9 +209,9 @@ export class EditResponse { class Session { - private readonly _responses: EditResponse[] = []; - - readonly teldata: TelemetryData; + private readonly _exchange: SessionExchange[] = []; + private readonly _startTime = new Date(); + private readonly _teldata: Partial; constructor( readonly editMode: EditMode, @@ -228,25 +220,42 @@ class Session { readonly provider: IInteractiveEditorSessionProvider, readonly session: IInteractiveEditorSession, ) { - this.teldata = { + this._teldata = { extension: provider.debugName, - startTime: new Date().toISOString(), - endTime: new Date().toISOString(), + startTime: this._startTime.toISOString(), edits: false, - terminalEdits: false, rounds: '', undos: '', editMode }; } - addResponse(response: EditResponse): void { - const newLen = this._responses.push(response); - this.teldata.rounds += `${newLen}|`; + addExchange(exchange: SessionExchange): void { + const newLen = this._exchange.push(exchange); + this._teldata.rounds += `${newLen}|`; + } + + get lastExchange(): SessionExchange | undefined { + return this._exchange[this._exchange.length - 1]; } - get lastResponse(): EditResponse | undefined { - return this._responses[this._responses.length - 1]; + recordExternalEditOccurred() { + this._teldata.edits = true; + } + + asTelemetryData(): TelemetryData { + return { + ...this._teldata, + endTime: new Date().toISOString(), + }; + } + + asRecording(): Recording { + return { + session: this.session, + when: this._startTime, + exchanges: this._exchange.map(e => ({ prompt: e.prompt, res: e.response.raw })) + }; } } @@ -280,7 +289,6 @@ export class InteractiveEditorController implements IEditorContribution { private _historyOffset: number = -1; private readonly _store = new DisposableStore(); - private readonly _recorder = new SessionRecorder(); private readonly _zone: InteractiveEditorZoneWidget; private readonly _ctxHasActiveRequest: IContextKey; private readonly _ctxInlineDiff: IContextKey; @@ -293,6 +301,7 @@ export class InteractiveEditorController implements IEditorContribution { private _inlineDiffEnabled: boolean = false; private _currentSession?: Session; + private _recordings: Recording[] = []; private _ctsSession: CancellationTokenSource = new CancellationTokenSource(); private _ctsRequest?: CancellationTokenSource; @@ -307,6 +316,7 @@ export class InteractiveEditorController implements IEditorContribution { @IStorageService private readonly _storageService: IStorageService, @IConfigurationService private readonly _configurationService: IConfigurationService, @IModelService private readonly _modelService: IModelService, + @ITextModelService private readonly _textModelService: ITextModelService, @INotebookEditorService private readonly _notebookEditorService: INotebookEditorService, @IContextKeyService contextKeyService: IContextKeyService, @@ -333,6 +343,18 @@ export class InteractiveEditorController implements IEditorContribution { return this._configurationService.getValue('interactiveEditor.editMode'); } + viewInChat() { + if (this._currentSession?.lastExchange?.response instanceof MarkdownResponse) { + + this._instaService.invokeFunction(showMessageResponse, this._currentSession.lastExchange.prompt, this._currentSession.lastExchange.response.raw.message.value); + + } + } + + updateExpansionState(expand: boolean) { + this._zone.widget.updateToggleState(expand); + } + async run(options: InteractiveEditorRunOptions | undefined): Promise { // hide/cancel inline completions when invoking IE @@ -361,20 +383,20 @@ export class InteractiveEditorController implements IEditorContribution { this._logService.trace('[IE] NO session', provider.debugName); return; } - this._recorder.add(session, textModel); this._logService.trace('[IE] NEW session', provider.debugName); const store = new DisposableStore(); + // keep a snapshot of the "actual" model + const textModel0 = this._modelService.createModel(createTextBufferFactoryFromSnapshot(textModel.createSnapshot()), { languageId: textModel.getLanguageId(), onDidChange: Event.None }, undefined, true); + store.add(textModel0); + + // keep a reference to prevent disposal of the "actual" model + const refTextModelN = await this._textModelService.createModelReference(textModel.uri); + store.add(refTextModelN); let textModel0Changes: LineRangeMapping[] | undefined; - const textModel0 = this._modelService.createModel( - createTextBufferFactoryFromSnapshot(textModel.createSnapshot()), - { languageId: textModel.getLanguageId(), onDidChange: Event.None }, - undefined, true - ); - store.add(textModel0); this._currentSession = new Session(editMode, textModel0, textModel, provider, session); this._strategy = this._instaService.createInstance(EditModeStrategy.ctor(editMode), this._currentSession); @@ -397,13 +419,13 @@ export class InteractiveEditorController implements IEditorContribution { let placeholder = session.placeholder ?? ''; let value = options?.message ?? ''; - + let autoSend = options?.autoSend ?? false; if (session.slashCommands) { store.add(this._instaService.invokeFunction(installSlashCommandSupport, this._zone.widget.inputEditor as IActiveCodeEditor, session.slashCommands)); } - this._zone.widget.updateMessage(session.message ?? localize('welcome.1', "AI-generated code may be incorrect.")); + this._zone.widget.updateStatus(session.message ?? localize('welcome.1', "AI-generated code may be incorrect.")); // CANCEL when input changes this._editor.onDidChangeModel(this.cancelSession, this, store); @@ -429,7 +451,7 @@ export class InteractiveEditorController implements IEditorContribution { inlineDiffDecorations.clear(); // note when "other" edits happen - this._currentSession!.teldata.edits = true; + this._currentSession?.recordExternalEditOccurred(); // CANCEL if the document has changed outside the current range const wholeRange = wholeRangeDecoration.getRange(0); @@ -450,9 +472,6 @@ export class InteractiveEditorController implements IEditorContribution { }, undefined, store); - const roundStore = new DisposableStore(); - store.add(roundStore); - const diffZone = this._instaService.createInstance(InteractiveEditorDiffWidget, this._editor, textModel0); do { @@ -478,13 +497,7 @@ export class InteractiveEditorController implements IEditorContribution { const inputPromise = this._zone.getInput(wholeRange.getEndPosition(), placeholder, value, this._ctsRequest.token); if (textModel0Changes && editMode === EditMode.LivePreview) { - const diffPosition = diffZone.getEndPositionForChanges(wholeRange, textModel0Changes); - if (diffPosition) { - const newInputPosition = diffPosition.delta(0, 1); - if (wholeRange.getEndPosition().isBefore(newInputPosition)) { - this._zone.updatePosition(newInputPosition); - } - } + diffZone.showDiff( () => wholeRangeDecoration.getRange(0)!, // TODO@jrieken if it can be null it will be null textModel0Changes @@ -493,11 +506,11 @@ export class InteractiveEditorController implements IEditorContribution { this._ctxLastFeedbackKind.reset(); // reveal the line after the whole range to ensure that the input box is visible this._editor.revealPosition({ lineNumber: wholeRange.endLineNumber + 1, column: 1 }, ScrollType.Smooth); - if (options?.autoSend && !this._currentSession.lastResponse) { + if (autoSend) { + autoSend = false; this.accept(); } const input = await inputPromise; - roundStore.clear(); if (!input) { continue; @@ -535,7 +548,7 @@ export class InteractiveEditorController implements IEditorContribution { if (!isCancellationError(e)) { this._logService.error('[IE] ERROR during request', provider.debugName); this._logService.error(e); - this._zone.widget.updateMessage(toErrorMessage(e), { classes: ['error'] }); + this._zone.widget.updateStatus(toErrorMessage(e), { classes: ['error'] }); // statusWidget continue; } @@ -553,24 +566,25 @@ export class InteractiveEditorController implements IEditorContribution { if (!reply) { this._logService.trace('[IE] NO reply or edits', provider.debugName); - this._zone.widget.updateMessage(localize('empty', "No results, please refine your input and try again."), { classes: ['warn'] }); + this._zone.widget.updateStatus(localize('empty', "No results, please refine your input and try again."), { classes: ['warn'] }); continue; } - this._recorder.addExchange(session, request, reply); this._zone.widget.updateToolbar(true); if (reply.type === 'message') { this._logService.info('[IE] received a MESSAGE, continuing outside editor', provider.debugName); - const messageReply = reply.message; - const renderedMarkdown = renderMarkdown(messageReply, { inline: true }); - this._zone.widget.updateMessage(renderedMarkdown.element, { linkListener: () => this._instaService.invokeFunction(showMessageResponse, request.prompt, messageReply.value), isMessageReply: true }); + const renderedMarkdown = renderMarkdown(reply.message, { inline: true }); + this._zone.widget.updateStatus(''); + this._zone.widget.updateMarkdownMessage(renderedMarkdown.element); + const markdownResponse = new MarkdownResponse(textModel.uri, reply); + this._currentSession.addExchange(new SessionExchange(value, markdownResponse)); continue; } const editResponse = new EditResponse(textModel.uri, reply); - this._currentSession.addResponse(editResponse); + this._currentSession.addExchange(new SessionExchange(value, editResponse)); const canContinue = this._strategy.update(editResponse); if (!canContinue) { @@ -602,7 +616,7 @@ export class InteractiveEditorController implements IEditorContribution { } else { // make edits more minimal - const moreMinimalEdits = (await this._editorWorkerService.computeMoreMinimalEdits(textModel.uri, editResponse.localEdits)); + const moreMinimalEdits = (await this._editorWorkerService.computeHumanReadableDiff(textModel.uri, editResponse.localEdits)); const editOperations = (moreMinimalEdits ?? editResponse.localEdits).map(edit => EditOperation.replace(Range.lift(edit.range), edit.text)); this._logService.trace('[IE] edits from PROVIDER and after making them MORE MINIMAL', provider.debugName, editResponse.localEdits, moreMinimalEdits); @@ -655,7 +669,7 @@ export class InteractiveEditorController implements IEditorContribution { } else { message = localize('lines.N', "Generated reply and changed {0} lines.", linesChanged); } - this._zone.widget.updateMessage(message); + this._zone.widget.updateStatus(message); } @@ -674,11 +688,15 @@ export class InteractiveEditorController implements IEditorContribution { this._logService.trace('[IE] session DONE', provider.debugName); - this._currentSession.teldata.endTime = new Date().toISOString(); - this._telemetryService.publicLog2('interactiveEditor/session', this._currentSession.teldata); + this._telemetryService.publicLog2('interactiveEditor/session', this._currentSession.asTelemetryData()); - // done, cleanup + // keep recording + const newLen = this._recordings.unshift(this._currentSession.asRecording()); + if (newLen > 5) { + this._recordings.pop(); + } + // done, cleanup diffZone.hide(); diffZone.dispose(); @@ -772,37 +790,40 @@ export class InteractiveEditorController implements IEditorContribution { this._historyOffset = pos; } - recordings() { - return this._recorder.getAll(); + recordings(): Recording[] { + return this._recordings; } undoLast(): string | void { - if (this._currentSession?.lastResponse) { + if (this._currentSession?.lastExchange?.response instanceof EditResponse) { this._currentSession.modelN.undo(); - return this._currentSession.lastResponse.localEdits[0].text; + return this._currentSession.lastExchange.response.localEdits[0].text; } } feedbackLast(helpful: boolean) { - if (this._currentSession?.lastResponse) { + if (this._currentSession?.lastExchange?.response) { const kind = helpful ? InteractiveEditorResponseFeedbackKind.Helpful : InteractiveEditorResponseFeedbackKind.Unhelpful; - this._currentSession.provider.handleInteractiveEditorResponseFeedback?.(this._currentSession.session, this._currentSession.lastResponse.raw, kind); + this._currentSession.provider.handleInteractiveEditorResponseFeedback?.(this._currentSession.session, this._currentSession.lastExchange.response.raw, kind); this._ctxLastFeedbackKind.set(helpful ? 'helpful' : 'unhelpful'); - this._zone.widget.updateMessage('Thank you for your feedback!', { resetAfter: 1250 }); + this._zone.widget.updateStatus('Thank you for your feedback!', { resetAfter: 1250 }); } } async applyChanges(): Promise { - if (this._currentSession?.lastResponse) { - const { lastResponse } = this._currentSession; - await this._strategy?.apply(); + if (this._currentSession?.lastExchange?.response instanceof EditResponse && this._strategy) { + const strategy = this._strategy; + this._strategy = undefined; + await strategy?.apply(); this._ctsSession.cancel(); - return lastResponse; + return this._currentSession.lastExchange.response; } } async cancelSession() { - await this._strategy?.cancel(); + const strategy = this._strategy; + this._strategy = undefined; + await strategy?.cancel(); this._ctsSession.cancel(); } } @@ -844,21 +865,20 @@ class PreviewStrategy extends EditModeStrategy { async apply() { - const response = this._session.lastResponse; - if (!response) { + if (!(this._session.lastExchange?.response instanceof EditResponse)) { return; } + const editResponse = this._session.lastExchange?.response; + if (editResponse.workspaceEdits) { + await this._bulkEditService.apply(editResponse.workspaceEdits); - if (response.workspaceEdits) { - await this._bulkEditService.apply(response.workspaceEdits); - - } else if (!response.workspaceEditsIncludeLocalEdits) { + } else if (!editResponse.workspaceEditsIncludeLocalEdits) { const { modelN } = this._session; if (modelN.equalsTextBuffer(this._session.model0.getTextBuffer())) { modelN.pushStackElement(); - const edits = response.localEdits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text)); + const edits = editResponse.localEdits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text)); modelN.pushEditOperations(null, edits, () => null); modelN.pushStackElement(); } @@ -1007,7 +1027,8 @@ async function showMessageResponse(accessor: ServicesAccessor, query: string, re const interactiveSessionWidgetService = accessor.get(IInteractiveSessionWidgetService); const widget = await interactiveSessionWidgetService.revealViewForProvider(providerId); if (widget && widget.viewModel) { - interactiveSessionService.addCompleteRequest(widget.viewModel.sessionId, query, { message: response }); + await interactiveSessionService.addCompleteRequest(widget.viewModel.sessionId, query, { message: response }); + widget.focusLastMessage(); } } diff --git a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorDiffWidget.ts b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorDiffWidget.ts index 373e8086bd7343..7b95c0a240a004 100644 --- a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorDiffWidget.ts +++ b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorDiffWidget.ts @@ -10,7 +10,7 @@ import { IActiveCodeEditor, ICodeEditor, IDiffEditor } from 'vs/editor/browser/e import { EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget'; import { EditorOption } from 'vs/editor/common/config/editorOptions'; import { Range } from 'vs/editor/common/core/range'; -import { ITextModel } from 'vs/editor/common/model'; +import { IModelDecorationOptions, IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model'; import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/browser/zoneWidget'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import * as colorRegistry from 'vs/platform/theme/common/colorRegistry'; @@ -21,7 +21,7 @@ import { LineRange } from 'vs/editor/common/core/lineRange'; import { LineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer'; import { Position } from 'vs/editor/common/core/position'; import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions'; -import { ScrollType } from 'vs/editor/common/editorCommon'; +import { IEditorDecorationsCollection, ScrollType } from 'vs/editor/common/editorCommon'; import { ILogService } from 'vs/platform/log/common/log'; export class InteractiveEditorDiffWidget extends ZoneWidget { @@ -31,6 +31,7 @@ export class InteractiveEditorDiffWidget extends ZoneWidget { private readonly _elements = h('div.interactive-editor-diff-widget@domNode'); private readonly _diffEditor: IDiffEditor; + private readonly _inlineDiffDecorations: IEditorDecorationsCollection; private readonly _sessionStore = this._disposables.add(new DisposableStore()); private _dim: Dimension | undefined; @@ -41,9 +42,11 @@ export class InteractiveEditorDiffWidget extends ZoneWidget { @IThemeService themeService: IThemeService, @ILogService private readonly _logService: ILogService, ) { - super(editor, { showArrow: false, showFrame: false, isResizeable: false, isAccessible: true }); + super(editor, { showArrow: false, showFrame: false, isResizeable: false, isAccessible: true, showInHiddenAreas: true, ordinal: 10000 + 1 }); super.create(); + this._inlineDiffDecorations = editor.createDecorationsCollection(); + const diffContributions = EditorExtensionsRegistry .getEditorContributions() .filter(c => c.id !== INTERACTIVE_EDITOR_ID); @@ -92,22 +95,26 @@ export class InteractiveEditorDiffWidget extends ZoneWidget { this._disposables.add(themeService.onDidColorThemeChange(doStyle)); } + override dispose(): void { + this._inlineDiffDecorations.clear(); + super.dispose(); + } + protected override _fillContainer(container: HTMLElement): void { container.appendChild(this._elements.domNode); } // --- show / hide -------------------- - override show(): void { - throw new Error('not supported like this'); + override hide(): void { + this._cleanupFullDiff(); + this._cleanupInlineDiff(); + this._sessionStore.clear(); + super.hide(); } - getEndPositionForChanges(range: Range, changes: LineRangeMapping[]): Position | undefined { - assertType(this.editor.hasModel()); - - const modified = this.editor.getModel(); - const ranges = this._computeHiddenRanges(modified, range, changes); - return ranges?.anchor; + override show(): void { + throw new Error('not supported like this, use showDiff'); } showDiff(range: () => Range, changes: LineRangeMapping[]): void { @@ -116,22 +123,91 @@ export class InteractiveEditorDiffWidget extends ZoneWidget { this._sessionStore.add(this._diffEditor.onDidUpdateDiff(() => { const result = this._diffEditor.getDiffComputationResult(); - this._doShowForChanges(range(), result?.changes2 ?? []); + const hasFocus = this._diffEditor.hasTextFocus(); + this._updateFromChanges(range(), result?.changes2 ?? []); + // TODO@jrieken find a better fix for this. this is the challenge: + // the _doShowForChanges method invokes show of the zone widget which removes and adds the + // zone and overlay parts. this dettaches and reattaches the dom nodes which means they lose + // focus + if (hasFocus) { + this._diffEditor.focus(); + } })); - this._doShowForChanges(range(), changes); + this._updateFromChanges(range(), changes); } - private _doShowForChanges(range: Range, changes: LineRangeMapping[]): void { + private _updateFromChanges(range: Range, changes: LineRangeMapping[]): void { assertType(this.editor.hasModel()); - const modified = this.editor.getModel(); - const ranges = this._computeHiddenRanges(modified, range, changes); - - if (!ranges) { + if (changes.length === 0) { + // no change + this._logService.debug('[IE] livePreview-mode: no diff'); this.hide(); - return; + + } else if (changes.every(isInlineDiffFriendly)) { + // simple changes + this._logService.debug('[IE] livePreview-mode: inline diff'); + this._cleanupFullDiff(); + this._renderChangesWithInlineDiff(changes); + + } else { + // complex changes + this._logService.debug('[IE] livePreview-mode: full diff'); + this._cleanupInlineDiff(); + this._renderChangesWithFullDiff(changes, range); + } + } + + // --- inline diff + + private _renderChangesWithInlineDiff(changes: LineRangeMapping[]) { + const original = this._textModelv0; + + const decorations: IModelDeltaDecoration[] = []; + + for (const { innerChanges } of changes) { + if (!innerChanges) { + continue; + } + for (const { modifiedRange, originalRange } of innerChanges) { + + const options: IModelDecorationOptions = { + description: 'interactive-diff-inline', + showIfCollapsed: true, + }; + + if (!modifiedRange.isEmpty()) { + options.className = 'interactive-editor-lines-inserted-range'; + } + + if (!originalRange.isEmpty()) { + options.before = { + content: original.getValueInRange(originalRange), + inlineClassName: 'interactive-editor-lines-deleted-range-inline' + }; + } + + decorations.push({ + range: modifiedRange, + options + }); + } } + this._inlineDiffDecorations.set(decorations); + } + + private _cleanupInlineDiff() { + this._inlineDiffDecorations.clear(); + } + + // --- full diff + + private _renderChangesWithFullDiff(changes: LineRangeMapping[], range: Range) { + + const modified = this.editor.getModel()!; + const ranges = this._computeHiddenRanges(modified, range, changes); + this._hideEditorRanges(this.editor, [ranges.modifiedHidden]); this._hideEditorRanges(this._diffEditor.getOriginalEditor(), ranges.originalDiffHidden); this._hideEditorRanges(this._diffEditor.getModifiedEditor(), ranges.modifiedDiffHidden); @@ -149,10 +225,15 @@ export class InteractiveEditorDiffWidget extends ZoneWidget { this._logService.debug(`[IE] diff SHOWING at ${ranges.anchor} with ${heightInLines} lines height`); } + private _cleanupFullDiff() { + this.editor.setHiddenAreas([], InteractiveEditorDiffWidget._hideId); + this._diffEditor.getOriginalEditor().setHiddenAreas([], InteractiveEditorDiffWidget._hideId); + this._diffEditor.getModifiedEditor().setHiddenAreas([], InteractiveEditorDiffWidget._hideId); + super.hide(); + } + private _computeHiddenRanges(model: ITextModel, range: Range, changes: LineRangeMapping[]) { - if (changes.length === 0) { - return undefined; - } + assertType(changes.length > 0); let originalLineRange = changes[0].originalRange; let modifiedLineRange = changes[0].modifiedRange; @@ -189,19 +270,12 @@ export class InteractiveEditorDiffWidget extends ZoneWidget { lineRanges = lineRanges.filter(range => !range.isEmpty); if (lineRanges.length === 0) { // todo? - this._logService.debug(`[IE] diff NOTHING to hide for ${String(editor.getModel()?.uri)}`); - } else { - const ranges = lineRanges.map(r => new Range(r.startLineNumber, 1, r.endLineNumberExclusive - 1, 1)); - editor.setHiddenAreas(ranges, InteractiveEditorDiffWidget._hideId); - this._logService.debug(`[IE] diff HIDING ${ranges} for ${editor.getId()} with ${String(editor.getModel()?.uri)}`); + this._logService.debug(`[IE] diff NOTHING to hide for ${editor.getId()} with ${String(editor.getModel()?.uri)}`); + return; } - } - - override hide(): void { - this.editor.setHiddenAreas([], InteractiveEditorDiffWidget._hideId); - this._diffEditor.getOriginalEditor().setHiddenAreas([], InteractiveEditorDiffWidget._hideId); - this._diffEditor.getModifiedEditor().setHiddenAreas([], InteractiveEditorDiffWidget._hideId); - super.hide(); + const ranges = lineRanges.map(r => new Range(r.startLineNumber, 1, r.endLineNumberExclusive - 1, 1)); + editor.setHiddenAreas(ranges, InteractiveEditorDiffWidget._hideId); + this._logService.debug(`[IE] diff HIDING ${ranges} for ${editor.getId()} with ${String(editor.getModel()?.uri)}`); } protected override revealRange(range: Range, isLastLine: boolean): void { @@ -235,3 +309,18 @@ function invert(range: LineRange, model: ITextModel): LineRange[] { result.push(new LineRange(range.endLineNumberExclusive, model.getLineCount() + 1)); return result.filter(r => !r.isEmpty); } + +function isInlineDiffFriendly(mapping: LineRangeMapping): boolean { + if (!mapping.modifiedRange.equals(mapping.originalRange)) { + return false; + } + if (!mapping.innerChanges) { + return false; + } + for (const { modifiedRange, originalRange } of mapping.innerChanges) { + if (Range.spansMultipleLines(modifiedRange) || Range.spansMultipleLines(originalRange)) { + return false; + } + } + return true; +} diff --git a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget.ts b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget.ts index 12504c4a1318b5..98476cf877b952 100644 --- a/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget.ts +++ b/src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget.ts @@ -5,7 +5,7 @@ import 'vs/css!./interactiveEditor'; import { CancellationToken } from 'vs/base/common/cancellation'; -import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle'; +import { DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { ICodeEditor, IDiffEditorConstructionOptions } from 'vs/editor/browser/editorBrowser'; import { EditorOption } from 'vs/editor/common/config/editorOptions'; import { IRange, Range } from 'vs/editor/common/core/range'; @@ -14,10 +14,10 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/browser/zoneWidget'; import { assertType } from 'vs/base/common/types'; -import { CTX_INTERACTIVE_EDITOR_FOCUSED, CTX_INTERACTIVE_EDITOR_INNER_CURSOR_FIRST, CTX_INTERACTIVE_EDITOR_INNER_CURSOR_LAST, CTX_INTERACTIVE_EDITOR_EMPTY, CTX_INTERACTIVE_EDITOR_OUTER_CURSOR_POSITION, CTX_INTERACTIVE_EDITOR_VISIBLE, MENU_INTERACTIVE_EDITOR_WIDGET, MENU_INTERACTIVE_EDITOR_WIDGET_STATUS } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor'; +import { CTX_INTERACTIVE_EDITOR_FOCUSED, CTX_INTERACTIVE_EDITOR_INNER_CURSOR_FIRST, CTX_INTERACTIVE_EDITOR_INNER_CURSOR_LAST, CTX_INTERACTIVE_EDITOR_EMPTY, CTX_INTERACTIVE_EDITOR_OUTER_CURSOR_POSITION, CTX_INTERACTIVE_EDITOR_VISIBLE, MENU_INTERACTIVE_EDITOR_WIDGET, MENU_INTERACTIVE_EDITOR_WIDGET_STATUS, MENU_INTERACTIVE_EDITOR_WIDGET_MARKDOWN_MESSAGE, CTX_INTERACTIVE_EDITOR_MESSAGE_CROP_STATE } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor'; import { ITextModel } from 'vs/editor/common/model'; -import { Dimension, addDisposableListener, getTotalHeight, getTotalWidth, h, reset, append } from 'vs/base/browser/dom'; -import { Emitter, Event, MicrotaskEmitter } from 'vs/base/common/event'; +import { Dimension, addDisposableListener, getTotalHeight, getTotalWidth, h, reset } from 'vs/base/browser/dom'; +import { Event, MicrotaskEmitter } from 'vs/base/common/event'; import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration'; import { ICodeEditorWidgetOptions } from 'vs/editor/browser/widget/codeEditorWidget'; import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions'; @@ -25,7 +25,6 @@ import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetCon import { IModelService } from 'vs/editor/common/services/model'; import { URI } from 'vs/base/common/uri'; import { EmbeddedCodeEditorWidget, EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget'; -import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController'; import { HiddenItemStrategy, MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar'; import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar'; import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController'; @@ -37,7 +36,8 @@ import { EditOperation } from 'vs/editor/common/core/editOperation'; import { ILanguageSelection } from 'vs/editor/common/languages/language'; import { ResourceLabel } from 'vs/workbench/browser/labels'; import { FileKind } from 'vs/platform/files/common/files'; -import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels'; +import { IAction } from 'vs/base/common/actions'; +import { IActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems'; const _inputEditorOptions: IEditorConstructionOptions = { padding: { top: 3, bottom: 2 }, @@ -65,6 +65,8 @@ const _inputEditorOptions: IEditorConstructionOptions = { guides: { indentation: false }, rulers: [], cursorWidth: 1, + cursorStyle: 'line', + cursorBlinking: 'blink', wrappingStrategy: 'advanced', wrappingIndent: 'none', renderWhitespace: 'none', @@ -94,31 +96,6 @@ const _previewEditorEditorOptions: IDiffEditorConstructionOptions = { readOnly: true, }; -class StatusLink extends Disposable { - - private readonly _domNode: HTMLAnchorElement; - private readonly _onClicked = this._register(new Emitter()); - readonly onClicked = this._onClicked.event; - - constructor(container: HTMLElement) { - super(); - const linkNode = document.createElement('a'); - const codicon = renderLabelWithIcons('$(comment-discussion)' + localize('viewInChat', 'View in Chat')); - reset(linkNode, ...codicon); - this._domNode = append(container, linkNode); - this._domNode.classList.add('status-link'); - this._register(addDisposableListener(this._domNode, 'click', () => this._onClicked.fire())); - } - - show(): void { - this._domNode.style.display = 'flex'; - } - - hide(): void { - this._domNode.style.display = 'none'; - } -} - class InteractiveEditorWidget { private static _modelPool: number = 1; @@ -143,8 +120,11 @@ class InteractiveEditorWidget { h('div.previewCreate.hidden@previewCreate'), h('div.status@status', [ h('div.actions.hidden@statusToolbar'), - h('span.label@statusLabel'), - h('span.link@statusLink'), + h('div.label.hidden@statusLabel') + ]), + h('div.markdownMessage.hidden@markdownMessage', [ + h('div.message@message'), + h('div.messageActions@messageActions') ]), ] ); @@ -155,6 +135,7 @@ class InteractiveEditorWidget { readonly inputEditor: ICodeEditor; private readonly _inputModel: ITextModel; private readonly _ctxInputEmpty: IContextKey; + private readonly _ctxMessageCropState: IContextKey<'cropped' | 'not_cropped' | 'expanded'>; private readonly _progressBar: ProgressBar; @@ -173,10 +154,6 @@ class InteractiveEditorWidget { public acceptInput: () => void = InteractiveEditorWidget._noop; private _cancelInput: () => void = InteractiveEditorWidget._noop; - - private readonly _statusLink: StatusLink; - private readonly _statusLinkListener = this._store.add(new MutableDisposable()); - constructor( parentEditor: ICodeEditor, @IModelService private readonly _modelService: IModelService, @@ -189,7 +166,6 @@ class InteractiveEditorWidget { isSimpleWidget: true, contributions: EditorExtensionsRegistry.getSomeEditorContributions([ SnippetController2.ID, - InlineCompletionsController.ID, SuggestController.ID ]) }; @@ -206,6 +182,7 @@ class InteractiveEditorWidget { const currentContentHeight = 0; + this._ctxMessageCropState = CTX_INTERACTIVE_EDITOR_MESSAGE_CROP_STATE.bindTo(this._contextKeyService); this._ctxInputEmpty = CTX_INTERACTIVE_EDITOR_EMPTY.bindTo(this._contextKeyService); const togglePlaceholder = () => { const hasText = this._inputModel.getValueLength() > 0; @@ -234,15 +211,15 @@ class InteractiveEditorWidget { this._progressBar = new ProgressBar(this._elements.progress); this._store.add(this._progressBar); - const statusToolbar = this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.statusToolbar, MENU_INTERACTIVE_EDITOR_WIDGET_STATUS, { + const workbenchToolbarOptions = { hiddenItemStrategy: HiddenItemStrategy.NoHide, toolbarOptions: { primaryGroup: () => true, useSeparatorsInPrimaryActions: true }, - actionViewItemProvider: (action, options) => createActionViewItem(this._instantiationService, action, options) - }); - + actionViewItemProvider: (action: IAction, options: IActionViewItemOptions) => createActionViewItem(this._instantiationService, action, options) + }; + const statusToolbar = this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.statusToolbar, MENU_INTERACTIVE_EDITOR_WIDGET_STATUS, workbenchToolbarOptions); this._historyStore.add(statusToolbar); // preview editors @@ -251,13 +228,17 @@ class InteractiveEditorWidget { this._previewCreateTitle = this._store.add(_instantiationService.createInstance(ResourceLabel, this._elements.previewCreateTitle, { supportIcons: true })); this._previewCreateEditor = this._store.add(_instantiationService.createInstance(EmbeddedCodeEditorWidget, this._elements.previewCreate, _previewEditorEditorOptions, codeEditorWidgetOptions, parentEditor)); - this._statusLink = new StatusLink(this._elements.statusLink); + this._elements.message.tabIndex = 0; + this._elements.statusLabel.tabIndex = 0; + const markdownMessageToolbar = this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.messageActions, MENU_INTERACTIVE_EDITOR_WIDGET_MARKDOWN_MESSAGE, workbenchToolbarOptions); + this._historyStore.add(markdownMessageToolbar); } dispose(): void { this._store.dispose(); this._historyStore.dispose(); this._ctxInputEmpty.reset(); + this._ctxMessageCropState.reset(); } get domNode(): HTMLElement { @@ -290,10 +271,11 @@ class InteractiveEditorWidget { getHeight(): number { const base = getTotalHeight(this._elements.progress) + getTotalHeight(this._elements.status); const editorHeight = this.inputEditor.getContentHeight() + 12 /* padding and border */; + const markdownMessageHeight = getTotalHeight(this._elements.markdownMessage); const previewDiffHeight = this._previewDiffEditor.getModel().modified ? 12 + Math.min(300, Math.max(0, this._previewDiffEditor.getContentHeight())) : 0; const previewCreateTitleHeight = getTotalHeight(this._elements.previewCreateTitle); const previewCreateHeight = this._previewCreateEditor.getModel() ? 18 + Math.min(300, Math.max(0, this._previewCreateEditor.getContentHeight())) : 0; - return base + editorHeight + previewDiffHeight + previewCreateTitleHeight + previewCreateHeight + 18 /* padding */ + 8 /*shadow*/; + return base + editorHeight + markdownMessageHeight + previewDiffHeight + previewCreateTitleHeight + previewCreateHeight + 18 /* padding */ + 8 /*shadow*/; } updateProgress(show: boolean) { @@ -392,32 +374,32 @@ class InteractiveEditorWidget { this._onDidChangeHeight.fire(); } - updateMessage(message: string | HTMLElement, ops: { linkListener?: () => void; isMessageReply?: boolean; classes?: string[]; resetAfter?: number } = {}) { - this._statusLinkListener.clear(); - if (ops.isMessageReply) { - this._statusLink.show(); - this._statusLinkListener.value = this._statusLink.onClicked(() => ops.linkListener?.()); + updateMarkdownMessage(message: Node) { + const messageDom = this._elements.message; + reset(messageDom, message); + this._elements.markdownMessage.classList.toggle('hidden', false); + if (messageDom.scrollHeight > messageDom.clientHeight) { + this._ctxMessageCropState.set('cropped'); } else { - this._statusLink.hide(); + this._ctxMessageCropState.set('not_cropped'); } + this._onDidChangeHeight.fire(); + } + + updateStatus(message: string, ops: { classes?: string[]; resetAfter?: number; keepMessage?: boolean } = {}) { const isTempMessage = typeof ops.resetAfter === 'number'; if (isTempMessage && !this._elements.statusLabel.dataset['state']) { - const messageNow = this._elements.statusLabel.innerText; + const statusLabel = this._elements.statusLabel.innerText; const classes = Array.from(this._elements.statusLabel.classList.values()); setTimeout(() => { - if (messageNow) { - this.updateMessage(messageNow, { ...ops, classes }); - } else { - reset(this._elements.statusLabel); - } + this.updateStatus(statusLabel, { classes, keepMessage: true }); }, ops.resetAfter); + } else if (!isTempMessage && !ops.keepMessage) { + this._elements.markdownMessage.classList.toggle('hidden', true); } - - this._elements.status.classList.toggle('hidden', false); - reset(this._elements.statusLabel, message); this._elements.statusLabel.className = `label ${(ops.classes ?? []).join(' ')}`; - this._elements.statusLabel.classList.toggle('message', ops.isMessageReply); + this._elements.statusLabel.classList.toggle('hidden', !message); if (isTempMessage) { this._elements.statusLabel.dataset['state'] = 'temp'; } else { @@ -429,6 +411,7 @@ class InteractiveEditorWidget { reset() { this._ctxInputEmpty.reset(); reset(this._elements.statusLabel); + this._elements.statusLabel.classList.toggle('hidden', true); this._elements.statusToolbar.classList.add('hidden'); this.hideCreatePreview(); this.hideEditsPreview(); @@ -439,6 +422,12 @@ class InteractiveEditorWidget { this.inputEditor.focus(); } + updateToggleState(expand: boolean) { + this._ctxMessageCropState.set(expand ? 'expanded' : 'cropped'); + this._elements.message.style.webkitLineClamp = expand ? '10' : '3'; + this._onDidChangeHeight.fire(); + } + // --- preview showEditsPreview(actualModel: ITextModel, edits: TextEdit[]) { @@ -521,7 +510,7 @@ export class InteractiveEditorZoneWidget extends ZoneWidget { @IInstantiationService private readonly _instaService: IInstantiationService, @IContextKeyService contextKeyService: IContextKeyService, ) { - super(editor, { showFrame: false, showArrow: false, isAccessible: true, className: 'interactive-editor-widget', keepEditorSelection: true }); + super(editor, { showFrame: false, showArrow: false, isAccessible: true, className: 'interactive-editor-widget', keepEditorSelection: true, showInHiddenAreas: true, ordinal: 10000 + 3 }); this._ctxVisible = CTX_INTERACTIVE_EDITOR_VISIBLE.bindTo(contextKeyService); this._ctxCursorPosition = CTX_INTERACTIVE_EDITOR_OUTER_CURSOR_POSITION.bindTo(contextKeyService); diff --git a/src/vs/workbench/contrib/interactiveEditor/common/interactiveEditor.ts b/src/vs/workbench/contrib/interactiveEditor/common/interactiveEditor.ts index a5fb17b258f0b6..6741613f2a81d3 100644 --- a/src/vs/workbench/contrib/interactiveEditor/common/interactiveEditor.ts +++ b/src/vs/workbench/contrib/interactiveEditor/common/interactiveEditor.ts @@ -107,6 +107,7 @@ export const CTX_INTERACTIVE_EDITOR_FOCUSED = new RawContextKey('intera export const CTX_INTERACTIVE_EDITOR_EMPTY = new RawContextKey('interactiveEditorEmpty', false, localize('interactiveEditorEmpty', "Whether the interactive editor input is empty")); export const CTX_INTERACTIVE_EDITOR_INNER_CURSOR_FIRST = new RawContextKey('interactiveEditorInnerCursorFirst', false, localize('interactiveEditorInnerCursorFirst', "Whether the cursor of the iteractive editor input is on the first line")); export const CTX_INTERACTIVE_EDITOR_INNER_CURSOR_LAST = new RawContextKey('interactiveEditorInnerCursorLast', false, localize('interactiveEditorInnerCursorLast', "Whether the cursor of the iteractive editor input is on the last line")); +export const CTX_INTERACTIVE_EDITOR_MESSAGE_CROP_STATE = new RawContextKey<'cropped' | 'not_cropped' | 'expanded'>('interactiveEditorMarkdownMessageCropState', 'not_cropped', localize('interactiveEditorMarkdownMessageCropState', "Whether the interactive editor message is cropped, not cropped or expanded")); export const CTX_INTERACTIVE_EDITOR_OUTER_CURSOR_POSITION = new RawContextKey<'above' | 'below' | ''>('interactiveEditorOuterCursorPosition', '', localize('interactiveEditorOuterCursorPosition', "Whether the cursor of the outer editor is above or below the interactive editor input")); export const CTX_INTERACTIVE_EDITOR_HAS_ACTIVE_REQUEST = new RawContextKey('interactiveEditorHasActiveRequest', false, localize('interactiveEditorHasActiveRequest', "Whether interactive editor has an active request")); export const CTX_INTERACTIVE_EDITOR_INLNE_DIFF = new RawContextKey('interactiveEditorInlineDiff', false, localize('interactiveEditorInlineDiff', "Whether interactive editor show inline diffs for changes")); @@ -118,6 +119,7 @@ export const CTX_INTERACTIVE_EDITOR_EDIT_MODE = new RawContextKey('con // --- menus export const MENU_INTERACTIVE_EDITOR_WIDGET = MenuId.for('interactiveEditorWidget'); +export const MENU_INTERACTIVE_EDITOR_WIDGET_MARKDOWN_MESSAGE = MenuId.for('interactiveEditorWidget.markdownMessage'); export const MENU_INTERACTIVE_EDITOR_WIDGET_STATUS = MenuId.for('interactiveEditorWidget.status'); export const MENU_INTERACTIVE_EDITOR_WIDGET_UNDO = MenuId.for('interactiveEditorWidget.undo'); MenuRegistry.appendMenuItem(MENU_INTERACTIVE_EDITOR_WIDGET_STATUS, { diff --git a/src/vs/workbench/contrib/interactiveSession/browser/actions/interactiveSessionActions.ts b/src/vs/workbench/contrib/interactiveSession/browser/actions/interactiveSessionActions.ts index 52599699e8c6f9..20779ac964bdcb 100644 --- a/src/vs/workbench/contrib/interactiveSession/browser/actions/interactiveSessionActions.ts +++ b/src/vs/workbench/contrib/interactiveSession/browser/actions/interactiveSessionActions.ts @@ -12,6 +12,7 @@ import { localize } from 'vs/nls'; import { Action2, IAction2Options, MenuId, registerAction2 } from 'vs/platform/actions/common/actions'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; +import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput'; import { ViewAction } from 'vs/workbench/browser/parts/views/viewPane'; import { ActiveEditorContext } from 'vs/workbench/common/contextkeys'; import { IInteractiveSessionEditorOptions, InteractiveSessionEditor } from 'vs/workbench/contrib/interactiveSession/browser/interactiveSessionEditor'; @@ -19,7 +20,7 @@ import { InteractiveSessionEditorInput } from 'vs/workbench/contrib/interactiveS import { InteractiveSessionViewPane } from 'vs/workbench/contrib/interactiveSession/browser/interactiveSessionViewPane'; import { IInteractiveSessionWidgetService } from 'vs/workbench/contrib/interactiveSession/browser/interactiveSessionWidget'; import { CONTEXT_IN_INTERACTIVE_INPUT, CONTEXT_IN_INTERACTIVE_SESSION } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionContextKeys'; -import { IInteractiveSessionService } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionService'; +import { IInteractiveSessionDetail, IInteractiveSessionService } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionService'; import { IInteractiveSessionWidgetHistoryService } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionWidgetHistoryService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; @@ -178,7 +179,7 @@ export function getOpenInteractiveSessionEditorAction(id: string, label: string, async run(accessor: ServicesAccessor) { const editorService = accessor.get(IEditorService); - await editorService.openEditor({ resource: InteractiveSessionEditorInput.getNewEditorUri(), options: { providerId: id, pinned: true } }); + await editorService.openEditor({ resource: InteractiveSessionEditorInput.getNewEditorUri(), options: { target: { providerId: id }, pinned: true } }); } }; } @@ -212,3 +213,47 @@ export function getClearAction(viewId: string, providerId: string) { } }; } + +const getHistoryInteractiveSessionActionDescriptorForViewTitle = (viewId: string, providerId: string): Readonly & { viewId: string } => ({ + viewId, + id: `workbench.action.interactiveSession.${providerId}.history`, + title: { + value: localize('interactiveSession.history.label', "Show History"), + original: 'Show History' + }, + menu: { + id: MenuId.ViewTitle, + when: ContextKeyExpr.and(ContextKeyExpr.equals('view', viewId), ContextKeyExpr.has('config.interactive.experimental.chatHistory')), + group: 'navigation', + order: 0 + }, + category: INTERACTIVE_SESSION_CATEGORY, + icon: Codicon.history, + f1: false +}); + +export function getHistoryAction(viewId: string, providerId: string) { + return class HistoryAction extends ViewAction { + constructor() { + super(getHistoryInteractiveSessionActionDescriptorForViewTitle(viewId, providerId)); + } + + async runInView(accessor: ServicesAccessor, view: InteractiveSessionViewPane) { + const interactiveSessionService = accessor.get(IInteractiveSessionService); + const quickInputService = accessor.get(IQuickInputService); + const editorService = accessor.get(IEditorService); + const items = interactiveSessionService.getHistory(); + const picks = items.map(i => ({ + label: i.title, + interactiveSession: i + })); + const selection = await quickInputService.pick(picks, { placeHolder: localize('interactiveSession.history.pick', "Select a chat session to restore") }); + if (selection) { + const sessionId = selection.interactiveSession.sessionId; + await editorService.openEditor({ + resource: InteractiveSessionEditorInput.getNewEditorUri(), options: { target: { sessionId }, pinned: true } + }); + } + } + }; +} diff --git a/src/vs/workbench/contrib/interactiveSession/browser/actions/interactiveSessionCopyActions.ts b/src/vs/workbench/contrib/interactiveSession/browser/actions/interactiveSessionCopyActions.ts index 080094d2c39bac..d920a851de54f3 100644 --- a/src/vs/workbench/contrib/interactiveSession/browser/actions/interactiveSessionCopyActions.ts +++ b/src/vs/workbench/contrib/interactiveSession/browser/actions/interactiveSessionCopyActions.ts @@ -35,6 +35,7 @@ export function registerInteractiveSessionCopyActions() { if (widget) { const viewModel = widget.viewModel; const sessionAsText = viewModel?.getItems() + .filter((item): item is (IInteractiveRequestViewModel | IInteractiveResponseViewModel) => isRequestVM(item) || isResponseVM(item)) .map(stringifyItem) .join('\n\n'); if (sessionAsText) { @@ -75,5 +76,5 @@ export function registerInteractiveSessionCopyActions() { function stringifyItem(item: IInteractiveRequestViewModel | IInteractiveResponseViewModel): string { return isRequestVM(item) ? - `${item.username}: ${item.message}` : `${item.username}: ${item.response.value}`; + `${item.username}: ${item.messageText}` : `${item.username}: ${item.response.value}`; } diff --git a/src/vs/workbench/contrib/interactiveSession/browser/interactiveSession.contribution.ts b/src/vs/workbench/contrib/interactiveSession/browser/interactiveSession.contribution.ts index 57505657b688e8..610f695b407465 100644 --- a/src/vs/workbench/contrib/interactiveSession/browser/interactiveSession.contribution.ts +++ b/src/vs/workbench/contrib/interactiveSession/browser/interactiveSession.contribution.ts @@ -99,7 +99,7 @@ class InteractiveSessionResolverContribution extends Disposable { }, { createEditorInput: ({ resource, options }) => { - return { editor: instantiationService.createInstance(InteractiveSessionEditorInput, resource, options as IInteractiveSessionEditorOptions, undefined), options }; + return { editor: instantiationService.createInstance(InteractiveSessionEditorInput, resource, options as IInteractiveSessionEditorOptions), options }; } } )); diff --git a/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionContributionServiceImpl.ts b/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionContributionServiceImpl.ts index 25735dba7192c4..a5a9b6b768902e 100644 --- a/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionContributionServiceImpl.ts +++ b/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionContributionServiceImpl.ts @@ -16,7 +16,7 @@ import { IProductService } from 'vs/platform/product/common/productService'; import { Registry } from 'vs/platform/registry/common/platform'; import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer'; import { IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ViewContainer, ViewContainerLocation, Extensions as ViewExtensions } from 'vs/workbench/common/views'; -import { getClearAction, getOpenInteractiveSessionEditorAction } from 'vs/workbench/contrib/interactiveSession/browser/actions/interactiveSessionActions'; +import { getClearAction, getHistoryAction, getOpenInteractiveSessionEditorAction } from 'vs/workbench/contrib/interactiveSession/browser/actions/interactiveSessionActions'; import { IInteractiveSessionViewOptions, INTERACTIVE_SIDEBAR_PANEL_ID, InteractiveSessionViewPane } from 'vs/workbench/contrib/interactiveSession/browser/interactiveSessionViewPane'; import { IInteractiveSessionContributionService, IInteractiveSessionProviderContribution, IRawInteractiveSessionProviderContribution } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionContributionService'; import * as extensionsRegistry from 'vs/workbench/services/extensions/common/extensionsRegistry'; @@ -136,7 +136,8 @@ export class InteractiveSessionContributionService implements IInteractiveSessio }]; Registry.as(ViewExtensions.ViewsRegistry).registerViews(viewDescriptor, viewContainer); - // Clear action in view title + // Actions in view title + const historyAction = registerAction2(getHistoryAction(viewId, providerDescriptor.id)); const clearAction = registerAction2(getClearAction(viewId, providerDescriptor.id)); // "Open Interactive Session Editor" Action @@ -147,6 +148,7 @@ export class InteractiveSessionContributionService implements IInteractiveSessio Registry.as(ViewExtensions.ViewsRegistry).deregisterViews(viewDescriptor, viewContainer); Registry.as(ViewExtensions.ViewContainersRegistry).deregisterViewContainer(viewContainer); clearAction.dispose(); + historyAction.dispose(); openEditor.dispose(); } }; diff --git a/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionEditor.ts b/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionEditor.ts index 261782866a4c78..ceca6bbdcd6dee 100644 --- a/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionEditor.ts +++ b/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionEditor.ts @@ -21,9 +21,10 @@ import { InteractiveSessionEditorInput } from 'vs/workbench/contrib/interactiveS import { IViewState, InteractiveSessionWidget } from 'vs/workbench/contrib/interactiveSession/browser/interactiveSessionWidget'; import { IInteractiveSessionService } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionService'; import { IInteractiveSessionModel } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionModel'; +import { DisposableStore } from 'vs/base/common/lifecycle'; export interface IInteractiveSessionEditorOptions extends IEditorOptions { - providerId: string; + target: { sessionId: string } | { providerId: string }; } export class InteractiveSessionEditor extends EditorPane { @@ -39,6 +40,8 @@ export class InteractiveSessionEditor extends EditorPane { private _memento: Memento | undefined; private _viewState: IViewState | undefined; + private _modelDisposables = this._register(new DisposableStore()); + constructor( @ITelemetryService telemetryService: ITelemetryService, @IThemeService themeService: IThemeService, @@ -89,22 +92,23 @@ export class InteractiveSessionEditor extends EditorPane { throw new Error('InteractiveSessionEditor lifecycle issue: no editor widget'); } - this.updateModel(editorModel.model, options); + this.updateModel(editorModel.model); } - private updateModel(model: IInteractiveSessionModel, options: IInteractiveSessionEditorOptions): void { + private updateModel(model: IInteractiveSessionModel): void { + this._modelDisposables.clear(); + this._memento = new Memento('interactive-session-editor-' + model.sessionId, this.storageService); this._viewState = this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.USER) as IViewState; this.widget.setModel(model, { ...this._viewState }); - const listener = model.onDidDispose(() => { + this._modelDisposables.add(model.onDidDispose(() => { // TODO go back to swapping out the EditorInput when the session is restarted instead of this listener - listener.dispose(); - const newModel = this.interactiveSessionService.startSession(options.providerId, false, CancellationToken.None); + const newModel = this.interactiveSessionService.startSession(model.providerId, CancellationToken.None); if (newModel) { (this.input as InteractiveSessionEditorInput).sessionId = newModel.sessionId; - this.updateModel(newModel, options); + this.updateModel(newModel); } - }); + })); } protected override saveState(): void { diff --git a/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionEditorInput.ts b/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionEditorInput.ts index 55ba227300b537..796c08c8950674 100644 --- a/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionEditorInput.ts +++ b/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionEditorInput.ts @@ -22,7 +22,9 @@ export class InteractiveSessionEditorInput extends EditorInput { static count = 0; private readonly inputCount: number; + public model: IInteractiveSessionModel | undefined; public sessionId: string | undefined; + public providerId: string | undefined; static getNewEditorUri(): URI { const handle = Math.floor(Math.random() * 1e9); @@ -32,7 +34,6 @@ export class InteractiveSessionEditorInput extends EditorInput { constructor( readonly resource: URI, readonly options: IInteractiveSessionEditorOptions, - initialSessionId: string | undefined, @IInteractiveSessionService private readonly interactiveSessionService: IInteractiveSessionService ) { super(); @@ -42,7 +43,8 @@ export class InteractiveSessionEditorInput extends EditorInput { throw new Error('Invalid interactive session URI'); } - this.sessionId = initialSessionId; + this.sessionId = 'sessionId' in options.target ? options.target.sessionId : undefined; + this.providerId = 'providerId' in options.target ? options.target.providerId : undefined; this.inputCount = InteractiveSessionEditorInput.count++; } @@ -69,7 +71,7 @@ export class InteractiveSessionEditorInput extends EditorInput { override async resolve(): Promise { const model = typeof this.sessionId === 'string' ? this.interactiveSessionService.retrieveSession(this.sessionId) : - this.interactiveSessionService.startSession(this.options.providerId, false, CancellationToken.None); + this.interactiveSessionService.startSession(this.providerId!, CancellationToken.None); if (!model) { return null; @@ -79,6 +81,13 @@ export class InteractiveSessionEditorInput extends EditorInput { this.sessionId = model.sessionId; return new InteractiveSessionEditorModel(model); } + + override dispose(): void { + super.dispose(); + if (this.sessionId) { + this.interactiveSessionService.clearSession(this.sessionId); + } + } } export class InteractiveSessionEditorModel extends Disposable implements IEditorModel { @@ -142,7 +151,6 @@ export namespace InteractiveSessionUri { interface ISerializedInteractiveSessionEditorInput { options: IInteractiveSessionEditorOptions; resource: URI; - sessionId: string; } export class InteractiveSessionEditorInputSerializer implements IEditorSerializer { @@ -161,8 +169,7 @@ export class InteractiveSessionEditorInputSerializer implements IEditorSerialize const obj: ISerializedInteractiveSessionEditorInput = { options: input.options, - resource: input.resource, - sessionId: input.sessionId + resource: input.resource }; return JSON.stringify(obj); } @@ -171,7 +178,7 @@ export class InteractiveSessionEditorInputSerializer implements IEditorSerialize try { const parsed: ISerializedInteractiveSessionEditorInput = JSON.parse(serializedEditor); const resource = URI.revive(parsed.resource); - return instantiationService.createInstance(InteractiveSessionEditorInput, resource, parsed.options as IInteractiveSessionEditorOptions, parsed.sessionId); + return instantiationService.createInstance(InteractiveSessionEditorInput, resource, parsed.options as IInteractiveSessionEditorOptions); } catch (err) { return undefined; } diff --git a/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionViewPane.ts b/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionViewPane.ts index 067883e8b1b8fb..c77eaa18814b2d 100644 --- a/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionViewPane.ts +++ b/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionViewPane.ts @@ -20,12 +20,17 @@ import { IViewPaneOptions, ViewPane } from 'vs/workbench/browser/parts/views/vie import { Memento } from 'vs/workbench/common/memento'; import { IViewDescriptorService } from 'vs/workbench/common/views'; import { IViewState, InteractiveSessionWidget } from 'vs/workbench/contrib/interactiveSession/browser/interactiveSessionWidget'; +import { IInteractiveSessionModel } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionModel'; import { IInteractiveSessionService } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionService'; export interface IInteractiveSessionViewOptions { readonly providerId: string; } +interface IViewPaneState extends IViewState { + sessionId?: string; +} + export const INTERACTIVE_SIDEBAR_PANEL_ID = 'workbench.panel.interactiveSessionSidebar'; export class InteractiveSessionViewPane extends ViewPane { static ID = 'workbench.panel.interactiveSession.view'; @@ -35,7 +40,7 @@ export class InteractiveSessionViewPane extends ViewPane { private modelDisposables = this._register(new DisposableStore()); private memento: Memento; - private viewState: IViewState; + private viewState: IViewPaneState; constructor( private readonly interactiveSessionViewOptions: IInteractiveSessionViewOptions, @@ -56,18 +61,19 @@ export class InteractiveSessionViewPane extends ViewPane { // View state for the ViewPane is currently global per-provider basically, but some other strictly per-model state will require a separate memento. this.memento = new Memento('interactive-session-view-' + this.interactiveSessionViewOptions.providerId, this.storageService); - this.viewState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.USER) as IViewState; + this.viewState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.USER) as IViewPaneState; } - private updateModel(initial = false): void { + private updateModel(model?: IInteractiveSessionModel | undefined): void { this.modelDisposables.clear(); - const model = this.interactiveSessionService.startSession(this.interactiveSessionViewOptions.providerId, initial, CancellationToken.None); + model = model ?? this.interactiveSessionService.startSession(this.interactiveSessionViewOptions.providerId, CancellationToken.None); if (!model) { throw new Error('Could not start interactive session'); } this._widget.setModel(model, { ...this.viewState }); + this.viewState.sessionId = model.sessionId; this.modelDisposables.add(model.onDidDispose(() => { this.updateModel(); })); @@ -84,7 +90,8 @@ export class InteractiveSessionViewPane extends ViewPane { })); this._widget.render(parent); - this.updateModel(true); + const initialModel = this.viewState.sessionId ? this.interactiveSessionService.retrieveSession(this.viewState.sessionId) : undefined; + this.updateModel(initialModel); } acceptInput(query?: string): void { diff --git a/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionWidget.ts b/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionWidget.ts index 0256c56e655056..978f3479241713 100644 --- a/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionWidget.ts +++ b/src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionWidget.ts @@ -176,18 +176,14 @@ export class InteractiveSessionWidget extends Disposable implements IInteractive private onDidChangeItems() { if (this.tree && this.visible) { - const items: InteractiveTreeItem[] = this.viewModel?.getItems() ?? []; - if (this.viewModel?.welcomeMessage) { - items.unshift(this.viewModel.welcomeMessage); - } - - const treeItems = items.map(item => { - return >{ - element: item, - collapsed: false, - collapsible: false - }; - }); + const treeItems = (this.viewModel?.getItems() ?? []) + .map(item => { + return >{ + element: item, + collapsed: false, + collapsible: false + }; + }); this.tree.setChildren(null, treeItems, { diffIdentityProvider: { @@ -202,7 +198,7 @@ export class InteractiveSessionWidget extends Disposable implements IInteractive } }); - const lastItem = items[items.length - 1]; + const lastItem = treeItems[treeItems.length - 1]?.element; if (lastItem && isResponseVM(lastItem) && lastItem.isComplete) { this.renderFollowups(lastItem.replyFollowups); } else { @@ -436,14 +432,6 @@ export class InteractiveSessionWidget extends Disposable implements IInteractive this.inputPart.saveState(); return { inputValue: this.inputPart.inputEditor.getValue() }; } - - public override dispose(): void { - super.dispose(); - - if (this.viewModel) { - this.interactiveSessionService.releaseSession(this.viewModel.sessionId); - } - } } export class InteractiveSessionWidgetService implements IInteractiveSessionWidgetService { diff --git a/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionModel.ts b/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionModel.ts index 57e6878c1f8e0d..6ce4b9ce686322 100644 --- a/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionModel.ts +++ b/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionModel.ts @@ -54,10 +54,17 @@ export class InteractiveRequestModel implements IInteractiveRequestModel { return this._id; } + public get username(): string { + return this._session.requesterUsername; + } + + public get avatarIconUri(): URI | undefined { + return this._session.requesterAvatarIconUri; + } + constructor( - public readonly message: string | IInteractiveSessionReplyFollowup, - public readonly username: string, - public readonly avatarIconUri?: URI) { + private readonly _session: InteractiveSessionModel, + public readonly message: string | IInteractiveSessionReplyFollowup) { this._id = 'request_' + InteractiveRequestModel.nextId++; } } @@ -105,11 +112,17 @@ export class InteractiveResponseModel extends Disposable implements IInteractive return this._session.providerId; } + public get username(): string { + return this._session.responderUsername; + } + + public get avatarIconUri(): URI | undefined { + return this._session.responderAvatarIconUri; + } + constructor( private _response: IMarkdownString, private readonly _session: InteractiveSessionModel, - public readonly username: string, - public readonly avatarIconUri?: URI, private _isComplete: boolean = false, private _isCanceled = false, private _vote?: InteractiveSessionVoteDirection, @@ -158,6 +171,7 @@ export interface IInteractiveSessionModel { readonly onDidChange: Event; readonly sessionId: string; readonly providerId: string; + // readonly title: string; readonly welcomeMessage: IInteractiveSessionWelcomeMessageModel | undefined; readonly requestInProgress: boolean; readonly inputPlaceholder?: string; @@ -166,7 +180,7 @@ export interface IInteractiveSessionModel { } export interface ISerializableInteractiveSessionsData { - [providerId: string]: ISerializableInteractiveSessionData[]; + [sessionId: string]: ISerializableInteractiveSessionData; } export interface ISerializableInteractiveSessionRequestData { @@ -181,7 +195,8 @@ export interface ISerializableInteractiveSessionRequestData { export interface ISerializableInteractiveSessionData { sessionId: string; - // welcomeMessage: string | undefined; + creationDate: number; + welcomeMessage: (string | IInteractiveSessionReplyFollowup[])[] | undefined; requests: ISerializableInteractiveSessionRequestData[]; requesterUsername: string; responderUsername: string; @@ -191,7 +206,7 @@ export interface ISerializableInteractiveSessionData { providerState: any; } -export type IInteractiveSessionChangeEvent = IInteractiveSessionAddRequestEvent | IInteractiveSessionAddResponseEvent | IInteractiveSessionClearEvent; +export type IInteractiveSessionChangeEvent = IInteractiveSessionAddRequestEvent | IInteractiveSessionAddResponseEvent | IInteractiveSessionInitEvent; export interface IInteractiveSessionAddRequestEvent { kind: 'addRequest'; @@ -203,8 +218,8 @@ export interface IInteractiveSessionAddResponseEvent { response: IInteractiveResponseModel; } -export interface IInteractiveSessionClearEvent { - kind: 'clear'; +export interface IInteractiveSessionInitEvent { + kind: 'initialize'; } export class InteractiveSessionModel extends Disposable implements IInteractiveSessionModel { @@ -248,15 +263,42 @@ export class InteractiveSessionModel extends Disposable implements IInteractiveS return !!lastRequest && !!lastRequest.response && !lastRequest.response.isComplete; } + private _creationDate: number; + get creationDate(): number { + return this._creationDate; + } + + get requesterUsername(): string { + return this._session?.requesterUsername ?? this.initialData?.requesterUsername ?? ''; + } + + get responderUsername(): string { + return this._session?.responderUsername ?? this.initialData?.responderUsername ?? ''; + } + + private readonly _initialRequesterAvatarIconUri: URI | undefined; + get requesterAvatarIconUri(): URI | undefined { + return this._session?.requesterAvatarIconUri ?? this._initialRequesterAvatarIconUri; + } + + private readonly _initialResponderAvatarIconUri: URI | undefined; + get responderAvatarIconUri(): URI | undefined { + return this._session?.responderAvatarIconUri ?? this._initialResponderAvatarIconUri; + } + constructor( public readonly providerId: string, - initialData: ISerializableInteractiveSessionData | undefined, + private readonly initialData: ISerializableInteractiveSessionData | undefined, @ILogService private readonly logService: ILogService ) { super(); this._sessionId = initialData ? initialData.sessionId : generateUuid(); this._requests = initialData ? this._deserialize(initialData) : []; this._providerState = initialData ? initialData.providerState : undefined; + this._creationDate = initialData?.creationDate ?? Date.now(); + + this._initialRequesterAvatarIconUri = initialData?.requesterAvatarIconUri && URI.revive(initialData.requesterAvatarIconUri); + this._initialResponderAvatarIconUri = initialData?.responderAvatarIconUri && URI.revive(initialData.responderAvatarIconUri); } private _deserialize(obj: ISerializableInteractiveSessionData): InteractiveRequestModel[] { @@ -266,10 +308,15 @@ export class InteractiveSessionModel extends Disposable implements IInteractiveS return []; } + if (obj.welcomeMessage) { + const content = obj.welcomeMessage.map(item => typeof item === 'string' ? new MarkdownString(item) : item); + this._welcomeMessage = new InteractiveSessionWelcomeMessageModel(content, obj.responderUsername, obj.responderAvatarIconUri && URI.revive(obj.responderAvatarIconUri)); + } + return requests.map((raw: ISerializableInteractiveSessionRequestData) => { - const request = new InteractiveRequestModel(raw.message, obj.requesterUsername, obj.requesterAvatarIconUri && URI.revive(obj.requesterAvatarIconUri)); + const request = new InteractiveRequestModel(this, raw.message); if (raw.response || raw.responseErrorDetails) { - request.response = new InteractiveResponseModel(new MarkdownString(raw.response), this, obj.responderUsername, obj.responderAvatarIconUri && URI.revive(obj.responderAvatarIconUri), true, raw.isCanceled, raw.vote, raw.providerResponseId, raw.responseErrorDetails, raw.followups); + request.response = new InteractiveResponseModel(new MarkdownString(raw.response), this, true, raw.isCanceled, raw.vote, raw.providerResponseId, raw.responseErrorDetails, raw.followups); } return request; }); @@ -281,7 +328,11 @@ export class InteractiveSessionModel extends Disposable implements IInteractiveS } this._session = session; - this._welcomeMessage = welcomeMessage; + if (!this._welcomeMessage) { + // Could also have loaded the welcome message from persisted data + this._welcomeMessage = welcomeMessage; + } + this._isInitializedDeferred.complete(); if (session.onDidChangeState) { @@ -290,18 +341,13 @@ export class InteractiveSessionModel extends Disposable implements IInteractiveS this.logService.trace('InteractiveSessionModel#acceptNewSessionState'); })); } + this._onDidChange.fire({ kind: 'initialize' }); } waitForInitialization(): Promise { return this._isInitializedDeferred.p; } - clear(): void { - this._requests.forEach(r => r.response?.dispose()); - this._requests = []; - this._onDidChange.fire({ kind: 'clear' }); - } - getRequests(): InteractiveRequestModel[] { return this._requests; } @@ -311,8 +357,8 @@ export class InteractiveSessionModel extends Disposable implements IInteractiveS throw new Error('addRequest: No session'); } - const request = new InteractiveRequestModel(message, this._session.requesterUsername, this._session.requesterAvatarIconUri); - request.response = new InteractiveResponseModel(new MarkdownString(''), this, this._session.responderUsername, this._session.responderAvatarIconUri); + const request = new InteractiveRequestModel(this, message); + request.response = new InteractiveResponseModel(new MarkdownString(''), this); this._requests.push(request); this._onDidChange.fire({ kind: 'addRequest', request }); @@ -325,7 +371,7 @@ export class InteractiveSessionModel extends Disposable implements IInteractiveS } if (!request.response) { - request.response = new InteractiveResponseModel(new MarkdownString(''), this, this._session.responderUsername, this._session.responderAvatarIconUri); + request.response = new InteractiveResponseModel(new MarkdownString(''), this); } if (request.response.isComplete) { @@ -351,7 +397,7 @@ export class InteractiveSessionModel extends Disposable implements IInteractiveS } if (!request.response) { - request.response = new InteractiveResponseModel(new MarkdownString(''), this, this._session.responderUsername, this._session.responderAvatarIconUri); + request.response = new InteractiveResponseModel(new MarkdownString(''), this); } request.response.complete(rawResponse.errorDetails); @@ -374,11 +420,18 @@ export class InteractiveSessionModel extends Disposable implements IInteractiveS toJSON(): ISerializableInteractiveSessionData { return { sessionId: this.sessionId, + creationDate: this._creationDate, requesterUsername: this._session!.requesterUsername, requesterAvatarIconUri: this._session!.requesterAvatarIconUri, responderUsername: this._session!.responderUsername, responderAvatarIconUri: this._session!.responderAvatarIconUri, - // welcomeMessage: this._welcomeMessage, + welcomeMessage: this._welcomeMessage?.content.map(c => { + if (Array.isArray(c)) { + return c; + } else { + return c.value; + } + }), requests: this._requests.map((r): ISerializableInteractiveSessionRequestData => { return { providerResponseId: r.response?.providerResponseId, diff --git a/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionService.ts b/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionService.ts index 08f3df79ab9974..a6659a3e0313b2 100644 --- a/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionService.ts +++ b/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionService.ts @@ -152,6 +152,11 @@ export interface IInteractiveSessionCompleteResponse { errorDetails?: IInteractiveResponseErrorDetails; } +export interface IInteractiveSessionDetail { + sessionId: string; + title: string; +} + export interface IInteractiveProviderInfo { id: string; displayName: string; @@ -163,7 +168,7 @@ export interface IInteractiveSessionService { _serviceBrand: undefined; registerProvider(provider: IInteractiveProvider): IDisposable; getProviderInfos(): IInteractiveProviderInfo[]; - startSession(providerId: string, allowRestoringSession: boolean, token: CancellationToken): InteractiveSessionModel | undefined; + startSession(providerId: string, token: CancellationToken): InteractiveSessionModel | undefined; retrieveSession(sessionId: string): IInteractiveSessionModel | undefined; /** @@ -176,7 +181,7 @@ export interface IInteractiveSessionService { addInteractiveRequest(context: any): void; addCompleteRequest(sessionId: string, message: string, response: IInteractiveSessionCompleteResponse): void; sendInteractiveRequestToProvider(sessionId: string, message: IInteractiveSessionDynamicRequest): void; - releaseSession(sessionId: string): void; + getHistory(): IInteractiveSessionDetail[]; onDidPerformUserAction: Event; notifyUserAction(event: IInteractiveSessionUserActionEvent): void; diff --git a/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionServiceImpl.ts b/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionServiceImpl.ts index 8259b082680b31..e460a332cddcad 100644 --- a/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionServiceImpl.ts +++ b/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionServiceImpl.ts @@ -5,7 +5,6 @@ import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async'; import { CancellationToken } from 'vs/base/common/cancellation'; -import { groupBy } from 'vs/base/common/collections'; import { Emitter, Event } from 'vs/base/common/event'; import { MarkdownString } from 'vs/base/common/htmlContent'; import { Iterable } from 'vs/base/common/iterator'; @@ -21,7 +20,7 @@ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storag import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { CONTEXT_PROVIDER_EXISTS } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionContextKeys'; import { ISerializableInteractiveSessionData, ISerializableInteractiveSessionsData, InteractiveSessionModel, InteractiveSessionWelcomeMessageModel } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionModel'; -import { IInteractiveProgress, IInteractiveProvider, IInteractiveProviderInfo, IInteractiveSession, IInteractiveSessionCompleteResponse, IInteractiveSessionDynamicRequest, IInteractiveSessionReplyFollowup, IInteractiveSessionService, IInteractiveSessionUserActionEvent, IInteractiveSlashCommand, InteractiveSessionCopyKind, InteractiveSessionVoteDirection } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionService'; +import { IInteractiveProgress, IInteractiveProvider, IInteractiveProviderInfo, IInteractiveSession, IInteractiveSessionCompleteResponse, IInteractiveSessionDetail, IInteractiveSessionDynamicRequest, IInteractiveSessionReplyFollowup, IInteractiveSessionService, IInteractiveSessionUserActionEvent, IInteractiveSlashCommand, InteractiveSessionCopyKind, InteractiveSessionVoteDirection } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionService'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; const serializedInteractiveSessionKey = 'interactive.sessions'; @@ -104,21 +103,22 @@ type InteractiveSessionTerminalClassification = { comment: 'Provides insight into the usage of InteractiveSession features.'; }; +const maxPersistedSessions = 20; + export class InteractiveSessionService extends Disposable implements IInteractiveSessionService { declare _serviceBrand: undefined; private readonly _providers = new Map(); private readonly _sessionModels = new Map(); - private readonly _releasedSessions = new Set(); private readonly _pendingRequests = new Map>(); - private readonly _unprocessedPersistedSessions: ISerializableInteractiveSessionsData; + private readonly _persistedSessions: ISerializableInteractiveSessionsData; private readonly _hasProvider: IContextKey; private readonly _onDidPerformUserAction = this._register(new Emitter()); public readonly onDidPerformUserAction: Event = this._onDidPerformUserAction.event; constructor( - @IStorageService storageService: IStorageService, + @IStorageService private readonly storageService: IStorageService, @ILogService private readonly logService: ILogService, @IExtensionService private readonly extensionService: IExtensionService, @IInstantiationService private readonly instantiationService: IInstantiationService, @@ -131,21 +131,28 @@ export class InteractiveSessionService extends Disposable implements IInteractiv const sessionData = storageService.get(serializedInteractiveSessionKey, StorageScope.WORKSPACE, ''); if (sessionData) { - this._unprocessedPersistedSessions = this.deserializeInteractiveSessions(sessionData); - const countsForLog = Object.keys(this._unprocessedPersistedSessions).map(key => `${key}: ${this._unprocessedPersistedSessions[key].length}`).join(', '); - this.trace('constructor', `Restored persisted sessions: ${countsForLog}`); + this._persistedSessions = this.deserializeInteractiveSessions(sessionData); + const countsForLog = Object.keys(this._persistedSessions).length; + this.trace('constructor', `Restored ${countsForLog} persisted sessions`); } else { - this._unprocessedPersistedSessions = {}; + this._persistedSessions = {}; this.trace('constructor', 'No persisted sessions'); } - this._register(storageService.onWillSaveState(e => { - const allSessions = Array.from(this._sessionModels.values()) - .filter(session => session.getRequests().length > 0); - const serialized = JSON.stringify(allSessions); - this.trace('onWillSaveState', `Persisting ${this._sessionModels.size} sessions`); - storageService.store(serializedInteractiveSessionKey, serialized, StorageScope.WORKSPACE, StorageTarget.MACHINE); - })); + this._register(storageService.onWillSaveState(() => this.saveState())); + } + + private saveState(): void { + let allSessions: (InteractiveSessionModel | ISerializableInteractiveSessionData)[] = Array.from(this._sessionModels.values()) + .filter(session => session.getRequests().length > 0); + allSessions = allSessions.concat( + Object.values(this._persistedSessions).filter(session => session.requests.length)); + allSessions.sort((a, b) => (b.creationDate ?? 0) - (a.creationDate ?? 0)); + allSessions = allSessions.slice(0, maxPersistedSessions); + this.trace('onWillSaveState', `Persisting ${allSessions.length} sessions`); + + const serialized = JSON.stringify(allSessions); + this.storageService.store(serializedInteractiveSessionKey, serialized, StorageScope.WORKSPACE, StorageTarget.MACHINE); } notifyUserAction(action: IInteractiveSessionUserActionEvent): void { @@ -196,26 +203,32 @@ export class InteractiveSessionService extends Disposable implements IInteractiv throw new Error('Expected array'); } - return groupBy(arrayOfSessions, item => item.providerId); + const sessions = arrayOfSessions.reduce((acc, session) => { + acc[session.sessionId] = session; + return acc; + }, {} as ISerializableInteractiveSessionsData); + return sessions; } catch (err) { this.error('deserializeInteractiveSessions', `Malformed session data: ${err}. [${sessionData.substring(0, 20)}${sessionData.length > 20 ? '...' : ''}]`); return {}; } } - startSession(providerId: string, allowRestoringSession: boolean, token: CancellationToken): InteractiveSessionModel { - this.trace('startSession', `providerId=${providerId}, allowRestoringSession=${allowRestoringSession}`); + getHistory(): IInteractiveSessionDetail[] { + const sessions = Object.values(this._persistedSessions); + sessions.sort((a, b) => (b.creationDate ?? 0) - (a.creationDate ?? 0)); - const restored = allowRestoringSession ? this.getNextRestoredSession(providerId) : undefined; - if (restored instanceof InteractiveSessionModel) { - this.trace('startSession', `Restored live session with id ${restored.sessionId}`); - return restored; - } - - const someSessionHistory = restored; - this.trace('startSession', `Has history: ${!!someSessionHistory}. Including provider state: ${!!someSessionHistory?.providerState}`); + return sessions.map(item => { + return { + sessionId: item.sessionId, + title: item.requests[0]?.message || '', + }; + }); + } - return this._startSession(providerId, someSessionHistory, token); + startSession(providerId: string, token: CancellationToken): InteractiveSessionModel { + this.trace('startSession', `providerId=${providerId}`); + return this._startSession(providerId, undefined, token); } private _startSession(providerId: string, someSessionHistory: ISerializableInteractiveSessionData | undefined, token: CancellationToken): InteractiveSessionModel { @@ -227,7 +240,8 @@ export class InteractiveSessionService extends Disposable implements IInteractiv model.dispose(); this._sessionModels.delete(model.sessionId); } - }).catch(() => { + }).catch(err => { + this.trace('startSession', `initializeSession failed: ${err}`); model.dispose(); this._sessionModels.delete(model.sessionId); }); @@ -253,8 +267,7 @@ export class InteractiveSessionService extends Disposable implements IInteractiv if (!session) { if (sessionHistory) { // sessionHistory was not used, so store it for later - const providerData = this._unprocessedPersistedSessions[model.providerId]; - providerData?.unshift(sessionHistory); + this._persistedSessions[sessionHistory.sessionId] = sessionHistory; } this.trace('startSession', 'Provider returned no session'); @@ -271,55 +284,21 @@ export class InteractiveSessionService extends Disposable implements IInteractiv return model; } - private getNextRestoredSession(providerId: string): InteractiveSessionModel | ISerializableInteractiveSessionData | undefined { - const releasedSessionId = Iterable.find(this._releasedSessions.values(), sessionId => this._sessionModels.get(sessionId)?.providerId === providerId); - if (typeof releasedSessionId === 'string') { - this._releasedSessions.delete(releasedSessionId); - return this._sessionModels.get(releasedSessionId); - } - - const providerData = this._unprocessedPersistedSessions[providerId] ?? []; - return providerData.shift(); - } - - releaseSession(sessionId: string): void { - this.trace('releaseSession', `sessionId=${sessionId}`); - this._releasedSessions.add(sessionId); - } - retrieveSession(sessionId: string): InteractiveSessionModel | undefined { - if (this._releasedSessions.has(sessionId)) { - this._releasedSessions.delete(sessionId); - } - const model = this._sessionModels.get(sessionId); if (model) { return model; } - const sessionData = this.findPersistedSession(sessionId); + const sessionData = this._persistedSessions[sessionId]; if (!sessionData) { return undefined; } - this._unprocessedPersistedSessions[sessionData.providerId] = - this._unprocessedPersistedSessions[sessionData.providerId].filter(item => item.sessionId !== sessionId); + delete this._persistedSessions[sessionId]; return this._startSession(sessionData.providerId, sessionData, CancellationToken.None); } - private findPersistedSession(sessionId: string): ISerializableInteractiveSessionData | undefined { - // TODO maybe this should just be keyed by sessionId - for (const provider of Object.keys(this._unprocessedPersistedSessions)) { - for (const session of this._unprocessedPersistedSessions[provider]) { - if (session.sessionId === sessionId) { - return session; - } - } - } - - return undefined; - } - async sendRequest(sessionId: string, request: string | IInteractiveSessionReplyFollowup): Promise { const messageText = typeof request === 'string' ? request : request.message; this.trace('sendRequest', `sessionId: ${sessionId}, message: ${messageText.substring(0, 20)}${messageText.length > 20 ? '[...]' : ''}}`); @@ -511,10 +490,10 @@ export class InteractiveSessionService extends Disposable implements IInteractiv throw new Error(`Unknown session: ${sessionId}`); } + this._persistedSessions[sessionId] = model.toJSON(); model.dispose(); this._sessionModels.delete(sessionId); this._pendingRequests.get(sessionId)?.cancel(); - this._releasedSessions.delete(sessionId); } registerProvider(provider: IInteractiveProvider): IDisposable { diff --git a/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionViewModel.ts b/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionViewModel.ts index 3f96a66adc2651..9ff23575b63b5f 100644 --- a/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionViewModel.ts +++ b/src/vs/workbench/contrib/interactiveSession/common/interactiveSessionViewModel.ts @@ -10,7 +10,7 @@ import { URI } from 'vs/base/common/uri'; import { localize } from 'vs/nls'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ILogService } from 'vs/platform/log/common/log'; -import { IInteractiveRequestModel, IInteractiveResponseModel, IInteractiveSessionModel, IInteractiveSessionWelcomeMessageModel, IInteractiveWelcomeMessageContent } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionModel'; +import { IInteractiveRequestModel, IInteractiveResponseModel, IInteractiveSessionModel, IInteractiveWelcomeMessageContent } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionModel'; import { IInteractiveResponseErrorDetails, IInteractiveSessionReplyFollowup, IInteractiveSessionResponseCommandFollowup, InteractiveSessionVoteDirection } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionService'; import { countWords } from 'vs/workbench/contrib/interactiveSession/common/interactiveSessionWordCounter'; @@ -31,10 +31,9 @@ export interface IInteractiveSessionViewModel { readonly sessionId: string; readonly onDidDisposeModel: Event; readonly onDidChange: Event; - readonly welcomeMessage: IInteractiveWelcomeMessageViewModel | undefined; readonly requestInProgress: boolean; readonly inputPlaceholder?: string; - getItems(): (IInteractiveRequestViewModel | IInteractiveResponseViewModel)[]; + getItems(): (IInteractiveRequestViewModel | IInteractiveResponseViewModel | IInteractiveWelcomeMessageViewModel)[]; } export interface IInteractiveRequestViewModel { @@ -93,10 +92,6 @@ export class InteractiveSessionViewModel extends Disposable implements IInteract return this._model.inputPlaceholder; } - get welcomeMessage() { - return this._model.welcomeMessage; - } - get sessionId() { return this._model.sessionId; } @@ -124,10 +119,7 @@ export class InteractiveSessionViewModel extends Disposable implements IInteract this._register(_model.onDidDispose(() => this._onDidDisposeModel.fire())); this._register(_model.onDidChange(e => { - if (e.kind === 'clear') { - this._items.length = 0; - this._onDidChange.fire(); - } else if (e.kind === 'addRequest') { + if (e.kind === 'addRequest') { this._items.push(new InteractiveRequestViewModel(e.request)); if (e.request.response) { this.onAddResponse(e.request.response); @@ -147,7 +139,7 @@ export class InteractiveSessionViewModel extends Disposable implements IInteract } getItems() { - return [...this._items]; + return [...(this._model.welcomeMessage ? [this._model.welcomeMessage] : []), ...this._items]; } override dispose() { @@ -326,23 +318,3 @@ export interface IInteractiveWelcomeMessageViewModel { readonly avatarIconUri?: URI; readonly content: IInteractiveWelcomeMessageContent[]; } - -export class InteractiveWelcomeMessageViewModel implements IInteractiveWelcomeMessageViewModel { - get id() { - return this._model.id; - } - - get username() { - return this._model.username; - } - - get avatarIconUri() { - return this._model.avatarIconUri; - } - - get content() { - return this._model.content; - } - - constructor(readonly _model: IInteractiveSessionWelcomeMessageModel) { } -} diff --git a/src/vs/workbench/contrib/interactiveSession/test/common/interactiveSessionService.test.ts b/src/vs/workbench/contrib/interactiveSession/test/common/interactiveSessionService.test.ts index 73dd135e234725..220af1c797844e 100644 --- a/src/vs/workbench/contrib/interactiveSession/test/common/interactiveSessionService.test.ts +++ b/src/vs/workbench/contrib/interactiveSession/test/common/interactiveSessionService.test.ts @@ -73,18 +73,18 @@ suite('InteractiveSession', () => { testDisposables.clear(); }); - test('Restores state for the correct provider', async () => { + test('retrieveSession', async () => { const testService = instantiationService.createInstance(InteractiveSessionService); const provider1 = new SimpleTestProvider('provider1'); const provider2 = new SimpleTestProvider('provider2'); testService.registerProvider(provider1); testService.registerProvider(provider2); - let session1 = testService.startSession('provider1', true, CancellationToken.None); + const session1 = testService.startSession('provider1', CancellationToken.None); await session1.waitForInitialization(); session1!.addRequest('request 1'); - let session2 = testService.startSession('provider2', true, CancellationToken.None); + const session2 = testService.startSession('provider2', CancellationToken.None); await session2.waitForInitialization(); session2!.addRequest('request 2'); @@ -97,10 +97,10 @@ suite('InteractiveSession', () => { const testService2 = instantiationService.createInstance(InteractiveSessionService); testService2.registerProvider(provider1); testService2.registerProvider(provider2); - session1 = testService2.startSession('provider1', true, CancellationToken.None); - await session1.waitForInitialization(); - session2 = testService2.startSession('provider2', true, CancellationToken.None); - await session2.waitForInitialization(); + const retrieved1 = testService2.retrieveSession(session1.sessionId); + await retrieved1!.waitForInitialization(); + const retrieved2 = testService2.retrieveSession(session2.sessionId); + await retrieved2!.waitForInitialization(); assert.deepStrictEqual(provider1.lastInitialState, { state: 'provider1_state' }); assert.deepStrictEqual(provider2.lastInitialState, { state: 'provider2_state' }); }); @@ -127,7 +127,7 @@ suite('InteractiveSession', () => { const provider1 = getFailProvider('provider1'); testService.registerProvider(provider1); - const session1 = testService.startSession('provider1', true, CancellationToken.None); + const session1 = testService.startSession('provider1', CancellationToken.None); await assert.rejects(() => session1.waitForInitialization()); }); @@ -179,7 +179,7 @@ suite('InteractiveSession', () => { testService.registerProvider(provider); - const model = testService.startSession('testProvider', true, CancellationToken.None); + const model = testService.startSession('testProvider', CancellationToken.None); const commands = await testService.getSlashCommands(model.sessionId, CancellationToken.None); assert.strictEqual(commands?.length, 1); @@ -192,7 +192,7 @@ suite('InteractiveSession', () => { const testService = instantiationService.createInstance(InteractiveSessionService); testService.registerProvider(new SimpleTestProvider('testProvider')); - const model = testService.startSession('testProvider', true, CancellationToken.None); + const model = testService.startSession('testProvider', CancellationToken.None); assert.strictEqual(model.getRequests().length, 0); await testService.sendInteractiveRequestToProvider(model.sessionId, { message: 'test request' }); @@ -203,7 +203,7 @@ suite('InteractiveSession', () => { const testService = instantiationService.createInstance(InteractiveSessionService); testService.registerProvider(new SimpleTestProvider('testProvider')); - const model = testService.startSession('testProvider', true, CancellationToken.None); + const model = testService.startSession('testProvider', CancellationToken.None); assert.strictEqual(model.getRequests().length, 0); await testService.addCompleteRequest(model.sessionId, 'test request', { message: 'test response' }); diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts index c0e9521b89727a..fdf55583f88143 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts @@ -19,6 +19,8 @@ import { CellStatusbarAlignment, INotebookCellStatusBarItem, NotebookCellExecuti import { INotebookCellExecution, INotebookExecutionStateService, NotebookExecutionType } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService'; import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService'; import { IMarkdownString } from 'vs/base/common/htmlContent'; +import { Codicon } from 'vs/base/common/codicons'; +import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; export function formatCellDuration(duration: number, showMilliseconds: boolean = true): string { if (showMilliseconds && duration < 1000) { @@ -107,7 +109,8 @@ class ExecutionStateCellStatusBarItem extends Disposable { constructor( private readonly _notebookViewModel: INotebookViewModel, private readonly _cell: ICellViewModel, - @INotebookExecutionStateService private readonly _executionStateService: INotebookExecutionStateService + @INotebookExecutionStateService private readonly _executionStateService: INotebookExecutionStateService, + @IConfigurationService private readonly _configurationService: IConfigurationService, ) { super(); @@ -153,49 +156,63 @@ class ExecutionStateCellStatusBarItem extends Disposable { } } - const item = this._getItemForState(runState, this._cell.internalMetadata); - return item ? [item] : []; + const items = this._getItemForState(runState, this._cell.internalMetadata); + return items; } - private _getItemForState(runState: INotebookCellExecution | undefined, internalMetadata: NotebookCellInternalMetadata): INotebookCellStatusBarItem | undefined { + private _getItemForState(runState: INotebookCellExecution | undefined, internalMetadata: NotebookCellInternalMetadata): INotebookCellStatusBarItem[] { + const experimentErrorFix = this._configurationService.getValue('notebook.experimental.interactiveFix'); const state = runState?.state; const { lastRunSuccess } = internalMetadata; if (!state && lastRunSuccess) { - return { + return [{ text: `$(${successStateIcon.id})`, color: themeColorFromId(cellStatusIconSuccess), tooltip: localize('notebook.cell.status.success', "Success"), alignment: CellStatusbarAlignment.Left, priority: Number.MAX_SAFE_INTEGER - }; + }]; } else if (!state && lastRunSuccess === false) { - return { + const items: INotebookCellStatusBarItem[] = [{ text: `$(${errorStateIcon.id})`, color: themeColorFromId(cellStatusIconError), tooltip: localize('notebook.cell.status.failed', "Failed"), alignment: CellStatusbarAlignment.Left, priority: Number.MAX_SAFE_INTEGER - }; + }]; + + if (experimentErrorFix) { + items.push({ + text: `$(${Codicon.sparkle.id})`, + color: themeColorFromId(cellStatusIconSuccess), + tooltip: localize('notebook.cell.status.fixError', "Fix Error"), + alignment: CellStatusbarAlignment.Left, + command: 'notebook.cell.fixError', + priority: Number.MAX_SAFE_INTEGER + }); + } + + return items; } else if (state === NotebookCellExecutionState.Pending || state === NotebookCellExecutionState.Unconfirmed) { - return { + return [{ text: `$(${pendingStateIcon.id})`, tooltip: localize('notebook.cell.status.pending', "Pending"), alignment: CellStatusbarAlignment.Left, priority: Number.MAX_SAFE_INTEGER - }; + }]; } else if (state === NotebookCellExecutionState.Executing) { const icon = runState?.didPause ? executingStateIcon : ThemeIcon.modify(executingStateIcon, 'spin'); - return { + return [{ text: `$(${icon.id})`, tooltip: localize('notebook.cell.status.executing', "Executing"), alignment: CellStatusbarAlignment.Left, priority: Number.MAX_SAFE_INTEGER - }; + }]; } - return; + return []; } override dispose() { diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts index cb460eded4cf29..9da02fa3f15718 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts @@ -148,16 +148,19 @@ export class FindModel extends Disposable { if (cell && cell.cellKind === CellKind.Markup) { const foundContentMatch = contentMatches.find(m => m.cell.handle === cell.handle && m.contentMatches.length > 0); const targetState = foundContentMatch ? CellEditState.Editing : CellEditState.Preview; - if (cell.getEditState() !== targetState) { + const currentEditingState = cell.getEditState(); + + if (currentEditingState === CellEditState.Editing && cell.editStateSource !== 'find') { + // it's already in editing mode, we should not update + continue; + } + if (currentEditingState !== targetState) { cell.updateEditState(targetState, 'find'); } } } }; - if (this._state.replaceString.length === 0) { - return; - } if (e.isReplaceRevealed) { updateEditingState(); diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts index 4f2b6c0632b059..a2400b2ea938f9 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.ts @@ -236,7 +236,7 @@ class NotebookFindWidget extends SimpleFindReplaceWidget implements INotebookEdi override async show(initialInput?: string, options?: IShowNotebookFindWidgetOptions): Promise { const searchStringUpdate = this._state.searchString !== initialInput; super.show(initialInput, options); - this._state.change({ searchString: initialInput ?? '', isRevealed: true }, false); + this._state.change({ searchString: initialInput ?? this._state.searchString, isRevealed: true }, false); if (typeof options?.matchIndex === 'number') { if (!this._findModel.findMatches.length) { diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants.ts b/src/vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants.ts index b1c318d5d353ec..7305bc2736ffa4 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants.ts @@ -22,6 +22,9 @@ import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from 'vs/workbench/services/workingCopy/common/storedFileWorkingCopy'; import { IStoredFileWorkingCopySaveParticipant, IWorkingCopyFileService } from 'vs/workbench/services/workingCopy/common/workingCopyFileService'; import { NotebookSetting } from 'vs/workbench/contrib/notebook/common/notebookCommon'; +import { ICommandService } from 'vs/platform/commands/common/commands'; +import { ILogService } from 'vs/platform/log/common/log'; +import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust'; class FormatOnSaveParticipant implements IStoredFileWorkingCopySaveParticipant { constructor( @@ -85,6 +88,57 @@ class FormatOnSaveParticipant implements IStoredFileWorkingCopySaveParticipant { } } +class CodeActionOnSaveParticipant implements IStoredFileWorkingCopySaveParticipant { + constructor( + @IConfigurationService private readonly configurationService: IConfigurationService, + @ICommandService private readonly commandService: ICommandService, + @ILogService private readonly logService: ILogService, + @IWorkspaceTrustManagementService private readonly workspaceTrustManagementService: IWorkspaceTrustManagementService, + ) { + } + + async participate(workingCopy: IStoredFileWorkingCopy, context: { reason: SaveReason }, progress: IProgress, _token: CancellationToken): Promise { + const isTrusted = this.workspaceTrustManagementService.isWorkspaceTrusted(); + if (!isTrusted) { + return; + } + + if (!workingCopy.model || !(workingCopy.model instanceof NotebookFileWorkingCopyModel)) { + return; + } + + if (context.reason === SaveReason.AUTO) { + return undefined; + } + + const setting = this.configurationService.getValue<{ [kind: string]: boolean } | string[]>('notebook.experimental.codeActionsOnSave'); + if (!setting) { + return undefined; + } + + const settingItems: string[] = Array.isArray(setting) + ? setting + : Object.keys(setting).filter(x => setting[x]); + + if (!settingItems.length) { + return undefined; + } + + progress.report({ message: 'CodeActionsOnSave running' }); + const disposable = new DisposableStore(); + try { + for (const cmd of settingItems) { + await this.commandService.executeCommand(cmd); + } + } catch { + // Failure to apply a code action should not block other on save actions + this.logService.warn('CodeActionsOnSave failed to apply a code action'); + } finally { + progress.report({ increment: 100 }); + disposable.dispose(); + } + } +} export class SaveParticipantsContribution extends Disposable implements IWorkbenchContribution { constructor( @IInstantiationService private readonly instantiationService: IInstantiationService, @@ -95,6 +149,7 @@ export class SaveParticipantsContribution extends Disposable implements IWorkben } private registerSaveParticipants(): void { + this._register(this.workingCopyFileService.addSaveParticipant(this.instantiationService.createInstance(CodeActionOnSaveParticipant))); this._register(this.workingCopyFileService.addSaveParticipant(this.instantiationService.createInstance(FormatOnSaveParticipant))); } } diff --git a/src/vs/workbench/contrib/notebook/browser/controller/executeActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/executeActions.ts index da85c5e975a886..6b7b0f8319585e 100644 --- a/src/vs/workbench/contrib/notebook/browser/controller/executeActions.ts +++ b/src/vs/workbench/contrib/notebook/browser/controller/executeActions.ts @@ -6,6 +6,9 @@ import { Iterable } from 'vs/base/common/iterator'; import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import { URI, UriComponents } from 'vs/base/common/uri'; +import { CancellationTokenSource } from 'vs/base/common/cancellation'; +import { ITextModel } from 'vs/editor/common/model'; +import { ISelection } from 'vs/editor/common/core/selection'; import { ILanguageService } from 'vs/editor/common/languages/language'; import { localize } from 'vs/nls'; import { MenuId, registerAction2 } from 'vs/platform/actions/common/actions'; @@ -25,6 +28,8 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { Schemas } from 'vs/base/common/network'; import { IDebugService } from 'vs/workbench/contrib/debug/common/debug'; +import { IInteractiveEditorRequest, IInteractiveEditorService } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor'; +import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange'; const EXECUTE_NOTEBOOK_COMMAND_ID = 'notebook.execute'; const CANCEL_NOTEBOOK_COMMAND_ID = 'notebook.cancelExecution'; @@ -705,3 +710,130 @@ registerAction2(class RevealLastFailedCellAction extends NotebookAction { } } }); + + +registerAction2(class FixCellErrorction extends NotebookCellAction { + constructor() { + super({ + id: 'notebook.cell.fixError', + title: localize('notebook.cell.fixError', 'Fix Execution Error'), + description: { + description: localize('notebook.cell.fixError', 'Fix Execution Error'), + args: [ + { + name: 'range', + description: 'The cell range', + schema: { + 'type': 'object', + 'required': ['start', 'end'], + 'properties': { + 'start': { + 'type': 'number' + }, + 'end': { + 'type': 'number' + } + } + } + }, + { + name: 'language', + description: 'The target cell language', + schema: { + 'type': 'string' + } + } + ] + } + }); + } + + protected override getCellContextFromArgs(accessor: ServicesAccessor, context?: ICellRange, ...additionalArgs: any[]): INotebookCellActionContext | undefined { + if (!context || typeof context.start !== 'number' || typeof context.end !== 'number' || context.start >= context.end) { + return; + } + + const activeEditorContext = this.getEditorContextFromArgsOrActive(accessor); + + if (!activeEditorContext || !activeEditorContext.notebookEditor.hasModel() || context.start >= activeEditorContext.notebookEditor.getLength()) { + return; + } + + return { + notebookEditor: activeEditorContext.notebookEditor, + cell: activeEditorContext.notebookEditor.cellAt(context.start)! + }; + } + + + async runWithContext(accessor: ServicesAccessor, context: INotebookCellActionContext): Promise { + const cell = context.cell; + + const outputViewModel = cell.outputsViewModels.filter(vm => vm.model.outputs.find(item => item.mime === 'application/vnd.code.notebook.error')); + + if (outputViewModel.length) { + const vm = outputViewModel[0]; + const textDecoder = new TextDecoder(); + + const output = vm.model.outputs.find(item => item.mime === 'application/vnd.code.notebook.error')!; + + type ErrorLike = Partial; + + let err: ErrorLike; + try { + err = JSON.parse(textDecoder.decode(output.data.buffer)); + + if (!err.message) { + return; + } + const textModel = context.notebookEditor.activeCodeEditor?.getModel() as ITextModel | null; + + if (!textModel) { + return; + } + + const interactiveEditorService = accessor.get(IInteractiveEditorService); + const provider = Iterable.first(interactiveEditorService.getAllProvider()); + if (!provider) { + return; + } + + context.notebookEditor.showProgress(); + + const _ctsSession: CancellationTokenSource = new CancellationTokenSource(); + + const range = textModel.getFullModelRange(); + const selection: ISelection = { + selectionStartLineNumber: range.startLineNumber, + selectionStartColumn: range.startColumn, + positionLineNumber: range.endLineNumber, + positionColumn: range.endColumn + }; + + const session = await provider.prepareInteractiveEditorSession(textModel, selection, _ctsSession.token); + + if (!session) { + context.notebookEditor.hideProgress(); + return; + } + + const request: IInteractiveEditorRequest = { + prompt: `Tweak the code to fix error: ${err.message}, and keep original code`, + selection: selection, + wholeRange: textModel.getFullModelRange() + }; + + const reply = await provider.provideResponse(session, request, _ctsSession.token); + + if (reply && reply.type === 'editorEdit') { + console.log(reply); + textModel.applyEdits(reply.edits); + } + + context.notebookEditor.hideProgress(); + } catch (e) { + console.log(e); + } + } + } +}); diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts index 3faa5958eea656..3d4c270f71215b 100644 --- a/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts +++ b/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts @@ -614,7 +614,8 @@ abstract class AbstractElementRenderer extends Disposable { dimension: { height: Math.min(OUTPUT_EDITOR_HEIGHT_MAGIC, this.cell.layoutInfo.rawOutputHeight || lineHeight * lineCount), width: this.cell.getComputedCellContainerWidth(this.notebookEditor.getLayoutInfo(), false, true) - } + }, + accessibilityVerbose: this.configurationService.getValue('accessibility.verbosity.diff-editor') ?? false }, { originalEditor: getOptimizedNestedCodeEditorWidgetOptions(), modifiedEditor: getOptimizedNestedCodeEditorWidgetOptions() diff --git a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts index 470b2a01db118e..4a84b5f510f303 100644 --- a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts +++ b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts @@ -903,7 +903,7 @@ configurationRegistry.registerConfiguration({ tags: ['notebookLayout', 'notebookOutputLayout'] }, [NotebookSetting.outputScrolling]: { - markdownDescription: nls.localize('notebook.outputScrolling', "Use a scrollable region for notebook output when longer than the limit"), + markdownDescription: nls.localize('notebook.outputScrolling', "Initially render notebook outputs in a scrollable region when longer than the limit"), type: 'boolean', tags: ['notebookLayout', 'notebookOutputLayout'], default: typeof product.quality === 'string' && product.quality !== 'stable' // only enable as default in insiders @@ -920,6 +920,15 @@ configurationRegistry.registerConfiguration({ tags: ['notebookLayout'], default: false }, + // [NotebookSetting.codeActionsOnSave]: { + // markdownDescription: nls.localize('notebook.codeActionsOnSave', "Experimental. Run a series of CodeActions for a notebook on save. CodeActions must be specified, the file must not be saved after delay, and the editor must not be shutting down. Example: `notebook.format: true`"), + // type: 'object', + // additionalProperties: { + // type: 'boolean' + // }, + // tags: ['notebookLayout'], + // default: {} + // }, [NotebookSetting.confirmDeleteRunningCell]: { markdownDescription: nls.localize('notebook.confirmDeleteRunningCell', "Control whether a confirmation prompt is required to delete a running cell."), type: 'boolean', diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts index a79fcc32540fbd..d00065a31daab3 100644 --- a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts +++ b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts @@ -243,10 +243,16 @@ export class NotebookEditor extends EditorPane implements INotebookEditorPane { throw new Error(localize('fail.noEditor', "Cannot open resource with notebook editor type '{0}', please check if you have the right extension installed and enabled.", input.viewType)); } + await this._extensionsWorkbenchService.whenInitialized; + const extensionInfo = this._extensionsWorkbenchService.local.find(e => e.identifier.id === knownProvider); throw createEditorOpenError(new Error(localize('fail.noEditor.extensionMissing', "Cannot open resource with notebook editor type '{0}', please check if you have the right extension installed and enabled.", input.viewType)), [ toAction({ - id: 'workbench.notebook.action.installOrEnableMissing', label: localize('notebookOpenInstallOrEnableMissingViewType', "Install and enable extension for '{0}'", input.viewType), run: async () => { + id: 'workbench.notebook.action.installOrEnableMissing', label: + extensionInfo + ? localize('notebookOpenEnableMissingViewType', "Enable extension for '{0}'", input.viewType) + : localize('notebookOpenInstallMissingViewType', "Install extension for '{0}'", input.viewType) + , run: async () => { const d = this._notebookService.onAddViewType(viewType => { if (viewType === input.viewType) { // serializer is registered, try to open again diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts index fc13c0b92651fa..62d2d92502c967 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts @@ -1421,11 +1421,7 @@ export class BackLayerWebView extends Themable { renderer = content.renderer; const first = output.outputs.find(op => op.mime === content.mimeType)!; - - // Copy the underlying buffer so we only send over the data we need - const valueBytes = new Uint8Array(first.data.buffer); - transfer.push(valueBytes.buffer); - + const valueBytes = copyBufferIfNeeded(first.data.buffer, transfer); message = { ...messageBase, outputId: output.outputId, @@ -1436,7 +1432,7 @@ export class BackLayerWebView extends Themable { metadata: output.metadata, output: { mime: first.mime, - valueBytes: valueBytes, + valueBytes, }, allOutputs: output.outputs.map(output => ({ mime: output.mime })), }, @@ -1474,16 +1470,20 @@ export class BackLayerWebView extends Themable { const outputCache = this.insetMapping.get(content.source)!; this.hiddenInsetMapping.delete(content.source); let updatedContent: ICreationContent | undefined = undefined; + + const transfer: ArrayBuffer[] = []; if (content.type === RenderOutputType.Extension) { const output = content.source.model; const firstBuffer = output.outputs.find(op => op.mime === content.mimeType)!; + + const valueBytes = copyBufferIfNeeded(firstBuffer.data.buffer, transfer); updatedContent = { type: RenderOutputType.Extension, outputId: outputCache.outputId, metadata: output.metadata, output: { mime: content.mimeType, - valueBytes: firstBuffer.data.buffer, + valueBytes, }, allOutputs: output.outputs.map(output => ({ mime: output.mime })) }; @@ -1496,7 +1496,7 @@ export class BackLayerWebView extends Themable { cellTop: cellTop, outputOffset: offset, content: updatedContent - }); + }, transfer); outputCache.versionId = content.source.model.versionId; return; @@ -1730,6 +1730,19 @@ export class BackLayerWebView extends Themable { } } +function copyBufferIfNeeded(buffer: Uint8Array, transfer: ArrayBuffer[]): Uint8Array { + if (buffer.byteLength === buffer.buffer.byteLength) { + // No copy needed but we can't transfer either + return buffer; + } else { + // The buffer is smaller than its backing array buffer. + // Create a copy to avoid sending the entire array buffer. + const valueBytes = new Uint8Array(buffer); + transfer.push(valueBytes.buffer); + return valueBytes; + } +} + function getTokenizationCss() { const colorMap = TokenizationRegistry.getColorMap(); const tokenizationCss = colorMap ? generateTokensCSSForColorMap(colorMap) : ''; diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts index 4ea778aaefe275..a9d374d9b55590 100644 --- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts +++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts @@ -453,15 +453,20 @@ async function webviewPreloads(ctx: PreloadContext) { }); }; - function focusFirstFocusableInCell(cellId: string) { + function focusFirstFocusableOrContainerInOutput(cellId: string) { const cellOutputContainer = document.getElementById(cellId); if (cellOutputContainer) { if (cellOutputContainer.contains(document.activeElement)) { return; } - const focusableElement = cellOutputContainer.querySelector('[tabindex="0"], [href], button, input, option, select, textarea') as HTMLElement | null; - focusableElement?.focus(); + let focusableElement = cellOutputContainer.querySelector('[tabindex="0"], [href], button, input, option, select, textarea') as HTMLElement | null; + if (!focusableElement) { + focusableElement = cellOutputContainer; + focusableElement.tabIndex = -1; + } + + focusableElement.focus(); } } @@ -1357,7 +1362,7 @@ async function webviewPreloads(ctx: PreloadContext) { break; } case 'focus-output': - focusFirstFocusableInCell(event.data.cellId); + focusFirstFocusableOrContainerInOutput(event.data.cellId); break; case 'decorations': { let outputContainer = document.getElementById(event.data.cellId); @@ -2283,6 +2288,7 @@ async function webviewPreloads(ctx: PreloadContext) { this.element = document.createElement('div'); this.element.style.position = 'absolute'; + this.element.style.outline = '0'; this.element.id = cellId; this.element.classList.add('cell_container'); diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts index be6dfe7ca35b24..076610d68a4caf 100644 --- a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts +++ b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts @@ -937,6 +937,7 @@ export const NotebookSetting = { outputScrolling: 'notebook.output.scrolling', textOutputLineLimit: 'notebook.output.textLineLimit', formatOnSave: 'notebook.formatOnSave.enabled', + codeActionsOnSave: 'notebook.experimental.codeActionsOnSave', outputWordWrap: 'notebook.output.wordWrap', outputLineHeightDeprecated: 'notebook.outputLineHeight', outputLineHeight: 'notebook.output.lineHeight', diff --git a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts index edea37c5b774e9..1d2d47340e5799 100644 --- a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts +++ b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts @@ -84,7 +84,7 @@ export class CommandsQuickAccessProvider extends AbstractEditorCommandsQuickAcce const info = this.interactiveSessionService.getProviderInfos()[0]; return info ? { - label: localize('askXInInteractiveSession', "Ask {0} '{1}'", info.displayName, filter), + label: localize('askXInInteractiveSession', "Ask {0}: {1}", info.displayName, filter), commandId: AskInInteractiveAction.ID, accept: () => commandService.executeCommand(AskInInteractiveAction.ID, filter) } diff --git a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts index 18a5d70d9b308b..b3a6832e4f1178 100644 --- a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts +++ b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts @@ -6,7 +6,7 @@ import * as nls from 'vs/nls'; import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { Extensions, IViewContainersRegistry, IViewsRegistry, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views'; -import { Attributes, AutoTunnelSource, IRemoteExplorerService, makeAddress, mapHasAddressLocalhostOrAllInterfaces, OnPortForward, PORT_AUTO_FORWARD_SETTING, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_HYBRID, PORT_AUTO_SOURCE_SETTING_OUTPUT, PORT_AUTO_SOURCE_SETTING_PROCESS, TUNNEL_VIEW_CONTAINER_ID, TUNNEL_VIEW_ID, TunnelSource } from 'vs/workbench/services/remote/common/remoteExplorerService'; +import { Attributes, AutoTunnelSource, IRemoteExplorerService, makeAddress, mapHasAddressLocalhostOrAllInterfaces, OnPortForward, PORT_AUTO_FORWARD_SETTING, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_HYBRID, PORT_AUTO_SOURCE_SETTING_OUTPUT, PORT_AUTO_SOURCE_SETTING_PROCESS, Tunnel, TUNNEL_VIEW_CONTAINER_ID, TUNNEL_VIEW_ID, TunnelSource } from 'vs/workbench/services/remote/common/remoteExplorerService'; import { forwardedPortsViewEnabled, ForwardPortAction, OpenPortInBrowserAction, TunnelPanel, TunnelPanelDescriptor, TunnelViewModel, OpenPortInPreviewAction, openPreviewEnabledContext } from 'vs/workbench/contrib/remote/browser/tunnelView'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService'; @@ -621,24 +621,29 @@ class ProcAutomaticPortForwarding extends Disposable { private async handleCandidateUpdate(removed: Map) { const removedPorts: number[] = []; - let autoForwarded: Set; + let autoForwarded: Map; if (this.unforwardOnly) { - autoForwarded = new Set(); + autoForwarded = new Map(); for (const entry of this.remoteExplorerService.tunnelModel.forwarded.entries()) { if (entry[1].source.source === TunnelSource.Auto) { - autoForwarded.add(entry[0]); + autoForwarded.set(entry[0], entry[1]); } } } else { - autoForwarded = this.autoForwarded; + autoForwarded = new Map(this.autoForwarded.entries()); } for (const removedPort of removed) { const key = removedPort[0]; - const value = removedPort[1]; - if (autoForwarded.has(key)) { + let value = removedPort[1]; + const forwardedValue = mapHasAddressLocalhostOrAllInterfaces(autoForwarded, value.host, value.port); + if (forwardedValue) { + if (typeof forwardedValue === 'string') { + this.autoForwarded.delete(key); + } else { + value = { host: forwardedValue.remoteHost, port: forwardedValue.remotePort }; + } await this.remoteExplorerService.close(value); - autoForwarded.delete(key); removedPorts.push(value.port); } else if (this.notifiedOnly.has(key)) { this.notifiedOnly.delete(key); diff --git a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts index b48ce0330f4f3b..9dfc51bd41dfd7 100644 --- a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts +++ b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts @@ -786,7 +786,7 @@ export class DirtyDiffController extends Disposable implements DirtyDiffContribu } let index: number; - if (this.editor.hasModel() && (typeof lineNumber === 'number')) { + if (this.editor.hasModel() && (typeof lineNumber === 'number' || !this.widget.provider)) { index = this.model.findNextClosestChange(typeof lineNumber === 'number' ? lineNumber : this.editor.getPosition().lineNumber, true, this.widget.provider); } else { const providerChanges: number[] = this.model.mapChanges.get(this.widget.provider) ?? this.model.mapChanges.values().next().value; @@ -1466,7 +1466,7 @@ export class DirtyDiffModel extends Disposable { const possibleChangesLength = possibleChanges.length; if (inclusive) { - if ((getModifiedEndLineNumber(change.change) >= lineNumber) && (change.change.modifiedStartLineNumber <= lineNumber)) { + if (getModifiedEndLineNumber(change.change) >= lineNumber) { if (preferredProvider && change.label !== preferredProvider) { possibleChanges.push(i); } else { diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts index 279327e4cc2e38..3367a55f3ff3d2 100644 --- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts +++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts @@ -19,7 +19,7 @@ import { IContextViewService, IContextMenuService } from 'vs/platform/contextvie import { IContextKeyService, IContextKey, ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; -import { MenuItemAction, IMenuService, registerAction2, MenuId, IAction2Options, MenuRegistry, Action2 } from 'vs/platform/actions/common/actions'; +import { MenuItemAction, IMenuService, registerAction2, MenuId, IAction2Options, MenuRegistry, Action2, IMenu } from 'vs/platform/actions/common/actions'; import { IAction, ActionRunner, Action, Separator } from 'vs/base/common/actions'; import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar'; import { IThemeService, IFileIconTheme } from 'vs/platform/theme/common/themeService'; @@ -356,6 +356,7 @@ interface ResourceTemplate { fileLabel: IResourceLabel; decorationIcon: HTMLElement; actionBar: ActionBar; + actionBarMenu: IMenu | undefined; readonly elementDisposables: DisposableStore; readonly disposables: IDisposable; } @@ -419,7 +420,7 @@ class ResourceRenderer implements ICompressibleTreeRenderer | ITreeNode, FuzzyScore | LabelFuzzyScore>, index: number, template: ResourceTemplate): void { @@ -430,9 +431,6 @@ class ResourceRenderer implements ICompressibleTreeRenderer, menu: IMenu): void { + if (!template.actionBarMenu || template.actionBarMenu !== menu) { + template.actionBar.clear(); + template.elementDisposables.add(connectPrimaryMenuToInlineActionBar(menu, template.actionBar)); + template.actionBarMenu = menu; + } + + template.actionBar.context = resourceOrFolder; + } + private _processFilterData(uri: URI, filterData: FuzzyScore | LabelFuzzyScore | undefined): [IMatch[] | undefined, IMatch[] | undefined] { if (!filterData) { return [undefined, undefined]; diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts index 06b11d86c131a0..e948dc576793bf 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts @@ -524,6 +524,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { }); this._register(this._configurationService.onDidChangeConfiguration(async e => { + if (e.affectsConfiguration('accessibility.verbosity.terminal')) { + this._setAriaLabel(this.xterm?.raw, this._instanceId, this.title); + } if (e.affectsConfiguration('terminal.integrated')) { this.updateConfig(); this.setVisible(this._isVisible); @@ -1942,7 +1945,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { labelParts.push(nls.localize('terminalScreenReaderMode', "Run the command: Toggle Screen Reader Accessibility Mode for an optimized screen reader experience")); } const accessibilityHelpKeybinding = this._keybindingService.lookupKeybinding(TerminalCommandId.ShowTerminalAccessibilityHelp)?.getLabel(); - if (accessibilityHelpKeybinding) { + if (this._configurationService.getValue('accessibility.verbosity.terminal') && accessibilityHelpKeybinding) { labelParts.push(nls.localize('terminalHelpAriaLabel', "Use {0} for terminal accessibility help", accessibilityHelpKeybinding)); } xterm.textarea.setAttribute('aria-label', labelParts.join('\n')); diff --git a/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts b/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts index 4436d3645f5779..68a867eb313e83 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts @@ -95,6 +95,11 @@ export class TerminalStatusList extends Disposable implements ITerminalStatusLis if (oldPrimary !== newPrimary) { this._onDidChangePrimaryStatus.fire(newPrimary); } + } else { + this._statuses.set(status.id, status); + // It maybe the case that status hasn't changed, there isn't a good way to check this based on + // `ITerminalStatus`, so just fire the event anyway. + this._onDidAddStatus.fire(status); } } diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBuffer.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBuffer.ts index b54efc7516d6c8..b132869eceacf8 100644 --- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBuffer.ts +++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBuffer.ts @@ -164,6 +164,7 @@ export class AccessibleBufferWidget extends TerminalAccessibleWidget { } else { this._cursorPosition = { lineNumber: item.lineNumber, column: 1 }; } + quickPick.dispose(); this.editorWidget.focus(); return; }); diff --git a/src/vs/workbench/contrib/terminalContrib/environmentChanges/browser/terminal.environmentChanges.contribution.ts b/src/vs/workbench/contrib/terminalContrib/environmentChanges/browser/terminal.environmentChanges.contribution.ts index fadbd79ae292e8..1ccc5c842510f6 100644 --- a/src/vs/workbench/contrib/terminalContrib/environmentChanges/browser/terminal.environmentChanges.contribution.ts +++ b/src/vs/workbench/contrib/terminalContrib/environmentChanges/browser/terminal.environmentChanges.contribution.ts @@ -3,9 +3,13 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Schemas } from 'vs/base/common/network'; import { URI } from 'vs/base/common/uri'; +import { Event } from 'vs/base/common/event'; +import { ITextModel } from 'vs/editor/common/model'; +import { IModelService } from 'vs/editor/common/services/model'; +import { ITextModelContentProvider, ITextModelService } from 'vs/editor/common/services/resolverService'; import { localize } from 'vs/nls'; +import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { EnvironmentVariableMutatorType, EnvironmentVariableScope, IEnvironmentVariableMutator, IMergedEnvironmentVariableCollection } from 'vs/platform/terminal/common/environmentVariable'; import { registerActiveInstanceAction } from 'vs/workbench/contrib/terminal/browser/terminalActions'; import { TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal'; @@ -16,17 +20,27 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic registerActiveInstanceAction({ id: TerminalCommandId.ShowEnvironmentContributions, title: { value: localize('workbench.action.terminal.showEnvironmentContributions', "Show Environment Contributions"), original: 'Show Environment Contributions' }, - run: async (activeInstance, c, accessor, scope) => { + run: async (activeInstance, c, accessor, arg) => { const collection = activeInstance.extEnvironmentVariableCollection; if (collection) { + const scope = arg as EnvironmentVariableScope | undefined; + const instantiationService = accessor.get(IInstantiationService); + const outputProvider = instantiationService.createInstance(EnvironmentCollectionProvider); const editorService = accessor.get(IEditorService); - await editorService.openEditor({ - resource: URI.from({ - scheme: Schemas.untitled - }), - contents: describeEnvironmentChanges(collection, scope as EnvironmentVariableScope | undefined), - languageId: 'markdown' - }); + const timestamp = new Date().getTime(); + const scopeDesc = scope?.workspaceFolder ? ` - ${scope.workspaceFolder.name}` : ''; + const textContent = await outputProvider.provideTextContent(URI.from( + { + scheme: EnvironmentCollectionProvider.scheme, + path: `Environment changes${scopeDesc}`, + fragment: describeEnvironmentChanges(collection, scope), + query: `environment-collection-${timestamp}` + })); + if (textContent) { + await editorService.openEditor({ + resource: textContent.uri + }); + } } } }); @@ -68,3 +82,23 @@ function mutatorTypeLabel(type: EnvironmentVariableMutatorType, value: string, v default: return `${variable}=${value}`; } } + +class EnvironmentCollectionProvider implements ITextModelContentProvider { + static scheme = 'ENVIRONMENT_CHANGES_COLLECTION'; + + constructor( + @ITextModelService textModelResolverService: ITextModelService, + @IModelService private readonly _modelService: IModelService + ) { + textModelResolverService.registerTextModelContentProvider(EnvironmentCollectionProvider.scheme, this); + } + + async provideTextContent(resource: URI): Promise { + const existing = this._modelService.getModel(resource); + if (existing && !existing.isDisposed()) { + return existing; + } + + return this._modelService.createModel(resource.fragment, { languageId: 'markdown', onDidChange: Event.None }, resource, false); + } +} diff --git a/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts b/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts index e940b30270cfdf..bd2c7faf1fc8ea 100644 --- a/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts +++ b/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts @@ -34,6 +34,7 @@ import { TestingExplorerView } from 'vs/workbench/contrib/testing/browser/testin import { ITestingOutputTerminalService } from 'vs/workbench/contrib/testing/browser/testingOutputTerminalService'; import { TestingConfigKeys, getTestingConfiguration } from 'vs/workbench/contrib/testing/common/configuration'; import { TestCommandId, TestExplorerViewMode, TestExplorerViewSorting, Testing, testConfigurationGroupNames } from 'vs/workbench/contrib/testing/common/constants'; +import { TestId } from 'vs/workbench/contrib/testing/common/testId'; import { ITestProfileService, canUseProfileWithTest } from 'vs/workbench/contrib/testing/common/testProfileService'; import { ITestResult } from 'vs/workbench/contrib/testing/common/testResult'; import { ITestResultService } from 'vs/workbench/contrib/testing/common/testResultService'; @@ -838,9 +839,31 @@ export class ShowMostRecentOutputAction extends Action2 { }); } - public run(accessor: ServicesAccessor) { + public async run(accessor: ServicesAccessor) { + const quickInputService = accessor.get(IQuickInputService); + const terminalOutputService = accessor.get(ITestingOutputTerminalService); const result = accessor.get(ITestResultService).results[0]; - accessor.get(ITestingOutputTerminalService).open(result); + + if (!result.tasks.length) { + return; + } + + let index = 0; + if (result.tasks.length > 1) { + const picked = await quickInputService.pick( + result.tasks.map((t, i) => ({ label: t.name || localize('testing.pickTaskUnnamed', "Run #{0}", i), index: i })), + { placeHolder: localize('testing.pickTask', "Pick a run to show output for") } + ); + + if (!picked) { + return; + } + + index = picked.index; + } + + + terminalOutputService.open(result, index); } } @@ -996,7 +1019,10 @@ abstract class ExecuteTestAtCursor extends Action2 { const irange = Range.lift(test.item.range); if (irange.containsPosition(position)) { if (bestRange && Range.equalsRange(test.item.range, bestRange)) { - bestNodes.push(test); + // check that a parent isn't already included (#180760) + if (!bestNodes.some(b => TestId.isChild(b.item.extId, test.item.extId))) { + bestNodes.push(test); + } } else { bestRange = irange; bestNodes = [test]; @@ -1005,7 +1031,7 @@ abstract class ExecuteTestAtCursor extends Action2 { if (!bestRangeBefore || bestRangeBefore.getStartPosition().isBefore(irange.getStartPosition())) { bestRangeBefore = irange; bestNodesBefore = [test]; - } else if (irange.equalsRange(bestRangeBefore)) { + } else if (irange.equalsRange(bestRangeBefore) && !bestNodesBefore.some(b => TestId.isChild(b.item.extId, test.item.extId))) { bestNodesBefore.push(test); } } diff --git a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts index e4e18fbb770e1c..3eec54c4a9719d 100644 --- a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts +++ b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts @@ -77,13 +77,13 @@ import { IObservableValue, MutableObservableValue, staticObservableValue } from import { StoredValue } from 'vs/workbench/contrib/testing/common/storedValue'; import { ITestExplorerFilterState } from 'vs/workbench/contrib/testing/common/testExplorerFilterState'; import { ITestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService'; -import { ITestResult, TestResultItemChange, TestResultItemChangeReason, maxCountPriority, resultItemParents } from 'vs/workbench/contrib/testing/common/testResult'; +import { ITestResult, LiveTestResult, TestResultItemChange, TestResultItemChangeReason, maxCountPriority, resultItemParents } from 'vs/workbench/contrib/testing/common/testResult'; import { ITestResultService, ResultChangeEvent } from 'vs/workbench/contrib/testing/common/testResultService'; import { ITestService } from 'vs/workbench/contrib/testing/common/testService'; import { IRichLocation, ITestErrorMessage, ITestItem, ITestMessage, ITestRunTask, ITestTaskState, TestMessageType, TestResultItem, TestResultState, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes'; import { TestingContextKeys } from 'vs/workbench/contrib/testing/common/testingContextKeys'; import { IShowResultOptions, ITestingPeekOpener } from 'vs/workbench/contrib/testing/common/testingPeekOpener'; -import { isFailedState } from 'vs/workbench/contrib/testing/common/testingStates'; +import { cmpPriority, isFailedState } from 'vs/workbench/contrib/testing/common/testingStates'; import { ParsedTestUri, TestUriType, buildTestUri, parseTestUri } from 'vs/workbench/contrib/testing/common/testingUri'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; @@ -115,16 +115,16 @@ class MessageSubject { } } -class ResultSubject { +class TaskSubject { public readonly outputUri: URI; public readonly revealLocation: undefined; - constructor(public readonly resultId: string) { - this.outputUri = buildTestUri({ resultId, type: TestUriType.AllOutput }); + constructor(public readonly resultId: string, public readonly taskIndex: number) { + this.outputUri = buildTestUri({ resultId, taskIndex, type: TestUriType.TaskOutput }); } } -type InspectSubject = MessageSubject | ResultSubject; +type InspectSubject = MessageSubject | TaskSubject; /** Iterates through every message in every result */ function* allMessages(results: readonly ITestResult[]) { @@ -251,7 +251,7 @@ export class TestingPeekOpener extends Disposable implements ITestingPeekOpener } const options = { pinned: false, revealIfOpened: true }; - if (current instanceof ResultSubject) { + if (current instanceof TaskSubject) { this.editorService.openEditor({ resource: current.outputUri, options }); return; } @@ -579,7 +579,7 @@ export class TestingOutputPeekController extends Disposable implements IEditorCo let found = false; for (const { messageIndex, taskIndex, result, test } of allMessages(this.testResults.results)) { - if (subject instanceof ResultSubject && result.id === subject.resultId) { + if (subject instanceof TaskSubject && result.id === subject.resultId) { found = true; // open the first message found in the current result } @@ -609,7 +609,7 @@ export class TestingOutputPeekController extends Disposable implements IEditorCo let previous: { messageIndex: number; taskIndex: number; result: ITestResult; test: TestResultItem } | undefined; for (const m of allMessages(this.testResults.results)) { - if (subject instanceof ResultSubject) { + if (subject instanceof TaskSubject) { if (m.result.id === subject.resultId) { break; } @@ -672,8 +672,8 @@ export class TestingOutputPeekController extends Disposable implements IEditorCo return undefined; } - if (parts.type === TestUriType.AllOutput) { - return new ResultSubject(parts.resultId); + if (parts.type === TestUriType.TaskOutput) { + return new TaskSubject(parts.resultId, parts.taskIndex); } const { resultId, testExtId, taskIndex, messageIndex } = parts; @@ -854,7 +854,7 @@ class TestResultsPeek extends PeekViewWidget { * Updates the test to be shown. */ public setModel(subject: InspectSubject): Promise { - if (subject instanceof ResultSubject) { + if (subject instanceof TaskSubject) { this.current = subject; return this.showInPlace(subject); } @@ -932,17 +932,6 @@ export class TestResultsView extends ViewPane { @ITestResultService private readonly resultService: ITestResultService, ) { super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService); - - this._register(resultService.onResultsChanged(ev => { - if (!this.isVisible()) { - return; - } - - if ('started' in ev) { - // allow the tree to update so that the item exists - queueMicrotask(() => this.content.reveal({ subject: new ResultSubject(ev.started.id), preserveFocus: true })); - } - })); } public get subject() { @@ -955,8 +944,8 @@ export class TestResultsView extends ViewPane { this.content.onDidRequestReveal(subject => this.content.reveal({ preserveFocus: true, subject })); const [lastResult] = this.resultService.results; - if (lastResult) { - this.content.reveal({ preserveFocus: true, subject: new ResultSubject(lastResult.id) }); + if (lastResult && lastResult.tasks.length) { + this.content.reveal({ preserveFocus: true, subject: new TaskSubject(lastResult.id, 0) }); } } @@ -1282,6 +1271,7 @@ interface ITreeElement { context: unknown; id: string; label: string; + onDidChange: Event; labelWithIcons?: readonly (HTMLSpanElement | string)[]; icon?: ThemeIcon; description?: string; @@ -1289,6 +1279,8 @@ interface ITreeElement { } class TestResultElement implements ITreeElement { + public readonly changeEmitter = new Emitter(); + public readonly onDidChange = this.changeEmitter.event; public readonly type = 'result'; public readonly context = this.value.id; public readonly id = this.value.id; @@ -1306,20 +1298,33 @@ class TestResultElement implements ITreeElement { } class TestCaseElement implements ITreeElement { + public readonly changeEmitter = new Emitter(); + public readonly onDidChange = this.changeEmitter.event; public readonly type = 'test'; public readonly context = this.test.item.extId; public readonly id = `${this.results.id}/${this.test.item.extId}`; - public readonly label = this.test.item.label; - public readonly labelWithIcons = renderLabelWithIcons(this.label); public readonly description?: string; + public get state() { + return this.test.tasks[this.taskIndex].state; + } + + public get label() { + return this.test.item.label; + } + + public get labelWithIcons() { + return renderLabelWithIcons(this.label); + } + public get icon() { - return icons.testingStatesToIcons.get(this.test.computedState); + return icons.testingStatesToIcons.get(this.state); } constructor( private readonly results: ITestResult, public readonly test: TestResultItem, + public readonly taskIndex: number, ) { for (const parent of resultItemParents(results, test)) { if (parent !== test) { @@ -1331,16 +1336,21 @@ class TestCaseElement implements ITreeElement { } } -class TestTaskElement implements ITreeElement { +class TaskElement implements ITreeElement { + public readonly changeEmitter = new Emitter(); + public readonly onDidChange = this.changeEmitter.event; public readonly type = 'task'; - public readonly task: ITestRunTask; public readonly context: string; public readonly id: string; public readonly label: string; - public readonly icon = undefined; + public readonly itemsCache = new CreationCache(); - constructor(results: ITestResult, public readonly test: TestResultItem, index: number) { - this.id = `${results.id}/${test.item.extId}/${index}`; + public get icon() { + return this.results.tasks[this.index].running ? icons.testingStatesToIcons.get(TestResultState.Running) : undefined; + } + + constructor(public readonly results: ITestResult, public readonly task: ITestRunTask, public readonly index: number) { + this.id = `${results.id}/${index}`; this.task = results.tasks[index]; this.context = String(index); this.label = this.task.name ?? localize('testUnnamedTask', 'Unnamed Task'); @@ -1356,6 +1366,7 @@ class TestMessageElement implements ITreeElement { public readonly location?: IRichLocation; public readonly description?: string; public readonly marker?: number; + public readonly onDidChange = Event.None; constructor( public readonly result: ITestResult, @@ -1388,7 +1399,7 @@ class TestMessageElement implements ITreeElement { } } -type TreeElement = TestResultElement | TestCaseElement | TestMessageElement | TestTaskElement; +type TreeElement = TestResultElement | TestCaseElement | TestMessageElement | TaskElement; class OutputPeekTree extends Disposable { private disposed = false; @@ -1429,6 +1440,15 @@ class OutputPeekTree extends Disposable { compressionEnabled: true, hideTwistiesOfChildlessElements: true, identityProvider: diffIdentityProvider, + sorter: { + compare(a, b) { + if (a instanceof TestCaseElement && b instanceof TestCaseElement) { + return cmpPriority(a.state, b.state); + } + + return 0; + }, + }, accessibilityProvider: { getAriaLabel(element: ITreeElement) { return element.ariaLabel || element.label; @@ -1440,45 +1460,37 @@ class OutputPeekTree extends Disposable { }, )) as WorkbenchCompressibleObjectTree; - const creationCache = new WeakMap(); - const cachedCreate = (ref: object, factory: () => T): TreeElement => { - const existing = creationCache.get(ref); - if (existing) { - return existing; - } + const cc = new CreationCache(); + const getTaskChildren = (taskElem: TaskElement): Iterable> => { + const tests = Iterable.filter(taskElem.results.tests, test => test.tasks[taskElem.index].state >= TestResultState.Running || test.tasks[taskElem.index].messages.length > 0); - const fresh = factory(); - creationCache.set(ref, fresh); - return fresh; - }; - - const getTaskChildren = (result: ITestResult, test: TestResultItem, taskId: number): Iterable> => { - return Iterable.map(test.tasks[0].messages, (m, messageIndex) => ({ - element: cachedCreate(m, () => new TestMessageElement(result, test, taskId, messageIndex)), + return Iterable.map(tests, test => ({ + element: taskElem.itemsCache.getOrCreate(test, () => new TestCaseElement(taskElem.results, test, taskElem.index)), incompressible: true, + children: getTestChildren(taskElem.results, test, taskElem.index), })); }; - const getTestChildren = (result: ITestResult, test: TestResultItem): Iterable> => { - const tasks = Iterable.filter(test.tasks, task => task.messages.length > 0); - return Iterable.map(tasks, (t, taskId) => ({ - element: cachedCreate(t, () => new TestTaskElement(result, test, taskId)), - incompressible: false, - children: getTaskChildren(result, test, taskId), + const getTestChildren = (result: ITestResult, test: TestResultItem, taskIndex: number): Iterable> => { + return Iterable.map(test.tasks[taskIndex].messages, (m, messageIndex) => ({ + element: cc.getOrCreate(m, () => new TestMessageElement(result, test, taskIndex, messageIndex)), + incompressible: true, })); }; const getResultChildren = (result: ITestResult): Iterable> => { - const tests = Iterable.filter(result.tests, test => test.tasks.some(t => t.messages.length > 0)); - return Iterable.map(tests, test => ({ - element: cachedCreate(test, () => new TestCaseElement(result, test)), - incompressible: true, - children: getTestChildren(result, test), - })); + return result.tasks.map((task, taskIndex) => { + const taskElem = cc.getOrCreate(task, () => new TaskElement(result, task, taskIndex)); + return ({ + element: taskElem, + incompressible: false, + children: getTaskChildren(taskElem), + }); + }); }; const getRootChildren = () => results.results.map(result => { - const element = cachedCreate(result, () => new TestResultElement(result)); + const element = cc.getOrCreate(result, () => new TestResultElement(result)); return { element, incompressible: true, @@ -1489,36 +1501,57 @@ class OutputPeekTree extends Disposable { // Queued result updates to prevent spamming CPU when lots of tests are // completing and messaging quickly (#142514) - const resultsToUpdate = new Set(); - const resultUpdateScheduler = this._register(new RunOnceScheduler(() => { - for (const result of resultsToUpdate) { - const resultNode = creationCache.get(result); - if (resultNode && this.tree.hasElement(resultNode)) { - this.tree.setChildren(resultNode, getResultChildren(result), { diffIdentityProvider }); + const taskChildrenToUpdate = new Set(); + const taskChildrenUpdate = this._register(new RunOnceScheduler(() => { + for (const taskNode of taskChildrenToUpdate) { + if (this.tree.hasElement(taskNode)) { + this.tree.setChildren(taskNode, getTaskChildren(taskNode), { diffIdentityProvider }); } } - resultsToUpdate.clear(); + taskChildrenToUpdate.clear(); }, 300)); - this._register(results.onTestChanged(e => { - const itemNode = creationCache.get(e.item); - if (itemNode && this.tree.hasElement(itemNode)) { // update to existing test message/state - this.tree.setChildren(itemNode, getTestChildren(e.result, e.item)); - return; - } + const handleNewResults = (result: LiveTestResult) => { + const resultNode = cc.get(result)! as TestResultElement; + const disposable = new DisposableStore(); + disposable.add(result.onNewTask(() => { + if (this.tree.hasElement(resultNode)) { + this.tree.setChildren(resultNode, getResultChildren(result), { diffIdentityProvider }); + } + })); + disposable.add(result.onEndTask(index => { + (cc.get(result.tasks[index]) as TaskElement | undefined)?.changeEmitter.fire(); + })); + + disposable.add(result.onChange(e => { + // try updating the item in each of its tasks + for (const [index, task] of result.tasks.entries()) { + const taskNode = cc.get(task) as TaskElement; + if (!this.tree.hasElement(taskNode)) { + continue; + } - const resultNode = creationCache.get(e.result); - if (resultNode && this.tree.hasElement(resultNode)) { // new test, update result children - if (!resultUpdateScheduler.isScheduled) { - resultsToUpdate.add(e.result); - resultUpdateScheduler.schedule(); + const itemNode = taskNode.itemsCache.get(e.item); + if (itemNode && this.tree.hasElement(itemNode)) { + this.tree.setChildren(itemNode, getTestChildren(result, e.item, index), { diffIdentityProvider }); + itemNode.changeEmitter.fire(); + return; + } + + taskChildrenToUpdate.add(taskNode); + if (!taskChildrenUpdate.isScheduled()) { + taskChildrenUpdate.schedule(); + } } - return; - } + })); - // should be unreachable? - this.tree.setChildren(null, getRootChildren(), { diffIdentityProvider }); - })); + disposable.add(result.onComplete(() => { + resultNode.changeEmitter.fire(); + disposable.dispose(); + })); + + this.tree.expand(resultNode, true); + }; this._register(results.onResultsChanged(e => { // little hack here: a result change can cause the peek to be disposed, @@ -1529,14 +1562,20 @@ class OutputPeekTree extends Disposable { } if ('completed' in e) { - const resultNode = creationCache.get(e.completed); - if (resultNode && this.tree.hasElement(resultNode)) { - this.tree.setChildren(resultNode, getResultChildren(e.completed)); - return; - } + (cc.get(e.completed) as TestResultElement | undefined)?.changeEmitter.fire(); + return; } this.tree.setChildren(null, getRootChildren(), { diffIdentityProvider }); + + // done after setChildren intentionally so that the ResultElement exists in the cache. + if ('started' in e) { + for (const child of this.tree.getNode(null).children) { + this.tree.collapse(child.element, false); + } + + handleNewResults(e.started); + } })); const revealItem = (element: TreeElement, preserveFocus: boolean) => { @@ -1548,7 +1587,7 @@ class OutputPeekTree extends Disposable { }; this._register(onDidReveal(({ subject, preserveFocus = false }) => { - if (subject instanceof ResultSubject) { + if (subject instanceof TaskSubject) { const resultItem = this.tree.getNode(null).children.find(c => (c.element as TestResultElement)?.id === subject.resultId); if (resultItem) { revealItem(resultItem.element as TestResultElement, preserveFocus); @@ -1556,7 +1595,7 @@ class OutputPeekTree extends Disposable { return; } - const messageNode = creationCache.get(subject.messages[subject.messageIndex]); + const messageNode = cc.get(subject.messages[subject.messageIndex]); if (!messageNode || !this.tree.hasElement(messageNode)) { return; } @@ -1578,8 +1617,8 @@ class OutputPeekTree extends Disposable { })); this._register(this.tree.onDidOpen(async e => { - if (e.element instanceof TestResultElement) { - this.requestReveal.fire(new ResultSubject(e.element.id)); + if (e.element instanceof TaskElement) { + this.requestReveal.fire(new TaskSubject(e.element.results.id, e.element.index)); } else if (e.element instanceof TestMessageElement) { this.requestReveal.fire(new MessageSubject(e.element.result.id, e.element.test, e.element.taskIndex, e.element.messageIndex)); } @@ -1646,7 +1685,7 @@ class TestRunElementRenderer implements ICompressibleTreeRenderer, FuzzyScore>, _index: number, templateData: TemplateData): void { const chain = node.element.elements; const lastElement = chain[chain.length - 1]; - if (lastElement instanceof TestTaskElement && chain.length >= 2) { + if (lastElement instanceof TaskElement && chain.length >= 2) { this.doRender(chain[chain.length - 2], templateData); } else { this.doRender(lastElement, templateData); @@ -1680,6 +1719,8 @@ class TestRunElementRenderer implements ICompressibleTreeRenderer, _index: number, templateData: TemplateData): void { + templateData.elementDisposable.clear(); + templateData.elementDisposable.add(element.element.onDidChange(() => this.doRender(element.element, templateData))); this.doRender(element.element, templateData); } @@ -1689,7 +1730,6 @@ class TestRunElementRenderer implements ICompressibleTreeRenderer this.testTerminalService.open(element.value) + () => this.testTerminalService.open(element.results, element.index) )); + } + + if (element instanceof TestResultElement) { + // only show if there are no collapsed test nodes that have more specific choices + if (element.value.tasks.length === 1) { + primary.push(new Action( + 'testing.outputPeek.showResultOutput', + localize('testing.showResultOutput', "Show Result Output"), + ThemeIcon.asClassName(Codicon.terminal), + undefined, + () => this.testTerminalService.open(element.value, 0) + )); + } primary.push(new Action( 'testing.outputPeek.reRunLastRun', @@ -1761,7 +1814,7 @@ class TreeActionsProvider { } } - if (element instanceof TestCaseElement || element instanceof TestTaskElement) { + if (element instanceof TestCaseElement) { const extId = element.test.item.extId; primary.push(new Action( 'testing.outputPeek.goToFile', @@ -1822,7 +1875,7 @@ class TreeActionsProvider { localize('testing.showMessageInTerminal', "Show Output in Terminal"), ThemeIcon.asClassName(Codicon.terminal), undefined, - () => this.testTerminalService.open(element.result, element.marker), + () => this.testTerminalService.open(element.result, element.taskIndex, element.marker), )); } } @@ -1984,3 +2037,22 @@ export class ToggleTestingPeekHistory extends Action2 { opener.historyVisible.value = !opener.historyVisible.value; } } + +class CreationCache { + private readonly v = new WeakMap(); + + public get(key: object) { + return this.v.get(key); + } + + public getOrCreate(ref: object, factory: () => T2): T2 { + const existing = this.v.get(ref); + if (existing) { + return existing as T2; + } + + const fresh = factory(); + this.v.set(ref, fresh); + return fresh; + } +} diff --git a/src/vs/workbench/contrib/testing/browser/testingOutputTerminalService.ts b/src/vs/workbench/contrib/testing/browser/testingOutputTerminalService.ts index 4639fbc0db9639..66434b228ebbb5 100644 --- a/src/vs/workbench/contrib/testing/browser/testingOutputTerminalService.ts +++ b/src/vs/workbench/contrib/testing/browser/testingOutputTerminalService.ts @@ -5,9 +5,8 @@ import { DeferredPromise } from 'vs/base/common/async'; import { Emitter, Event } from 'vs/base/common/event'; -import { Disposable } from 'vs/base/common/lifecycle'; +import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle'; import { language } from 'vs/base/common/platform'; -import { listenStream } from 'vs/base/common/stream'; import { isDefined } from 'vs/base/common/types'; import { localize } from 'vs/nls'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; @@ -28,7 +27,7 @@ export interface ITestingOutputTerminalService { * Opens a terminal for the given test's output. Optionally, scrolls to and * selects the given marker in the test results. */ - open(result: ITestResult, marker?: number): Promise; + open(result: ITestResult, taskIndex: number, marker?: number): Promise; } const friendlyDate = (date: number) => { @@ -36,10 +35,17 @@ const friendlyDate = (date: number) => { return d.getHours() + ':' + String(d.getMinutes()).padStart(2, '0') + ':' + String(d.getSeconds()).padStart(2, '0'); }; -const getTitle = (result: ITestResult | undefined) => { - return result - ? localize('testOutputTerminalTitleWithDate', 'Test Output at {0}', friendlyDate(result.completedAt ?? Date.now())) - : genericTitle; +const getTitle = (result: ITestResult | undefined, taskIndex: number | undefined) => { + if (!result || taskIndex === undefined) { + return genericTitle; + } + + const task = result.tasks[taskIndex]; + if (result.tasks.length < 2 || !task?.name) { + return localize('testOutputTerminalTitleWithDate', 'Test Output at {0}', friendlyDate(result.completedAt ?? Date.now())); + } + + return localize('testOutputTerminalTitleWithDateAndTaskName', '{0} at {1}', task.name, friendlyDate(result.completedAt ?? Date.now())); }; const genericTitle = localize('testOutputTerminalTitle', 'Test Output'); @@ -58,30 +64,39 @@ export class TestingOutputTerminalService implements ITestingOutputTerminalServi @ITestResultService resultService: ITestResultService, @IViewsService private viewsService: IViewsService, ) { + + const newTaskListener = new MutableDisposable(); + // If a result terminal is currently active and we start a new test run, // stream live results there automatically. resultService.onResultsChanged(evt => { - const active = this.terminalService.activeInstance; - if (!('started' in evt) || !active) { + if (!('started' in evt)) { return; } - const pane = this.viewsService.getActiveViewWithId(TERMINAL_VIEW_ID); - if (!pane) { - return; - } + newTaskListener.value = evt.started.onNewTask(taskIndex => { + const active = this.terminalService.activeInstance; + if (!active) { + return; + } - const output = this.outputTerminals.get(active); - if (output && output.ended) { - this.showResultsInTerminal(active, output, evt.started); - } + const pane = this.viewsService.getActiveViewWithId(TERMINAL_VIEW_ID); + if (!pane) { + return; + } + + const output = this.outputTerminals.get(active); + if (output && output.ended) { + this.showResultsInTerminal(active, output, evt.started, taskIndex); + } + }); }); } /** * @inheritdoc */ - public async open(result: ITestResult | undefined, marker?: number): Promise { + public async open(result: ITestResult | undefined, taskIndex: number | undefined, marker?: number): Promise { const testOutputPtys = this.terminalService.instances .map(t => { const output = this.outputTerminals.get(t); @@ -90,7 +105,7 @@ export class TestingOutputTerminalService implements ITestingOutputTerminalServi .filter(isDefined); // If there's an existing terminal for the attempted reveal, show that instead. - const existing = testOutputPtys.find(([, o]) => o.resultId === result?.id); + const existing = testOutputPtys.find(([, o]) => o.resultId === result?.id && o.taskIndex === taskIndex); if (existing) { this.terminalService.setActiveInstance(existing[0]); if (existing[0].target === TerminalLocation.Editor) { @@ -107,7 +122,7 @@ export class TestingOutputTerminalService implements ITestingOutputTerminalServi const ended = testOutputPtys.find(([, o]) => o.ended); if (ended) { ended[1].clear(); - this.showResultsInTerminal(ended[0], ended[1], result); + this.showResultsInTerminal(ended[0], ended[1], result, taskIndex); return; } @@ -117,14 +132,17 @@ export class TestingOutputTerminalService implements ITestingOutputTerminalServi isFeatureTerminal: true, icon: testingViewIcon, customPtyImplementation: () => output, - name: getTitle(result), + name: getTitle(result, taskIndex), }, - }), output, result, marker); + }), output, result, taskIndex, marker); } - private async showResultsInTerminal(terminal: ITerminalInstance, output: TestOutputProcess, result: ITestResult | undefined, thenSelectMarker?: number) { + private async showResultsInTerminal(terminal: ITerminalInstance, output: TestOutputProcess, result: ITestResult | undefined, taskIndex: number | undefined, thenSelectMarker?: number) { this.outputTerminals.set(terminal, output); - output.resetFor(result?.id, getTitle(result)); + const title = getTitle(result, taskIndex); + output.resetFor(result?.id, taskIndex, title); + terminal.rename(title); + this.terminalService.setActiveInstance(terminal); if (terminal.target === TerminalLocation.Editor) { this.terminalEditorService.revealActiveEditor(); @@ -132,33 +150,49 @@ export class TestingOutputTerminalService implements ITestingOutputTerminalServi this.terminalGroupService.showPanel(); } - if (!result) { + await output.started; + + if (!result || taskIndex === undefined) { // seems like it takes a tick for listeners to be registered output.ended = true; setTimeout(() => output.pushData(localize('testNoRunYet', '\r\nNo tests have been run, yet.\r\n'))); return; } - const [stream] = await Promise.all([result.getOutput(), output.started]); + + const testOutput = result.tasks[taskIndex].output; + let hadData = false; - listenStream(stream, { - onData: d => { - hadData = true; - output.pushData(d.toString()); - }, - onError: err => output.pushData(`\r\n\r\n${err.stack || err.message}`), - onEnd: () => { - if (!hadData) { - output.pushData(`\x1b[2m${localize('runNoOutout', 'The test run did not record any output.')}\x1b[0m`); - } + for (const d of testOutput.buffers) { + hadData = true; + output.pushData(d.toString()); + } - const completedAt = result.completedAt ? new Date(result.completedAt) : new Date(); - const text = localize('runFinished', 'Test run finished at {0}', completedAt.toLocaleString(language)); - output.pushData(`\r\n\r\n\x1b[1m> ${text} <\x1b[0m\r\n\r\n`); - output.ended = true; - this.revealMarker(terminal, thenSelectMarker); - }, + const disposable = new DisposableStore(); + disposable.add(testOutput.onDidWriteData(d => { + hadData = true; + output.pushData(d.toString()); + })); + + testOutput.endPromise.then(() => { + if (disposable.isDisposed) { + return; + } + if (!hadData) { + output.pushData(`\x1b[2m${localize('runNoOutout', 'The test run did not record any output.')}\x1b[0m`); + } + + const completedAt = result.completedAt ? new Date(result.completedAt) : new Date(); + const text = localize('runFinished', 'Test run finished at {0}', completedAt.toLocaleString(language)); + output.pushData(`\r\n\r\n\x1b[1m> ${text} <\x1b[0m\r\n\r\n`); + output.ended = true; + this.revealMarker(terminal, thenSelectMarker); + disposable.dispose(); }); + + disposable.add(terminal.onDisposed(() => { + disposable.dispose(); + })); } private revealMarker(terminal: ITerminalInstance, marker?: number) { @@ -174,12 +208,13 @@ class TestOutputProcess extends Disposable implements ITerminalChildProcess { onDidChangeHasChildProcesses?: Event | undefined; onDidChangeProperty = Event.None; private processDataEmitter = this._register(new Emitter()); - private titleEmitter = this._register(new Emitter()); private readonly startedDeferred = new DeferredPromise(); /** Whether the associated test has ended (indicating the terminal can be reused) */ public ended = true; /** Result currently being displayed */ public resultId: string | undefined; + /** Task currently being displayed */ + public taskIndex: number | undefined; /** Promise resolved when the terminal is ready to take data */ public readonly started = this.startedDeferred.p; @@ -191,10 +226,10 @@ class TestOutputProcess extends Disposable implements ITerminalChildProcess { this.processDataEmitter.fire('\x1bc'); } - public resetFor(resultId: string | undefined, title: string) { + public resetFor(resultId: string | undefined, taskIndex: number | undefined, title: string) { this.ended = false; this.resultId = resultId; - this.titleEmitter.fire(title); + this.taskIndex = taskIndex; } //#region implementation @@ -205,7 +240,6 @@ class TestOutputProcess extends Disposable implements ITerminalChildProcess { public readonly onProcessExit = this._register(new Emitter()).event; private readonly _onProcessReady = this._register(new Emitter<{ pid: number; cwd: string }>()); public readonly onProcessReady = this._onProcessReady.event; - public readonly onProcessTitleChanged = this.titleEmitter.event; public readonly onProcessShellTypeChanged = this._register(new Emitter()).event; public start(): Promise { diff --git a/src/vs/workbench/contrib/testing/common/testId.ts b/src/vs/workbench/contrib/testing/common/testId.ts index 1682cd898110b5..6e4929616b2053 100644 --- a/src/vs/workbench/contrib/testing/common/testId.ts +++ b/src/vs/workbench/contrib/testing/common/testId.ts @@ -100,6 +100,13 @@ export class TestId { return idx === -1 ? idString : idString.slice(idx + TestIdPathParts.Delimiter.length); } + /** + * Gets whether maybeChild is a child of maybeParent. + */ + public static isChild(maybeParent: string, maybeChild: string) { + return maybeChild.startsWith(maybeParent) && maybeChild[maybeParent.length] === TestIdPathParts.Delimiter; + } + /** * Compares the position of the two ID strings. */ @@ -108,11 +115,11 @@ export class TestId { return TestPosition.IsSame; } - if (b.startsWith(a + TestIdPathParts.Delimiter)) { + if (TestId.isChild(a, b)) { return TestPosition.IsChild; } - if (a.startsWith(b + TestIdPathParts.Delimiter)) { + if (TestId.isChild(b, a)) { return TestPosition.IsParent; } diff --git a/src/vs/workbench/contrib/testing/common/testResult.ts b/src/vs/workbench/contrib/testing/common/testResult.ts index c136d1f21173f0..b21f49df31f70f 100644 --- a/src/vs/workbench/contrib/testing/common/testResult.ts +++ b/src/vs/workbench/contrib/testing/common/testResult.ts @@ -3,19 +3,19 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { newWriteableBufferStream, VSBuffer, VSBufferReadableStream, VSBufferWriteableStream } from 'vs/base/common/buffer'; -import { Emitter } from 'vs/base/common/event'; +import { DeferredPromise } from 'vs/base/common/async'; +import { VSBuffer } from 'vs/base/common/buffer'; +import { Emitter, Event } from 'vs/base/common/event'; import { Lazy } from 'vs/base/common/lazy'; -import { DisposableStore } from 'vs/base/common/lifecycle'; +import { language } from 'vs/base/common/platform'; +import { removeAnsiEscapeCodes } from 'vs/base/common/strings'; import { localize } from 'vs/nls'; import { IComputedStateAccessor, refreshComputedState } from 'vs/workbench/contrib/testing/common/getComputedState'; import { IObservableValue, MutableObservableValue, staticObservableValue } from 'vs/workbench/contrib/testing/common/observableValue'; -import { getMarkId, IRichLocation, ISerializedTestResults, ITestItem, ITestMessage, ITestOutputMessage, ITestRunTask, ITestTaskState, ResolvedTestRunRequest, TestItemExpandState, TestMessageType, TestResultItem, TestResultState } from 'vs/workbench/contrib/testing/common/testTypes'; import { TestCoverage } from 'vs/workbench/contrib/testing/common/testCoverage'; -import { maxPriority, statesInOrder, terminalStatePriorities } from 'vs/workbench/contrib/testing/common/testingStates'; -import { removeAnsiEscapeCodes } from 'vs/base/common/strings'; import { TestId } from 'vs/workbench/contrib/testing/common/testId'; -import { language } from 'vs/base/common/platform'; +import { maxPriority, statesInOrder, terminalStatePriorities } from 'vs/workbench/contrib/testing/common/testingStates'; +import { getMarkId, IRichLocation, ISerializedTestResults, ITestItem, ITestMessage, ITestOutputMessage, ITestRunTask, ITestTaskState, ResolvedTestRunRequest, TestItemExpandState, TestMessageType, TestResultItem, TestResultState } from 'vs/workbench/contrib/testing/common/testTypes'; export interface ITestRunTaskResults extends ITestRunTask { /** @@ -27,6 +27,11 @@ export interface ITestRunTaskResults extends ITestRunTask { * Messages from the task not associated with any specific test. */ readonly otherMessages: ITestOutputMessage[]; + + /** + * Test results output for the task. + */ + readonly output: ITaskRawOutput; } export interface ITestResult { @@ -71,16 +76,6 @@ export interface ITestResult { */ getStateById(testExtId: string): TestResultItem | undefined; - /** - * Loads the output of the result as a stream. - */ - getOutput(): Promise; - - /** - * Loads an output of the result. - */ - getOutputRange(offset: number, length: number): Promise; - /** * Serializes the test result. Used to save and restore results * in the workspace. @@ -93,75 +88,77 @@ export interface ITestResult { toJSONWithMessages(): ISerializedTestResults | undefined; } -export const resultItemParents = function* (results: ITestResult, item: TestResultItem) { - for (const id of TestId.fromString(item.item.extId).idsToRoot()) { - yield results.getStateById(id.toString())!; - } -}; - /** - * Count of the number of tests in each run state. + * Output type exposed from live test results. */ -export type TestStateCount = { [K in TestResultState]: number }; +export interface ITaskRawOutput { + readonly onDidWriteData: Event; + readonly endPromise: Promise; + readonly buffers: VSBuffer[]; + readonly length: number; -export const makeEmptyCounts = () => { - const o: Partial = {}; - for (const state of statesInOrder) { - o[state] = 0; - } + getRange(start: number, end: number): VSBuffer; +} - return o as TestStateCount; +const emptyRawOutput: ITaskRawOutput = { + buffers: [], + length: 0, + onDidWriteData: Event.None, + endPromise: Promise.resolve(), + getRange: () => VSBuffer.alloc(0), }; -export const maxCountPriority = (counts: Readonly) => { - for (const state of statesInOrder) { - if (counts[state] > 0) { - return state; - } +export class TaskRawOutput implements ITaskRawOutput { + private readonly writeDataEmitter = new Emitter(); + private readonly endDeferred = new DeferredPromise(); + private offset = 0; + + /** @inheritdoc */ + public readonly onDidWriteData = this.writeDataEmitter.event; + + /** @inheritdoc */ + public readonly endPromise = this.endDeferred.p; + + /** @inheritdoc */ + public readonly buffers: VSBuffer[] = []; + + /** @inheritdoc */ + public get length() { + return this.offset; } - return TestResultState.Unset; -}; + /** @inheritdoc */ + getRange(start: number, length: number): VSBuffer { + const buf = VSBuffer.alloc(length); -const getMarkCode = (marker: number, start: boolean) => `\x1b]633;SetMark;Id=${getMarkId(marker, start)};Hidden\x07`; + let bufLastWrite = 0; + let internalLastRead = 0; + for (const b of this.buffers) { + if (internalLastRead + b.byteLength <= start) { + internalLastRead += b.byteLength; + continue; + } -/** - * Deals with output of a {@link LiveTestResult}. By default we pass-through - * data into the underlying write stream, but if a client requests to read it - * we splice in the written data and then continue streaming incoming data. - */ -export class LiveOutputController { - /** Set on close() to a promise that is resolved once closing is complete */ - private closed?: Promise; - /** Data written so far. This is available until the file closes. */ - private previouslyWritten: VSBuffer[] | undefined = []; + const bstart = Math.max(0, start - internalLastRead); + const bend = Math.min(b.byteLength, bstart + length - bufLastWrite); - private readonly dataEmitter = new Emitter(); - private readonly endEmitter = new Emitter(); - private _offset = 0; + buf.buffer.set(b.buffer.subarray(bstart, bend), bufLastWrite); + bufLastWrite += bend - bstart; + internalLastRead += b.byteLength; - /** - * Gets the number of written bytes. - */ - public get offset() { - return this._offset; - } + if (bufLastWrite === buf.byteLength) { + break; + } + } - constructor( - private readonly writer: Lazy<[VSBufferWriteableStream, Promise]>, - private readonly reader: () => Promise, - private readonly rangeReader: (offset: number, length: number) => Promise, - ) { } + return bufLastWrite < length ? buf.slice(0, bufLastWrite) : buf; + } /** - * Appends data to the output. + * Appends data to the output, returning the byte index where data starts. */ - public append(data: VSBuffer, marker?: number): { offset: number; done: Promise | void } { - if (this.closed) { - return { offset: this._offset, done: this.closed }; - } - - let startOffset = this._offset; + public append(data: VSBuffer, marker?: number): number { + let startOffset = this.offset; if (marker !== undefined) { const start = VSBuffer.fromString(getMarkCode(marker, true)); const end = VSBuffer.fromString(getMarkCode(marker, false)); @@ -169,89 +166,50 @@ export class LiveOutputController { data = VSBuffer.concat([start, data, end]); } - this.previouslyWritten?.push(data); - this.dataEmitter.fire(data); - this._offset += data.byteLength; + this.buffers.push(data); + this.writeDataEmitter.fire(data); + this.offset += data.byteLength; - return { offset: startOffset, done: this.writer.value[0].write(data) }; + return startOffset; } - /** - * Reads a range of data from the output. - */ - public getRange(offset: number, length: number) { - if (!this.previouslyWritten) { - return this.rangeReader(offset, length); - } - - const buffer = VSBuffer.alloc(length); - let pos = 0; - for (const chunk of this.previouslyWritten) { - if (pos + chunk.byteLength < offset) { - // no-op - } else if (pos > offset + length) { - break; - } else { - const cs = Math.max(0, offset - pos); - const bs = Math.max(0, pos - offset); - buffer.set(chunk.slice(cs, cs + Math.min(length - bs, chunk.byteLength - cs)), bs); - } - - pos += chunk.byteLength; - } - - const trailing = (offset + length) - pos; - return Promise.resolve(trailing > 0 ? buffer.slice(0, -trailing) : buffer); + /** Signals the output has ended. */ + public end() { + this.endDeferred.complete(); } +} - /** - * Reads the value of the stream. - */ - public read() { - if (!this.previouslyWritten) { - return this.reader(); - } - - const stream = newWriteableBufferStream(); - for (const chunk of this.previouslyWritten) { - stream.write(chunk); - } +export const resultItemParents = function* (results: ITestResult, item: TestResultItem) { + for (const id of TestId.fromString(item.item.extId).idsToRoot()) { + yield results.getStateById(id.toString())!; + } +}; - const disposable = new DisposableStore(); - disposable.add(this.dataEmitter.event(d => stream.write(d))); - disposable.add(this.endEmitter.event(() => stream.end())); - stream.on('end', () => disposable.dispose()); +/** + * Count of the number of tests in each run state. + */ +export type TestStateCount = { [K in TestResultState]: number }; - return Promise.resolve(stream); +export const makeEmptyCounts = () => { + const o: Partial = {}; + for (const state of statesInOrder) { + o[state] = 0; } - /** - * Closes the output, signalling no more writes will be made. - * @returns a promise that resolves when the output is written - */ - public close(): Promise { - if (this.closed) { - return this.closed; - } + return o as TestStateCount; +}; - if (!this.writer.hasValue) { - this.closed = Promise.resolve(); - } else { - const [stream, ended] = this.writer.value; - stream.end(); - this.closed = ended; +export const maxCountPriority = (counts: Readonly) => { + for (const state of statesInOrder) { + if (counts[state] > 0) { + return state; } + } - this.endEmitter.fire(); - this.closed.then(() => { - this.previouslyWritten = undefined; - this.dataEmitter.dispose(); - this.endEmitter.dispose(); - }); + return TestResultState.Unset; +}; - return this.closed; - } -} +const getMarkCode = (marker: number, start: boolean) => `\x1b]633;SetMark;Id=${getMarkId(marker, start)};Hidden\x07`; interface TestResultItemWithChildren extends TestResultItem { /** Children in the run */ @@ -284,6 +242,8 @@ export type TestResultItemChange = { item: TestResultItem; result: ITestResult } */ export class LiveTestResult implements ITestResult { private readonly completeEmitter = new Emitter(); + private readonly newTaskEmitter = new Emitter(); + private readonly endTaskEmitter = new Emitter(); private readonly changeEmitter = new Emitter(); private readonly testById = new Map(); private testMarkerCounter = 0; @@ -291,7 +251,9 @@ export class LiveTestResult implements ITestResult { public readonly onChange = this.changeEmitter.event; public readonly onComplete = this.completeEmitter.event; - public readonly tasks: ITestRunTaskResults[] = []; + public readonly onNewTask = this.newTaskEmitter.event; + public readonly onEndTask = this.endTaskEmitter.event; + public readonly tasks: (ITestRunTaskResults & { output: TaskRawOutput })[] = []; public readonly name = localize('runFinished', 'Test run at {0}', new Date().toLocaleString(language)); /** @@ -333,7 +295,6 @@ export class LiveTestResult implements ITestResult { constructor( public readonly id: string, - public readonly output: LiveOutputController, public readonly persist: boolean, public readonly request: ResolvedTestRunRequest, ) { @@ -359,7 +320,10 @@ export class LiveTestResult implements ITestResult { marker = this.testMarkerCounter++; } - const { offset } = this.output.append(output, marker); + const index = this.mustGetTaskIndex(taskId); + const task = this.tasks[index]; + + const offset = task.output.append(output, marker); const message: ITestOutputMessage = { location, message: removeAnsiEscapeCodes(preview), @@ -369,12 +333,10 @@ export class LiveTestResult implements ITestResult { type: TestMessageType.Output, }; - - const index = this.mustGetTaskIndex(taskId); if (testId) { this.testById.get(testId)?.tasks[index].messages.push(message); } else { - this.tasks[index].otherMessages.push(message); + task.otherMessages.push(message); } } @@ -382,13 +344,13 @@ export class LiveTestResult implements ITestResult { * Adds a new run task to the results. */ public addTask(task: ITestRunTask) { - const index = this.tasks.length; - this.tasks.push({ ...task, coverage: new MutableObservableValue(undefined), otherMessages: [] }); + this.tasks.push({ ...task, coverage: new MutableObservableValue(undefined), otherMessages: [], output: new TaskRawOutput() }); for (const test of this.tests) { test.tasks.push({ duration: undefined, messages: [], state: TestResultState.Unset }); - this.fireUpdateAndRefresh(test, index, TestResultState.Queued); } + + this.newTaskEmitter.fire(this.tasks.length - 1); } /** @@ -455,30 +417,22 @@ export class LiveTestResult implements ITestResult { }); } - /** - * @inheritdoc - */ - public getOutput() { - return this.output.read(); - } - - /** - * @inheritdoc - */ - public getOutputRange(offset: number, bytes: number) { - return this.output.getRange(offset, bytes); - } - /** * Marks the task in the test run complete. */ public markTaskComplete(taskId: string) { - this.tasks[this.mustGetTaskIndex(taskId)].running = false; + const index = this.mustGetTaskIndex(taskId); + const task = this.tasks[index]; + task.running = false; + task.output.end(); + this.setAllToState( TestResultState.Unset, taskId, t => t.state === TestResultState.Queued || t.state === TestResultState.Running, ); + + this.endTaskEmitter.fire(index); } /** @@ -570,7 +524,7 @@ export class LiveTestResult implements ITestResult { if (this.tasks.length) { for (let i = 0; i < this.tasks.length; i++) { - node.tasks.push({ duration: undefined, messages: [], state: TestResultState.Queued }); + node.tasks.push({ duration: undefined, messages: [], state: TestResultState.Unset }); } } @@ -650,8 +604,6 @@ export class HydratedTestResult implements ITestResult { constructor( private readonly serialized: ISerializedTestResults, - private readonly outputLoader: () => Promise, - private readonly outputRangeLoader: (offset: number, length: number) => Promise, private readonly persist = true, ) { this.id = serialized.id; @@ -661,6 +613,7 @@ export class HydratedTestResult implements ITestResult { name: task.name, running: false, coverage: staticObservableValue(undefined), + output: emptyRawOutput, otherMessages: [] })); this.name = serialized.name; @@ -673,13 +626,6 @@ export class HydratedTestResult implements ITestResult { } } - /** - * @inheritdoc - */ - public getOutputRange(offset: number, bytes: number) { - return this.outputRangeLoader(offset, bytes); - } - /** * @inheritdoc */ @@ -687,13 +633,6 @@ export class HydratedTestResult implements ITestResult { return this.testById.get(extTestId); } - /** - * @inheritdoc - */ - public getOutput() { - return this.outputLoader(); - } - /** * @inheritdoc */ diff --git a/src/vs/workbench/contrib/testing/common/testResultService.ts b/src/vs/workbench/contrib/testing/common/testResultService.ts index 0df9e450a3ff68..ecd01614b4c1ce 100644 --- a/src/vs/workbench/contrib/testing/common/testResultService.ts +++ b/src/vs/workbench/contrib/testing/common/testResultService.ts @@ -133,7 +133,7 @@ export class TestResultService implements ITestResultService { public createLiveResult(req: ResolvedTestRunRequest | ExtensionRunTestsRequest) { if ('targets' in req) { const id = generateUuid(); - return this.push(new LiveTestResult(id, this.storage.getOutputController(id), true, req)); + return this.push(new LiveTestResult(id, true, req)); } let profile: ITestRunProfile | undefined; @@ -158,7 +158,7 @@ export class TestResultService implements ITestResultService { }); } - return this.push(new LiveTestResult(req.id, this.storage.getOutputController(req.id), req.persist, resolved)); + return this.push(new LiveTestResult(req.id, req.persist, resolved)); } /** diff --git a/src/vs/workbench/contrib/testing/common/testResultStorage.ts b/src/vs/workbench/contrib/testing/common/testResultStorage.ts index db6b0e82c0117a..2b2e027b65b290 100644 --- a/src/vs/workbench/contrib/testing/common/testResultStorage.ts +++ b/src/vs/workbench/contrib/testing/common/testResultStorage.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import { bufferToStream, newWriteableBufferStream, VSBuffer, VSBufferReadableStream, VSBufferWriteableStream } from 'vs/base/common/buffer'; -import { Lazy } from 'vs/base/common/lazy'; import { isDefined } from 'vs/base/common/types'; import { URI } from 'vs/base/common/uri'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; @@ -14,8 +13,8 @@ import { ILogService } from 'vs/platform/log/common/log'; import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { StoredValue } from 'vs/workbench/contrib/testing/common/storedValue'; +import { HydratedTestResult, ITestResult } from 'vs/workbench/contrib/testing/common/testResult'; import { ISerializedTestResults } from 'vs/workbench/contrib/testing/common/testTypes'; -import { HydratedTestResult, ITestResult, LiveOutputController, LiveTestResult } from 'vs/workbench/contrib/testing/common/testResult'; export const RETAIN_MAX_RESULTS = 128; const RETAIN_MIN_RESULTS = 16; @@ -34,11 +33,6 @@ export interface ITestResultStorage { * Persists the list of test results. */ persist(results: ReadonlyArray): Promise; - - /** - * Gets the output controller for a new or existing test result. - */ - getOutputController(resultId: string): LiveOutputController; } export const ITestResultStorage = createDecorator('ITestResultStorage'); @@ -80,7 +74,7 @@ export abstract class BaseTestResultStorage implements ITestResultStorage { return undefined; } - return new HydratedTestResult(contents, () => this.readOutputForResultId(id), (o, l) => this.readOutputRangeForResultId(id, o, l)); + return new HydratedTestResult(contents); } catch (e) { this.logService.warn(`Error deserializing stored test result ${id}`, e); return undefined; @@ -90,21 +84,6 @@ export abstract class BaseTestResultStorage implements ITestResultStorage { return results.filter(isDefined); } - /** - * @override - */ - public getOutputController(resultId: string) { - return new LiveOutputController( - new Lazy(() => { - const stream = newWriteableBufferStream(); - const promise = this.storeOutputForResultId(resultId, stream); - return [stream, promise]; - }), - () => this.readOutputForResultId(resultId), - (o, l) => this.readOutputRangeForResultId(resultId, o, l) - ); - } - /** * @override */ @@ -150,10 +129,6 @@ export abstract class BaseTestResultStorage implements ITestResultStorage { todo.push(this.storeForResultId(result.id, obj)); toStore.push({ id: result.id, rev: currentRevision, bytes: contents.byteLength }); budget -= contents.byteLength; - - if (result instanceof LiveTestResult && result.completedAt !== undefined) { - todo.push(result.output.close()); - } } for (const id of toDelete.keys()) { diff --git a/src/vs/workbench/contrib/testing/common/testingContentProvider.ts b/src/vs/workbench/contrib/testing/common/testingContentProvider.ts index 7c78d8db22e44f..bcd992edfc1d47 100644 --- a/src/vs/workbench/contrib/testing/common/testingContentProvider.ts +++ b/src/vs/workbench/contrib/testing/common/testingContentProvider.ts @@ -3,6 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { VSBuffer } from 'vs/base/common/buffer'; +import { DisposableStore } from 'vs/base/common/lifecycle'; import { removeAnsiEscapeCodes } from 'vs/base/common/strings'; import { URI } from 'vs/base/common/uri'; import { ILanguageSelection, ILanguageService } from 'vs/editor/common/languages/language'; @@ -48,25 +50,34 @@ export class TestingContentProvider implements IWorkbenchContribution, ITextMode return null; } - if (parsed.type === TestUriType.AllOutput) { - const stream = await result.getOutput(); + if (parsed.type === TestUriType.TaskOutput) { + const task = result.tasks[parsed.taskIndex]; const model = this.modelService.createModel('', null, resource, false); const append = (text: string) => model.applyEdits([{ range: { startColumn: 1, endColumn: 1, startLineNumber: Infinity, endLineNumber: Infinity }, text, }]); - let hadContent = false; - stream.on('data', buf => { - hadContent ||= buf.byteLength > 0; - append(removeAnsiEscapeCodes(buf.toString())); - }); - stream.on('end', () => { + const init = VSBuffer.concat(task.output.buffers, task.output.length).toString(); + append(removeAnsiEscapeCodes(init)); + + let hadContent = init.length > 0; + const dispose = new DisposableStore(); + dispose.add(task.output.onDidWriteData(d => { + hadContent ||= d.byteLength > 0; + append(removeAnsiEscapeCodes(d.toString())); + })); + task.output.endPromise.then(() => { + if (dispose.isDisposed) { + return; + } if (!hadContent) { append(localize('runNoOutout', 'The test run did not record any output.')); + dispose.dispose(); } }); - model.onWillDispose(() => stream.destroy()); + model.onWillDispose(() => dispose.dispose()); + return model; } @@ -95,7 +106,7 @@ export class TestingContentProvider implements IWorkbenchContribution, ITextMode } if (message.type === TestMessageType.Output) { - const content = await result!.getOutputRange(message.offset, message.length); + const content = result.tasks[parsed.taskIndex].output.getRange(message.offset, message.length); text = removeAnsiEscapeCodes(content.toString()); } else if (typeof message.message === 'string') { text = message.message; diff --git a/src/vs/workbench/contrib/testing/common/testingStates.ts b/src/vs/workbench/contrib/testing/common/testingStates.ts index a3f1848b3b9451..0ec1fb91432640 100644 --- a/src/vs/workbench/contrib/testing/common/testingStates.ts +++ b/src/vs/workbench/contrib/testing/common/testingStates.ts @@ -18,8 +18,8 @@ export const statePriority: { [K in TestResultState]: number } = { [TestResultState.Failed]: 4, [TestResultState.Queued]: 3, [TestResultState.Passed]: 2, - [TestResultState.Unset]: 1, - [TestResultState.Skipped]: 0, + [TestResultState.Unset]: 0, + [TestResultState.Skipped]: 1, }; export const isFailedState = (s: TestResultState) => s === TestResultState.Errored || s === TestResultState.Failed; diff --git a/src/vs/workbench/contrib/testing/common/testingUri.ts b/src/vs/workbench/contrib/testing/common/testingUri.ts index f2a2556649972f..1e3b99eb21f598 100644 --- a/src/vs/workbench/contrib/testing/common/testingUri.ts +++ b/src/vs/workbench/contrib/testing/common/testingUri.ts @@ -9,15 +9,16 @@ import { URI } from 'vs/base/common/uri'; export const TEST_DATA_SCHEME = 'vscode-test-data'; export const enum TestUriType { - AllOutput, + TaskOutput, ResultMessage, ResultActualOutput, ResultExpectedOutput, } interface IAllOutputReference { - type: TestUriType.AllOutput; + type: TestUriType.TaskOutput; resultId: string; + taskIndex: number; } interface IResultTestUri { @@ -73,18 +74,18 @@ export const parseTestUri = (uri: URI): ParsedTestUri | undefined => { } if (request[0] === TestUriParts.AllOutput) { - return { resultId: locationId, type: TestUriType.AllOutput }; + return { resultId: locationId, taskIndex: Number(request[1]), type: TestUriType.TaskOutput }; } return undefined; }; export const buildTestUri = (parsed: ParsedTestUri): URI => { - if (parsed.type === TestUriType.AllOutput) { + if (parsed.type === TestUriType.TaskOutput) { return URI.from({ scheme: TEST_DATA_SCHEME, authority: TestUriParts.Results, - path: ['', parsed.resultId, TestUriParts.AllOutput].join('/'), + path: ['', parsed.resultId, TestUriParts.AllOutput, parsed.taskIndex].join('/'), }); } diff --git a/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts b/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts index 4d53c4ddd790a4..befed0d417b5f1 100644 --- a/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts +++ b/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts @@ -5,28 +5,17 @@ import * as assert from 'assert'; import { timeout } from 'vs/base/common/async'; -import { bufferToStream, newWriteableBufferStream, VSBuffer } from 'vs/base/common/buffer'; -import { Lazy } from 'vs/base/common/lazy'; +import { VSBuffer } from 'vs/base/common/buffer'; import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService'; import { NullLogService } from 'vs/platform/log/common/log'; -import { ITestTaskState, ResolvedTestRunRequest, TestResultItem, TestResultState, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes'; import { TestId } from 'vs/workbench/contrib/testing/common/testId'; import { TestProfileService } from 'vs/workbench/contrib/testing/common/testProfileService'; -import { HydratedTestResult, LiveOutputController, LiveTestResult, makeEmptyCounts, resultItemParents, TestResultItemChange, TestResultItemChangeReason } from 'vs/workbench/contrib/testing/common/testResult'; +import { HydratedTestResult, LiveTestResult, makeEmptyCounts, resultItemParents, TaskRawOutput, TestResultItemChange, TestResultItemChangeReason } from 'vs/workbench/contrib/testing/common/testResult'; import { TestResultService } from 'vs/workbench/contrib/testing/common/testResultService'; -import { InMemoryResultStorage, ITestResultStorage, TestResultStorage } from 'vs/workbench/contrib/testing/common/testResultStorage'; +import { InMemoryResultStorage, ITestResultStorage } from 'vs/workbench/contrib/testing/common/testResultStorage'; +import { ITestTaskState, ResolvedTestRunRequest, TestResultItem, TestResultState, TestRunProfileBitset } from 'vs/workbench/contrib/testing/common/testTypes'; import { getInitializedMainTestCollection, testStubs, TestTestCollection } from 'vs/workbench/contrib/testing/test/common/testStubs'; import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices'; -import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider'; -import { FileService } from 'vs/platform/files/common/fileService'; -import { DisposableStore } from 'vs/base/common/lifecycle'; -import { URI } from 'vs/base/common/uri'; - -export const emptyOutputController = () => new LiveOutputController( - new Lazy(() => [newWriteableBufferStream(), Promise.resolve()]), - () => Promise.resolve(bufferToStream(VSBuffer.alloc(0))), - () => Promise.resolve(VSBuffer.alloc(0)), -); suite('Workbench - Test Results Service', () => { const getLabelsIn = (it: Iterable) => [...it].map(t => t.item.label).sort(); @@ -57,7 +46,6 @@ suite('Workbench - Test Results Service', () => { changed = new Set(); r = new TestLiveTestResult( 'foo', - emptyOutputController(), true, defaultOpts(['id-a']), ); @@ -92,7 +80,6 @@ suite('Workbench - Test Results Service', () => { test('is empty if no tests are yet present', async () => { assert.deepStrictEqual(getLabelsIn(new TestLiveTestResult( 'foo', - emptyOutputController(), false, defaultOpts(['id-a']), ).tests), []); @@ -254,7 +241,6 @@ suite('Workbench - Test Results Service', () => { const r2 = results.push(new LiveTestResult( '', - emptyOutputController(), false, defaultOpts([]), )); @@ -267,7 +253,6 @@ suite('Workbench - Test Results Service', () => { results.push(r); const r2 = results.push(new LiveTestResult( '', - emptyOutputController(), false, defaultOpts([]), )); @@ -291,7 +276,7 @@ suite('Workbench - Test Results Service', () => { computedState: state, ownComputedState: state, }] - }, () => Promise.resolve(bufferToStream(VSBuffer.alloc(0))), () => Promise.resolve(VSBuffer.alloc(0))); + }); test('pushes hydrated results', async () => { results.push(r); @@ -330,64 +315,29 @@ suite('Workbench - Test Results Service', () => { }); suite('output controller', () => { - - const disposables = new DisposableStore(); - const ROOT = URI.file('tests').with({ scheme: 'vscode-tests' }); - let storage: TestResultStorage; - - setup(() => { - const logService = new NullLogService(); - const fileService = disposables.add(new FileService(logService)); - const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider()); - disposables.add(fileService.registerProvider(ROOT.scheme, fileSystemProvider)); - - storage = new TestResultStorage( - new TestStorageService(), - new NullLogService(), - { getWorkspace: () => ({ id: 'test' }) } as any, - fileService, - { workspaceStorageHome: ROOT } as any - ); - }); - - teardown(() => disposables.clear()); - test('reads live output ranges', async () => { - const ctrl = storage.getOutputController('a'); + const ctrl = new TaskRawOutput(); ctrl.append(VSBuffer.fromString('12345')); ctrl.append(VSBuffer.fromString('67890')); ctrl.append(VSBuffer.fromString('12345')); ctrl.append(VSBuffer.fromString('67890')); - assert.deepStrictEqual(await ctrl.getRange(0, 5), VSBuffer.fromString('12345')); - assert.deepStrictEqual(await ctrl.getRange(5, 5), VSBuffer.fromString('67890')); - assert.deepStrictEqual(await ctrl.getRange(7, 6), VSBuffer.fromString('890123')); - assert.deepStrictEqual(await ctrl.getRange(15, 5), VSBuffer.fromString('67890')); - assert.deepStrictEqual(await ctrl.getRange(15, 10), VSBuffer.fromString('67890')); + assert.deepStrictEqual(ctrl.getRange(0, 5), VSBuffer.fromString('12345')); + assert.deepStrictEqual(ctrl.getRange(5, 5), VSBuffer.fromString('67890')); + assert.deepStrictEqual(ctrl.getRange(7, 6), VSBuffer.fromString('890123')); + assert.deepStrictEqual(ctrl.getRange(15, 5), VSBuffer.fromString('67890')); + assert.deepStrictEqual(ctrl.getRange(15, 10), VSBuffer.fromString('67890')); }); test('corrects offsets for marked ranges', async () => { - const ctrl = storage.getOutputController('a'); + const ctrl = new TaskRawOutput(); const a1 = ctrl.append(VSBuffer.fromString('12345'), 1); const a2 = ctrl.append(VSBuffer.fromString('67890'), 1234); - assert.deepStrictEqual(await ctrl.getRange(a1.offset, 5), VSBuffer.fromString('12345')); - assert.deepStrictEqual(await ctrl.getRange(a2.offset, 5), VSBuffer.fromString('67890')); - }); - - test('reads stored output ranges', async () => { - const ctrl = storage.getOutputController('a'); - - ctrl.append(VSBuffer.fromString('12345')); - ctrl.append(VSBuffer.fromString('67890')); - ctrl.append(VSBuffer.fromString('12345')); - ctrl.append(VSBuffer.fromString('67890')); - await ctrl.close(); - - // sanity: - assert.deepStrictEqual(await ctrl.getRange(0, 5), VSBuffer.fromString('12345')); + assert.deepStrictEqual(ctrl.getRange(a1, 5), VSBuffer.fromString('12345')); + assert.deepStrictEqual(ctrl.getRange(a2, 5), VSBuffer.fromString('67890')); }); }); }); diff --git a/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts b/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts index 115095f4eef2f0..a46e0e630a68b5 100644 --- a/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts +++ b/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts @@ -8,7 +8,6 @@ import { range } from 'vs/base/common/arrays'; import { NullLogService } from 'vs/platform/log/common/log'; import { ITestResult, LiveTestResult } from 'vs/workbench/contrib/testing/common/testResult'; import { InMemoryResultStorage, RETAIN_MAX_RESULTS } from 'vs/workbench/contrib/testing/common/testResultStorage'; -import { emptyOutputController } from 'vs/workbench/contrib/testing/test/common/testResultService.test'; import { testStubs } from 'vs/workbench/contrib/testing/test/common/testStubs'; import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices'; @@ -18,7 +17,6 @@ suite('Workbench - Test Result Storage', () => { const makeResult = (taskName = 't') => { const t = new LiveTestResult( '', - emptyOutputController(), true, { targets: [] } ); diff --git a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts index d2e559701458e3..5dabeed9dc8c54 100644 --- a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts +++ b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts @@ -731,7 +731,8 @@ class DefaultThemeUpdatedNotificationContribution implements IWorkbenchContribut private async _showYouGotMigratedNotification(): Promise { this._storageService.store(DefaultThemeUpdatedNotificationContribution.STORAGE_KEY, true, StorageScope.APPLICATION, StorageTarget.USER); - const newThemeSettingsId = isWeb ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK; + const usingLight = this._workbenchThemeService.getColorTheme().type === ColorScheme.LIGHT; + const newThemeSettingsId = usingLight ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK; const newTheme = (await this._workbenchThemeService.getColorThemes()).find(theme => theme.settingsId === newThemeSettingsId); if (newTheme) { const choices = [ @@ -752,7 +753,7 @@ class DefaultThemeUpdatedNotificationContribution implements IWorkbenchContribut label: localize('button.revert', "Revert"), run: async () => { this._writeTelemetry('keepOld'); - const oldSettingsId = isWeb ? ThemeSettingDefaults.COLOR_THEME_LIGHT_OLD : ThemeSettingDefaults.COLOR_THEME_DARK_OLD; + const oldSettingsId = usingLight ? ThemeSettingDefaults.COLOR_THEME_LIGHT_OLD : ThemeSettingDefaults.COLOR_THEME_DARK_OLD; const oldTheme = (await this._workbenchThemeService.getColorThemes()).find(theme => theme.settingsId === oldSettingsId); if (oldTheme) { this._workbenchThemeService.setColorTheme(oldTheme, 'auto'); diff --git a/src/vs/workbench/contrib/update/browser/update.ts b/src/vs/workbench/contrib/update/browser/update.ts index f7a5ce60765d55..51000990668acf 100644 --- a/src/vs/workbench/contrib/update/browser/update.ts +++ b/src/vs/workbench/contrib/update/browser/update.ts @@ -17,7 +17,7 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/ import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService'; import { ReleaseNotesManager } from 'vs/workbench/contrib/update/browser/releaseNotesEditor'; -import { isWindows } from 'vs/base/common/platform'; +import { isWeb, isWindows } from 'vs/base/common/platform'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { RawContextKey, IContextKey, IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { MenuRegistry, MenuId, registerAction2, Action2 } from 'vs/platform/actions/common/actions'; @@ -117,6 +117,10 @@ export class ProductContribution implements IWorkbenchContribution { downloadUrlKey.set(productService.downloadUrl); } + if (isWeb) { + return; + } + hostService.hadLastFocus().then(async hadLastFocus => { if (!hadLastFocus) { return; diff --git a/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html b/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html index d8b7f4ebd31291..eceefada5cc2f9 100644 --- a/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html +++ b/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html @@ -272,7 +272,7 @@ const onControllerChange = () => { navigator.serviceWorker.removeEventListener('controllerchange', onControllerChange); if (navigator.serviceWorker.controller) { - postVersionMessage(navigator.serviceWorker.controller); + postVersionMessage(navigator.serviceWorker.controller); } else { return reject(new Error('No controller found.')); } @@ -450,11 +450,11 @@ if (!disableServiceWorker) { hostMessaging.onMessage('did-load-resource', (_event, data) => { assertIsDefined(navigator.serviceWorker.controller).postMessage({ channel: 'did-load-resource', data }, data.data?.buffer ? [data.data.buffer] : []); - }); + }); hostMessaging.onMessage('did-load-localhost', (_event, data) => { assertIsDefined(navigator.serviceWorker.controller).postMessage({ channel: 'did-load-localhost', data }); - }); + }); navigator.serviceWorker.addEventListener('message', event => { switch (event.data.channel) { @@ -630,8 +630,10 @@ */ function isCopyPasteOrCut(e) { const hasMeta = e.ctrlKey || e.metaKey; - const shiftInsert = e.shiftKey && e.key.toLowerCase() === 'insert'; - return (hasMeta && ['c', 'v', 'x'].includes(e.key.toLowerCase())) || shiftInsert; + // 45: keyCode of "Insert" + const shiftInsert = e.shiftKey && e.keyCode === 45; + // 67, 86, 88: keyCode of "C", "V", "X" + return (hasMeta && [67, 86, 88].includes(e.keyCode)) || shiftInsert; } /** @@ -640,7 +642,8 @@ */ function isUndoRedo(e) { const hasMeta = e.ctrlKey || e.metaKey; - return hasMeta && ['z', 'y'].includes(e.key.toLowerCase()); + // 90, 89: keyCode of "Z", "Y" + return hasMeta && [90, 89].includes(e.keyCode); } /** @@ -649,7 +652,8 @@ */ function isPrint(e) { const hasMeta = e.ctrlKey || e.metaKey; - return hasMeta && e.key.toLowerCase() === 'p'; + // 80: keyCode of "P" + return hasMeta && e.keyCode === 80; } /** @@ -658,7 +662,8 @@ */ function isFindEvent(e) { const hasMeta = e.ctrlKey || e.metaKey; - return hasMeta && e.key.toLowerCase() === 'f'; + // 70: keyCode of "F" + return hasMeta && e.keyCode === 70; } /** @@ -667,7 +672,8 @@ */ function isSaveEvent(e) { const hasMeta = e.ctrlKey || e.metaKey; - return hasMeta && e.key.toLowerCase() === 's'; + // 83: keyCode of "S" + return hasMeta && e.keyCode === 83; } /** @@ -676,7 +682,8 @@ */ function isCloseTab(e) { const hasMeta = e.ctrlKey || e.metaKey; - return hasMeta && e.key.toLowerCase() === 'w'; + // 87: keyCode of "W" + return hasMeta && e.keyCode === 87; } /** @@ -685,7 +692,8 @@ */ function isNewWindow(e) { const hasMeta = e.ctrlKey || e.metaKey; - return hasMeta && e.key.toLowerCase() === 'n'; + // 78: keyCode of "N" + return hasMeta && e.keyCode === 78; } let isHandlingScroll = false; diff --git a/src/vs/workbench/contrib/webview/browser/pre/index.html b/src/vs/workbench/contrib/webview/browser/pre/index.html index cbf61f2131355e..8e3d08e1a7290e 100644 --- a/src/vs/workbench/contrib/webview/browser/pre/index.html +++ b/src/vs/workbench/contrib/webview/browser/pre/index.html @@ -5,7 +5,7 @@ + content="default-src 'none'; script-src 'sha256-N4YFn5ze5crjPqMK/opogKs7bSGWtf3lmjV/3LfbSOs=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> { + rerender(); + const someStepsComplete = this.gettingStartedCategories.some(category => category.steps.find(s => s.done)); + if (!this.productService.openToWelcomeMainPage && !someStepsComplete && !this.hasScrolledToFirstCategory) { + const firstSessionDateString = this.storageService.get(firstSessionDateStorageKey, StorageScope.APPLICATION) || new Date().toUTCString(); + const daysSinceFirstSession = ((+new Date()) - (+new Date(firstSessionDateString))) / 1000 / 60 / 60 / 24; + const fistContentBehaviour = daysSinceFirstSession < 1 ? 'openToFirstCategory' : 'index'; + + if (fistContentBehaviour === 'openToFirstCategory') { + const first = this.gettingStartedCategories.filter(c => !c.when || this.contextService.contextMatchesRules(c.when))[0]; + this.hasScrolledToFirstCategory = true; + if (first) { + this.currentWalkthrough = first; + this.editorInput.selectedCategory = this.currentWalkthrough?.id; + this.buildCategorySlide(this.editorInput.selectedCategory, undefined); + this.setSlide('details'); + return; + } + } + } + })); + this._register(this.gettingStartedService.onDidAddWalkthrough(rerender)); this._register(this.gettingStartedService.onDidRemoveWalkthrough(rerender)); @@ -872,29 +893,11 @@ export class GettingStartedPage extends EditorPane { } } - const someStepsComplete = this.gettingStartedCategories.some(category => category.steps.find(s => s.done)); if (this.editorInput.showTelemetryNotice && this.productService.openToWelcomeMainPage) { const telemetryNotice = $('p.telemetry-notice'); this.buildTelemetryFooter(telemetryNotice); footer.appendChild(telemetryNotice); - } else if (!this.productService.openToWelcomeMainPage && !someStepsComplete && !this.hasScrolledToFirstCategory) { - const firstSessionDateString = this.storageService.get(firstSessionDateStorageKey, StorageScope.APPLICATION) || new Date().toUTCString(); - const daysSinceFirstSession = ((+new Date()) - (+new Date(firstSessionDateString))) / 1000 / 60 / 60 / 24; - const fistContentBehaviour = daysSinceFirstSession < 1 ? 'openToFirstCategory' : 'index'; - - if (fistContentBehaviour === 'openToFirstCategory') { - const first = this.gettingStartedCategories.filter(c => !c.when || this.contextService.contextMatchesRules(c.when))[0]; - this.hasScrolledToFirstCategory = true; - if (first) { - this.currentWalkthrough = first; - this.editorInput.selectedCategory = this.currentWalkthrough?.id; - this.buildCategorySlide(this.editorInput.selectedCategory, undefined); - this.setSlide('details'); - return; - } - } } - this.setSlide('categories'); } diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts index 1908c1a35f2323..2bed700f6452d0 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts @@ -377,8 +377,13 @@ export class WalkthroughsService extends Disposable implements IWalkthroughsServ this.metadata.set(categoryID, { firstSeen: +new Date(), stepIDs: walkthrough.steps?.map(s => s.id) ?? [], manaullyOpened: false }); } + const override = await Promise.race([ + this.tasExperimentService?.getTreatment(`gettingStarted.overrideCategory.${extension.identifier.value + '.' + walkthrough.id}.when`), + new Promise(resolve => setTimeout(() => resolve(walkthrough.when), 5000)) + ]); + if (this.sessionInstalledExtensions.has(extension.identifier.value.toLowerCase()) - && this.contextService.contextMatchesRules(ContextKeyExpr.deserialize(walkthrough.when) ?? ContextKeyExpr.true()) + && this.contextService.contextMatchesRules(ContextKeyExpr.deserialize(override ?? walkthrough.when) ?? ContextKeyExpr.true()) ) { this.sessionInstalledExtensions.delete(extension.identifier.value.toLowerCase()); if (index < sectionToOpenIndex && isNewlyInstalled) { @@ -460,7 +465,7 @@ export class WalkthroughsService extends Disposable implements IWalkthroughsServ ? FileAccess.uriToBrowserUri(joinPath(extension.extensionLocation, iconStr)).toString(true) : DefaultIconPath }, - when: ContextKeyExpr.deserialize(walkthrough.when) ?? ContextKeyExpr.true(), + when: ContextKeyExpr.deserialize(override ?? walkthrough.when) ?? ContextKeyExpr.true(), } as const; this._registerWalkthrough(walkthoughDescriptor); diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/dark.png b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/dark.png index d6d83828f466bf..5f65f40db2d656 100644 Binary files a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/dark.png and b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/dark.png differ diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/light.png b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/light.png index fa614736af9d28..b5ac38dc7279ec 100644 Binary files a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/light.png and b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/light.png differ diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker.ts index 40a664e75818d7..7c204e585199c4 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker.ts @@ -12,11 +12,11 @@ export default () => `
- ${escape(localize('dark', "Dark"))} + ${escape(localize('dark', "Dark Modern"))} - ${escape(localize('light', "Light"))} + ${escape(localize('light', "Light Modern"))}
diff --git a/src/vs/workbench/services/issue/electron-sandbox/issueService.ts b/src/vs/workbench/services/issue/electron-sandbox/issueService.ts index 948d9a4902e7db..7c6d856a877bc3 100644 --- a/src/vs/workbench/services/issue/electron-sandbox/issueService.ts +++ b/src/vs/workbench/services/issue/electron-sandbox/issueService.ts @@ -64,7 +64,7 @@ export class NativeIssueService implements IWorkbenchIssueService { version: manifest.version, repositoryUrl: manifest.repository && manifest.repository.url, bugsUrl: manifest.bugs && manifest.bugs.url, - hasIssueUriRequestHandler: this._handlers.has(extension.identifier.id), + hasIssueUriRequestHandler: this._handlers.has(extension.identifier.id.toLowerCase()), displayName: manifest.displayName, id: extension.identifier.id, isTheme, @@ -145,7 +145,7 @@ export class NativeIssueService implements IWorkbenchIssueService { } registerIssueUriRequestHandler(extensionId: string, handler: IIssueUriRequestHandler): IDisposable { - this._handlers.set(extensionId, handler); + this._handlers.set(extensionId.toLowerCase(), handler); return { dispose: () => this._handlers.delete(extensionId) }; diff --git a/src/vs/workbench/services/remote/common/remoteExplorerService.ts b/src/vs/workbench/services/remote/common/remoteExplorerService.ts index 7ce33fccd67c32..d945cf074c9cae 100644 --- a/src/vs/workbench/services/remote/common/remoteExplorerService.ts +++ b/src/vs/workbench/services/remote/common/remoteExplorerService.ts @@ -425,6 +425,7 @@ export class TunnelModel extends Disposable { public readonly configPortsAttributes: PortsAttributes; private restoreListener: IDisposable | undefined; private knownPortsRestoreValue: string | undefined; + private unrestoredExtensionTunnels: Map = new Map(); private portAttributesProviders: PortAttributesProvider[] = []; @@ -551,7 +552,9 @@ export class TunnelModel extends Disposable { const tunnels = JSON.parse(tunnelRestoreValue) ?? []; this.logService.trace(`ForwardedPorts: (TunnelModel) restoring ports ${tunnels.map(tunnel => tunnel.remotePort).join(', ')}`); for (const tunnel of tunnels) { - if (!mapHasAddressLocalhostOrAllInterfaces(this.detected, tunnel.remoteHost, tunnel.remotePort)) { + const alreadyForwarded = mapHasAddressLocalhostOrAllInterfaces(this.detected, tunnel.remoteHost, tunnel.remotePort); + // Extension forwarded ports should only be updated, not restored. + if ((tunnel.source.source === TunnelSource.User && !alreadyForwarded) || (tunnel.source.source === TunnelSource.Extension && alreadyForwarded)) { await this.forward({ remote: { host: tunnel.remoteHost, port: tunnel.remotePort }, local: tunnel.localPort, @@ -559,6 +562,8 @@ export class TunnelModel extends Disposable { privacy: tunnel.privacy, elevateIfNeeded: true }); + } else if (tunnel.source.source === TunnelSource.Extension && !alreadyForwarded) { + this.unrestoredExtensionTunnels.set(makeAddress(tunnel.remoteHost, tunnel.remotePort), tunnel); } } } @@ -580,7 +585,7 @@ export class TunnelModel extends Disposable { @debounce(1000) private async storeForwarded() { if (this.configurationService.getValue('remote.restoreForwardedPorts')) { - const valueToStore = JSON.stringify(Array.from(this.forwarded.values()).filter(value => value.source.source === TunnelSource.User)); + const valueToStore = JSON.stringify(Array.from(this.forwarded.values()).filter(value => value.source.source !== TunnelSource.Auto)); if (valueToStore !== this.knownPortsRestoreValue) { this.knownPortsRestoreValue = valueToStore; const key = await this.getStorageKey(); @@ -626,7 +631,7 @@ export class TunnelModel extends Disposable { const key = makeAddress(tunnelProperties.remote.host, tunnelProperties.remote.port); this.inProgress.set(key, true); - const tunnel = await this.tunnelService.openTunnel(addressProvider, tunnelProperties.remote.host, tunnelProperties.remote.port, undefined, localPort, (!tunnelProperties.elevateIfNeeded) ? attributes?.elevateIfNeeded : tunnelProperties.elevateIfNeeded, tunnelProperties.privacy, attributes?.protocol); + let tunnel = await this.tunnelService.openTunnel(addressProvider, tunnelProperties.remote.host, tunnelProperties.remote.port, undefined, localPort, (!tunnelProperties.elevateIfNeeded) ? attributes?.elevateIfNeeded : tunnelProperties.elevateIfNeeded, tunnelProperties.privacy, attributes?.protocol); if (tunnel && tunnel.localAddress) { const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces(this._candidates ?? new Map(), tunnelProperties.remote.host, tunnelProperties.remote.port); const protocol = (tunnel.protocol ? @@ -653,6 +658,19 @@ export class TunnelModel extends Disposable { await this.storeForwarded(); await this.showPortMismatchModalIfNeeded(tunnel, localPort, attributes); this._onForwardPort.fire(newForward); + if (this.unrestoredExtensionTunnels.has(key)) { + const updateProps = this.unrestoredExtensionTunnels.get(key); + this.unrestoredExtensionTunnels.delete(key); + if (updateProps) { + tunnel = await this.forward({ + remote: { host: newForward.remoteHost, port: newForward.remotePort }, + local: newForward.localPort, + name: newForward.name, + privacy: updateProps.privacy, + elevateIfNeeded: true, + }); + } + } return tunnel; } this.inProgress.delete(key); diff --git a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts index 0ae7e479016c7d..ea58be56b01f44 100644 --- a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts +++ b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts @@ -6,7 +6,7 @@ import * as nls from 'vs/nls'; import * as types from 'vs/base/common/types'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; -import { IWorkbenchThemeService, IWorkbenchColorTheme, IWorkbenchFileIconTheme, ExtensionData, VS_LIGHT_THEME, VS_DARK_THEME, VS_HC_THEME, VS_HC_LIGHT_THEME, ThemeSettings, IWorkbenchProductIconTheme, ThemeSettingTarget, ThemeSettingDefaults } from 'vs/workbench/services/themes/common/workbenchThemeService'; +import { IWorkbenchThemeService, IWorkbenchColorTheme, IWorkbenchFileIconTheme, ExtensionData, VS_LIGHT_THEME, VS_DARK_THEME, VS_HC_THEME, VS_HC_LIGHT_THEME, ThemeSettings, IWorkbenchProductIconTheme, ThemeSettingTarget, ThemeSettingDefaults, COLOR_THEME_DARK_INITIAL_COLORS, COLOR_THEME_LIGHT_INITIAL_COLORS } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { Registry } from 'vs/platform/registry/common/platform'; @@ -143,7 +143,8 @@ export class WorkbenchThemeService implements IWorkbenchThemeService { // themes are loaded asynchronously, we need to initialize // a color theme document with good defaults until the theme is loaded let themeData: ColorThemeData | undefined = ColorThemeData.fromStorageData(this.storageService); - if (themeData && this.settings.colorTheme !== themeData.settingsId && this.settings.isDefaultColorTheme()) { + const colorThemeSetting = this.settings.colorTheme; + if (themeData && colorThemeSetting !== themeData.settingsId && this.settings.isDefaultColorTheme()) { this.hasDefaultUpdated = themeData.settingsId === ThemeSettingDefaults.COLOR_THEME_DARK_OLD || themeData.settingsId === ThemeSettingDefaults.COLOR_THEME_LIGHT_OLD; // the web has different defaults than the desktop, therefore do not restore when the setting is the default theme and the storage doesn't match that. @@ -152,18 +153,19 @@ export class WorkbenchThemeService implements IWorkbenchThemeService { // the preferred color scheme (high contrast, light, dark) has changed since the last start const preferredColorScheme = this.getPreferredColorScheme(); + const defaultColorMap = colorThemeSetting === ThemeSettingDefaults.COLOR_THEME_LIGHT ? COLOR_THEME_LIGHT_INITIAL_COLORS : colorThemeSetting === ThemeSettingDefaults.COLOR_THEME_DARK ? COLOR_THEME_DARK_INITIAL_COLORS : undefined; if (preferredColorScheme && themeData?.type !== preferredColorScheme && this.storageService.get(PERSISTED_OS_COLOR_SCHEME, PERSISTED_OS_COLOR_SCHEME_SCOPE) !== preferredColorScheme) { - themeData = ColorThemeData.createUnloadedThemeForThemeType(preferredColorScheme); + themeData = ColorThemeData.createUnloadedThemeForThemeType(preferredColorScheme, undefined); } if (!themeData) { const initialColorTheme = environmentService.options?.initialColorTheme; if (initialColorTheme) { - themeData = ColorThemeData.createUnloadedThemeForThemeType(initialColorTheme.themeType, initialColorTheme.colors); + themeData = ColorThemeData.createUnloadedThemeForThemeType(initialColorTheme.themeType, initialColorTheme.colors ?? defaultColorMap); } } if (!themeData) { - themeData = ColorThemeData.createUnloadedThemeForThemeType(isWeb ? ColorScheme.LIGHT : ColorScheme.DARK); + themeData = ColorThemeData.createUnloadedThemeForThemeType(isWeb ? ColorScheme.LIGHT : ColorScheme.DARK, defaultColorMap); } themeData.setCustomizations(this.settings); this.applyTheme(themeData, undefined, true); diff --git a/src/vs/workbench/services/themes/common/colorThemeData.ts b/src/vs/workbench/services/themes/common/colorThemeData.ts index 257a77e705194f..c498d6c4da4a81 100644 --- a/src/vs/workbench/services/themes/common/colorThemeData.ts +++ b/src/vs/workbench/services/themes/common/colorThemeData.ts @@ -587,22 +587,6 @@ export class ColorThemeData implements IWorkbenchColorTheme { // constructors static createUnloadedThemeForThemeType(themeType: ColorScheme, colorMap?: { [id: string]: string }): ColorThemeData { - if (!colorMap) { - if (themeType === ColorScheme.LIGHT) { - colorMap = { - 'activityBar.background': '#f8f8f8', - 'statusBar.background': '#f8f8f8', - 'statusBar.noFolderBackground': '#f8f8f8' - }; - } else { - colorMap = { - 'activityBar.background': '#181818', - 'statusBar.background': '#181818', - 'statusBar.noFolderBackground': '#1f1f1f', - }; - } - - } return ColorThemeData.createUnloadedTheme(getThemeTypeSelector(themeType), colorMap); } diff --git a/src/vs/workbench/services/themes/common/themeConfiguration.ts b/src/vs/workbench/services/themes/common/themeConfiguration.ts index 5e54716254c660..f7fe4efae0801f 100644 --- a/src/vs/workbench/services/themes/common/themeConfiguration.ts +++ b/src/vs/workbench/services/themes/common/themeConfiguration.ts @@ -23,6 +23,10 @@ const colorThemeSettingEnum: string[] = []; const colorThemeSettingEnumItemLabels: string[] = []; const colorThemeSettingEnumDescriptions: string[] = []; +function formatSettingAsLink(str: string) { + return `\`#${str}#\``; +} + const colorThemeSettingSchema: IConfigurationPropertySchema = { type: 'string', description: nls.localize('colorTheme', "Specifies the color theme used in the workbench."), @@ -34,7 +38,7 @@ const colorThemeSettingSchema: IConfigurationPropertySchema = { }; const preferredDarkThemeSettingSchema: IConfigurationPropertySchema = { type: 'string', // - markdownDescription: nls.localize({ key: 'preferredDarkColorTheme', comment: ['`#{0}#` will become a link to an other setting. Do not remove backtick or #'] }, 'Specifies the preferred color theme for dark OS appearance when `#{0}#` is enabled.', ThemeSettings.DETECT_COLOR_SCHEME), + markdownDescription: nls.localize({ key: 'preferredDarkColorTheme', comment: ['{0} will become a link to another setting.'] }, 'Specifies the preferred color theme for dark OS appearance when {0} is enabled.', formatSettingAsLink(ThemeSettings.DETECT_COLOR_SCHEME)), default: ThemeSettingDefaults.COLOR_THEME_DARK, enum: colorThemeSettingEnum, enumDescriptions: colorThemeSettingEnumDescriptions, @@ -43,7 +47,7 @@ const preferredDarkThemeSettingSchema: IConfigurationPropertySchema = { }; const preferredLightThemeSettingSchema: IConfigurationPropertySchema = { type: 'string', - markdownDescription: nls.localize({ key: 'preferredLightColorTheme', comment: ['`#{0}#` will become a link to an other setting. Do not remove backtick or #'] }, 'Specifies the preferred color theme for light OS appearance when `#{0}#` is enabled.', ThemeSettings.DETECT_COLOR_SCHEME), + markdownDescription: nls.localize({ key: 'preferredLightColorTheme', comment: ['{0} will become a link to another setting.'] }, 'Specifies the preferred color theme for light OS appearance when {0} is enabled.', formatSettingAsLink(ThemeSettings.DETECT_COLOR_SCHEME)), default: ThemeSettingDefaults.COLOR_THEME_LIGHT, enum: colorThemeSettingEnum, enumDescriptions: colorThemeSettingEnumDescriptions, @@ -52,7 +56,7 @@ const preferredLightThemeSettingSchema: IConfigurationPropertySchema = { }; const preferredHCDarkThemeSettingSchema: IConfigurationPropertySchema = { type: 'string', - markdownDescription: nls.localize({ key: 'preferredHCDarkColorTheme', comment: ['`#{0}#` will become a link to an other setting. Do not remove backtick or #'] }, 'Specifies the preferred color theme used in high contrast dark mode when `#{0}#` is enabled.', ThemeSettings.DETECT_HC), + markdownDescription: nls.localize({ key: 'preferredHCDarkColorTheme', comment: ['{0} will become a link to another setting.'] }, 'Specifies the preferred color theme used in high contrast dark mode when {0} is enabled.', formatSettingAsLink(ThemeSettings.DETECT_HC)), default: ThemeSettingDefaults.COLOR_THEME_HC_DARK, enum: colorThemeSettingEnum, enumDescriptions: colorThemeSettingEnumDescriptions, @@ -61,7 +65,7 @@ const preferredHCDarkThemeSettingSchema: IConfigurationPropertySchema = { }; const preferredHCLightThemeSettingSchema: IConfigurationPropertySchema = { type: 'string', - markdownDescription: nls.localize({ key: 'preferredHCLightColorTheme', comment: ['`#{0}#` will become a link to an other setting. Do not remove backtick or #'] }, 'Specifies the preferred color theme used in high contrast light mode when `#{0}#` is enabled.', ThemeSettings.DETECT_HC), + markdownDescription: nls.localize({ key: 'preferredHCLightColorTheme', comment: ['{0} will become a link to another setting.'] }, 'Specifies the preferred color theme used in high contrast light mode when {0} is enabled.', formatSettingAsLink(ThemeSettings.DETECT_HC)), default: ThemeSettingDefaults.COLOR_THEME_HC_LIGHT, enum: colorThemeSettingEnum, enumDescriptions: colorThemeSettingEnumDescriptions, @@ -70,7 +74,7 @@ const preferredHCLightThemeSettingSchema: IConfigurationPropertySchema = { }; const detectColorSchemeSettingSchema: IConfigurationPropertySchema = { type: 'boolean', - markdownDescription: nls.localize('detectColorScheme', 'If set, automatically switch to the preferred color theme based on the OS appearance. If the OS appearance is dark, the theme specified at `#{0}#` is used, for light `#{1}#`.', ThemeSettings.PREFERRED_DARK_THEME, ThemeSettings.PREFERRED_LIGHT_THEME), + markdownDescription: nls.localize({ key: 'detectColorScheme', comment: ['{0} and {1} will become links to other settings.'] }, 'If set, automatically switch to the preferred color theme based on the OS appearance. If the OS appearance is dark, the theme specified at {0} is used, for light {1}.', formatSettingAsLink(ThemeSettings.PREFERRED_DARK_THEME), formatSettingAsLink(ThemeSettings.PREFERRED_LIGHT_THEME)), default: false }; @@ -106,7 +110,7 @@ const productIconThemeSettingSchema: IConfigurationPropertySchema = { const detectHCSchemeSettingSchema: IConfigurationPropertySchema = { type: 'boolean', default: true, - markdownDescription: nls.localize('autoDetectHighContrast', "If enabled, will automatically change to high contrast theme if the OS is using a high contrast theme. The high contrast theme to use is specified by `#{0}#` and `#{1}#`.", ThemeSettings.PREFERRED_HC_DARK_THEME, ThemeSettings.PREFERRED_HC_LIGHT_THEME), + markdownDescription: nls.localize({ key: 'autoDetectHighContrast', comment: ['{0} and {1} will become links to other settings.'] }, "If enabled, will automatically change to high contrast theme if the OS is using a high contrast theme. The high contrast theme to use is specified by {0} and {1}", formatSettingAsLink(ThemeSettings.PREFERRED_HC_DARK_THEME), formatSettingAsLink(ThemeSettings.PREFERRED_HC_LIGHT_THEME)), scope: ConfigurationScope.APPLICATION }; @@ -164,7 +168,7 @@ const tokenColorSchema: IJSONSchema = { semanticHighlighting: { description: nls.localize('editorColors.semanticHighlighting', 'Whether semantic highlighting should be enabled for this theme.'), deprecationMessage: nls.localize('editorColors.semanticHighlighting.deprecationMessage', 'Use `enabled` in `editor.semanticTokenColorCustomizations` setting instead.'), - markdownDeprecationMessage: nls.localize('editorColors.semanticHighlighting.deprecationMessageMarkdown', 'Use `enabled` in `#editor.semanticTokenColorCustomizations#` setting instead.'), + markdownDeprecationMessage: nls.localize({ key: 'editorColors.semanticHighlighting.deprecationMessageMarkdown', comment: ['{0} will become a link to another setting.'] }, 'Use `enabled` in {0} setting instead.', formatSettingAsLink('editor.semanticTokenColorCustomizations')), type: 'boolean' } }, diff --git a/src/vs/workbench/services/themes/common/workbenchThemeService.ts b/src/vs/workbench/services/themes/common/workbenchThemeService.ts index 149b290979ff95..22ebde5b0b8029 100644 --- a/src/vs/workbench/services/themes/common/workbenchThemeService.ts +++ b/src/vs/workbench/services/themes/common/workbenchThemeService.ts @@ -41,8 +41,8 @@ export enum ThemeSettings { } export enum ThemeSettingDefaults { - COLOR_THEME_DARK = 'Default Dark+ Experimental', - COLOR_THEME_LIGHT = 'Default Light+ Experimental', + COLOR_THEME_DARK = 'Default Dark Modern', + COLOR_THEME_LIGHT = 'Default Light Modern', COLOR_THEME_HC_DARK = 'Default High Contrast', COLOR_THEME_HC_LIGHT = 'Default High Contrast Light', @@ -50,9 +50,21 @@ export enum ThemeSettingDefaults { COLOR_THEME_LIGHT_OLD = 'Default Light+', FILE_ICON_THEME = 'vs-seti', - PRODUCT_ICON_THEME = 'Default' + PRODUCT_ICON_THEME = 'Default', } +export const COLOR_THEME_DARK_INITIAL_COLORS = { + 'activityBar.background': '#181818', + 'statusBar.background': '#181818', + 'statusBar.noFolderBackground': '#1f1f1f', +}; + +export const COLOR_THEME_LIGHT_INITIAL_COLORS = { + 'activityBar.background': '#f8f8f8', + 'statusBar.background': '#f8f8f8', + 'statusBar.noFolderBackground': '#f8f8f8' +}; + export interface IWorkbenchTheme { readonly id: string; readonly label: string; diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts index c010c73133d589..2aa3bf24396ea5 100644 --- a/src/vs/workbench/workbench.common.main.ts +++ b/src/vs/workbench/workbench.common.main.ts @@ -362,4 +362,7 @@ import 'vs/workbench/contrib/deprecatedExtensionMigrator/browser/deprecatedExten // Bracket Pair Colorizer 2 Telemetry import 'vs/workbench/contrib/bracketPairColorizer2Telemetry/browser/bracketPairColorizer2Telemetry.contribution'; +// Accessibility +import 'vs/workbench/contrib/accessibility/browser/accessibility.contribution'; + //#endregion diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts index 6004a608ec896d..144e8923aaa7a1 100644 --- a/src/vscode-dts/vscode.d.ts +++ b/src/vscode-dts/vscode.d.ts @@ -733,7 +733,7 @@ declare module 'vscode' { */ OpenOpen = 0, /** - * The decoration's range will not widen when edits occur at the start of end. + * The decoration's range will not widen when edits occur at the start or end. */ ClosedClosed = 1, /** @@ -15653,12 +15653,19 @@ declare module 'vscode' { */ export interface AuthenticationGetSessionOptions { /** - * Whether the existing user session preference should be cleared. + * Whether the existing session preference should be cleared. * * For authentication providers that support being signed into multiple accounts at once, the user will be * prompted to select an account to use when {@link authentication.getSession getSession} is called. This preference * is remembered until {@link authentication.getSession getSession} is called with this flag. * + * Note: + * The preference is extension specific. So if one extension calls {@link authentication.getSession getSession}, it will not + * affect the session preference for another extension calling {@link authentication.getSession getSession}. Additionally, + * the preference is set for the current workspace and also globally. This means that new workspaces will use the "global" + * value at first and then when this flag is provided, a new value can be set for that workspace. This also means + * that pre-existing workspaces will not lose their preference if a new workspace sets this flag. + * * Defaults to false. */ clearSessionPreference?: boolean; diff --git a/src/vscode-dts/vscode.proposed.debugFocus.d.ts b/src/vscode-dts/vscode.proposed.debugFocus.d.ts index 4526f0a854dfde..b4b267d5402af4 100644 --- a/src/vscode-dts/vscode.proposed.debugFocus.d.ts +++ b/src/vscode-dts/vscode.proposed.debugFocus.d.ts @@ -8,6 +8,7 @@ declare module 'vscode' { // See https://github.com/microsoft/vscode/issues/63943 export interface ThreadFocus { + // eslint-disable-next-line local/vscode-dts-string-type-literals kind: 'thread'; /** @@ -22,6 +23,7 @@ declare module 'vscode' { } export interface StackFrameFocus { + // eslint-disable-next-line local/vscode-dts-string-type-literals kind: 'stackFrame'; /** diff --git a/src/vscode-dts/vscode.proposed.documentPaste.d.ts b/src/vscode-dts/vscode.proposed.documentPaste.d.ts index f5fc018444cd20..09ad9504bdba63 100644 --- a/src/vscode-dts/vscode.proposed.documentPaste.d.ts +++ b/src/vscode-dts/vscode.proposed.documentPaste.d.ts @@ -66,7 +66,11 @@ declare module 'vscode' { * * This can either be an exact mime type such as `image/png`, or a wildcard pattern such as `image/*`. * - * Use `files` to indicate that the provider should be invoked if any {@link DataTransferFile files} are present in the {@link DataTransfer}.. + * Use `text/uri-list` for resources dropped from the explorer or other tree views in the workbench. + * + * Use `files` to indicate that the provider should be invoked if any {@link DataTransferFile files} are present in the {@link DataTransfer}. + * Note that {@link DataTransferFile} entries are only created when dropping content from outside the editor, such as + * from the operating system. */ readonly pasteMimeTypes: readonly string[]; } diff --git a/src/vscode-dts/vscode.proposed.dropMetadata.d.ts b/src/vscode-dts/vscode.proposed.dropMetadata.d.ts index 9266cd62bf12c7..4e1b1a39d049a9 100644 --- a/src/vscode-dts/vscode.proposed.dropMetadata.d.ts +++ b/src/vscode-dts/vscode.proposed.dropMetadata.d.ts @@ -27,7 +27,11 @@ declare module 'vscode' { * * This can either be an exact mime type such as `image/png`, or a wildcard pattern such as `image/*`. * + * Use `text/uri-list` for resources dropped from the explorer or other tree views in the workbench. + * * Use `files` to indicate that the provider should be invoked if any {@link DataTransferFile files} are present in the {@link DataTransfer}. + * Note that {@link DataTransferFile} entries are only created when dropping content from outside the editor, such as + * from the operating system. */ readonly dropMimeTypes: readonly string[]; } diff --git a/src/vscode-dts/vscode.proposed.handleIssueUri.d.ts b/src/vscode-dts/vscode.proposed.handleIssueUri.d.ts index 60c8ad08609dbe..069720276e9ec3 100644 --- a/src/vscode-dts/vscode.proposed.handleIssueUri.d.ts +++ b/src/vscode-dts/vscode.proposed.handleIssueUri.d.ts @@ -8,10 +8,24 @@ declare module 'vscode' { // https://github.com/microsoft/vscode/issues/46726 export interface IssueUriRequestHandler { + /** + *Handle the request by the issue reporter for the Uri you want to direct the user to. + */ handleIssueUrlRequest(): ProviderResult; } export namespace env { + /** + * Register an {@link IssueUriRequestHandler}. By registering an issue uri request handler, + * you can direct the built-in issue reporter to your issue reporting web experience of choice. + * The Uri that the handler returns will be opened in the user's browser. + * + * Examples of this include: + * - Using GitHub Issue Forms or GitHub Discussions you can pre-fill the issue creation with relevant information from the current workspace using query parameters + * - Directing to a different web form that isn't on GitHub for reporting issues + * + * @param handler the issue uri request handler to register for this extension. + */ export function registerIssueUriRequestHandler(handler: IssueUriRequestHandler): Disposable; } } diff --git a/src/vscode-dts/vscode.proposed.interactive.d.ts b/src/vscode-dts/vscode.proposed.interactive.d.ts index 9672f01c067b48..7d29f7eead5637 100644 --- a/src/vscode-dts/vscode.proposed.interactive.d.ts +++ b/src/vscode-dts/vscode.proposed.interactive.d.ts @@ -159,6 +159,7 @@ declare module 'vscode' { } export interface InteractiveSessionVoteAction { + // eslint-disable-next-line local/vscode-dts-string-type-literals kind: 'vote'; responseId: string; direction: InteractiveSessionVoteDirection; @@ -171,6 +172,7 @@ declare module 'vscode' { } export interface InteractiveSessionCopyAction { + // eslint-disable-next-line local/vscode-dts-string-type-literals kind: 'copy'; responseId: string; codeBlockIndex: number; @@ -181,6 +183,7 @@ declare module 'vscode' { } export interface InteractiveSessionInsertAction { + // eslint-disable-next-line local/vscode-dts-string-type-literals kind: 'insert'; responseId: string; codeBlockIndex: number; @@ -189,6 +192,7 @@ declare module 'vscode' { } export interface InteractiveSessionTerminalAction { + // eslint-disable-next-line local/vscode-dts-string-type-literals kind: 'runInTerminal'; responseId: string; codeBlockIndex: number; @@ -196,6 +200,7 @@ declare module 'vscode' { } export interface InteractiveSessionCommandAction { + // eslint-disable-next-line local/vscode-dts-string-type-literals kind: 'command'; command: InteractiveResponseCommand; } diff --git a/src/vscode-dts/vscode.proposed.resolvers.d.ts b/src/vscode-dts/vscode.proposed.resolvers.d.ts index c1c413bc31f237..c145c600667b3e 100644 --- a/src/vscode-dts/vscode.proposed.resolvers.d.ts +++ b/src/vscode-dts/vscode.proposed.resolvers.d.ts @@ -173,7 +173,7 @@ declare module 'vscode' { export interface ResourceLabelFormatting { label: string; // myLabel:/${path} // For historic reasons we use an or string here. Once we finalize this API we should start using enums instead and adopt it in extensions. - // eslint-disable-next-line local/vscode-dts-literal-or-types + // eslint-disable-next-line local/vscode-dts-literal-or-types, local/vscode-dts-string-type-literals separator: '/' | '\\' | ''; tildify?: boolean; normalizeDriveLetter?: boolean; diff --git a/src/vscode-dts/vscode.proposed.saveEditor.d.ts b/src/vscode-dts/vscode.proposed.saveEditor.d.ts index 9088939a4649ec..c9da82d5542ea7 100644 --- a/src/vscode-dts/vscode.proposed.saveEditor.d.ts +++ b/src/vscode-dts/vscode.proposed.saveEditor.d.ts @@ -11,7 +11,7 @@ declare module 'vscode' { /** * Saves the editor identified by the given resource and returns the resulting resource or `undefined` - * if save was not successful. + * if save was not successful or no editor with the given resource was found. * * **Note** that an editor with the provided resource must be opened in order to be saved. * @@ -22,7 +22,8 @@ declare module 'vscode' { /** * Saves the editor identified by the given resource to a new file name as provided by the user and - * returns the resulting resource or `undefined` if save was not successful or cancelled. + * returns the resulting resource or `undefined` if save was not successful or cancelled or no editor + * with the given resource was found. * * **Note** that an editor with the provided resource must be opened in order to be saved as. * diff --git a/yarn.lock b/yarn.lock index 761f6ea1f1cabf..776f9f3346dadd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9807,10 +9807,10 @@ typescript@^4.7.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== -typescript@^5.1.0-dev.20230417: - version "5.1.0-dev.20230417" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.0-dev.20230417.tgz#3c6acdd4e49858bc10f7bdf535e768513ebc55e9" - integrity sha512-bEjKfPjxAgvrUViweybCkB++3y9qyF4hCBeXOf998QQDJpLAcaQWmub4IoPZ5yTvrkuGuNzFpy46tytA4p1fbA== +typescript@^5.1.0-dev.20230424: + version "5.1.0-dev.20230424" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.0-dev.20230424.tgz#6b560143787fd346682077dbbad5e1135a476870" + integrity sha512-yhQpzzjyLCyXORVY8AgJYaWpm235ZzG/boelYvgloE7v+kCucAdegsBf7duLJzXc/8+wABR2diYMbjPpd5c3Ww== typical@^4.0.0: version "4.0.0"