@theia/search-in-workspace 1.34.2 → 1.34.3

package/src/browser/search-in-workspace-frontend-module.ts

@@ -1,82 +1,82 @@
-// *****************************************************************************
-// 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
-// *****************************************************************************
-
-import '../../src/browser/styles/index.css';
-
-import { ContainerModule, interfaces } from '@theia/core/shared/inversify';
-import { SearchInWorkspaceService, SearchInWorkspaceClientImpl } from './search-in-workspace-service';
-import { SearchInWorkspaceServer, SIW_WS_PATH } from '../common/search-in-workspace-interface';
-import {
-    WebSocketConnectionProvider, WidgetFactory, createTreeContainer, bindViewContribution, FrontendApplicationContribution, LabelProviderContribution,
-    ApplicationShellLayoutMigration,
-    StylingParticipant
-} from '@theia/core/lib/browser';
-import { SearchInWorkspaceWidget } from './search-in-workspace-widget';
-import { SearchInWorkspaceResultTreeWidget } from './search-in-workspace-result-tree-widget';
-import { SearchInWorkspaceFrontendContribution } from './search-in-workspace-frontend-contribution';
-import { SearchInWorkspaceContextKeyService } from './search-in-workspace-context-key-service';
-import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-import { bindSearchInWorkspacePreferences } from './search-in-workspace-preferences';
-import { SearchInWorkspaceLabelProvider } from './search-in-workspace-label-provider';
-import { SearchInWorkspaceFactory } from './search-in-workspace-factory';
-import { SearchLayoutVersion3Migration } from './search-layout-migrations';
-
-export default new ContainerModule(bind => {
-    bind(SearchInWorkspaceContextKeyService).toSelf().inSingletonScope();
-
-    bind(SearchInWorkspaceWidget).toSelf();
-    bind<WidgetFactory>(WidgetFactory).toDynamicValue(ctx => ({
-        id: SearchInWorkspaceWidget.ID,
-        createWidget: () => ctx.container.get(SearchInWorkspaceWidget)
-    }));
-    bind(SearchInWorkspaceResultTreeWidget).toDynamicValue(ctx => createSearchTreeWidget(ctx.container));
-    bind(SearchInWorkspaceFactory).toSelf().inSingletonScope();
-    bind(WidgetFactory).toService(SearchInWorkspaceFactory);
-    bind(ApplicationShellLayoutMigration).to(SearchLayoutVersion3Migration).inSingletonScope();
-
-    bindViewContribution(bind, SearchInWorkspaceFrontendContribution);
-    bind(FrontendApplicationContribution).toService(SearchInWorkspaceFrontendContribution);
-    bind(TabBarToolbarContribution).toService(SearchInWorkspaceFrontendContribution);
-    bind(StylingParticipant).toService(SearchInWorkspaceFrontendContribution);
-
-    // The object that gets notified of search results.
-    bind(SearchInWorkspaceClientImpl).toSelf().inSingletonScope();
-
-    bind(SearchInWorkspaceService).toSelf().inSingletonScope();
-
-    // The object to call methods on the backend.
-    bind(SearchInWorkspaceServer).toDynamicValue(ctx => {
-        const client = ctx.container.get(SearchInWorkspaceClientImpl);
-        return WebSocketConnectionProvider.createProxy(ctx.container, SIW_WS_PATH, client);
-    }).inSingletonScope();
-
-    bindSearchInWorkspacePreferences(bind);
-
-    bind(SearchInWorkspaceLabelProvider).toSelf().inSingletonScope();
-    bind(LabelProviderContribution).toService(SearchInWorkspaceLabelProvider);
-});
-
-export function createSearchTreeWidget(parent: interfaces.Container): SearchInWorkspaceResultTreeWidget {
-    const child = createTreeContainer(parent, {
-        widget: SearchInWorkspaceResultTreeWidget,
-        props: {
-            contextMenuPath: SearchInWorkspaceResultTreeWidget.Menus.BASE,
-            globalSelection: true
-        }
-    });
-
-    return child.get(SearchInWorkspaceResultTreeWidget);
-}
+// *****************************************************************************
+// 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
+// *****************************************************************************
+
+import '../../src/browser/styles/index.css';
+
+import { ContainerModule, interfaces } from '@theia/core/shared/inversify';
+import { SearchInWorkspaceService, SearchInWorkspaceClientImpl } from './search-in-workspace-service';
+import { SearchInWorkspaceServer, SIW_WS_PATH } from '../common/search-in-workspace-interface';
+import {
+    WebSocketConnectionProvider, WidgetFactory, createTreeContainer, bindViewContribution, FrontendApplicationContribution, LabelProviderContribution,
+    ApplicationShellLayoutMigration,
+    StylingParticipant
+} from '@theia/core/lib/browser';
+import { SearchInWorkspaceWidget } from './search-in-workspace-widget';
+import { SearchInWorkspaceResultTreeWidget } from './search-in-workspace-result-tree-widget';
+import { SearchInWorkspaceFrontendContribution } from './search-in-workspace-frontend-contribution';
+import { SearchInWorkspaceContextKeyService } from './search-in-workspace-context-key-service';
+import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import { bindSearchInWorkspacePreferences } from './search-in-workspace-preferences';
+import { SearchInWorkspaceLabelProvider } from './search-in-workspace-label-provider';
+import { SearchInWorkspaceFactory } from './search-in-workspace-factory';
+import { SearchLayoutVersion3Migration } from './search-layout-migrations';
+
+export default new ContainerModule(bind => {
+    bind(SearchInWorkspaceContextKeyService).toSelf().inSingletonScope();
+
+    bind(SearchInWorkspaceWidget).toSelf();
+    bind<WidgetFactory>(WidgetFactory).toDynamicValue(ctx => ({
+        id: SearchInWorkspaceWidget.ID,
+        createWidget: () => ctx.container.get(SearchInWorkspaceWidget)
+    }));
+    bind(SearchInWorkspaceResultTreeWidget).toDynamicValue(ctx => createSearchTreeWidget(ctx.container));
+    bind(SearchInWorkspaceFactory).toSelf().inSingletonScope();
+    bind(WidgetFactory).toService(SearchInWorkspaceFactory);
+    bind(ApplicationShellLayoutMigration).to(SearchLayoutVersion3Migration).inSingletonScope();
+
+    bindViewContribution(bind, SearchInWorkspaceFrontendContribution);
+    bind(FrontendApplicationContribution).toService(SearchInWorkspaceFrontendContribution);
+    bind(TabBarToolbarContribution).toService(SearchInWorkspaceFrontendContribution);
+    bind(StylingParticipant).toService(SearchInWorkspaceFrontendContribution);
+
+    // The object that gets notified of search results.
+    bind(SearchInWorkspaceClientImpl).toSelf().inSingletonScope();
+
+    bind(SearchInWorkspaceService).toSelf().inSingletonScope();
+
+    // The object to call methods on the backend.
+    bind(SearchInWorkspaceServer).toDynamicValue(ctx => {
+        const client = ctx.container.get(SearchInWorkspaceClientImpl);
+        return WebSocketConnectionProvider.createProxy(ctx.container, SIW_WS_PATH, client);
+    }).inSingletonScope();
+
+    bindSearchInWorkspacePreferences(bind);
+
+    bind(SearchInWorkspaceLabelProvider).toSelf().inSingletonScope();
+    bind(LabelProviderContribution).toService(SearchInWorkspaceLabelProvider);
+});
+
+export function createSearchTreeWidget(parent: interfaces.Container): SearchInWorkspaceResultTreeWidget {
+    const child = createTreeContainer(parent, {
+        widget: SearchInWorkspaceResultTreeWidget,
+        props: {
+            contextMenuPath: SearchInWorkspaceResultTreeWidget.Menus.BASE,
+            globalSelection: true
+        }
+    });
+
+    return child.get(SearchInWorkspaceResultTreeWidget);
+}

