@codingame/monaco-vscode-api 3.2.3 → 4.0.0

package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js

@@ -77,7 +77,7 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
             this.messages.delete(resource);
         }
     }
-    onSaveError(error, model) {
+    onSaveError(error, model, options) {
         const fileOperationError = error;
         const resource = model.resource;
         let message;
@@ -100,7 +100,7 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
                     basename(resource)
                 ));
                 primaryActions.push(this.instantiationService.createInstance(ResolveSaveConflictAction, model));
-                primaryActions.push(this.instantiationService.createInstance(SaveModelIgnoreModifiedSinceAction, model));
+                primaryActions.push(this.instantiationService.createInstance(SaveModelIgnoreModifiedSinceAction, model, options));
                 secondaryActions.push(this.instantiationService.createInstance(ConfigureSaveConflictAction));
             }
         }
@@ -110,13 +110,13 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
             const isPermissionDenied = fileOperationError.fileOperationResult === 6 ;
             const canSaveElevated = resource.scheme === Schemas.file;
             if (canSaveElevated && (isPermissionDenied || triedToUnlock)) {
-                primaryActions.push(this.instantiationService.createInstance(SaveModelElevatedAction, model, !!triedToUnlock));
+                primaryActions.push(this.instantiationService.createInstance(SaveModelElevatedAction, model, options, !!triedToUnlock));
             }
             else if (isWriteLocked) {
-                primaryActions.push(this.instantiationService.createInstance(UnlockModelAction, model));
+                primaryActions.push(this.instantiationService.createInstance(UnlockModelAction, model, options));
             }
             else {
-                primaryActions.push(this.instantiationService.createInstance(RetrySaveModelAction, model));
+                primaryActions.push(this.instantiationService.createInstance(RetrySaveModelAction, model, options));
             }
             primaryActions.push(this.instantiationService.createInstance(SaveModelAsAction, model));
             primaryActions.push(this.instantiationService.createInstance(DiscardModelAction, model));
