Deduplicate InMemoryTextResource

packages/bulk-edit/src/browser/bulk-edit-frontend-module.ts

@@ -15,13 +15,12 @@
  ********************************************************************************/
 import { ContainerModule } from '@theia/core/shared/inversify';
 import { WidgetFactory } from '@theia/core/lib/browser/widget-manager';
-import { BulkEditTreeWidget, BULK_EDIT_TREE_WIDGET_ID, createBulkEditTreeWidget, InMemoryTextResourceResolver } from './bulk-edit-tree';
+import { BulkEditTreeWidget, BULK_EDIT_TREE_WIDGET_ID, createBulkEditTreeWidget } from './bulk-edit-tree';
 import { FrontendApplicationContribution, LabelProviderContribution } from '@theia/core/lib/browser';
 import { bindViewContribution } from '@theia/core/lib/browser';
 import { BulkEditContribution } from './bulk-edit-contribution';
 import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { BulkEditTreeLabelProvider } from './bulk-edit-tree-label-provider';
-import { ResourceResolver } from '@theia/core/lib/common';
 import '../../src/browser/style/bulk-edit.css';
 
 export default new ContainerModule(bind => {
@@ -38,7 +37,4 @@ export default new ContainerModule(bind => {
 
     bind(BulkEditTreeLabelProvider).toSelf().inSingletonScope();
     bind(LabelProviderContribution).toService(BulkEditTreeLabelProvider);
-
-    bind(InMemoryTextResourceResolver).toSelf().inSingletonScope();
-    bind(ResourceResolver).toService(InMemoryTextResourceResolver);
 });

packages/bulk-edit/src/browser/bulk-edit-tree/bulk-edit-tree-widget.tsx

@@ -26,7 +26,7 @@ import { FileResourceResolver } from '@theia/filesystem/lib/browser';
 import URI from '@theia/core/lib/common/uri';
 import { EditorWidget, EditorManager, EditorOpenerOptions } from '@theia/editor/lib/browser';
 import { DiffUris } from '@theia/core/lib/browser';
-import { MEMORY_TEXT } from './in-memory-text-resource';
+import { MEMORY_TEXT } from '@theia/core/lib/common';
 import { Disposable } from '@theia/core/lib/common/disposable';
 import { QuickViewService } from '@theia/core/lib/browser/quick-view-service';
 

packages/bulk-edit/src/browser/bulk-edit-tree/index.ts

@@ -19,4 +19,3 @@ export * from './bulk-edit-tree-model';
 export * from './bulk-edit-node-selection';
 export * from './bulk-edit-tree-widget';
 export * from './bulk-edit-tree-container';
-export * from './in-memory-text-resource';

packages/core/src/browser/frontend-application-module.ts

@@ -28,7 +28,8 @@ import {
     MenuModelRegistry, MenuContribution,
     MessageClient,
     InMemoryResources,
-    messageServicePath
+    messageServicePath,
+    InMemoryTextResourceResolver
 } from '../common';
 import { KeybindingRegistry, KeybindingContext, KeybindingContribution } from './keybinding';
 import { FrontendApplication, FrontendApplicationContribution, DefaultFrontendApplicationContribution } from './frontend-application';
@@ -189,6 +190,9 @@ export const frontendApplicationModule = new ContainerModule((bind, unbind, isBo
     bind(InMemoryResources).toSelf().inSingletonScope();
     bind(ResourceResolver).toService(InMemoryResources);
 
+    bind(InMemoryTextResourceResolver).toSelf().inSingletonScope();
+    bind(ResourceResolver).toService(InMemoryTextResourceResolver);
+
     bind(SelectionService).toSelf().inSingletonScope();
     bind(CommandRegistry).toSelf().inSingletonScope().onActivation(({ container }, registry) => {
         WebSocketConnectionProvider.createProxy(container, commandServicePath, registry);

packages/core/src/common/resource.ts

@@ -290,3 +290,30 @@ export class InMemoryResources implements ResourceResolver {
         return new ReferenceMutableResource(reference);
     }
 }
+
+export const MEMORY_TEXT = 'mem-txt';
+
+/**
+ * Resource implementation for 'mem-txt' URI scheme where content is saved in URI query.
+ */
+export class InMemoryTextResource implements Resource {
+    constructor(readonly uri: URI) { }
+
+    async readContents(options?: { encoding?: string | undefined; } | undefined): Promise<string> {
+        return this.uri.query;
+    }
+    dispose(): void { }
+}
+
+/**
+ * ResourceResolver implementation for 'mem-txt' URI scheme.
+ */
+@injectable()
+export class InMemoryTextResourceResolver implements ResourceResolver {
+    resolve(uri: URI): MaybePromise<Resource> {
+        if (uri.scheme !== MEMORY_TEXT) {
+            throw new Error(`Expected a URI with ${MEMORY_TEXT} scheme. Was: ${uri}.`);
+        }
+        return new InMemoryTextResource(uri);
+    }
+}

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

@@ -22,11 +22,9 @@ import { SearchInWorkspaceServer, SIW_WS_PATH } from '../common/search-in-worksp
 import {
     WebSocketConnectionProvider, WidgetFactory, createTreeContainer, TreeWidget, bindViewContribution, FrontendApplicationContribution, LabelProviderContribution
 } from '@theia/core/lib/browser';
-import { ResourceResolver } from '@theia/core';
 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 { InMemoryTextResourceResolver } from './in-memory-text-resource';
 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';
@@ -57,9 +55,6 @@ export default new ContainerModule(bind => {
         return WebSocketConnectionProvider.createProxy(ctx.container, SIW_WS_PATH, client);
     }).inSingletonScope();
 
-    bind(InMemoryTextResourceResolver).toSelf().inSingletonScope();
-    bind(ResourceResolver).toService(InMemoryTextResourceResolver);
-
     bindSearchInWorkspacePreferences(bind);
 
     bind(SearchInWorkspaceLabelProvider).toSelf().inSingletonScope();

packages/search-in-workspace/src/browser/search-in-workspace-result-tree-widget.tsx

@@ -40,7 +40,7 @@ import { FileResourceResolver, FileSystemPreferences } from '@theia/filesystem/l
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { SearchInWorkspaceResult, SearchInWorkspaceOptions, SearchMatch } from '../common/search-in-workspace-interface';
 import { SearchInWorkspaceService } from './search-in-workspace-service';
-import { MEMORY_TEXT } from './in-memory-text-resource';
+import { MEMORY_TEXT } from '@theia/core/lib/common';
 import URI from '@theia/core/lib/common/uri';
 import * as React from '@theia/core/shared/react';
 import { SearchInWorkspacePreferences } from './search-in-workspace-preferences';
@@ -971,7 +971,7 @@ export class SearchInWorkspaceResultTreeWidget extends TreeWidget {
             fileUri = new URI(node.fileUri);
         }
 
-        const opts: EditorOpenerOptions | undefined = !DiffUris.isDiffUri(fileUri) ? {
+        const opts: EditorOpenerOptions = {
             selection: {
                 start: {
                     line: node.line - 1,
@@ -983,7 +983,7 @@ export class SearchInWorkspaceResultTreeWidget extends TreeWidget {
                 }
             },
             mode: 'reveal'
-        } : undefined;
+        };
 
         const editorWidget = await this.editorManager.open(fileUri, opts);