@theia/terminal 1.45.0 → 1.46.0-next.72

package/src/browser/terminal-theme-service.ts

@@ -1,209 +1,213 @@
-// *****************************************************************************
-// Copyright (C) 2019 TypeFox 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 { ITheme } from 'xterm';
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
-import { ColorDefaults } from '@theia/core/lib/common/color';
-import { ThemeService } from '@theia/core/lib/browser/theming';
-import { ThemeChangeEvent } from '@theia/core/lib/common/theme';
-import { Event } from '@theia/core';
-
-/**
- * It should be aligned with https://github.com/microsoft/vscode/blob/0dfa355b3ad185a6289ba28a99c141ab9e72d2be/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.ts#L40
- */
-export const terminalAnsiColorMap: { [key: string]: { index: number, defaults: ColorDefaults } } = {
-    'terminal.ansiBlack': {
-        index: 0,
-        defaults: {
-            light: '#000000',
-            dark: '#000000',
-            hcDark: '#000000',
-            hcLight: '#292929'
-        }
-    },
-    'terminal.ansiRed': {
-        index: 1,
-        defaults: {
-            light: '#cd3131',
-            dark: '#cd3131',
-            hcDark: '#cd0000',
-            hcLight: '#cd3131'
-        }
-    },
-    'terminal.ansiGreen': {
-        index: 2,
-        defaults: {
-            light: '#00BC00',
-            dark: '#0DBC79',
-            hcDark: '#00cd00',
-            hcLight: '#00bc00'
-        }
-    },
-    'terminal.ansiYellow': {
-        index: 3,
-        defaults: {
-            light: '#949800',
-            dark: '#e5e510',
-            hcDark: '#cdcd00',
-            hcLight: '#949800'
-        }
-    },
-    'terminal.ansiBlue': {
-        index: 4,
-        defaults: {
-            light: '#0451a5',
-            dark: '#2472c8',
-            hcDark: '#0000ee',
-            hcLight: '#0451a5'
-        }
-    },
-    'terminal.ansiMagenta': {
-        index: 5,
-        defaults: {
-            light: '#bc05bc',
-            dark: '#bc3fbc',
-            hcDark: '#cd00cd',
-            hcLight: '#bc05bc'
-        }
-    },
-    'terminal.ansiCyan': {
-        index: 6,
-        defaults: {
-            light: '#0598bc',
-            dark: '#11a8cd',
-            hcDark: '#00cdcd',
-            hcLight: '#0598b'
-        }
-    },
-    'terminal.ansiWhite': {
-        index: 7,
-        defaults: {
-            light: '#555555',
-            dark: '#e5e5e5',
-            hcDark: '#e5e5e5',
-            hcLight: '#555555'
-        }
-    },
-    'terminal.ansiBrightBlack': {
-        index: 8,
-        defaults: {
-            light: '#666666',
-            dark: '#666666',
-            hcDark: '#7f7f7f',
-            hcLight: '#666666'
-        }
-    },
-    'terminal.ansiBrightRed': {
-        index: 9,
-        defaults: {
-            light: '#cd3131',
-            dark: '#f14c4c',
-            hcDark: '#ff0000',
-            hcLight: '#cd3131'
-        }
-    },
-    'terminal.ansiBrightGreen': {
-        index: 10,
-        defaults: {
-            light: '#14CE14',
-            dark: '#23d18b',
-            hcDark: '#00ff00',
-            hcLight: '#00bc00'
-        }
-    },
-    'terminal.ansiBrightYellow': {
-        index: 11,
-        defaults: {
-            light: '#b5ba00',
-            dark: '#f5f543',
-            hcDark: '#ffff00',
-            hcLight: '#b5ba00'
-        }
-    },
-    'terminal.ansiBrightBlue': {
-        index: 12,
-        defaults: {
-            light: '#0451a5',
-            dark: '#3b8eea',
-            hcDark: '#5c5cff',
-            hcLight: '#0451a5'
-        }
-    },
-    'terminal.ansiBrightMagenta': {
-        index: 13,
-        defaults: {
-            light: '#bc05bc',
-            dark: '#d670d6',
-            hcDark: '#ff00ff',
-            hcLight: '#bc05bc'
-        }
-    },
-    'terminal.ansiBrightCyan': {
-        index: 14,
-        defaults: {
-            light: '#0598bc',
-            dark: '#29b8db',
-            hcDark: '#00ffff',
-            hcLight: '#0598bc'
-        }
-    },
-    'terminal.ansiBrightWhite': {
-        index: 15,
-        defaults: {
-            light: '#a5a5a5',
-            dark: '#e5e5e5',
-            hcDark: '#ffffff',
-            hcLight: '#a5a5a5'
-        }
-    }
-};
-
-@injectable()
-export class TerminalThemeService {
-
-    @inject(ColorRegistry) protected readonly colorRegistry: ColorRegistry;
-    @inject(ThemeService) protected readonly themeService: ThemeService;
-
-    get onDidChange(): Event<ThemeChangeEvent> {
-        return this.themeService.onDidColorThemeChange;
-    }
-
-    get theme(): ITheme {
-        const foregroundColor = this.colorRegistry.getCurrentColor('terminal.foreground');
-        const backgroundColor = this.colorRegistry.getCurrentColor('terminal.background') || this.colorRegistry.getCurrentColor('panel.background');
-        const cursorColor = this.colorRegistry.getCurrentColor('terminalCursor.foreground') || foregroundColor;
-        const cursorAccentColor = this.colorRegistry.getCurrentColor('terminalCursor.background') || backgroundColor;
-        const selectionColor = this.colorRegistry.getCurrentColor('terminal.selectionBackground');
-
-        const theme: ITheme = {
-            background: backgroundColor,
-            foreground: foregroundColor,
-            cursor: cursorColor,
-            cursorAccent: cursorAccentColor,
-            selection: selectionColor
-        };
-        // eslint-disable-next-line guard-for-in
-        for (const id in terminalAnsiColorMap) {
-            const colorId = id.substring(13);
-            const colorName = colorId.charAt(0).toLowerCase() + colorId.slice(1);
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            (theme as any)[colorName] = this.colorRegistry.getCurrentColor(id);
-        }
-        return theme;
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2019 TypeFox 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 { ITheme } from 'xterm';
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
+import { ColorDefaults } from '@theia/core/lib/common/color';
+import { ThemeService } from '@theia/core/lib/browser/theming';
+import { ThemeChangeEvent } from '@theia/core/lib/common/theme';
+import { Event } from '@theia/core';
+
+/**
+ * It should be aligned with https://github.com/microsoft/vscode/blob/0dfa355b3ad185a6289ba28a99c141ab9e72d2be/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.ts#L40
+ */
+export const terminalAnsiColorMap: { [key: string]: { index: number, defaults: ColorDefaults } } = {
+    'terminal.ansiBlack': {
+        index: 0,
+        defaults: {
+            light: '#000000',
+            dark: '#000000',
+            hcDark: '#000000',
+            hcLight: '#292929'
+        }
+    },
+    'terminal.ansiRed': {
+        index: 1,
+        defaults: {
+            light: '#cd3131',
+            dark: '#cd3131',
+            hcDark: '#cd0000',
+            hcLight: '#cd3131'
+        }
+    },
+    'terminal.ansiGreen': {
+        index: 2,
+        defaults: {
+            light: '#00BC00',
+            dark: '#0DBC79',
+            hcDark: '#00cd00',
+            hcLight: '#00bc00'
+        }
+    },
+    'terminal.ansiYellow': {
+        index: 3,
+        defaults: {
+            light: '#949800',
+            dark: '#e5e510',
+            hcDark: '#cdcd00',
+            hcLight: '#949800'
+        }
+    },
+    'terminal.ansiBlue': {
+        index: 4,
+        defaults: {
+            light: '#0451a5',
+            dark: '#2472c8',
+            hcDark: '#0000ee',
+            hcLight: '#0451a5'
+        }
+    },
+    'terminal.ansiMagenta': {
+        index: 5,
+        defaults: {
+            light: '#bc05bc',
+            dark: '#bc3fbc',
+            hcDark: '#cd00cd',
+            hcLight: '#bc05bc'
+        }
+    },
+    'terminal.ansiCyan': {
+        index: 6,
+        defaults: {
+            light: '#0598bc',
+            dark: '#11a8cd',
+            hcDark: '#00cdcd',
+            hcLight: '#0598b'
+        }
+    },
+    'terminal.ansiWhite': {
+        index: 7,
+        defaults: {
+            light: '#555555',
+            dark: '#e5e5e5',
+            hcDark: '#e5e5e5',
+            hcLight: '#555555'
+        }
+    },
+    'terminal.ansiBrightBlack': {
+        index: 8,
+        defaults: {
+            light: '#666666',
+            dark: '#666666',
+            hcDark: '#7f7f7f',
+            hcLight: '#666666'
+        }
+    },
+    'terminal.ansiBrightRed': {
+        index: 9,
+        defaults: {
+            light: '#cd3131',
+            dark: '#f14c4c',
+            hcDark: '#ff0000',
+            hcLight: '#cd3131'
+        }
+    },
+    'terminal.ansiBrightGreen': {
+        index: 10,
+        defaults: {
+            light: '#14CE14',
+            dark: '#23d18b',
+            hcDark: '#00ff00',
+            hcLight: '#00bc00'
+        }
+    },
+    'terminal.ansiBrightYellow': {
+        index: 11,
+        defaults: {
+            light: '#b5ba00',
+            dark: '#f5f543',
+            hcDark: '#ffff00',
+            hcLight: '#b5ba00'
+        }
+    },
+    'terminal.ansiBrightBlue': {
+        index: 12,
+        defaults: {
+            light: '#0451a5',
+            dark: '#3b8eea',
+            hcDark: '#5c5cff',
+            hcLight: '#0451a5'
+        }
+    },
+    'terminal.ansiBrightMagenta': {
+        index: 13,
+        defaults: {
+            light: '#bc05bc',
+            dark: '#d670d6',
+            hcDark: '#ff00ff',
+            hcLight: '#bc05bc'
+        }
+    },
+    'terminal.ansiBrightCyan': {
+        index: 14,
+        defaults: {
+            light: '#0598bc',
+            dark: '#29b8db',
+            hcDark: '#00ffff',
+            hcLight: '#0598bc'
+        }
+    },
+    'terminal.ansiBrightWhite': {
+        index: 15,
+        defaults: {
+            light: '#a5a5a5',
+            dark: '#e5e5e5',
+            hcDark: '#ffffff',
+            hcLight: '#a5a5a5'
+        }
+    }
+};
+
+@injectable()
+export class TerminalThemeService {
+
+    @inject(ColorRegistry) protected readonly colorRegistry: ColorRegistry;
+    @inject(ThemeService) protected readonly themeService: ThemeService;
+
+    get onDidChange(): Event<ThemeChangeEvent> {
+        return this.themeService.onDidColorThemeChange;
+    }
+
+    get theme(): ITheme {
+        const foregroundColor = this.colorRegistry.getCurrentColor('terminal.foreground');
+        const backgroundColor = this.colorRegistry.getCurrentColor('terminal.background') || this.colorRegistry.getCurrentColor('panel.background');
+        const cursorColor = this.colorRegistry.getCurrentColor('terminalCursor.foreground') || foregroundColor;
+        const cursorAccentColor = this.colorRegistry.getCurrentColor('terminalCursor.background') || backgroundColor;
+        const selectionBackgroundColor = this.colorRegistry.getCurrentColor('terminal.selectionBackground');
+        const selectionInactiveBackground = this.colorRegistry.getCurrentColor('terminal.inactiveSelectionBackground');
+        const selectionForegroundColor = this.colorRegistry.getCurrentColor('terminal.selectionForeground');
+
+        const theme: ITheme = {
+            background: backgroundColor,
+            foreground: foregroundColor,
+            cursor: cursorColor,
+            cursorAccent: cursorAccentColor,
+            selectionBackground: selectionBackgroundColor,
+            selectionInactiveBackground: selectionInactiveBackground,
+            selectionForeground: selectionForegroundColor
+        };
+        // eslint-disable-next-line guard-for-in
+        for (const id in terminalAnsiColorMap) {
+            const colorId = id.substring(13);
+            const colorName = colorId.charAt(0).toLowerCase() + colorId.slice(1);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            (theme as any)[colorName] = this.colorRegistry.getCurrentColor(id);
+        }
+        return theme;
+    }
+
+}

package/src/browser/terminal-url-link-provider.ts

@@ -1,66 +1,66 @@
-// *****************************************************************************
-// Copyright (C) 2022 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 { inject, injectable } from '@theia/core/shared/inversify';
-import { OpenerService, open } from '@theia/core/lib/browser';
-import { TerminalWidget } from './base/terminal-widget';
-import { TerminalLink, TerminalLinkProvider } from './terminal-link-provider';
-import URI from '@theia/core/lib/common/uri';
-
-@injectable()
-export class UrlLinkProvider implements TerminalLinkProvider {
-
-    @inject(OpenerService) protected readonly openerService: OpenerService;
-
-    protected readonly urlRegExp = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g;
-    protected readonly localhostRegExp = /(https?:\/\/)?(localhost|127\.0\.0\.1|0\.0\.0\.0)(:[0-9]{1,5})?([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g;
-
-    async provideLinks(line: string, terminal: TerminalWidget): Promise<TerminalLink[]> {
-        return [...this.matchUrlLinks(line), ...this.matchLocalhostLinks(line)];
-    }
-
-    protected matchUrlLinks(line: string): TerminalLink[] {
-        const links: TerminalLink[] = [];
-        let regExpResult: RegExpExecArray | null;
-        while (regExpResult = this.urlRegExp.exec(line)) {
-            const match = regExpResult![0];
-            links.push({
-                startIndex: this.urlRegExp.lastIndex - match.length,
-                length: match.length,
-                handle: () => open(this.openerService, new URI(match)).then()
-            });
-        }
-        return links;
-    }
-
-    protected matchLocalhostLinks(line: string): TerminalLink[] {
-        const links: TerminalLink[] = [];
-        let regExpResult: RegExpExecArray | null;
-        while (regExpResult = this.localhostRegExp.exec(line)) {
-            const match = regExpResult![0];
-            links.push({
-                startIndex: this.localhostRegExp.lastIndex - match.length,
-                length: match.length,
-                handle: async () => {
-                    const uri = match.startsWith('http') ? match : `http://${match}`;
-                    open(this.openerService, new URI(uri));
-                }
-            });
-        }
-        return links;
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2022 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 { inject, injectable } from '@theia/core/shared/inversify';
+import { OpenerService, open } from '@theia/core/lib/browser';
+import { TerminalWidget } from './base/terminal-widget';
+import { TerminalLink, TerminalLinkProvider } from './terminal-link-provider';
+import URI from '@theia/core/lib/common/uri';
+
+@injectable()
+export class UrlLinkProvider implements TerminalLinkProvider {
+
+    @inject(OpenerService) protected readonly openerService: OpenerService;
+
+    protected readonly urlRegExp = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g;
+    protected readonly localhostRegExp = /(https?:\/\/)?(localhost|127\.0\.0\.1|0\.0\.0\.0)(:[0-9]{1,5})?([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g;
+
+    async provideLinks(line: string, terminal: TerminalWidget): Promise<TerminalLink[]> {
+        return [...this.matchUrlLinks(line), ...this.matchLocalhostLinks(line)];
+    }
+
+    protected matchUrlLinks(line: string): TerminalLink[] {
+        const links: TerminalLink[] = [];
+        let regExpResult: RegExpExecArray | null;
+        while (regExpResult = this.urlRegExp.exec(line)) {
+            const match = regExpResult![0];
+            links.push({
+                startIndex: this.urlRegExp.lastIndex - match.length,
+                length: match.length,
+                handle: () => open(this.openerService, new URI(match)).then()
+            });
+        }
+        return links;
+    }
+
+    protected matchLocalhostLinks(line: string): TerminalLink[] {
+        const links: TerminalLink[] = [];
+        let regExpResult: RegExpExecArray | null;
+        while (regExpResult = this.localhostRegExp.exec(line)) {
+            const match = regExpResult![0];
+            links.push({
+                startIndex: this.localhostRegExp.lastIndex - match.length,
+                length: match.length,
+                handle: async () => {
+                    const uri = match.startsWith('http') ? match : `http://${match}`;
+                    open(this.openerService, new URI(uri));
+                }
+            });
+        }
+        return links;
+    }
+
+}