Minor changes

Signed-off-by: Jan Bicker <jan.bicker@typefox.io>

packages/search-in-workspace/src/browser/memory-text-resource.ts → packages/search-in-workspace/src/browser/in-memory-text-resource.ts

@@ -11,7 +11,7 @@ import URI from "@theia/core/lib/common/uri";
 
 export const MEMORY_TEXT = "mem-txt";
 
-export class MemoryTextResource implements Resource {
+export class InMemoryTextResource implements Resource {
 
     constructor(readonly uri: URI) { }
 
@@ -23,11 +23,11 @@ export class MemoryTextResource implements Resource {
 }
 
 @injectable()
-export class MemoryTextResourceResolver implements ResourceResolver {
+export class InMemoryTextResourceResolver implements ResourceResolver {
     resolve(uri: URI): Resource | Promise<Resource> {
         if (uri.scheme !== MEMORY_TEXT) {
             throw new Error(`Expected a URI with ${MEMORY_TEXT} scheme. Was: ${uri}.`);
         }
-        return new MemoryTextResource(uri);
+        return new InMemoryTextResource(uri);
     }
 }

packages/search-in-workspace/src/browser/quick-search-in-workspace.ts

@@ -23,13 +23,11 @@ export class QuickSearchInWorkspace implements QuickOpenModel {
     private currentSearchId: number = -1;
     protected MAX_RESULTS = 100;
 
-    constructor(
-        @inject(QuickOpenService) protected readonly quickOpenService: QuickOpenService,
-        @inject(SearchInWorkspaceService) protected readonly searchInWorkspaceService: SearchInWorkspaceService,
-        @inject(OpenerService) protected readonly openerService: OpenerService,
-        @inject(LabelProvider) protected readonly labelProvider: LabelProvider,
-        @inject(ILogger) protected readonly logger: ILogger,
-    ) { }
+    @inject(QuickOpenService) protected readonly quickOpenService: QuickOpenService;
+    @inject(SearchInWorkspaceService) protected readonly searchInWorkspaceService: SearchInWorkspaceService;
+    @inject(OpenerService) protected readonly openerService: OpenerService;
+    @inject(LabelProvider) protected readonly labelProvider: LabelProvider;
+    @inject(ILogger) protected readonly logger: ILogger;
 
     isEnabled(): boolean {
         return this.searchInWorkspaceService.isEnabled();

packages/search-in-workspace/src/browser/search-in-workspace-frontend-contribution.ts

@@ -11,7 +11,7 @@ import { injectable } from "inversify";
 
 export namespace SearchInWorkspaceCommands {
     export const OPEN_SIW_WIDGET = {
-        id: "open-siw-widget"
+        id: "search-in-workspace.open"
     };
 }
 

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

@@ -14,7 +14,7 @@ import { CommandContribution, MenuContribution, ResourceResolver } from "@theia/
 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 { MemoryTextResourceResolver } from "./memory-text-resource";
+import { InMemoryTextResourceResolver } from "./in-memory-text-resource";
 
 import "../../src/browser/styles/index.css";
 
@@ -28,9 +28,7 @@ export default new ContainerModule(bind => {
 
     bind(SearchInWorkspaceFrontendContribution).toSelf().inSingletonScope();
     for (const identifier of [CommandContribution, MenuContribution, KeybindingContribution]) {
-        bind(identifier).toDynamicValue(ctx =>
-            ctx.container.get(SearchInWorkspaceFrontendContribution)
-        ).inSingletonScope();
+        bind(identifier).toService(SearchInWorkspaceFrontendContribution);
     }
 
     bind(QuickSearchInWorkspace).toSelf().inSingletonScope();
@@ -50,8 +48,8 @@ export default new ContainerModule(bind => {
         return WebSocketConnectionProvider.createProxy(ctx.container, '/search-in-workspace', client);
     }).inSingletonScope();
 
-    bind(MemoryTextResourceResolver).toSelf().inSingletonScope();
-    bind(ResourceResolver).toService(MemoryTextResourceResolver);
+    bind(InMemoryTextResourceResolver).toSelf().inSingletonScope();
+    bind(ResourceResolver).toService(InMemoryTextResourceResolver);
 });
 
 export function createSearchTreeWidget(parent: interfaces.Container): SearchInWorkspaceResultTreeWidget {