@codingame/monaco-vscode-api 2.2.2 → 3.0.0

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

@@ -1,34 +1,35 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Schemas } from '../../../../base/common/network.js';
-import { sep } from '../../../../base/common/path.js';
-import { isWindows } from '../../../../base/common/platform.js';
-import { UndoCommand, RedoCommand } from '../../../../editor/browser/editorExtensions.js';
-import { ModesRegistry } from '../../../../editor/common/languages/modesRegistry.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { Extensions as Extensions$1 } from '../../../../platform/configuration/common/configurationRegistry.js';
-import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
-import { ILabelService } from '../../../../platform/label/common/label.js';
+import { sep } from '../../../../base/common/path.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.js';
-import { EditorPaneDescriptor } from '../../../browser/editor.js';
-import { Extensions } from '../../../common/contributions.js';
+import { Extensions as Extensions$1 } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { registerWorkbenchContribution2, Extensions } from '../../../common/contributions.js';
 import { EditorExtensions } from '../../../common/editor.js';
-import { BinaryFileEditor } from './editors/binaryFileEditor.js';
-import { FileEditorInputSerializer, FileEditorWorkingCopyEditorHandler } from './editors/fileEditorHandler.js';
-import { FileEditorInput } from './editors/fileEditorInput.js';
-import { TextFileEditor } from './editors/textFileEditor.js';
+import { FILE_EDITOR_INPUT_ID, BINARY_TEXT_FILE_MODE } from '../common/files.js';
 import { TextFileEditorTracker } from './editors/textFileEditorTracker.js';
 import { TextFileSaveErrorHandler } from './editors/textFileSaveErrorHandler.js';
-import { UNDO_REDO_SOURCE } from './explorerService.js';
+import { FileEditorInput } from './editors/fileEditorInput.js';
+import { BinaryFileEditor } from './editors/binaryFileEditor.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { isWindows } from '../../../../base/common/platform.js';
 import { ExplorerViewletViewsContribution } from './explorerViewlet.js';
-import { IExplorerService } from './files.js';
+import { EditorPaneDescriptor } from '../../../browser/editor.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { UNDO_REDO_SOURCE } from './explorerService.js';
+import { Schemas } from '../../../../base/common/network.js';
 import { WorkspaceWatcher } from './workspaceWatcher.js';
 import { DirtyFilesIndicator } from '../common/dirtyFilesIndicator.js';
