@theia/monaco 1.53.0-next.5 → 1.53.0-next.55

package/src/browser/monaco-standalone-theme-service.ts

@@ -1,51 +1,51 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-// *****************************************************************************
-// Copyright (C) 2024 STMicroelectronics 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 { IDisposable } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
-import { StandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneThemeService';
-
-export class MonacoStandaloneThemeService extends StandaloneThemeService {
-    protected get styleElements(): HTMLStyleElement[] {
-        // access private style element array
-        return (this as any)._styleElements;
-    }
-
-    protected get allCSS(): string {
-        return (this as any)._allCSS;
-    }
-
-    override registerEditorContainer(domNode: HTMLElement): IDisposable {
-        const style = domNode.ownerDocument.createElement('style');
-        style.type = 'text/css';
-        style.media = 'screen';
-        style.className = 'monaco-colors';
-        style.textContent = this.allCSS;
-        domNode.ownerDocument.head.appendChild(style);
-        this.styleElements.push(style);
-        return {
-            dispose: () => {
-                for (let i = 0; i < this.styleElements.length; i++) {
-                    if (this.styleElements[i] === style) {
-                        this.styleElements.splice(i, 1);
-                        style.remove();
-                        return;
-                    }
-                }
-            }
-        };
-    }
-}
+/* eslint-disable @typescript-eslint/no-explicit-any */
+// *****************************************************************************
+// Copyright (C) 2024 STMicroelectronics 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 { IDisposable } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
+import { StandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneThemeService';
+
+export class MonacoStandaloneThemeService extends StandaloneThemeService {
+    protected get styleElements(): HTMLStyleElement[] {
+        // access private style element array
+        return (this as any)._styleElements;
+    }
+
+    protected get allCSS(): string {
+        return (this as any)._allCSS;
+    }
+
+    override registerEditorContainer(domNode: HTMLElement): IDisposable {
+        const style = domNode.ownerDocument.createElement('style');
+        style.type = 'text/css';
+        style.media = 'screen';
+        style.className = 'monaco-colors';
+        style.textContent = this.allCSS;
+        domNode.ownerDocument.head.appendChild(style);
+        this.styleElements.push(style);
+        return {
+            dispose: () => {
+                for (let i = 0; i < this.styleElements.length; i++) {
+                    if (this.styleElements[i] === style) {
+                        this.styleElements.splice(i, 1);
+                        style.remove();
+                        return;
+                    }
+                }
+            }
+        };
+    }
+}

package/src/browser/monaco-status-bar-contribution.ts

@@ -1,110 +1,110 @@
-// *****************************************************************************
-// Copyright (C) 2018 Ericsson
-//
-// 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 { injectable, inject } from '@theia/core/shared/inversify';
-import { DisposableCollection, nls } from '@theia/core';
-import { FrontendApplicationContribution, FrontendApplication, StatusBar, StatusBarAlignment } from '@theia/core/lib/browser';
-import { EditorCommands, EditorManager, EditorWidget } from '@theia/editor/lib/browser';
-import { MonacoEditor } from './monaco-editor';
-import * as monaco from '@theia/monaco-editor-core';
-
-@injectable()
-export class MonacoStatusBarContribution implements FrontendApplicationContribution {
-
-    protected readonly toDispose = new DisposableCollection();
-
-    constructor(
-        @inject(EditorManager) protected readonly editorManager: EditorManager,
-        @inject(StatusBar) protected readonly statusBar: StatusBar
-    ) { }
-
-    onStart(app: FrontendApplication): void {
-        this.updateStatusBar();
-        this.editorManager.onCurrentEditorChanged(() => this.updateStatusBar());
-    }
-
-    protected updateStatusBar(): void {
-        const editor = this.editorManager.currentEditor;
-        const editorModel = this.getModel(editor);
-        if (editor && editorModel) {
-            this.setConfigTabSizeWidget();
-            this.setLineEndingWidget();
-
-            this.toDispose.dispose();
-            this.toDispose.push(editorModel.onDidChangeOptions(() => {
-                this.setConfigTabSizeWidget();
-                this.setLineEndingWidget();
-            }));
-            let previous = editorModel.getEOL();
-            this.toDispose.push(editorModel.onDidChangeContent(e => {
-                if (previous !== e.eol) {
-                    previous = e.eol;
-                    this.setLineEndingWidget();
-                }
-            }));
-        } else {
-            this.removeConfigTabSizeWidget();
-            this.removeLineEndingWidget();
-        }
-    }
-
-    protected setConfigTabSizeWidget(): void {
-        const editor = this.editorManager.currentEditor;
-        const editorModel = this.getModel(editor);
-        if (editor && editorModel) {
-            const modelOptions = editorModel.getOptions();
-            const tabSize = modelOptions.tabSize;
-            const indentSize = modelOptions.indentSize;
-            const spaceOrTabSizeMessage = modelOptions.insertSpaces
-                ? nls.localizeByDefault('Spaces: {0}', indentSize)
-                : nls.localizeByDefault('Tab Size: {0}', tabSize);
-            this.statusBar.setElement('editor-status-tabbing-config', {
-                text: spaceOrTabSizeMessage,
-                alignment: StatusBarAlignment.RIGHT,
-                priority: 10,
-                command: EditorCommands.CONFIG_INDENTATION.id,
-                tooltip: nls.localizeByDefault('Select Indentation')
-            });
-        }
-    }
-    protected removeConfigTabSizeWidget(): void {
-        this.statusBar.removeElement('editor-status-tabbing-config');
-    }
-
-    protected setLineEndingWidget(): void {
-        const editor = this.editorManager.currentEditor;
-        const editorModel = this.getModel(editor);
-        if (editor && editorModel) {
-            const eol = editorModel.getEOL();
-            const text = eol === '\n' ? 'LF' : 'CRLF';
-            this.statusBar.setElement('editor-status-eol', {
-                text: `${text}`,
-                alignment: StatusBarAlignment.RIGHT,
-                priority: 11,
-                command: EditorCommands.CONFIG_EOL.id,
-                tooltip: nls.localizeByDefault('Select End of Line Sequence')
-            });
-        }
-    }
-    protected removeLineEndingWidget(): void {
-        this.statusBar.removeElement('editor-status-eol');
-    }
-
-    protected getModel(editor: EditorWidget | undefined): monaco.editor.ITextModel | undefined {
-        const monacoEditor = MonacoEditor.get(editor);
-        return monacoEditor && monacoEditor.getControl().getModel() || undefined;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018 Ericsson
+//
+// 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 { injectable, inject } from '@theia/core/shared/inversify';
+import { DisposableCollection, nls } from '@theia/core';
+import { FrontendApplicationContribution, FrontendApplication, StatusBar, StatusBarAlignment } from '@theia/core/lib/browser';
+import { EditorCommands, EditorManager, EditorWidget } from '@theia/editor/lib/browser';
+import { MonacoEditor } from './monaco-editor';
+import * as monaco from '@theia/monaco-editor-core';
+
+@injectable()
+export class MonacoStatusBarContribution implements FrontendApplicationContribution {
+
+    protected readonly toDispose = new DisposableCollection();
+
+    constructor(
+        @inject(EditorManager) protected readonly editorManager: EditorManager,
+        @inject(StatusBar) protected readonly statusBar: StatusBar
+    ) { }
+
+    onStart(app: FrontendApplication): void {
+        this.updateStatusBar();
+        this.editorManager.onCurrentEditorChanged(() => this.updateStatusBar());
+    }
+
+    protected updateStatusBar(): void {
+        const editor = this.editorManager.currentEditor;
+        const editorModel = this.getModel(editor);
+        if (editor && editorModel) {
+            this.setConfigTabSizeWidget();
+            this.setLineEndingWidget();
+
+            this.toDispose.dispose();
+            this.toDispose.push(editorModel.onDidChangeOptions(() => {
+                this.setConfigTabSizeWidget();
+                this.setLineEndingWidget();
+            }));
+            let previous = editorModel.getEOL();
+            this.toDispose.push(editorModel.onDidChangeContent(e => {
+                if (previous !== e.eol) {
+                    previous = e.eol;
+                    this.setLineEndingWidget();
+                }
+            }));
+        } else {
+            this.removeConfigTabSizeWidget();
+            this.removeLineEndingWidget();
+        }
+    }
+
+    protected setConfigTabSizeWidget(): void {
+        const editor = this.editorManager.currentEditor;
+        const editorModel = this.getModel(editor);
+        if (editor && editorModel) {
+            const modelOptions = editorModel.getOptions();
+            const tabSize = modelOptions.tabSize;
+            const indentSize = modelOptions.indentSize;
+            const spaceOrTabSizeMessage = modelOptions.insertSpaces
+                ? nls.localizeByDefault('Spaces: {0}', indentSize)
+                : nls.localizeByDefault('Tab Size: {0}', tabSize);
+            this.statusBar.setElement('editor-status-tabbing-config', {
+                text: spaceOrTabSizeMessage,
+                alignment: StatusBarAlignment.RIGHT,
+                priority: 10,
+                command: EditorCommands.CONFIG_INDENTATION.id,
+                tooltip: nls.localizeByDefault('Select Indentation')
+            });
+        }
+    }
+    protected removeConfigTabSizeWidget(): void {
+        this.statusBar.removeElement('editor-status-tabbing-config');
+    }
+
+    protected setLineEndingWidget(): void {
+        const editor = this.editorManager.currentEditor;
+        const editorModel = this.getModel(editor);
+        if (editor && editorModel) {
+            const eol = editorModel.getEOL();
+            const text = eol === '\n' ? 'LF' : 'CRLF';
+            this.statusBar.setElement('editor-status-eol', {
+                text: `${text}`,
+                alignment: StatusBarAlignment.RIGHT,
+                priority: 11,
+                command: EditorCommands.CONFIG_EOL.id,
+                tooltip: nls.localizeByDefault('Select End of Line Sequence')
+            });
+        }
+    }
+    protected removeLineEndingWidget(): void {
+        this.statusBar.removeElement('editor-status-eol');
+    }
+
+    protected getModel(editor: EditorWidget | undefined): monaco.editor.ITextModel | undefined {
+        const monacoEditor = MonacoEditor.get(editor);
+        return monacoEditor && monacoEditor.getControl().getModel() || undefined;
+    }
+}