Find All references doesn't exist for typescript plugin #14856

Signed-off-by: Victor Rubezhny <vrubezhny@redhat.com>
eclipse-theia · Feb 21, 2020 · a2bc6b3 · a2bc6b3
1 parent 6a6a673
commit a2bc6b3
Show file tree

Hide file tree

Showing 17 changed files with 743 additions and 334 deletions.
diff --git a/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts b/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts
@@ -30,7 +30,13 @@ import { CommandService } from '@theia/core/lib/common/command';
 import TheiaURI from '@theia/core/lib/common/uri';
 import { EditorManager } from '@theia/editor/lib/browser';
 import { CodeEditorWidget } from '@theia/plugin-ext/lib/main/browser/menus/menus-contribution-handler';
-import { TextDocumentShowOptions } from '@theia/plugin-ext/lib/common/plugin-api-rpc-model';
+import {
+    TextDocumentShowOptions,
+    Location,
+    CallHierarchyItem,
+    CallHierarchyIncomingCall,
+    CallHierarchyOutgoingCall
+} from '@theia/plugin-ext/lib/common/plugin-api-rpc-model';
 import { DocumentsMainImpl } from '@theia/plugin-ext/lib/main/browser/documents-main';
 import { createUntitledResource } from '@theia/plugin-ext/lib/main/browser/editor/untitled-resource';
 import { toDocumentSymbol } from '@theia/plugin-ext/lib/plugin/type-converters';
@@ -40,6 +46,7 @@ import { WorkspaceService, WorkspaceInput } from '@theia/workspace/lib/browser/w
 import { DiffService } from '@theia/workspace/lib/browser/diff-service';
 import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
 import { inject, injectable } from 'inversify';
+import { Position } from '@theia/plugin-ext/lib/common/plugin-api-rpc';
 import URI from 'vscode-uri';
 
 export namespace VscodeCommands {
@@ -374,8 +381,68 @@ export class PluginVscodeCommandsContribution implements CommandContribution {
                 })
             }
         );
+
         // TODO register other `vscode.execute...` commands.
         // see https://github.com/microsoft/vscode/blob/master/src/vs/workbench/api/common/extHostApiCommands.ts
+        commands.registerCommand(
+            {
+                id: 'vscode.executeReferenceProvider'
+            },
+            {
+                execute: ((resource: URI, position: Position) => {
+                    const args = {
+                        resource: monaco.Uri.from(resource),
+                        position: position
+                    };
+                    return commands.executeCommand<Location[]>('_executeReferenceProvider', args);
+                })
+            }
+        );
+        commands.registerCommand(
+            {
+                id: 'vscode.executeImplementationProvider'
+            },
+            {
+                execute: ((resource: URI, position: Position) => {
+                    const args = {
+                        resource: monaco.Uri.from(resource),
+                        position: position
+                    };
+                    return commands.executeCommand<Location[]>('_executeImplementationProvider', args);
+                })
+            }
+        );
+        commands.registerCommand(
+            {
+                id: 'vscode.prepareCallHierarchy'
+            },
+            {
+                execute: ((resource: URI, position: Position) => {
+                    const args = {
+                        resource: monaco.Uri.from(resource),
+                        position: position
+                    };
+                    return commands.executeCommand<CallHierarchyItem[]>('_executePrepareCallHierarchy', args);
+                })
+            }
+        );
+        commands.registerCommand(
+            {
+                id: 'vscode.provideIncomingCalls'
+            },
+            {
+                execute: ((item: CallHierarchyItem) =>
+                    commands.executeCommand<CallHierarchyIncomingCall[]>('_executeProvideIncomingCalls', { item }))
+            }
+        );
+        commands.registerCommand(
+            {
+                id: 'vscode.provideOutgoingCalls'
+            },
+            {
+                execute: ((item: CallHierarchyItem) =>
+                    commands.executeCommand<CallHierarchyOutgoingCall[]>('_executeProvideOutgoingCalls', { item }))
+            }
+        );
     }
-
 }
diff --git a/packages/plugin-ext/src/common/index.ts b/packages/plugin-ext/src/common/index.ts
@@ -18,4 +18,3 @@
 export * from './plugin-protocol';
 export * from './plugin-api-rpc';
 export * from './plugin-ext-api-contribution';
-export * from './known-commands';
diff --git a/packages/plugin-ext/src/common/known-commands.ts b/packages/plugin-ext/src/common/known-commands.ts
diff --git a/packages/plugin-ext/src/common/plugin-api-rpc-model.ts b/packages/plugin-ext/src/common/plugin-api-rpc-model.ts
@@ -519,3 +519,25 @@ export interface CallHierarchyReference {
     callerDefinition: CallHierarchyDefinition,
     references: Range[]
 }
