@theia/monaco 1.64.0-next.28 → 1.64.0

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

@@ -0,0 +1,69 @@
+// *****************************************************************************
+// Copyright (C) 2025 1C-Soft LLC 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 { 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';
+
+export class MonacoEditorOverlayButton implements Disposable {
+
+    private static nextId = 1;
+
+    readonly domNode: HTMLElement;
+
+    protected readonly onClickEmitter = new Emitter<void>();
+    readonly onClick = this.onClickEmitter.event;
+
+    protected readonly toDispose = new DisposableCollection(this.onClickEmitter);
+
+    constructor(
+        editor: MonacoEditor,
+        label: string,
+        id = 'theia-editor.overlayButtonWidget' + MonacoEditorOverlayButton.nextId++
+    ) {
+        this.domNode = document.createElement('div');
+        this.domNode.classList.add('overlay-button');
+        this.domNode.textContent = label;
+        this.toDispose.push(onDomEvent(this.domNode, 'click', () => this.onClickEmitter.fire()));
+
+        const overlayWidget: monaco.editor.IOverlayWidget = {
+            getId: () => id,
+            getDomNode: () => this.domNode,
+            getPosition: () => ({
+                preference: monaco.editor.OverlayWidgetPositionPreference.BOTTOM_RIGHT_CORNER
+            })
+        };
+        editor.getControl().addOverlayWidget(overlayWidget);
+        this.toDispose.push(Disposable.create(() => editor.getControl().removeOverlayWidget(overlayWidget)));
+    }
+
+    get enabled(): boolean {
+        return !this.domNode.classList.contains(DISABLED_CLASS);
+    }
+
+    set enabled(value: boolean) {
+        if (value) {
+            this.domNode.classList.remove(DISABLED_CLASS);
+        } else {
+            this.domNode.classList.add(DISABLED_CLASS);
+        }
+    }
+
+    dispose(): void {
+        this.toDispose.dispose();
+    }
+}

package/src/browser/monaco-editor.ts

@@ -124,6 +124,8 @@ export class MonacoEditor extends MonacoEditorServices implements TextEditor {
     readonly onEncodingChanged = this.document.onDidChangeEncoding;
     protected readonly onResizeEmitter = new Emitter<Dimension | null>();
     readonly onDidResize = this.onResizeEmitter.event;
+    protected readonly onShouldDisplayDirtyDiffChangedEmitter = new Emitter<boolean>;
+    readonly onShouldDisplayDirtyDiffChanged: Event<boolean> | undefined = this.onShouldDisplayDirtyDiffChangedEmitter.event;
 
     readonly documents = new Set<MonacoEditorModel>();
     protected model: monaco.editor.ITextModel | null;
@@ -146,7 +148,8 @@ export class MonacoEditor extends MonacoEditorServices implements TextEditor {
             this.onDocumentContentChangedEmitter,
             this.onMouseDownEmitter,
             this.onLanguageChangedEmitter,
-            this.onScrollChangedEmitter
+            this.onScrollChangedEmitter,
+            this.onShouldDisplayDirtyDiffChangedEmitter
         ]);
         this.documents.add(document);
         this.autoSizing = options && options.autoSizing !== undefined ? options.autoSizing : false;
@@ -162,6 +165,7 @@ export class MonacoEditor extends MonacoEditorServices implements TextEditor {
             StandaloneServices.get(IInstantiationService).createInstance(WorkbenchHoverDelegate, placement, enableInstantHover, {})
         )));
         this.addHandlers(this.editor);
+        this.editor.createContextKey('resource', document.uri);
     }
 
     protected async init(): Promise<void> {
@@ -657,8 +661,15 @@ export class MonacoEditor extends MonacoEditorServices implements TextEditor {
         return this.uri.withPath(resourceUri.path);
     }
 
+    private _shouldDisplayDirtyDiff = true;
     shouldDisplayDirtyDiff(): boolean {
-        return true;
+        return this._shouldDisplayDirtyDiff;
+    }
+    setShouldDisplayDirtyDiff(value: boolean): void {
+        if (value !== this._shouldDisplayDirtyDiff) {
+            this._shouldDisplayDirtyDiff = value;
+            this.onShouldDisplayDirtyDiffChangedEmitter.fire(value);
+        }
     }
 }
 

package/src/browser/monaco-frontend-module.ts

@@ -81,6 +81,9 @@ import { DefaultContentHoverWidgetPatcher } from './default-content-hover-widget
 import { MonacoWorkspaceContextService } from './monaco-workspace-context-service';
 import { MonacoCodeActionSaveParticipant } from './monaco-code-action-save-participant';
 import { MonacoCodeActionService, MonacoCodeActionServiceImpl } from './monaco-code-action-service';
+import { MonacoDiffComputer } from './monaco-diff-computer';
+import { DiffComputer } from '@theia/core/lib/common/diff';
+import { MonacoEditorContentMenuContribution } from './monaco-editor-content-menu';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(MonacoThemingService).toSelf().inSingletonScope();
@@ -200,6 +203,12 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
     bind(DefaultContentHoverWidgetPatcher).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(DefaultContentHoverWidgetPatcher);
+
+    bind(MonacoDiffComputer).toSelf().inSingletonScope();
+    bind(DiffComputer).toService(MonacoDiffComputer);
+
+    bind(MonacoEditorContentMenuContribution).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).to(MonacoEditorContentMenuContribution);
 });
 
 export const MonacoConfigurationService = Symbol('MonacoConfigurationService');

package/src/browser/style/index.css

@@ -273,3 +273,20 @@
 .quick-input-header > .quick-input-inline-action-bar {
   display: none;
 }
+
+.monaco-editor .overlay-button {
+  padding: 6px 11px;
+  border-radius: 2px;
+  cursor: pointer;
+  user-select: none;
+  z-index: 1;
+  background-color: var(--theia-button-background);
+  color: var(--theia-button-foreground);
+  border: 1px solid var(--theia-contrast-border);
+  font-family: var(--theia-ui-font-family);
+  line-height: 1.4;
+}
+
+.monaco-editor .overlay-button.theia-mod-disabled {
+  display: none;
+}