@theia/monaco 1.47.0-next.0 → 1.47.0

package/lib/browser/textmate/textmate-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"textmate-registry.js","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"textmate-registry.js","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-registry.ts"],"names":[],"mappings":"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"}

package/lib/browser/workspace-symbol-command.js

@@ -14,18 +14,10 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 var WorkspaceSymbolCommand_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkspaceSymbolCommand = void 0;
+const tslib_1 = require("tslib");
 const inversify_1 = require("@theia/core/shared/inversify");
 const environment_1 = require("@theia/core/shared/@theia/application-package/lib/environment");
 const browser_1 = require("@theia/core/lib/browser");
@@ -156,31 +148,31 @@ let WorkspaceSymbolCommand = WorkspaceSymbolCommand_1 = class WorkspaceSymbolCom
     }
 };
 WorkspaceSymbolCommand.PREFIX = '#';
-__decorate([
+(0, tslib_1.__decorate)([
     (0, inversify_1.inject)(monaco_languages_1.MonacoLanguages),
-    __metadata("design:type", monaco_languages_1.MonacoLanguages)
+    (0, tslib_1.__metadata)("design:type", monaco_languages_1.MonacoLanguages)
 ], WorkspaceSymbolCommand.prototype, "languages", void 0);
-__decorate([
+(0, tslib_1.__decorate)([
     (0, inversify_1.inject)(browser_1.OpenerService),
-    __metadata("design:type", Object)
+    (0, tslib_1.__metadata)("design:type", Object)
 ], WorkspaceSymbolCommand.prototype, "openerService", void 0);
-__decorate([
+(0, tslib_1.__decorate)([
     (0, inversify_1.inject)(quick_input_1.QuickInputService),
-    __metadata("design:type", Object)
+    (0, tslib_1.__metadata)("design:type", Object)
 ], WorkspaceSymbolCommand.prototype, "quickInputService", void 0);
-__decorate([
+(0, tslib_1.__decorate)([
     (0, inversify_1.inject)(quick_input_1.QuickAccessRegistry),
-    __metadata("design:type", Object)
+    (0, tslib_1.__metadata)("design:type", Object)
 ], WorkspaceSymbolCommand.prototype, "quickAccessRegistry", void 0);
-__decorate([
+(0, tslib_1.__decorate)([
     (0, inversify_1.inject)(common_1.SelectionService),
-    __metadata("design:type", common_1.SelectionService)
+    (0, tslib_1.__metadata)("design:type", common_1.SelectionService)
 ], WorkspaceSymbolCommand.prototype, "selectionService", void 0);
-__decorate([
+(0, tslib_1.__decorate)([
     (0, inversify_1.inject)(browser_1.LabelProvider),
-    __metadata("design:type", browser_1.LabelProvider)
+    (0, tslib_1.__metadata)("design:type", browser_1.LabelProvider)
 ], WorkspaceSymbolCommand.prototype, "labelProvider", void 0);
-WorkspaceSymbolCommand = WorkspaceSymbolCommand_1 = __decorate([
+WorkspaceSymbolCommand = WorkspaceSymbolCommand_1 = (0, tslib_1.__decorate)([
     (0, inversify_1.injectable)()
 ], WorkspaceSymbolCommand);
 exports.WorkspaceSymbolCommand = WorkspaceSymbolCommand;

package/lib/browser/workspace-symbol-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-symbol-command.js","sourceRoot":"","sources":["../../src/browser/workspace-symbol-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-symbol-command.js","sourceRoot":"","sources":["../../src/browser/workspace-symbol-command.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "@theia/monaco",
-  "version": "1.47.0-next.0+f332cad",
+  "version": "1.47.0",
   "description": "Theia - Monaco Extension",
   "dependencies": {
-    "@theia/core": "1.47.0-next.0+f332cad",
-    "@theia/editor": "1.47.0-next.0+f332cad",
-    "@theia/filesystem": "1.47.0-next.0+f332cad",
-    "@theia/markers": "1.47.0-next.0+f332cad",
-    "@theia/monaco-editor-core": "1.72.3",
-    "@theia/outline-view": "1.47.0-next.0+f332cad",
-    "@theia/workspace": "1.47.0-next.0+f332cad",
+    "@theia/core": "1.47.0",
+    "@theia/editor": "1.47.0",
+    "@theia/filesystem": "1.47.0",
+    "@theia/markers": "1.47.0",
+    "@theia/monaco-editor-core": "1.83.101",
+    "@theia/outline-view": "1.47.0",
+    "@theia/workspace": "1.47.0",
     "fast-plist": "^0.1.2",
     "idb": "^4.0.5",
     "jsonc-parser": "^2.2.0",
+    "tslib": "^2.6.2",
     "vscode-oniguruma": "1.6.1",
     "vscode-textmate": "^9.0.0"
   },
@@ -50,10 +51,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.46.0"
+    "@theia/ext-scripts": "1.47.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "f332cadcb5f05ddeabe5d87a3abc76da73ffdd1f"
+  "gitHead": "96685e37b5450a599370355ccffd4062cf1b72ab"
 }

package/src/browser/markdown-renderer/monaco-markdown-renderer.ts

@@ -16,14 +16,11 @@
 
 import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
 import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language';
-import { MarkdownRenderer as CodeMarkdownRenderer } from '@theia/monaco-editor-core/esm/vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
+import { MarkdownRenderer as CodeMarkdownRenderer, IMarkdownRendererOptions } from '@theia/monaco-editor-core/esm/vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
 import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { MonacoCommandServiceFactory } from '../monaco-command-service';
-import { MonacoEditorService } from '../monaco-editor-service';
 import * as monaco from '@theia/monaco-editor-core';
-import { OpenerService as MonacoOpenerService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/openerService';
 import { OpenerService, PreferenceService, WidgetOpenerOptions, open } from '@theia/core/lib/browser';
-import { OpenExternalOptions, OpenInternalOptions } from '@theia/monaco-editor-core/esm/vs/platform/opener/common/opener';
+import { IOpenerService, OpenExternalOptions, OpenInternalOptions } from '@theia/monaco-editor-core/esm/vs/platform/opener/common/opener';
 import { HttpOpenHandlerOptions } from '@theia/core/lib/browser/http-open-handler';
 import { URI } from '@theia/core/lib/common/uri';
 import { MarkdownRenderer, MarkdownRenderOptions, MarkdownRenderResult } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
@@ -34,8 +31,6 @@ import { DisposableCollection, DisposableGroup } from '@theia/core';
 
 @injectable()
 export class MonacoMarkdownRenderer implements MarkdownRenderer {
-    @inject(MonacoEditorService) protected readonly codeEditorService: MonacoEditorService;
-    @inject(MonacoCommandServiceFactory) protected readonly commandServiceFactory: MonacoCommandServiceFactory;
     @inject(OpenerService) protected readonly openerService: OpenerService;
     @inject(PreferenceService) protected readonly preferences: PreferenceService;
 
@@ -72,21 +67,18 @@ export class MonacoMarkdownRenderer implements MarkdownRenderer {
     @postConstruct()
     protected init(): void {
         const languages = StandaloneServices.get(ILanguageService);
-        const openerService = new MonacoOpenerService(this.codeEditorService, this.commandServiceFactory());
+        const openerService = StandaloneServices.get(IOpenerService);
         openerService.registerOpener({
             open: (u, options) => this.interceptOpen(u, options)
         });
-        const getPreference = () => this.preferences.get<string>('editor.fontFamily');
-        const rendererOptions = new Proxy(Object.create(null), { // eslint-disable-line no-null/no-null
-            get(_, field): string | undefined {
-                if (field === 'codeBlockFontFamily') {
-                    return getPreference();
-                } else {
-                    return undefined;
-                }
+        const that = this;
+        const prefs = new class implements IMarkdownRendererOptions {
+            get codeBlockFontFamily(): string | undefined {
+                return that.preferences.get<string>('editor.fontFamily');
             }
-        });
-        this.delegate = new CodeMarkdownRenderer(rendererOptions, languages, openerService);
+        };
+
+        this.delegate = new CodeMarkdownRenderer(prefs, languages, openerService);
     }
 
     protected async interceptOpen(monacoUri: monaco.Uri | string, monacoOptions?: OpenInternalOptions | OpenExternalOptions): Promise<boolean> {

package/src/browser/monaco-bulk-edit-service.ts

@@ -31,12 +31,12 @@ export class MonacoBulkEditService implements IBulkEditService {
 
     private _previewHandler?: IBulkEditPreviewHandler;
 
-    async apply(editsIn: ResourceEdit[] | WorkspaceEdit, options?: IBulkEditOptions): Promise<IBulkEditResult & { success: boolean }> {
+    async apply(editsIn: ResourceEdit[] | WorkspaceEdit, options?: IBulkEditOptions): Promise<IBulkEditResult> {
         const edits = Array.isArray(editsIn) ? editsIn : ResourceEdit.convert(editsIn);
 
         if (this._previewHandler && (options?.showPreview || edits.some(value => value.metadata?.needsConfirmation))) {
             editsIn = await this._previewHandler(edits, options);
-            return { ariaSummary: '', success: true };
+            return { ariaSummary: '', isApplied: true };
         } else {
             return this.workspace.applyBulkEdit(edits, options);
         }

package/src/browser/monaco-command-registry.ts

@@ -36,7 +36,10 @@ export class MonacoCommandRegistry {
 
     @inject(SelectionService) protected readonly selectionService: SelectionService;
 
-    validate(command: string): string | undefined {
+    validate(command: string | undefined): string | undefined {
+        if (!command) {
+            return undefined;
+        }
         return this.commands.commandIds.indexOf(command) !== -1 ? command : undefined;
     }
 

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

@@ -14,18 +14,14 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
 import { CommandRegistry } from '@theia/core/lib/common/command';
 import { Emitter } from '@theia/core/lib/common/event';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { ICommandEvent, ICommandService } from '@theia/monaco-editor-core/esm/vs/platform/commands/common/commands';
-import { StandaloneCommandService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+import { StandaloneCommandService, StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 import * as monaco from '@theia/monaco-editor-core';
-
-export const MonacoCommandServiceFactory = Symbol('MonacoCommandServiceFactory');
-export interface MonacoCommandServiceFactory {
-    (): MonacoCommandService;
-}
+import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation';
 
 @injectable()
 export class MonacoCommandService implements ICommandService, Disposable {
@@ -38,7 +34,6 @@ export class MonacoCommandService implements ICommandService, Disposable {
     );
 
     protected delegate: StandaloneCommandService | undefined;
-    protected readonly delegateListeners = new DisposableCollection();
 
     constructor(
         @inject(CommandRegistry) protected readonly commandRegistry: CommandRegistry
@@ -47,6 +42,19 @@ export class MonacoCommandService implements ICommandService, Disposable {
         this.toDispose.push(this.commandRegistry.onDidExecuteCommand(e => this.onDidExecuteCommandEmitter.fire(e)));
     }
 
+    @postConstruct()
+    init(): void {
+        this.delegate = new StandaloneCommandService(StandaloneServices.get(IInstantiationService));
+        if (this.delegate) {
+            this.toDispose.push(this.delegate.onWillExecuteCommand(event =>
+                this.onWillExecuteCommandEmitter.fire(event)
+            ));
+            this.toDispose.push(this.delegate.onDidExecuteCommand(event =>
+                this.onDidExecuteCommandEmitter.fire(event)
+            ));
+        }
+    }
+
     dispose(): void {
         this.toDispose.dispose();
     }
@@ -59,23 +67,6 @@ export class MonacoCommandService implements ICommandService, Disposable {
         return this.onDidExecuteCommandEmitter.event;
     }
 
-    setDelegate(delegate: StandaloneCommandService | undefined): void {
-        if (this.toDispose.disposed) {
-            return;
-        }
-        this.delegateListeners.dispose();
-        this.toDispose.push(this.delegateListeners);
-        this.delegate = delegate;
-        if (this.delegate) {
-            this.delegateListeners.push(this.delegate.onWillExecuteCommand(event =>
-                this.onWillExecuteCommandEmitter.fire(event)
-            ));
-            this.delegateListeners.push(this.delegate.onDidExecuteCommand(event =>
-                this.onDidExecuteCommandEmitter.fire(event)
-            ));
-        }
-    }
-
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     async executeCommand(commandId: any, ...args: any[]): Promise<any> {
         try {

package/src/browser/monaco-command.ts

@@ -21,16 +21,15 @@ import { CommonCommands, QuickInputService, ApplicationShell } from '@theia/core
 import { EditorCommands, EditorManager, EditorWidget } from '@theia/editor/lib/browser';
 import { MonacoEditor } from './monaco-editor';
 import { MonacoCommandRegistry, MonacoEditorCommandHandler } from './monaco-command-registry';
-import { MonacoEditorService } from './monaco-editor-service';
-import { MonacoTextModelService } from './monaco-text-model-service';
 import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
 import { nls } from '@theia/core/lib/common/nls';
-import { ContextKeyService as VSCodeContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
 import { EditorExtensionsRegistry } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorExtensions';
 import { CommandsRegistry, ICommandService } from '@theia/monaco-editor-core/esm/vs/platform/commands/common/commands';
 import * as monaco from '@theia/monaco-editor-core';
 import { EndOfLineSequence } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
 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 { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
 
 export namespace MonacoCommands {
 
@@ -67,15 +66,6 @@ export class MonacoEditorCommandHandlers implements CommandContribution {
     @inject(QuickInputService) @optional()
     protected readonly quickInputService: QuickInputService;
 
-    @inject(MonacoEditorService)
-    protected readonly codeEditorService: MonacoEditorService;
-
-    @inject(MonacoTextModelService)
-    protected readonly textModelService: MonacoTextModelService;
-
-    @inject(VSCodeContextKeyService)
-    protected readonly contextKeyService: VSCodeContextKeyService;
-
     @inject(ApplicationShell)
     protected readonly shell: ApplicationShell;
 
@@ -135,10 +125,10 @@ export class MonacoEditorCommandHandlers implements CommandContribution {
      * and execute them using the instantiation service of the current editor.
      */
     protected registerMonacoCommands(): void {
-        const editorActions = new Map(EditorExtensionsRegistry.getEditorActions().map(({ id, label, alias }) => [id, { label, alias }]));
+        const editorActions = new Map([...EditorExtensionsRegistry.getEditorActions()].map(({ id, label, alias }) => [id, { label, alias }]));
 
-        const { codeEditorService } = this;
-        const globalInstantiationService = StandaloneServices.initialize({});
+        const codeEditorService = StandaloneServices.get(ICodeEditorService);
+        const globalInstantiationService = StandaloneServices.get(IInstantiationService);
         const monacoCommands = CommandsRegistry.getCommands();
         for (const id of monacoCommands.keys()) {
             if (MonacoCommands.EXCLUDE_ACTIONS.has(id)) {

package/src/browser/monaco-context-key-service.ts

@@ -14,22 +14,24 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { injectable, postConstruct } from '@theia/core/shared/inversify';
 import {
     ContextKeyService as TheiaContextKeyService, ContextKey, ContextKeyChangeEvent,
     ScopedValueStore, ContextMatcher, ContextKeyValue
 } from '@theia/core/lib/browser/context-key-service';
 import { Emitter } from '@theia/core';
-import { AbstractContextKeyService, ContextKeyService as VSCodeContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
+import { AbstractContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
 import { ContextKeyExpr, ContextKeyExpression, IContext, IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 
 @injectable()
 export class MonacoContextKeyService implements TheiaContextKeyService {
     protected readonly onDidChangeEmitter = new Emitter<ContextKeyChangeEvent>();
     readonly onDidChange = this.onDidChangeEmitter.event;
 
-    @inject(VSCodeContextKeyService)
-    protected readonly contextKeyService: VSCodeContextKeyService;
+    get contextKeyService(): AbstractContextKeyService {
+        return StandaloneServices.get(IContextKeyService) as AbstractContextKeyService;
+    }
 
     @postConstruct()
     protected init(): void {
@@ -125,8 +127,7 @@ export class MonacoContextKeyService implements TheiaContextKeyService {
                     return parsed.evaluate(ctx);
                 }
                 return true;
-            },
-            dispose: () => delegate.dispose(),
+            }
         };
     }
 

package/src/browser/monaco-context-menu.ts

@@ -17,13 +17,14 @@
 import { injectable, inject } from '@theia/core/shared/inversify';
 import { MenuPath } from '@theia/core/lib/common/menu';
 import { EDITOR_CONTEXT_MENU } from '@theia/editor/lib/browser';
-import { ContextMenuRenderer, toAnchor } from '@theia/core/lib/browser';
+import { Anchor, ContextMenuRenderer, Coordinate } from '@theia/core/lib/browser';
 import { Menu } from '@theia/core/shared/@phosphor/widgets';
 import { CommandRegistry } from '@theia/core/shared/@phosphor/commands';
 import { IContextMenuService } from '@theia/monaco-editor-core/esm/vs/platform/contextview/browser/contextView';
 import { IContextMenuDelegate } from '@theia/monaco-editor-core/esm/vs/base/browser/contextmenu';
 import { MenuItemAction } from '@theia/monaco-editor-core/esm/vs/platform/actions/common/actions';
 import { Event, Emitter } from '@theia/monaco-editor-core/esm/vs/base/common/event';
+import { StandardMouseEvent } from '@theia/monaco-editor-core/esm/vs/base/browser/mouseEvent';
 
 @injectable()
 export class MonacoContextMenuService implements IContextMenuService {
@@ -38,11 +39,20 @@ export class MonacoContextMenuService implements IContextMenuService {
         return this.onDidShowContextMenuEmitter.event;
     };
 
-    constructor(@inject(ContextMenuRenderer) protected readonly contextMenuRenderer: ContextMenuRenderer) {
+    @inject(ContextMenuRenderer) protected readonly contextMenuRenderer: ContextMenuRenderer;
+
+    toAnchor(anchor: HTMLElement | Coordinate | StandardMouseEvent): Anchor {
+        if (anchor instanceof HTMLElement) {
+            return { x: anchor.offsetLeft, y: anchor.offsetTop };
+        } else if (anchor instanceof StandardMouseEvent) {
+            return { x: anchor.posx, y: anchor.posy };
+        } else {
+            return anchor;
+        }
     }
 
     showContextMenu(delegate: IContextMenuDelegate): void {
-        const anchor = toAnchor(delegate.getAnchor());
+        const anchor = this.toAnchor(delegate.getAnchor());
         const actions = delegate.getActions();
         const onHide = () => {
             delegate.onHide?.(false);

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

@@ -23,16 +23,15 @@ import { MonacoDiffNavigatorFactory } from './monaco-diff-navigator-factory';
 import { DiffUris } from '@theia/core/lib/browser/diff-uris';
 import * as monaco from '@theia/monaco-editor-core';
 import { IDiffEditorConstructionOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
-import { IDiffNavigatorOptions } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneEditor';
-import { StandaloneDiffEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
+import { StandaloneDiffEditor2 } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
 
 export namespace MonacoDiffEditor {
-    export interface IOptions extends MonacoEditor.ICommonOptions, IDiffEditorConstructionOptions, IDiffNavigatorOptions {
+    export interface IOptions extends MonacoEditor.ICommonOptions, IDiffEditorConstructionOptions {
     }
 }
 
 export class MonacoDiffEditor extends MonacoEditor {
-    protected _diffEditor: monaco.editor.IStandaloneDiffEditor;
+    protected _diffEditor: StandaloneDiffEditor2;
     protected _diffNavigator: DiffNavigator;
 
     constructor(
@@ -43,18 +42,18 @@ export class MonacoDiffEditor extends MonacoEditor {
         services: MonacoEditorServices,
         protected readonly diffNavigatorFactory: MonacoDiffNavigatorFactory,
         options?: MonacoDiffEditor.IOptions,
-        override?: EditorServiceOverrides,
+        override?: EditorServiceOverrides
     ) {
         super(uri, modifiedModel, node, services, options, override);
         this.documents.add(originalModel);
         const original = originalModel.textEditorModel;
         const modified = modifiedModel.textEditorModel;
-        this._diffNavigator = diffNavigatorFactory.createdDiffNavigator(this._diffEditor, options);
+        this._diffNavigator = diffNavigatorFactory.createdDiffNavigator(this._diffEditor);
         this._diffEditor.setModel({ original, modified });
     }
 
     get diffEditor(): monaco.editor.IStandaloneDiffEditor {
-        return this._diffEditor;
+        return this._diffEditor as unknown as monaco.editor.IStandaloneDiffEditor;
     }
 
     get diffNavigator(): DiffNavigator {
@@ -68,8 +67,8 @@ export class MonacoDiffEditor extends MonacoEditor {
          *  Incomparable enums prevent TypeScript from believing that public IStandaloneDiffEditor is satisfied by private StandaloneDiffEditor
          */
         this._diffEditor = instantiator
-            .createInstance(StandaloneDiffEditor, this.node, { ...options, fixedOverflowWidgets: true }) as unknown as monaco.editor.IStandaloneDiffEditor;
-        this.editor = this._diffEditor.getModifiedEditor();
+            .createInstance(StandaloneDiffEditor2, this.node, { ...options, fixedOverflowWidgets: true });
+        this.editor = this._diffEditor.getModifiedEditor() as unknown as monaco.editor.IStandaloneCodeEditor;
         return this._diffEditor;
     }
 

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

@@ -16,46 +16,24 @@
 
 import { injectable } from '@theia/core/shared/inversify';
 import { DiffNavigator } from '@theia/editor/lib/browser';
-import * as monaco from '@theia/monaco-editor-core';
-import { DiffNavigator as MonacoDiffNavigator } from '@theia/monaco-editor-core/esm/vs/editor/browser/widget/diffNavigator';
-import { IStandaloneDiffEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
+import { StandaloneDiffEditor2 } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
 
 @injectable()
 export class MonacoDiffNavigatorFactory {
 
     static nullNavigator = <DiffNavigator>{
-        canNavigate: () => false,
         hasNext: () => false,
         hasPrevious: () => false,
         next: () => { },
         previous: () => { },
     };
 
-    createdDiffNavigator(editor: IStandaloneDiffEditor | monaco.editor.IStandaloneDiffEditor, options?: monaco.editor.IDiffNavigatorOptions): DiffNavigator {
-        const navigator = new MonacoDiffNavigator(editor as IStandaloneDiffEditor, options);
-        const ensureInitialized = (fwd: boolean) => {
-            if (navigator['nextIdx'] < 0) {
-                navigator['_initIdx'](fwd);
-            }
-        };
+    createdDiffNavigator(editor: StandaloneDiffEditor2): DiffNavigator {
         return {
-            canNavigate: () => navigator.canNavigate(),
-            hasNext: () => {
-                if (navigator.canNavigate()) {
-                    ensureInitialized(true);
-                    return navigator['nextIdx'] + 1 < navigator['ranges'].length;
-                }
-                return false;
-            },
-            hasPrevious: () => {
-                if (navigator.canNavigate()) {
-                    ensureInitialized(false);
-                    return navigator['nextIdx'] > 0;
-                }
-                return false;
-            },
-            next: () => navigator.next(),
-            previous: () => navigator.previous(),
+            hasNext: () => true,
+            hasPrevious: () => true,
+            next: () => editor.goToDiff('next'),
+            previous: () => editor.goToDiff('previous')
         };
     }
 }

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

@@ -32,6 +32,7 @@ import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common
 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 { editorGeneratedPreferenceProperties } from '@theia/editor/lib/browser/editor-generated-preference-schema';
+import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
 
 export {
     TextDocumentSaveReason
@@ -81,6 +82,8 @@ export class MonacoEditorModel implements IResolvedTextEditorModel, TextEditorDo
     protected readonly onDidChangeEncodingEmitter = new Emitter<string>();
     readonly onDidChangeEncoding = this.onDidChangeEncodingEmitter.event;
 
+    readonly onDidChangeReadOnly: Event<boolean | MarkdownString> = this.resource.onDidChangeReadOnly ?? Event.None;
+
     private preferredEncoding: string | undefined;
     private contentEncoding: string | undefined;
 
@@ -302,11 +305,11 @@ export class MonacoEditorModel implements IResolvedTextEditorModel, TextEditorDo
         return this.m2p.asRange(this.model.validateRange(this.p2m.asRange(range)));
     }
 
-    get readOnly(): boolean {
-        return this.resource.saveContents === undefined;
+    get readOnly(): boolean | MarkdownString {
+        return this.resource.readOnly ?? false;
     }
 
-    isReadonly(): boolean {
+    isReadonly(): boolean | MarkdownString {
         return this.readOnly;
     }