@theia/plugin-ext 1.25.0-next.7 → 1.25.0

package/src/plugin/type-converters.spec.ts

@@ -235,6 +235,19 @@ describe('Type converters:', () => {
             }
         };
 
+        const shellPluginTaskWithQuotedCommand: theia.Task = {
+            ...shellPluginTask, execution: {
+                command: {
+                    quoting: types.ShellQuoting.Strong,
+                    value: 'yarn'
+                },
+                args,
+                options: {
+                    cwd
+                }
+            }
+        };
+
         const pluginTaskWithCommandLine: theia.Task = {
             name: label,
             source,
@@ -278,7 +291,7 @@ describe('Type converters:', () => {
             }
         };
 
-        it('should convert to task dto', () => {
+        it('should convert to task dto with string command', () => {
             // when
             const result: TaskDto | undefined = Converter.fromTask(shellPluginTask);
 
@@ -287,6 +300,12 @@ describe('Type converters:', () => {
             assert.deepStrictEqual(result, shellTaskDto);
         });
 
+        it('should convert to task dto with ShellStringQuoted', () => {
+            const result: TaskDto | undefined = Converter.fromTask(shellPluginTaskWithQuotedCommand);
+            assert.notStrictEqual(result, undefined);
+            assert.deepStrictEqual(result, shellTaskDto);
+        });
+
         it('should convert from task dto', () => {
             // when
             const result: theia.Task = Converter.toTask(shellTaskDto);

package/src/plugin/type-converters.ts

@@ -675,7 +675,7 @@ export function toLocation(value: model.Location): types.Location {
     return new types.Location(URI.revive(value.uri), toRange(value.range));
 }
 
-export function fromCallHierarchyItem(item: theia.CallHierarchyItem): model.CallHierarchyItem {
+export function fromCallHierarchyItem(item: types.CallHierarchyItem): model.CallHierarchyItem {
     return <model.CallHierarchyItem>{
         kind: SymbolKind.fromSymbolKind(item.kind),
         name: item.name,
@@ -684,7 +684,8 @@ export function fromCallHierarchyItem(item: theia.CallHierarchyItem): model.Call
         range: fromRange(item.range),
         selectionRange: fromRange(item.selectionRange),
         tags: item.tags,
-        data: item.data,
+        _itemId: item._itemId,
+        _sessionId: item._sessionId,
     };
 }
 
@@ -698,7 +699,9 @@ export function toCallHierarchyItem(value: model.CallHierarchyItem): types.CallH
         toRange(value.selectionRange),
     );
     item.tags = value.tags;
-    item.data = value.data;
+    item._itemId = value._itemId;
+    item._sessionId = value._sessionId;
+
     return item;
 }
 
@@ -885,13 +888,12 @@ export function fromShellExecution(execution: theia.ShellExecution, taskDto: Tas
         return taskDto;
     }
 
-    const command = execution.command;
-    if (typeof command === 'string') {
-        taskDto.command = command;
+    if (execution.command) {
+        taskDto.command = getCommand(execution.command);
         taskDto.args = getShellArgs(execution.args);
         return taskDto;
     } else {
-        throw new Error('Converting ShellQuotedString command is not implemented');
+        throw new Error('Command is undefined');
     }
 }
 
@@ -949,6 +951,10 @@ export function getShellArgs(args: undefined | (string | theia.ShellQuotedString
     return result;
 }
 
+function getCommand(command: string | theia.ShellQuotedString): string {
+    return typeof command === 'string' ? command : command.value;
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function getShellExecutionOptions(options: theia.ShellExecutionOptions): { [key: string]: any } {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/plugin/types-impl.ts

@@ -2437,7 +2437,6 @@ 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;
@@ -2448,7 +2447,7 @@ export class CallHierarchyItem {
         this.selectionRange = selectionRange;
     }
 
-    static isCallHierarchyItem(thing: {}): thing is theia.CallHierarchyItem {
+    static isCallHierarchyItem(thing: {}): thing is CallHierarchyItem {
         if (thing instanceof CallHierarchyItem) {
             return true;
         }

package/src/plugin/workspace.ts

@@ -276,7 +276,7 @@ export class WorkspaceExtImpl implements WorkspaceExt {
         };
     }
 
-    async $provideTextDocumentContent(documentURI: string): Promise<string | undefined> {
+    async $provideTextDocumentContent(documentURI: string): Promise<string | undefined | null> {
         const uri = URI.parse(documentURI);
         const provider = this.documentContentProviders.get(uri.scheme);
         if (provider) {