@theia/plugin-ext 1.18.0-next.121 → 1.18.0-next.122

package/package.json

@@ -1,31 +1,31 @@
 {
   "name": "@theia/plugin-ext",
-  "version": "1.18.0-next.121+2c63c96d522",
+  "version": "1.18.0-next.122+49055bf84e9",
   "description": "Theia - Plugin Extension",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@theia/bulk-edit": "1.18.0-next.121+2c63c96d522",
-    "@theia/callhierarchy": "1.18.0-next.121+2c63c96d522",
-    "@theia/console": "1.18.0-next.121+2c63c96d522",
-    "@theia/core": "1.18.0-next.121+2c63c96d522",
-    "@theia/debug": "1.18.0-next.121+2c63c96d522",
-    "@theia/editor": "1.18.0-next.121+2c63c96d522",
-    "@theia/file-search": "1.18.0-next.121+2c63c96d522",
-    "@theia/filesystem": "1.18.0-next.121+2c63c96d522",
-    "@theia/markers": "1.18.0-next.121+2c63c96d522",
-    "@theia/messages": "1.18.0-next.121+2c63c96d522",
-    "@theia/monaco": "1.18.0-next.121+2c63c96d522",
-    "@theia/navigator": "1.18.0-next.121+2c63c96d522",
-    "@theia/output": "1.18.0-next.121+2c63c96d522",
-    "@theia/plugin": "1.18.0-next.121+2c63c96d522",
-    "@theia/preferences": "1.18.0-next.121+2c63c96d522",
-    "@theia/scm": "1.18.0-next.121+2c63c96d522",
-    "@theia/search-in-workspace": "1.18.0-next.121+2c63c96d522",
-    "@theia/task": "1.18.0-next.121+2c63c96d522",
-    "@theia/terminal": "1.18.0-next.121+2c63c96d522",
-    "@theia/timeline": "1.18.0-next.121+2c63c96d522",
-    "@theia/workspace": "1.18.0-next.121+2c63c96d522",
+    "@theia/bulk-edit": "1.18.0-next.122+49055bf84e9",
+    "@theia/callhierarchy": "1.18.0-next.122+49055bf84e9",
+    "@theia/console": "1.18.0-next.122+49055bf84e9",
+    "@theia/core": "1.18.0-next.122+49055bf84e9",
+    "@theia/debug": "1.18.0-next.122+49055bf84e9",
+    "@theia/editor": "1.18.0-next.122+49055bf84e9",
+    "@theia/file-search": "1.18.0-next.122+49055bf84e9",
+    "@theia/filesystem": "1.18.0-next.122+49055bf84e9",
+    "@theia/markers": "1.18.0-next.122+49055bf84e9",
+    "@theia/messages": "1.18.0-next.122+49055bf84e9",
+    "@theia/monaco": "1.18.0-next.122+49055bf84e9",
+    "@theia/navigator": "1.18.0-next.122+49055bf84e9",
+    "@theia/output": "1.18.0-next.122+49055bf84e9",
+    "@theia/plugin": "1.18.0-next.122+49055bf84e9",
+    "@theia/preferences": "1.18.0-next.122+49055bf84e9",
+    "@theia/scm": "1.18.0-next.122+49055bf84e9",
+    "@theia/search-in-workspace": "1.18.0-next.122+49055bf84e9",
+    "@theia/task": "1.18.0-next.122+49055bf84e9",
+    "@theia/terminal": "1.18.0-next.122+49055bf84e9",
+    "@theia/timeline": "1.18.0-next.122+49055bf84e9",
+    "@theia/workspace": "1.18.0-next.122+49055bf84e9",
     "@types/markdown-it": "*",
     "@types/mime": "^2.0.1",
     "decompress": "^4.2.1",
@@ -92,5 +92,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "2c63c96d52288d0fe02268a50a192d8b2f065ecb"
+  "gitHead": "49055bf84e9f707422090815f162dc2879c50090"
 }

