@codingame/monaco-vscode-api 24.3.0 → 25.0.0

package/vscode/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.js

@@ -2,7 +2,6 @@
 import { localize } from '../../../../../nls.js';
 import { Extensions } from '../../../../../platform/configuration/common/configurationRegistry.js';
 import { Registry } from '../../../../../platform/registry/common/platform.js';
-import product from '../../../../../platform/product/common/product.js';
 import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
 
 var TerminalSuggestSettingId;
@@ -36,26 +35,30 @@ const windowsDefaultExecutableExtensions = [
     'sh',
 ];
 const terminalSuggestConfigSection = 'terminal.integrated.suggest';
+function normalizeQuickSuggestionsConfig(config) {
+    if (typeof config === 'boolean') {
+        return config
+            ? { commands: 'on', arguments: 'on', unknown: 'off' }
+            : { commands: 'off', arguments: 'off', unknown: 'off' };
+    }
+    return config;
+}
 const terminalSuggestConfiguration = {
     [TerminalSuggestSettingId.Enabled]: {
         restricted: true,
         markdownDescription: ( localize(
-            12295,
-            "Enables terminal intellisense suggestions (preview) for supported shells ({0}) when {1} is set to {2}.",
-            'PowerShell v7+, zsh, bash, fish',
-            `\`#${TerminalSettingId.ShellIntegrationEnabled}#\``,
-            '`true`'
+            12346,
+            "Enables terminal IntelliSense suggestions (also known as autocomplete) for supported shells ({0}). This requires {1} to be enabled and working or [manually installed](https://code.visualstudio.com/docs/terminal/shell-integration#_manual-installation-install).",
+            'Windows PowerShell, PowerShell v7+, zsh, bash, fish',
+            `\`#${TerminalSettingId.ShellIntegrationEnabled}#\``
         )),
         type: 'boolean',
-        default: product.quality !== 'stable',
-        experiment: {
-            mode: 'auto',
-        },
+        default: true,
     },
     [TerminalSuggestSettingId.Providers]: {
         restricted: true,
         markdownDescription: ( localize(
-            12296,
+            12347,
             "Providers are enabled by default. Omit them by setting the id of the provider to `false`."
         )),
         type: 'object',
@@ -64,88 +67,91 @@ const terminalSuggestConfiguration = {
     [TerminalSuggestSettingId.QuickSuggestions]: {
         restricted: true,
         markdownDescription: ( localize(
-            12297,
+            12348,
             "Controls whether suggestions should automatically show up while typing. Also be aware of the {0}-setting which controls if suggestions are triggered by special characters.",
             `\`#${TerminalSuggestSettingId.SuggestOnTriggerCharacters}#\``
         )),
-        type: 'object',
-        properties: {
-            commands: {
-                description: ( localize(
-                    12298,
-                    'Enable quick suggestions for commands, the first word in a command line input.'
-                )),
-                type: 'string',
-                enum: ['off', 'on'],
-            },
-            arguments: {
-                description: ( localize(
-                    12299,
-                    'Enable quick suggestions for arguments, anything after the first word in a command line input.'
-                )),
-                type: 'string',
-                enum: ['off', 'on'],
+        oneOf: [
+            {
+                type: 'boolean',
             },
-            unknown: {
-                description: ( localize(
-                    12300,
-                    'Enable quick suggestions when it\'s unclear what the best suggestion is, if this is on files and folders will be suggested as a fallback.'
-                )),
-                type: 'string',
-                enum: ['off', 'on'],
-            },
-        },
-        default: {
-            commands: 'on',
-            arguments: 'on',
-            unknown: 'off',
-        },
+            {
+                type: 'object',
+                properties: {
+                    commands: {
+                        description: ( localize(
+                            12349,
+                            'Enable quick suggestions for commands, the first word in a command line input.'
+                        )),
+                        type: 'string',
+                        enum: ['off', 'on'],
+                    },
+                    arguments: {
+                        description: ( localize(
+                            12350,
+                            'Enable quick suggestions for arguments, anything after the first word in a command line input.'
+                        )),
+                        type: 'string',
+                        enum: ['off', 'on'],
+                    },
+                    unknown: {
+                        description: ( localize(
+                            12351,
+                            'Enable quick suggestions when it\'s unclear what the best suggestion is, if this is on files and folders will be suggested as a fallback.'
+                        )),
+                        type: 'string',
+                        enum: ['off', 'on'],
+                    },
+                },
+            }
+        ],
+        default: false,
     },
     [TerminalSuggestSettingId.SuggestOnTriggerCharacters]: {
         restricted: true,
         markdownDescription: ( localize(
-            12301,
+            12352,
             "Controls whether suggestions should automatically show up when typing trigger characters."
         )),
         type: 'boolean',
-        default: true,
+        default: false,
     },
     [TerminalSuggestSettingId.RunOnEnter]: {
         restricted: true,
         markdownDescription: ( localize(
-            12302,
+            12353,
             "Controls whether suggestions should run immediately when `Enter` (not `Tab`) is used to accept the result."
         )),
         enum: ['never', 'exactMatch', 'exactMatchIgnoreExtension', 'always'],
         markdownEnumDescriptions: [
-            ( localize(12303, "Never run on `Enter`.")),
-            ( localize(12304, "Run on `Enter` when the suggestion is typed in its entirety.")),
+            ( localize(12354, "Never run on `Enter`.")),
+            ( localize(12355, "Run on `Enter` when the suggestion is typed in its entirety.")),
             ( localize(
-            12305,
+            12356,
             "Run on `Enter` when the suggestion is typed in its entirety or when a file is typed without its extension included."
         )),
-            ( localize(12306, "Always run on `Enter`."))
+            ( localize(12357, "Always run on `Enter`."))
         ],
         default: 'never',
     },
     [TerminalSuggestSettingId.SelectionMode]: {
         markdownDescription: ( localize(
-            12307,
+            12358,
             "Controls how suggestion selection works in the integrated terminal."
         )),
         type: 'string',
         enum: ['partial', 'always', 'never'],
         markdownEnumDescriptions: [
             ( localize(
-            12308,
+            12359,
             "Partially select a suggestion when automatically triggering IntelliSense. `Tab` can be used to accept the first suggestion, only after navigating the suggestions via `Down` will `Enter` also accept the active suggestion."
         )),
             ( localize(
-            12309,
+            12360,
             "Always select a suggestion when automatically triggering IntelliSense. `Enter` or `Tab` can be used to accept the first suggestion."
         )),
             ( localize(
-            12310,
+            12361,
             "Never select a suggestion when automatically triggering IntelliSense. The list must be navigated via `Down` before `Enter` or `Tab` can be used to accept the active suggestion."
         )),
         ],
@@ -154,7 +160,7 @@ const terminalSuggestConfiguration = {
     [TerminalSuggestSettingId.WindowsExecutableExtensions]: {
         restricted: true,
         markdownDescription: ( localize(
-            12311,
+            12362,
             "A set of windows command executable extensions that will be included as suggestions in the terminal.\n\nMany executables are included by default, listed below:\n\n{0}.\n\nTo exclude an extension, set it to `false`\n\n. To include one not in the list, add it and set it to `true`.",
             ( windowsDefaultExecutableExtensions.sort().map(extension => `- ${extension}`)).join('\n')
         )),
@@ -164,7 +170,7 @@ const terminalSuggestConfiguration = {
     [TerminalSuggestSettingId.ShowStatusBar]: {
         restricted: true,
         markdownDescription: ( localize(
-            12312,
+            12363,
             "Controls whether the terminal suggestions status bar should be shown."
         )),
         type: 'boolean',
@@ -173,16 +179,16 @@ const terminalSuggestConfiguration = {
     [TerminalSuggestSettingId.CdPath]: {
         restricted: true,
         markdownDescription: ( localize(
-            12313,
+            12364,
             "Controls whether to enable $CDPATH support which exposes children of the folders in the $CDPATH variable regardless of the current working directory. $CDPATH is expected to be semi colon-separated on Windows and colon-separated on other platforms."
         )),
         type: 'string',
         enum: ['off', 'relative', 'absolute'],
         markdownEnumDescriptions: [
-            ( localize(12314, "Disable the feature.")),
-            ( localize(12315, "Enable the feature and use relative paths.")),
+            ( localize(12365, "Disable the feature.")),
+            ( localize(12366, "Enable the feature and use relative paths.")),
             ( localize(
-            12316,
+            12367,
             "Enable the feature and use absolute paths. This is useful when the shell doesn't natively support `$CDPATH`."
         )),
         ],
@@ -191,25 +197,25 @@ const terminalSuggestConfiguration = {
     [TerminalSuggestSettingId.InlineSuggestion]: {
         restricted: true,
         markdownDescription: ( localize(
-            12317,
+            12368,
             "Controls whether the shell's inline suggestion should be detected and how it is scored."
         )),
         type: 'string',
         enum: ['off', 'alwaysOnTopExceptExactMatch', 'alwaysOnTop'],
         markdownEnumDescriptions: [
-            ( localize(12318, "Disable the feature.")),
+            ( localize(12369, "Disable the feature.")),
             ( localize(
-            12319,
-            "Enable the feature and sort the inline suggestion without forcing it to be on top. This means that exact matches will be will be above the inline suggestion."
+            12370,
+            "Enable the feature and sort the inline suggestion without forcing it to be on top. This means that exact matches will be above the inline suggestion."
         )),
-            ( localize(12320, "Enable the feature and always put the inline suggestion on top.")),
+            ( localize(12371, "Enable the feature and always put the inline suggestion on top.")),
         ],
         default: 'alwaysOnTop',
     },
     [TerminalSuggestSettingId.UpArrowNavigatesHistory]: {
         restricted: true,
         markdownDescription: ( localize(
-            12321,
+            12372,
             "Determines whether the up arrow key navigates the command history when focus is on the first suggestion and navigation has not yet occurred. When set to false, the up arrow will move focus to the last suggestion instead."
         )),
         type: 'boolean',
@@ -218,7 +224,7 @@ const terminalSuggestConfiguration = {
     [TerminalSuggestSettingId.InsertTrailingSpace]: {
         restricted: true,
         markdownDescription: ( localize(
-            12322,
+            12373,
             "Controls whether a space is automatically inserted after accepting a suggestion and re-trigger suggestions. Folders and symbolic link folders will never have a trailing space added."
         )),
         type: 'boolean',
@@ -232,16 +238,16 @@ function registerTerminalSuggestProvidersConfiguration(providers) {
     if (!( providers.has('lsp'))) {
         providers.set('lsp', {
             id: 'lsp',
-            description: ( localize(12323, 'Show suggestions from language servers.'))
+            description: ( localize(12374, 'Show suggestions from language servers.'))
         });
     }
     const providersProperties = {};
     for (const id of Array.from(( providers.keys())).sort()) {
         providersProperties[id] = {
             type: 'boolean',
-            default: true,
+            default: id === 'lsp' ? false : true,
             description: providers.get(id)?.description ??
-                ( localize(12324, "Show suggestions from {0}.", id))
+                ( localize(12375, "Show suggestions from {0}.", id))
         };
     }
     const defaultValue = {};
@@ -251,13 +257,13 @@ function registerTerminalSuggestProvidersConfiguration(providers) {
     terminalSuggestProvidersConfiguration = {
         id: 'terminalSuggestProviders',
         order: 100,
-        title: ( localize(12325, "Terminal Suggest Providers")),
+        title: ( localize(12376, "Terminal Suggest Providers")),
         type: 'object',
         properties: {
             [TerminalSuggestSettingId.Providers]: {
                 restricted: true,
                 markdownDescription: ( localize(
-                    12326,
+                    12377,
                     "Controls which suggestions automatically show up while typing. Suggestion providers are enabled by default."
                 )),
                 type: 'object',
@@ -276,4 +282,4 @@ function registerTerminalSuggestProvidersConfiguration(providers) {
 }
 registerTerminalSuggestProvidersConfiguration();
 
-export { TerminalSuggestSettingId, registerTerminalSuggestProvidersConfiguration, terminalSuggestConfigSection, terminalSuggestConfiguration, windowsDefaultExecutableExtensions };
+export { TerminalSuggestSettingId, normalizeQuickSuggestionsConfig, registerTerminalSuggestProvidersConfiguration, terminalSuggestConfigSection, terminalSuggestConfiguration, windowsDefaultExecutableExtensions };

package/vscode/src/vs/workbench/contrib/terminalContrib/typeAhead/common/terminalTypeAheadConfiguration.js

@@ -12,7 +12,7 @@ var TerminalTypeAheadSettingId;
 const terminalTypeAheadConfiguration = {
     [TerminalTypeAheadSettingId.LocalEchoLatencyThreshold]: {
         description: ( localize(
-            12327,
+            12378,
             "Length of network delay, in milliseconds, where local edits will be echoed on the terminal without waiting for server acknowledgement. If '0', local echo will always be on, and if '-1' it will be disabled."
         )),
         type: 'integer',
@@ -22,23 +22,23 @@ const terminalTypeAheadConfiguration = {
     },
     [TerminalTypeAheadSettingId.LocalEchoEnabled]: {
         markdownDescription: ( localize(
-            12328,
+            12379,
             "When local echo should be enabled. This will override {0}",
             '`#terminal.integrated.localEchoLatencyThreshold#`'
         )),
         type: 'string',
         enum: ['on', 'off', 'auto'],
         enumDescriptions: [
-            ( localize(12329, "Always enabled")),
-            ( localize(12330, "Always disabled")),
-            ( localize(12331, "Enabled only for remote workspaces"))
+            ( localize(12380, "Always enabled")),
+            ( localize(12381, "Always disabled")),
+            ( localize(12382, "Enabled only for remote workspaces"))
         ],
         default: 'off',
         tags: ['preview'],
     },
     [TerminalTypeAheadSettingId.LocalEchoExcludePrograms]: {
         description: ( localize(
-            12332,
+            12383,
             "Local echo will be disabled when any of these program names are found in the terminal title."
         )),
         type: 'array',
@@ -51,7 +51,7 @@ const terminalTypeAheadConfiguration = {
     },
     [TerminalTypeAheadSettingId.LocalEchoStyle]: {
         description: ( localize(
-            12333,
+            12384,
             "Terminal style of locally echoed text; either a font style or an RGB color."
         )),
         default: 'dim',

package/vscode/src/vs/workbench/contrib/terminalContrib/zoom/common/terminal.zoom.js

@@ -16,11 +16,11 @@ const terminalZoomConfiguration = {
     [TerminalZoomSettingId.MouseWheelZoom]: {
         markdownDescription: isMacintosh
             ? ( localize(
-            12347,
+            12399,
             "Zoom the font of the terminal when using mouse wheel and holding `Cmd`."
         ))
             : ( localize(
-            12348,
+            12400,
             "Zoom the font of the terminal when using mouse wheel and holding `Ctrl`."
         )),
         type: 'boolean',

package/vscode/src/vs/workbench/contrib/testing/common/constants.js

@@ -27,19 +27,19 @@ var TestExplorerViewSorting;
     TestExplorerViewSorting["ByDuration"] = "duration";
 })(TestExplorerViewSorting || (TestExplorerViewSorting = {}));
 const testStateNames = {
-    [TestResultState.Errored]: ( localize(12656, 'Errored')),
-    [TestResultState.Failed]: ( localize(12657, 'Failed')),
-    [TestResultState.Passed]: ( localize(12658, 'Passed')),
-    [TestResultState.Queued]: ( localize(12659, 'Queued')),
-    [TestResultState.Running]: ( localize(12660, 'Running')),
-    [TestResultState.Skipped]: ( localize(12661, 'Skipped')),
-    [TestResultState.Unset]: ( localize(12662, 'Not yet run')),
+    [TestResultState.Errored]: ( localize(12708, 'Errored')),
+    [TestResultState.Failed]: ( localize(12709, 'Failed')),
+    [TestResultState.Passed]: ( localize(12710, 'Passed')),
+    [TestResultState.Queued]: ( localize(12711, 'Queued')),
+    [TestResultState.Running]: ( localize(12712, 'Running')),
+    [TestResultState.Skipped]: ( localize(12713, 'Skipped')),
+    [TestResultState.Unset]: ( localize(12714, 'Not yet run')),
 };
-const labelForTestInState = (label, state) => ( localize(12663, '{0} ({1})', stripIcons(label), testStateNames[state]));
+const labelForTestInState = (label, state) => ( localize(12715, '{0} ({1})', stripIcons(label), testStateNames[state]));
 const testConfigurationGroupNames = {
-    [TestRunProfileBitset.Debug]: ( localize(12664, 'Debug')),
-    [TestRunProfileBitset.Run]: ( localize(12665, 'Run')),
-    [TestRunProfileBitset.Coverage]: ( localize(12666, 'Coverage')),
+    [TestRunProfileBitset.Debug]: ( localize(12716, 'Debug')),
+    [TestRunProfileBitset.Run]: ( localize(12717, 'Run')),
+    [TestRunProfileBitset.Coverage]: ( localize(12718, 'Coverage')),
 };
 var TestCommandId;
 (function (TestCommandId) {

package/vscode/src/vs/workbench/contrib/testing/common/testResult.js

@@ -160,7 +160,7 @@ let LiveTestResult = class LiveTestResult extends Disposable {
         this.onNewTask = this.newTaskEmitter.event;
         this.onEndTask = this.endTaskEmitter.event;
         this.tasks = [];
-        this.name = ( localize(12667, 'Test run at {0}', ( new Date()).toLocaleString(language)));
+        this.name = ( localize(12719, 'Test run at {0}', ( new Date()).toLocaleString(language)));
         this.counts = makeEmptyCounts();
         this.computedStateAccessor = {
             getOwnState: i => i.ownComputedState,
@@ -384,7 +384,7 @@ class HydratedTestResult {
         this.completedAt = serialized.completedAt;
         this.tasks = ( serialized.tasks.map((task, i) => ({
             id: task.id,
-            name: task.name || ( localize(12668, 'Unnamed Task')),
+            name: task.name || ( localize(12720, 'Unnamed Task')),
             ctrlId: task.ctrlId,
             running: false,
             coverage: observableValue(this, undefined),

package/vscode/src/vs/workbench/contrib/testing/common/testTypes.js

@@ -46,9 +46,9 @@ var TestRunProfileBitset;
     TestRunProfileBitset[TestRunProfileBitset["SupportsContinuousRun"] = 64] = "SupportsContinuousRun";
 })(TestRunProfileBitset || (TestRunProfileBitset = {}));
 const testProfileBitset = {
-    [TestRunProfileBitset.Run]: ( localize(12671, 'Run')),
-    [TestRunProfileBitset.Debug]: ( localize(12672, 'Debug')),
-    [TestRunProfileBitset.Coverage]: ( localize(12673, 'Coverage')),
+    [TestRunProfileBitset.Run]: ( localize(12723, 'Run')),
+    [TestRunProfileBitset.Debug]: ( localize(12724, 'Debug')),
+    [TestRunProfileBitset.Coverage]: ( localize(12725, 'Coverage')),
 };
 const testRunProfileBitsetList = [
     TestRunProfileBitset.Run,

package/vscode/src/vs/workbench/contrib/url/browser/trustedDomainService.d.ts

@@ -12,5 +12,6 @@ export declare class TrustedDomainService extends Disposable implements ITrusted
     private _onDidChangeTrustedDomains;
     readonly onDidChangeTrustedDomains: Event<void>;
     constructor(_instantiationService: IInstantiationService, _storageService: IStorageService);
+    get trustedDomains(): string[];
     isValid(resource: URI): boolean;
 }

package/vscode/src/vs/workbench/contrib/url/browser/trustedDomainService.js

@@ -7,7 +7,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { StorageScope } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { readStaticTrustedDomains, TRUSTED_DOMAINS_STORAGE_KEY } from './trustedDomains.js';
-import { isURLDomainTrusted } from '../common/trustedDomains.js';
+import { isURLDomainTrusted } from '../../../../platform/url/common/trustedDomains.js';
 import { Emitter } from '../../../../base/common/event.js';
 
 let TrustedDomainService = class TrustedDomainService extends Disposable {
@@ -33,6 +33,9 @@ let TrustedDomainService = class TrustedDomainService extends Disposable {
             this._onDidChangeTrustedDomains.fire();
         }));
     }
+    get trustedDomains() {
+        return this._staticTrustedDomainsResult.value;
+    }
     isValid(resource) {
         const { defaultTrustedDomains, trustedDomains, } = this._instantiationService.invokeFunction(readStaticTrustedDomains);
         const allTrustedDomains = [...defaultTrustedDomains, ...trustedDomains];

package/vscode/src/vs/workbench/contrib/url/browser/trustedDomainService.service.d.ts

@@ -5,4 +5,5 @@ export interface ITrustedDomainService {
     _serviceBrand: undefined;
     readonly onDidChangeTrustedDomains: Event<void>;
     isValid(resource: URI): boolean;
+    readonly trustedDomains: string[];
 }

package/vscode/src/vs/workbench/contrib/url/browser/trustedDomains.js

@@ -6,19 +6,54 @@ import { StorageScope, StorageTarget } from '../../../../platform/storage/common
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.service.js';
+import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { createScanner, SyntaxKind } from '../../../../base/common/json.js';
 
 const TRUSTED_DOMAINS_URI = ( URI.parse('trustedDomains:/Trusted Domains'));
 const TRUSTED_DOMAINS_STORAGE_KEY = 'http.linkProtectionTrustedDomains';
 const TRUSTED_DOMAINS_CONTENT_STORAGE_KEY = 'http.linkProtectionTrustedDomainsContent';
+async function openInEditor(editorService, resource) {
+    await editorService.openEditor({
+        resource,
+        languageId: 'jsonc',
+        options: { pinned: true }
+    });
+    const editor = editorService.activeTextEditorControl;
+    if (!isCodeEditor(editor)) {
+        return;
+    }
+    const model = editor.getModel();
+    if (!model || !isEqual(model.uri, resource)) {
+        return;
+    }
+    const scanner = createScanner(model.getValue(), true);
+    let offset;
+    for (let token = scanner.scan(); token !== SyntaxKind.EOF; token = scanner.scan()) {
+        if (token === SyntaxKind.OpenBracketToken) {
+            offset = scanner.getTokenOffset() + scanner.getTokenLength();
+            const nextToken = scanner.scan();
+            if (nextToken !== SyntaxKind.EOF && nextToken !== SyntaxKind.CloseBracketToken) {
+                offset = scanner.getTokenOffset();
+            }
+            break;
+        }
+    }
+    if (offset !== undefined) {
+        const position = model.getPositionAt(offset);
+        editor.setPosition(position);
+        editor.revealPositionInCenter(position);
+    }
+}
 const manageTrustedDomainSettingsCommand = {
     id: 'workbench.action.manageTrustedDomain',
     description: {
-        description: ( localize2(12859, 'Manage Trusted Domains')),
+        description: ( localize2(12911, 'Manage Trusted Domains')),
         args: []
     },
     handler: async (accessor) => {
         const editorService = accessor.get(IEditorService);
-        editorService.openEditor({ resource: TRUSTED_DOMAINS_URI, languageId: 'jsonc', options: { pinned: true } });
+        await openInEditor(editorService, TRUSTED_DOMAINS_URI);
         return;
     }
 };
@@ -30,7 +65,7 @@ async function configureOpenerTrustedDomainsHandler(trustedDomains, domainToConf
     const options = [];
     options.push({
         type: 'item',
-        label: ( localize(12860, 'Trust {0}', domainToConfigure)),
+        label: ( localize(12912, 'Trust {0}', domainToConfigure)),
         id: 'trust',
         toTrust: domainToConfigure,
         picked: true
@@ -42,7 +77,7 @@ async function configureOpenerTrustedDomainsHandler(trustedDomains, domainToConf
             const base = parsedDomainToConfigure.authority.split(':')[0];
             options.push({
                 type: 'item',
-                label: ( localize(12861, 'Trust {0} on all ports', base)),
+                label: ( localize(12913, 'Trust {0} on all ports', base)),
                 toTrust: base + ':*',
                 id: 'trust'
             });
@@ -51,32 +86,30 @@ async function configureOpenerTrustedDomainsHandler(trustedDomains, domainToConf
     else {
         options.push({
             type: 'item',
-            label: ( localize(12862, 'Trust {0} and all its subdomains', domainEnd)),
+            label: ( localize(12914, 'Trust {0} and all its subdomains', domainEnd)),
             toTrust: topLevelDomain,
             id: 'trust'
         });
     }
     options.push({
         type: 'item',
-        label: ( localize(12863, 'Trust all domains (disables link protection)')),
+        label: ( localize(12915, 'Trust all domains (disables link protection)')),
         toTrust: '*',
         id: 'trust'
     });
     options.push({
         type: 'item',
-        label: ( localize(12864, 'Manage Trusted Domains')),
+        label: ( localize(12916, 'Manage Trusted Domains')),
         id: 'manage'
     });
     const pickedResult = await quickInputService.pick(options, { activeItem: options[0] });
     if (pickedResult && pickedResult.id) {
         switch (pickedResult.id) {
-            case 'manage':
-                await editorService.openEditor({
-                    resource: TRUSTED_DOMAINS_URI.with({ fragment: ( resource.toString()) }),
-                    languageId: 'jsonc',
-                    options: { pinned: true }
-                });
+            case 'manage': {
+                const uriWithFragment = TRUSTED_DOMAINS_URI.with({ fragment: ( resource.toString()) });
+                await openInEditor(editorService, uriWithFragment);
                 return trustedDomains;
+            }
             case 'trust': {
                 const itemToTrust = pickedResult.toTrust;
                 if (trustedDomains.indexOf(itemToTrust) === -1) {

package/vscode/src/vs/workbench/contrib/webview/browser/webview.contribution.js

@@ -39,7 +39,7 @@ if (CutAction) {
     MenuRegistry.appendMenuItem(MenuId.WebviewContext, {
         command: {
             id: CutAction.id,
-            title: ( localize(13102, "Cut")),
+            title: ( localize(13154, "Cut")),
         },
         group: '5_cutcopypaste',
         order: 1,
@@ -50,7 +50,7 @@ if (CopyAction) {
     MenuRegistry.appendMenuItem(MenuId.WebviewContext, {
         command: {
             id: CopyAction.id,
-            title: ( localize(13103, "Copy")),
+            title: ( localize(13155, "Copy")),
         },
         group: '5_cutcopypaste',
         order: 2,
@@ -61,7 +61,7 @@ if (PasteAction) {
     MenuRegistry.appendMenuItem(MenuId.WebviewContext, {
         command: {
             id: PasteAction.id,
-            title: ( localize(13104, "Paste")),
+            title: ( localize(13156, "Paste")),
         },
         group: '5_cutcopypaste',
         order: 3,

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js

@@ -23,7 +23,7 @@ import { IWorkbenchLayoutService } from '../../../services/layout/browser/layout
 var WebviewEditor_1;
 const CONTEXT_ACTIVE_WEBVIEW_PANEL_ID = ( new RawContextKey('activeWebviewPanelId', '', {
     type: 'string',
-    description: ( localize(13111, "The viewType of the currently active webview panel.")),
+    description: ( localize(13163, "The viewType of the currently active webview panel.")),
 }));
 let WebviewEditor = class WebviewEditor extends EditorPane {
     static { WebviewEditor_1 = this; }