@theia/plugin-ext 1.32.0-next.5 → 1.32.0

package/src/plugin/type-converters.ts

@@ -565,10 +565,22 @@ export function fromWorkspaceEdit(value: theia.WorkspaceEdit, documents?: any):
         if (Array.isArray(uriOrEdits)) {
             // text edits
             const doc = documents ? documents.getDocument(uri.toString()) : undefined;
-            result.edits.push(<WorkspaceTextEditDto>{ resource: uri, modelVersionId: doc && doc.version, edit: uriOrEdits.map(fromTextEdit)[0], metadata: entry[2] });
+            const workspaceTextEditDto: WorkspaceTextEditDto = {
+                resource: uri,
+                modelVersionId: doc?.version,
+                textEdit: uriOrEdits.map(fromTextEdit)[0],
+                metadata: entry[2] as types.WorkspaceEditMetadata
+            };
+            result.edits.push(workspaceTextEditDto);
         } else {
             // resource edits
-            result.edits.push(<WorkspaceFileEditDto>{ oldUri: uri, newUri: uriOrEdits, options: entry[2], metadata: entry[3] });
+            const workspaceFileEditDto: WorkspaceFileEditDto = {
+                oldResource: uri,
+                newResource: uriOrEdits,
+                options: entry[2] as types.FileOperationOptions,
+                metadata: entry[3]
+            };
+            result.edits.push(workspaceFileEditDto);
         }
     }
     return result;
@@ -816,6 +828,8 @@ export function fromTask(task: theia.Task): TaskDto | undefined {
     taskDto.label = task.name;
     taskDto.source = task.source;
 
+    taskDto.runOptions = { reevaluateOnRerun: task.runOptions.reevaluateOnRerun };
+
     if ((task as types.Task).hasProblemMatchers) {
         taskDto.problemMatcher = task.problemMatchers;
     }
@@ -877,10 +891,11 @@ export function toTask(taskDto: TaskDto): theia.Task {
         throw new Error('Task should be provided for converting');
     }
 
-    const { type, taskType, label, source, scope, problemMatcher, detail, command, args, options, group, presentation, ...properties } = taskDto;
+    const { type, taskType, label, source, scope, problemMatcher, detail, command, args, options, group, presentation, runOptions, ...properties } = taskDto;
     const result = {} as theia.Task;
     result.name = label;
     result.source = source;
+    result.runOptions = runOptions ?? {};
     if (detail) {
         result.detail = detail;
     }

package/src/plugin/types-impl.ts

@@ -213,6 +213,11 @@ export enum ExtensionMode {
     Test = 3,
 }
 
+export enum ExtensionKind {
+    UI = 1,
+    Workspace = 2
+}
+
 /**
  * Represents the validation type of the Source Control input.
  */
@@ -2057,6 +2062,7 @@ export class Task {
     private taskSource: string;
     private taskGroup: TaskGroup | undefined;
     private taskPresentationOptions: theia.TaskPresentationOptions;
+    private taskRunOptions: theia.RunOptions;
     constructor(
         taskDefinition: theia.TaskDefinition,
         scope: theia.WorkspaceFolder | theia.TaskScope.Global | theia.TaskScope.Workspace,
@@ -2229,6 +2235,17 @@ export class Task {
         }
         this.taskPresentationOptions = value;
     }
+
+    get runOptions(): theia.RunOptions {
+        return this.taskRunOptions;
+    }
+
+    set runOptions(value: theia.RunOptions) {
+        if (value === null || value === undefined) {
+            value = Object.create(null);
+        }
+        this.taskRunOptions = value;
+    }
 }
 
 @es5ClassCompat