@theia/search-in-workspace 1.34.2 → 1.34.3

package/lib/node/search-in-workspace-backend-module.d.ts

@@ -1,4 +1,4 @@
-import { ContainerModule } from '@theia/core/shared/inversify';
-declare const _default: ContainerModule;
-export default _default;
+import { ContainerModule } from '@theia/core/shared/inversify';
+declare const _default: ContainerModule;
+export default _default;
 //# sourceMappingURL=search-in-workspace-backend-module.d.ts.map

package/lib/node/search-in-workspace-backend-module.js

@@ -1,33 +1,33 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2017-2018 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-const inversify_1 = require("@theia/core/shared/inversify");
-const common_1 = require("@theia/core/lib/common");
-const search_in_workspace_interface_1 = require("../common/search-in-workspace-interface");
-const ripgrep_search_in_workspace_server_1 = require("./ripgrep-search-in-workspace-server");
-const ripgrep_1 = require("@vscode/ripgrep");
-exports.default = new inversify_1.ContainerModule(bind => {
-    bind(search_in_workspace_interface_1.SearchInWorkspaceServer).to(ripgrep_search_in_workspace_server_1.RipgrepSearchInWorkspaceServer);
-    bind(common_1.ConnectionHandler).toDynamicValue(ctx => new common_1.JsonRpcConnectionHandler(search_in_workspace_interface_1.SIW_WS_PATH, client => {
-        const server = ctx.container.get(search_in_workspace_interface_1.SearchInWorkspaceServer);
-        server.setClient(client);
-        client.onDidCloseConnection(() => server.dispose());
-        return server;
-    }));
-    bind(ripgrep_search_in_workspace_server_1.RgPath).toConstantValue(ripgrep_1.rgPath);
-});
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2017-2018 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+const inversify_1 = require("@theia/core/shared/inversify");
+const common_1 = require("@theia/core/lib/common");
+const search_in_workspace_interface_1 = require("../common/search-in-workspace-interface");
+const ripgrep_search_in_workspace_server_1 = require("./ripgrep-search-in-workspace-server");
+const ripgrep_1 = require("@vscode/ripgrep");
+exports.default = new inversify_1.ContainerModule(bind => {
+    bind(search_in_workspace_interface_1.SearchInWorkspaceServer).to(ripgrep_search_in_workspace_server_1.RipgrepSearchInWorkspaceServer);
+    bind(common_1.ConnectionHandler).toDynamicValue(ctx => new common_1.JsonRpcConnectionHandler(search_in_workspace_interface_1.SIW_WS_PATH, client => {
+        const server = ctx.container.get(search_in_workspace_interface_1.SearchInWorkspaceServer);
+        server.setClient(client);
+        client.onDidCloseConnection(() => server.dispose());
+        return server;
+    }));
+    bind(ripgrep_search_in_workspace_server_1.RgPath).toConstantValue(ripgrep_1.rgPath);
+});
 //# sourceMappingURL=search-in-workspace-backend-module.js.map

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@theia/search-in-workspace",
-  "version": "1.34.2",
+  "version": "1.34.3",
   "description": "Theia - Search in workspace",
   "dependencies": {
-    "@theia/core": "1.34.2",
-    "@theia/editor": "1.34.2",
-    "@theia/filesystem": "1.34.2",
-    "@theia/navigator": "1.34.2",
-    "@theia/process": "1.34.2",
-    "@theia/workspace": "1.34.2",
+    "@theia/core": "1.34.3",
+    "@theia/editor": "1.34.3",
+    "@theia/filesystem": "1.34.3",
+    "@theia/navigator": "1.34.3",
+    "@theia/process": "1.34.3",
+    "@theia/workspace": "1.34.3",
     "@vscode/ripgrep": "^1.14.2",
     "minimatch": "^5.1.0"
   },
@@ -46,7 +46,7 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.34.2"
+    "@theia/ext-scripts": "1.34.3"
   },
-  "gitHead": "dba940bd8c0f9f4b324dad0e90d570d499456f60"
+  "gitHead": "a6cf9fe96b1624d6e27a11dce2ebdeae820478e5"
 }

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