package/src/browser/search-in-workspace-label-provider.ts

@@ -1,48 +1,48 @@
-// *****************************************************************************
-// 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 } from '@theia/core/shared/inversify';
-import { LabelProviderContribution, LabelProvider, DidChangeLabelEvent } from '@theia/core/lib/browser/label-provider';
-import { SearchInWorkspaceRootFolderNode, SearchInWorkspaceFileNode } from './search-in-workspace-result-tree-widget';
-import URI from '@theia/core/lib/common/uri';
-
-@injectable()
-export class SearchInWorkspaceLabelProvider implements LabelProviderContribution {
-
-    @inject(LabelProvider)
-    protected readonly labelProvider: LabelProvider;
-
-    canHandle(element: object): number {
-        return SearchInWorkspaceRootFolderNode.is(element) || SearchInWorkspaceFileNode.is(element) ? 100 : 0;
-    }
-
-    getIcon(node: SearchInWorkspaceRootFolderNode | SearchInWorkspaceFileNode): string {
-        if (SearchInWorkspaceFileNode.is(node)) {
-            return this.labelProvider.getIcon(new URI(node.fileUri).withScheme('file'));
-        }
-        return this.labelProvider.folderIcon;
-    }
-
-    getName(node: SearchInWorkspaceRootFolderNode | SearchInWorkspaceFileNode): string {
-        const uri = SearchInWorkspaceFileNode.is(node) ? node.fileUri : node.folderUri;
-        return new URI(uri).displayName;
-    }
-
-    affects(node: SearchInWorkspaceRootFolderNode | SearchInWorkspaceFileNode, event: DidChangeLabelEvent): boolean {
-        return SearchInWorkspaceFileNode.is(node) && event.affects(new URI(node.fileUri).withScheme('file'));
-    }
-
-}
+// *****************************************************************************
+// 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 } from '@theia/core/shared/inversify';
+import { LabelProviderContribution, LabelProvider, DidChangeLabelEvent } from '@theia/core/lib/browser/label-provider';
+import { SearchInWorkspaceRootFolderNode, SearchInWorkspaceFileNode } from './search-in-workspace-result-tree-widget';
+import URI from '@theia/core/lib/common/uri';
+
+@injectable()
+export class SearchInWorkspaceLabelProvider implements LabelProviderContribution {
+
+    @inject(LabelProvider)
+    protected readonly labelProvider: LabelProvider;
+
+    canHandle(element: object): number {
+        return SearchInWorkspaceRootFolderNode.is(element) || SearchInWorkspaceFileNode.is(element) ? 100 : 0;
+    }
+
+    getIcon(node: SearchInWorkspaceRootFolderNode | SearchInWorkspaceFileNode): string {
+        if (SearchInWorkspaceFileNode.is(node)) {
+            return this.labelProvider.getIcon(new URI(node.fileUri).withScheme('file'));
+        }
+        return this.labelProvider.folderIcon;
+    }
+
+    getName(node: SearchInWorkspaceRootFolderNode | SearchInWorkspaceFileNode): string {
+        const uri = SearchInWorkspaceFileNode.is(node) ? node.fileUri : node.folderUri;
+        return new URI(uri).displayName;
+    }
+
+    affects(node: SearchInWorkspaceRootFolderNode | SearchInWorkspaceFileNode, event: DidChangeLabelEvent): boolean {
+        return SearchInWorkspaceFileNode.is(node) && event.affects(new URI(node.fileUri).withScheme('file'));
+    }
+
+}

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

