@codingame/monaco-vscode-api 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

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

@@ -0,0 +1,326 @@
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { DEFAULT_EDITOR_ASSOCIATION, findViewStateForEditor, isResourceEditorInput } from '../../../../common/editor.js';
+import { AbstractTextResourceEditorInput } from '../../../../common/editor/textResourceEditorInput.js';
+import { BinaryEditorModel } from '../../../../common/editor/binaryEditorModel.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { ITextFileService } from '../../../../services/textfile/common/textfiles.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { DisposableStore, dispose } from '../../../../../base/common/lifecycle.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { FILE_EDITOR_INPUT_ID, BINARY_FILE_EDITOR_ID, TEXT_FILE_EDITOR_ID } from '../../common/files.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { Event } from '../../../../../base/common/event.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { createTextBufferFactory } from '../../../../../editor/common/model/textModel.js';
+import { IPathService } from '../../../../services/path/common/pathService.js';
+import { ITextResourceConfigurationService } from '../../../../../editor/common/services/textResourceConfiguration.js';
+var FileEditorInput_1;
+let FileEditorInput = FileEditorInput_1 = class FileEditorInput extends AbstractTextResourceEditorInput {
+    get typeId() {
+        return FILE_EDITOR_INPUT_ID;
+    }
+    get editorId() {
+        return DEFAULT_EDITOR_ASSOCIATION.id;
+    }
+    get capabilities() {
+        let capabilities = 32 ;
+        if (this.model) {
+            if (this.model.isReadonly()) {
+                capabilities |= 2 ;
+            }
+        }
+        else {
+            if (this.fileService.hasProvider(this.resource)) {
+                if (this.filesConfigurationService.isReadonly(this.resource)) {
+                    capabilities |= 2 ;
+                }
+            }
+            else {
+                capabilities |= 4 ;
+            }
+        }
+        if (!((capabilities & 2) )) {
+            capabilities |= 128 ;
+        }
+        return capabilities;
+    }
+    constructor(resource, preferredResource, preferredName, preferredDescription, preferredEncoding, preferredLanguageId, preferredContents, instantiationService, textFileService, textModelService, labelService, fileService, filesConfigurationService, editorService, pathService, textResourceConfigurationService) {
+        super(resource, preferredResource, editorService, textFileService, labelService, fileService, filesConfigurationService, textResourceConfigurationService);
+        this.instantiationService = instantiationService;
+        this.textModelService = textModelService;
+        this.pathService = pathService;
+        this.forceOpenAs = 0 ;
+        this.model = undefined;
+        this.cachedTextFileModelReference = undefined;
+        this.modelListeners = this._register(( new DisposableStore()));
+        this.model = this.textFileService.files.get(resource);
+        if (preferredName) {
+            this.setPreferredName(preferredName);
+        }
+        if (preferredDescription) {
+            this.setPreferredDescription(preferredDescription);
+        }
+        if (preferredEncoding) {
+            this.setPreferredEncoding(preferredEncoding);
+        }
+        if (preferredLanguageId) {
+            this.setPreferredLanguageId(preferredLanguageId);
+        }
+        if (typeof preferredContents === 'string') {
+            this.setPreferredContents(preferredContents);
+        }
+        this._register(this.textFileService.files.onDidCreate(model => this.onDidCreateTextFileModel(model)));
+        if (this.model) {
+            this.registerModelListeners(this.model);
+        }
+    }
+    onDidCreateTextFileModel(model) {
+        if (isEqual(model.resource, this.resource)) {
+            this.model = model;
+            this.registerModelListeners(model);
+        }
+    }
+    registerModelListeners(model) {
+        this.modelListeners.clear();
+        this.modelListeners.add(model.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
+        this.modelListeners.add(model.onDidChangeReadonly(() => this._onDidChangeCapabilities.fire()));
+        this.modelListeners.add(model.onDidSaveError(() => this._onDidChangeDirty.fire()));
+        this.modelListeners.add(Event.once(model.onWillDispose)(() => {
+            this.modelListeners.clear();
+            this.model = undefined;
+        }));
+    }
+    getName() {
+        return this.preferredName || super.getName();
+    }
+    setPreferredName(name) {
+        if (!this.allowLabelOverride()) {
+            return;
+        }
+        if (this.preferredName !== name) {
+            this.preferredName = name;
+            this._onDidChangeLabel.fire();
+        }
+    }
+    allowLabelOverride() {
+        return this.resource.scheme !== this.pathService.defaultUriScheme &&
+            this.resource.scheme !== Schemas.vscodeUserData &&
+            this.resource.scheme !== Schemas.file &&
+            this.resource.scheme !== Schemas.vscodeRemote;
+    }
+    getPreferredName() {
+        return this.preferredName;
+    }
+    isReadonly() {
+        return this.model ? this.model.isReadonly() : this.filesConfigurationService.isReadonly(this.resource);
+    }
+    getDescription(verbosity) {
+        return this.preferredDescription || super.getDescription(verbosity);
+    }
+    setPreferredDescription(description) {
+        if (!this.allowLabelOverride()) {
+            return;
+        }
+        if (this.preferredDescription !== description) {
+            this.preferredDescription = description;
+            this._onDidChangeLabel.fire();
+        }
+    }
+    getPreferredDescription() {
+        return this.preferredDescription;
+    }
+    getTitle(verbosity) {
+        let title = super.getTitle(verbosity);
+        const preferredTitle = this.getPreferredTitle();
+        if (preferredTitle) {
+            title = `${preferredTitle} (${title})`;
+        }
+        return title;
+    }
+    getPreferredTitle() {
+        if (this.preferredName && this.preferredDescription) {
+            return `${this.preferredName} ${this.preferredDescription}`;
+        }
+        if (this.preferredName || this.preferredDescription) {
+            return this.preferredName ?? this.preferredDescription;
+        }
+        return undefined;
+    }
+    getEncoding() {
+        if (this.model) {
+            return this.model.getEncoding();
+        }
+        return this.preferredEncoding;
+    }
+    getPreferredEncoding() {
+        return this.preferredEncoding;
+    }
+    async setEncoding(encoding, mode) {
+        this.setPreferredEncoding(encoding);
+        return this.model?.setEncoding(encoding, mode);
+    }
+    setPreferredEncoding(encoding) {
+        this.preferredEncoding = encoding;
+        this.setForceOpenAsText();
+    }
+    getLanguageId() {
+        if (this.model) {
+            return this.model.getLanguageId();
+        }
+        return this.preferredLanguageId;
+    }
+    getPreferredLanguageId() {
+        return this.preferredLanguageId;
+    }
+    setLanguageId(languageId, source) {
+        this.setPreferredLanguageId(languageId);
+        this.model?.setLanguageId(languageId, source);
+    }
+    setPreferredLanguageId(languageId) {
+        this.preferredLanguageId = languageId;
+        this.setForceOpenAsText();
+    }
+    setPreferredContents(contents) {
+        this.preferredContents = contents;
+        this.setForceOpenAsText();
+    }
+    setForceOpenAsText() {
+        this.forceOpenAs = 1 ;
+    }
+    setForceOpenAsBinary() {
+        this.forceOpenAs = 2 ;
+    }
+    isDirty() {
+        return !!(this.model?.isDirty());
+    }
+    isSaving() {
+        if (this.model?.hasState(0 ) || this.model?.hasState(3 ) || this.model?.hasState(5 )) {
+            return false;
+        }
+        if (this.filesConfigurationService.hasShortAutoSaveDelay(this)) {
+            return true;
+        }
+        return super.isSaving();
+    }
+    prefersEditorPane(editorPanes) {
+        if (this.forceOpenAs === 2 ) {
+            return editorPanes.find(editorPane => editorPane.typeId === BINARY_FILE_EDITOR_ID);
+        }
+        return editorPanes.find(editorPane => editorPane.typeId === TEXT_FILE_EDITOR_ID);
+    }
+    resolve(options) {
+        if (this.forceOpenAs === 2 ) {
+            return this.doResolveAsBinary();
+        }
+        return this.doResolveAsText(options);
+    }
+    async doResolveAsText(options) {
+        try {
+            const preferredContents = this.preferredContents;
+            this.preferredContents = undefined;
+            await this.textFileService.files.resolve(this.resource, {
+                languageId: this.preferredLanguageId,
+                encoding: this.preferredEncoding,
+                contents: typeof preferredContents === 'string' ? createTextBufferFactory(preferredContents) : undefined,
+                reload: { async: true },
+                allowBinary: this.forceOpenAs === 1 ,
+                reason: 1 ,
+                limits: this.ensureLimits(options)
+            });
+            if (!this.cachedTextFileModelReference) {
+                this.cachedTextFileModelReference = await this.textModelService.createModelReference(this.resource);
+            }
+            const model = this.cachedTextFileModelReference.object;
+            if (this.isDisposed()) {
+                this.disposeModelReference();
+            }
+            return model;
+        }
+        catch (error) {
+            if (error.textFileOperationResult === 0 ) {
+                return this.doResolveAsBinary();
+            }
+            throw error;
+        }
+    }
+    async doResolveAsBinary() {
+        const model = this.instantiationService.createInstance(BinaryEditorModel, this.preferredResource, this.getName());
+        await model.resolve();
+        return model;
+    }
+    isResolved() {
+        return !!this.model;
+    }
+    async rename(group, target) {
+        return {
+            editor: {
+                resource: target,
+                encoding: this.getEncoding(),
+                options: {
+                    viewState: findViewStateForEditor(this, group, this.editorService)
+                }
+            }
+        };
+    }
+    toUntyped(options) {
+        const untypedInput = {
+            resource: this.preferredResource,
+            forceFile: true,
+            options: {
+                override: this.editorId
+            }
+        };
+        if (typeof options?.preserveViewState === 'number') {
+            untypedInput.encoding = this.getEncoding();
+            untypedInput.languageId = this.getLanguageId();
+            untypedInput.contents = (() => {
+                const model = this.textFileService.files.get(this.resource);
+                if (model?.isDirty() && !model.textEditorModel.isTooLargeForHeapOperation()) {
+                    return model.textEditorModel.getValue();
+                }
+                return undefined;
+            })();
+            untypedInput.options = {
+                ...untypedInput.options,
+                viewState: findViewStateForEditor(this, options.preserveViewState, this.editorService)
+            };
+        }
+        return untypedInput;
+    }
+    matches(otherInput) {
+        if (this === otherInput) {
+            return true;
+        }
+        if (otherInput instanceof FileEditorInput_1) {
+            return isEqual(otherInput.resource, this.resource);
+        }
+        if (isResourceEditorInput(otherInput)) {
+            return super.matches(otherInput);
+        }
+        return false;
+    }
+    dispose() {
+        this.model = undefined;
+        this.disposeModelReference();
+        super.dispose();
+    }
+    disposeModelReference() {
+        dispose(this.cachedTextFileModelReference);
+        this.cachedTextFileModelReference = undefined;
+    }
+};
+FileEditorInput = FileEditorInput_1 = ( __decorate([
+    ( __param(7, IInstantiationService)),
+    ( __param(8, ITextFileService)),
+    ( __param(9, ITextModelService)),
+    ( __param(10, ILabelService)),
+    ( __param(11, IFileService)),
+    ( __param(12, IFilesConfigurationService)),
+    ( __param(13, IEditorService)),
+    ( __param(14, IPathService)),
+    ( __param(15, ITextResourceConfigurationService))
+], FileEditorInput));
+export { FileEditorInput };

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

@@ -30,7 +30,7 @@ import { OpenRecentAction } from '../../../browser/actions/windowActions.js';
 import { isMacintosh, isWeb } from '../../../../base/common/platform.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-import { isMouseEvent, focusWindow } from '../../../../base/browser/dom.js';
+import { isMouseEvent } from '../../../../base/browser/dom.js';
 const explorerViewIcon = registerIcon('explorer-view-icon', Codicon.files, ( localizeWithPath(
     'vs/workbench/contrib/files/browser/explorerViewlet',
     'explorerViewIcon',
@@ -193,7 +193,6 @@ let ExplorerViewPaneContainer = class ExplorerViewPaneContainer extends ViewPane
             explorerView.setExpanded(true);
         }
         if (explorerView?.isExpanded()) {
-            focusWindow(explorerView.element);
             explorerView.focus();
         }
         else {

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

@@ -36,7 +36,7 @@ import { timeout } from '../../../../base/common/async.js';
 import { IWorkingCopyFileService } from '../../../services/workingCopy/common/workingCopyFileService.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-import { IViewsService } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { trim, rtrim } from '../../../../base/common/strings.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { ResourceFileEdit } from '../../../../editor/browser/services/bulkEditService.js';
@@ -726,20 +726,19 @@ class ShowActiveFileInExplorer extends Action2 {
         }
     }
 }
-class ShowOpenedFileInNewWindow extends Action2 {
+class OpenActiveFileInEmptyWorkspace extends Action2 {
     static { this.ID = 'workbench.action.files.showOpenedFileInNewWindow'; }
     static { this.LABEL = ( localizeWithPath(
         'vs/workbench/contrib/files/browser/fileActions',
-        'openFileInNewWindow',
-        "Open Active File in New Window"
+        'openFileInEmptyWorkspace',
+        "Open Active File in New Empty Workspace"
     )); }
     constructor() {
         super({
-            id: ShowOpenedFileInNewWindow.ID,
-            title: { value: ShowOpenedFileInNewWindow.LABEL, original: 'Open Active File in New Window' },
+            id: OpenActiveFileInEmptyWorkspace.ID,
+            title: { value: OpenActiveFileInEmptyWorkspace.LABEL, original: 'Open Active File in New Empty Workspace' },
             f1: true,
             category: Categories.File,
-            keybinding: { primary: KeyChord(2048  | 41 , 45 ), weight: 200  },
             precondition: EmptyWorkspaceSupportContext
         });
     }
@@ -1165,7 +1164,7 @@ const pasteFileHandler = async (accessor, fileList) => {
     const hasNativeFilesToPaste = fileList && fileList.length > 0;
     const confirmPasteNative = hasNativeFilesToPaste && configurationService.getValue('explorer.confirmPasteNative');
     const toPaste = await getFilesToPaste(fileList, clipboardService);
-    if (confirmPasteNative) {
+    if (confirmPasteNative && toPaste?.length >= 1) {
         const message = toPaste.length > 1 ?
             ( localizeWithPath(
                 'vs/workbench/contrib/files/browser/fileActions',
@@ -1403,4 +1402,4 @@ class ResetActiveEditorReadonlyInSession extends BaseSetActiveEditorReadonlyInSe
         super(ResetActiveEditorReadonlyInSession.ID, { value: ResetActiveEditorReadonlyInSession.LABEL, original: 'Reset Active Editor Readonly in Session' }, 'reset');
     }
 }
-export { COPY_FILE_LABEL, CloseGroupAction, CompareNewUntitledTextFilesAction, CompareWithClipboardAction, DOWNLOAD_COMMAND_ID, DOWNLOAD_LABEL, FileCopiedContext, FocusFilesExplorer, GlobalCompareResourcesAction, MOVE_FILE_TO_TRASH_LABEL, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, PASTE_FILE_LABEL, ResetActiveEditorReadonlyInSession, SaveAllInGroupAction, SetActiveEditorReadonlyInSession, SetActiveEditorWriteableInSession, ShowActiveFileInExplorer, ShowOpenedFileInNewWindow, TRIGGER_RENAME_LABEL, ToggleActiveEditorReadonlyInSession, ToggleAutoSaveAction, UPLOAD_COMMAND_ID, UPLOAD_LABEL, copyFileHandler, cutFileHandler, deleteFileHandler, findValidPasteFileTarget, incrementFileName, moveFileToTrashHandler, openFilePreserveFocusHandler, pasteFileHandler, renameHandler, validateFileName };
+export { COPY_FILE_LABEL, CloseGroupAction, CompareNewUntitledTextFilesAction, CompareWithClipboardAction, DOWNLOAD_COMMAND_ID, DOWNLOAD_LABEL, FileCopiedContext, FocusFilesExplorer, GlobalCompareResourcesAction, MOVE_FILE_TO_TRASH_LABEL, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, OpenActiveFileInEmptyWorkspace, PASTE_FILE_LABEL, ResetActiveEditorReadonlyInSession, SaveAllInGroupAction, SetActiveEditorReadonlyInSession, SetActiveEditorWriteableInSession, ShowActiveFileInExplorer, TRIGGER_RENAME_LABEL, ToggleActiveEditorReadonlyInSession, ToggleAutoSaveAction, UPLOAD_COMMAND_ID, UPLOAD_LABEL, copyFileHandler, cutFileHandler, deleteFileHandler, findValidPasteFileTarget, incrementFileName, moveFileToTrashHandler, openFilePreserveFocusHandler, pasteFileHandler, renameHandler, validateFileName };

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

@@ -262,7 +262,8 @@ configurationRegistry.registerConfiguration({
                 AutoSaveConfiguration.ON_FOCUS_CHANGE,
                 AutoSaveConfiguration.ON_WINDOW_CHANGE,
                 AutoSaveConfiguration.AFTER_DELAY
-            ))
+            )),
+            scope: 5
         },
         'files.autoSaveDelay': {
             'type': 'number',
@@ -273,7 +274,28 @@ configurationRegistry.registerConfiguration({
                 { comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'autoSaveDelay' },
                 "Controls the delay in milliseconds after which an editor with unsaved changes is saved automatically. Only applies when `#files.autoSave#` is set to `{0}`.",
                 AutoSaveConfiguration.AFTER_DELAY
-            ))
+            )),
+            scope: 5
+        },
+        'files.autoSaveWorkspaceFilesOnly': {
+            'type': 'boolean',
+            'default': false,
+            'markdownDescription': ( localizeWithPath(
+                'vs/workbench/contrib/files/browser/files.configuration.contribution',
+                { comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'autoSaveWorkspaceFilesOnly' },
+                "When enabled, will limit [auto save](https://code.visualstudio.com/docs/editor/codebasics#_save-auto-save) of editors to files that are inside the opened workspace. Only applies when `#files.autoSave#` is enabled."
+            )),
+            scope: 5
+        },
+        'files.autoSaveWhenNoErrors': {
+            'type': 'boolean',
+            'default': false,
+            'markdownDescription': ( localizeWithPath(
+                'vs/workbench/contrib/files/browser/files.configuration.contribution',
+                { comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'autoSaveWhenNoErrors' },
+                "When enabled, will limit [auto save](https://code.visualstudio.com/docs/editor/codebasics#_save-auto-save) of editors to files that have no errors reported in them at the time the auto save is triggered. Only applies when `#files.autoSave#` is enabled."
+            )),
+            scope: 5
         },
         'files.watcherExclude': {
             'type': 'object',
@@ -461,3 +483,49 @@ configurationRegistry.registerConfiguration({
         },
     }
 });
+configurationRegistry.registerConfiguration({
+    ...editorConfigurationBaseNode,
+    properties: {
+        'editor.formatOnSave': {
+            'type': 'boolean',
+            'description': ( localizeWithPath(
+                'vs/workbench/contrib/files/browser/files.configuration.contribution',
+                'formatOnSave',
+                "Format a file on save. A formatter must be available, the file must not be saved after delay, and the editor must not be shutting down."
+            )),
+            'scope': 5 ,
+        },
+        'editor.formatOnSaveMode': {
+            'type': 'string',
+            'default': 'file',
+            'enum': [
+                'file',
+                'modifications',
+                'modificationsIfAvailable'
+            ],
+            'enumDescriptions': [
+                ( localizeWithPath(
+                    'vs/workbench/contrib/files/browser/files.configuration.contribution',
+                    { key: 'everything', comment: ['This is the description of an option'] },
+                    "Format the whole file."
+                )),
+                ( localizeWithPath(
+                    'vs/workbench/contrib/files/browser/files.configuration.contribution',
+                    { key: 'modification', comment: ['This is the description of an option'] },
+                    "Format modifications (requires source control)."
+                )),
+                ( localizeWithPath(
+                    'vs/workbench/contrib/files/browser/files.configuration.contribution',
+                    { key: 'modificationIfAvailable', comment: ['This is the description of an option'] },
+                    "Will attempt to format modifications only (requires source control). If source control can't be used, then the whole file will be formatted."
+                )),
+            ],
+            'markdownDescription': ( localizeWithPath(
+                'vs/workbench/contrib/files/browser/files.configuration.contribution',
+                'formatOnSaveMode',
+                "Controls if format on save formats the whole file or only modifications. Only applies when `#editor.formatOnSave#` is enabled."
+            )),
+            'scope': 5 ,
+        },
+    }
+});

package/vscode/src/vs/workbench/contrib/files/browser/files.d.ts

@@ -42,14 +42,17 @@ declare const IExplorerService: ServiceIdentifier<IExplorerService>;
 interface IExplorerView {
     autoReveal: boolean | 'force' | 'focusNoScroll';
     getContext(respectMultiSelection: boolean): ExplorerItem[];
-    refresh(recursive: boolean, item?: ExplorerItem): Promise<void>;
-    selectResource(resource: URI | undefined, reveal?: boolean | string): Promise<void>;
+    refresh(recursive: boolean, item?: ExplorerItem, cancelEditing?: boolean): Promise<void>;
+    selectResource(resource: URI | undefined, reveal?: boolean | string, retry?: number): Promise<void>;
     setTreeInput(): Promise<void>;
     itemsCopied(tats: ExplorerItem[], cut: boolean, previousCut: ExplorerItem[] | undefined): void;
     setEditable(stat: ExplorerItem, isEditing: boolean): Promise<void>;
     isItemVisible(item: ExplorerItem): boolean;
     isItemCollapsed(item: ExplorerItem): boolean;
     hasFocus(): boolean;
+    getFocus(): ExplorerItem[];
+    focusNext(): void;
+    focusLast(): void;
 }
 
 export { IExplorerService, type IExplorerView };

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

@@ -0,0 +1,13 @@
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorExtensions } from '../../../common/editor.js';
+import { FileEditorInput } from './editors/fileEditorInput.js';
+import { FILE_EDITOR_INPUT_ID } from '../common/files.js';
+( Registry.as(EditorExtensions.EditorFactory)).registerFileEditorFactory({
+    typeId: FILE_EDITOR_INPUT_ID,
+    createFileEditor: (resource, preferredResource, preferredName, preferredDescription, preferredEncoding, preferredLanguageId, preferredContents, instantiationService) => {
+        return instantiationService.createInstance(FileEditorInput, resource, preferredResource, preferredName, preferredDescription, preferredEncoding, preferredLanguageId, preferredContents);
+    },
+    isFileEditor: (obj) => {
+        return obj instanceof FileEditorInput;
+    }
+});

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