-import { FILE_EDITOR_INPUT_ID, BINARY_TEXT_FILE_MODE } from '../common/files.js';
+import { UndoCommand, RedoCommand } from '../../../../editor/browser/editorExtensions.js';
+import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.js';
+import { IExplorerService } from './files.js';
+import { FileEditorInputSerializer, FileEditorWorkingCopyEditorHandler } from './editors/fileEditorHandler.js';
+import { ModesRegistry } from '../../../../editor/common/languages/modesRegistry.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { TextFileEditor } from './editors/textFileEditor.js';
 import './files.configuration.contribution.js';
 import './files.fileEditorFactory.contribution.js';
 let FileUriLabelContribution = class FileUriLabelContribution {
+    static { this.ID = 'workbench.contrib.fileUriLabel'; }
     constructor(labelService) {
         labelService.registerFormatter({
             scheme: Schemas.file,
@@ -61,13 +62,13 @@ FileUriLabelContribution = ( __decorate([
     ( new SyncDescriptor(FileEditorInput))
 ]);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(FILE_EDITOR_INPUT_ID, FileEditorInputSerializer);
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(FileEditorWorkingCopyEditorHandler, 2 );
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(ExplorerViewletViewsContribution, 1 );
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(TextFileEditorTracker, 1 );
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(TextFileSaveErrorHandler, 1 );
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(FileUriLabelContribution, 1 );
+registerWorkbenchContribution2(FileEditorWorkingCopyEditorHandler.ID, FileEditorWorkingCopyEditorHandler, 2 );
+registerWorkbenchContribution2(ExplorerViewletViewsContribution.ID, ExplorerViewletViewsContribution, 1 );
+registerWorkbenchContribution2(TextFileEditorTracker.ID, TextFileEditorTracker, 1 );
+registerWorkbenchContribution2(TextFileSaveErrorHandler.ID, TextFileSaveErrorHandler, 1 );
+registerWorkbenchContribution2(FileUriLabelContribution.ID, FileUriLabelContribution, 1 );
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(WorkspaceWatcher, 3 );
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(DirtyFilesIndicator, 1 );
+registerWorkbenchContribution2(DirtyFilesIndicator.ID, DirtyFilesIndicator, 1 );
 const configurationRegistry = ( Registry.as(Extensions$1.Configuration));
 configurationRegistry.registerConfiguration({
     'id': 'explorer',

package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../../nls.js';
 import { mark } from '../../../../../base/common/performance.js';
 import { memoize } from '../../../../../base/common/decorators.js';
 import { ExplorerFolderContext, ExplorerResourceReadonlyContext, ExplorerResourceAvailableEditorIdsContext, ExplorerRootContext, ExplorerResourceMoveableToTrash, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, ExplorerCompressedLastFocusContext, ViewHasSomeCollapsibleRootItemContext, FoldersViewVisibleContext, ExplorerResourceCut, FilesExplorerFocusedContext, ExplorerFocusedContext, ExplorerResourceNotReadonlyContext, VIEW_ID } from '../../common/files.js';
@@ -825,11 +825,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.files.action.refreshFilesExplorer',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/files/browser/views/explorerView',
                 'refreshExplorer',
                 "Refresh Explorer"
-            )), original: 'Refresh Explorer' },
+            )),
             f1: true,
             icon: Codicon.refresh,
             menu: {
@@ -851,11 +851,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.files.action.collapseExplorerFolders',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/files/browser/views/explorerView',
                 'collapseExplorerFolders',
                 "Collapse Folders in Explorer"
-            )), original: 'Collapse Folders in Explorer' },
+            )),
             f1: true,
             icon: Codicon.collapseAll,
             menu: {

package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js

@@ -880,7 +880,7 @@ let FileDragAndDrop = class FileDragAndDrop {
             if (compressedTarget) {
                 const iconLabelName = getIconLabelNameFromHTMLElement(originalEvent.target);
                 if (iconLabelName && iconLabelName.index < iconLabelName.count - 1) {
-                    const result = this.handleDragOver(data, compressedTarget, targetIndex, originalEvent);
+                    const result = this.handleDragOver(data, compressedTarget, targetIndex, targetSector, originalEvent);
                     if (result) {
                         if (iconLabelName.element !== this.compressedDragOverElement) {
                             this.compressedDragOverElement = iconLabelName.element;
@@ -899,9 +899,9 @@ let FileDragAndDrop = class FileDragAndDrop {
             }
         }
         this.compressedDropTargetDisposable.dispose();
-        return this.handleDragOver(data, target, targetIndex, originalEvent);
+        return this.handleDragOver(data, target, targetIndex, targetSector, originalEvent);
     }
-    handleDragOver(data, target, targetIndex, originalEvent) {
+    handleDragOver(data, target, targetIndex, targetSector, originalEvent) {
         const isCopy = originalEvent && ((originalEvent.ctrlKey && !isMacintosh) || (originalEvent.altKey && isMacintosh));
         const isNative = data instanceof NativeDragAndDropData;
         const effectType = (isNative || isCopy) ? 0  : 1 ;
@@ -916,10 +916,14 @@ let FileDragAndDrop = class FileDragAndDrop {
         }
         else {
             const items = FileDragAndDrop_1.getStatsFromDragAndDropData(data);
+            const isRootsReorder = items.every(item => item.isRoot);
             if (!target) {
                 if (!isCopy && items.every(i => !!i.parent && i.parent.isRoot)) {
                     return false;
                 }
+                if (isRootsReorder) {
+                    return { accept: true, effect: { type: 1 , position: "drop-target-after"  } };
+                }
                 return { accept: true, bubble: 0 , effect, autoExpand: false };
             }
             if (!Array.isArray(items)) {
@@ -929,15 +933,12 @@ let FileDragAndDrop = class FileDragAndDrop {
                 return false;
             }
             if (( items.some((source) => {
-                if (source.isRoot && target instanceof ExplorerItem && !target.isRoot) {
-                    return true;
+                if (source.isRoot) {
+                    return false;
                 }
                 if (this.uriIdentityService.extUri.isEqual(source.resource, target.resource)) {
                     return true;
                 }
-                if (source.isRoot && target instanceof ExplorerItem && target.isRoot) {
-                    return false;
-                }
                 if (!isCopy && this.uriIdentityService.extUri.isEqual(dirname(source.resource), target.resource)) {
                     return true;
                 }
@@ -948,6 +949,23 @@ let FileDragAndDrop = class FileDragAndDrop {
             }))) {
                 return false;
             }
+            if (isRootsReorder) {
+                if (!target.isRoot) {
+                    return false;
+                }
+                let dropEffectPosition = undefined;
+                switch (targetSector) {
+                    case 0 :
+                    case 1 :
+                        dropEffectPosition = "drop-target-before" ;
+                        break;
+                    case 2 :
+                    case 3 :
+                        dropEffectPosition = "drop-target-after" ;
+                        break;
+                }
+                return { accept: true, effect: { type: 1 , position: dropEffectPosition } };
+            }
         }
         if (!target) {
             return { accept: true, bubble: 0 , effect };
@@ -998,6 +1016,7 @@ let FileDragAndDrop = class FileDragAndDrop {
         }
         if (!target) {
             target = this.explorerService.roots[this.explorerService.roots.length - 1];
+            targetSector = 3 ;
         }
         if (!target.isDirectory && target.parent) {
             target = target.parent;
@@ -1021,14 +1040,14 @@ let FileDragAndDrop = class FileDragAndDrop {
                 }
             }
             else {
-                await this.handleExplorerDrop(data, resolvedTarget, originalEvent);
+                await this.handleExplorerDrop(data, resolvedTarget, targetIndex, targetSector, originalEvent);
             }
         }
         catch (error) {
             this.dialogService.error(toErrorMessage(error));
         }
     }
-    async handleExplorerDrop(data, target, originalEvent) {
+    async handleExplorerDrop(data, target, targetIndex, targetSector, originalEvent) {
         const elementsData = FileDragAndDrop_1.getStatsFromDragAndDropData(data);
         const distinctItems = ( new Map(( elementsData.map(element => [element, this.isCollapsed(element)]))));
         for (const [item, collapsed] of distinctItems) {
@@ -1094,19 +1113,20 @@ let FileDragAndDrop = class FileDragAndDrop {
                 await this.configurationService.updateValue(FileDragAndDrop_1.CONFIRM_DND_SETTING_KEY, false);
             }
         }
-        await this.doHandleRootDrop(items.filter(s => s.isRoot), target);
+        await this.doHandleRootDrop(items.filter(s => s.isRoot), target, targetSector);
         const sources = items.filter(s => !s.isRoot);
         if (isCopy) {
             return this.doHandleExplorerDropOnCopy(sources, target);
         }
         return this.doHandleExplorerDropOnMove(sources, target);
     }
-    async doHandleRootDrop(roots, target) {
+    async doHandleRootDrop(roots, target, targetSector) {
         if (roots.length === 0) {
             return;
         }
         const folders = this.contextService.getWorkspace().folders;
         let targetIndex;
+        const sourceIndices = [];
         const workspaceCreationData = [];
         const rootsToMove = [];
         for (let index = 0; index < folders.length; index++) {
@@ -1117,6 +1137,12 @@ let FileDragAndDrop = class FileDragAndDrop {
             if (target instanceof ExplorerItem && this.uriIdentityService.extUri.isEqual(folders[index].uri, target.resource)) {
                 targetIndex = index;
             }
+            for (const root of roots) {
+                if (this.uriIdentityService.extUri.isEqual(folders[index].uri, root.resource)) {
+                    sourceIndices.push(index);
+                    break;
+                }
+            }
             if (roots.every(r => ( r.resource.toString()) !== ( folders[index].uri.toString()))) {
                 workspaceCreationData.push(data);
             }
@@ -1127,6 +1153,19 @@ let FileDragAndDrop = class FileDragAndDrop {
         if (targetIndex === undefined) {
             targetIndex = workspaceCreationData.length;
         }
+        else {
+            switch (targetSector) {
+                case 3 :
+                case 2 :
+                    targetIndex++;
+                    break;
+            }
+            for (const sourceIndex of sourceIndices) {
+                if (sourceIndex < targetIndex) {
+                    targetIndex--;
+                }
+            }
+        }
         workspaceCreationData.splice(targetIndex, 0, ...rootsToMove);
         return this.workspaceEditingService.updateFolders(0, workspaceCreationData.length, workspaceCreationData);
     }

package/vscode/src/vs/workbench/contrib/files/browser/views/media/openeditors.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".pane-header .open-editors-dirty-count-container{align-items:center;display:flex;min-width:fit-content}.pane-header .open-editors-dirty-count-container>.dirty-count.monaco-count-badge.hidden,.pane.horizontal:not(.expanded) .pane-header .open-editors-dirty-count-container>.dirty-count.monaco-count-badge{display:none}.pane-header .open-editors-dirty-count-container>.dirty-count.monaco-count-badge{margin-left:6px;min-height:auto;padding:2px 4px}.open-editors .monaco-list .monaco-list-row.dirty>.monaco-action-bar,.open-editors .monaco-list .monaco-list-row.focused>.monaco-action-bar,.open-editors .monaco-list .monaco-list-row.sticky>.monaco-action-bar,.open-editors .monaco-list .monaco-list-row:hover>.monaco-action-bar{visibility:visible}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .action-label{display:block;padding:2px}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .codicon{color:inherit}.open-editors .monaco-list .monaco-list-row.dirty:not(:hover)>.monaco-action-bar .codicon-pinned:before{content:\"\\ebb2\"}.open-editors .monaco-list .monaco-list-row.dirty:not(:hover)>.monaco-action-bar .codicon-close:before{content:\"\\ea71\"}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .action-close-all-files,.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .save-all{height:22px;width:23px}.open-editors .monaco-list .monaco-list-row>.editor-group,.open-editors .monaco-list .monaco-list-row>.open-editor{flex:1}.open-editors .monaco-list .monaco-list-row{display:flex;padding-left:22px}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar{align-items:center;display:flex;visibility:hidden}.open-editors .monaco-list .monaco-list-row .editor-group{cursor:default;font-size:11px;font-weight:700;text-transform:uppercase}.composite:lang(ja) .open-editors .monaco-list .monaco-list-row .editor-group,.composite:lang(ko) .open-editors .monaco-list .monaco-list-row .editor-group,.composite:lang(zh-Hans) .open-editors .monaco-list .monaco-list-row .editor-group,.composite:lang(zh-Hant) .open-editors .monaco-list .monaco-list-row .editor-group{font-weight:400}.open-editors .editor-group,.open-editors .open-editor{height:22px;line-height:22px}.open-editors .editor-group,.open-editors .open-editor>a{overflow:hidden;text-overflow:ellipsis}.monaco-workbench.hc-black .open-editors .editor-group,.monaco-workbench.hc-black .open-editors .open-editor,.monaco-workbench.hc-light .open-editors .editor-group,.monaco-workbench.hc-light .open-editors .open-editor{line-height:20px}";
+var css = ".pane-header .open-editors-dirty-count-container{align-items:center;display:flex;min-width:fit-content}.pane-header .open-editors-dirty-count-container>.dirty-count.monaco-count-badge.hidden,.pane.horizontal:not(.expanded) .pane-header .open-editors-dirty-count-container>.dirty-count.monaco-count-badge{display:none}.pane-header .open-editors-dirty-count-container>.dirty-count.monaco-count-badge{margin-left:6px;min-height:auto;padding:2px 4px}.open-editors .monaco-list .monaco-list-row.dirty>.monaco-action-bar,.open-editors .monaco-list .monaco-list-row.focused>.monaco-action-bar,.open-editors .monaco-list .monaco-list-row.sticky>.monaco-action-bar,.open-editors .monaco-list .monaco-list-row:hover>.monaco-action-bar{visibility:visible}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .action-label{display:block;padding:2px}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .codicon{color:inherit}.open-editors .monaco-list .monaco-list-row.dirty:not(:hover)>.monaco-action-bar .codicon-pinned:before{content:\"\\ebb2\";font-family:codicon}.open-editors .monaco-list .monaco-list-row.dirty:not(:hover)>.monaco-action-bar .codicon-close:before{content:\"\\ea71\";font-family:codicon}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .action-close-all-files,.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .save-all{height:22px;width:23px}.open-editors .monaco-list .monaco-list-row>.editor-group,.open-editors .monaco-list .monaco-list-row>.open-editor{flex:1}.open-editors .monaco-list .monaco-list-row{display:flex;padding-left:22px}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar{align-items:center;display:flex;visibility:hidden}.open-editors .monaco-list .monaco-list-row .editor-group{cursor:default;font-size:11px;font-weight:700;text-transform:uppercase}.composite:lang(ja) .open-editors .monaco-list .monaco-list-row .editor-group,.composite:lang(ko) .open-editors .monaco-list .monaco-list-row .editor-group,.composite:lang(zh-Hans) .open-editors .monaco-list .monaco-list-row .editor-group,.composite:lang(zh-Hant) .open-editors .monaco-list .monaco-list-row .editor-group{font-weight:400}.open-editors .editor-group,.open-editors .open-editor{height:22px;line-height:22px}.open-editors .editor-group,.open-editors .open-editor>a{overflow:hidden;text-overflow:ellipsis}.monaco-workbench.hc-black .open-editors .editor-group,.monaco-workbench.hc-black .open-editors .open-editor,.monaco-workbench.hc-light .open-editors .editor-group,.monaco-workbench.hc-light .open-editors .open-editor{line-height:20px}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js

@@ -146,6 +146,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
         if (this.listLabels) {
             this.listLabels.clear();
         }
+        this.dnd = ( new OpenEditorsDragAndDrop(this.sortOrder, this.instantiationService, this.editorGroupService));
         this.listLabels = this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility });
         this.list = this.instantiationService.createInstance(WorkbenchList, 'OpenEditors', container, delegate, [
             ( new EditorGroupRenderer(this.keybindingService, this.instantiationService)),
@@ -157,7 +158,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
             ))
         ], {
             identityProvider: { getId: (element) => element instanceof OpenEditor ? element.getId() : ( element.id.toString()) },
-            dnd: ( new OpenEditorsDragAndDrop(this.instantiationService, this.editorGroupService)),
+            dnd: this.dnd,
             overrideStyles: {
                 listBackground: this.getBackgroundColor()
             },
@@ -374,6 +375,9 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
         }
         if (event.affectsConfiguration('explorer.decorations') || event.affectsConfiguration('explorer.openEditors.sortOrder')) {
             this.sortOrder = this.configurationService.getValue('explorer.openEditors.sortOrder');
+            if (this.dnd) {
+                this.dnd.sortOrder = this.sortOrder;
+            }
             this.listRefreshScheduler?.schedule();
         }
     }
@@ -557,9 +561,13 @@ class OpenEditorRenderer {
     }
 }
 class OpenEditorsDragAndDrop {
-    constructor(instantiationService, editorGroupService) {
+    set sortOrder(value) {
+        this._sortOrder = value;
+    }
+    constructor(sortOrder, instantiationService, editorGroupService) {
         this.instantiationService = instantiationService;
         this.editorGroupService = editorGroupService;
+        this._sortOrder = sortOrder;
     }
     get dropHandler() {
         return this.instantiationService.createInstance(ResourcesDropHandler, { allowWorkspaceOpen: false });
@@ -600,6 +608,14 @@ class OpenEditorsDragAndDrop {
                 return false;
             }
         }
+        if (this._sortOrder !== 'editorOrder') {
+            if (data instanceof ElementsDragAndDropData) {
+                return false;
+            }
+            else {
+                return { accept: true, effect: { type: 1  }, feedback: [-1] };
+            }
+        }
         let dropEffectPosition = undefined;
         switch (targetSector) {
             case 0 :
@@ -671,11 +687,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleEditorGroupLayout',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/files/browser/views/openEditorsView',
                 'flipLayout',
                 "Toggle Vertical/Horizontal Editor Layout"
-            )), original: 'Toggle Vertical/Horizontal Editor Layout' },
+            )),
             f1: true,
             keybinding: {
                 primary: 1024  | 512  | 21 ,
@@ -702,8 +718,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: toggleEditorGroupLayoutId,
         title: {
-            original: 'Flip Layout',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/contrib/files/browser/views/openEditorsView',
                 'miToggleEditorLayoutWithoutMnemonic',
                 "Flip Layout"
@@ -721,7 +736,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.files.saveAll',
-            title: { value: SAVE_ALL_LABEL, original: 'Save All' },
+            title: SAVE_ALL_LABEL,
             f1: true,
             icon: Codicon.saveAll,
             menu: {
@@ -762,11 +777,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'openEditors.newUntitledFile',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/files/browser/views/openEditorsView',
                 'newUntitledFile',
                 "New Untitled Text File"
-            )), original: 'New Untitled Text File' },
+            )),
             f1: false,
             icon: Codicon.newFile,
             menu: {

package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.js

@@ -85,7 +85,7 @@ let WorkspaceWatcher = class WorkspaceWatcher extends Disposable {
         const config = this.configurationService.getValue({ resource: workspace.uri });
         if (config.files?.watcherExclude) {
             for (const key in config.files.watcherExclude) {
-                if (config.files.watcherExclude[key] === true) {
+                if (key && config.files.watcherExclude[key] === true) {
                     excludes.push(key);
                 }
             }

package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js

@@ -7,6 +7,7 @@ import { NumberBadge, IActivityService } from '../../../services/activity/common
 import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
 let DirtyFilesIndicator = class DirtyFilesIndicator extends Disposable {
+    static { this.ID = 'workbench.contrib.dirtyFilesIndicator'; }
     constructor(lifecycleService, activityService, workingCopyService, filesConfigurationService) {
         super();
         this.lifecycleService = lifecycleService;

package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js

@@ -6,9 +6,9 @@ import { registerEditorContribution, EditorAction2 } from '../../../../editor/br
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { asCommandLink } from '../../../../editor/contrib/inlayHints/browser/inlayHints.js';
 import { InlayHintsController } from '../../../../editor/contrib/inlayHints/browser/inlayHintsController.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
-import { AudioCue, IAudioCueService } from '../../../../platform/audioCues/browser/audioCueService.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { RawContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { Link } from '../../../../platform/opener/browser/link.js';
@@ -28,9 +28,9 @@ let InlayHintsAccessibility = class InlayHintsAccessibility {
     static get(editor) {
         return editor.getContribution(InlayHintsAccessibility_1.ID) ?? undefined;
     }
-    constructor(_editor, contextKeyService, _audioCueService, _instaService) {
+    constructor(_editor, contextKeyService, _accessibilitySignalService, _instaService) {
         this._editor = _editor;
-        this._audioCueService = _audioCueService;
+        this._accessibilitySignalService = _accessibilitySignalService;
         this._instaService = _instaService;
         this._sessionDispoosables = ( new DisposableStore());
         this._ariaElement = document.createElement('span');
@@ -121,7 +121,7 @@ let InlayHintsAccessibility = class InlayHintsAccessibility {
         const line = this._editor.getPosition().lineNumber;
         const hints = InlayHintsController.get(this._editor)?.getInlayHintsForLine(line);
         if (!hints || hints.length === 0) {
-            this._audioCueService.playAudioCue(AudioCue.noInlayHints);
+            this._accessibilitySignalService.playSignal(AccessibilitySignal.noInlayHints);
         }
         else {
             this._read(line, hints);
@@ -134,21 +134,18 @@ let InlayHintsAccessibility = class InlayHintsAccessibility {
 };
 InlayHintsAccessibility = InlayHintsAccessibility_1 = ( __decorate([
     ( __param(1, IContextKeyService)),
-    ( __param(2, IAudioCueService)),
+    ( __param(2, IAccessibilitySignalService)),
     ( __param(3, IInstantiationService))
 ], InlayHintsAccessibility));
 registerAction2(class StartReadHints extends EditorAction2 {
     constructor() {
         super({
             id: 'inlayHints.startReadingLineWithHint',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty',
-                    'read.title',
-                    'Read Line With Inline Hints'
-                )),
-                original: 'Read Line With Inline Hints'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty',
+                'read.title',
+                "Read Line With Inline Hints"
+            )),
             precondition: EditorContextKeys.hasInlayHintsProvider,
             f1: true
         });
@@ -162,14 +159,11 @@ registerAction2(class StopReadHints extends EditorAction2 {
     constructor() {
         super({
             id: 'inlayHints.stopReadingLineWithHint',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty',
-                    'stop.title',
-                    'Stop Inlay Hints Reading'
-                )),
-                original: 'Stop Inlay Hints Reading'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty',
+                'stop.title',
+                "Stop Inlay Hints Reading"
+            )),
             precondition: InlayHintsAccessibility.IsReading,
             f1: true,
             keybinding: {

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .zone-widget.inline-chat-widget{z-index:3}.monaco-editor .zone-widget-container.inside-selection{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-editor .inline-chat{background:var(--vscode-inlineChat-background);border:1px solid var(--vscode-inlineChat-border);border-radius:6px;box-shadow:0 4px 8px var(--vscode-inlineChat-shadow);color:inherit;margin-top:6px;padding:6px}.monaco-editor .inline-chat .body{display:flex}.monaco-editor .inline-chat .body .content{border-radius:2px;box-sizing:border-box;display:flex;outline:1px solid var(--vscode-inlineChatInput-border);outline-offset:-1px}.monaco-editor .inline-chat .body .content.synthetic-focus{outline:1px solid var(--vscode-inlineChatInput-focusBorder)}.monaco-editor .inline-chat .body .content .input{align-items:center;cursor:text;display:flex;justify-content:space-between;padding:2px 2px 2px 6px}.monaco-editor .inline-chat .body .content .input,.monaco-editor .inline-chat .body .content .input .monaco-editor-background{background-color:var(--vscode-inlineChatInput-background)}.monaco-editor .inline-chat .body .content .input .editor-placeholder{color:var(--vscode-inlineChatInput-placeholderForeground);overflow:hidden;position:absolute;text-overflow:ellipsis;white-space:nowrap;z-index:1}.monaco-editor .inline-chat .body .content .input .editor-placeholder.hidden{display:none}.monaco-editor .inline-chat .body .content .input .editor-container{vertical-align:middle}.monaco-editor .inline-chat .body .toolbar{align-self:stretch;background:var(--vscode-inlineChatInput-background);border-bottom-right-radius:2px;border-top-right-radius:2px;display:flex;flex-direction:column;padding-right:4px}.monaco-editor .inline-chat .body .toolbar .actions-container{display:flex;flex-direction:row;gap:4px}.monaco-editor .inline-chat .body>.widget-toolbar{padding-left:4px}.monaco-editor .inline-chat .progress{left:19px;position:relative;width:calc(100% - 18px)}.monaco-workbench .part.editor>.content .monaco-editor .inline-chat .progress .monaco-progress-container{top:0}.monaco-editor .inline-chat .status{align-items:center;display:flex;justify-content:space-between;margin-top:4px}.monaco-editor .inline-chat .status.actions{margin-top:4px}.monaco-editor .inline-chat .status .actions.hidden{display:none}.monaco-editor .inline-chat .status .label{align-self:baseline;color:var(--vscode-descriptionForeground);display:inline-flex;font-size:11px;overflow:hidden}.monaco-editor .inline-chat .status .label.hidden{display:none}.monaco-editor .inline-chat .status .label.info{margin-right:auto;padding-left:2px}.monaco-editor .inline-chat .status .label.info>.codicon{font-size:12px;line-height:18px;padding:0 5px}.monaco-editor .inline-chat .status .label.status{margin-left:auto;padding-left:10px;padding-right:4px}.monaco-editor .inline-chat .status .label .slash-command-pill CODE{background-color:var(--vscode-chat-slashCommandBackground);border-radius:3px;color:var(--vscode-chat-slashCommandForeground);padding:0 1px}.monaco-editor .inline-chat .detectedIntent{color:var(--vscode-descriptionForeground);padding:5px 0 5px 5px}.monaco-editor .inline-chat .detectedIntent.hidden{display:none}.monaco-editor .inline-chat .detectedIntent .slash-command-pill CODE{background-color:var(--vscode-chat-slashCommandBackground);border-radius:3px;color:var(--vscode-chat-slashCommandForeground);padding:0 1px}.monaco-editor .inline-chat .detectedIntent .slash-command-pill a{color:var(--vscode-textLink-foreground);cursor:pointer}.monaco-editor .inline-chat .chatMessage .chatMessageContent .value{-webkit-line-clamp:none;-webkit-box-orient:vertical;display:-webkit-box;overflow:hidden;-webkit-user-select:text;user-select:text}.monaco-editor .inline-chat .chatMessage .chatMessageContent[state=cropped] .value{-webkit-line-clamp:var(--vscode-inline-chat-cropped,3)}.monaco-editor .inline-chat .chatMessage .chatMessageContent[state=expanded] .value{-webkit-line-clamp:var(--vscode-inline-chat-expanded,10)}.monaco-editor .inline-chat .followUps{padding:5px}.monaco-editor .inline-chat .followUps .interactive-session-followups .monaco-button{color:var(--vscode-textLink-foreground);display:block;font-size:12px}.monaco-editor .inline-chat .followUps.hidden{display:none}.monaco-editor .inline-chat .chatMessage{padding:8px 3px}.monaco-editor .inline-chat .chatMessage .chatMessageContent{padding:2px}.monaco-editor .inline-chat .chatMessage.hidden{display:none}.monaco-editor .inline-chat .status .label A{color:var(--vscode-textLink-foreground);cursor:pointer}.monaco-editor .inline-chat .status .label.error{color:var(--vscode-errorForeground)}.monaco-editor .inline-chat .status .label.warn{color:var(--vscode-editorWarning-foreground)}.monaco-editor .inline-chat .status .actions{display:flex}.monaco-editor .inline-chat .status .actions>.monaco-button,.monaco-editor .inline-chat .status .actions>.monaco-button-dropdown{margin-right:6px}.monaco-editor .inline-chat .status .actions>.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.monaco-editor .inline-chat .status .actions>.monaco-button.codicon{display:flex}.monaco-editor .inline-chat .status .actions>.monaco-button.codicon:before{align-self:center}.monaco-editor .inline-chat .status .actions .monaco-text-button{padding:2px 4px;white-space:nowrap}.monaco-editor .inline-chat .status .monaco-toolbar .action-item{padding:0 2px}.monaco-editor .inline-chat .status .monaco-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-editor .inline-chat .status .monaco-toolbar .action-item.button-item .action-label:is(:hover,:focus){background-color:var(--vscode-button-hoverBackground)}.monaco-editor .inline-chat .preview{display:none}.monaco-editor .inline-chat .previewCreate,.monaco-editor .inline-chat .previewDiff{border:1px solid var(--vscode-inlineChat-border);border-radius:2px;display:inherit;margin:6px 0}.monaco-editor .inline-chat .previewCreateTitle{padding-top:6px}.monaco-editor .inline-chat .previewCreate.hidden,.monaco-editor .inline-chat .previewCreateTitle.hidden,.monaco-editor .inline-chat .previewDiff.hidden{display:none}.monaco-editor .inline-chat-toolbar{display:flex}.monaco-editor .inline-chat-toolbar>.monaco-button{margin-right:6px}.monaco-editor .inline-chat-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-editor .inline-chat-inserted-range{background-color:var(--vscode-inlineChatDiff-inserted)}.monaco-editor .inline-chat-inserted-range-linehighlight{background-color:var(--vscode-diffEditor-insertedLineBackground)}.monaco-editor .inline-chat-original-zone2{background-color:var(--vscode-diffEditor-removedLineBackground);opacity:.8}.monaco-editor .inline-chat-lines-inserted-range{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-editor .inline-chat-block-selection{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-editor .inline-chat-slash-command{opacity:0}.monaco-editor .inline-chat-slash-command-detail{opacity:.5}.monaco-editor .inline-chat-diff-widget .monaco-diff-editor .monaco-editor .margin-view-overlays,.monaco-editor .inline-chat-diff-widget .monaco-diff-editor .monaco-editor-background,.monaco-editor .inline-chat-newfile-widget{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-editor .inline-chat-newfile-widget .title{align-items:center;display:flex;justify-content:space-between}.monaco-editor .inline-chat-newfile-widget .title .detail{margin-left:4px}.monaco-editor .inline-chat-newfile-widget .buttonbar-widget{display:flex;margin-left:auto;margin-right:8px}.monaco-editor .inline-chat-newfile-widget .buttonbar-widget>.monaco-button{display:inline-flex;margin-left:4px;white-space:nowrap}.monaco-editor .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque,.monaco-editor .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{cursor:pointer;display:block;transition:opacity .2s ease-in-out}.monaco-editor .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque{opacity:.5}.monaco-editor .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{opacity:0}.monaco-editor .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque:hover,.monaco-editor .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent:hover{opacity:1}";
+var css = ".monaco-editor .zone-widget.inline-chat-widget{z-index:3}.monaco-editor .zone-widget-container.inside-selection{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-editor .inline-chat{background:var(--vscode-inlineChat-background);border:1px solid var(--vscode-inlineChat-border);border-radius:6px;box-shadow:0 4px 8px var(--vscode-inlineChat-shadow);color:inherit;margin-top:6px;padding:6px}.monaco-editor .inline-chat .body{display:flex}.monaco-editor .inline-chat .body .content{border-radius:2px;box-sizing:border-box;display:flex;outline:1px solid var(--vscode-inlineChatInput-border);outline-offset:-1px}.monaco-editor .inline-chat .body .content.synthetic-focus{outline:1px solid var(--vscode-inlineChatInput-focusBorder)}.monaco-editor .inline-chat .body .content .input{align-items:center;cursor:text;display:flex;justify-content:space-between;padding:2px 2px 2px 6px}.monaco-editor .inline-chat .body .content .input,.monaco-editor .inline-chat .body .content .input .monaco-editor-background{background-color:var(--vscode-inlineChatInput-background)}.monaco-editor .inline-chat .body .content .input .editor-placeholder{color:var(--vscode-inlineChatInput-placeholderForeground);overflow:hidden;position:absolute;text-overflow:ellipsis;white-space:nowrap;z-index:1}.monaco-editor .inline-chat .body .content .input .editor-placeholder.hidden{display:none}.monaco-editor .inline-chat .body .content .input .editor-container{vertical-align:middle}.monaco-editor .inline-chat .body .toolbar{align-self:stretch;background:var(--vscode-inlineChatInput-background);border-bottom-right-radius:2px;border-top-right-radius:2px;display:flex;flex-direction:column;padding-right:4px}.monaco-editor .inline-chat .body .toolbar .actions-container{display:flex;flex-direction:row;gap:4px}.monaco-editor .inline-chat .body>.widget-toolbar{padding-left:4px}.monaco-editor .inline-chat .progress{left:19px;position:relative;width:calc(100% - 18px)}.monaco-workbench .part.editor>.content .monaco-editor .inline-chat .progress .monaco-progress-container{top:0}.monaco-editor .inline-chat .status{align-items:center;display:flex;justify-content:space-between;margin-top:4px}.monaco-editor .inline-chat .status.actions{margin-top:4px}.monaco-editor .inline-chat .status .actions.hidden{display:none}.monaco-editor .inline-chat .status .label{align-self:baseline;color:var(--vscode-descriptionForeground);display:inline-flex;font-size:11px;overflow:hidden}.monaco-editor .inline-chat .status .label.hidden{display:none}.monaco-editor .inline-chat .status .label.info{margin-right:auto;padding-left:2px}.monaco-editor .inline-chat .status .label.info>.codicon{font-size:12px;line-height:18px;padding:0 5px}.monaco-editor .inline-chat .status .label.status{margin-left:auto;padding-left:10px;padding-right:4px}.monaco-editor .inline-chat .status .label .slash-command-pill CODE{background-color:var(--vscode-chat-slashCommandBackground);border-radius:3px;color:var(--vscode-chat-slashCommandForeground);padding:0 1px}.monaco-editor .inline-chat .detectedIntent{color:var(--vscode-descriptionForeground);padding:5px 0 5px 5px}.monaco-editor .inline-chat .detectedIntent.hidden{display:none}.monaco-editor .inline-chat .detectedIntent .slash-command-pill CODE{background-color:var(--vscode-chat-slashCommandBackground);border-radius:3px;color:var(--vscode-chat-slashCommandForeground);padding:0 1px}.monaco-editor .inline-chat .detectedIntent .slash-command-pill a{color:var(--vscode-textLink-foreground);cursor:pointer}.monaco-editor .inline-chat .chatMessage .chatMessageContent .value{-webkit-line-clamp:none;-webkit-box-orient:vertical;display:-webkit-box;overflow:hidden;-webkit-user-select:text;user-select:text}.monaco-editor .inline-chat .chatMessage .chatMessageContent[state=cropped] .value{-webkit-line-clamp:var(--vscode-inline-chat-cropped,3)}.monaco-editor .inline-chat .chatMessage .chatMessageContent[state=expanded] .value{-webkit-line-clamp:var(--vscode-inline-chat-expanded,10)}.monaco-editor .inline-chat .followUps{padding:5px}.monaco-editor .inline-chat .followUps .interactive-session-followups .monaco-button{color:var(--vscode-textLink-foreground);display:block;font-size:12px}.monaco-editor .inline-chat .followUps.hidden{display:none}.monaco-editor .inline-chat .chatMessage{padding:8px 3px}.monaco-editor .inline-chat .chatMessage .chatMessageContent{padding:2px}.monaco-editor .inline-chat .chatMessage.hidden{display:none}.monaco-editor .inline-chat .status .label A{color:var(--vscode-textLink-foreground);cursor:pointer}.monaco-editor .inline-chat .status .label.error{color:var(--vscode-errorForeground)}.monaco-editor .inline-chat .status .label.warn{color:var(--vscode-editorWarning-foreground)}.monaco-editor .inline-chat .status .actions{display:flex}.monaco-editor .inline-chat .status .actions>.monaco-button,.monaco-editor .inline-chat .status .actions>.monaco-button-dropdown{margin-right:6px}.monaco-editor .inline-chat .status .actions>.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.monaco-editor .inline-chat .status .actions>.monaco-button.codicon{display:flex}.monaco-editor .inline-chat .status .actions>.monaco-button.codicon:before{align-self:center}.monaco-editor .inline-chat .status .actions .monaco-text-button{padding:2px 4px;white-space:nowrap}.monaco-editor .inline-chat .status .monaco-toolbar .action-item{padding:0 2px}.monaco-editor .inline-chat .status .monaco-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-editor .inline-chat .status .monaco-toolbar .action-item.button-item .action-label:is(:hover,:focus){background-color:var(--vscode-button-hoverBackground)}.monaco-editor .inline-chat .preview{display:none}.monaco-editor .inline-chat .previewCreate,.monaco-editor .inline-chat .previewDiff{border:1px solid var(--vscode-inlineChat-border);border-radius:2px;display:inherit;margin:6px 0}.monaco-editor .inline-chat .previewCreateTitle{padding-top:6px}.monaco-editor .inline-chat .diff-review.hidden,.monaco-editor .inline-chat .previewCreate.hidden,.monaco-editor .inline-chat .previewCreateTitle.hidden,.monaco-editor .inline-chat .previewDiff.hidden{display:none}.monaco-editor .inline-chat-toolbar{display:flex}.monaco-editor .inline-chat-toolbar>.monaco-button{margin-right:6px}.monaco-editor .inline-chat-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-editor .inline-chat-inserted-range{background-color:var(--vscode-inlineChatDiff-inserted)}.monaco-editor .inline-chat-inserted-range-linehighlight{background-color:var(--vscode-diffEditor-insertedLineBackground)}.monaco-editor .inline-chat-original-zone2{background-color:var(--vscode-diffEditor-removedLineBackground);opacity:.8}.monaco-editor .inline-chat-lines-inserted-range{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-editor .inline-chat-block-selection{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-editor .inline-chat-slash-command{opacity:0}.monaco-editor .inline-chat-slash-command-detail{opacity:.5}.monaco-editor .inline-chat-diff-widget .monaco-diff-editor .monaco-editor .margin-view-overlays,.monaco-editor .inline-chat-diff-widget .monaco-diff-editor .monaco-editor-background,.monaco-editor .inline-chat-newfile-widget{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-editor .inline-chat-newfile-widget .title{align-items:center;display:flex;justify-content:space-between}.monaco-editor .inline-chat-newfile-widget .title .detail{margin-left:4px}.monaco-editor .inline-chat-newfile-widget .buttonbar-widget{display:flex;margin-left:auto;margin-right:8px}.monaco-editor .inline-chat-newfile-widget .buttonbar-widget>.monaco-button{display:inline-flex;margin-left:4px;white-space:nowrap}.monaco-editor .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque,.monaco-editor .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{cursor:pointer;display:block;transition:opacity .2s ease-in-out}.monaco-editor .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque{opacity:.5}.monaco-editor .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{opacity:0}.monaco-editor .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque:hover,.monaco-editor .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent:hover{opacity:1}";
 n(css,{});
 export { css, css as default };