@codingame/monaco-vscode-views-service-override 2.0.3-improve-modularity.1 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-views-service-override",
-  "version": "2.0.3-improve-modularity.1",
+  "version": "2.0.3",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,16 +18,16 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.0.3-improve-modularity.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.0.3",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "2.0.3-improve-modularity.1",
-    "@codingame/monaco-vscode-layout-service-override": "2.0.3-improve-modularity.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.0.3-improve-modularity.1",
-    "@codingame/monaco-vscode-keybindings-service-override": "2.0.3-improve-modularity.1",
-    "@codingame/monaco-vscode-files-service-override": "2.0.3-improve-modularity.1",
-    "@codingame/monaco-vscode-extensions-service-override": "2.0.3-improve-modularity.1",
-    "@codingame/monaco-vscode-environment-service-override": "2.0.3-improve-modularity.1",
-    "@codingame/monaco-vscode-host-service-override": "2.0.3-improve-modularity.1",
-    "@codingame/monaco-vscode-base-service-override": "2.0.3-improve-modularity.1"
+    "@codingame/monaco-vscode-bulk-edit-service-override": "2.0.3",
+    "@codingame/monaco-vscode-layout-service-override": "2.0.3",
+    "@codingame/monaco-vscode-quickaccess-service-override": "2.0.3",
+    "@codingame/monaco-vscode-keybindings-service-override": "2.0.3",
+    "@codingame/monaco-vscode-files-service-override": "2.0.3",
+    "@codingame/monaco-vscode-extensions-service-override": "2.0.3",
+    "@codingame/monaco-vscode-environment-service-override": "2.0.3",
+    "@codingame/monaco-vscode-host-service-override": "2.0.3",
+    "@codingame/monaco-vscode-base-service-override": "2.0.3"
   }
 }

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

@@ -3,7 +3,7 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { BaseBinaryResourceEditor } from 'vscode/vscode/vs/workbench/browser/parts/editor/binaryEditor';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
-import { FileEditorInput } from './fileEditorInput.js';
+import { FileEditorInput } from 'vscode/vscode/vs/workbench/contrib/files/browser/editors/fileEditorInput';
 import { BINARY_FILE_EDITOR_ID, BINARY_TEXT_FILE_MODE } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { EditorResolution } from 'vscode/vscode/vs/platform/editor/common/editor';

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

@@ -10,7 +10,7 @@ import { AbstractTextCodeEditor } from 'vscode/vscode/vs/workbench/browser/parts
 import { isTextEditorViewState, createEditorOpenError, createTooLargeFileError, DEFAULT_EDITOR_ASSOCIATION } from 'vscode/vscode/vs/workbench/common/editor';
 import { applyTextEditorOptions } from 'vscode/vscode/vs/workbench/common/editor/editorOptions';
 import { BinaryEditorModel } from 'vscode/vscode/vs/workbench/common/editor/binaryEditorModel';
-import { FileEditorInput } from './fileEditorInput.js';
+import { FileEditorInput } from 'vscode/vscode/vs/workbench/contrib/files/browser/editors/fileEditorInput';
 import { TooLargeFileOperationError, ByteSize, FileOperationError, IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';

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

@@ -12,7 +12,7 @@ import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { DiffEditorInput } from 'vscode/vscode/vs/workbench/common/editor/diffEditorInput';
 import { RawContextKey, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { TextFileContentProvider } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
-import { FileEditorInput } from './fileEditorInput.js';
+import { FileEditorInput } from 'vscode/vscode/vs/workbench/contrib/files/browser/editors/fileEditorInput';
 import { SAVE_FILE_AS_LABEL } from 'vscode/vscode/vs/workbench/contrib/files/browser/fileConstants';
 import { Severity, INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';

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

@@ -16,7 +16,7 @@ import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
 import { BinaryFileEditor } from './editors/binaryFileEditor.js';
 import { FileEditorInputSerializer, FileEditorWorkingCopyEditorHandler } from './editors/fileEditorHandler.js';
-import { FileEditorInput } from './editors/fileEditorInput.js';
+import { FileEditorInput } from 'vscode/vscode/vs/workbench/contrib/files/browser/editors/fileEditorInput';
 import { TextFileEditor } from './editors/textFileEditor.js';
 import { TextFileEditorTracker } from './editors/textFileEditorTracker.js';
 import { TextFileSaveErrorHandler } from './editors/textFileSaveErrorHandler.js';
@@ -27,6 +27,7 @@ import { WorkspaceWatcher } from './workspaceWatcher.js';
 import { DirtyFilesIndicator } from '../common/dirtyFilesIndicator.js';
 import { FILE_EDITOR_INPUT_ID, BINARY_TEXT_FILE_MODE } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
 import 'vscode/vscode/vs/workbench/contrib/files/browser/files.configuration.contribution';
+import 'vscode/vscode/vs/workbench/contrib/files/browser/files.fileEditorFactory.contribution';
 
 let FileUriLabelContribution = class FileUriLabelContribution {
     constructor(labelService) {
@@ -60,15 +61,6 @@ FileUriLabelContribution = ( __decorate([
 ))), [
     ( new SyncDescriptor(FileEditorInput))
 ]);
-( 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;
-    }
-});
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(FILE_EDITOR_INPUT_ID, FileEditorInputSerializer);
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(FileEditorWorkingCopyEditorHandler, 2 );
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(ExplorerViewletViewsContribution, 1 );

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

@@ -1,344 +0,0 @@
-import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { DEFAULT_EDITOR_ASSOCIATION, findViewStateForEditor, isResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor';
-import { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
-import { BinaryEditorModel } from 'vscode/vscode/vs/workbench/common/editor/binaryEditorModel';
-import { getLargeFileConfirmationLimit, ByteSize, IFileService } from 'vscode/vscode/vs/platform/files/common/files';
-import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
-import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
-import { FILE_EDITOR_INPUT_ID, BINARY_FILE_EDITOR_ID, TEXT_FILE_EDITOR_ID } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
-import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { isEqual } from 'vscode/vscode/vs/base/common/resources';
-import { Event } from 'vscode/vscode/vs/base/common/event';
-import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { createTextBufferFactory } from 'vscode/vscode/vs/editor/common/model/textModel';
-import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
-import { ITextResourceConfigurationService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
-import { isConfigured } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-
-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);
-        this.instantiationService = instantiationService;
-        this.textModelService = textModelService;
-        this.pathService = pathService;
-        this.textResourceConfigurationService = textResourceConfigurationService;
-        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.getAutoSaveMode() === 1 ) {
-            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;
-        }
-    }
-    ensureLimits(options) {
-        if (options?.limits) {
-            return options.limits;
-        }
-        const defaultSizeLimit = getLargeFileConfirmationLimit(this.resource);
-        let configuredSizeLimit = undefined;
-        const configuredSizeLimitMb = this.textResourceConfigurationService.inspect(this.resource, null, 'workbench.editorLargeFileConfirmation');
-        if (isConfigured(configuredSizeLimitMb)) {
-            configuredSizeLimit = configuredSizeLimitMb.value * ByteSize.MB;
-        }
-        return {
-            size: configuredSizeLimit ?? defaultSizeLimit
-        };
-    }
-    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 };