@@ -1,139 +1,139 @@
-// *****************************************************************************
-// 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as React from '@theia/core/shared/react';
-import { Key, KeyCode } from '@theia/core/lib/browser';
-import debounce = require('@theia/core/shared/lodash.debounce');
-
-interface HistoryState {
-    history: string[];
-    index: number;
-};
-type InputAttributes = React.InputHTMLAttributes<HTMLInputElement>;
-
-export class SearchInWorkspaceInput extends React.Component<InputAttributes, HistoryState> {
-    static LIMIT = 100;
-
-    private input = React.createRef<HTMLInputElement>();
-
-    constructor(props: InputAttributes) {
-        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.input.current?.value ?? '';
-    }
-
-    set value(value: string) {
-        if (this.input.current) {
-            this.input.current.value = value;
-        }
-    }
-
-    /**
-     * Handle history navigation without overriding the parent's onKeyDown handler, if any.
-     */
-    protected readonly onKeyDown = (e: React.KeyboardEvent<HTMLInputElement>): void => {
-        if (Key.ARROW_UP.keyCode === KeyCode.createKeyCode(e.nativeEvent).key?.keyCode) {
-            e.preventDefault();
-            this.previousValue();
-        } else if (Key.ARROW_DOWN.keyCode === KeyCode.createKeyCode(e.nativeEvent).key?.keyCode) {
-            e.preventDefault();
-            this.nextValue();
-        }
-        this.props.onKeyDown?.(e);
-    };
-
-    /**
-     * Switch the input'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 input'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 without overriding the parent's onChange handler, if any.
-     */
-    protected readonly onChange = (e: React.ChangeEvent<HTMLInputElement>): 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(-SearchInWorkspaceInput.LIMIT);
-        this.updateState(history.length - 1, history);
-    }
-
-    override render(): React.ReactNode {
-        return (
-            <input
-                {...this.props}
-                onKeyDown={this.onKeyDown}
-                onChange={this.onChange}
-                spellCheck={false}
-                ref={this.input}
-            />
-        );
-    }
-}
+// *****************************************************************************
+// 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as React from '@theia/core/shared/react';
+import { Key, KeyCode } from '@theia/core/lib/browser';
+import debounce = require('@theia/core/shared/lodash.debounce');
+
+interface HistoryState {
+    history: string[];
+    index: number;
+};
+type InputAttributes = React.InputHTMLAttributes<HTMLInputElement>;
+
+export class SearchInWorkspaceInput extends React.Component<InputAttributes, HistoryState> {
+    static LIMIT = 100;
+
+    private input = React.createRef<HTMLInputElement>();
+
+    constructor(props: InputAttributes) {
+        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.input.current?.value ?? '';
+    }
+
+    set value(value: string) {
+        if (this.input.current) {
+            this.input.current.value = value;
+        }
+    }
+
+    /**
+     * Handle history navigation without overriding the parent's onKeyDown handler, if any.
+     */
+    protected readonly onKeyDown = (e: React.KeyboardEvent<HTMLInputElement>): void => {
+        if (Key.ARROW_UP.keyCode === KeyCode.createKeyCode(e.nativeEvent).key?.keyCode) {
+            e.preventDefault();
+            this.previousValue();
+        } else if (Key.ARROW_DOWN.keyCode === KeyCode.createKeyCode(e.nativeEvent).key?.keyCode) {
+            e.preventDefault();
+            this.nextValue();
+        }
+        this.props.onKeyDown?.(e);
+    };
+
+    /**
+     * Switch the input'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 input'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 without overriding the parent's onChange handler, if any.
+     */
+    protected readonly onChange = (e: React.ChangeEvent<HTMLInputElement>): 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(-SearchInWorkspaceInput.LIMIT);
+        this.updateState(history.length - 1, history);
+    }
+
+    override render(): React.ReactNode {
+        return (
+            <input
+                {...this.props}
+                onKeyDown={this.onKeyDown}
+                onChange={this.onChange}
+                spellCheck={false}
+                ref={this.input}
+            />
+        );
+    }
+}

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 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 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);
+    }
+
+}