@@ -276,7 +276,7 @@ ResolveSaveConflictAction = ( __decorate([
     ( __param(4, IProductService))
 ], ResolveSaveConflictAction));
 class SaveModelElevatedAction extends Action {
-    constructor(model, triedToUnlock) {
+    constructor(model, options, triedToUnlock) {
         super('workbench.files.action.saveModelElevated', triedToUnlock ? isWindows ? ( localizeWithPath(
             'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
             'overwriteElevated',
@@ -295,11 +295,13 @@ class SaveModelElevatedAction extends Action {
             "Retry as Sudo..."
         )));
         this.model = model;
+        this.options = options;
         this.triedToUnlock = triedToUnlock;
     }
     async run() {
         if (!this.model.isDisposed()) {
             await this.model.save({
+                ...this.options,
                 writeElevated: true,
                 writeUnlock: this.triedToUnlock,
                 reason: 1
@@ -308,17 +310,18 @@ class SaveModelElevatedAction extends Action {
     }
 }
 class RetrySaveModelAction extends Action {
-    constructor(model) {
+    constructor(model, options) {
         super('workbench.files.action.saveModel', ( localizeWithPath(
             'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
             'retry',
             "Retry"
         )));
         this.model = model;
+        this.options = options;
     }
     async run() {
         if (!this.model.isDisposed()) {
-            await this.model.save({ reason: 1  });
+            await this.model.save({ ...this.options, reason: 1  });
         }
     }
 }
@@ -370,32 +373,34 @@ SaveModelAsAction = ( __decorate([
     ( __param(1, IEditorService))
 ], SaveModelAsAction));
 class UnlockModelAction extends Action {
-    constructor(model) {
+    constructor(model, options) {
         super('workbench.files.action.unlock', ( localizeWithPath(
             'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
             'overwrite',
             "Overwrite"
         )));
         this.model = model;
+        this.options = options;
     }
     async run() {
         if (!this.model.isDisposed()) {
-            await this.model.save({ writeUnlock: true, reason: 1  });
+            await this.model.save({ ...this.options, writeUnlock: true, reason: 1  });
         }
     }
 }
 class SaveModelIgnoreModifiedSinceAction extends Action {
-    constructor(model) {
+    constructor(model, options) {
         super('workbench.files.action.saveIgnoreModifiedSince', ( localizeWithPath(
             'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
             'overwrite',
             "Overwrite"
         )));
         this.model = model;
+        this.options = options;
     }
     async run() {
         if (!this.model.isDisposed()) {
-            await this.model.save({ ignoreModifiedSince: true, reason: 1  });
+            await this.model.save({ ...this.options, ignoreModifiedSince: true, reason: 1  });
         }
     }
 }

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

@@ -81,12 +81,12 @@ let ExplorerViewletViewsContribution = class ExplorerViewletViewsContribution ex
                 viewDescriptorsToRegister.push(explorerViewDescriptor);
             }
         }
-        if (viewDescriptorsToRegister.length) {
-            viewsRegistry.registerViews(viewDescriptorsToRegister, VIEW_CONTAINER);
-        }
         if (viewDescriptorsToDeregister.length) {
             viewsRegistry.deregisterViews(viewDescriptorsToDeregister, VIEW_CONTAINER);
         }
+        if (viewDescriptorsToRegister.length) {
+            viewsRegistry.registerViews(viewDescriptorsToRegister, VIEW_CONTAINER);
+        }
         mark('code/didRegisterExplorerViews');
     }
     createOpenEditorsViewDescriptor() {

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

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
+import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { OS, isWindows } from '../../../../base/common/platform.js';
-import { extname, basename, isAbsolute } from '../../../../base/common/path.js';
-import { basenameOrAuthority, joinPath, basename as basename$1, isEqualOrParent, distinctParents } from '../../../../base/common/resources.js';
+import { extname, basename as basename$1, isAbsolute } from '../../../../base/common/path.js';
+import { basename, basenameOrAuthority, joinPath, isEqualOrParent, distinctParents } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { Action } from '../../../../base/common/actions.js';
@@ -19,7 +19,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
-import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ICommandService, CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { Schemas } from '../../../../base/common/network.js';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
@@ -46,7 +46,7 @@ import { IPaneCompositePartService } from '../../../services/panecomposite/brows
 import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
 import { IPathService } from '../../../services/path/common/pathService.js';
 import { Action2 } from '../../../../platform/actions/common/actions.js';
-import { EmptyWorkspaceSupportContext, ActiveEditorContext, ActiveEditorCanToggleReadonlyContext } from '../../../common/contextkeys.js';
+import { ActiveEditorContext, EmptyWorkspaceSupportContext, ActiveEditorCanToggleReadonlyContext } from '../../../common/contextkeys.js';
 import { KeyChord } from '../../../../base/common/keyCodes.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';
@@ -448,7 +448,7 @@ function incrementFileName(name, isFolder, incrementalNaming) {
         let extSuffix = '';
         if (!isFolder) {
             extSuffix = extname(name);
-            namePrefix = basename(name, extSuffix);
+            namePrefix = basename$1(name, extSuffix);
         }
         const suffixRegex = /^(.+ copy)( \d+)?$/;
         if (suffixRegex.test(namePrefix)) {
@@ -546,7 +546,7 @@ async function askForOverwrite(fileService, dialogService, targetResource) {
             'vs/workbench/contrib/files/browser/fileActions',
             'confirmOverwrite',
             "A file or folder with the name '{0}' already exists in the destination folder. Do you want to replace it?",
-            basename(targetResource.path)
+            basename$1(targetResource.path)
         )),
         primaryButton: ( localizeWithPath(
             'vs/workbench/contrib/files/browser/fileActions',
@@ -893,7 +893,7 @@ class CompareWithClipboardAction extends Action2 {
                 const provider = instantiationService.createInstance(ClipboardContentProvider);
                 this.registrationDisposal = textModelService.registerTextModelContentProvider(scheme, provider);
             }
-            const name = basename$1(resource);
+            const name = basename(resource);
             const editorLabel = ( localizeWithPath(
                 'vs/workbench/contrib/files/browser/fileActions',
                 'clipboardComparisonLabel',
@@ -1177,7 +1177,7 @@ const pasteFileHandler = async (accessor, fileList) => {
                 'vs/workbench/contrib/files/browser/fileActions',
                 'confirmPasteNative',
                 "Are you sure you want to paste '{0}'?",
-                basename(toPaste.type === 'paths' ? toPaste.files[0].fsPath : toPaste.files[0].name)
+                basename$1(toPaste.type === 'paths' ? toPaste.files[0].fsPath : toPaste.files[0].name)
             ));
         const detail = toPaste.files.length > 1 ? getFileNamesMessage(( toPaste.files.map(item => toPaste.type === 'paths' ? item.path : item.name))) : undefined;
         const confirmation = await dialogService.confirm({

package/vscode/src/vs/workbench/contrib/files/browser/fileCommands.save.js

@@ -6,7 +6,7 @@ import { hash } from '../../../../base/common/hash.js';
 import { KeyChord } from '../../../../base/common/keyCodes.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
-import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/embeddedCodeEditorWidget.js';
+import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';

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

@@ -207,6 +207,16 @@ configurationRegistry.registerConfiguration({
             )),
             'scope': 5
         },
+        'files.trimTrailingWhitespaceInRegexAndStrings': {
+            'type': 'boolean',
+            'default': true,
+            'description': ( localizeWithPath(
+                'vs/workbench/contrib/files/browser/files.configuration.contribution',
+                'trimTrailingWhitespaceInRegexAndStrings',
+                "When enabled, trailing whitespace will be removed from multiline strings and regexes will be removed on save or when executing 'editor.action.trimTrailingWhitespace'. This can cause whitespace to not be trimmed from lines when there isn't up-to-date token information."
+            )),
+            'scope': 5
+        },
         'files.insertFinalNewline': {
             'type': 'boolean',
             'default': false,

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

@@ -8,7 +8,17 @@ import { isTemporaryWorkspace, IWorkspaceContextService } from '../../../../../p
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { ViewPane } from '../../../../browser/parts/views/viewPane.js';
 import { ResourcesDropHandler } from '../../../../browser/dnd.js';
-import { listDropOverBackground } from '../../../../../platform/theme/common/colorRegistry.js';
+import '../../../../../platform/theme/common/colorUtils.js';
+import '../../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../../platform/theme/common/colors/inputColors.js';
+import { listDropOverBackground } from '../../../../../platform/theme/common/colors/listColors.js';
+import '../../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../../platform/theme/common/colors/searchColors.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IViewDescriptorService } from '../../../../common/views.js';

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

@@ -2,7 +2,17 @@ import { __decorate, __param } from '../../../../../../../../external/tslib/tsli
 import { Emitter } from '../../../../../base/common/event.js';
 import { localizeWithPath } from '../../../../../nls.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
-import { listInvalidItemForeground, listDeemphasizedForeground } from '../../../../../platform/theme/common/colorRegistry.js';
+import '../../../../../platform/theme/common/colorUtils.js';
+import '../../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../../platform/theme/common/colors/inputColors.js';
+import { listInvalidItemForeground, listDeemphasizedForeground } from '../../../../../platform/theme/common/colors/listColors.js';
+import '../../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../../platform/theme/common/colors/searchColors.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { explorerRootErrorEmitter } from './explorerViewer.js';
 import { IExplorerService } from '../files.js';

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

@@ -175,10 +175,8 @@ let ExplorerView = class ExplorerView extends ViewPane {
         this.dragHandler = ( new DelayedDragHandler(container, () => this.setExpanded(true)));
         const titleElement = container.querySelector('.title');
         const setHeader = () => {
-            const workspace = this.contextService.getWorkspace();
-            const title = ( workspace.folders.map(folder => folder.name)).join();
             titleElement.textContent = this.name;
-            titleElement.title = title;
+            this.updateTitle(this.name);
             this.ariaHeaderLabel = ( localizeWithPath(
                 'vs/workbench/contrib/files/browser/views/explorerView',
                 'explorerSection',

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

@@ -30,7 +30,7 @@ import { IWorkspaceEditingService } from '../../../../services/workspaces/common
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { findValidPasteFileTarget } from '../fileActions.js';
 import { createMatches } from '../../../../../base/common/filters.js';
-import { EventMultiplexer, Event, Emitter } from '../../../../../base/common/event.js';
+import { Emitter, EventMultiplexer, Event } from '../../../../../base/common/event.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { isStringArray, isNumber } from '../../../../../base/common/types.js';
 import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';

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

@@ -15,12 +15,22 @@ import { OpenEditor, OpenEditorsFocusedContext, ExplorerFocusedContext } from '.
 import { CloseEditorAction, UnpinEditorAction, CloseAllEditorsAction } from '../../../../browser/parts/editor/editorActions.js';
 import { IContextKeyService, ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
-import { asCssVariable, badgeBackground, badgeForeground, contrastBorder } from '../../../../../platform/theme/common/colorRegistry.js';
+import { asCssVariable } from '../../../../../platform/theme/common/colorUtils.js';
+import { contrastBorder } from '../../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../../platform/theme/common/colors/listColors.js';
+import '../../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../../platform/theme/common/colors/minimapColors.js';
+import { badgeBackground, badgeForeground } from '../../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../../platform/theme/common/colors/searchColors.js';
 import { WorkbenchList } from '../../../../../platform/list/browser/listService.js';
 import { ResourceLabels } from '../../../../browser/labels.js';
 import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
-import { dispose } from '../../../../../base/common/lifecycle.js';
+import { DisposableMap, dispose } from '../../../../../base/common/lifecycle.js';
 import { MenuId, registerAction2, MenuRegistry, Action2 } from '../../../../../platform/actions/common/actions.js';
 import { OpenEditorsGroupContext, OpenEditorsDirtyEditorContext, OpenEditorsReadonlyEditorContext, SAVE_ALL_LABEL, SAVE_ALL_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID } from '../fileConstants.js';
 import { ResourceContextKey, MultipleEditorGroupsContext } from '../../../../common/contextkeys.js';
@@ -75,7 +85,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
             }
             this.listRefreshScheduler?.schedule(this.structuralRefreshDelay);
         };
-        const groupDisposables = ( new Map());
+        const groupDisposables = this._register(( new DisposableMap()));
         const addGroupListener = (group) => {
             const groupModelChangeListener = group.onDidModelChange(e => {
                 if (this.listRefreshScheduler?.isScheduled()) {
@@ -96,8 +106,8 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
                             this.list.splice(index, 1, [group]);
                         }
                         break;
+                    case 13 :
                     case 12 :
-                    case 11 :
                     case 9 :
                     case 10 :
                     case 8 :
@@ -112,7 +122,6 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
                 }
             });
             groupDisposables.set(group.id, groupModelChangeListener);
-            this._register(groupDisposables.get(group.id));
         };
         this.editorGroupService.groups.forEach(g => addGroupListener(g));
         this._register(this.editorGroupService.onDidAddGroup(group => {
@@ -122,7 +131,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
         this._register(this.editorGroupService.onDidMoveGroup(() => updateWholeList()));
         this._register(this.editorGroupService.onDidChangeActiveGroup(() => this.focusActiveEditor()));
         this._register(this.editorGroupService.onDidRemoveGroup(group => {
-            dispose(groupDisposables.get(group.id));
+            groupDisposables.deleteAndDispose(group.id);
             updateWholeList();
         }));
     }

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

@@ -1,16 +1,14 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { VIEWLET_ID } from './files.js';
-import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { NumberBadge, IActivityService } from '../../../services/activity/common/activity.js';
 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) {
+    constructor(activityService, workingCopyService, filesConfigurationService) {
         super();
-        this.lifecycleService = lifecycleService;
         this.activityService = activityService;
         this.workingCopyService = workingCopyService;
         this.filesConfigurationService = filesConfigurationService;
@@ -21,7 +19,6 @@ let DirtyFilesIndicator = class DirtyFilesIndicator extends Disposable {
     }
     registerListeners() {
         this._register(this.workingCopyService.onDidChangeDirty(workingCopy => this.onWorkingCopyDidChangeDirty(workingCopy)));
-        this.lifecycleService.onDidShutdown(() => this.dispose());
     }
     onWorkingCopyDidChangeDirty(workingCopy) {
         const gotDirty = workingCopy.isDirty();
@@ -54,9 +51,8 @@ let DirtyFilesIndicator = class DirtyFilesIndicator extends Disposable {
     }
 };
 DirtyFilesIndicator = ( __decorate([
-    ( __param(0, ILifecycleService)),
-    ( __param(1, IActivityService)),
-    ( __param(2, IWorkingCopyService)),
-    ( __param(3, IFilesConfigurationService))
+    ( __param(0, IActivityService)),
+    ( __param(1, IWorkingCopyService)),
+    ( __param(2, IFilesConfigurationService))
 ], DirtyFilesIndicator));
 export { DirtyFilesIndicator };