@theia/search-in-workspace 1.53.0-next.4 → 1.53.0-next.55

package/src/browser/components/search-in-workspace-textarea.tsx

@@ -1,153 +1,153 @@
-// *****************************************************************************
-// Copyright (C) 2021 Ericsson 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 { Key, KeyCode } from '@theia/core/lib/browser';
-import * as React from '@theia/core/shared/react';
-import TextareaAutosize from 'react-autosize-textarea';
-import debounce = require('@theia/core/shared/lodash.debounce');
-
-interface HistoryState {
-    history: string[];
-    index: number;
-};
-type TextareaAttributes = React.TextareaHTMLAttributes<HTMLTextAreaElement>;
-
-export class SearchInWorkspaceTextArea extends React.Component<TextareaAttributes, HistoryState> {
-    static LIMIT = 100;
-
-    private textarea = React.createRef<HTMLTextAreaElement>();
-
-    constructor(props: TextareaAttributes) {
-        super(props);
-        this.state = {
-            history: [],
-            index: 0,
-        };
-    }
-
-    updateState(index: number, history?: string[]): void {
-        this.value = history ? history[index] : this.state.history[index];
-        this.setState(prevState => {
-            const newState = {
-                ...prevState,
-                index,
-            };
-            if (history) {
-                newState.history = history;
-            }
-            return newState;
-        });
-    }
-
-    get value(): string {
-        return this.textarea.current?.value ?? '';
-    }
-
-    set value(value: string) {
-        if (this.textarea.current) {
-            this.textarea.current.value = value;
-        }
-    }
-
-    /**
-     * Handle history navigation without overriding the parent's onKeyDown handler, if any.
-     */
-    protected readonly onKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>): void => {
-        // Navigate history only when cursor is at first or last position of the textarea
-        if (Key.ARROW_UP.keyCode === KeyCode.createKeyCode(e.nativeEvent).key?.keyCode && e.currentTarget.selectionStart === 0) {
-            e.preventDefault();
-            this.previousValue();
-        } else if (Key.ARROW_DOWN.keyCode === KeyCode.createKeyCode(e.nativeEvent).key?.keyCode && e.currentTarget.selectionEnd === e.currentTarget.value.length) {
-            e.preventDefault();
-            this.nextValue();
-        }
-
-        // Prevent newline on enter
-        if (Key.ENTER.keyCode === KeyCode.createKeyCode(e.nativeEvent).key?.keyCode && !e.nativeEvent.shiftKey) {
-            e.preventDefault();
-        }
-
-        this.props.onKeyDown?.(e);
-    };
-
-    /**
-     * Switch the textarea's text to the previous value, if any.
-     */
-    previousValue(): void {
-        const { history, index } = this.state;
-        if (!this.value) {
-            this.value = history[index];
-        } else if (index > 0 && index < history.length) {
-            this.updateState(index - 1);
-        }
-    }
-
-    /**
-     * Switch the textarea's text to the next value, if any.
-     */
-    nextValue(): void {
-        const { history, index } = this.state;
-        if (index === history.length - 1) {
-            this.value = '';
-        } else if (!this.value) {
-            this.value = history[index];
-        } else if (index >= 0 && index < history.length - 1) {
-            this.updateState(index + 1);
-        }
-    }
-
-    /**
-     * Handle history collection and textarea resizing without overriding the parent's onChange handler, if any.
-     */
-    protected readonly onChange = (e: React.ChangeEvent<HTMLTextAreaElement>): void => {
-        this.addToHistory();
-        this.props.onChange?.(e);
-    };
-
-    /**
-     * Add a nonempty current value to the history, if not already present. (Debounced, 1 second delay.)
-     */
-    readonly addToHistory = debounce(this.doAddToHistory, 1000);
-
-    private doAddToHistory(): void {
-        if (!this.value) {
-            return;
-        }
-        const history = this.state.history
-            .filter(term => term !== this.value)
-            .concat(this.value)
-            .slice(-SearchInWorkspaceTextArea.LIMIT);
-        this.updateState(history.length - 1, history);
-    }
-
-    override render(): React.ReactNode {
-        const { onResize, ...filteredProps } = this.props;
-        return (
-            <TextareaAutosize
-                {...filteredProps}
-                autoCapitalize="off"
-                autoCorrect="off"
-                maxRows={7} /* from VS Code */
-                onChange={this.onChange}
-                onKeyDown={this.onKeyDown}
-                ref={this.textarea}
-                rows={1}
-                spellCheck={false}
-            >
-            </TextareaAutosize>
-        );
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2021 Ericsson 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 { Key, KeyCode } from '@theia/core/lib/browser';
+import * as React from '@theia/core/shared/react';
+import TextareaAutosize from 'react-autosize-textarea';
+import debounce = require('@theia/core/shared/lodash.debounce');
+
+interface HistoryState {
+    history: string[];
+    index: number;
+};
+type TextareaAttributes = React.TextareaHTMLAttributes<HTMLTextAreaElement>;
+
+export class SearchInWorkspaceTextArea extends React.Component<TextareaAttributes, HistoryState> {
+    static LIMIT = 100;
+
+    private textarea = React.createRef<HTMLTextAreaElement>();
+
+    constructor(props: TextareaAttributes) {
+        super(props);
+        this.state = {
+            history: [],
+            index: 0,
+        };
+    }
+
+    updateState(index: number, history?: string[]): void {
+        this.value = history ? history[index] : this.state.history[index];
+        this.setState(prevState => {
+            const newState = {
+                ...prevState,
+                index,
+            };
+            if (history) {
+                newState.history = history;
+            }
+            return newState;
+        });
+    }
+
+    get value(): string {
+        return this.textarea.current?.value ?? '';
+    }
+
+    set value(value: string) {
+        if (this.textarea.current) {
+            this.textarea.current.value = value;
+        }
+    }
+
+    /**
+     * Handle history navigation without overriding the parent's onKeyDown handler, if any.
+     */
+    protected readonly onKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>): void => {
+        // Navigate history only when cursor is at first or last position of the textarea
+        if (Key.ARROW_UP.keyCode === KeyCode.createKeyCode(e.nativeEvent).key?.keyCode && e.currentTarget.selectionStart === 0) {
+            e.preventDefault();
+            this.previousValue();
+        } else if (Key.ARROW_DOWN.keyCode === KeyCode.createKeyCode(e.nativeEvent).key?.keyCode && e.currentTarget.selectionEnd === e.currentTarget.value.length) {
+            e.preventDefault();
+            this.nextValue();
+        }
+
+        // Prevent newline on enter
+        if (Key.ENTER.keyCode === KeyCode.createKeyCode(e.nativeEvent).key?.keyCode && !e.nativeEvent.shiftKey) {
+            e.preventDefault();
+        }
+
+        this.props.onKeyDown?.(e);
+    };
+
+    /**
+     * Switch the textarea's text to the previous value, if any.
+     */
+    previousValue(): void {
+        const { history, index } = this.state;
+        if (!this.value) {
+            this.value = history[index];
+        } else if (index > 0 && index < history.length) {
+            this.updateState(index - 1);
+        }
+    }
+
+    /**
+     * Switch the textarea's text to the next value, if any.
+     */
+    nextValue(): void {
+        const { history, index } = this.state;
+        if (index === history.length - 1) {
+            this.value = '';
+        } else if (!this.value) {
+            this.value = history[index];
+        } else if (index >= 0 && index < history.length - 1) {
+            this.updateState(index + 1);
+        }
+    }
+
+    /**
+     * Handle history collection and textarea resizing without overriding the parent's onChange handler, if any.
+     */
+    protected readonly onChange = (e: React.ChangeEvent<HTMLTextAreaElement>): void => {
+        this.addToHistory();
+        this.props.onChange?.(e);
+    };
+
+    /**
+     * Add a nonempty current value to the history, if not already present. (Debounced, 1 second delay.)
+     */
+    readonly addToHistory = debounce(this.doAddToHistory, 1000);
+
+    private doAddToHistory(): void {
+        if (!this.value) {
+            return;
+        }
+        const history = this.state.history
+            .filter(term => term !== this.value)
+            .concat(this.value)
+            .slice(-SearchInWorkspaceTextArea.LIMIT);
+        this.updateState(history.length - 1, history);
+    }
+
+    override render(): React.ReactNode {
+        const { onResize, ...filteredProps } = this.props;
+        return (
+            <TextareaAutosize
+                {...filteredProps}
+                autoCapitalize="off"
+                autoCorrect="off"
+                maxRows={7} /* from VS Code */
+                onChange={this.onChange}
+                onKeyDown={this.onKeyDown}
+                ref={this.textarea}
+                rows={1}
+                spellCheck={false}
+            >
+            </TextareaAutosize>
+        );
+    }
+}

