@codingame/monaco-vscode-api 7.1.0 → 7.1.1

package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
 import { Extensions } from '../../../../platform/theme/common/iconRegistry.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
@@ -8,21 +8,19 @@ import { joinPath, isEqualOrParent } from '../../../../base/common/resources.js'
 import { extname, posix } from '../../../../base/common/path.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
-const _moduleId = "vs/workbench/services/themes/common/iconExtensionPoint";
 const iconRegistry = ( (Registry.as(Extensions.IconContribution)));
 const iconReferenceSchema = iconRegistry.getIconReferenceSchema();
 const iconIdPattern = `^${ThemeIcon.iconNameSegment}(-${ThemeIcon.iconNameSegment})+$`;
 const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'icons',
     jsonSchema: {
-        description: ( localizeWithPath(_moduleId, 0, 'Contributes extension defined themable icons')),
+        description: ( localize(988, 'Contributes extension defined themable icons')),
         type: 'object',
         propertyNames: {
             pattern: iconIdPattern,
-            description: ( localizeWithPath(_moduleId, 1, 'The identifier of the themable icon')),
-            patternErrorMessage: ( localizeWithPath(
-                _moduleId,
-                2,
+            description: ( localize(989, 'The identifier of the themable icon')),
+            patternErrorMessage: ( localize(
+                990,
                 'Identifiers can only contain letters, digits and minuses and need to consist of at least two segments in the form `component-iconname`.'
             )),
         },
@@ -31,7 +29,7 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
             properties: {
                 description: {
                     type: 'string',
-                    description: ( localizeWithPath(_moduleId, 3, 'The description of the themable icon')),
+                    description: ( localize(991, 'The description of the themable icon')),
                 },
                 default: {
                     anyOf: [
@@ -40,11 +38,11 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                             type: 'object',
                             properties: {
                                 fontPath: {
-                                    description: ( localizeWithPath(_moduleId, 4, 'The path of the icon font that defines the icon.')),
+                                    description: ( localize(992, 'The path of the icon font that defines the icon.')),
                                     type: 'string'
                                 },
                                 fontCharacter: {
-                                    description: ( localizeWithPath(_moduleId, 5, 'The character for the icon in the icon font.')),
+                                    description: ( localize(993, 'The character for the icon in the icon font.')),
                                     type: 'string'
                                 }
                             },
@@ -52,9 +50,8 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint({
                             defaultSnippets: [{ body: { fontPath: '${1:myiconfont.woff}', fontCharacter: '${2:\\\\E001}' } }]
                         }
                     ],
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        6,
+                    description: ( localize(
+                        994,
                         'The default of the icon. Either a reference to an extisting ThemeIcon or an icon in an icon font.'
                     )),
                 }
@@ -72,27 +69,24 @@ class IconExtensionPoint {
                 const extensionValue = extension.value;
                 const collector = extension.collector;
                 if (!extensionValue || typeof extensionValue !== 'object') {
-                    collector.error(( localizeWithPath(
-                        _moduleId,
-                        7,
+                    collector.error(( localize(
+                        995,
                         "'configuration.icons' must be an object with the icon names as properties."
                     )));
                     return;
                 }
                 for (const id in extensionValue) {
                     if (!id.match(iconIdPattern)) {
-                        collector.error(( localizeWithPath(
-                            _moduleId,
-                            8,
+                        collector.error(( localize(
+                            996,
                             "'configuration.icons' keys represent the icon id and can only contain letter, digits and minuses. They need to consist of at least two segments in the form `component-iconname`."
                         )));
                         return;
                     }
                     const iconContribution = extensionValue[id];
                     if (typeof iconContribution.description !== 'string' || iconContribution.description.length === 0) {
-                        collector.error(( localizeWithPath(
-                            _moduleId,
-                            9,
+                        collector.error(( localize(
+                            997,
                             "'configuration.icons.description' must be defined and can not be empty"
                         )));
                         return;
@@ -105,9 +99,8 @@ class IconExtensionPoint {
                         const fileExt = extname(defaultIcon.fontPath).substring(1);
                         const format = formatMap[fileExt];
                         if (!format) {
-                            collector.warn(( localizeWithPath(
-                                _moduleId,
-                                10,
+                            collector.warn(( localize(
+                                998,
                                 "Expected `contributes.icons.default.fontPath` to have file extension 'woff', woff2' or 'ttf', is '{0}'.",
                                 fileExt
                             )));
@@ -116,9 +109,8 @@ class IconExtensionPoint {
                         const extensionLocation = extension.description.extensionLocation;
                         const iconFontLocation = joinPath(extensionLocation, defaultIcon.fontPath);
                         if (!isEqualOrParent(iconFontLocation, extensionLocation)) {
-                            collector.warn(( localizeWithPath(
-                                _moduleId,
-                                11,
+                            collector.warn(( localize(
+                                999,
                                 "Expected `contributes.icons.default.fontPath` ({0}) to be included inside extension's folder ({0}).",
                                 iconFontLocation.path,
                                 extensionLocation.path
@@ -136,9 +128,8 @@ class IconExtensionPoint {
                         }, iconContribution.description);
                     }
                     else {
-                        collector.error(( localizeWithPath(
-                            _moduleId,
-                            12,
+                        collector.error(( localize(
+                            1000,
                             "'configuration.icons.default' must be either a reference to the id of an other theme icon (string) or a icon definition (object) with properties `fontPath` and `fontCharacter`."
                         )));
                     }

package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorModel.js

@@ -22,7 +22,7 @@ var UntitledTextEditorModel_1;
 let UntitledTextEditorModel = class UntitledTextEditorModel extends BaseTextEditorModel {
     static { UntitledTextEditorModel_1 = this; }
     static { this.FIRST_LINE_NAME_MAX_LENGTH = 40; }
-    static { this.FIRST_LINE_NAME_CANDIDATE_MAX_LENGTH = UntitledTextEditorModel_1.FIRST_LINE_NAME_MAX_LENGTH * 10; }
+    static { this.FIRST_LINE_NAME_CANDIDATE_MAX_LENGTH = this.FIRST_LINE_NAME_MAX_LENGTH * 10; }
     static { this.ACTIVE_EDITOR_LANGUAGE_ID = '${activeEditorLanguage}'; }
     get name() {
         if (this.configuredLabelFormat === 'content' && !this.hasAssociatedFilePath && this.cachedModelFirstLineWords) {

package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js

@@ -1,10 +1,9 @@
-import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
+import { localize, localize2 } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { URI } from '../../../../base/common/uri.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-const _moduleId = "vs/workbench/services/userDataProfile/common/userDataProfile";
 const PROFILE_URL_AUTHORITY = 'profile';
 function toUserDataProfileUri(path, productService) {
     return (
@@ -15,13 +14,13 @@ function toUserDataProfileUri(path, productService) {
         }))
     );
 }
-const defaultUserDataProfileIcon = registerIcon('defaultProfile-icon', Codicon.settings, ( localizeWithPath(_moduleId, 0, 'Icon for Default Profile.')));
+const defaultUserDataProfileIcon = registerIcon('defaultProfile-icon', Codicon.settings, ( localize(3787, 'Icon for Default Profile.')));
 const ProfilesMenu = ( (new MenuId('Profiles')));
 const MANAGE_PROFILES_ACTION_ID = 'workbench.profiles.actions.manage';
-const PROFILES_TITLE = ( localize2WithPath(_moduleId, 1, 'Profiles'));
+const PROFILES_TITLE = ( localize2(3788, 'Profiles'));
 const PROFILES_CATEGORY = { ...PROFILES_TITLE };
 const PROFILE_EXTENSION = 'code-profile';
-const PROFILE_FILTER = [{ name: ( localizeWithPath(_moduleId, 2, "Profile")), extensions: [PROFILE_EXTENSION] }];
+const PROFILE_FILTER = [{ name: ( localize(3789, "Profile")), extensions: [PROFILE_EXTENSION] }];
 const PROFILES_ENABLEMENT_CONTEXT = ( (new RawContextKey('profiles.enabled', true)));
 const CURRENT_PROFILE_CONTEXT = ( (new RawContextKey('currentProfile', '')));
 const IS_CURRENT_PROFILE_TRANSIENT_CONTEXT = ( (new RawContextKey('isCurrentProfileTransient', false)));

package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.js

@@ -1,8 +1,7 @@
 import { Codicon } from '../../../../base/common/codicons.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-const _moduleId = "vs/workbench/services/userDataProfile/common/userDataProfileIcons";
-const DEFAULT_ICON = registerIcon('settings-view-bar-icon', Codicon.settingsGear, ( localizeWithPath(_moduleId, 0, "Settings icon in the view bar.")));
+const DEFAULT_ICON = registerIcon('settings-view-bar-icon', Codicon.settingsGear, ( localize(8812, "Settings icon in the view bar.")));
 const ICONS = [
     DEFAULT_ICON,
     Codicon.vm,

package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js

@@ -1,20 +1,19 @@
 import { SyncStatus, SyncResource } from '../../../../platform/userDataSync/common/userDataSync.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localize2, localize } from '../../../../nls.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-const _moduleId = "vs/workbench/services/userDataSync/common/userDataSync";
 function getSyncAreaLabel(source) {
     switch (source) {
-        case SyncResource.Settings: return ( localizeWithPath(_moduleId, 0, "Settings"));
-        case SyncResource.Keybindings: return ( localizeWithPath(_moduleId, 1, "Keyboard Shortcuts"));
-        case SyncResource.Snippets: return ( localizeWithPath(_moduleId, 2, "User Snippets"));
-        case SyncResource.Tasks: return ( localizeWithPath(_moduleId, 3, "User Tasks"));
-        case SyncResource.Extensions: return ( localizeWithPath(_moduleId, 4, "Extensions"));
-        case SyncResource.GlobalState: return ( localizeWithPath(_moduleId, 5, "UI State"));
-        case SyncResource.Profiles: return ( localizeWithPath(_moduleId, 6, "Profiles"));
-        case SyncResource.WorkspaceState: return ( localizeWithPath(_moduleId, 7, "Workspace State"));
+        case SyncResource.Settings: return ( localize(8445, "Settings"));
+        case SyncResource.Keybindings: return ( localize(8446, "Keyboard Shortcuts"));
+        case SyncResource.Snippets: return ( localize(8447, "Snippets"));
+        case SyncResource.Tasks: return ( localize(8448, "Tasks"));
+        case SyncResource.Extensions: return ( localize(8449, "Extensions"));
+        case SyncResource.GlobalState: return ( localize(8450, "UI State"));
+        case SyncResource.Profiles: return ( localize(8451, "Profiles"));
+        case SyncResource.WorkspaceState: return ( localize(8452, "Workspace State"));
     }
 }
 var AccountStatus;
@@ -22,8 +21,8 @@ var AccountStatus;
     AccountStatus["Unavailable"] = "unavailable";
     AccountStatus["Available"] = "available";
 })(AccountStatus || (AccountStatus = {}))));
-const SYNC_TITLE = ( localize2WithPath(_moduleId, 8, "Settings Sync"));
-const SYNC_VIEW_ICON = registerIcon('settings-sync-view-icon', Codicon.sync, ( localizeWithPath(_moduleId, 9, 'View icon of the Settings Sync view.')));
+const SYNC_TITLE = ( localize2(8453, "Settings Sync"));
+const SYNC_VIEW_ICON = registerIcon('settings-sync-view-icon', Codicon.sync, ( localize(8454, 'View icon of the Settings Sync view.')));
 const CONTEXT_SYNC_STATE = ( (new RawContextKey('syncStatus', SyncStatus.Uninitialized)));
 const CONTEXT_SYNC_ENABLEMENT = ( (new RawContextKey('syncEnabled', false)));
 const CONTEXT_ACCOUNT_STATE = ( (new RawContextKey('userDataSyncAccountStatus', AccountStatus.Unavailable)));
@@ -36,7 +35,7 @@ const SYNC_VIEW_CONTAINER_ID = 'workbench.view.sync';
 const SYNC_CONFLICTS_VIEW_ID = 'workbench.views.sync.conflicts';
 const DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR = {
     id: 'workbench.userDataSync.actions.downloadSyncActivity',
-    title: ( localize2WithPath(_moduleId, 10, "Download Settings Sync Activity")),
+    title: ( localize2(8455, "Download Settings Sync Activity")),
     category: Categories.Developer,
     f1: true,
     precondition: ( (ContextKeyExpr.and(

package/vscode/src/vs/workbench/services/views/browser/viewsService.js

@@ -10,7 +10,7 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { isString } from '../../../../base/common/types.js';
 import { registerAction2, Action2, MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
-import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
+import { localize, localize2 } from '../../../../nls.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import '../../../../platform/instantiation/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -29,7 +29,6 @@ import { FilterViewPaneContainer } from '../../../browser/parts/views/viewsViewl
 import { IPaneCompositePartService } from '../../panecomposite/browser/panecomposite.service.js';
 import { IEditorService } from '../../editor/common/editorService.service.js';
 import { IViewsService } from '../common/viewsService.service.js';
-const _moduleId = "vs/workbench/services/views/browser/viewsService";
 let ViewsService = class ViewsService extends Disposable {
     constructor(viewDescriptorService, paneCompositeService, contextKeyService, layoutService, editorService) {
         super();
@@ -217,7 +216,7 @@ let ViewsService = class ViewsService extends Disposable {
     }
     getFocusedViewName() {
         const viewId = this.contextKeyService.getContextKeyValue(FocusedViewContext.key) ?? '';
-        const textEditorFocused = this.editorService.activeTextEditorControl?.hasTextFocus() ? ( localizeWithPath(_moduleId, 0, "Text Editor")) : undefined;
+        const textEditorFocused = this.editorService.activeTextEditorControl?.hasTextFocus() ? ( localize(4155, "Text Editor")) : undefined;
         return this.viewDescriptorService.getViewDescriptorById(( (viewId.toString())))?.name?.value ?? textEditorFocused ?? '';
     }
     async openView(id, focus) {
@@ -318,10 +317,10 @@ let ViewsService = class ViewsService extends Disposable {
                             const localizedTitle = typeof title === 'string' ? title : title.value;
                             const originalTitle = typeof title === 'string' ? title : title.original;
                             if (viewContainerLocation === ViewContainerLocation.Sidebar) {
-                                return { value: ( localizeWithPath(_moduleId, 1, "Show {0}", localizedTitle)), original: `Show ${originalTitle}` };
+                                return { value: ( localize(4156, "Show {0}", localizedTitle)), original: `Show ${originalTitle}` };
                             }
                             else {
-                                return { value: ( localizeWithPath(_moduleId, 2, "Toggle {0}", localizedTitle)), original: `Toggle ${originalTitle}` };
+                                return { value: ( localize(4157, "Toggle {0}", localizedTitle)), original: `Toggle ${originalTitle}` };
                             }
                         },
                         category: Categories.View,
@@ -389,10 +388,10 @@ let ViewsService = class ViewsService extends Disposable {
                             const localizedTitle = typeof title === 'string' ? title : title.value;
                             const originalTitle = typeof title === 'string' ? title : title.original;
                             if (viewContainerLocation === ViewContainerLocation.Sidebar) {
-                                return { value: ( localizeWithPath(_moduleId, 1, "Show {0}", localizedTitle)), original: `Show ${originalTitle}` };
+                                return { value: ( localize(4157, "Show {0}", localizedTitle)), original: `Show ${originalTitle}` };
                             }
                             else {
-                                return { value: ( localizeWithPath(_moduleId, 2, "Toggle {0}", localizedTitle)), original: `Toggle ${originalTitle}` };
+                                return { value: ( localize(4157, "Toggle {0}", localizedTitle)), original: `Toggle ${originalTitle}` };
                             }
                         },
                         category: Categories.View,
@@ -443,7 +442,7 @@ let ViewsService = class ViewsService extends Disposable {
     registerFocusViewAction(viewDescriptor, category) {
         return registerAction2(class FocusViewAction extends Action2 {
             constructor() {
-                const title = ( localize2WithPath(_moduleId, 3, "Focus on {0} View", viewDescriptor.name.value));
+                const title = ( localize2(4158, "Focus on {0} View", viewDescriptor.name.value));
                 super({
                     id: viewDescriptor.focusCommand ? viewDescriptor.focusCommand.id : `${viewDescriptor.id}.focus`,
                     title,
@@ -491,7 +490,7 @@ let ViewsService = class ViewsService extends Disposable {
             constructor() {
                 super({
                     id: `${viewDescriptor.id}.resetViewLocation`,
-                    title: ( localize2WithPath(_moduleId, 4, "Reset Location")),
+                    title: ( localize2(4159, "Reset Location")),
                     menu: [{
                             id: MenuId.ViewTitleContext,
                             when: ( (ContextKeyExpr.or( (ContextKeyExpr.and(

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { ETAG_DISABLED, FileOperationResult, NotModifiedSinceFileOperationError } from '../../../../platform/files/common/files.js';
@@ -28,7 +28,6 @@ import { ProgressLocation } from '../../../../platform/progress/common/progress.
 import { IProgressService } from '../../../../platform/progress/common/progress.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
 var StoredFileWorkingCopy_1;
-const _moduleId = "vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
 var StoredFileWorkingCopyState;
 ( ((function(StoredFileWorkingCopyState) {
     StoredFileWorkingCopyState[StoredFileWorkingCopyState["SAVED"] = 0] = "SAVED";
@@ -404,7 +403,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         }
         const saveCancellation = ( (new CancellationTokenSource()));
         return this.progressService.withProgress({
-            title: ( localizeWithPath(_moduleId, 0, "Saving '{0}'", this.name)),
+            title: ( localize(10651, "Saving '{0}'", this.name)),
             location: ProgressLocation.Window,
             cancellable: true,
             delay: this.isDirty() ? 3000 : 5000
@@ -451,7 +450,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             }
             versionId = this.versionId;
             this.inErrorMode = false;
-            progress.report({ message: ( localizeWithPath(_moduleId, 1, "Writing into file...")) });
+            progress.report({ message: ( localize(10652, "Writing into file...")) });
             this.trace(`doSave(${versionId}) - before write()`);
             const lastResolvedFileStat = assertIsDefined(this.lastResolvedFileStat);
             const resolvedFileWorkingCopy = this;
@@ -527,14 +526,13 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         const primaryActions = [];
         let message;
         if (fileOperationError.fileOperationResult === FileOperationResult.FILE_MODIFIED_SINCE) {
-            message = ( localizeWithPath(
-                _moduleId,
-                2,
+            message = ( localize(
+                10653,
                 "Failed to save '{0}': The content of the file is newer. Do you want to overwrite the file with your changes?",
                 this.name
             ));
-            primaryActions.push(toAction({ id: 'fileWorkingCopy.overwrite', label: ( localizeWithPath(_moduleId, 3, "Overwrite")), run: () => this.save({ ...options, ignoreModifiedSince: true, reason: SaveReason.EXPLICIT }) }));
-            primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: ( localizeWithPath(_moduleId, 4, "Discard")), run: () => this.revert() }));
+            primaryActions.push(toAction({ id: 'fileWorkingCopy.overwrite', label: ( localize(10654, "Overwrite")), run: () => this.save({ ...options, ignoreModifiedSince: true, reason: SaveReason.EXPLICIT }) }));
+            primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: ( localize(10655, "Discard")), run: () => this.revert() }));
         }
         else {
             const isWriteLocked = fileOperationError.fileOperationResult === FileOperationResult.FILE_WRITE_LOCKED;
@@ -548,22 +546,22 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                 primaryActions.push(toAction({
                     id: 'fileWorkingCopy.saveElevated',
                     label: triedToUnlock ?
-                        isWindows ? ( localizeWithPath(_moduleId, 5, "Overwrite as Admin...")) : ( localizeWithPath(_moduleId, 6, "Overwrite as Sudo...")) :
-                        isWindows ? ( localizeWithPath(_moduleId, 7, "Retry as Admin...")) : ( localizeWithPath(_moduleId, 8, "Retry as Sudo...")),
+                        isWindows ? ( localize(10656, "Overwrite as Admin...")) : ( localize(10657, "Overwrite as Sudo...")) :
+                        isWindows ? ( localize(10658, "Retry as Admin...")) : ( localize(10659, "Retry as Sudo...")),
                     run: () => {
                         this.save({ ...options, writeElevated: true, writeUnlock: triedToUnlock, reason: SaveReason.EXPLICIT });
                     }
                 }));
             }
             else if (isWriteLocked) {
-                primaryActions.push(toAction({ id: 'fileWorkingCopy.unlock', label: ( localizeWithPath(_moduleId, 3, "Overwrite")), run: () => this.save({ ...options, writeUnlock: true, reason: SaveReason.EXPLICIT }) }));
+                primaryActions.push(toAction({ id: 'fileWorkingCopy.unlock', label: ( localize(10659, "Overwrite")), run: () => this.save({ ...options, writeUnlock: true, reason: SaveReason.EXPLICIT }) }));
             }
             else {
-                primaryActions.push(toAction({ id: 'fileWorkingCopy.retry', label: ( localizeWithPath(_moduleId, 9, "Retry")), run: () => this.save({ ...options, reason: SaveReason.EXPLICIT }) }));
+                primaryActions.push(toAction({ id: 'fileWorkingCopy.retry', label: ( localize(10660, "Retry")), run: () => this.save({ ...options, reason: SaveReason.EXPLICIT }) }));
             }
             primaryActions.push(toAction({
                 id: 'fileWorkingCopy.saveAs',
-                label: ( localizeWithPath(_moduleId, 10, "Save As...")),
+                label: ( localize(10661, "Save As...")),
                 run: async () => {
                     const editor = this.workingCopyEditorService.findEditor(this);
                     if (editor) {
@@ -574,27 +572,24 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                     }
                 }
             }));
-            primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: ( localizeWithPath(_moduleId, 4, "Discard")), run: () => this.revert() }));
+            primaryActions.push(toAction({ id: 'fileWorkingCopy.revert', label: ( localize(10661, "Discard")), run: () => this.revert() }));
             if (isWriteLocked) {
                 if (triedToUnlock && canSaveElevated) {
                     message = isWindows ?
-                        ( localizeWithPath(
-                            _moduleId,
-                            11,
+                        ( localize(
+                            10662,
                             "Failed to save '{0}': File is read-only. Select 'Overwrite as Admin' to retry as administrator.",
                             this.name
                         )) :
-                        ( localizeWithPath(
-                            _moduleId,
-                            12,
+                        ( localize(
+                            10663,
                             "Failed to save '{0}': File is read-only. Select 'Overwrite as Sudo' to retry as superuser.",
                             this.name
                         ));
                 }
                 else {
-                    message = ( localizeWithPath(
-                        _moduleId,
-                        13,
+                    message = ( localize(
+                        10664,
                         "Failed to save '{0}': File is read-only. Select 'Overwrite' to attempt to make it writeable.",
                         this.name
                     ));
@@ -602,23 +597,20 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
             }
             else if (canSaveElevated && isPermissionDenied) {
                 message = isWindows ?
-                    ( localizeWithPath(
-                        _moduleId,
-                        14,
+                    ( localize(
+                        10665,
                         "Failed to save '{0}': Insufficient permissions. Select 'Retry as Admin' to retry as administrator.",
                         this.name
                     )) :
-                    ( localizeWithPath(
-                        _moduleId,
-                        15,
+                    ( localize(
+                        10666,
                         "Failed to save '{0}': Insufficient permissions. Select 'Retry as Sudo' to retry as superuser.",
                         this.name
                     ));
             }
             else {
-                message = ( localizeWithPath(
-                    _moduleId,
-                    16,
+                message = ( localize(
+                    10667,
                     "Failed to save '{0}': {1}",
                     this.name,
                     toErrorMessage(error, false)

package/vscode-dts/vscode.proposed.aiTextSearchProviderNew.d.ts

@@ -0,0 +1,119 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+	/**
+	 * Options that apply to AI text search.
+	 */
+	export interface AITextSearchOptionsNew {
+
+		folderOptions: {
+			/**
+			 * The root folder to search within.
+			 */
+			folder: Uri;
+
+			/**
+			 * Files that match an `includes` glob pattern should be included in the search.
+			 */
+			includes: string[];
+
+			/**
+			 * Files that match an `excludes` glob pattern should be excluded from the search.
+			 */
+			excludes: GlobPattern[];
+
+			/**
+			 * Whether symlinks should be followed while searching.
+			 * For more info, see the setting description for `search.followSymlinks`.
+			 */
+			followSymlinks: boolean;
+
+			/**
+			 * Which file locations we should look for ignore (.gitignore or .ignore) files to respect.
+			 */
+			useIgnoreFiles: {
+				/**
+				 * Use ignore files at the current workspace root.
+				 */
+				local: boolean;
+				/**
+				 * Use ignore files at the parent directory. If set, {@link TextSearchProviderOptionsNew.useIgnoreFiles.local} should also be `true`.
+				 */
+				parent: boolean;
+				/**
+				 * Use global ignore files. If set, {@link TextSearchProviderOptionsNew.useIgnoreFiles.local} should also be `true`.
+				 */
+				global: boolean;
+			};
+		}[];
+
+		/**
+		 * The maximum number of results to be returned.
+		 */
+		maxResults: number;
+
+		/**
+		 * Options to specify the size of the result text preview.
+		 */
+		previewOptions: {
+			/**
+			 * The maximum number of lines in the preview.
+			 * Only search providers that support multiline search will ever return more than one line in the match.
+			 */
+			matchLines: number;
+
+			/**
+			 * The maximum number of characters included per line.
+			 */
+			charsPerLine: number;
+		};
+
+		/**
+		 * Exclude files larger than `maxFileSize` in bytes.
+		 */
+		maxFileSize: number;
+
+		/**
+		 * Interpret files using this encoding.
+		 * See the vscode setting `"files.encoding"`
+		 */
+		encoding: string;
+
+		/**
+		 * Number of lines of context to include before and after each match.
+		 */
+		surroundingContext: number;
+	}
+
+	/**
+	 * An AITextSearchProvider provides additional AI text search results in the workspace.
+	 */
+	export interface AITextSearchProviderNew {
+		/**
+		 * WARNING: VERY EXPERIMENTAL.
+		 *
+		 * Provide results that match the given text pattern.
+		 * @param query The parameter for this query.
+		 * @param options A set of options to consider while searching.
+		 * @param progress A progress callback that must be invoked for all results.
+		 * @param token A cancellation token.
+		 */
+		provideAITextSearchResults(query: string, options: AITextSearchOptionsNew, progress: Progress<TextSearchResultNew>, token: CancellationToken): ProviderResult<TextSearchCompleteNew>;
+	}
+
+	export namespace workspace {
+		/**
+		 * Register an AI text search provider.
+		 *
+		 * Only one provider can be registered per scheme.
+		 *
+		 * @param scheme The provider will be invoked for workspace folders that have this file scheme.
+		 * @param provider The provider.
+		 * @return A {@link Disposable} that unregisters this provider when being disposed.
+		 */
+		export function registerAITextSearchProviderNew(scheme: string, provider: AITextSearchProviderNew): Disposable;
+	}
+}