@theia/monaco 1.59.0-next.72 → 1.60.0-next.43

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@theia/monaco",
-  "version": "1.59.0-next.72+f41d8efcd",
+  "version": "1.60.0-next.43+2a13720d2",
   "description": "Theia - Monaco Extension",
   "dependencies": {
-    "@theia/core": "1.59.0-next.72+f41d8efcd",
-    "@theia/editor": "1.59.0-next.72+f41d8efcd",
-    "@theia/filesystem": "1.59.0-next.72+f41d8efcd",
-    "@theia/markers": "1.59.0-next.72+f41d8efcd",
+    "@theia/core": "1.60.0-next.43+2a13720d2",
+    "@theia/editor": "1.60.0-next.43+2a13720d2",
+    "@theia/filesystem": "1.60.0-next.43+2a13720d2",
+    "@theia/markers": "1.60.0-next.43+2a13720d2",
     "@theia/monaco-editor-core": "1.96.302",
-    "@theia/outline-view": "1.59.0-next.72+f41d8efcd",
-    "@theia/workspace": "1.59.0-next.72+f41d8efcd",
+    "@theia/outline-view": "1.60.0-next.43+2a13720d2",
+    "@theia/workspace": "1.60.0-next.43+2a13720d2",
     "fast-plist": "^0.1.2",
     "idb": "^4.0.5",
     "jsonc-parser": "^2.2.0",
@@ -52,10 +52,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.58.0"
+    "@theia/ext-scripts": "1.59.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "f41d8efcd4abb79167b74bf476eafc7857e97306"
+  "gitHead": "2a13720d2d41d8ae6ee4e34cd2dee1c656a18018"
 }

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

@@ -18,8 +18,8 @@ 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 { 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 { Menu } from '@theia/core/shared/@lumino/widgets';
+import { CommandRegistry } from '@theia/core/shared/@lumino/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';
@@ -51,14 +51,14 @@ export class MonacoContextMenuService implements IContextMenuService {
         }
     }
 
