@theia/monaco 1.77.0-next.95 → 1.77.0

package/src/browser/monaco-diff-editor.ts

@@ -17,24 +17,24 @@
 import URI from '@theia/core/lib/common/uri';
 import { Disposable } from '@theia/core/lib/common';
 import { Dimension, DiffNavigator, DeltaDecorationParams } from '@theia/editor/lib/browser';
-import { MonacoEditorModel } from './monaco-editor-model';
-import { EditorServiceOverrides, MonacoEditor, MonacoEditorServices } from './monaco-editor';
-import { MonacoDiffNavigatorFactory } from './monaco-diff-navigator-factory';
+import { MonacoEditorModel } from './monaco-editor-model.js';
+import { EditorServiceOverrides, MonacoEditor, MonacoEditorServices } from './monaco-editor.js';
+import { MonacoDiffNavigatorFactory } from './monaco-diff-navigator-factory.js';
 import { DiffUris } from '@theia/core/lib/browser/diff-uris';
 import * as monaco from '@theia/monaco-editor-core';
-import { ICodeEditor, IDiffEditorConstructionOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
+import { ICodeEditor, IDiffEditorConstructionOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser.js';
 import { IActionDescriptor, IStandaloneCodeEditor, IStandaloneDiffEditor, StandaloneCodeEditor, StandaloneDiffEditor2 }
-    from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
-import { IEditorConstructionOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/config/editorConfiguration';
-import { ICodeEditorWidgetOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { EmbeddedDiffEditorWidget } from '@theia/monaco-editor-core/esm/vs/editor/browser/widget/diffEditor/embeddedDiffEditorWidget';
-import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation';
-import { ContextKeyValue, IContextKey } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
-import { IDisposable } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
-import { ICommandHandler } from '@theia/monaco-editor-core/esm/vs/platform/commands/common/commands';
-import { EditorContextKeys } from '@theia/monaco-editor-core/esm/vs/editor/common/editorContextKeys';
-import { IEditorOptions } from '@theia/monaco-editor-core/esm/vs/editor/common/config/editorOptions';
-import { ILineChange } from '@theia/monaco-editor-core/esm/vs/editor/common/diff/legacyLinesDiffComputer';
+    from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor.js';
+import { IEditorConstructionOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/config/editorConfiguration.js';
+import { ICodeEditorWidgetOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { EmbeddedDiffEditorWidget } from '@theia/monaco-editor-core/esm/vs/editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
+import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation.js';
+import { ContextKeyValue, IContextKey } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey.js';
+import { IDisposable } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle.js';
+import { ICommandHandler } from '@theia/monaco-editor-core/esm/vs/platform/commands/common/commands.js';
+import { EditorContextKeys } from '@theia/monaco-editor-core/esm/vs/editor/common/editorContextKeys.js';
+import { IEditorOptions } from '@theia/monaco-editor-core/esm/vs/editor/common/config/editorOptions.js';
+import { ILineChange } from '@theia/monaco-editor-core/esm/vs/editor/common/diff/legacyLinesDiffComputer.js';
 
 export namespace MonacoDiffEditor {
     export interface IOptions extends MonacoEditor.ICommonOptions, IDiffEditorConstructionOptions {

package/src/browser/monaco-diff-navigator-factory.ts

@@ -16,7 +16,7 @@
 
 import { injectable } from '@theia/core/shared/inversify';
 import { DiffNavigator } from '@theia/editor/lib/browser';
-import { IDiffEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
+import { IDiffEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser.js';
 
 @injectable()
 export class MonacoDiffNavigatorFactory {

package/src/browser/monaco-editor-content-menu.ts

@@ -20,11 +20,11 @@ import { ObservableFromEvent, ObservableUtils } from '@theia/core/lib/common/obs
 import { FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { Context } from '@theia/core/lib/browser/context-key-service';
 import { EditorManager, EDITOR_CONTENT_MENU, EditorWidget } from '@theia/editor/lib/browser';
-import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
-import { IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
-import { MonacoContextKeyService } from './monaco-context-key-service';
-import { MonacoEditor } from './monaco-editor';
-import { MonacoEditorOverlayButton } from './monaco-editor-overlay-button';
+import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser.js';
+import { IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey.js';
+import { MonacoContextKeyService } from './monaco-context-key-service.js';
+import { MonacoEditor } from './monaco-editor.js';
+import { MonacoEditorOverlayButton } from './monaco-editor-overlay-button.js';
 
 /**
  * Implements {@link EDITOR_CONTENT_MENU} for {@link MonacoEditor}s.

package/src/browser/monaco-editor-model.spec.ts

@@ -0,0 +1,157 @@
+// *****************************************************************************
+// Copyright (C) 2026 CodeSignal and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+let disableJSDOM = enableJSDOM();
+
+import { expect } from 'chai';
+import URI from '@theia/core/lib/common/uri';
+import { Resource } from '@theia/core/lib/common/resource';
+import { Deferred } from '@theia/core/lib/common/promise-util';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation.js';
+import type { MonacoEditorModel as MonacoEditorModelType } from './monaco-editor-model.js';
+import type { MonacoToProtocolConverter as MonacoToProtocolConverterType } from './monaco-to-protocol-converter.js';
+import type { ProtocolToMonacoConverter as ProtocolToMonacoConverterType } from './protocol-to-monaco-converter.js';
+
+disableJSDOM();
+
+describe('MonacoEditorModel save', () => {
+    let MonacoEditorModel: typeof MonacoEditorModelType;
+    let MonacoToProtocolConverter: typeof MonacoToProtocolConverterType;
+    let ProtocolToMonacoConverter: typeof ProtocolToMonacoConverterType;
+
+    before(async () => {
+        disableJSDOM = enableJSDOM();
+        StandaloneServices.get(IInstantiationService);
+        ({ MonacoEditorModel } = await import('./monaco-editor-model.js'));
+        ({ MonacoToProtocolConverter } = await import('./monaco-to-protocol-converter.js'));
+        ({ ProtocolToMonacoConverter } = await import('./protocol-to-monaco-converter.js'));
+    });
+    after(() => disableJSDOM());
+
+    let files = 0;
+
+    class SlowResource implements Resource {
+        readonly uri = new URI(`file:///workspace/notes-${++files}.txt`);
+        content = '';
+        writing?: Deferred<void>;
+        readonly writeStarted = new Deferred<void>();
+
+        async readContents(): Promise<string> {
+            return this.content;
+        }
+
+        async saveContents(content: string): Promise<void> {
+            this.writeStarted.resolve();
+            await this.writing?.promise;
+            this.content = content;
+        }
+
+        dispose(): void { }
+    }
+
+    async function createModel(resource: SlowResource): Promise<MonacoEditorModelType> {
+        const model = new MonacoEditorModel(resource, new MonacoToProtocolConverter(), new ProtocolToMonacoConverter());
+        await model.load();
+        return model;
+    }
+
+    function type(model: MonacoEditorModelType, text: string): void {
+        const end = model.textEditorModel.getFullModelRange().getEndPosition();
+        model.textEditorModel.pushEditOperations([], [{
+            range: { startLineNumber: end.lineNumber, startColumn: end.column, endLineNumber: end.lineNumber, endColumn: end.column },
+            text
+        }], () => []);
+        model.textEditorModel.pushStackElement();
+    }
+
+    it('stays dirty when edited while a save is being written, and the next save writes the edit', async () => {
+        const resource = new SlowResource();
+        const model = await createModel(resource);
+        let saves = 0;
+        model.onDidSaveModel(() => saves++);
+        type(model, 'a');
+        resource.writing = new Deferred<void>();
+
+        const saving = model.save();
+        await resource.writeStarted.promise;
+        type(model, 'b');
+        resource.writing.resolve();
+        await saving;
+
+        expect(resource.content).to.equal('a');
+        expect(model.dirty).to.be.true;
+        expect(saves).to.equal(1);
+
+        await model.save();
+
+        expect(resource.content).to.equal('ab');
+        expect(model.dirty).to.be.false;
+        model.dispose();
+    });
+
+    it('is clean after a save when nothing changed during it', async () => {
+        const resource = new SlowResource();
+        const model = await createModel(resource);
+        type(model, 'a');
+
+        await model.save();
+
+        expect(resource.content).to.equal('a');
+        expect(model.dirty).to.be.false;
+        model.dispose();
+    });
+
+    it('is clean again when an edit made during the save is undone', async () => {
+        const resource = new SlowResource();
+        const model = await createModel(resource);
+        type(model, 'a');
+        resource.writing = new Deferred<void>();
+
+        const saving = model.save();
+        await resource.writeStarted.promise;
+        type(model, 'b');
+        resource.writing.resolve();
+        await saving;
+        model.textEditorModel.undo();
+
+        expect(model.textEditorModel.getValue()).to.equal('a');
+        expect(model.dirty).to.be.false;
+        model.dispose();
+    });
+
+    it('is clean after a revert during the save, which cancels it', async () => {
+        const resource = new SlowResource();
+        const model = await createModel(resource);
+        let saves = 0;
+        model.onDidSaveModel(() => saves++);
+        type(model, 'a');
+        resource.writing = new Deferred<void>();
+
+        const saving = model.save();
+        await resource.writeStarted.promise;
+        type(model, 'b');
+        const reverting = model.revert();
+        resource.writing.resolve();
+        await Promise.all([saving, reverting]);
+
+        expect(model.textEditorModel.getValue()).to.equal('a');
+        expect(model.dirty).to.be.false;
+        expect(saves).to.equal(0);
+        model.dispose();
+    });
+});

package/src/browser/monaco-editor-model.ts

@@ -21,16 +21,16 @@ import { Emitter, Event } from '@theia/core/lib/common/event';
 import { CancellationTokenSource, CancellationToken } from '@theia/core/lib/common/cancellation';
 import { Resource, ResourceError, ResourceVersion } from '@theia/core/lib/common/resource';
 import { Saveable, SaveOptions, SaveReason } from '@theia/core/lib/browser/saveable';
-import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
-import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
+import { MonacoToProtocolConverter } from './monaco-to-protocol-converter.js';
+import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter.js';
 import { ILogger, Loggable, Log } from '@theia/core/lib/common/logger';
-import { ITextBufferFactory, ITextModel, ITextSnapshot } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
-import { IResolvedTextEditorModel } from '@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService';
+import { ITextBufferFactory, ITextModel, ITextSnapshot } from '@theia/monaco-editor-core/esm/vs/editor/common/model.js';
+import { IResolvedTextEditorModel } from '@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService.js';
 import * as monaco from '@theia/monaco-editor-core';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language';
-import { IModelService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/model';
-import { createTextBufferFactoryFromStream } from '@theia/monaco-editor-core/esm/vs/editor/common/model/textModel';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language.js';
+import { IModelService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/model.js';
+import { createTextBufferFactoryFromStream } from '@theia/monaco-editor-core/esm/vs/editor/common/model/textModel.js';
 import { editorGeneratedPreferenceProperties } from '@theia/editor/lib/common/editor-generated-preference-schema';
 import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
@@ -577,7 +577,12 @@ export class MonacoEditorModel implements IResolvedTextEditorModel, TextEditorDo
             this.updateContentEncoding();
             this.setValid(true);
 
-            if (token.isCancellationRequested && this.model.getAlternativeVersionId() !== currentToSaveVersion) {
+            if (this.model.getAlternativeVersionId() !== currentToSaveVersion) {
+                // Edited while the content was being written: the model stays dirty, and what was written is the saved version.
+                if (!token.isCancellationRequested) {
+                    this.bufferSavedVersionId = currentToSaveVersion;
+                    this.fireDidSaveModel();
+                }
                 return;
             }
 

package/src/browser/monaco-editor-overlay-button.ts

@@ -17,7 +17,7 @@
 import { Disposable, DisposableCollection, Emitter } from '@theia/core';
 import { DISABLED_CLASS, onDomEvent } from '@theia/core/lib/browser';
 import * as monaco from '@theia/monaco-editor-core';
-import { MonacoEditor } from './monaco-editor';
+import { MonacoEditor } from './monaco-editor.js';
 
 export class MonacoEditorOverlayButton implements Disposable {
 

package/src/browser/monaco-editor-peek-view-widget.ts

@@ -16,19 +16,19 @@
 
 import { Position, Range } from '@theia/core/shared/vscode-languageserver-protocol';
 import { DisposableCollection } from '@theia/core';
-import { MonacoEditor } from './monaco-editor';
+import { MonacoEditor } from './monaco-editor.js';
 import * as monaco from '@theia/monaco-editor-core';
-import { PeekViewWidget, IPeekViewOptions, IPeekViewStyles } from '@theia/monaco-editor-core/esm/vs/editor/contrib/peekView/browser/peekView';
-import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
-import { ActionBar } from '@theia/monaco-editor-core/esm/vs/base/browser/ui/actionbar/actionbar';
-import { Action } from '@theia/monaco-editor-core/esm/vs/base/common/actions';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation';
-import { IThemeService } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
-import { Color } from '@theia/monaco-editor-core/esm/vs/base/common/color';
+import { PeekViewWidget, IPeekViewOptions, IPeekViewStyles } from '@theia/monaco-editor-core/esm/vs/editor/contrib/peekView/browser/peekView.js';
+import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser.js';
+import { ActionBar } from '@theia/monaco-editor-core/esm/vs/base/browser/ui/actionbar/actionbar.js';
+import { Action } from '@theia/monaco-editor-core/esm/vs/base/common/actions.js';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation.js';
+import { IThemeService } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService.js';
+import { Color } from '@theia/monaco-editor-core/esm/vs/base/common/color.js';
 
 export { peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground }
-    from '@theia/monaco-editor-core/esm/vs/editor/contrib/peekView/browser/peekView';
+    from '@theia/monaco-editor-core/esm/vs/editor/contrib/peekView/browser/peekView.js';
 
 export namespace MonacoEditorPeekViewWidget {
     export interface Styles {

package/src/browser/monaco-editor-provider.ts

@@ -20,33 +20,33 @@ import { TextEditor, DiffNavigator } from '@theia/editor/lib/browser';
 import { DiffUris } from '@theia/core/lib/browser/diff-uris';
 import { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify';
 import { DisposableCollection, deepClone, Disposable, CancellationToken } from '@theia/core/lib/common';
-import { MonacoDiffEditor } from './monaco-diff-editor';
-import { MonacoDiffNavigatorFactory } from './monaco-diff-navigator-factory';
-import { EditorServiceOverrides, MonacoEditor, MonacoEditorServices } from './monaco-editor';
-import { MonacoEditorModel, TextDocumentSaveReason } from './monaco-editor-model';
-import { MonacoWorkspace } from './monaco-workspace';
+import { MonacoDiffEditor } from './monaco-diff-editor.js';
+import { MonacoDiffNavigatorFactory } from './monaco-diff-navigator-factory.js';
+import { EditorServiceOverrides, MonacoEditor, MonacoEditorServices } from './monaco-editor.js';
+import { MonacoEditorModel, TextDocumentSaveReason } from './monaco-editor-model.js';
+import { MonacoWorkspace } from './monaco-workspace.js';
 import { ContributionProvider, ILogger } from '@theia/core';
 import { KeybindingRegistry, OpenerService, open, WidgetOpenerOptions, SaveOptions, FormatType } from '@theia/core/lib/browser';
-import { MonacoResolvedKeybinding } from './monaco-resolved-keybinding';
+import { MonacoResolvedKeybinding } from './monaco-resolved-keybinding.js';
 import { HttpOpenHandlerOptions } from '@theia/core/lib/browser/http-open-handler';
-import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
-import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
+import { MonacoToProtocolConverter } from './monaco-to-protocol-converter.js';
+import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter.js';
 import * as monaco from '@theia/monaco-editor-core';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { IOpenerService, OpenExternalOptions, OpenInternalOptions } from '@theia/monaco-editor-core/esm/vs/platform/opener/common/opener';
-import { IKeybindingService } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybinding';
-import { IContextMenuService } from '@theia/monaco-editor-core/esm/vs/platform/contextview/browser/contextView';
-import { Event } from '@theia/monaco-editor-core/esm/vs/base/common/event';
-import { KeyCodeChord } from '@theia/monaco-editor-core/esm/vs/base/common/keybindings';
-import { IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
-import { ITextModelService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService';
-import { IReference } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { IOpenerService, OpenExternalOptions, OpenInternalOptions } from '@theia/monaco-editor-core/esm/vs/platform/opener/common/opener.js';
+import { IKeybindingService } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybinding.js';
+import { IContextMenuService } from '@theia/monaco-editor-core/esm/vs/platform/contextview/browser/contextView.js';
+import { Event } from '@theia/monaco-editor-core/esm/vs/base/common/event.js';
+import { KeyCodeChord } from '@theia/monaco-editor-core/esm/vs/base/common/keybindings.js';
+import { IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey.js';
+import { ITextModelService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService.js';
+import { IReference } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle.js';
 import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
-import { SimpleMonacoEditor } from './simple-monaco-editor';
-import { ICodeEditorWidgetOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget';
+import { SimpleMonacoEditor } from './simple-monaco-editor.js';
+import { ICodeEditorWidgetOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget.js';
 import { timeoutReject } from '@theia/core/lib/common/promise-util';
 import { FileSystemPreferences } from '@theia/filesystem/lib/common';
-import { insertFinalNewline } from './monaco-utilities';
+import { insertFinalNewline } from './monaco-utilities.js';
 import { EditorPreferenceChange, EditorPreferences } from '@theia/editor/lib/common/editor-preferences';
 
 export const MonacoEditorFactory = Symbol('MonacoEditorFactory');

package/src/browser/monaco-editor-service.ts

@@ -18,15 +18,15 @@ import { injectable, inject, decorate, named } from '@theia/core/shared/inversif
 import URI from '@theia/core/lib/common/uri';
 import { OpenerService, open, WidgetOpenMode, ApplicationShell } from '@theia/core/lib/browser';
 import { EditorWidget, EditorOpenerOptions, EditorManager, CustomEditorWidget } from '@theia/editor/lib/browser';
-import { MonacoEditor } from './monaco-editor';
-import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
-import { MonacoEditorModel } from './monaco-editor-model';
-import { IResourceEditorInput, ITextResourceEditorInput } from '@theia/monaco-editor-core/esm/vs/platform/editor/common/editor';
-import { StandaloneCodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditorService';
-import { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
-import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
-import { IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
-import { IThemeService } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
+import { MonacoEditor } from './monaco-editor.js';
+import { MonacoToProtocolConverter } from './monaco-to-protocol-converter.js';
+import { MonacoEditorModel } from './monaco-editor-model.js';
+import { IResourceEditorInput, ITextResourceEditorInput } from '@theia/monaco-editor-core/esm/vs/platform/editor/common/editor.js';
+import { StandaloneCodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditorService.js';
+import { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor.js';
+import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser.js';
+import { IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey.js';
+import { IThemeService } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService.js';
 import { ContributionProvider, PreferenceService } from '@theia/core';
 
 decorate(injectable(), StandaloneCodeEditorService);

package/src/browser/monaco-editor.spec.ts

@@ -21,13 +21,13 @@ import { expect } from 'chai';
 import * as sinon from 'sinon';
 import { Disposable, Event } from '@theia/core/lib/common';
 import URI from '@theia/core/lib/common/uri';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation';
-import type { MonacoEditor as MonacoEditorType, MonacoEditorServices } from './monaco-editor';
-import type { MonacoEditorModel } from './monaco-editor-model';
-import type { MonacoDiffEditor as MonacoDiffEditorType } from './monaco-diff-editor';
-import type { MonacoToProtocolConverter as MonacoToProtocolConverterType } from './monaco-to-protocol-converter';
-import type { ProtocolToMonacoConverter as ProtocolToMonacoConverterType } from './protocol-to-monaco-converter';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation.js';
+import type { MonacoEditor as MonacoEditorType, MonacoEditorServices } from './monaco-editor.js';
+import type { MonacoEditorModel } from './monaco-editor-model.js';
+import type { MonacoDiffEditor as MonacoDiffEditorType } from './monaco-diff-editor.js';
+import type { MonacoToProtocolConverter as MonacoToProtocolConverterType } from './monaco-to-protocol-converter.js';
+import type { ProtocolToMonacoConverter as ProtocolToMonacoConverterType } from './protocol-to-monaco-converter.js';
 
 disableJSDOM();
 
@@ -41,10 +41,10 @@ describe('MonacoEditor visibility', () => {
         disableJSDOM = enableJSDOM();
         // Initialize baseline services before editor imports register additional services requiring browser CSS globals.
         StandaloneServices.get(IInstantiationService);
-        ({ MonacoEditor } = await import('./monaco-editor'));
-        ({ MonacoDiffEditor } = await import('./monaco-diff-editor'));
-        ({ MonacoToProtocolConverter } = await import('./monaco-to-protocol-converter'));
-        ({ ProtocolToMonacoConverter } = await import('./protocol-to-monaco-converter'));
+        ({ MonacoEditor } = await import('./monaco-editor.js'));
+        ({ MonacoDiffEditor } = await import('./monaco-diff-editor.js'));
+        ({ MonacoToProtocolConverter } = await import('./monaco-to-protocol-converter.js'));
+        ({ ProtocolToMonacoConverter } = await import('./protocol-to-monaco-converter.js'));
     });
     after(() => disableJSDOM());
 

package/src/browser/monaco-editor.ts

@@ -38,36 +38,36 @@ import {
     EditorDecorationOptions,
     MouseTargetType
 } from '@theia/editor/lib/browser';
-import { MonacoEditorModel } from './monaco-editor-model';
-import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
-import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
+import { MonacoEditorModel } from './monaco-editor-model.js';
+import { MonacoToProtocolConverter } from './monaco-to-protocol-converter.js';
+import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter.js';
 import { TextEdit } from '@theia/core/shared/vscode-languageserver-protocol';
 import { UTF8 } from '@theia/core/lib/common/encodings';
 import * as monaco from '@theia/monaco-editor-core';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language';
-import { IInstantiationService, ServiceIdentifier } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation';
-import { ICodeEditor, IMouseTargetMargin } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
-import { IStandaloneEditorConstructionOptions, StandaloneCodeEditor, StandaloneEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
-import { ServiceCollection } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language.js';
+import { IInstantiationService, ServiceIdentifier } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation.js';
+import { ICodeEditor, IMouseTargetMargin } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser.js';
+import { IStandaloneEditorConstructionOptions, StandaloneCodeEditor, StandaloneEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor.js';
+import { ServiceCollection } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection.js';
 import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
-import { ConfigurationChangedEvent, IEditorOptions, ShowLightbulbIconMode } from '@theia/monaco-editor-core/esm/vs/editor/common/config/editorOptions';
-import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
-import { CursorColumns } from '@theia/monaco-editor-core/esm/vs/editor/common/core/cursorColumns';
-import { ICommandService } from '@theia/monaco-editor-core/esm/vs/platform/commands/common/commands';
-import { IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybinding';
-import { IThemeService } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
-import { INotificationService } from '@theia/monaco-editor-core/esm/vs/platform/notification/common/notification';
-import { IAccessibilityService } from '@theia/monaco-editor-core/esm/vs/platform/accessibility/common/accessibility';
-import { ILanguageConfigurationService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/languageConfigurationRegistry';
-import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures';
-import * as objects from '@theia/monaco-editor-core/esm/vs/base/common/objects';
+import { ConfigurationChangedEvent, IEditorOptions, ShowLightbulbIconMode } from '@theia/monaco-editor-core/esm/vs/editor/common/config/editorOptions.js';
+import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService.js';
+import { CursorColumns } from '@theia/monaco-editor-core/esm/vs/editor/common/core/cursorColumns.js';
+import { ICommandService } from '@theia/monaco-editor-core/esm/vs/platform/commands/common/commands.js';
+import { IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey.js';
+import { IKeybindingService } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybinding.js';
+import { IThemeService } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService.js';
+import { INotificationService } from '@theia/monaco-editor-core/esm/vs/platform/notification/common/notification.js';
+import { IAccessibilityService } from '@theia/monaco-editor-core/esm/vs/platform/accessibility/common/accessibility.js';
+import { ILanguageConfigurationService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/languageConfigurationRegistry.js';
+import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures.js';
+import * as objects from '@theia/monaco-editor-core/esm/vs/base/common/objects.js';
 import { Selection } from '@theia/editor/lib/browser/editor';
-import { IHoverService, WorkbenchHoverDelegate } from '@theia/monaco-editor-core/esm/vs/platform/hover/browser/hover';
-import { setHoverDelegateFactory } from '@theia/monaco-editor-core/esm/vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IMarkdownRendererService } from '@theia/monaco-editor-core/esm/vs/platform/markdown/browser/markdownRenderer';
-import { MonacoTextModelService } from './monaco-text-model-service';
+import { IHoverService, WorkbenchHoverDelegate } from '@theia/monaco-editor-core/esm/vs/platform/hover/browser/hover.js';
+import { setHoverDelegateFactory } from '@theia/monaco-editor-core/esm/vs/base/browser/ui/hover/hoverDelegateFactory.js';
+import { IMarkdownRendererService } from '@theia/monaco-editor-core/esm/vs/platform/markdown/browser/markdownRenderer.js';
+import { MonacoTextModelService } from './monaco-text-model-service.js';
 
 export type ServicePair<T> = [ServiceIdentifier<T>, T];
 

package/src/browser/monaco-formatter-service.ts

@@ -15,16 +15,16 @@
 // *****************************************************************************
 
 import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import { Emitter, Event, PreferenceInspection, PreferenceLanguageOverrideService, PreferenceScope, PreferenceService } from '@theia/core';
+import { Emitter, Event, PreferenceInspection, PreferenceScope, PreferenceService } from '@theia/core';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { FormatterInfo, FormatterService, FormatterSettingScope, FormatterStatus } from '@theia/editor/lib/browser/editor-formatter-service';
 import { TextEditor } from '@theia/editor/lib/browser';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures';
-import { DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
-import { ExtensionIdentifier } from '@theia/monaco-editor-core/esm/vs/platform/extensions/common/extensions';
-import { ITextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
-import { MonacoEditor } from './monaco-editor';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures.js';
+import { DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider } from '@theia/monaco-editor-core/esm/vs/editor/common/languages.js';
+import { ExtensionIdentifier } from '@theia/monaco-editor-core/esm/vs/platform/extensions/common/extensions.js';
+import { ITextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model.js';
+import { MonacoEditor } from './monaco-editor.js';
 
 /**
  * Extended formatter provider interface that includes extension metadata.
@@ -52,9 +52,6 @@ export class MonacoFormatterService implements FormatterService {
     @inject(PreferenceService)
     protected readonly preferenceService: PreferenceService;
 
-    @inject(PreferenceLanguageOverrideService)
-    protected readonly preferenceSchema: PreferenceLanguageOverrideService;
-
     @inject(WorkspaceService)
     protected readonly workspaceService: WorkspaceService;
 
@@ -74,25 +71,17 @@ export class MonacoFormatterService implements FormatterService {
         });
 
         this.preferenceService.onPreferenceChanged(change => {
-            if (change.preferenceName.includes(PREFERENCE_NAME)) {
+            if (change.preferenceName === PREFERENCE_NAME) {
                 this.onDidChangeFormattersEmitter.fire();
             }
         });
     }
 
-    protected getFormatterPreferenceName(languageId: string): string {
-        return this.preferenceSchema.overridePreferenceName({
-            preferenceName: PREFERENCE_NAME,
-            overrideIdentifier: languageId
-        });
-    }
-
     getFormatterStatus(editor: TextEditor): FormatterStatus {
         const { languageId, uri: resourceUri } = editor.document;
         const formatters = this.getAvailableFormatters(editor);
-        const preferenceName = this.getFormatterPreferenceName(languageId);
 
-        const configuredStatus = this.getConfiguredFormatterStatus(preferenceName, resourceUri, formatters);
+        const configuredStatus = this.getConfiguredFormatterStatus(languageId, resourceUri, formatters);
         if (configuredStatus) {
             return configuredStatus;
         }
@@ -115,11 +104,11 @@ export class MonacoFormatterService implements FormatterService {
     }
 
     protected getConfiguredFormatterStatus(
-        preferenceName: string,
+        languageId: string,
         resourceUri: string,
         formatters: FormatterInfo[]
     ): FormatterStatus | undefined {
-        const inspection = this.preferenceService.inspect<string>(preferenceName, resourceUri);
+        const inspection = this.preferenceService.inspect<string>(PREFERENCE_NAME, resourceUri, languageId);
         if (!inspection) {
             return undefined;
         }
@@ -218,19 +207,16 @@ export class MonacoFormatterService implements FormatterService {
         const isEditor = typeof languageIdOrEditor !== 'string';
         const languageId = isEditor ? languageIdOrEditor.document.languageId : languageIdOrEditor;
         const resourceUri = isEditor ? languageIdOrEditor.document.uri : undefined;
-        const preferenceName = this.getFormatterPreferenceName(languageId);
-        await this.preferenceService.set(preferenceName, formatterId, scope, resourceUri);
+        await this.preferenceService.set(PREFERENCE_NAME, formatterId, scope, resourceUri, languageId);
     }
 
     getDefaultFormatter(languageId: string, resourceUri: string): string | undefined {
-        const preferenceName = this.getFormatterPreferenceName(languageId);
-        return this.preferenceService.get<string>(preferenceName, undefined, resourceUri);
+        return this.preferenceService.get<string>(PREFERENCE_NAME, { resource: resourceUri, override: languageId });
     }
 
     getConfiguredScope(editor: TextEditor): PreferenceScope | undefined {
         const { languageId, uri: resourceUri } = editor.document;
-        const preferenceName = this.getFormatterPreferenceName(languageId);
-        const inspection = this.preferenceService.inspect<string>(preferenceName, resourceUri);
+        const inspection = this.preferenceService.inspect<string>(PREFERENCE_NAME, resourceUri, languageId);
 
         if (!inspection) {
             return undefined;