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

package/README.md

@@ -1,40 +1,40 @@
-<div align='center'>
-
-<br />
-
-<img src='https://raw.githubusercontent.com/eclipse-theia/theia/master/logo/theia.svg?sanitize=true' alt='theia-ext-logo' width='100px' />
-
-<h2>ECLIPSE THEIA - SEARCH-IN-WORKSPACE EXTENSION</h2>
-
-<hr />
-
-</div>
-
-## Description
-
-The `@theia/search-in-workspace` extension provides the ability to perform searches over all files in a given workspace using different search techniques.
-
-## Search Widget
-
-The `@theia/search-in-workspace` extension contributes the `Search` widget which is capable of performing different types of searches include the possibility to:
-- Perform standard searches
-- Perform searches using regular expressions
-- Perform searches within an `include` list (search for specific types of files (ex: `*.ts`))
-- Perform searches excluding files or directories (using `exclude`)
-- Perform searches ignoring hidden or excluded files/folders
-- Perform search and replace (to quickly update multiple occurrences of a search term)
-
-## Additional Information
-
-- [API documentation for `@theia/search-in-workspace`](https://eclipse-theia.github.io/theia/docs/next/modules/search_in_workspace.html)
-- [Theia - GitHub](https://github.com/eclipse-theia/theia)
-- [Theia - Website](https://theia-ide.org/)
-
-## License
-
-- [Eclipse Public License 2.0](http://www.eclipse.org/legal/epl-2.0/)
-- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](https://projects.eclipse.org/license/secondary-gpl-2.0-cp)
-
-## Trademark
-"Theia" is a trademark of the Eclipse Foundation
-https://www.eclipse.org/theia
+<div align='center'>
+
+<br />
+
+<img src='https://raw.githubusercontent.com/eclipse-theia/theia/master/logo/theia.svg?sanitize=true' alt='theia-ext-logo' width='100px' />
+
+<h2>ECLIPSE THEIA - SEARCH-IN-WORKSPACE EXTENSION</h2>
+
+<hr />
+
+</div>
+
+## Description
+
+The `@theia/search-in-workspace` extension provides the ability to perform searches over all files in a given workspace using different search techniques.
+
+## Search Widget
+
+The `@theia/search-in-workspace` extension contributes the `Search` widget which is capable of performing different types of searches include the possibility to:
+- Perform standard searches
+- Perform searches using regular expressions
+- Perform searches within an `include` list (search for specific types of files (ex: `*.ts`))
+- Perform searches excluding files or directories (using `exclude`)
+- Perform searches ignoring hidden or excluded files/folders
+- Perform search and replace (to quickly update multiple occurrences of a search term)
+
+## Additional Information
+
+- [API documentation for `@theia/search-in-workspace`](https://eclipse-theia.github.io/theia/docs/next/modules/search_in_workspace.html)
+- [Theia - GitHub](https://github.com/eclipse-theia/theia)
+- [Theia - Website](https://theia-ide.org/)
+
+## License
+
+- [Eclipse Public License 2.0](http://www.eclipse.org/legal/epl-2.0/)
+- [一 (Secondary) GNU General Public License, version 2 with the GNU Classpath Exception](https://projects.eclipse.org/license/secondary-gpl-2.0-cp)
+
+## Trademark
+"Theia" is a trademark of the Eclipse Foundation
+https://www.eclipse.org/theia

package/lib/browser/search-in-workspace-frontend-contribution.js

@@ -459,10 +459,10 @@ let SearchInWorkspaceFrontendContribution = class SearchInWorkspaceFrontendContr
     registerThemeStyle(theme, collector) {
         const contrastBorder = theme.getColor('contrastBorder');
         if (contrastBorder && (0, theme_1.isHighContrast)(theme.type)) {
-            collector.addRule(`
-                .t-siw-search-container .searchHeader .search-field-container {
-                    border-color: ${contrastBorder};
-                }
+            collector.addRule(`
+                .t-siw-search-container .searchHeader .search-field-container {
+                    border-color: ${contrastBorder};
+                }
             `);
         }
     }

package/lib/node/ripgrep-search-in-workspace-server.slow-spec.js

@@ -101,62 +101,62 @@ before(() => {
         contents += ('long-' + pad.substring(0, pad.length - str.length) + str);
     }
     createTestFile('long-line', contents);
-    createTestFile('carrots', `\
-This is a carrot.
-Most carrots are orange, but some carrots are not.
-Once capitalized, the word carrot looks like this: CARROT.
-Carrot is a funny word.
+    createTestFile('carrots', `\
+This is a carrot.
+Most carrots are orange, but some carrots are not.
+Once capitalized, the word carrot looks like this: CARROT.
+Carrot is a funny word.
 `);
-    createTestFile('potatoes', `\
-Potatoes, unlike carrots, are generally not orange.  But sweet potatoes are,
-it's very confusing.
+    createTestFile('potatoes', `\
+Potatoes, unlike carrots, are generally not orange.  But sweet potatoes are,
+it's very confusing.
 `);
     createTestFile('pastas', 'pasta pasta');
-    createTestFile('regexes', `\
-aaa hello. x h3lo y hell0h3lllo
-hello1
+    createTestFile('regexes', `\
+aaa hello. x h3lo y hell0h3lllo
+hello1
 `);
     const smallDirPath = rootDirA + '/small';
     fs.mkdirSync(smallDirPath);
     createTestFile('small', 'A small file.\n');
-    const copyrightLine = '\
+    const copyrightLine = '\
     Copyright (C) 2021 <Company> and others.';
     fs.mkdirSync(smallDirPath + '/test');
     createTestFile('small/test/test-spec.ts', copyrightLine);
     fs.mkdirSync(rootDirA + '/test');
     createTestFile('test/test-spec.ts', copyrightLine);
     fs.mkdirSync(rootDirA + '/orange');
-    createTestFile('orange/hamlin', '\
+    createTestFile('orange/hamlin', '\
     Hamlin orange is one of our most cold-hardy sweet oranges. Grown since 1885');
-    createTestFile('orange/navel', '\
+    createTestFile('orange/navel', '\
     Most well known orange type');
     if (!core_1.isWindows) {
-        createTestFile('file:with:some:colons', `\
-Are you looking for this: --foobar?
+        createTestFile('file:with:some:colons', `\
+Are you looking for this: --foobar?
 `);
     }
-    createTestFile('file with spaces', `\
-Are you looking for this: --foobar?
+    createTestFile('file with spaces', `\
+Are you looking for this: --foobar?
 `);
-    createTestFile('utf8-file', `\
-Var är jag?  Varför är jag här?
+    createTestFile('utf8-file', `\
+Var är jag?  Varför är jag här?
 `);
-    createTestFile('special shell characters', `\
-If one uses \`salut";\' echo foo && echo bar; "\` as a search term it should not be a problem to find here.
+    createTestFile('special shell characters', `\
+If one uses \`salut";\' echo foo && echo bar; "\` as a search term it should not be a problem to find here.
 `);
-    createTestFile('glob.txt', `\
-test -glob patterns
+    createTestFile('glob.txt', `\
+test -glob patterns
 `);
-    createTestFile('glob', `\
-test --glob patterns
+    createTestFile('glob', `\
+test --glob patterns
 `);
     let lotsOfMatchesText = '';
     for (let i = 0; i < 100000; i++) {
         lotsOfMatchesText += 'lots-of-matches\n';
     }
     createTestFile('lots-of-matches', lotsOfMatchesText);
-    createTestFile('orange', `\
-the oranges' orange looks slightly different from carrots' orange.
+    createTestFile('orange', `\
+the oranges' orange looks slightly different from carrots' orange.
 `);
     createTestFile('folderSubfolder', 'a file in the subfolder of a folder.');
 });

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@theia/search-in-workspace",
-  "version": "1.53.0-next.4+9e9124118",
+  "version": "1.53.0-next.55+d1a989a68c",
   "description": "Theia - Search in workspace",
   "dependencies": {
-    "@theia/core": "1.53.0-next.4+9e9124118",
-    "@theia/editor": "1.53.0-next.4+9e9124118",
-    "@theia/filesystem": "1.53.0-next.4+9e9124118",
-    "@theia/navigator": "1.53.0-next.4+9e9124118",
-    "@theia/process": "1.53.0-next.4+9e9124118",
-    "@theia/workspace": "1.53.0-next.4+9e9124118",
+    "@theia/core": "1.53.0-next.55+d1a989a68c",
+    "@theia/editor": "1.53.0-next.55+d1a989a68c",
+    "@theia/filesystem": "1.53.0-next.55+d1a989a68c",
+    "@theia/navigator": "1.53.0-next.55+d1a989a68c",
+    "@theia/process": "1.53.0-next.55+d1a989a68c",
+    "@theia/workspace": "1.53.0-next.55+d1a989a68c",
     "@vscode/ripgrep": "^1.14.2",
     "minimatch": "^5.1.0",
     "react-autosize-textarea": "^7.0.0",
@@ -48,7 +48,7 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.52.0"
+    "@theia/ext-scripts": "1.53.0"
   },
-  "gitHead": "9e912411843f32b2a549ef6580b07872edd95e8b"
+  "gitHead": "d1a989a68c1b5ec1f9098e9126653c6346844769"
 }

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