@theia/callhierarchy 1.18.0 → 1.21.0-next.12

package/lib/browser/callhierarchy-contribution.d.ts

@@ -15,9 +15,10 @@
  ********************************************************************************/
 import { MenuModelRegistry, Command, CommandRegistry } from '@theia/core/lib/common';
 import { AbstractViewContribution, OpenViewArguments, KeybindingRegistry } from '@theia/core/lib/browser';
-import { CurrentEditorAccess } from '@theia/editor/lib/browser';
+import { CurrentEditorAccess, EditorManager } from '@theia/editor/lib/browser';
 import { CallHierarchyTreeWidget } from './callhierarchy-tree/callhierarchy-tree-widget';
 import { CallHierarchyServiceProvider } from './callhierarchy-service';
+import { ContextKey, ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 export declare const CALL_HIERARCHY_TOGGLE_COMMAND_ID = "callhierarchy:toggle";
 export declare const CALL_HIERARCHY_LABEL = "Call Hierarchy";
 export declare namespace CallHierarchyCommands {
@@ -25,8 +26,12 @@ export declare namespace CallHierarchyCommands {
 }
 export declare class CallHierarchyContribution extends AbstractViewContribution<CallHierarchyTreeWidget> {
     protected readonly editorAccess: CurrentEditorAccess;
+    protected readonly editorManager: EditorManager;
     protected readonly callHierarchyServiceProvider: CallHierarchyServiceProvider;
+    protected readonly contextKeyService: ContextKeyService;
+    protected editorHasCallHierarchyProvider: ContextKey<boolean>;
     constructor();
+    protected init(): void;
     protected isCallHierarchyAvailable(): boolean;
     openView(args?: Partial<OpenViewArguments>): Promise<CallHierarchyTreeWidget>;
     registerCommands(commands: CommandRegistry): void;

package/lib/browser/callhierarchy-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callhierarchy-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/callhierarchy-contribution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACrF,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC1G,OAAO,EAAuB,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AAEzF,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AAGvE,eAAO,MAAM,gCAAgC,yBAAyB,CAAC;AACvE,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AAErD,yBAAiB,qBAAqB,CAAC;IAC5B,MAAM,IAAI,EAAE,OAGlB,CAAC;CACL;AAED,qBACa,yBAA0B,SAAQ,wBAAwB,CAAC,uBAAuB,CAAC;IAE/D,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAAC;IAC5C,SAAS,CAAC,QAAQ,CAAC,4BAA4B,EAAE,4BAA4B,CAAC;;IAapH,SAAS,CAAC,wBAAwB,IAAI,OAAO;IAKvC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAOnF,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAWjD,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAS7C,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI;CAO7D"}
+{"version":3,"file":"callhierarchy-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/callhierarchy-contribution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACrF,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC1G,OAAO,EAAuB,mBAAmB,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AAEzF,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAE5F,eAAO,MAAM,gCAAgC,yBAAyB,CAAC;AACvE,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AAErD,yBAAiB,qBAAqB,CAAC;IAC5B,MAAM,IAAI,SAGa,CAAC;CAClC;AAED,qBACa,yBAA0B,SAAQ,wBAAwB,CAAC,uBAAuB,CAAC;IAE/D,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAAC;IAC3D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACjC,SAAS,CAAC,QAAQ,CAAC,4BAA4B,EAAE,4BAA4B,CAAC;IACzF,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAEnF,SAAS,CAAC,8BAA8B,EAAG,UAAU,CAAC,OAAO,CAAC,CAAC;;IAe/D,SAAS,CAAC,IAAI,IAAI,IAAI;IAMtB,SAAS,CAAC,wBAAwB,IAAI,OAAO;IAKvC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAOnF,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAWjD,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAS7C,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI;CAO7D"}

package/lib/browser/callhierarchy-contribution.js

@@ -26,19 +26,21 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CallHierarchyContribution = exports.CallHierarchyCommands = exports.CALL_HIERARCHY_LABEL = exports.CALL_HIERARCHY_TOGGLE_COMMAND_ID = void 0;
 const inversify_1 = require("@theia/core/shared/inversify");
+const common_1 = require("@theia/core/lib/common");
 const browser_1 = require("@theia/core/lib/browser");
 const browser_2 = require("@theia/editor/lib/browser");
 const callhierarchy_1 = require("./callhierarchy");
 const callhierarchy_service_1 = require("./callhierarchy-service");
 const uri_1 = require("@theia/core/lib/common/uri");
+const context_key_service_1 = require("@theia/core/lib/browser/context-key-service");
 exports.CALL_HIERARCHY_TOGGLE_COMMAND_ID = 'callhierarchy:toggle';
 exports.CALL_HIERARCHY_LABEL = 'Call Hierarchy';
 var CallHierarchyCommands;
 (function (CallHierarchyCommands) {
-    CallHierarchyCommands.OPEN = {
+    CallHierarchyCommands.OPEN = common_1.Command.toLocalizedCommand({
         id: 'callhierarchy:open',
         label: 'Open Call Hierarchy'
-    };
+    }, 'theia/callhierarchy/open');
 })(CallHierarchyCommands = exports.CallHierarchyCommands || (exports.CallHierarchyCommands = {}));
 let CallHierarchyContribution = class CallHierarchyContribution extends browser_1.AbstractViewContribution {
     constructor() {
@@ -52,6 +54,11 @@ let CallHierarchyContribution = class CallHierarchyContribution extends browser_
             toggleKeybinding: 'ctrlcmd+shift+f1'
         });
     }
+    init() {
+        this.editorHasCallHierarchyProvider = this.contextKeyService.createKey('editorHasCallHierarchyProvider', false);
+        this.editorManager.onCurrentEditorChanged(() => this.editorHasCallHierarchyProvider.set(this.isCallHierarchyAvailable()));
+        this.callHierarchyServiceProvider.onDidChange(() => this.editorHasCallHierarchyProvider.set(this.isCallHierarchyAvailable()));
+    }
     isCallHierarchyAvailable() {
         const { selection, languageId } = this.editorAccess;
         return !!selection && !!languageId && !!this.callHierarchyServiceProvider.get(languageId, new uri_1.default(selection.uri));
@@ -92,10 +99,24 @@ __decorate([
     inversify_1.inject(browser_2.CurrentEditorAccess),
     __metadata("design:type", browser_2.CurrentEditorAccess)
 ], CallHierarchyContribution.prototype, "editorAccess", void 0);
+__decorate([
+    inversify_1.inject(browser_2.EditorManager),
+    __metadata("design:type", browser_2.EditorManager)
+], CallHierarchyContribution.prototype, "editorManager", void 0);
 __decorate([
     inversify_1.inject(callhierarchy_service_1.CallHierarchyServiceProvider),
     __metadata("design:type", callhierarchy_service_1.CallHierarchyServiceProvider)
 ], CallHierarchyContribution.prototype, "callHierarchyServiceProvider", void 0);
+__decorate([
+    inversify_1.inject(context_key_service_1.ContextKeyService),
+    __metadata("design:type", context_key_service_1.ContextKeyService)
+], CallHierarchyContribution.prototype, "contextKeyService", void 0);
+__decorate([
+    inversify_1.postConstruct(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], CallHierarchyContribution.prototype, "init", null);
 CallHierarchyContribution = __decorate([
     inversify_1.injectable(),
     __metadata("design:paramtypes", [])

package/lib/browser/callhierarchy-contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"callhierarchy-contribution.js","sourceRoot":"","sources":["../../src/browser/callhierarchy-contribution.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAkE;AAElE,qDAA0G;AAC1G,uDAAqF;AAErF,mDAAmD;AACnD,mEAAuE;AACvE,oDAA6C;AAEhC,QAAA,gCAAgC,GAAG,sBAAsB,CAAC;AAC1D,QAAA,oBAAoB,GAAG,gBAAgB,CAAC;AAErD,IAAiB,qBAAqB,CAKrC;AALD,WAAiB,qBAAqB;IACrB,0BAAI,GAAY;QACzB,EAAE,EAAE,oBAAoB;QACxB,KAAK,EAAE,qBAAqB;KAC/B,CAAC;AACN,CAAC,EALgB,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAKrC;AAGD,IAAa,yBAAyB,GAAtC,MAAa,yBAA0B,SAAQ,kCAAiD;IAI5F;QACI,KAAK,CAAC;YACF,QAAQ,EAAE,gCAAgB;YAC1B,UAAU,EAAE,4BAAoB;YAChC,oBAAoB,EAAE;gBAClB,IAAI,EAAE,QAAQ;aACjB;YACD,eAAe,EAAE,wCAAgC;YACjD,gBAAgB,EAAE,kBAAkB;SACvC,CAAC,CAAC;IACP,CAAC;IAES,wBAAwB;QAC9B,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QACpD,OAAO,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,aAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IACtH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAiC;QAC5C,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QACpD,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAC9C,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,gBAAgB,CAAC,QAAyB;QACtC,QAAQ,CAAC,eAAe,CAAC,qBAAqB,CAAC,IAAI,EAAE;YACjD,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;gBACzB,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,IAAI;aACjB,CAAC;YACF,SAAS,EAAE,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC;SACtD,CAAC,CAAC;QACH,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAED,aAAa,CAAC,KAAwB;QAClC,MAAM,QAAQ,GAAG,CAAC,GAAG,6BAAmB,EAAE,YAAY,CAAC,CAAC;QACxD,KAAK,CAAC,kBAAkB,CAAC,QAAQ,EAAE;YAC/B,SAAS,EAAE,qBAAqB,CAAC,IAAI,CAAC,EAAE;YACxC,KAAK,EAAE,4BAAoB;SAC9B,CAAC,CAAC;QACH,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,mBAAmB,CAAC,WAA+B;QAC/C,KAAK,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACvC,WAAW,CAAC,kBAAkB,CAAC;YAC3B,OAAO,EAAE,qBAAqB,CAAC,IAAI,CAAC,EAAE;YACtC,UAAU,EAAE,YAAY;SAC3B,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AArDgC;IAA5B,kBAAM,CAAC,6BAAmB,CAAC;8BAAkC,6BAAmB;+DAAC;AAC5C;IAArC,kBAAM,CAAC,oDAA4B,CAAC;8BAAkD,oDAA4B;+EAAC;AAH3G,yBAAyB;IADrC,sBAAU,EAAE;;GACA,yBAAyB,CAuDrC;AAvDY,8DAAyB"}
+{"version":3,"file":"callhierarchy-contribution.js","sourceRoot":"","sources":["../../src/browser/callhierarchy-contribution.ts"],"names":[],"mappings":"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"}

package/lib/browser/callhierarchy-service.d.ts

@@ -14,24 +14,26 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { Position, DocumentUri } from '@theia/core/shared/vscode-languageserver-types';
+import { CancellationToken } from '@theia/core';
+import URI from '@theia/core/lib/common/uri';
+import { ContributionProvider, Disposable, Emitter, Event } from '@theia/core/lib/common';
 import { Definition, Caller, Callee } from './callhierarchy';
-import { ContributionProvider } from '@theia/core/lib/common';
 import { LanguageSelector } from '../common/language-selector';
-import URI from '@theia/core/lib/common/uri';
-import { Disposable } from '@theia/core/lib/common';
-import { CancellationToken } from '@theia/core';
 export declare const CallHierarchyService: unique symbol;
 export interface CallHierarchyService {
     readonly selector: LanguageSelector;
-    getRootDefinition(uri: DocumentUri, position: Position, cancellationToken: CancellationToken): Promise<Definition | undefined>;
+    getRootDefinition(uri: DocumentUri, position: Position, cancellationToken: CancellationToken): Promise<Definition | Definition[] | undefined>;
     getCallers(definition: Definition, cancellationToken: CancellationToken): Promise<Caller[] | undefined>;
     getCallees?(definition: Definition, cancellationToken: CancellationToken): Promise<Callee[] | undefined>;
 }
 export declare class CallHierarchyServiceProvider {
     protected readonly contributions: ContributionProvider<CallHierarchyService>;
+    protected readonly onDidChangeEmitter: Emitter<void>;
+    get onDidChange(): Event<void>;
     private services;
     init(): void;
     get(languageId: string, uri: URI): CallHierarchyService | undefined;
+    protected score(service: CallHierarchyService, languageId: string, uri: URI): number;
     add(service: CallHierarchyService): Disposable;
     private remove;
 }

package/lib/browser/callhierarchy-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callhierarchy-service.d.ts","sourceRoot":"","sources":["../../src/browser/callhierarchy-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAS,MAAM,6BAA6B,CAAC;AACtE,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE,MAAM,WAAW,oBAAoB;IAEjC,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IAEpC,iBAAiB,CAAC,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAA;IAC9H,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAAA;IACvG,UAAU,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAAA;CAC3G;AAED,qBACa,4BAA4B;IAGrC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC,oBAAoB,CAAC,CAAC;IAE7E,OAAO,CAAC,QAAQ,CAA8B;IAG9C,IAAI,IAAI,IAAI;IAIZ,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,oBAAoB,GAAG,SAAS;IAOnE,GAAG,CAAC,OAAO,EAAE,oBAAoB,GAAG,UAAU;IAU9C,OAAO,CAAC,MAAM;CAKjB"}
+{"version":3,"file":"callhierarchy-service.d.ts","sourceRoot":"","sources":["../../src/browser/callhierarchy-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAS,MAAM,6BAA6B,CAAC;AAEtE,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE,MAAM,WAAW,oBAAoB;IAEjC,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IAEpC,iBAAiB,CAAC,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,GAAG,UAAU,EAAE,GAAG,SAAS,CAAC,CAAA;IAC7I,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAAA;IACvG,UAAU,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAAA;CAC3G;AAED,qBACa,4BAA4B;IAGrC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC,oBAAoB,CAAC,CAAC;IAE7E,SAAS,CAAC,QAAQ,CAAC,kBAAkB,gBAAuB;IAC5D,IAAI,WAAW,IAAI,KAAK,CAAC,IAAI,CAAC,CAE7B;IAED,OAAO,CAAC,QAAQ,CAA8B;IAG9C,IAAI,IAAI,IAAI;IAIZ,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,oBAAoB,GAAG,SAAS;IAMnE,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,MAAM;IAIpF,GAAG,CAAC,OAAO,EAAE,oBAAoB,GAAG,UAAU;IAW9C,OAAO,CAAC,MAAM;CASjB"}

package/lib/browser/callhierarchy-service.js

@@ -31,17 +31,27 @@ const language_selector_1 = require("../common/language-selector");
 exports.CallHierarchyService = Symbol('CallHierarchyService');
 let CallHierarchyServiceProvider = class CallHierarchyServiceProvider {
     constructor() {
+        this.onDidChangeEmitter = new common_1.Emitter();
         this.services = [];
     }
+    get onDidChange() {
+        return this.onDidChangeEmitter.event;
+    }
     init() {
         this.services = this.services.concat(this.contributions.getContributions());
     }
     get(languageId, uri) {
-        return this.services.sort((left, right) => language_selector_1.score(right.selector, uri.scheme, uri.path.toString(), languageId, true) - language_selector_1.score(left.selector, uri.scheme, uri.path.toString(), languageId, true))[0];
+        return this.services
+            .filter(service => this.score(service, languageId, uri) > 0)
+            .sort((left, right) => this.score(right, languageId, uri) - this.score(left, languageId, uri))[0];
+    }
+    score(service, languageId, uri) {
+        return language_selector_1.score(service.selector, uri.scheme, uri.path.toString(), languageId, true);
     }
     add(service) {
         this.services.push(service);
         const that = this;
+        this.onDidChangeEmitter.fire();
         return {
             dispose: () => {
                 that.remove(service);
@@ -51,7 +61,11 @@ let CallHierarchyServiceProvider = class CallHierarchyServiceProvider {
     remove(service) {
         const length = this.services.length;
         this.services = this.services.filter(value => value !== service);
-        return length !== this.services.length;
+        const serviceWasRemoved = length !== this.services.length;
+        if (serviceWasRemoved) {
+            this.onDidChangeEmitter.fire();
+        }
+        return serviceWasRemoved;
     }
 };
 __decorate([

package/lib/browser/callhierarchy-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"callhierarchy-service.js","sourceRoot":"","sources":["../../src/browser/callhierarchy-service.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAwF;AAGxF,mDAA8D;AAC9D,mEAAsE;AAKzD,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAYnE,IAAa,4BAA4B,GAAzC,MAAa,4BAA4B;IAAzC;QAKY,aAAQ,GAA2B,EAAE,CAAC;IA6BlD,CAAC;IA1BG,IAAI;QACA,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,GAAG,CAAC,UAAkB,EAAE,GAAQ;QAE5B,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CACrB,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACZ,yBAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,yBAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnK,CAAC;IAED,GAAG,CAAC,OAA6B;QAC7B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC;QAClB,OAAO;YACH,OAAO,EAAE,GAAG,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACzB,CAAC;SACJ,CAAC;IACN,CAAC;IAEO,MAAM,CAAC,OAA6B;QACxC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC;QACjE,OAAO,MAAM,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC3C,CAAC;CACJ,CAAA;AA/BG;IADC,kBAAM,CAAC,6BAAoB,CAAC;IAAE,iBAAK,CAAC,4BAAoB,CAAC;;mEACmB;AAK7E;IADC,yBAAa,EAAE;;;;wDAGf;AAVQ,4BAA4B;IADxC,sBAAU,EAAE;GACA,4BAA4B,CAkCxC;AAlCY,oEAA4B"}
+{"version":3,"file":"callhierarchy-service.js","sourceRoot":"","sources":["../../src/browser/callhierarchy-service.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAwF;AAIxF,mDAA0F;AAE1F,mEAAsE;AAEzD,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAYnE,IAAa,4BAA4B,GAAzC,MAAa,4BAA4B;IAAzC;QAKuB,uBAAkB,GAAG,IAAI,gBAAO,EAAQ,CAAC;QAKpD,aAAQ,GAA2B,EAAE,CAAC;IAqClD,CAAC;IAzCG,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;IACzC,CAAC;IAKD,IAAI;QACA,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,GAAG,CAAC,UAAkB,EAAE,GAAQ;QAC5B,OAAO,IAAI,CAAC,QAAQ;aACf,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;aAC3D,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1G,CAAC;IAES,KAAK,CAAC,OAA6B,EAAE,UAAkB,EAAE,GAAQ;QACvE,OAAO,yBAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IACtF,CAAC;IAED,GAAG,CAAC,OAA6B;QAC7B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC;QAC/B,OAAO;YACH,OAAO,EAAE,GAAG,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACzB,CAAC;SACJ,CAAC;IACN,CAAC;IAEO,MAAM,CAAC,OAA6B;QACxC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC;QACjE,MAAM,iBAAiB,GAAG,MAAM,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC1D,IAAI,iBAAiB,EAAE;YACnB,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC;SAClC;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;CACJ,CAAA;AA5CG;IADC,kBAAM,CAAC,6BAAoB,CAAC;IAAE,iBAAK,CAAC,4BAAoB,CAAC;;mEACmB;AAU7E;IADC,yBAAa,EAAE;;;;wDAGf;AAfQ,4BAA4B;IADxC,sBAAU,EAAE;GACA,4BAA4B,CA+CxC;AA/CY,oEAA4B"}

package/lib/browser/callhierarchy-tree/callhierarchy-tree-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callhierarchy-tree-model.d.ts","sourceRoot":"","sources":["../../../src/browser/callhierarchy-tree/callhierarchy-tree-model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAkB,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,gDAAgD,CAAC;AAI1E,qBACa,sBAAuB,SAAQ,aAAa;IAErD,OAAO,CAAC,WAAW,CAAqB;IAEb,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,4BAA4B,EAAE,4BAA4B,CAAC;IAEpH,OAAO,IAAI,iBAAiB;IAI5B,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAEK,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBrI,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;CAG7C"}
+{"version":3,"file":"callhierarchy-tree-model.d.ts","sourceRoot":"","sources":["../../../src/browser/callhierarchy-tree/callhierarchy-tree-model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAqB,aAAa,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAkB,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,gDAAgD,CAAC;AAI1E,qBACa,sBAAuB,SAAQ,aAAa;IAErD,OAAO,CAAC,WAAW,CAAqB;IAEb,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,4BAA4B,EAAE,4BAA4B,CAAC;IAEpH,OAAO,IAAI,iBAAiB;IAI5B,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAEK,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrI,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;CAG7C"}

package/lib/browser/callhierarchy-tree/callhierarchy-tree-model.js

@@ -48,9 +48,16 @@ let CallHierarchyTreeModel = class CallHierarchyTreeModel extends browser_1.Tree
                 this.tree.callHierarchyService = callHierarchyService;
                 const cancellationSource = new cancellation_1.CancellationTokenSource();
                 const rootDefinition = await callHierarchyService.getRootDefinition(uri, position, cancellationSource.token);
-                if (rootDefinition) {
-                    const rootNode = callhierarchy_tree_1.DefinitionNode.create(rootDefinition, undefined);
-                    this.tree.root = rootNode;
+                const definitions = rootDefinition && (Array.isArray(rootDefinition) ? rootDefinition : [rootDefinition]);
+                if (definitions) {
+                    const root = {
+                        id: 'call-hierarchy-tree-root',
+                        parent: undefined,
+                        children: [],
+                        visible: false,
+                    };
+                    definitions.forEach(definition => browser_1.CompositeTreeNode.addChild(root, callhierarchy_tree_1.DefinitionNode.create(definition, root)));
+                    this.tree.root = root;
                 }
             }
         }

package/lib/browser/callhierarchy-tree/callhierarchy-tree-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"callhierarchy-tree-model.js","sourceRoot":"","sources":["../../../src/browser/callhierarchy-tree/callhierarchy-tree-model.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAkE;AAClE,qDAAkE;AAClE,6DAAyE;AACzE,oEAAwE;AAExE,oDAA6C;AAC7C,sEAA8E;AAG9E,IAAa,sBAAsB,GAAnC,MAAa,sBAAuB,SAAQ,uBAAa;IAOrD,OAAO;QACH,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAED,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,UAA8B,EAAE,GAAuB,EAAE,QAA8B;QACjH,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,oBAAoB,GAAG,SAAS,CAAC;QAC3C,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,UAAU,IAAI,GAAG,IAAI,QAAQ,EAAE;YAC/B,MAAM,oBAAoB,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,aAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7F,IAAI,oBAAoB,EAAE;gBACtB,IAAI,CAAC,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;gBACtD,MAAM,kBAAkB,GAAG,IAAI,sCAAuB,EAAE,CAAC;gBACzD,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAAC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBAC7G,IAAI,cAAc,EAAE;oBAChB,MAAM,QAAQ,GAAG,mCAAc,CAAC,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;oBAClE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC;iBAC7B;aACJ;SACJ;IACL,CAAC;IAES,UAAU,CAAC,IAAc;QAC/B,oDAAoD;IACxD,CAAC;CACJ,CAAA;AAhC8B;IAA1B,kBAAM,CAAC,sCAAiB,CAAC;8BAA0B,sCAAiB;oDAAC;AAChC;IAArC,kBAAM,CAAC,oDAA4B,CAAC;8BAAkD,oDAA4B;4EAAC;AAL3G,sBAAsB;IADlC,sBAAU,EAAE;GACA,sBAAsB,CAoClC;AApCY,wDAAsB"}
+{"version":3,"file":"callhierarchy-tree-model.js","sourceRoot":"","sources":["../../../src/browser/callhierarchy-tree/callhierarchy-tree-model.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAkE;AAClE,qDAAqF;AACrF,6DAAyE;AACzE,oEAAwE;AAExE,oDAA6C;AAC7C,sEAA8E;AAG9E,IAAa,sBAAsB,GAAnC,MAAa,sBAAuB,SAAQ,uBAAa;IAOrD,OAAO;QACH,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAED,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,UAA8B,EAAE,GAAuB,EAAE,QAA8B;QACjH,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,oBAAoB,GAAG,SAAS,CAAC;QAC3C,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,UAAU,IAAI,GAAG,IAAI,QAAQ,EAAE;YAC/B,MAAM,oBAAoB,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,aAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7F,IAAI,oBAAoB,EAAE;gBACtB,IAAI,CAAC,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;gBACtD,MAAM,kBAAkB,GAAG,IAAI,sCAAuB,EAAE,CAAC;gBACzD,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAAC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBAC7G,MAAM,WAAW,GAAG,cAAc,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;gBAC1G,IAAI,WAAW,EAAE;oBACb,MAAM,IAAI,GAAsB;wBAC5B,EAAE,EAAE,0BAA0B;wBAC9B,MAAM,EAAE,SAAS;wBACjB,QAAQ,EAAE,EAAE;wBACZ,OAAO,EAAE,KAAK;qBACjB,CAAC;oBACF,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,2BAAiB,CAAC,QAAQ,CAAC,IAAI,EAAE,mCAAc,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;oBAC7G,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;iBACzB;aACJ;SACJ;IACL,CAAC;IAES,UAAU,CAAC,IAAc;QAC/B,oDAAoD;IACxD,CAAC;CACJ,CAAA;AAvC8B;IAA1B,kBAAM,CAAC,sCAAiB,CAAC;8BAA0B,sCAAiB;oDAAC;AAChC;IAArC,kBAAM,CAAC,oDAA4B,CAAC;8BAAkD,oDAA4B;4EAAC;AAL3G,sBAAsB;IADlC,sBAAU,EAAE;GACA,sBAAsB,CA2ClC;AA3CY,wDAAsB"}

package/lib/browser/callhierarchy.d.ts

@@ -22,6 +22,7 @@ export interface Definition {
     symbolKind: SymbolKind;
     containerName: string | undefined;
     tags?: readonly SymbolTag[];
+    data?: unknown;
 }
 export interface Caller {
     callerDefinition: Definition;

package/lib/browser/callhierarchy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callhierarchy.d.ts","sourceRoot":"","sources":["../../src/browser/callhierarchy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAC;AAExG,eAAO,MAAM,gBAAgB,kBAAkB,CAAC;AAEhD,MAAM,WAAW,UAAU;IACvB,QAAQ,EAAE,QAAQ,CAAC;IACnB,cAAc,EAAE,KAAK,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,IAAI,CAAC,EAAE,SAAS,SAAS,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,MAAM;IACnB,gBAAgB,EAAE,UAAU,CAAC;IAC7B,UAAU,EAAE,KAAK,EAAE,CAAA;CACtB;AAED,MAAM,WAAW,MAAM;IACnB,gBAAgB,EAAE,UAAU,CAAC;IAC7B,UAAU,EAAE,KAAK,EAAE,CAAA;CACtB"}
+{"version":3,"file":"callhierarchy.d.ts","sourceRoot":"","sources":["../../src/browser/callhierarchy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAC;AAExG,eAAO,MAAM,gBAAgB,kBAAkB,CAAC;AAEhD,MAAM,WAAW,UAAU;IACvB,QAAQ,EAAE,QAAQ,CAAC;IACnB,cAAc,EAAE,KAAK,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,IAAI,CAAC,EAAE,SAAS,SAAS,EAAE,CAAC;IAC5B,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,MAAM;IACnB,gBAAgB,EAAE,UAAU,CAAC;IAC7B,UAAU,EAAE,KAAK,EAAE,CAAA;CACtB;AAED,MAAM,WAAW,MAAM;IACnB,gBAAgB,EAAE,UAAU,CAAC;IAC7B,UAAU,EAAE,KAAK,EAAE,CAAA;CACtB"}

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@theia/callhierarchy",
-  "version": "1.18.0",
+  "version": "1.21.0-next.12+c8248f736ed",
   "description": "Theia - Call Hierarchy Extension",
   "dependencies": {
-    "@theia/core": "1.18.0",
-    "@theia/editor": "1.18.0",
-    "@theia/monaco": "1.18.0",
+    "@theia/core": "1.21.0-next.12+c8248f736ed",
+    "@theia/editor": "1.21.0-next.12+c8248f736ed",
+    "@theia/monaco": "1.21.0-next.12+c8248f736ed",
     "ts-md5": "^1.2.2"
   },
   "publishConfig": {
@@ -41,10 +41,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.18.0"
+    "@theia/ext-scripts": "1.20.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "76318d01b7b3364cdf35ee456797699363f2634d"
+  "gitHead": "c8248f736edb4939155711987333ed39d9394b11"
 }

package/src/browser/callhierarchy-contribution.ts

@@ -14,30 +14,36 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { injectable, inject } from '@theia/core/shared/inversify';
+import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
 import { MenuModelRegistry, Command, CommandRegistry } from '@theia/core/lib/common';
 import { AbstractViewContribution, OpenViewArguments, KeybindingRegistry } from '@theia/core/lib/browser';
-import { EDITOR_CONTEXT_MENU, CurrentEditorAccess } from '@theia/editor/lib/browser';
+import { EDITOR_CONTEXT_MENU, CurrentEditorAccess, EditorManager } from '@theia/editor/lib/browser';
 import { CallHierarchyTreeWidget } from './callhierarchy-tree/callhierarchy-tree-widget';
 import { CALLHIERARCHY_ID } from './callhierarchy';
 import { CallHierarchyServiceProvider } from './callhierarchy-service';
 import URI from '@theia/core/lib/common/uri';
+import { ContextKey, ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 
 export const CALL_HIERARCHY_TOGGLE_COMMAND_ID = 'callhierarchy:toggle';
 export const CALL_HIERARCHY_LABEL = 'Call Hierarchy';
 
 export namespace CallHierarchyCommands {
-    export const OPEN: Command = {
+    export const OPEN = Command.toLocalizedCommand({
         id: 'callhierarchy:open',
         label: 'Open Call Hierarchy'
-    };
+    }, 'theia/callhierarchy/open');
 }
 
 @injectable()
 export class CallHierarchyContribution extends AbstractViewContribution<CallHierarchyTreeWidget> {
 
     @inject(CurrentEditorAccess) protected readonly editorAccess: CurrentEditorAccess;
+    @inject(EditorManager) protected readonly editorManager: EditorManager;
     @inject(CallHierarchyServiceProvider) protected readonly callHierarchyServiceProvider: CallHierarchyServiceProvider;
+    @inject(ContextKeyService) protected readonly contextKeyService: ContextKeyService;
+
+    protected editorHasCallHierarchyProvider!: ContextKey<boolean>;
+
     constructor() {
         super({
             widgetId: CALLHIERARCHY_ID,
@@ -50,6 +56,13 @@ export class CallHierarchyContribution extends AbstractViewContribution<CallHier
         });
     }
 
+    @postConstruct()
+    protected init(): void {
+        this.editorHasCallHierarchyProvider = this.contextKeyService.createKey('editorHasCallHierarchyProvider', false);
+        this.editorManager.onCurrentEditorChanged(() => this.editorHasCallHierarchyProvider.set(this.isCallHierarchyAvailable()));
+        this.callHierarchyServiceProvider.onDidChange(() => this.editorHasCallHierarchyProvider.set(this.isCallHierarchyAvailable()));
+    }
+
     protected isCallHierarchyAvailable(): boolean {
         const { selection, languageId } = this.editorAccess;
         return !!selection && !!languageId && !!this.callHierarchyServiceProvider.get(languageId, new URI(selection.uri));

package/src/browser/callhierarchy-service.ts

@@ -16,12 +16,11 @@
 
 import { injectable, inject, named, postConstruct } from '@theia/core/shared/inversify';
 import { Position, DocumentUri } from '@theia/core/shared/vscode-languageserver-types';
+import { CancellationToken } from '@theia/core';
+import URI from '@theia/core/lib/common/uri';
+import { ContributionProvider, Disposable, Emitter, Event } from '@theia/core/lib/common';
 import { Definition, Caller, Callee } from './callhierarchy';
-import { ContributionProvider } from '@theia/core/lib/common';
 import { LanguageSelector, score } from '../common/language-selector';
-import URI from '@theia/core/lib/common/uri';
-import { Disposable } from '@theia/core/lib/common';
-import { CancellationToken } from '@theia/core';
 
 export const CallHierarchyService = Symbol('CallHierarchyService');
 
@@ -29,7 +28,7 @@ export interface CallHierarchyService {
 
     readonly selector: LanguageSelector;
 
-    getRootDefinition(uri: DocumentUri, position: Position, cancellationToken: CancellationToken): Promise<Definition | undefined>
+    getRootDefinition(uri: DocumentUri, position: Position, cancellationToken: CancellationToken): Promise<Definition | Definition[] | undefined>
     getCallers(definition: Definition, cancellationToken: CancellationToken): Promise<Caller[] | undefined>
     getCallees?(definition: Definition, cancellationToken: CancellationToken): Promise<Callee[] | undefined>
 }
@@ -40,6 +39,11 @@ export class CallHierarchyServiceProvider {
     @inject(ContributionProvider) @named(CallHierarchyService)
     protected readonly contributions: ContributionProvider<CallHierarchyService>;
 
+    protected readonly onDidChangeEmitter = new Emitter<void>();
+    get onDidChange(): Event<void> {
+        return this.onDidChangeEmitter.event;
+    }
+
     private services: CallHierarchyService[] = [];
 
     @postConstruct()
@@ -48,15 +52,19 @@ export class CallHierarchyServiceProvider {
     }
 
     get(languageId: string, uri: URI): CallHierarchyService | undefined {
+        return this.services
+            .filter(service => this.score(service, languageId, uri) > 0)
+            .sort((left, right) => this.score(right, languageId, uri) - this.score(left, languageId, uri))[0];
+    }
 
-        return this.services.sort(
-            (left, right) =>
-                score(right.selector, uri.scheme, uri.path.toString(), languageId, true) - score(left.selector, uri.scheme, uri.path.toString(), languageId, true))[0];
+    protected score(service: CallHierarchyService, languageId: string, uri: URI): number {
+        return score(service.selector, uri.scheme, uri.path.toString(), languageId, true);
     }
 
     add(service: CallHierarchyService): Disposable {
         this.services.push(service);
         const that = this;
+        this.onDidChangeEmitter.fire();
         return {
             dispose: () => {
                 that.remove(service);
@@ -67,6 +75,10 @@ export class CallHierarchyServiceProvider {
     private remove(service: CallHierarchyService): boolean {
         const length = this.services.length;
         this.services = this.services.filter(value => value !== service);
-        return length !== this.services.length;
+        const serviceWasRemoved = length !== this.services.length;
+        if (serviceWasRemoved) {
+            this.onDidChangeEmitter.fire();
+        }
+        return serviceWasRemoved;
     }
 }

package/src/browser/callhierarchy-tree/callhierarchy-tree-model.ts

@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { injectable, inject } from '@theia/core/shared/inversify';
-import { TreeModelImpl, TreeNode } from '@theia/core/lib/browser';
+import { CompositeTreeNode, TreeModelImpl, TreeNode } from '@theia/core/lib/browser';
 import { CallHierarchyTree, DefinitionNode } from './callhierarchy-tree';
 import { CallHierarchyServiceProvider } from '../callhierarchy-service';
 import { Position } from '@theia/core/shared/vscode-languageserver-types';
@@ -48,9 +48,16 @@ export class CallHierarchyTreeModel extends TreeModelImpl {
                 this.tree.callHierarchyService = callHierarchyService;
                 const cancellationSource = new CancellationTokenSource();
                 const rootDefinition = await callHierarchyService.getRootDefinition(uri, position, cancellationSource.token);
-                if (rootDefinition) {
-                    const rootNode = DefinitionNode.create(rootDefinition, undefined);
-                    this.tree.root = rootNode;
+                const definitions = rootDefinition && (Array.isArray(rootDefinition) ? rootDefinition : [rootDefinition]);
+                if (definitions) {
+                    const root: CompositeTreeNode = {
+                        id: 'call-hierarchy-tree-root',
+                        parent: undefined,
+                        children: [],
+                        visible: false,
+                    };
+                    definitions.forEach(definition => CompositeTreeNode.addChild(root, DefinitionNode.create(definition, root)));
+                    this.tree.root = root;
                 }
             }
         }

package/src/browser/callhierarchy.ts

@@ -25,6 +25,7 @@ export interface Definition {
     symbolKind: SymbolKind,
     containerName: string | undefined,
     tags?: readonly SymbolTag[];
+    data?: unknown,
 }
 
 export interface Caller {

package/src/browser/style/index.css

@@ -45,6 +45,7 @@
 
 .theia-CallHierarchyTree .definitionNode .referenceCount {
     color: var(--theia-badge-background);
+    padding-right: 4px;
 }
 
 .theia-CallHierarchyTree .definitionNode .container {