+
+export interface CallHierarchyItem {
+    _sessionId?: string;
+    _itemId?: string;
+
+    kind: SymbolKind;
+    name: string;
+    detail?: string;
+    uri: UriComponents;
+    range: Range;
+    selectionRange: Range;
+}
+
+export interface CallHierarchyIncomingCall {
+    from: CallHierarchyItem;
+    fromRanges: Range[];
+}
+
+export interface CallHierarchyOutgoingCall {
+    to: CallHierarchyItem;
+    fromRanges: Range[];
+}
diff --git a/packages/plugin-ext/src/common/plugin-api-rpc.ts b/packages/plugin-ext/src/common/plugin-api-rpc.ts
@@ -514,6 +514,8 @@ export interface TreeViewsMain {
     $unregisterTreeDataProvider(treeViewId: string): void;
     $refresh(treeViewId: string): void;
     $reveal(treeViewId: string, treeItemId: string): Promise<any>;
+    $setMessage(treeViewId: string, message: string): void;
+    $setTitle(treeViewId: string, title: string): void;
 }
 
 export interface TreeViewsExt {

diff --git a/packages/plugin-ext/src/main/browser/style/tree.css b/packages/plugin-ext/src/main/browser/style/tree.css
@@ -38,3 +38,8 @@
     align-items: center;
     height: 100%;
 }
+
+.theia-tree-view  .theia-TreeContainer .theia-TreeViewInfo {
+    color: var(--theia-descriptionForeground);
+    margin-left: 17px;
+}
diff --git a/packages/plugin-ext/src/main/browser/view/plugin-view-registry.ts b/packages/plugin-ext/src/main/browser/view/plugin-view-registry.ts
@@ -268,6 +268,23 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
                 }
             }
         }));
+
+        toDispose.push(this.commands.registerCommand({
+            id: `${view.id}.focus`
+        }, {
+            execute: async () => {
+                const widget = await this.openView(view.id);
+                if (widget) {
+                    const data = this.views.get(view.id);
+                    if (data) {
+                        const [containerId] = data;
+                        const identifier = this.toViewContainerIdentifier(containerId);
+                        this.shell.activateWidget(identifier.id);
+                    }
+                }
+            }
+        }));
+
         return toDispose;
     }
 

diff --git a/packages/plugin-ext/src/main/browser/view/plugin-view-widget.ts b/packages/plugin-ext/src/main/browser/view/plugin-view-widget.ts
@@ -21,6 +21,7 @@ import { CommandRegistry } from '@theia/core/lib/common/command';
 import { ViewContextKeyService } from './view-context-key-service';
 import { StatefulWidget } from '@theia/core/lib/browser/shell/shell-layout-restorer';
 import { Message } from '@phosphor/messaging';
+import { TreeViewWidget } from './tree-view-widget';
 
 @injectable()
 export class PluginViewWidgetIdentifier {
@@ -59,6 +60,7 @@ export class PluginViewWidget extends Panel implements StatefulWidget {
         const widget = this.widgets[0];
         if (widget) {
             widget.activate();
+            this.updateWidgetMessage();
         } else {
             this.node.focus();
         }
@@ -67,12 +69,14 @@ export class PluginViewWidget extends Panel implements StatefulWidget {
     storeState(): PluginViewWidget.State {
         return {
             label: this.title.label,
+            message: this.message,
             widgets: this.widgets
         };
     }
 
     restoreState(state: PluginViewWidget.State): void {
         this.title.label = state.label;
+        this.message = state.message;
         for (const widget of state.widgets) {
             this.addWidget(widget);
         }
@@ -96,10 +100,39 @@ export class PluginViewWidget extends Panel implements StatefulWidget {
         }
     }
 
+    private _message: string | undefined;
+    get message(): string | undefined {
+        return this._message;
+    }
+
+    set message(message: string | undefined) {
+        this._message = message;
+        this.updateWidgetMessage();
+    }
+
+    private updateWidgetMessage(): void {
+        const widget = this.widgets[0];
+        if (widget) {
+            if (widget instanceof TreeViewWidget) {
+                widget.message = this._message;
+            }
+        }
+    }
+
+    addWidget(widget: Widget): void {
+        super.addWidget(widget);
+        this.updateWidgetMessage();
+    }
+
+    insertWidget(index: number, widget: Widget): void {
+        super.insertWidget(index, widget);
+        this.updateWidgetMessage();
+    }
 }
 export namespace PluginViewWidget {
     export interface State {
         label: string
+        message?: string;
         widgets: ReadonlyArray<Widget>
     }
 }
diff --git a/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx b/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx
@@ -372,4 +372,25 @@ export class TreeViewWidget extends TreeWidget {
             }
         }
     }
