@codingame/monaco-vscode-snippets-service-override 1.83.2 → 1.83.3-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-snippets-service-override",
-  "version": "1.83.2",
+  "version": "1.83.3-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.83.3-next.0",
     "monaco-editor": "0.44.0"
   }
 }

package/vscode/src/vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions.js

@@ -1,10 +1,10 @@
 import { EditorAction2 } from 'monaco-editor/esm/vs/editor/browser/editorExtensions.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 
 const defaultOptions = {
     category: {
-        value: ( localize('snippets', 'Snippets')),
+        value: localizeWithPath('vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions', 'snippets', 'Snippets'),
         original: 'Snippets'
     },
 };

package/vscode/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.js

@@ -56,19 +56,14 @@ async function computePicks(snippetService, userDataProfileService, languageServ
                 label: basename(file.location),
                 filepath: file.location,
                 description: names.size === 0
-                    ? ( nls.localize('global.scope', "(global)"))
-                    : ( nls.localize('global.1', "({0})", [...names].join(', ')))
+                    ? nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'global.scope', "(global)")
+                    : nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'global.1', "({0})", [...names].join(', '))
             };
             existing.push(snippet);
             if (!source) {
                 continue;
             }
-            const detail = ( nls.localize(
-                'detail.label',
-                "({0}) {1}",
-                source,
-                labelService.getUriLabel(file.location, { relative: true })
-            ));
+            const detail = nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'detail.label', "({0}) {1}", source, labelService.getUriLabel(file.location, { relative: true }));
             const lastItem = added.get(basename(file.location));
             if (lastItem) {
                 snippet.detail = detail;
@@ -125,16 +120,16 @@ async function createSnippetFile(scope, defaultPath, quickInputService, fileServ
     }
     await fileService.createFolder(defaultPath);
     const input = await quickInputService.input({
-        placeHolder: ( nls.localize('name', "Type snippet file name")),
+        placeHolder: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'name', "Type snippet file name"),
         async validateInput(input) {
             if (!input) {
-                return ( nls.localize('bad_name1', "Invalid file name"));
+                return nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'bad_name1', "Invalid file name");
             }
             if (!isValidBasename(input)) {
-                return ( nls.localize('bad_name2', "'{0}' is not a valid file name", input));
+                return nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'bad_name2', "'{0}' is not a valid file name", input);
             }
             if (await fileService.exists(createSnippetUri(input))) {
-                return ( nls.localize('bad_name3', "'{0}' already exists", input));
+                return nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'bad_name3', "'{0}' already exists", input);
             }
             return undefined;
         }