package/src/browser/search-in-workspace-context-key-service.ts

@@ -1,93 +1,93 @@
-// *****************************************************************************
-// 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 { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { ContextKeyService, ContextKey } from '@theia/core/lib/browser/context-key-service';
-
-@injectable()
-export class SearchInWorkspaceContextKeyService {
-
-    @inject(ContextKeyService)
-    protected readonly contextKeyService: ContextKeyService;
-
-    protected _searchViewletVisible: ContextKey<boolean>;
-    get searchViewletVisible(): ContextKey<boolean> {
-        return this._searchViewletVisible;
-    }
-
-    protected _searchViewletFocus: ContextKey<boolean>;
-    get searchViewletFocus(): ContextKey<boolean> {
-        return this._searchViewletFocus;
-    }
-
-    protected searchInputBoxFocus: ContextKey<boolean>;
-    setSearchInputBoxFocus(searchInputBoxFocus: boolean): void {
-        this.searchInputBoxFocus.set(searchInputBoxFocus);
-        this.updateInputBoxFocus();
-    }
-
-    protected replaceInputBoxFocus: ContextKey<boolean>;
-    setReplaceInputBoxFocus(replaceInputBoxFocus: boolean): void {
-        this.replaceInputBoxFocus.set(replaceInputBoxFocus);
-        this.updateInputBoxFocus();
-    }
-
-    protected patternIncludesInputBoxFocus: ContextKey<boolean>;
-    setPatternIncludesInputBoxFocus(patternIncludesInputBoxFocus: boolean): void {
-        this.patternIncludesInputBoxFocus.set(patternIncludesInputBoxFocus);
-        this.updateInputBoxFocus();
-    }
-
-    protected patternExcludesInputBoxFocus: ContextKey<boolean>;
-    setPatternExcludesInputBoxFocus(patternExcludesInputBoxFocus: boolean): void {
-        this.patternExcludesInputBoxFocus.set(patternExcludesInputBoxFocus);
-        this.updateInputBoxFocus();
-    }
-
-    protected inputBoxFocus: ContextKey<boolean>;
-    protected updateInputBoxFocus(): void {
-        this.inputBoxFocus.set(
-            this.searchInputBoxFocus.get() ||
-            this.replaceInputBoxFocus.get() ||
-            this.patternIncludesInputBoxFocus.get() ||
-            this.patternExcludesInputBoxFocus.get()
-        );
-    }
-
-    protected _replaceActive: ContextKey<boolean>;
-    get replaceActive(): ContextKey<boolean> {
-        return this._replaceActive;
-    }
-
-    protected _hasSearchResult: ContextKey<boolean>;
-    get hasSearchResult(): ContextKey<boolean> {
-        return this._hasSearchResult;
-    }
-
-    @postConstruct()
-    protected init(): void {
-        this._searchViewletVisible = this.contextKeyService.createKey<boolean>('searchViewletVisible', false);
-        this._searchViewletFocus = this.contextKeyService.createKey<boolean>('searchViewletFocus', false);
-        this.inputBoxFocus = this.contextKeyService.createKey<boolean>('inputBoxFocus', false);
-        this.searchInputBoxFocus = this.contextKeyService.createKey<boolean>('searchInputBoxFocus', false);
-        this.replaceInputBoxFocus = this.contextKeyService.createKey<boolean>('replaceInputBoxFocus', false);
-        this.patternIncludesInputBoxFocus = this.contextKeyService.createKey<boolean>('patternIncludesInputBoxFocus', false);
-        this.patternExcludesInputBoxFocus = this.contextKeyService.createKey<boolean>('patternExcludesInputBoxFocus', false);
-        this._replaceActive = this.contextKeyService.createKey<boolean>('replaceActive', false);
-        this._hasSearchResult = this.contextKeyService.createKey<boolean>('hasSearchResult', false);
-    }
-
-}
+// *****************************************************************************
+// 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 { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { ContextKeyService, ContextKey } from '@theia/core/lib/browser/context-key-service';
+
+@injectable()
+export class SearchInWorkspaceContextKeyService {
+
+    @inject(ContextKeyService)
+    protected readonly contextKeyService: ContextKeyService;
+
+    protected _searchViewletVisible: ContextKey<boolean>;
+    get searchViewletVisible(): ContextKey<boolean> {
+        return this._searchViewletVisible;
+    }
+
+    protected _searchViewletFocus: ContextKey<boolean>;
+    get searchViewletFocus(): ContextKey<boolean> {
+        return this._searchViewletFocus;
+    }
+
+    protected searchInputBoxFocus: ContextKey<boolean>;
+    setSearchInputBoxFocus(searchInputBoxFocus: boolean): void {
+        this.searchInputBoxFocus.set(searchInputBoxFocus);
+        this.updateInputBoxFocus();
+    }
+
+    protected replaceInputBoxFocus: ContextKey<boolean>;
+    setReplaceInputBoxFocus(replaceInputBoxFocus: boolean): void {
+        this.replaceInputBoxFocus.set(replaceInputBoxFocus);
+        this.updateInputBoxFocus();
+    }
+
+    protected patternIncludesInputBoxFocus: ContextKey<boolean>;
+    setPatternIncludesInputBoxFocus(patternIncludesInputBoxFocus: boolean): void {
+        this.patternIncludesInputBoxFocus.set(patternIncludesInputBoxFocus);
+        this.updateInputBoxFocus();
+    }
+
+    protected patternExcludesInputBoxFocus: ContextKey<boolean>;
+    setPatternExcludesInputBoxFocus(patternExcludesInputBoxFocus: boolean): void {
+        this.patternExcludesInputBoxFocus.set(patternExcludesInputBoxFocus);
+        this.updateInputBoxFocus();
+    }
+
+    protected inputBoxFocus: ContextKey<boolean>;
+    protected updateInputBoxFocus(): void {
+        this.inputBoxFocus.set(
+            this.searchInputBoxFocus.get() ||
+            this.replaceInputBoxFocus.get() ||
+            this.patternIncludesInputBoxFocus.get() ||
+            this.patternExcludesInputBoxFocus.get()
+        );
+    }
+
+    protected _replaceActive: ContextKey<boolean>;
+    get replaceActive(): ContextKey<boolean> {
+        return this._replaceActive;
+    }
+
+    protected _hasSearchResult: ContextKey<boolean>;
+    get hasSearchResult(): ContextKey<boolean> {
+        return this._hasSearchResult;
+    }
+
+    @postConstruct()
+    protected init(): void {
+        this._searchViewletVisible = this.contextKeyService.createKey<boolean>('searchViewletVisible', false);
+        this._searchViewletFocus = this.contextKeyService.createKey<boolean>('searchViewletFocus', false);
+        this.inputBoxFocus = this.contextKeyService.createKey<boolean>('inputBoxFocus', false);
+        this.searchInputBoxFocus = this.contextKeyService.createKey<boolean>('searchInputBoxFocus', false);
+        this.replaceInputBoxFocus = this.contextKeyService.createKey<boolean>('replaceInputBoxFocus', false);
+        this.patternIncludesInputBoxFocus = this.contextKeyService.createKey<boolean>('patternIncludesInputBoxFocus', false);
+        this.patternExcludesInputBoxFocus = this.contextKeyService.createKey<boolean>('patternExcludesInputBoxFocus', false);
+        this._replaceActive = this.contextKeyService.createKey<boolean>('replaceActive', false);
+        this._hasSearchResult = this.contextKeyService.createKey<boolean>('hasSearchResult', false);
+    }
+
+}

