@theia/callhierarchy 1.18.0 → 1.19.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/callhierarchy-contribution.d.ts.map +1 -1
- package/lib/browser/callhierarchy-contribution.js +3 -2
- package/lib/browser/callhierarchy-contribution.js.map +1 -1
- package/lib/browser/callhierarchy-service.d.ts +2 -3
- package/lib/browser/callhierarchy-service.d.ts.map +1 -1
- package/lib/browser/callhierarchy-service.js.map +1 -1
- package/lib/browser/callhierarchy-tree/callhierarchy-tree-model.d.ts.map +1 -1
- package/lib/browser/callhierarchy-tree/callhierarchy-tree-model.js +10 -3
- package/lib/browser/callhierarchy-tree/callhierarchy-tree-model.js.map +1 -1
- package/lib/browser/callhierarchy.d.ts +1 -0
- package/lib/browser/callhierarchy.d.ts.map +1 -1
- package/package.json +6 -6
- package/src/browser/callhierarchy-contribution.ts +2 -2
- package/src/browser/callhierarchy-service.ts +2 -3
- package/src/browser/callhierarchy-tree/callhierarchy-tree-model.ts +11 -4
- package/src/browser/callhierarchy.ts +1 -0
- package/src/browser/style/index.css +1 -0
|
@@ -1 +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,
|
|
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,SAGa,CAAC;CAClC;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"}
|
|
@@ -26,6 +26,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
26
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
27
|
exports.CallHierarchyContribution = exports.CallHierarchyCommands = exports.CALL_HIERARCHY_LABEL = exports.CALL_HIERARCHY_TOGGLE_COMMAND_ID = void 0;
|
|
28
28
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
29
|
+
const common_1 = require("@theia/core/lib/common");
|
|
29
30
|
const browser_1 = require("@theia/core/lib/browser");
|
|
30
31
|
const browser_2 = require("@theia/editor/lib/browser");
|
|
31
32
|
const callhierarchy_1 = require("./callhierarchy");
|
|
@@ -35,10 +36,10 @@ exports.CALL_HIERARCHY_TOGGLE_COMMAND_ID = 'callhierarchy:toggle';
|
|
|
35
36
|
exports.CALL_HIERARCHY_LABEL = 'Call Hierarchy';
|
|
36
37
|
var CallHierarchyCommands;
|
|
37
38
|
(function (CallHierarchyCommands) {
|
|
38
|
-
CallHierarchyCommands.OPEN = {
|
|
39
|
+
CallHierarchyCommands.OPEN = common_1.Command.toLocalizedCommand({
|
|
39
40
|
id: 'callhierarchy:open',
|
|
40
41
|
label: 'Open Call Hierarchy'
|
|
41
|
-
};
|
|
42
|
+
}, 'theia/callhierarchy/open');
|
|
42
43
|
})(CallHierarchyCommands = exports.CallHierarchyCommands || (exports.CallHierarchyCommands = {}));
|
|
43
44
|
let CallHierarchyContribution = class CallHierarchyContribution extends browser_1.AbstractViewContribution {
|
|
44
45
|
constructor() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callhierarchy-contribution.js","sourceRoot":"","sources":["../../src/browser/callhierarchy-contribution.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAkE;
|
|
1
|
+
{"version":3,"file":"callhierarchy-contribution.js","sourceRoot":"","sources":["../../src/browser/callhierarchy-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,15 +15,14 @@
|
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { Position, DocumentUri } from '@theia/core/shared/vscode-languageserver-types';
|
|
17
17
|
import { Definition, Caller, Callee } from './callhierarchy';
|
|
18
|
-
import { ContributionProvider } from '@theia/core/lib/common';
|
|
18
|
+
import { ContributionProvider, Disposable } from '@theia/core/lib/common';
|
|
19
19
|
import { LanguageSelector } from '../common/language-selector';
|
|
20
20
|
import URI from '@theia/core/lib/common/uri';
|
|
21
|
-
import { Disposable } from '@theia/core/lib/common';
|
|
22
21
|
import { CancellationToken } from '@theia/core';
|
|
23
22
|
export declare const CallHierarchyService: unique symbol;
|
|
24
23
|
export interface CallHierarchyService {
|
|
25
24
|
readonly selector: LanguageSelector;
|
|
26
|
-
getRootDefinition(uri: DocumentUri, position: Position, cancellationToken: CancellationToken): Promise<Definition | undefined>;
|
|
25
|
+
getRootDefinition(uri: DocumentUri, position: Position, cancellationToken: CancellationToken): Promise<Definition | Definition[] | undefined>;
|
|
27
26
|
getCallers(definition: Definition, cancellationToken: CancellationToken): Promise<Caller[] | undefined>;
|
|
28
27
|
getCallees?(definition: Definition, cancellationToken: CancellationToken): Promise<Callee[] | undefined>;
|
|
29
28
|
}
|
|
@@ -1 +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;
|
|
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,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAS,MAAM,6BAA6B,CAAC;AACtE,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,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,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,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callhierarchy-service.js","sourceRoot":"","sources":["../../src/browser/callhierarchy-service.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAwF;AAGxF,
|
|
1
|
+
{"version":3,"file":"callhierarchy-service.js","sourceRoot":"","sources":["../../src/browser/callhierarchy-service.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAAwF;AAGxF,mDAA0E;AAC1E,mEAAsE;AAIzD,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"}
|
|
@@ -1 +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,
|
|
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,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"}
|
|
@@ -48,9 +48,16 @@ let CallHierarchyTreeModel = class CallHierarchyTreeModel extends browser_1.Tree
|
|
|
48
48
|
this.tree.callHierarchyService = callHierarchyService;
|
|
49
49
|
const cancellationSource = new cancellation_1.CancellationTokenSource();
|
|
50
50
|
const rootDefinition = await callHierarchyService.getRootDefinition(uri, position, cancellationSource.token);
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
51
|
+
const definitions = rootDefinition && (Array.isArray(rootDefinition) ? rootDefinition : [rootDefinition]);
|
|
52
|
+
if (definitions) {
|
|
53
|
+
const root = {
|
|
54
|
+
id: 'call-hierarchy-tree-root',
|
|
55
|
+
parent: undefined,
|
|
56
|
+
children: [],
|
|
57
|
+
visible: false,
|
|
58
|
+
};
|
|
59
|
+
definitions.forEach(definition => browser_1.CompositeTreeNode.addChild(root, callhierarchy_tree_1.DefinitionNode.create(definition, root)));
|
|
60
|
+
this.tree.root = root;
|
|
54
61
|
}
|
|
55
62
|
}
|
|
56
63
|
}
|
|
@@ -1 +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,
|
|
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,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"}
|
|
@@ -1 +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;
|
|
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;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
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/callhierarchy",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.19.0",
|
|
4
4
|
"description": "Theia - Call Hierarchy Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.
|
|
7
|
-
"@theia/editor": "1.
|
|
8
|
-
"@theia/monaco": "1.
|
|
6
|
+
"@theia/core": "1.19.0",
|
|
7
|
+
"@theia/editor": "1.19.0",
|
|
8
|
+
"@theia/monaco": "1.19.0",
|
|
9
9
|
"ts-md5": "^1.2.2"
|
|
10
10
|
},
|
|
11
11
|
"publishConfig": {
|
|
@@ -41,10 +41,10 @@
|
|
|
41
41
|
"watch": "theiaext watch"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
|
-
"@theia/ext-scripts": "1.
|
|
44
|
+
"@theia/ext-scripts": "1.19.0"
|
|
45
45
|
},
|
|
46
46
|
"nyc": {
|
|
47
47
|
"extends": "../../configs/nyc.json"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "cebb5417bb40e320178e3a4e66070af514f0525f"
|
|
50
50
|
}
|
|
@@ -27,10 +27,10 @@ export const CALL_HIERARCHY_TOGGLE_COMMAND_ID = 'callhierarchy:toggle';
|
|
|
27
27
|
export const CALL_HIERARCHY_LABEL = 'Call Hierarchy';
|
|
28
28
|
|
|
29
29
|
export namespace CallHierarchyCommands {
|
|
30
|
-
export const OPEN
|
|
30
|
+
export const OPEN = Command.toLocalizedCommand({
|
|
31
31
|
id: 'callhierarchy:open',
|
|
32
32
|
label: 'Open Call Hierarchy'
|
|
33
|
-
};
|
|
33
|
+
}, 'theia/callhierarchy/open');
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
@injectable()
|
|
@@ -17,10 +17,9 @@
|
|
|
17
17
|
import { injectable, inject, named, postConstruct } from '@theia/core/shared/inversify';
|
|
18
18
|
import { Position, DocumentUri } from '@theia/core/shared/vscode-languageserver-types';
|
|
19
19
|
import { Definition, Caller, Callee } from './callhierarchy';
|
|
20
|
-
import { ContributionProvider } from '@theia/core/lib/common';
|
|
20
|
+
import { ContributionProvider, Disposable } from '@theia/core/lib/common';
|
|
21
21
|
import { LanguageSelector, score } from '../common/language-selector';
|
|
22
22
|
import URI from '@theia/core/lib/common/uri';
|
|
23
|
-
import { Disposable } from '@theia/core/lib/common';
|
|
24
23
|
import { CancellationToken } from '@theia/core';
|
|
25
24
|
|
|
26
25
|
export const CallHierarchyService = Symbol('CallHierarchyService');
|
|
@@ -29,7 +28,7 @@ export interface CallHierarchyService {
|
|
|
29
28
|
|
|
30
29
|
readonly selector: LanguageSelector;
|
|
31
30
|
|
|
32
|
-
getRootDefinition(uri: DocumentUri, position: Position, cancellationToken: CancellationToken): Promise<Definition | undefined>
|
|
31
|
+
getRootDefinition(uri: DocumentUri, position: Position, cancellationToken: CancellationToken): Promise<Definition | Definition[] | undefined>
|
|
33
32
|
getCallers(definition: Definition, cancellationToken: CancellationToken): Promise<Caller[] | undefined>
|
|
34
33
|
getCallees?(definition: Definition, cancellationToken: CancellationToken): Promise<Callee[] | undefined>
|
|
35
34
|
}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
|
|
17
17
|
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
18
|
-
import { TreeModelImpl, TreeNode } from '@theia/core/lib/browser';
|
|
18
|
+
import { CompositeTreeNode, TreeModelImpl, TreeNode } from '@theia/core/lib/browser';
|
|
19
19
|
import { CallHierarchyTree, DefinitionNode } from './callhierarchy-tree';
|
|
20
20
|
import { CallHierarchyServiceProvider } from '../callhierarchy-service';
|
|
21
21
|
import { Position } from '@theia/core/shared/vscode-languageserver-types';
|
|
@@ -48,9 +48,16 @@ export class CallHierarchyTreeModel extends TreeModelImpl {
|
|
|
48
48
|
this.tree.callHierarchyService = callHierarchyService;
|
|
49
49
|
const cancellationSource = new CancellationTokenSource();
|
|
50
50
|
const rootDefinition = await callHierarchyService.getRootDefinition(uri, position, cancellationSource.token);
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
51
|
+
const definitions = rootDefinition && (Array.isArray(rootDefinition) ? rootDefinition : [rootDefinition]);
|
|
52
|
+
if (definitions) {
|
|
53
|
+
const root: CompositeTreeNode = {
|
|
54
|
+
id: 'call-hierarchy-tree-root',
|
|
55
|
+
parent: undefined,
|
|
56
|
+
children: [],
|
|
57
|
+
visible: false,
|
|
58
|
+
};
|
|
59
|
+
definitions.forEach(definition => CompositeTreeNode.addChild(root, DefinitionNode.create(definition, root)));
|
|
60
|
+
this.tree.root = root;
|
|
54
61
|
}
|
|
55
62
|
}
|
|
56
63
|
}
|