@@ -194,15 +189,12 @@ class ConfigureSnippetsAction extends SnippetsAction {
         super({
             id: 'workbench.action.openSnippets',
             title: {
-                value: ( nls.localize('openSnippet.label', "Configure User Snippets")),
+                value: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'openSnippet.label', "Configure User Snippets"),
                 original: 'Configure User Snippets'
             },
             shortTitle: {
-                value: ( nls.localize('userSnippets', "User Snippets")),
-                mnemonicTitle: ( nls.localize(
-                    { key: 'miOpenSnippets', comment: ['&& denotes a mnemonic'] },
-                    "User &&Snippets"
-                )),
+                value: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'userSnippets', "User Snippets"),
+                mnemonicTitle: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', { key: 'miOpenSnippets', comment: ['&& denotes a mnemonic'] }, "User &&Snippets"),
                 original: 'User Snippets'
             },
             f1: true,
@@ -225,27 +217,27 @@ class ConfigureSnippetsAction extends SnippetsAction {
         const picks = await computePicks(snippetService, userDataProfileService, languageService, labelService);
         const existing = picks.existing;
         const globalSnippetPicks = [{
-                scope: ( nls.localize('new.global_scope', 'global')),
-                label: ( nls.localize('new.global', "New Global Snippets file...")),
+                scope: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'new.global_scope', 'global'),
+                label: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'new.global', "New Global Snippets file..."),
                 uri: userDataProfileService.currentProfile.snippetsHome
             }];
         const workspaceSnippetPicks = [];
         for (const folder of workspaceService.getWorkspace().folders) {
             workspaceSnippetPicks.push({
-                scope: ( nls.localize('new.workspace_scope', "{0} workspace", folder.name)),
-                label: ( nls.localize('new.folder', "New Snippets file for '{0}'...", folder.name)),
+                scope: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'new.workspace_scope', "{0} workspace", folder.name),
+                label: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'new.folder', "New Snippets file for '{0}'...", folder.name),
                 uri: folder.toResource('.vscode')
             });
         }
         if (existing.length > 0) {
-            existing.unshift({ type: 'separator', label: ( nls.localize('group.global', "Existing Snippets")) });
-            existing.push({ type: 'separator', label: ( nls.localize('new.global.sep', "New Snippets")) });
+            existing.unshift({ type: 'separator', label: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'group.global', "Existing Snippets") });
+            existing.push({ type: 'separator', label: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'new.global.sep', "New Snippets") });
         }
         else {
-            existing.push({ type: 'separator', label: ( nls.localize('new.global.sep', "New Snippets")) });
+            existing.push({ type: 'separator', label: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'new.global.sep', "New Snippets") });
         }
         const pick = await quickInputService.pick([].concat(existing, globalSnippetPicks, workspaceSnippetPicks, picks.future), {
-            placeHolder: ( nls.localize('openSnippet.pickLanguage', "Select Snippets File or Create Snippets")),
+            placeHolder: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/configureSnippets', 'openSnippet.pickLanguage', "Select Snippets File or Create Snippets"),
             matchOnDescription: true
         });
         if (globalSnippetPicks.indexOf(pick) >= 0) {

package/vscode/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.js

@@ -3,7 +3,7 @@ import { compare } from 'monaco-editor/esm/vs/base/common/strings.js';
 import { getCodeEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
 import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
 import { SnippetController2 } from 'monaco-editor/esm/vs/editor/contrib/snippet/browser/snippetController2.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
 import { SnippetsAction } from './abstractSnippetsActions.js';
 import { ISnippetsService } from 'vscode/vscode/vs/workbench/contrib/snippets/browser/snippets';
@@ -15,7 +15,7 @@ class ApplyFileSnippetAction extends SnippetsAction {
         super({
             id: ApplyFileSnippetAction.Id,
             title: {
-                value: ( localize('label', 'Fill File with Snippet')),
+                value: localizeWithPath('vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets', 'label', 'Fill File with Snippet'),
                 original: 'Fill File with Snippet'
             },
             f1: true,
@@ -79,7 +79,7 @@ class ApplyFileSnippetAction extends SnippetsAction {
             }
         }
         const pick = await quickInputService.pick(picks, {
-            placeHolder: ( localize('placeholder', 'Select a snippet')),
+            placeHolder: localizeWithPath('vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets', 'placeholder', 'Select a snippet'),
             matchOnDetail: true,
         });
         return pick?.snippet;

package/vscode/src/vs/workbench/contrib/snippets/browser/commands/insertSnippet.js

@@ -38,7 +38,7 @@ class InsertSnippetAction extends SnippetEditorAction {
         super({
             id: 'editor.action.insertSnippet',
             title: {
-                value: ( nls.localize('snippet.suggestions.label', "Insert Snippet")),
+                value: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/commands/insertSnippet', 'snippet.suggestions.label', "Insert Snippet"),
                 original: 'Insert Snippet'
             },
             f1: true,

package/vscode/src/vs/workbench/contrib/snippets/browser/commands/surroundWithSnippet.js

@@ -1,6 +1,6 @@
 import { EditorContextKeys } from 'monaco-editor/esm/vs/editor/common/editorContextKeys.js';
 import { SnippetController2 } from 'monaco-editor/esm/vs/editor/contrib/snippet/browser/snippetController2.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.js';
 import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
@@ -19,7 +19,7 @@ class SurroundWithSnippetEditorAction extends SnippetEditorAction {
     static { this.options = {
         id: 'editor.action.surroundWithSnippet',
         title: {
-            value: ( localize('label', 'Surround With Snippet...')),
+            value: localizeWithPath('vs/workbench/contrib/snippets/browser/commands/surroundWithSnippet', 'label', 'Surround With Snippet...'),
             original: 'Surround With Snippet...'
         }
     }; }

package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCodeActionProvider.js

@@ -3,7 +3,7 @@ import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { Selection } from 'monaco-editor/esm/vs/editor/common/core/selection.js';
 import { ILanguageFeaturesService } from 'monaco-editor/esm/vs/editor/common/services/languageFeatures.js';
 import { CodeActionKind } from 'monaco-editor/esm/vs/editor/contrib/codeAction/common/types.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { ApplyFileSnippetAction } from './commands/fileTemplateSnippets.js';
@@ -41,7 +41,7 @@ let SurroundWithSnippetCodeActionProvider = class SurroundWithSnippetCodeActionP
                 break;
             }
             actions.push({
-                title: ( localize('codeAction', "Surround With: {0}", snippet.name)),
+                title: localizeWithPath('vs/workbench/contrib/snippets/browser/snippetCodeActionProvider', 'codeAction', "Surround With: {0}", snippet.name),
                 kind: CodeActionKind.SurroundWith.value,
                 edit: asWorkspaceEdit(model, range, snippet)
             });
@@ -59,7 +59,7 @@ let FileTemplateCodeActionProvider = class FileTemplateCodeActionProvider {
     static { FileTemplateCodeActionProvider_1 = this; }
     static { this._MAX_CODE_ACTIONS = 4; }
     static { this._overflowCommandCodeAction = {
-        title: ( localize('overflow.start.title', 'Start with Snippet')),
+        title: localizeWithPath('vs/workbench/contrib/snippets/browser/snippetCodeActionProvider', 'overflow.start.title', 'Start with Snippet'),
         kind: CodeActionKind.SurroundWith.value,
         command: {
             id: ApplyFileSnippetAction.Id,
@@ -82,7 +82,7 @@ let FileTemplateCodeActionProvider = class FileTemplateCodeActionProvider {
                 break;
             }
             actions.push({
-                title: ( localize('title', 'Start with: {0}', snippet.name)),
+                title: localizeWithPath('vs/workbench/contrib/snippets/browser/snippetCodeActionProvider', 'title', 'Start with: {0}', snippet.name),
                 kind: CodeActionKind.SurroundWith.value,
                 edit: asWorkspaceEdit(model, model.getFullModelRange(), snippet)
             });

package/vscode/src/vs/workbench/contrib/snippets/browser/snippetPicker.js

@@ -29,13 +29,13 @@ async function pickSnippet(accessor, languageIdOrSnippets) {
                 let label = '';
                 switch (snippet.snippetSource) {
                     case 1 :
-                        label = ( nls.localize('sep.userSnippet', "User Snippets"));
+                        label = nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippetPicker', 'sep.userSnippet', "User Snippets");
                         break;
                     case 3 :
                         label = snippet.source;
                         break;
                     case 2 :
-                        label = ( nls.localize('sep.workspaceSnippet', "Workspace Snippets"));
+                        label = nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippetPicker', 'sep.workspaceSnippet', "Workspace Snippets");
                         break;
                 }
                 result.push({ type: 'separator', label });
@@ -45,14 +45,14 @@ async function pickSnippet(accessor, languageIdOrSnippets) {
                 if (isEnabled) {
                     pick.buttons = [{
                             iconClass: ThemeIcon.asClassName(Codicon.eyeClosed),
-                            tooltip: ( nls.localize('disableSnippet', 'Hide from IntelliSense'))
+                            tooltip: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippetPicker', 'disableSnippet', 'Hide from IntelliSense')
                         }];
                 }
                 else {
-                    pick.description = ( nls.localize('isDisabled', "(hidden from IntelliSense)"));
+                    pick.description = nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippetPicker', 'isDisabled', "(hidden from IntelliSense)");
                     pick.buttons = [{
                             iconClass: ThemeIcon.asClassName(Codicon.eye),
-                            tooltip: ( nls.localize('enable.snippet', 'Show in IntelliSense'))
+                            tooltip: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippetPicker', 'enable.snippet', 'Show in IntelliSense')
                         }];
                 }
             }
@@ -62,7 +62,7 @@ async function pickSnippet(accessor, languageIdOrSnippets) {
         return result;
     };
     const picker = quickInputService.createQuickPick();
-    picker.placeholder = ( nls.localize('pick.placeholder', "Select a snippet"));
+    picker.placeholder = nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippetPicker', 'pick.placeholder', "Select a snippet");
     picker.matchOnDetail = true;
     picker.ignoreFocusOut = false;
     picker.keepScrollPosition = true;
@@ -73,7 +73,7 @@ async function pickSnippet(accessor, languageIdOrSnippets) {
     });
     picker.items = makeSnippetPicks();
     if (!picker.items.length) {
-        picker.validationMessage = ( nls.localize('pick.noSnippetAvailable', "No snippet available"));
+        picker.validationMessage = nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippetPicker', 'pick.noSnippetAvailable', "No snippet available");
     }
     picker.show();
     await Promise.race([Event.toPromise(picker.onDidAccept), Event.toPromise(picker.onDidHide)]);

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

@@ -25,10 +25,7 @@ workbenchContribRegistry.registerWorkbenchContribution(SnippetCodeActions, 3 );
     ...editorConfigurationBaseNode,
     'properties': {
         'editor.snippets.codeActions.enabled': {
-            'description': ( nls.localize(
-                'editor.snippets.codeActions.enabled',
-                'Controls if surround-with-snippets or file template snippets show as Code Actions.'
-            )),
+            'description': nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippets.contribution', 'editor.snippets.codeActions.enabled', 'Controls if surround-with-snippets or file template snippets show as Code Actions.'),
             'type': 'boolean',
             'default': true
         }
@@ -37,31 +34,22 @@ workbenchContribRegistry.registerWorkbenchContribution(SnippetCodeActions, 3 );
 const languageScopeSchemaId = 'vscode://schemas/snippets';
 const snippetSchemaProperties = {
     prefix: {
-        description: ( nls.localize(
-            'snippetSchema.json.prefix',
-            'The prefix to use when selecting the snippet in intellisense'
-        )),
+        description: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippets.contribution', 'snippetSchema.json.prefix', 'The prefix to use when selecting the snippet in intellisense'),
         type: ['string', 'array']
     },
     isFileTemplate: {
-        description: ( nls.localize(
-            'snippetSchema.json.isFileTemplate',
-            'The snippet is meant to populate or replace a whole file'
-        )),
+        description: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippets.contribution', 'snippetSchema.json.isFileTemplate', 'The snippet is meant to populate or replace a whole file'),
         type: 'boolean'
     },
     body: {
-        markdownDescription: ( nls.localize(
-            'snippetSchema.json.body',
-            'The snippet content. Use `$1`, `${1:defaultText}` to define cursor positions, use `$0` for the final cursor position. Insert variable values with `${varName}` and `${varName:defaultText}`, e.g. `This is file: $TM_FILENAME`.'
-        )),
+        markdownDescription: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippets.contribution', 'snippetSchema.json.body', 'The snippet content. Use `$1`, `${1:defaultText}` to define cursor positions, use `$0` for the final cursor position. Insert variable values with `${varName}` and `${varName:defaultText}`, e.g. `This is file: $TM_FILENAME`.'),
         type: ['string', 'array'],
         items: {
             type: 'string'
         }
     },
     description: {
-        description: ( nls.localize('snippetSchema.json.description', 'The snippet description.')),
+        description: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippets.contribution', 'snippetSchema.json.description', 'The snippet description.'),
         type: ['string', 'array']
     }
 };
@@ -70,11 +58,11 @@ const languageScopeSchema = {
     allowComments: true,
     allowTrailingCommas: true,
     defaultSnippets: [{
-            label: ( nls.localize('snippetSchema.json.default', "Empty snippet")),
+            label: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippets.contribution', 'snippetSchema.json.default', "Empty snippet"),
             body: { '${1:snippetName}': { 'prefix': '${2:prefix}', 'body': '${3:snippet}', 'description': '${4:description}' } }
         }],
     type: 'object',
-    description: ( nls.localize('snippetSchema.json', 'User snippet configuration')),
+    description: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippets.contribution', 'snippetSchema.json', 'User snippet configuration'),
     additionalProperties: {
         type: 'object',
         required: ['body'],
@@ -88,21 +76,18 @@ const globalSchema = {
     allowComments: true,
     allowTrailingCommas: true,
     defaultSnippets: [{
-            label: ( nls.localize('snippetSchema.json.default', "Empty snippet")),
+            label: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippets.contribution', 'snippetSchema.json.default', "Empty snippet"),
             body: { '${1:snippetName}': { 'scope': '${2:scope}', 'prefix': '${3:prefix}', 'body': '${4:snippet}', 'description': '${5:description}' } }
         }],
     type: 'object',
-    description: ( nls.localize('snippetSchema.json', 'User snippet configuration')),
+    description: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippets.contribution', 'snippetSchema.json', 'User snippet configuration'),
     additionalProperties: {
         type: 'object',
         required: ['body'],
         properties: {
             ...snippetSchemaProperties,
             scope: {
-                description: ( nls.localize(
-                    'snippetSchema.json.scope',
-                    "A list of language names to which this snippet applies, e.g. 'typescript,javascript'."
-                )),
+                description: nls.localizeWithPath('vs/workbench/contrib/snippets/browser/snippets.contribution', 'snippetSchema.json.scope', "A list of language names to which this snippet applies, e.g. 'typescript,javascript'."),
                 type: 'string'
             }
         },