package/src/common/plugin-api-rpc-model.ts

@@ -524,6 +524,7 @@ export interface CallHierarchyDefinition {
     range: Range;
     selectionRange: Range;
     tags?: readonly SymbolTag[];
+    data: unknown;
 }
 
 export interface CallHierarchyReference {
@@ -542,6 +543,7 @@ export interface CallHierarchyItem {
     range: Range;
     selectionRange: Range;
     tags?: readonly SymbolTag[];
+    data: unknown;
 }
 
 export interface CallHierarchyIncomingCall {

package/src/common/plugin-api-rpc.ts

@@ -1459,7 +1459,7 @@ export interface LanguagesExt {
     $provideDocumentSemanticTokens(handle: number, resource: UriComponents, previousResultId: number, token: CancellationToken): Promise<BinaryBuffer | null>;
     $releaseDocumentSemanticTokens(handle: number, semanticColoringResultId: number): void;
     $provideDocumentRangeSemanticTokens(handle: number, resource: UriComponents, range: Range, token: CancellationToken): Promise<BinaryBuffer | null>;
-    $provideRootDefinition(handle: number, resource: UriComponents, location: Position, token: CancellationToken): Promise<CallHierarchyDefinition | undefined>;
+    $provideRootDefinition(handle: number, resource: UriComponents, location: Position, token: CancellationToken): Promise<CallHierarchyDefinition | CallHierarchyDefinition[] | undefined>;
     $provideCallers(handle: number, definition: CallHierarchyDefinition, token: CancellationToken): Promise<CallHierarchyReference[] | undefined>;
     $provideCallees(handle: number, definition: CallHierarchyDefinition, token: CancellationToken): Promise<CallHierarchyReference[] | undefined>;
 }

package/src/main/browser/callhierarchy/callhierarchy-type-converters.ts

@@ -152,7 +152,8 @@ export function toDefinition(definition: model.CallHierarchyDefinition | undefin
         symbolName: definition.name,
         symbolKind: SymbolKindConverter.toSymbolKind(definition.kind),
         containerName: undefined,
-        tags: definition.tags
+        tags: definition.tags,
+        data: definition.data,
     };
 }
 
@@ -162,7 +163,9 @@ export function fromDefinition(definition: CallHierarchyDefinition): model.CallH
         range: fromRange(definition.location.range),
         selectionRange: fromRange(definition.selectionRange),
         name: definition.symbolName,
-        kind: SymbolKindConverter.fromSymbolKind(definition.symbolKind)
+        kind: SymbolKindConverter.fromSymbolKind(definition.symbolKind),
+        tags: definition.tags,
+        data: definition.data,
     };
 }
 

package/src/main/browser/languages-main.ts

