@theia/terminal 1.34.2 → 1.34.3

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

@@ -1,139 +1,139 @@
-// *****************************************************************************
-// Copyright (C) 2017 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import '../../src/browser/style/terminal.css';
-import 'xterm/css/xterm.css';
-
-import { ContainerModule, Container } from '@theia/core/shared/inversify';
-import { CommandContribution, MenuContribution, nls } from '@theia/core/lib/common';
-import { bindContributionProvider } from '@theia/core';
-import { KeybindingContribution, WebSocketConnectionProvider, WidgetFactory, KeybindingContext, FrontendApplicationContribution } from '@theia/core/lib/browser';
-import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-import { TerminalFrontendContribution } from './terminal-frontend-contribution';
-import { TerminalWidgetImpl, TERMINAL_WIDGET_FACTORY_ID } from './terminal-widget-impl';
-import { TerminalWidget, TerminalWidgetOptions } from './base/terminal-widget';
-import { ITerminalServer, terminalPath } from '../common/terminal-protocol';
-import { TerminalWatcher } from '../common/terminal-watcher';
-import { IShellTerminalServer, shellTerminalPath, ShellTerminalServerProxy } from '../common/shell-terminal-protocol';
-import { TerminalActiveContext, TerminalSearchVisibleContext } from './terminal-keybinding-contexts';
-import { createCommonBindings } from '../common/terminal-common-module';
-import { TerminalService } from './base/terminal-service';
-import { bindTerminalPreferences } from './terminal-preferences';
-import { TerminalContribution } from './terminal-contribution';
-import { TerminalSearchWidgetFactory } from './search/terminal-search-widget';
-import { TerminalQuickOpenService, TerminalQuickOpenContribution } from './terminal-quick-open-service';
-import { createTerminalSearchFactory } from './search/terminal-search-container';
-import { TerminalCopyOnSelectionHandler } from './terminal-copy-on-selection-handler';
-import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
-import { TerminalThemeService } from './terminal-theme-service';
-import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input/quick-access';
-import { createXtermLinkFactory, TerminalLinkProvider, TerminalLinkProviderContribution, XtermLinkFactory } from './terminal-link-provider';
-import { UrlLinkProvider } from './terminal-url-link-provider';
-import { FileDiffPostLinkProvider, FileDiffPreLinkProvider, FileLinkProvider } from './terminal-file-link-provider';
-import {
-    ContributedTerminalProfileStore, DefaultProfileStore, DefaultTerminalProfileService,
-    TerminalProfileService, TerminalProfileStore, UserTerminalProfileStore
-} from './terminal-profile-service';
-
-export default new ContainerModule(bind => {
-    bindTerminalPreferences(bind);
-    bind(KeybindingContext).to(TerminalActiveContext).inSingletonScope();
-    bind(KeybindingContext).to(TerminalSearchVisibleContext).inSingletonScope();
-
-    bind(TerminalWidget).to(TerminalWidgetImpl).inTransientScope();
-    bind(TerminalWatcher).toSelf().inSingletonScope();
-
-    let terminalNum = 0;
-    bind(WidgetFactory).toDynamicValue(ctx => ({
-        id: TERMINAL_WIDGET_FACTORY_ID,
-        createWidget: (options: TerminalWidgetOptions) => {
-            const child = new Container({ defaultScope: 'Singleton' });
-            child.parent = ctx.container;
-            const counter = terminalNum++;
-            const domId = options.id || 'terminal-' + counter;
-            const widgetOptions: TerminalWidgetOptions = {
-                title: `${nls.localizeByDefault('Terminal')} ${counter}`,
-                useServerTitle: true,
-                destroyTermOnClose: true,
-                ...options
-            };
-            child.bind(TerminalWidgetOptions).toConstantValue(widgetOptions);
-            child.bind('terminal-dom-id').toConstantValue(domId);
-
-            child.bind(TerminalSearchWidgetFactory).toDynamicValue(context => createTerminalSearchFactory(context.container));
-
-            return child.get(TerminalWidget);
-        }
-    }));
-
-    bind(TerminalQuickOpenService).toSelf().inSingletonScope();
-    bind(TerminalCopyOnSelectionHandler).toSelf().inSingletonScope();
-
-    bind(TerminalQuickOpenContribution).toSelf().inSingletonScope();
-    for (const identifier of [CommandContribution, QuickAccessContribution]) {
-        bind(identifier).toService(TerminalQuickOpenContribution);
-    }
-
-    bind(TerminalThemeService).toSelf().inSingletonScope();
-    bind(TerminalFrontendContribution).toSelf().inSingletonScope();
-    bind(TerminalService).toService(TerminalFrontendContribution);
-    for (const identifier of [CommandContribution, MenuContribution, KeybindingContribution, TabBarToolbarContribution, ColorContribution]) {
-        bind(identifier).toService(TerminalFrontendContribution);
-    }
-
-    bind(ITerminalServer).toDynamicValue(ctx => {
-        const connection = ctx.container.get(WebSocketConnectionProvider);
-        const terminalWatcher = ctx.container.get(TerminalWatcher);
-        return connection.createProxy<ITerminalServer>(terminalPath, terminalWatcher.getTerminalClient());
-    }).inSingletonScope();
-
-    bind(ShellTerminalServerProxy).toDynamicValue(ctx => {
-        const connection = ctx.container.get(WebSocketConnectionProvider);
-        const terminalWatcher = ctx.container.get(TerminalWatcher);
-        return connection.createProxy<IShellTerminalServer>(shellTerminalPath, terminalWatcher.getTerminalClient());
-    }).inSingletonScope();
-    bind(IShellTerminalServer).toService(ShellTerminalServerProxy);
-
-    createCommonBindings(bind);
-
-    bindContributionProvider(bind, TerminalContribution);
-
-    // terminal link provider contribution point
-    bindContributionProvider(bind, TerminalLinkProvider);
-    bind(TerminalLinkProviderContribution).toSelf().inSingletonScope();
-    bind(TerminalContribution).toService(TerminalLinkProviderContribution);
-    bind(XtermLinkFactory).toFactory(createXtermLinkFactory);
-
-    // default terminal link provider
-    bind(UrlLinkProvider).toSelf().inSingletonScope();
-    bind(TerminalLinkProvider).toService(UrlLinkProvider);
-    bind(FileLinkProvider).toSelf().inSingletonScope();
-    bind(TerminalLinkProvider).toService(FileLinkProvider);
-    bind(FileDiffPreLinkProvider).toSelf().inSingletonScope();
-    bind(TerminalLinkProvider).toService(FileDiffPreLinkProvider);
-    bind(FileDiffPostLinkProvider).toSelf().inSingletonScope();
-    bind(TerminalLinkProvider).toService(FileDiffPostLinkProvider);
-
-    bind(ContributedTerminalProfileStore).to(DefaultProfileStore).inSingletonScope();
-    bind(UserTerminalProfileStore).to(DefaultProfileStore).inSingletonScope();
-    bind(TerminalProfileService).toDynamicValue(ctx => {
-        const userStore = ctx.container.get<TerminalProfileStore>(UserTerminalProfileStore);
-        const contributedStore = ctx.container.get<TerminalProfileStore>(ContributedTerminalProfileStore);
-        return new DefaultTerminalProfileService(userStore, contributedStore);
-    }).inSingletonScope();
-
-    bind(FrontendApplicationContribution).to(TerminalFrontendContribution);
-});
+// *****************************************************************************
+// Copyright (C) 2017 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import '../../src/browser/style/terminal.css';
+import 'xterm/css/xterm.css';
+
+import { ContainerModule, Container } from '@theia/core/shared/inversify';
+import { CommandContribution, MenuContribution, nls } from '@theia/core/lib/common';
+import { bindContributionProvider } from '@theia/core';
+import { KeybindingContribution, WebSocketConnectionProvider, WidgetFactory, KeybindingContext, FrontendApplicationContribution } from '@theia/core/lib/browser';
+import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import { TerminalFrontendContribution } from './terminal-frontend-contribution';
+import { TerminalWidgetImpl, TERMINAL_WIDGET_FACTORY_ID } from './terminal-widget-impl';
+import { TerminalWidget, TerminalWidgetOptions } from './base/terminal-widget';
+import { ITerminalServer, terminalPath } from '../common/terminal-protocol';
+import { TerminalWatcher } from '../common/terminal-watcher';
+import { IShellTerminalServer, shellTerminalPath, ShellTerminalServerProxy } from '../common/shell-terminal-protocol';
+import { TerminalActiveContext, TerminalSearchVisibleContext } from './terminal-keybinding-contexts';
+import { createCommonBindings } from '../common/terminal-common-module';
+import { TerminalService } from './base/terminal-service';
+import { bindTerminalPreferences } from './terminal-preferences';
+import { TerminalContribution } from './terminal-contribution';
+import { TerminalSearchWidgetFactory } from './search/terminal-search-widget';
+import { TerminalQuickOpenService, TerminalQuickOpenContribution } from './terminal-quick-open-service';
+import { createTerminalSearchFactory } from './search/terminal-search-container';
+import { TerminalCopyOnSelectionHandler } from './terminal-copy-on-selection-handler';
+import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
+import { TerminalThemeService } from './terminal-theme-service';
+import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input/quick-access';
+import { createXtermLinkFactory, TerminalLinkProvider, TerminalLinkProviderContribution, XtermLinkFactory } from './terminal-link-provider';
+import { UrlLinkProvider } from './terminal-url-link-provider';
+import { FileDiffPostLinkProvider, FileDiffPreLinkProvider, FileLinkProvider } from './terminal-file-link-provider';
+import {
+    ContributedTerminalProfileStore, DefaultProfileStore, DefaultTerminalProfileService,
+    TerminalProfileService, TerminalProfileStore, UserTerminalProfileStore
+} from './terminal-profile-service';
+
+export default new ContainerModule(bind => {
+    bindTerminalPreferences(bind);
+    bind(KeybindingContext).to(TerminalActiveContext).inSingletonScope();
+    bind(KeybindingContext).to(TerminalSearchVisibleContext).inSingletonScope();
+
+    bind(TerminalWidget).to(TerminalWidgetImpl).inTransientScope();
+    bind(TerminalWatcher).toSelf().inSingletonScope();
+
+    let terminalNum = 0;
+    bind(WidgetFactory).toDynamicValue(ctx => ({
+        id: TERMINAL_WIDGET_FACTORY_ID,
+        createWidget: (options: TerminalWidgetOptions) => {
+            const child = new Container({ defaultScope: 'Singleton' });
+            child.parent = ctx.container;
+            const counter = terminalNum++;
+            const domId = options.id || 'terminal-' + counter;
+            const widgetOptions: TerminalWidgetOptions = {
+                title: `${nls.localizeByDefault('Terminal')} ${counter}`,
+                useServerTitle: true,
+                destroyTermOnClose: true,
+                ...options
+            };
+            child.bind(TerminalWidgetOptions).toConstantValue(widgetOptions);
+            child.bind('terminal-dom-id').toConstantValue(domId);
+
+            child.bind(TerminalSearchWidgetFactory).toDynamicValue(context => createTerminalSearchFactory(context.container));
+
+            return child.get(TerminalWidget);
+        }
+    }));
+
+    bind(TerminalQuickOpenService).toSelf().inSingletonScope();
+    bind(TerminalCopyOnSelectionHandler).toSelf().inSingletonScope();
+
+    bind(TerminalQuickOpenContribution).toSelf().inSingletonScope();
+    for (const identifier of [CommandContribution, QuickAccessContribution]) {
+        bind(identifier).toService(TerminalQuickOpenContribution);
+    }
+
+    bind(TerminalThemeService).toSelf().inSingletonScope();
+    bind(TerminalFrontendContribution).toSelf().inSingletonScope();
+    bind(TerminalService).toService(TerminalFrontendContribution);
+    for (const identifier of [CommandContribution, MenuContribution, KeybindingContribution, TabBarToolbarContribution, ColorContribution]) {
+        bind(identifier).toService(TerminalFrontendContribution);
+    }
+
+    bind(ITerminalServer).toDynamicValue(ctx => {
+        const connection = ctx.container.get(WebSocketConnectionProvider);
+        const terminalWatcher = ctx.container.get(TerminalWatcher);
+        return connection.createProxy<ITerminalServer>(terminalPath, terminalWatcher.getTerminalClient());
+    }).inSingletonScope();
+
+    bind(ShellTerminalServerProxy).toDynamicValue(ctx => {
+        const connection = ctx.container.get(WebSocketConnectionProvider);
+        const terminalWatcher = ctx.container.get(TerminalWatcher);
+        return connection.createProxy<IShellTerminalServer>(shellTerminalPath, terminalWatcher.getTerminalClient());
+    }).inSingletonScope();
+    bind(IShellTerminalServer).toService(ShellTerminalServerProxy);
+
+    createCommonBindings(bind);
+
+    bindContributionProvider(bind, TerminalContribution);
+
+    // terminal link provider contribution point
+    bindContributionProvider(bind, TerminalLinkProvider);
+    bind(TerminalLinkProviderContribution).toSelf().inSingletonScope();
+    bind(TerminalContribution).toService(TerminalLinkProviderContribution);
+    bind(XtermLinkFactory).toFactory(createXtermLinkFactory);
+
+    // default terminal link provider
+    bind(UrlLinkProvider).toSelf().inSingletonScope();
+    bind(TerminalLinkProvider).toService(UrlLinkProvider);
+    bind(FileLinkProvider).toSelf().inSingletonScope();
+    bind(TerminalLinkProvider).toService(FileLinkProvider);
+    bind(FileDiffPreLinkProvider).toSelf().inSingletonScope();
+    bind(TerminalLinkProvider).toService(FileDiffPreLinkProvider);
+    bind(FileDiffPostLinkProvider).toSelf().inSingletonScope();
+    bind(TerminalLinkProvider).toService(FileDiffPostLinkProvider);
+
+    bind(ContributedTerminalProfileStore).to(DefaultProfileStore).inSingletonScope();
+    bind(UserTerminalProfileStore).to(DefaultProfileStore).inSingletonScope();
+    bind(TerminalProfileService).toDynamicValue(ctx => {
+        const userStore = ctx.container.get<TerminalProfileStore>(UserTerminalProfileStore);
+        const contributedStore = ctx.container.get<TerminalProfileStore>(ContributedTerminalProfileStore);
+        return new DefaultTerminalProfileService(userStore, contributedStore);
+    }).inSingletonScope();
+
+    bind(FrontendApplicationContribution).to(TerminalFrontendContribution);
+});