-    private getContext(delegate: IContextMenuDelegate): HTMLElement | undefined {
+    private getContext(delegate: IContextMenuDelegate): HTMLElement {
         const anchor = delegate.getAnchor();
         if (anchor instanceof HTMLElement) {
             return anchor;
         } else if (anchor instanceof StandardMouseEvent) {
             return anchor.target;
         } else {
-            return undefined;
+            return window.document.body; // last resort
         }
     }
     showContextMenu(delegate: IContextMenuDelegate): void {

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

@@ -31,6 +31,8 @@ import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform
 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';
 
 export namespace MonacoDiffEditor {
     export interface IOptions extends MonacoEditor.ICommonOptions, IDiffEditorConstructionOptions {
@@ -40,6 +42,9 @@ export namespace MonacoDiffEditor {
 export class MonacoDiffEditor extends MonacoEditor {
     protected _diffEditor: IStandaloneDiffEditor;
     protected _diffNavigator: DiffNavigator;
+    protected savedDiffState: monaco.editor.IDiffEditorViewState | null;
+    protected originalTextModel: monaco.editor.ITextModel;
+    protected modifiedTextModel: monaco.editor.ITextModel;
 
     constructor(
         uri: URI,
@@ -53,9 +58,12 @@ export class MonacoDiffEditor extends MonacoEditor {
         parentEditor?: MonacoEditor
     ) {
         super(uri, modifiedModel, node, services, options, override, parentEditor);
+        this.originalTextModel = originalModel.textEditorModel;
+        this.modifiedTextModel = modifiedModel.textEditorModel;
         this.documents.add(originalModel);
         const original = originalModel.textEditorModel;
         const modified = modifiedModel.textEditorModel;
+        this.wordWrapOverride = options?.wordWrapOverride2;
         this._diffNavigator = diffNavigatorFactory.createdDiffNavigator(this._diffEditor);
         this._diffEditor.setModel({ original, modified });
     }
@@ -69,7 +77,7 @@ export class MonacoDiffEditor extends MonacoEditor {
     }
 
     protected override create(options?: IDiffEditorConstructionOptions, override?: EditorServiceOverrides): Disposable {
-        options = { ...options, fixedOverflowWidgets: true };
+        options = { ...options, fixedOverflowWidgets: false };
         const instantiator = this.getInstantiatorWithOverrides(override);
         /**
          *  @monaco-uplift. Should be guaranteed to work.
@@ -82,10 +90,20 @@ export class MonacoDiffEditor extends MonacoEditor {
         return this._diffEditor;
     }
 
+    protected wordWrapOverride: IEditorOptions['wordWrapOverride2'];
+    protected lastReachedSideBySideBreakpoint = true;
     protected override resize(dimension: Dimension | null): void {
         if (this.node) {
             const layoutSize = this.computeLayoutSize(this.node, dimension);
             this._diffEditor.layout(layoutSize);
+            // Workaround for https://github.com/microsoft/vscode/issues/217386#issuecomment-2711750462
+            const leftEditor = this._diffEditor.getOriginalEditor();
+            const hasReachedSideBySideBreakpoint = leftEditor.contextKeyService
+                .getContextKeyValue(EditorContextKeys.diffEditorRenderSideBySideInlineBreakpointReached.key);
+            if (hasReachedSideBySideBreakpoint !== this.lastReachedSideBySideBreakpoint) {
+                leftEditor.updateOptions({ wordWrapOverride2: this.wordWrapOverride ?? hasReachedSideBySideBreakpoint ?  'off' : 'inherit' });
+            }
+            this.lastReachedSideBySideBreakpoint = !!hasReachedSideBySideBreakpoint;
         }
     }
 
@@ -110,6 +128,26 @@ export class MonacoDiffEditor extends MonacoEditor {
     override shouldDisplayDirtyDiff(): boolean {
         return false;
     }
+
+    override handleVisibilityChanged(nowVisible: boolean): void {
+        if (nowVisible) {
+            this.diffEditor.setModel({original: this.originalTextModel, modified: this.modifiedTextModel});
+            this.diffEditor.restoreViewState(this.savedDiffState);
+            this.diffEditor.focus();
+        } else {
+            const originalModel = this.diffEditor.getOriginalEditor().getModel();
+            if (originalModel) {
+                this.originalTextModel = originalModel;
+            }
+            const modifiedModel = this.diffEditor.getModifiedEditor().getModel();
+            if (modifiedModel) {
+                this.modifiedTextModel = modifiedModel;
+            }
+            this.savedDiffState = this.diffEditor.saveViewState();
+            // eslint-disable-next-line no-null/no-null
+            this.diffEditor.setModel(null);
+        }
+    }
 }
 
 class EmbeddedDiffEditor extends EmbeddedDiffEditorWidget implements IStandaloneDiffEditor {

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

@@ -409,7 +409,7 @@ export class MonacoEditorProvider {
         overviewRulerBorder: false,
         scrollBeyondLastLine: false,
         renderLineHighlight: 'none',
-        fixedOverflowWidgets: true,
+        fixedOverflowWidgets: false,
         acceptSuggestionOnEnter: 'smart',
         minimap: {
             enabled: false
@@ -421,7 +421,7 @@ export class MonacoEditorProvider {
         options = {
             scrollBeyondLastLine: true,
             overviewRulerLanes: 2,
-            fixedOverflowWidgets: true,
+            fixedOverflowWidgets: false,
             minimap: { enabled: false },
             renderSideBySide: false,
             readOnly: true,

package/src/browser/monaco-editor.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { injectable, inject, unmanaged } from '@theia/core/shared/inversify';
-import { ElementExt } from '@theia/core/shared/@phosphor/domutils';
+import { ElementExt } from '@theia/core/shared/@lumino/domutils';
 import URI from '@theia/core/lib/common/uri';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import { DisposableCollection, Disposable, Emitter, Event, nullToUndefined, MaybeNull } from '@theia/core/lib/common';
@@ -174,7 +174,7 @@ export class MonacoEditor extends MonacoEditorServices implements TextEditor {
         const combinedOptions = {
             ...options,
             lightbulb: { enabled: ShowLightbulbIconMode.On },
-            fixedOverflowWidgets: true,
+            fixedOverflowWidgets: false,
             scrollbar: {
                 useShadows: false,
                 verticalHasArrows: false,
@@ -559,10 +559,8 @@ export class MonacoEditor extends MonacoEditorServices implements TextEditor {
         const toPosition = (line: number): monaco.Position => this.p2m.asPosition({ line, character: 0 });
         const start = toPosition(startLineNumber).lineNumber;
         const end = toPosition(endLineNumber).lineNumber;
-        return this.editor
-            .getModel()!
-            .getLinesDecorations(start, end)
-            .map(this.toEditorDecoration.bind(this));
+        return this.editor.getModel()?.getLinesDecorations(start, end)
+            .map(this.toEditorDecoration.bind(this)) || [];
     }
 
     protected toEditorDecoration(decoration: monaco.editor.IModelDecoration): EditorDecoration & Readonly<{ id: string }> {

package/src/browser/monaco-init.ts

@@ -28,6 +28,35 @@
  */
 
 // Before importing anything from monaco we need to override its localization function
+import * as MonacoNls from '@theia/monaco-editor-core/esm/vs/nls';
+import { nls } from '@theia/core/lib/common/nls';
+import { FormatType, Localization } from '@theia/core/lib/common/i18n/localization';
+
+function localize(label: string, ...args: FormatType[]): MonacoNls.ILocalizedString {
+    const original = Localization.format(label, args);
+    if (nls.locale) {
+        const defaultKey = nls.getDefaultKey(label);
+        if (defaultKey) {
+            return {
+                original,
+                value: nls.localize(defaultKey, label, ...args)
+            };
+        }
+    }
+    return {
+        original,
+        value: original
+    };
+}
+
+Object.assign(MonacoNls, {
+    localize(_key: string, label: string, ...args: FormatType[]): string {
+        return localize(label, ...args).value;
+    },
+    localize2(_key: string, label: string, ...args: FormatType[]): MonacoNls.ILocalizedString {
+        return localize(label, ...args);
+    }
+});
 
 import { Container } from '@theia/core/shared/inversify';
 import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
@@ -51,6 +80,8 @@ import { IQuickInputService } from '@theia/monaco-editor-core/esm/vs/platform/qu
 import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
 import { MonacoStandaloneThemeService } from './monaco-standalone-theme-service';
 import { createContentHoverWidgetPatcher } from './content-hover-widget-patcher';
+import { IHoverService } from '@theia/monaco-editor-core/esm/vs/platform/hover/browser/hover';
+import { setBaseLayerHoverDelegate } from '@theia/monaco-editor-core/esm/vs/base/browser/ui/hover/hoverDelegate2';
 
 export const contentHoverWidgetPatcher = createContentHoverWidgetPatcher();
 
@@ -124,5 +155,8 @@ export namespace MonacoInit {
             [IQuickInputService.toString()]: new SyncDescriptor(MonacoQuickInputImplementationConstructor, [container]),
             [IStandaloneThemeService.toString()]: new SyncDescriptor(MonacoStandaloneThemeServiceConstructor, [])
         });
+        // Make sure the global base hover delegate is initialized as otherwise the quick input will throw an error and not update correctly
+        // in case no Monaco editor was constructed before and items with keybindings are shown. See #15042.
+        setBaseLayerHoverDelegate(StandaloneServices.get(IHoverService));
     }
 }

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

@@ -24,7 +24,7 @@ import { Disposable, DisposableCollection, Emitter, TextDocumentContentChangeDel
 import { MonacoEditorModel } from './monaco-editor-model';
 import { Dimension, EditorMouseEvent, MouseTarget, Position, TextDocumentChangeEvent } from '@theia/editor/lib/browser';
 import * as monaco from '@theia/monaco-editor-core';
-import { ElementExt } from '@theia/core/shared/@phosphor/domutils';
+import { ElementExt } from '@theia/core/shared/@lumino/domutils';
 import { Selection } from '@theia/editor/lib/browser/editor';
 import { SelectionDirection } from '@theia/monaco-editor-core/esm/vs/editor/common/core/selection';
 import { ShowLightbulbIconMode } from '@theia/monaco-editor-core/esm/vs/editor/common/config/editorOptions';
@@ -89,7 +89,7 @@ export class SimpleMonacoEditor extends MonacoEditorServices implements Disposab
         const combinedOptions = {
             ...options,
             lightbulb: { enabled: ShowLightbulbIconMode.On },
-            fixedOverflowWidgets: true,
+            fixedOverflowWidgets: false,
             automaticLayout: true,
             scrollbar: {
                 useShadows: false,

package/src/browser/style/index.css

@@ -13,7 +13,7 @@
 /*
  * set z-index to 0, so tabs are not above overlay widgets
  */
-.p-TabBar.theia-app-centers {
+.lm-TabBar.theia-app-centers {
   z-index: 0;
   display: flex;
 }