+
+    private _message: string | undefined;
+    get message(): string | undefined {
+        return this._message;
+    }
+
+    set message(message: string | undefined) {
+        this._message = message;
+        this.update();
+    }
+
+    protected render(): React.ReactNode {
+        return React.createElement('div', this.createContainerAttributes(), this.renderSearchInfo(), this.renderTree(this.model));
+    }
+
+    protected renderSearchInfo(): React.ReactNode {
+        if (this._message) {
+            return <div className='theia-TreeViewInfo'>{this._message}</div>;
+        }
+        return undefined;
+    }
 }
diff --git a/packages/plugin-ext/src/main/browser/view/tree-views-main.ts b/packages/plugin-ext/src/main/browser/view/tree-views-main.ts
@@ -22,6 +22,7 @@ import { SelectableTreeNode, ExpandableTreeNode, CompositeTreeNode, WidgetManage
 import { ViewContextKeyService } from './view-context-key-service';
 import { Disposable, DisposableCollection } from '@theia/core';
 import { TreeViewWidget, TreeViewNode } from './tree-view-widget';
+import { PluginViewWidget } from './plugin-view-widget';
 
 export class TreeViewsMainImpl implements TreeViewsMain, Disposable {
 
@@ -108,6 +109,20 @@ export class TreeViewsMainImpl implements TreeViewsMain, Disposable {
         }
     }
 
+    async $setMessage(treeViewId: string, message: string): Promise<void> {
+        const viewPanel = await this.viewRegistry.getView(treeViewId);
+        if (viewPanel instanceof PluginViewWidget) {
+            viewPanel.message = message;
+        }
+    }
+
+    async $setTitle(treeViewId: string, title: string): Promise<void> {
+        const viewPanel = await this.viewRegistry.getView(treeViewId);
+        if (viewPanel) {
+            viewPanel.title.label = title;
+        }
+    }
+
     protected handleTreeEvents(treeViewId: string, treeViewWidget: TreeViewWidget): void {
         this.toDispose.push(treeViewWidget.model.onExpansionChanged(event => {
             this.proxy.$setExpanded(treeViewId, event.id, event.expanded);

diff --git a/packages/plugin-ext/src/plugin/command-registry.ts b/packages/plugin-ext/src/plugin/command-registry.ts
@@ -24,7 +24,7 @@ import { CommandRegistryExt, PLUGIN_RPC_CONTEXT as Ext, CommandRegistryMain } fr
 import { RPCProtocol } from '../common/rpc-protocol';
 import { Disposable } from './types-impl';
 import { DisposableCollection } from '@theia/core';
-import { KnownCommands } from '../common/known-commands';
+import { KnownCommands } from './known-commands';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type Handler = <T>(...args: any[]) => T | PromiseLike<T | undefined>;
@@ -104,8 +104,19 @@ export class CommandRegistryImpl implements CommandRegistryExt {
             return this.executeLocalCommand(id, ...args);
         } else if (KnownCommands.mapped(id)) {
             // Using the KnownCommand exclusions, convert the commands manually
-            return KnownCommands.map(id, args, (mappedId: string, mappedArgs: any[] | undefined) =>
-                this.proxy.$executeCommand(mappedId, ...mappedArgs));
+            return KnownCommands.map(id, args, (mappedId: string, mappedArgs: any[] | undefined, mappedResult: KnownCommands.ConversionFunction) => {
+                const mr: KnownCommands.ConversionFunction = mappedResult;
+                return this.proxy.$executeCommand(mappedId, ...mappedArgs).then((result: any) => {
+                    if (!result) {
+                        return undefined;
+                    }
+                    if (!mr) {
+                        return result;
+                    }
+                    return mr(result);
+                });
+            }
+            );
         } else {
             return this.proxy.$executeCommand(id, ...args);
         }

diff --git a/packages/plugin-ext/src/plugin/known-commands.spec.ts b/packages/plugin-ext/src/plugin/known-commands.spec.ts
@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import * as assert from 'assert';
-import { KnownCommands } from '../common/known-commands';
+import { KnownCommands } from './known-commands';
 import URI from 'vscode-uri';
 import { Position } from './types-impl';
 import { fromPosition } from './type-converters';