package/src/browser/terminal-keybinding-contexts.ts

@@ -1,52 +1,52 @@
-// *****************************************************************************
-// Copyright (C) 2018 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { KeybindingContext, ApplicationShell } from '@theia/core/lib/browser';
-import { TerminalWidget } from './base/terminal-widget';
-
-export namespace TerminalKeybindingContexts {
-    export const terminalActive = 'terminalActive';
-    export const terminalHideSearch = 'hideSearch';
-}
-
-@injectable()
-export class TerminalActiveContext implements KeybindingContext {
-    readonly id: string = TerminalKeybindingContexts.terminalActive;
-
-    @inject(ApplicationShell)
-    protected readonly shell: ApplicationShell;
-
-    isEnabled(): boolean {
-        return this.shell.activeWidget instanceof TerminalWidget;
-    }
-}
-
-@injectable()
-export class TerminalSearchVisibleContext implements KeybindingContext {
-    readonly id: string = TerminalKeybindingContexts.terminalHideSearch;
-
-    @inject(ApplicationShell)
-    protected readonly shell: ApplicationShell;
-
-    isEnabled(): boolean {
-        if (!(this.shell.activeWidget instanceof TerminalWidget)) {
-            return false;
-        }
-        const searchWidget = this.shell.activeWidget.getSearchBox();
-        return searchWidget.isVisible;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { KeybindingContext, ApplicationShell } from '@theia/core/lib/browser';
+import { TerminalWidget } from './base/terminal-widget';
+
+export namespace TerminalKeybindingContexts {
+    export const terminalActive = 'terminalActive';
+    export const terminalHideSearch = 'hideSearch';
+}
+
+@injectable()
+export class TerminalActiveContext implements KeybindingContext {
+    readonly id: string = TerminalKeybindingContexts.terminalActive;
+
+    @inject(ApplicationShell)
+    protected readonly shell: ApplicationShell;
+
+    isEnabled(): boolean {
+        return this.shell.activeWidget instanceof TerminalWidget;
+    }
+}
+
+@injectable()
+export class TerminalSearchVisibleContext implements KeybindingContext {
+    readonly id: string = TerminalKeybindingContexts.terminalHideSearch;
+
+    @inject(ApplicationShell)
+    protected readonly shell: ApplicationShell;
+
+    isEnabled(): boolean {
+        if (!(this.shell.activeWidget instanceof TerminalWidget)) {
+            return false;
+        }
+        const searchWidget = this.shell.activeWidget.getSearchBox();
+        return searchWidget.isVisible;
+    }
+}