@theia/terminal 1.45.1 → 1.46.0-next.72

package/src/browser/search/terminal-search-widget.tsx

@@ -1,161 +1,161 @@
-// *****************************************************************************
-// Copyright (C) 2019 Red Hat, Inc. 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 { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { ReactWidget } from '@theia/core/lib/browser/widgets/react-widget';
-import * as React from '@theia/core/shared/react';
-import '../../../src/browser/style/terminal-search.css';
-import { Terminal } from 'xterm';
-import { SearchAddon, ISearchOptions } from 'xterm-addon-search';
-import { codicon, Key } from '@theia/core/lib/browser';
-
-export const TERMINAL_SEARCH_WIDGET_FACTORY_ID = 'terminal-search';
-export const TerminalSearchWidgetFactory = Symbol('TerminalSearchWidgetFactory');
-export type TerminalSearchWidgetFactory = (terminal: Terminal) => TerminalSearchWidget;
-
-@injectable()
-export class TerminalSearchWidget extends ReactWidget {
-
-    private searchInput: HTMLInputElement | null;
-    private searchBox: HTMLDivElement | null;
-    private searchOptions: ISearchOptions = {};
-    private searchAddon: SearchAddon;
-
-    @inject(Terminal)
-    protected terminal: Terminal;
-
-    @postConstruct()
-    protected init(): void {
-        this.node.classList.add('theia-search-terminal-widget-parent');
-
-        this.searchAddon = new SearchAddon();
-        this.terminal.loadAddon(this.searchAddon);
-
-        this.hide();
-        this.update();
-    }
-
-    protected render(): React.ReactNode {
-        return <div className='theia-search-terminal-widget'>
-            <div className='theia-search-elem-box' ref={searchBox => this.searchBox = searchBox} >
-                <input
-                    title='Find'
-                    type='text'
-                    spellCheck='false'
-                    placeholder='Find'
-                    ref={ip => this.searchInput = ip}
-                    onKeyUp={this.onInputChanged}
-                    onFocus={this.onSearchInputFocus}
-                    onBlur={this.onSearchInputBlur}
-                />
-                <div title='Match case' tabIndex={0} className={'search-elem ' + codicon('case-sensitive')} onClick={this.handleCaseSensitiveOptionClicked}></div>
-                <div title='Match whole word' tabIndex={0} className={'search-elem ' + codicon('whole-word')} onClick={this.handleWholeWordOptionClicked}></div>
-                <div title='Use regular expression' tabIndex={0} className={'search-elem ' + codicon('regex')} onClick={this.handleRegexOptionClicked}></div>
-            </div>
-            <button title='Previous match' className={'search-elem ' + codicon('arrow-up')} onClick={this.handlePreviousButtonClicked}></button>
-            <button title='Next match' className={'search-elem ' + codicon('arrow-down')} onClick={this.handleNextButtonClicked}></button>
-            <button title='Close' className={'search-elem ' + codicon('close')} onClick={this.handleHide}></button>
-        </div>;
-    }
-
-    onSearchInputFocus = (): void => {
-        if (this.searchBox) {
-            this.searchBox.classList.add('focused');
-        }
-    };
-
-    onSearchInputBlur = (): void => {
-        if (this.searchBox) {
-            this.searchBox.classList.remove('focused');
-        }
-    };
-
-    private handleHide = (): void => {
-        this.hide();
-    };
-
-    private handleCaseSensitiveOptionClicked = (event: React.MouseEvent<HTMLSpanElement>): void => {
-        this.searchOptions.caseSensitive = !this.searchOptions.caseSensitive;
-        this.updateSearchInputBox(this.searchOptions.caseSensitive, event.currentTarget);
-    };
-
-    private handleWholeWordOptionClicked = (event: React.MouseEvent<HTMLSpanElement>): void => {
-        this.searchOptions.wholeWord = !this.searchOptions.wholeWord;
-        this.updateSearchInputBox(this.searchOptions.wholeWord, event.currentTarget);
-    };
-
-    private handleRegexOptionClicked = (event: React.MouseEvent<HTMLSpanElement>): void => {
-        this.searchOptions.regex = !this.searchOptions.regex;
-        this.updateSearchInputBox(this.searchOptions.regex, event.currentTarget);
-    };
-
-    private updateSearchInputBox(enable: boolean, optionElement: HTMLSpanElement): void {
-        if (enable) {
-            optionElement.classList.add('option-enabled');
-        } else {
-            optionElement.classList.remove('option-enabled');
-        }
-        this.searchInput!.focus();
-    }
-
-    private onInputChanged = (event: React.KeyboardEvent): void => {
-        // move to previous search result on `Shift + Enter`
-        if (event && event.shiftKey && event.keyCode === Key.ENTER.keyCode) {
-            this.search(false, 'previous');
-            return;
-        }
-        // move to next search result on `Enter`
-        if (event && event.keyCode === Key.ENTER.keyCode) {
-            this.search(false, 'next');
-            return;
-        }
-
-        this.search(true, 'next');
-    };
-
-    search(incremental: boolean, searchDirection: 'next' | 'previous'): void {
-        if (this.searchInput) {
-            this.searchOptions.incremental = incremental;
-            const searchText = this.searchInput.value;
-
-            if (searchDirection === 'next') {
-                this.searchAddon.findNext(searchText, this.searchOptions);
-            }
-
-            if (searchDirection === 'previous') {
-                this.searchAddon.findPrevious(searchText, this.searchOptions);
-            }
-        }
-    }
-
-    private handleNextButtonClicked = (): void => {
-        this.search(false, 'next');
-    };
-
-    private handlePreviousButtonClicked = (): void => {
-        this.search(false, 'previous');
-    };
-
-    override onAfterHide(): void {
-        this.terminal.focus();
-    }
-
-    override onAfterShow(): void {
-        if (this.searchInput) {
-            this.searchInput.select();
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2019 Red Hat, Inc. 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 { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { ReactWidget } from '@theia/core/lib/browser/widgets/react-widget';
+import * as React from '@theia/core/shared/react';
+import '../../../src/browser/style/terminal-search.css';
+import { Terminal } from 'xterm';
+import { SearchAddon, ISearchOptions } from 'xterm-addon-search';
+import { codicon, Key } from '@theia/core/lib/browser';
+
+export const TERMINAL_SEARCH_WIDGET_FACTORY_ID = 'terminal-search';
+export const TerminalSearchWidgetFactory = Symbol('TerminalSearchWidgetFactory');
+export type TerminalSearchWidgetFactory = (terminal: Terminal) => TerminalSearchWidget;
+
+@injectable()
+export class TerminalSearchWidget extends ReactWidget {
+
+    private searchInput: HTMLInputElement | null;
+    private searchBox: HTMLDivElement | null;
+    private searchOptions: ISearchOptions = {};
+    private searchAddon: SearchAddon;
+
+    @inject(Terminal)
+    protected terminal: Terminal;
+
+    @postConstruct()
+    protected init(): void {
+        this.node.classList.add('theia-search-terminal-widget-parent');
+
+        this.searchAddon = new SearchAddon();
+        this.terminal.loadAddon(this.searchAddon);
+
+        this.hide();
+        this.update();
+    }
+
+    protected render(): React.ReactNode {
+        return <div className='theia-search-terminal-widget'>
+            <div className='theia-search-elem-box' ref={searchBox => this.searchBox = searchBox} >
+                <input
+                    title='Find'
+                    type='text'
+                    spellCheck='false'
+                    placeholder='Find'
+                    ref={ip => this.searchInput = ip}
+                    onKeyUp={this.onInputChanged}
+                    onFocus={this.onSearchInputFocus}
+                    onBlur={this.onSearchInputBlur}
+                />
+                <div title='Match case' tabIndex={0} className={'search-elem ' + codicon('case-sensitive')} onClick={this.handleCaseSensitiveOptionClicked}></div>
+                <div title='Match whole word' tabIndex={0} className={'search-elem ' + codicon('whole-word')} onClick={this.handleWholeWordOptionClicked}></div>
+                <div title='Use regular expression' tabIndex={0} className={'search-elem ' + codicon('regex')} onClick={this.handleRegexOptionClicked}></div>
+            </div>
+            <button title='Previous match' className={'search-elem ' + codicon('arrow-up')} onClick={this.handlePreviousButtonClicked}></button>
+            <button title='Next match' className={'search-elem ' + codicon('arrow-down')} onClick={this.handleNextButtonClicked}></button>
+            <button title='Close' className={'search-elem ' + codicon('close')} onClick={this.handleHide}></button>
+        </div>;
+    }
+
+    onSearchInputFocus = (): void => {
+        if (this.searchBox) {
+            this.searchBox.classList.add('focused');
+        }
+    };
+
+    onSearchInputBlur = (): void => {
+        if (this.searchBox) {
+            this.searchBox.classList.remove('focused');
+        }
+    };
+
+    private handleHide = (): void => {
+        this.hide();
+    };
+
+    private handleCaseSensitiveOptionClicked = (event: React.MouseEvent<HTMLSpanElement>): void => {
+        this.searchOptions.caseSensitive = !this.searchOptions.caseSensitive;
+        this.updateSearchInputBox(this.searchOptions.caseSensitive, event.currentTarget);
+    };
+
+    private handleWholeWordOptionClicked = (event: React.MouseEvent<HTMLSpanElement>): void => {
+        this.searchOptions.wholeWord = !this.searchOptions.wholeWord;
+        this.updateSearchInputBox(this.searchOptions.wholeWord, event.currentTarget);
+    };
+
+    private handleRegexOptionClicked = (event: React.MouseEvent<HTMLSpanElement>): void => {
+        this.searchOptions.regex = !this.searchOptions.regex;
+        this.updateSearchInputBox(this.searchOptions.regex, event.currentTarget);
+    };
+
+    private updateSearchInputBox(enable: boolean, optionElement: HTMLSpanElement): void {
+        if (enable) {
+            optionElement.classList.add('option-enabled');
+        } else {
+            optionElement.classList.remove('option-enabled');
+        }
+        this.searchInput!.focus();
+    }
+
+    private onInputChanged = (event: React.KeyboardEvent): void => {
+        // move to previous search result on `Shift + Enter`
+        if (event && event.shiftKey && event.keyCode === Key.ENTER.keyCode) {
+            this.search(false, 'previous');
+            return;
+        }
+        // move to next search result on `Enter`
+        if (event && event.keyCode === Key.ENTER.keyCode) {
+            this.search(false, 'next');
+            return;
+        }
+
+        this.search(true, 'next');
+    };
+
+    search(incremental: boolean, searchDirection: 'next' | 'previous'): void {
+        if (this.searchInput) {
+            this.searchOptions.incremental = incremental;
+            const searchText = this.searchInput.value;
+
+            if (searchDirection === 'next') {
+                this.searchAddon.findNext(searchText, this.searchOptions);
+            }
+
+            if (searchDirection === 'previous') {
+                this.searchAddon.findPrevious(searchText, this.searchOptions);
+            }
+        }
+    }
+
+    private handleNextButtonClicked = (): void => {
+        this.search(false, 'next');
+    };
+
+    private handlePreviousButtonClicked = (): void => {
+        this.search(false, 'previous');
+    };
+
+    override onAfterHide(): void {
+        this.terminal.focus();
+    }
+
+    override onAfterShow(): void {
+        if (this.searchInput) {
+            this.searchInput.select();
+        }
+    }
+}

package/src/browser/shell-terminal-profile.ts

@@ -1,45 +1,45 @@
-// *****************************************************************************
-// 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 { URI } from '@theia/core';
-import { TerminalService } from './base/terminal-service';
-import { TerminalWidget, TerminalWidgetOptions } from './base/terminal-widget';
-import { TerminalProfile } from './terminal-profile-service';
-
-export class ShellTerminalProfile implements TerminalProfile {
-
-    get shellPath(): string | undefined {
-        return this.options.shellPath;
-    }
-
-    constructor(protected readonly terminalService: TerminalService, protected readonly options: TerminalWidgetOptions) { }
-
-    async start(): Promise<TerminalWidget> {
-        const widget = await this.terminalService.newTerminal(this.options);
-        widget.start();
-        return widget;
-    }
-
-    /**
-     * Makes a copy of this profile modified with the options given
-     * as an argument.
-     * @param options the options to override
-     * @returns a modified copy of this profile
-     */
-    modify(options: { cwd?: string | URI }): TerminalProfile {
-        return new ShellTerminalProfile(this.terminalService, { ...this.options, ...options });
-    }
-}
+// *****************************************************************************
+// 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 { URI } from '@theia/core';
+import { TerminalService } from './base/terminal-service';
+import { TerminalWidget, TerminalWidgetOptions } from './base/terminal-widget';
+import { TerminalProfile } from './terminal-profile-service';
+
+export class ShellTerminalProfile implements TerminalProfile {
+
+    get shellPath(): string | undefined {
+        return this.options.shellPath;
+    }
+
+    constructor(protected readonly terminalService: TerminalService, protected readonly options: TerminalWidgetOptions) { }
+
+    async start(): Promise<TerminalWidget> {
+        const widget = await this.terminalService.newTerminal(this.options);
+        widget.start();
+        return widget;
+    }
+
+    /**
+     * Makes a copy of this profile modified with the options given
+     * as an argument.
+     * @param options the options to override
+     * @returns a modified copy of this profile
+     */
+    modify(options: { cwd?: string | URI }): TerminalProfile {
+        return new ShellTerminalProfile(this.terminalService, { ...this.options, ...options });
+    }
+}

package/src/browser/style/terminal-search.css

@@ -1,99 +1,99 @@
-/********************************************************************************
- * Copyright (C) 2019 Red Hat, Inc. 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
- ********************************************************************************/
-
-.theia-search-terminal-widget-parent {
-  background: var(--theia-sideBar-background);
-  position: absolute;
-  margin: 0px;
-  border: var(--theia-border-width) solid transparent;
-  padding: 0px;
-  top: 1px;
-  right: 19px;
-
-  z-index: 10;
-}
-
-.theia-search-terminal-widget-parent .theia-search-elem-box {
-  display: flex;
-  margin: 0px;
-  border: var(--theia-border-width) solid transparent;
-  padding: 0px;
-  align-items: center;
-  color: var(--theia-input-foreground);
-  background: var(--theia-input-background);
-}
-
-.theia-search-terminal-widget-parent .theia-search-elem-box input {
-  margin-left: 5px;
-  padding: 0px;
-  width: 100px;
-  height: 18px;
-  color: inherit;
-  background-color: inherit;
-  border: var(--theia-border-width) solid transparent;
-  outline: none;
-}
-
-.theia-search-terminal-widget-parent
-  .theia-search-elem-box
-  .search-elem.codicon {
-  height: 16px;
-  width: 18px;
-}
-
-.theia-search-terminal-widget-parent .search-elem.codicon {
-  border: var(--theia-border-width) solid transparent;
-  height: 20px;
-  width: 20px;
-  opacity: 0.7;
-  outline: none;
-  color: var(--theia-input-foreground);
-  padding: 0px;
-  margin-left: 3px;
-}
-
-.theia-search-terminal-widget-parent .search-elem:hover {
-  opacity: 1;
-}
-
-.theia-search-terminal-widget-parent .theia-search-elem-box.focused {
-  border: var(--theia-border-width) solid var(--theia-focusBorder);
-}
-
-.theia-search-terminal-widget-parent
-  .theia-search-elem-box
-  .search-elem.option-enabled {
-  border: var(--theia-border-width) solid var(--theia-inputOption-activeBorder);
-  background-color: var(--theia-inputOption-activeBackground);
-}
-
-.theia-search-terminal-widget-parent .theia-search-terminal-widget {
-  margin: 2px;
-  display: flex;
-  align-items: center;
-  font: var(--theia-content-font-size);
-  color: var(--theia-input-foreground);
-}
-
-.theia-search-terminal-widget-parent .theia-search-terminal-widget button {
-  background-color: transparent;
-}
-
-.theia-search-terminal-widget-parent
-  .theia-search-terminal-widget
-  button:focus {
-  border: var(--theia-border-width) var(--theia-focusBorder) solid;
-}
+/********************************************************************************
+ * Copyright (C) 2019 Red Hat, Inc. 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
+ ********************************************************************************/
+
+.theia-search-terminal-widget-parent {
+  background: var(--theia-sideBar-background);
+  position: absolute;
+  margin: 0px;
+  border: var(--theia-border-width) solid transparent;
+  padding: 0px;
+  top: 1px;
+  right: 19px;
+
+  z-index: 10;
+}
+
+.theia-search-terminal-widget-parent .theia-search-elem-box {
+  display: flex;
+  margin: 0px;
+  border: var(--theia-border-width) solid transparent;
+  padding: 0px;
+  align-items: center;
+  color: var(--theia-input-foreground);
+  background: var(--theia-input-background);
+}
+
+.theia-search-terminal-widget-parent .theia-search-elem-box input {
+  margin-left: 5px;
+  padding: 0px;
+  width: 100px;
+  height: 18px;
+  color: inherit;
+  background-color: inherit;
+  border: var(--theia-border-width) solid transparent;
+  outline: none;
+}
+
+.theia-search-terminal-widget-parent
+  .theia-search-elem-box
+  .search-elem.codicon {
+  height: 16px;
+  width: 18px;
+}
+
+.theia-search-terminal-widget-parent .search-elem.codicon {
+  border: var(--theia-border-width) solid transparent;
+  height: 20px;
+  width: 20px;
+  opacity: 0.7;
+  outline: none;
+  color: var(--theia-input-foreground);
+  padding: 0px;
+  margin-left: 3px;
+}
+
+.theia-search-terminal-widget-parent .search-elem:hover {
+  opacity: 1;
+}
+
+.theia-search-terminal-widget-parent .theia-search-elem-box.focused {
+  border: var(--theia-border-width) solid var(--theia-focusBorder);
+}
+
+.theia-search-terminal-widget-parent
+  .theia-search-elem-box
+  .search-elem.option-enabled {
+  border: var(--theia-border-width) solid var(--theia-inputOption-activeBorder);
+  background-color: var(--theia-inputOption-activeBackground);
+}
+
+.theia-search-terminal-widget-parent .theia-search-terminal-widget {
+  margin: 2px;
+  display: flex;
+  align-items: center;
+  font: var(--theia-content-font-size);
+  color: var(--theia-input-foreground);
+}
+
+.theia-search-terminal-widget-parent .theia-search-terminal-widget button {
+  background-color: transparent;
+}
+
+.theia-search-terminal-widget-parent
+  .theia-search-terminal-widget
+  button:focus {
+  border: var(--theia-border-width) var(--theia-focusBorder) solid;
+}