@@ -8,7 +8,7 @@ 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 { listDropBackground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { listDropOverBackground } from '../../../../../platform/theme/common/colorRegistry.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IViewDescriptorService } from '../../../../common/views.js';
@@ -45,7 +45,7 @@ let EmptyView = class EmptyView extends ViewPane {
                 dropHandler.handleDrop(e, getWindow(container));
             },
             onDragEnter: () => {
-                const color = this.themeService.getColorTheme().getColor(listDropBackground);
+                const color = this.themeService.getColorTheme().getColor(listDropOverBackground);
                 container.style.backgroundColor = color ? ( color.toString()) : '';
             },
             onDragEnd: () => {

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../../external/tslib/tsli
 import { localizeWithPath } 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, VIEWLET_ID } from '../../common/files.js';
+import { ExplorerFolderContext, ExplorerResourceReadonlyContext, ExplorerResourceAvailableEditorIdsContext, ExplorerRootContext, ExplorerResourceMoveableToTrash, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, ExplorerCompressedLastFocusContext, ViewHasSomeCollapsibleRootItemContext, FoldersViewVisibleContext, ExplorerResourceCut, FilesExplorerFocusedContext, ExplorerFocusedContext, ExplorerResourceNotReadonlyContext, VIEW_ID } from '../../common/files.js';
 import { FileCopiedContext, NEW_FILE_COMMAND_ID, NEW_FOLDER_COMMAND_ID } from '../fileActions.js';
 import { append, $, addDisposableListener, getWindow, isAncestorOfActiveElement, isKeyboardEvent, getLargestChildWidth, EventType } from '../../../../../base/browser/dom.js';
 import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
@@ -32,7 +32,8 @@ import { IClipboardService } from '../../../../../platform/clipboard/common/clip
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { Event } from '../../../../../base/common/event.js';
 import { SIDE_BAR_BACKGROUND } from '../../../../common/theme.js';
-import { IViewDescriptorService, IViewsService } from '../../../../common/views.js';
+import { IViewDescriptorService } from '../../../../common/views.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
 import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../../common/editor.js';
@@ -40,7 +41,6 @@ import { IExplorerService } from '../files.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { IEditorResolverService } from '../../../../services/editor/common/editorResolverService.js';
-import { IPaneCompositePartService } from '../../../../services/panecomposite/browser/panecomposite.js';
 import { EditorOpenSource } from '../../../../../platform/editor/common/editor.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { isInputElement } from '../../../../../base/browser/ui/list/listWidget.js';
@@ -227,16 +227,30 @@ let ExplorerView = class ExplorerView extends ViewPane {
     focus() {
         super.focus();
         this.tree.domFocus();
-        const focused = this.tree.getFocus();
-        if (focused.length === 1 && this._autoReveal) {
-            this.tree.reveal(focused[0], 0.5);
+        if (this.tree.getFocusedPart() === 0 ) {
+            const focused = this.tree.getFocus();
+            if (focused.length === 1 && this._autoReveal) {
+                this.tree.reveal(focused[0], 0.5);
+            }
         }
     }
     hasFocus() {
         return isAncestorOfActiveElement(this.container);
     }
+    getFocus() {
+        return this.tree.getFocus();
+    }
+    focusNext() {
+        this.tree.focusNext();
+    }
+    focusLast() {
+        this.tree.focusLast();
+    }
     getContext(respectMultiSelection) {
-        return getContext(this.tree.getFocus(), this.tree.getSelection(), respectMultiSelection, this.renderer);
+        const focusedItems = this.tree.getFocusedPart() === 1  ?
+            this.tree.getStickyScrollFocus() :
+            this.tree.getFocus();
+        return getContext(focusedItems, this.tree.getSelection(), respectMultiSelection, this.renderer);
     }
     isItemVisible(item) {
         if (!this.filter) {
@@ -500,9 +514,7 @@ let ExplorerView = class ExplorerView extends ViewPane {
             this.tree.domFocus();
         }
         const toRefresh = item || this.tree.getInput();
-        return this.tree.updateChildren(toRefresh, recursive, !!item, {
-            diffIdentityProvider: identityProvider
-        });
+        return this.tree.updateChildren(toRefresh, recursive, !!item);
     }
     getOptimalWidth() {
         const parentNode = this.tree.getHTMLElement();
@@ -594,13 +606,18 @@ let ExplorerView = class ExplorerView extends ViewPane {
             catch (e) {
                 return this.selectResource(resource, reveal, retry + 1);
             }
-            for (const child of ( item.children.values())) {
-                if (this.uriIdentityService.extUri.isEqualOrParent(resource, child.resource)) {
-                    item = child;
-                    break;
-                }
+            if (!item.children.size) {
                 item = null;
             }
+            else {
+                for (const child of ( item.children.values())) {
+                    if (this.uriIdentityService.extUri.isEqualOrParent(resource, child.resource)) {
+                        item = child;
+                        break;
+                    }
+                    item = null;
+                }
+            }
         }
         if (item) {
             if (item === this.tree.getInput()) {
@@ -824,9 +841,9 @@ registerAction2(class extends Action2 {
         });
     }
     async run(accessor) {
-        const paneCompositeService = accessor.get(IPaneCompositePartService);
+        const viewsService = accessor.get(IViewsService);
         const explorerService = accessor.get(IExplorerService);
-        await paneCompositeService.openPaneComposite(VIEWLET_ID, 0 );
+        await viewsService.openView(VIEW_ID);
         await explorerService.refresh();
     }
 });