@@ -774,7 +774,7 @@ export class LanguagesMainImpl implements LanguagesMain, Disposable {
             selector: language,
             getRootDefinition: (uri: DocumentUri, position: Position, cancellationToken: CancellationToken) =>
                 this.proxy.$provideRootDefinition(handle, toUriComponents(uri), fromPosition(position), cancellationToken)
-                    .then(def => toDefinition(def)),
+                    .then(def => Array.isArray(def) ? def.map(item => toDefinition(item)) : toDefinition(def)),
             getCallers: (definition: Definition, cancellationToken: CancellationToken) => this.proxy.$provideCallers(handle, fromDefinition(definition), cancellationToken)
                 .then(result => {
                     if (!result) {

package/src/plugin/languages/call-hierarchy.ts

@@ -29,7 +29,9 @@ export class CallHierarchyAdapter {
         private readonly documents: DocumentsExtImpl
     ) { }
 
-    async provideRootDefinition(resource: URI, position: rpc.Position, token: theia.CancellationToken): Promise<model.CallHierarchyDefinition | undefined> {
+    async provideRootDefinition(
+        resource: URI, position: rpc.Position, token: theia.CancellationToken
+    ): Promise<model.CallHierarchyDefinition | model.CallHierarchyDefinition[] | undefined> {
         const documentData = this.documents.getDocumentData(resource);
         if (!documentData) {
             return Promise.reject(new Error(`There is no document for ${resource}`));
@@ -40,12 +42,14 @@ export class CallHierarchyAdapter {
                 position.lineNumber,
                 position.column
             ),
-            token);
+            token
+        );
+
         if (!definition) {
             return undefined;
         }
 
-        return this.fromCallHierarchyItem(definition);
+        return Array.isArray(definition) ? definition.map(item => this.fromCallHierarchyItem(item)) : this.fromCallHierarchyItem(definition);
     }
 
     async provideCallers(definition: model.CallHierarchyDefinition, token: theia.CancellationToken): Promise<model.CallHierarchyReference[] | undefined> {
@@ -73,7 +77,8 @@ export class CallHierarchyAdapter {
             selectionRange: this.fromRange(item.selectionRange),
             name: item.name,
             kind: item.kind,
-            tags: item.tags
+            tags: item.tags,
+            data: item.data,
         };
     }
 
@@ -96,7 +101,7 @@ export class CallHierarchyAdapter {
     }
 
     private toCallHierarchyItem(definition: model.CallHierarchyDefinition): theia.CallHierarchyItem {
-        return new types.CallHierarchyItem(
+        const item = new types.CallHierarchyItem(
             Converter.SymbolKind.toSymbolKind(definition.kind),
             definition.name,
             definition.detail ? definition.detail : '',
@@ -104,6 +109,9 @@ export class CallHierarchyAdapter {
             this.toRange(definition.range),
             this.toRange(definition.selectionRange),
         );
+        item.tags = definition.tags;
+        item.data = definition.data;
+        return item;
     }
 
     private fromCallHierarchyIncomingCall(caller: theia.CallHierarchyIncomingCall): model.CallHierarchyReference {

package/src/plugin/languages.ts

@@ -583,7 +583,9 @@ export class LanguagesExtImpl implements LanguagesExt {
         return this.createDisposable(callId);
     }
 
-    $provideRootDefinition(handle: number, resource: UriComponents, location: Position, token: theia.CancellationToken): Promise<CallHierarchyDefinition | undefined> {
+    $provideRootDefinition(
+        handle: number, resource: UriComponents, location: Position, token: theia.CancellationToken
+    ): Promise<CallHierarchyDefinition | CallHierarchyDefinition[] | undefined> {
         return this.withAdapter(handle, CallHierarchyAdapter, adapter => adapter.provideRootDefinition(URI.revive(resource), location, token), undefined);
     }
 

package/src/plugin/type-converters.ts

@@ -683,18 +683,23 @@ export function fromCallHierarchyItem(item: theia.CallHierarchyItem): model.Call
         uri: item.uri,
         range: fromRange(item.range),
         selectionRange: fromRange(item.selectionRange),
-        tags: item.tags
+        tags: item.tags,
+        data: item.data,
     };
 }
 
 export function toCallHierarchyItem(value: model.CallHierarchyItem): types.CallHierarchyItem {
-    return new types.CallHierarchyItem(
+    const item = new types.CallHierarchyItem(
         SymbolKind.toSymbolKind(value.kind),
         value.name,
         value.detail ? value.detail : '',
         URI.revive(value.uri),
         toRange(value.range),
-        toRange(value.selectionRange));
+        toRange(value.selectionRange),
+    );
+    item.tags = value.tags;
+    item.data = value.data;
+    return item;
 }
 
 export function toCallHierarchyIncomingCall(value: model.CallHierarchyIncomingCall): types.CallHierarchyIncomingCall {

package/src/plugin/types-impl.ts

@@ -2419,6 +2419,7 @@ export class CallHierarchyItem {
     range: Range;
     selectionRange: Range;
     tags?: readonly SymbolTag[];
+    data?: unknown;
 
     constructor(kind: SymbolKind, name: string, detail: string, uri: URI, range: Range, selectionRange: Range) {
         this.kind = kind;