@@ -1,91 +1,91 @@
-// *****************************************************************************
-// Copyright (C) 2019 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 { nls } from '@theia/core/lib/common/nls';
-import { PreferenceSchema, PreferenceProxy, PreferenceService, createPreferenceProxy, PreferenceContribution } from '@theia/core/lib/browser/preferences';
-import { interfaces } from '@theia/core/shared/inversify';
-
-export const searchInWorkspacePreferencesSchema: PreferenceSchema = {
-    type: 'object',
-    properties: {
-        'search.lineNumbers': {
-            description: nls.localizeByDefault('Controls whether to show line numbers for search results.'),
-            default: false,
-            type: 'boolean',
-        },
-        'search.collapseResults': {
-            description: nls.localizeByDefault('Controls whether the search results will be collapsed or expanded.'),
-            default: 'auto',
-            type: 'string',
-            enum: ['auto', 'alwaysCollapse', 'alwaysExpand'],
-        },
-        'search.searchOnType': {
-            description: nls.localizeByDefault('Search all files as you type.'),
-            default: true,
-            type: 'boolean',
-        },
-        'search.searchOnTypeDebouncePeriod': {
-            // eslint-disable-next-line max-len
-            markdownDescription: nls.localizeByDefault('When `#search.searchOnType#` is enabled, controls the timeout in milliseconds between a character being typed and the search starting. Has no effect when `search.searchOnType` is disabled.'),
-            default: 300,
-            type: 'number',
-        },
-        'search.searchOnEditorModification': {
-            description: nls.localize('theia/search-in-workspace/searchOnEditorModification', 'Search the active editor when modified.'),
-            default: true,
-            type: 'boolean',
-        },
-        'search.smartCase': {
-            // eslint-disable-next-line max-len
-            description: nls.localizeByDefault('Search case-insensitively if the pattern is all lowercase, otherwise, search case-sensitively.'),
-            default: false,
-            type: 'boolean',
-        },
-        'search.followSymlinks': {
-            description: nls.localizeByDefault('Controls whether to follow symlinks while searching.'),
-            default: true,
-            type: 'boolean',
-        }
-    }
-};
-
-export class SearchInWorkspaceConfiguration {
-    'search.lineNumbers': boolean;
-    'search.collapseResults': string;
-    'search.searchOnType': boolean;
-    'search.searchOnTypeDebouncePeriod': number;
-    'search.searchOnEditorModification': boolean;
-    'search.smartCase': boolean;
-    'search.followSymlinks': boolean;
-}
-
-export const SearchInWorkspacePreferenceContribution = Symbol('SearchInWorkspacePreferenceContribution');
-export const SearchInWorkspacePreferences = Symbol('SearchInWorkspacePreferences');
-export type SearchInWorkspacePreferences = PreferenceProxy<SearchInWorkspaceConfiguration>;
-
-export function createSearchInWorkspacePreferences(preferences: PreferenceService, schema: PreferenceSchema = searchInWorkspacePreferencesSchema): SearchInWorkspacePreferences {
-    return createPreferenceProxy(preferences, schema);
-}
-
-export function bindSearchInWorkspacePreferences(bind: interfaces.Bind): void {
-    bind(SearchInWorkspacePreferences).toDynamicValue(ctx => {
-        const preferences = ctx.container.get<PreferenceService>(PreferenceService);
-        const contribution = ctx.container.get<PreferenceContribution>(SearchInWorkspacePreferenceContribution);
-        return createSearchInWorkspacePreferences(preferences, contribution.schema);
-    }).inSingletonScope();
-    bind(SearchInWorkspacePreferenceContribution).toConstantValue({ schema: searchInWorkspacePreferencesSchema });
-    bind(PreferenceContribution).toService(SearchInWorkspacePreferenceContribution);
-}
+// *****************************************************************************
+// Copyright (C) 2019 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 { nls } from '@theia/core/lib/common/nls';
+import { PreferenceSchema, PreferenceProxy, PreferenceService, createPreferenceProxy, PreferenceContribution } from '@theia/core/lib/browser/preferences';
+import { interfaces } from '@theia/core/shared/inversify';
+
+export const searchInWorkspacePreferencesSchema: PreferenceSchema = {
+    type: 'object',
+    properties: {
+        'search.lineNumbers': {
+            description: nls.localizeByDefault('Controls whether to show line numbers for search results.'),
+            default: false,
+            type: 'boolean',
+        },
+        'search.collapseResults': {
+            description: nls.localizeByDefault('Controls whether the search results will be collapsed or expanded.'),
+            default: 'auto',
+            type: 'string',
+            enum: ['auto', 'alwaysCollapse', 'alwaysExpand'],
+        },
+        'search.searchOnType': {
+            description: nls.localizeByDefault('Search all files as you type.'),
+            default: true,
+            type: 'boolean',
+        },
+        'search.searchOnTypeDebouncePeriod': {
+            // eslint-disable-next-line max-len
+            markdownDescription: nls.localizeByDefault('When `#search.searchOnType#` is enabled, controls the timeout in milliseconds between a character being typed and the search starting. Has no effect when `search.searchOnType` is disabled.'),
+            default: 300,
+            type: 'number',
+        },
+        'search.searchOnEditorModification': {
+            description: nls.localize('theia/search-in-workspace/searchOnEditorModification', 'Search the active editor when modified.'),
+            default: true,
+            type: 'boolean',
+        },
+        'search.smartCase': {
+            // eslint-disable-next-line max-len
+            description: nls.localizeByDefault('Search case-insensitively if the pattern is all lowercase, otherwise, search case-sensitively.'),
+            default: false,
+            type: 'boolean',
+        },
+        'search.followSymlinks': {
+            description: nls.localizeByDefault('Controls whether to follow symlinks while searching.'),
+            default: true,
+            type: 'boolean',
+        }
+    }
+};
+
+export class SearchInWorkspaceConfiguration {
+    'search.lineNumbers': boolean;
+    'search.collapseResults': string;
+    'search.searchOnType': boolean;
+    'search.searchOnTypeDebouncePeriod': number;
+    'search.searchOnEditorModification': boolean;
+    'search.smartCase': boolean;
+    'search.followSymlinks': boolean;
+}
+
+export const SearchInWorkspacePreferenceContribution = Symbol('SearchInWorkspacePreferenceContribution');
+export const SearchInWorkspacePreferences = Symbol('SearchInWorkspacePreferences');
+export type SearchInWorkspacePreferences = PreferenceProxy<SearchInWorkspaceConfiguration>;
+
+export function createSearchInWorkspacePreferences(preferences: PreferenceService, schema: PreferenceSchema = searchInWorkspacePreferencesSchema): SearchInWorkspacePreferences {
+    return createPreferenceProxy(preferences, schema);
+}
+
+export function bindSearchInWorkspacePreferences(bind: interfaces.Bind): void {
+    bind(SearchInWorkspacePreferences).toDynamicValue(ctx => {
+        const preferences = ctx.container.get<PreferenceService>(PreferenceService);
+        const contribution = ctx.container.get<PreferenceContribution>(SearchInWorkspacePreferenceContribution);
+        return createSearchInWorkspacePreferences(preferences, contribution.schema);
+    }).inSingletonScope();
+    bind(SearchInWorkspacePreferenceContribution).toConstantValue({ schema: searchInWorkspacePreferencesSchema });
+    bind(PreferenceContribution).toService(SearchInWorkspacePreferenceContribution);
+}