package/src/browser/search-in-workspace-factory.ts

@@ -1,59 +1,59 @@
-// *****************************************************************************
-// Copyright (C) 2021 SAP SE or an SAP affiliate company 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 {
-    codicon,
-    ViewContainer,
-    ViewContainerTitleOptions,
-    WidgetFactory,
-    WidgetManager
-} from '@theia/core/lib/browser';
-import { SearchInWorkspaceWidget } from './search-in-workspace-widget';
-import { nls } from '@theia/core/lib/common/nls';
-
-export const SEARCH_VIEW_CONTAINER_ID = 'search-view-container';
-export const SEARCH_VIEW_CONTAINER_TITLE_OPTIONS: ViewContainerTitleOptions = {
-    label: nls.localizeByDefault('Search'),
-    iconClass: codicon('search'),
-    closeable: true
-};
-
-@injectable()
-export class SearchInWorkspaceFactory implements WidgetFactory {
-
-    readonly id = SEARCH_VIEW_CONTAINER_ID;
-
-    protected searchWidgetOptions: ViewContainer.Factory.WidgetOptions = {
-        canHide: false,
-        initiallyCollapsed: false
-    };
-
-    @inject(ViewContainer.Factory)
-    protected readonly viewContainerFactory: ViewContainer.Factory;
-    @inject(WidgetManager) protected readonly widgetManager: WidgetManager;
-
-    async createWidget(): Promise<ViewContainer> {
-        const viewContainer = this.viewContainerFactory({
-            id: SEARCH_VIEW_CONTAINER_ID,
-            progressLocationId: 'search'
-        });
-        viewContainer.setTitleOptions(SEARCH_VIEW_CONTAINER_TITLE_OPTIONS);
-        const widget = await this.widgetManager.getOrCreateWidget(SearchInWorkspaceWidget.ID);
-        viewContainer.addWidget(widget, this.searchWidgetOptions);
-        return viewContainer;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2021 SAP SE or an SAP affiliate company 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 {
+    codicon,
+    ViewContainer,
+    ViewContainerTitleOptions,
+    WidgetFactory,
+    WidgetManager
+} from '@theia/core/lib/browser';
+import { SearchInWorkspaceWidget } from './search-in-workspace-widget';
+import { nls } from '@theia/core/lib/common/nls';
+
+export const SEARCH_VIEW_CONTAINER_ID = 'search-view-container';
+export const SEARCH_VIEW_CONTAINER_TITLE_OPTIONS: ViewContainerTitleOptions = {
+    label: nls.localizeByDefault('Search'),
+    iconClass: codicon('search'),
+    closeable: true
+};
+
+@injectable()
+export class SearchInWorkspaceFactory implements WidgetFactory {
+
+    readonly id = SEARCH_VIEW_CONTAINER_ID;
+
+    protected searchWidgetOptions: ViewContainer.Factory.WidgetOptions = {
+        canHide: false,
+        initiallyCollapsed: false
+    };
+
+    @inject(ViewContainer.Factory)
+    protected readonly viewContainerFactory: ViewContainer.Factory;
+    @inject(WidgetManager) protected readonly widgetManager: WidgetManager;
+
+    async createWidget(): Promise<ViewContainer> {
+        const viewContainer = this.viewContainerFactory({
+            id: SEARCH_VIEW_CONTAINER_ID,
+            progressLocationId: 'search'
+        });
+        viewContainer.setTitleOptions(SEARCH_VIEW_CONTAINER_TITLE_OPTIONS);
+        const widget = await this.widgetManager.getOrCreateWidget(SearchInWorkspaceWidget.ID);
+        viewContainer.addWidget(widget, this.searchWidgetOptions);
+        return viewContainer;
+    }
+}