@theia/task 1.32.0-next.8 → 1.32.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.
@@ -1,7 +1,6 @@
1
1
  import { Severity } from '@theia/core/lib/common/severity';
2
2
  import { Diagnostic } from '@theia/core/shared/vscode-languageserver-protocol';
3
3
  import { URI } from '@theia/core/shared/vscode-uri';
4
- import { ProblemPatternContribution, WatchingMatcherContribution } from './task-protocol';
5
4
  export declare enum ApplyToKind {
6
5
  allDocuments = 0,
7
6
  openDocuments = 1,
@@ -87,4 +86,40 @@ export interface ProblemMatchData extends ProblemMatch {
87
86
  export declare namespace ProblemMatchData {
88
87
  function is(data: ProblemMatch): data is ProblemMatchData;
89
88
  }
89
+ export interface WatchingMatcherContribution {
90
+ activeOnStart?: boolean;
91
+ beginsPattern: string | WatchingPattern;
92
+ endsPattern: string | WatchingPattern;
93
+ }
94
+ export interface ProblemMatcherContribution {
95
+ base?: string;
96
+ name?: string;
97
+ label: string;
98
+ deprecated?: boolean;
99
+ owner: string;
100
+ source?: string;
101
+ applyTo?: string;
102
+ fileLocation?: 'absolute' | 'relative' | string[];
103
+ pattern: string | ProblemPatternContribution | ProblemPatternContribution[];
104
+ severity?: string;
105
+ watching?: WatchingMatcherContribution;
106
+ background?: WatchingMatcherContribution;
107
+ }
108
+ export interface ProblemPatternContribution {
109
+ name?: string;
110
+ regexp: string;
111
+ kind?: string;
112
+ file?: number;
113
+ message?: number;
114
+ location?: number;
115
+ line?: number;
116
+ character?: number;
117
+ column?: number;
118
+ endLine?: number;
119
+ endCharacter?: number;
120
+ endColumn?: number;
121
+ code?: number;
122
+ severity?: number;
123
+ loop?: boolean;
124
+ }
90
125
  //# sourceMappingURL=problem-matcher-protocol.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"problem-matcher-protocol.d.ts","sourceRoot":"","sources":["../../src/common/problem-matcher-protocol.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"problem-matcher-protocol.d.ts","sourceRoot":"","sources":["../../src/common/problem-matcher-protocol.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"problem-matcher-protocol.js","sourceRoot":"","sources":["../../src/common/problem-matcher-protocol.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"problem-matcher-protocol.js","sourceRoot":"","sources":["../../src/common/problem-matcher-protocol.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,8 @@
1
+ import { Event } from '@theia/core';
1
2
  import { JsonRpcServer } from '@theia/core/lib/common/messaging/proxy-factory';
2
3
  import { IJSONSchema } from '@theia/core/lib/common/json-schema';
3
- import { ProblemMatcher, ProblemMatch, WatchingPattern } from './problem-matcher-protocol';
4
+ import { ProblemMatcher, ProblemMatch, WatchingMatcherContribution, ProblemMatcherContribution, ProblemPatternContribution } from './problem-matcher-protocol';
5
+ export { WatchingMatcherContribution, ProblemMatcherContribution, ProblemPatternContribution };
4
6
  export declare const taskPath = "/services/task";
5
7
  export declare const TaskServer: unique symbol;
6
8
  export declare const TaskClient: unique symbol;
@@ -174,40 +176,15 @@ export interface TaskDefinition {
174
176
  schema: IJSONSchema;
175
177
  };
176
178
  }
177
- export interface WatchingMatcherContribution {
178
- activeOnStart?: boolean;
179
- beginsPattern: string | WatchingPattern;
180
- endsPattern: string | WatchingPattern;
181
- }
182
- export interface ProblemMatcherContribution {
183
- base?: string;
184
- name?: string;
185
- label: string;
186
- deprecated?: boolean;
187
- owner: string;
188
- source?: string;
189
- applyTo?: string;
190
- fileLocation?: 'absolute' | 'relative' | string[];
191
- pattern: string | ProblemPatternContribution | ProblemPatternContribution[];
192
- severity?: string;
193
- watching?: WatchingMatcherContribution;
194
- background?: WatchingMatcherContribution;
195
- }
196
- export interface ProblemPatternContribution {
197
- name?: string;
198
- regexp: string;
199
- kind?: string;
200
- file?: number;
201
- message?: number;
202
- location?: number;
203
- line?: number;
204
- character?: number;
205
- column?: number;
206
- endLine?: number;
207
- endCharacter?: number;
208
- endColumn?: number;
209
- code?: number;
210
- severity?: number;
211
- loop?: boolean;
179
+ export interface ManagedTask {
180
+ id: number;
181
+ context?: string;
182
+ }
183
+ export interface ManagedTaskManager<T extends ManagedTask> {
184
+ onDelete: Event<number>;
185
+ register(task: T, context?: string): number;
186
+ get(id: number): T | undefined;
187
+ getTasks(context?: string): T[] | undefined;
188
+ delete(task: T): void;
212
189
  }
213
190
  //# sourceMappingURL=task-protocol.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"task-protocol.d.ts","sourceRoot":"","sources":["../../src/common/task-protocol.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"task-protocol.d.ts","sourceRoot":"","sources":["../../src/common/task-protocol.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"task-protocol.js","sourceRoot":"","sources":["../../src/common/task-protocol.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"task-protocol.js","sourceRoot":"","sources":["../../src/common/task-protocol.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@ import { ILogger } from '@theia/core';
2
2
  import { RawProcessFactory, TerminalProcessOptions, TaskTerminalProcessFactory } from '@theia/process/lib/node';
3
3
  import { ShellQuotedString, ShellQuotingFunctions } from '@theia/process/lib/common/shell-quoting';
4
4
  import { TaskFactory } from './process-task';
5
- import { TaskRunner } from '../task-runner';
5
+ import { TaskRunner } from '../task-runner-protocol';
6
6
  import { Task } from '../task';
7
7
  import { TaskConfiguration } from '../../common/task-protocol';
8
8
  import { CommandOptions } from '../../common/process/task-protocol';
@@ -1 +1 @@
1
- {"version":3,"file":"process-task-runner.d.ts","sourceRoot":"","sources":["../../../src/node/process/process-task-runner.ts"],"names":[],"mappings":"AAsBA,OAAO,EAA+B,OAAO,EAAE,MAAM,aAAa,CAAC;AAEnE,OAAO,EACH,iBAAiB,EAGjB,sBAAsB,EACtB,0BAA0B,EAC7B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACH,iBAAiB,EAAE,qBAAqB,EAC3C,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAoB,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAItF,MAAM,WAAW,iBAAiB;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,KAAK,CAAC,MAAM,GAAG,iBAAiB,CAAC,GAAG,SAAS,CAAC;IACpD,OAAO,EAAE,cAAc,CAAA;CAC1B;AAED,MAAM,WAAW,oBAAoB;IACjC,yDAAyD;IACzD,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,2FAA2F;IAC3F,gBAAgB,CAAC,EAAE,qBAAqB,CAAC;CAC5C;AAED;;GAEG;AACH,qBACa,iBAAkB,YAAW,UAAU;IAGhD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,0BAA0B,CAAC;IAG1E,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAE5C;;;OAGG;IACG,GAAG,CAAC,UAAU,EAAE,iBAAiB,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmCrE,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,iBAAiB,GAAG,sBAAsB;IA6FnF,SAAS,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,iBAAiB,EAAE,gBAAgB,CAAC,EAAE,qBAAqB,GAAG,MAAM;IAoBvH,SAAS,CAAC,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,oBAAoB;IA6BxE,SAAS,CAAC,oBAAoB,CAAC,UAAU,EAAE,iBAAiB,GAAG,iBAAiB;IAahF,SAAS,CAAC,UAAU,CAAC,WAAW,EAAE,SAAS,GAAG,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,GAAG,MAAM,GAAG,SAAS;IAU1H;;;;;;;;;;OAUG;IACH,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,qBAAqB,GAAG,OAAO;IAiCjG,SAAS,CAAC,wBAAwB,CAAC,UAAU,EAAE,iBAAiB,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,GAAG,KAAK,GAAG,SAAS,GAAG,iBAAiB;IA6BrI,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAM7C;;;;;;OAMG;cACa,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAO3E"}
1
+ {"version":3,"file":"process-task-runner.d.ts","sourceRoot":"","sources":["../../../src/node/process/process-task-runner.ts"],"names":[],"mappings":"AAsBA,OAAO,EAA+B,OAAO,EAAE,MAAM,aAAa,CAAC;AAEnE,OAAO,EACH,iBAAiB,EAGjB,sBAAsB,EACtB,0BAA0B,EAC7B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACH,iBAAiB,EAAE,qBAAqB,EAC3C,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAoB,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAItF,MAAM,WAAW,iBAAiB;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,KAAK,CAAC,MAAM,GAAG,iBAAiB,CAAC,GAAG,SAAS,CAAC;IACpD,OAAO,EAAE,cAAc,CAAA;CAC1B;AAED,MAAM,WAAW,oBAAoB;IACjC,yDAAyD;IACzD,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,2FAA2F;IAC3F,gBAAgB,CAAC,EAAE,qBAAqB,CAAC;CAC5C;AAED;;GAEG;AACH,qBACa,iBAAkB,YAAW,UAAU;IAGhD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,0BAA0B,CAAC;IAG1E,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAE5C;;;OAGG;IACG,GAAG,CAAC,UAAU,EAAE,iBAAiB,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmCrE,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,iBAAiB,GAAG,sBAAsB;IA6FnF,SAAS,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,iBAAiB,EAAE,gBAAgB,CAAC,EAAE,qBAAqB,GAAG,MAAM;IAoBvH,SAAS,CAAC,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,oBAAoB;IA6BxE,SAAS,CAAC,oBAAoB,CAAC,UAAU,EAAE,iBAAiB,GAAG,iBAAiB;IAahF,SAAS,CAAC,UAAU,CAAC,WAAW,EAAE,SAAS,GAAG,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,GAAG,MAAM,GAAG,SAAS;IAU1H;;;;;;;;;;OAUG;IACH,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,qBAAqB,GAAG,OAAO;IAiCjG,SAAS,CAAC,wBAAwB,CAAC,UAAU,EAAE,iBAAiB,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,GAAG,KAAK,GAAG,SAAS,GAAG,iBAAiB;IA6BrI,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAM7C;;;;;;OAMG;cACa,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAO3E"}
@@ -1,10 +1,11 @@
1
1
  import { Emitter, Event, ILogger } from '@theia/core/lib/common';
2
2
  import { BackendApplicationContribution } from '@theia/core/lib/node';
3
3
  import { Task } from './task';
4
+ import { ManagedTaskManager } from '../common';
4
5
  /**
5
6
  * The {@link TaskManager} is the common component responsible for managing running tasks.
6
7
  */
7
- export declare class TaskManager implements BackendApplicationContribution {
8
+ export declare class TaskManager implements BackendApplicationContribution, ManagedTaskManager<Task> {
8
9
  protected readonly logger: ILogger;
9
10
  /** contains all running tasks */
10
11
  protected readonly tasks: Map<number, Task>;
@@ -1 +1 @@
1
- {"version":3,"file":"task-manager.d.ts","sourceRoot":"","sources":["../../src/node/task-manager.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAI9B;;GAEG;AACH,qBACa,WAAY,YAAW,8BAA8B;IAc1B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO;IAZtE,iCAAiC;IACjC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAa;IACxD,yCAAyC;IACzC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAa;IAChE,2DAA2D;IAC3D,SAAS,CAAC,EAAE,EAAE,MAAM,CAAM;IAC1B;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,kBAAyB;gBAGF,MAAM,EAAE,OAAO;IAGtE;;;;;;;OAOG;IACH,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM;IAgB1C;;;;;OAKG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAIjC;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,SAAS;IAU1C;;;OAGG;IACH,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAcxB,IAAI,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,CAE5B;IAED;;OAEG;IACH,MAAM,IAAI,IAAI;CAMjB"}
1
+ {"version":3,"file":"task-manager.d.ts","sourceRoot":"","sources":["../../src/node/task-manager.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAI/C;;GAEG;AACH,qBACa,WAAY,YAAW,8BAA8B,EAAE,kBAAkB,CAAC,IAAI,CAAC;IAcpD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO;IAZtE,iCAAiC;IACjC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAa;IACxD,yCAAyC;IACzC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAa;IAChE,2DAA2D;IAC3D,SAAS,CAAC,EAAE,EAAE,MAAM,CAAM;IAC1B;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,kBAAyB;gBAGF,MAAM,EAAE,OAAO;IAGtE;;;;;;;OAOG;IACH,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM;IAgB1C;;;;;OAKG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAIjC;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,SAAS;IAU1C;;;OAGG;IACH,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAgBxB,IAAI,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,CAE5B;IAED;;OAEG;IACH,MAAM,IAAI,IAAI;CAMjB"}
@@ -106,7 +106,9 @@ let TaskManager = class TaskManager {
106
106
  const tasksForWS = this.tasksPerCtx.get(ctx);
107
107
  if (tasksForWS !== undefined) {
108
108
  const idx = tasksForWS.indexOf(task);
109
- tasksForWS.splice(idx, 1);
109
+ if (idx !== -1) {
110
+ tasksForWS.splice(idx, 1);
111
+ }
110
112
  }
111
113
  }
112
114
  this.deleteEmitter.fire(task.id);
@@ -1 +1 @@
1
- {"version":3,"file":"task-manager.js","sourceRoot":"","sources":["../../src/node/task-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"task-manager.js","sourceRoot":"","sources":["../../src/node/task-manager.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,17 @@
1
+ import { TaskConfiguration } from '../common';
2
+ import { Task } from './task';
3
+ export declare const TaskRunner: unique symbol;
4
+ /**
5
+ * A {@link TaskRunner} knows how to run a task configuration of a particular type.
6
+ */
7
+ export interface TaskRunner {
8
+ /**
9
+ * Runs a task based on the given `TaskConfiguration`.
10
+ * @param taskConfig the task configuration that should be executed.
11
+ * @param ctx the execution context.
12
+ *
13
+ * @returns a promise of the (currently running) {@link Task}.
14
+ */
15
+ run(tskConfig: TaskConfiguration, ctx?: string): Promise<Task>;
16
+ }
17
+ //# sourceMappingURL=task-runner-protocol.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"task-runner-protocol.d.ts","sourceRoot":"","sources":["../../src/node/task-runner-protocol.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,eAAO,MAAM,UAAU,eAAuB,CAAC;AAC/C;;GAEG;AACH,MAAM,WAAW,UAAU;IACvB;;;;;;OAMG;IACH,GAAG,CAAC,SAAS,EAAE,iBAAiB,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE"}
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ // *****************************************************************************
3
+ // Copyright (C) 2022 Ericsson and others.
4
+ //
5
+ // This program and the accompanying materials are made available under the
6
+ // terms of the Eclipse Public License v. 2.0 which is available at
7
+ // http://www.eclipse.org/legal/epl-2.0.
8
+ //
9
+ // This Source Code may also be made available under the following Secondary
10
+ // Licenses when the conditions for such availability set forth in the Eclipse
11
+ // Public License v. 2.0 are satisfied: GNU General Public License, version 2
12
+ // with the GNU Classpath Exception which is available at
13
+ // https://www.gnu.org/software/classpath/license.html.
14
+ //
15
+ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
16
+ // *****************************************************************************
17
+ Object.defineProperty(exports, "__esModule", { value: true });
18
+ exports.TaskRunner = void 0;
19
+ exports.TaskRunner = Symbol('TaskRunner');
20
+ //# sourceMappingURL=task-runner-protocol.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"task-runner-protocol.js","sourceRoot":"","sources":["../../src/node/task-runner-protocol.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAKnE,QAAA,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC"}
@@ -1,7 +1,7 @@
1
1
  import { Disposable } from '@theia/core/lib/common/disposable';
2
2
  import { ProcessTaskRunner } from './process/process-task-runner';
3
- import { Task } from './task';
4
- import { TaskConfiguration } from '../common/task-protocol';
3
+ import { TaskRunner } from './task-runner-protocol';
4
+ export { TaskRunner };
5
5
  export declare const TaskRunnerContribution: unique symbol;
6
6
  /** The {@link TaskRunnerContribution} can be used to contribute custom {@link TaskRunner}s. */
7
7
  export interface TaskRunnerContribution {
@@ -11,20 +11,6 @@ export interface TaskRunnerContribution {
11
11
  */
12
12
  registerRunner(runners: TaskRunnerRegistry): void;
13
13
  }
14
- export declare const TaskRunner: unique symbol;
15
- /**
16
- * A {@link TaskRunner} knows how to run a task configuration of a particular type.
17
- */
18
- export interface TaskRunner {
19
- /**
20
- * Runs a task based on the given `TaskConfiguration`.
21
- * @param taskConfig the task configuration that should be executed.
22
- * @param ctx the execution context.
23
- *
24
- * @returns a promise of the (currently running) {@link Task}.
25
- */
26
- run(tskConfig: TaskConfiguration, ctx?: string): Promise<Task>;
27
- }
28
14
  /**
29
15
  * The {@link TaskRunnerRegistry} is the common component for the registration and provisioning of
30
16
  * {@link TaskRunner}s. Theia will collect all {@link TaskRunner}s and invoke {@link TaskRunnerContribution#registerRunner}
@@ -1 +1 @@
1
- {"version":3,"file":"task-runner.d.ts","sourceRoot":"","sources":["../../src/node/task-runner.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AAEvE,+FAA+F;AAC/F,MAAM,WAAW,sBAAsB;IACnC;;;OAGG;IACH,cAAc,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACrD;AAED,eAAO,MAAM,UAAU,eAAuB,CAAC;AAC/C;;GAEG;AACH,MAAM,WAAW,UAAU;IACvB;;;;;;OAMG;IACH,GAAG,CAAC,SAAS,EAAE,iBAAiB,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AAED;;;;;GAKG;AACH,qBACa,kBAAkB;IAE3B,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC3C,yFAAyF;IACzF,SAAS,CAAC,aAAa,EAAE,UAAU,CAAC;IAGpC,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB;;;;;;;;OAQG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,UAAU;IAO5D;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU;IAUzC;;;;OAIG;IACH,cAAc,IAAI,MAAM,EAAE;CAG7B"}
1
+ {"version":3,"file":"task-runner.d.ts","sourceRoot":"","sources":["../../src/node/task-runner.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,CAAC;AAEtB,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AAEvE,+FAA+F;AAC/F,MAAM,WAAW,sBAAsB;IACnC;;;OAGG;IACH,cAAc,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAAC;CACrD;AAED;;;;;GAKG;AACH,qBACa,kBAAkB;IAE3B,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC3C,yFAAyF;IACzF,SAAS,CAAC,aAAa,EAAE,UAAU,CAAC;IAGpC,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB;;;;;;;;OAQG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,UAAU;IAO5D;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU;IAUzC;;;;OAIG;IACH,cAAc,IAAI,MAAM,EAAE;CAG7B"}
@@ -24,11 +24,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
24
24
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
25
25
  };
26
26
  Object.defineProperty(exports, "__esModule", { value: true });
27
- exports.TaskRunnerRegistry = exports.TaskRunner = exports.TaskRunnerContribution = void 0;
27
+ exports.TaskRunnerRegistry = exports.TaskRunnerContribution = exports.TaskRunner = void 0;
28
28
  const inversify_1 = require("@theia/core/shared/inversify");
29
29
  const process_task_runner_1 = require("./process/process-task-runner");
30
+ const task_runner_protocol_1 = require("./task-runner-protocol");
31
+ Object.defineProperty(exports, "TaskRunner", { enumerable: true, get: function () { return task_runner_protocol_1.TaskRunner; } });
30
32
  exports.TaskRunnerContribution = Symbol('TaskRunnerContribution');
31
- exports.TaskRunner = Symbol('TaskRunner');
32
33
  /**
33
34
  * The {@link TaskRunnerRegistry} is the common component for the registration and provisioning of
34
35
  * {@link TaskRunner}s. Theia will collect all {@link TaskRunner}s and invoke {@link TaskRunnerContribution#registerRunner}
@@ -1 +1 @@
1
- {"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../../src/node/task-runner.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAAiF;AAEjF,uEAAkE;AAIrD,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAW1D,QAAA,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAe/C;;;;;GAKG;AAEH,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAUjB,IAAI;QACV,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC;IAChD,CAAC;IACD;;;;;;;;OAQG;IACH,cAAc,CAAC,IAAY,EAAE,MAAkB;QAC3C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/B,OAAO;YACH,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;SAC3C,CAAC;IACN,CAAC;IAED;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,KAAe;QACxB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,MAAM,EAAE;gBACR,OAAO,MAAM,CAAC;aACjB;SACJ;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACH,cAAc;QACV,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACpC,CAAC;CACJ,CAAA;AAhDG;IADC,IAAA,kBAAM,EAAC,uCAAiB,CAAC;8BACY,uCAAiB;6DAAC;AAGxD;IADC,IAAA,yBAAa,GAAE;;;;8CAIf;AAbQ,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CAuD9B;AAvDY,gDAAkB"}
1
+ {"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../../src/node/task-runner.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAAiF;AAEjF,uEAAkE;AAClE,iEAAoD;AAC3C,2FADA,iCAAU,OACA;AAEN,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAWvE;;;;;GAKG;AAEH,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAUjB,IAAI;QACV,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC;IAChD,CAAC;IACD;;;;;;;;OAQG;IACH,cAAc,CAAC,IAAY,EAAE,MAAkB;QAC3C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/B,OAAO;YACH,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;SAC3C,CAAC;IACN,CAAC;IAED;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,KAAe;QACxB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,MAAM,EAAE;gBACR,OAAO,MAAM,CAAC;aACjB;SACJ;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACH,cAAc;QACV,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACpC,CAAC;CACJ,CAAA;AAhDG;IADC,IAAA,kBAAM,EAAC,uCAAiB,CAAC;8BACY,uCAAiB;6DAAC;AAGxD;IADC,IAAA,yBAAa,GAAE;;;;8CAIf;AAbQ,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CAuD9B;AAvDY,gDAAkB"}
@@ -1,6 +1,5 @@
1
1
  import { ILogger, Disposable, DisposableCollection, Emitter, Event, MaybePromise } from '@theia/core/lib/common/';
2
- import { TaskManager } from './task-manager';
3
- import { TaskInfo, TaskExitedEvent, TaskConfiguration, TaskOutputEvent } from '../common/task-protocol';
2
+ import { TaskInfo, TaskExitedEvent, TaskConfiguration, TaskOutputEvent, ManagedTask, ManagedTaskManager } from '../common/task-protocol';
4
3
  /**
5
4
  * Represents the options used for running a task.
6
5
  */
@@ -17,15 +16,15 @@ export interface TaskOptions {
17
16
  * Implementing classes have to call the {@link Task#fireOutputLine} function
18
17
  * whenever a new output occurs during the execution.
19
18
  */
20
- export declare abstract class Task implements Disposable {
21
- protected readonly taskManager: TaskManager;
19
+ export declare abstract class Task implements Disposable, ManagedTask {
20
+ protected readonly taskManager: ManagedTaskManager<Task>;
22
21
  protected readonly logger: ILogger;
23
22
  protected readonly options: TaskOptions;
24
23
  protected taskId: number;
25
24
  protected readonly toDispose: DisposableCollection;
26
25
  readonly exitEmitter: Emitter<TaskExitedEvent>;
27
26
  readonly outputEmitter: Emitter<TaskOutputEvent>;
28
- constructor(taskManager: TaskManager, logger: ILogger, options: TaskOptions);
27
+ constructor(taskManager: ManagedTaskManager<Task>, logger: ILogger, options: TaskOptions);
29
28
  /**
30
29
  * Terminate this task.
31
30
  *
@@ -1 +1 @@
1
- {"version":3,"file":"task.d.ts","sourceRoot":"","sources":["../../src/node/task.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAClH,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACxG;;GAEG;AACH,MAAM,WAAW,WAAW;IACxB,qBAAqB;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,MAAM,EAAE,iBAAiB,CAAC;IAC1B,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,8BACsB,IAAK,YAAW,UAAU;IAQxC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;IAC3C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO;IAClC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW;IAR3C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAA8B;IAChF,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAC/C,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;gBAG1B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,WAAW;IAS3C;;;;OAIG;IACH,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAE9B,IAAI,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAEnC;IAED,IAAI,QAAQ,IAAI,KAAK,CAAC,eAAe,CAAC,CAErC;IAED,gEAAgE;IAChE,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAItD,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAGtD;;;;;OAKG;IACH,QAAQ,CAAC,cAAc,IAAI,YAAY,CAAC,QAAQ,CAAC;IAEjD,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAEhC;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,OAAO,IAAI,IAAI;CAGlB"}
1
+ {"version":3,"file":"task.d.ts","sourceRoot":"","sources":["../../src/node/task.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAClH,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,iBAAiB,EAAE,eAAe,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AACzI;;GAEG;AACH,MAAM,WAAW,WAAW;IACxB,qBAAqB;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,MAAM,EAAE,iBAAiB,CAAC;IAC1B,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,8BACsB,IAAK,YAAW,UAAU,EAAE,WAAW;IAQrD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC,IAAI,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO;IAClC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW;IAR3C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAA8B;IAChF,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAC/C,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;gBAG1B,WAAW,EAAE,kBAAkB,CAAC,IAAI,CAAC,EACrC,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,WAAW;IAS3C;;;;OAIG;IACH,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAE9B,IAAI,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAEnC;IAED,IAAI,QAAQ,IAAI,KAAK,CAAC,eAAe,CAAC,CAErC;IAED,gEAAgE;IAChE,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAItD,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAGtD;;;;;OAKG;IACH,QAAQ,CAAC,cAAc,IAAI,YAAY,CAAC,QAAQ,CAAC;IAEjD,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAEhC;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,OAAO,IAAI,IAAI;CAGlB"}
package/lib/node/task.js CHANGED
@@ -27,7 +27,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
27
27
  exports.Task = void 0;
28
28
  const inversify_1 = require("@theia/core/shared/inversify");
29
29
  const common_1 = require("@theia/core/lib/common/");
30
- const task_manager_1 = require("./task-manager");
31
30
  /**
32
31
  * A {@link Task} represents the execution state of a `TaskConfiguration`.
33
32
  * Implementing classes have to call the {@link Task#fireOutputLine} function
@@ -73,7 +72,7 @@ let Task = class Task {
73
72
  };
74
73
  Task = __decorate([
75
74
  (0, inversify_1.injectable)(),
76
- __metadata("design:paramtypes", [task_manager_1.TaskManager, Object, Object])
75
+ __metadata("design:paramtypes", [Object, Object, Object])
77
76
  ], Task);
78
77
  exports.Task = Task;
79
78
  //# sourceMappingURL=task.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"task.js","sourceRoot":"","sources":["../../src/node/task.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAA0D;AAC1D,oDAAkH;AAClH,iDAA6C;AAc7C;;;;GAIG;AAEH,IAAsB,IAAI,GAA1B,MAAsB,IAAI;IAOtB,YACuB,WAAwB,EACxB,MAAe,EACf,OAAoB;QAFpB,gBAAW,GAAX,WAAW,CAAa;QACxB,WAAM,GAAN,MAAM,CAAS;QACf,YAAO,GAAP,OAAO,CAAa;QAPxB,cAAS,GAAyB,IAAI,6BAAoB,EAAE,CAAC;QAS5E,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpE,IAAI,CAAC,WAAW,GAAG,IAAI,gBAAO,EAAmB,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,IAAI,gBAAO,EAAmB,CAAC;QACpD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC5C,CAAC;IASD,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;IAClC,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;IACpC,CAAC;IAED,gEAAgE;IACtD,cAAc,CAAC,KAAsB;QAC3C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAES,cAAc,CAAC,KAAsB;QAC3C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IASD,IAAI,EAAE;QACF,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IAC9B,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;CACJ,CAAA;AAjEqB,IAAI;IADzB,IAAA,sBAAU,GAAE;qCAS2B,0BAAW;GAR7B,IAAI,CAiEzB;AAjEqB,oBAAI"}
1
+ {"version":3,"file":"task.js","sourceRoot":"","sources":["../../src/node/task.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAA0D;AAC1D,oDAAkH;AAclH;;;;GAIG;AAEH,IAAsB,IAAI,GAA1B,MAAsB,IAAI;IAOtB,YACuB,WAAqC,EACrC,MAAe,EACf,OAAoB;QAFpB,gBAAW,GAAX,WAAW,CAA0B;QACrC,WAAM,GAAN,MAAM,CAAS;QACf,YAAO,GAAP,OAAO,CAAa;QAPxB,cAAS,GAAyB,IAAI,6BAAoB,EAAE,CAAC;QAS5E,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpE,IAAI,CAAC,WAAW,GAAG,IAAI,gBAAO,EAAmB,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,IAAI,gBAAO,EAAmB,CAAC;QACpD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC5C,CAAC;IASD,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;IAClC,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;IACpC,CAAC;IAED,gEAAgE;IACtD,cAAc,CAAC,KAAsB;QAC3C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAES,cAAc,CAAC,KAAsB;QAC3C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IASD,IAAI,EAAE;QACF,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IAC9B,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;CACJ,CAAA;AAjEqB,IAAI;IADzB,IAAA,sBAAU,GAAE;;GACS,IAAI,CAiEzB;AAjEqB,oBAAI"}
package/package.json CHANGED
@@ -1,19 +1,19 @@
1
1
  {
2
2
  "name": "@theia/task",
3
- "version": "1.32.0-next.8+d109bc9ae",
3
+ "version": "1.32.0",
4
4
  "description": "Theia - Task extension. This extension adds support for executing raw or terminal processes in the backend.",
5
5
  "dependencies": {
6
- "@theia/core": "1.32.0-next.8+d109bc9ae",
7
- "@theia/editor": "1.32.0-next.8+d109bc9ae",
8
- "@theia/filesystem": "1.32.0-next.8+d109bc9ae",
9
- "@theia/markers": "1.32.0-next.8+d109bc9ae",
10
- "@theia/monaco": "1.32.0-next.8+d109bc9ae",
11
- "@theia/monaco-editor-core": "1.67.2",
12
- "@theia/process": "1.32.0-next.8+d109bc9ae",
13
- "@theia/terminal": "1.32.0-next.8+d109bc9ae",
14
- "@theia/userstorage": "1.32.0-next.8+d109bc9ae",
15
- "@theia/variable-resolver": "1.32.0-next.8+d109bc9ae",
16
- "@theia/workspace": "1.32.0-next.8+d109bc9ae",
6
+ "@theia/core": "1.32.0",
7
+ "@theia/editor": "1.32.0",
8
+ "@theia/filesystem": "1.32.0",
9
+ "@theia/markers": "1.32.0",
10
+ "@theia/monaco": "1.32.0",
11
+ "@theia/monaco-editor-core": "1.72.3",
12
+ "@theia/process": "1.32.0",
13
+ "@theia/terminal": "1.32.0",
14
+ "@theia/userstorage": "1.32.0",
15
+ "@theia/variable-resolver": "1.32.0",
16
+ "@theia/workspace": "1.32.0",
17
17
  "async-mutex": "^0.3.1",
18
18
  "jsonc-parser": "^2.2.0",
19
19
  "p-debounce": "^2.1.0"
@@ -52,10 +52,10 @@
52
52
  "watch": "theiaext watch"
53
53
  },
54
54
  "devDependencies": {
55
- "@theia/ext-scripts": "1.31.0"
55
+ "@theia/ext-scripts": "1.32.0"
56
56
  },
57
57
  "nyc": {
58
58
  "extends": "../../configs/nyc.json"
59
59
  },
60
- "gitHead": "d109bc9ae3e00c22902fe1e92d6d2882970e1129"
60
+ "gitHead": "789d0148748b4dc9dea398520b5a3dd2998d71ec"
61
61
  }
@@ -25,7 +25,6 @@ import { Severity } from '@theia/core/lib/common/severity';
25
25
  import { Diagnostic } from '@theia/core/shared/vscode-languageserver-protocol';
26
26
  // TODO use URI from `@theia/core` instead
27
27
  import { URI } from '@theia/core/shared/vscode-uri';
28
- import { ProblemPatternContribution, WatchingMatcherContribution } from './task-protocol';
29
28
 
30
29
  export enum ApplyToKind {
31
30
  allDocuments,
@@ -191,3 +190,46 @@ export namespace ProblemMatchData {
191
190
  return 'marker' in data;
192
191
  }
193
192
  }
193
+
194
+ export interface WatchingMatcherContribution {
195
+ // If set to true the background monitor is in active mode when the task starts.
196
+ // This is equals of issuing a line that matches the beginPattern
197
+ activeOnStart?: boolean;
198
+ beginsPattern: string | WatchingPattern;
199
+ endsPattern: string | WatchingPattern;
200
+ }
201
+
202
+ export interface ProblemMatcherContribution {
203
+ base?: string;
204
+ name?: string;
205
+ label: string;
206
+ deprecated?: boolean;
207
+
208
+ owner: string;
209
+ source?: string;
210
+ applyTo?: string;
211
+ fileLocation?: 'absolute' | 'relative' | string[];
212
+ pattern: string | ProblemPatternContribution | ProblemPatternContribution[];
213
+ severity?: string;
214
+ watching?: WatchingMatcherContribution; // deprecated. Use `background`.
215
+ background?: WatchingMatcherContribution;
216
+ }
217
+
218
+ export interface ProblemPatternContribution {
219
+ name?: string;
220
+ regexp: string;
221
+
222
+ kind?: string;
223
+ file?: number;
224
+ message?: number;
225
+ location?: number;
226
+ line?: number;
227
+ character?: number;
228
+ column?: number;
229
+ endLine?: number;
230
+ endCharacter?: number;
231
+ endColumn?: number;
232
+ code?: number;
233
+ severity?: number;
234
+ loop?: boolean;
235
+ }
@@ -14,9 +14,11 @@
14
14
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  // *****************************************************************************
16
16
 
17
+ import { Event } from '@theia/core';
17
18
  import { JsonRpcServer } from '@theia/core/lib/common/messaging/proxy-factory';
18
19
  import { IJSONSchema } from '@theia/core/lib/common/json-schema';
19
- import { ProblemMatcher, ProblemMatch, WatchingPattern } from './problem-matcher-protocol';
20
+ import { ProblemMatcher, ProblemMatch, WatchingMatcherContribution, ProblemMatcherContribution, ProblemPatternContribution } from './problem-matcher-protocol';
21
+ export { WatchingMatcherContribution, ProblemMatcherContribution, ProblemPatternContribution };
20
22
 
21
23
  export const taskPath = '/services/task';
22
24
 
@@ -290,45 +292,15 @@ export interface TaskDefinition {
290
292
  }
291
293
  }
292
294
 
293
- export interface WatchingMatcherContribution {
294
- // If set to true the background monitor is in active mode when the task starts.
295
- // This is equals of issuing a line that matches the beginPattern
296
- activeOnStart?: boolean;
297
- beginsPattern: string | WatchingPattern;
298
- endsPattern: string | WatchingPattern;
295
+ export interface ManagedTask {
296
+ id: number;
297
+ context?: string;
299
298
  }
300
299
 
301
- export interface ProblemMatcherContribution {
302
- base?: string;
303
- name?: string;
304
- label: string;
305
- deprecated?: boolean;
306
-
307
- owner: string;
308
- source?: string;
309
- applyTo?: string;
310
- fileLocation?: 'absolute' | 'relative' | string[];
311
- pattern: string | ProblemPatternContribution | ProblemPatternContribution[];
312
- severity?: string;
313
- watching?: WatchingMatcherContribution; // deprecated. Use `background`.
314
- background?: WatchingMatcherContribution;
315
- }
316
-
317
- export interface ProblemPatternContribution {
318
- name?: string;
319
- regexp: string;
320
-
321
- kind?: string;
322
- file?: number;
323
- message?: number;
324
- location?: number;
325
- line?: number;
326
- character?: number;
327
- column?: number;
328
- endLine?: number;
329
- endCharacter?: number;
330
- endColumn?: number;
331
- code?: number;
332
- severity?: number;
333
- loop?: boolean;
300
+ export interface ManagedTaskManager<T extends ManagedTask> {
301
+ onDelete: Event<number>;
302
+ register(task: T, context?: string): number;
303
+ get(id: number): T | undefined;
304
+ getTasks(context?: string): T[] | undefined;
305
+ delete(task: T): void;
334
306
  }
@@ -33,7 +33,7 @@ import {
33
33
  ShellQuotedString, ShellQuotingFunctions, BashQuotingFunctions, CmdQuotingFunctions, PowershellQuotingFunctions, createShellCommandLine, ShellQuoting,
34
34
  } from '@theia/process/lib/common/shell-quoting';
35
35
  import { TaskFactory } from './process-task';
36
- import { TaskRunner } from '../task-runner';
36
+ import { TaskRunner } from '../task-runner-protocol';
37
37
  import { Task } from '../task';
38
38
  import { TaskConfiguration } from '../../common/task-protocol';
39
39
  import { ProcessTaskError, CommandOptions } from '../../common/process/task-protocol';
@@ -17,6 +17,7 @@ import { inject, injectable, named } from '@theia/core/shared/inversify';
17
17
  import { Emitter, Event, ILogger } from '@theia/core/lib/common';
18
18
  import { BackendApplicationContribution } from '@theia/core/lib/node';
19
19
  import { Task } from './task';
20
+ import { ManagedTaskManager } from '../common';
20
21
 
21
22
  // inspired by process-manager.ts
22
23
 
@@ -24,7 +25,7 @@ import { Task } from './task';
24
25
  * The {@link TaskManager} is the common component responsible for managing running tasks.
25
26
  */
26
27
  @injectable()
27
- export class TaskManager implements BackendApplicationContribution {
28
+ export class TaskManager implements BackendApplicationContribution, ManagedTaskManager<Task> {
28
29
 
29
30
  /** contains all running tasks */
30
31
  protected readonly tasks: Map<number, Task> = new Map();
@@ -104,7 +105,9 @@ export class TaskManager implements BackendApplicationContribution {
104
105
  const tasksForWS = this.tasksPerCtx.get(ctx);
105
106
  if (tasksForWS !== undefined) {
106
107
  const idx = tasksForWS.indexOf(task);
107
- tasksForWS.splice(idx, 1);
108
+ if (idx !== -1) {
109
+ tasksForWS.splice(idx, 1);
110
+ }
108
111
  }
109
112
  }
110
113
  this.deleteEmitter.fire(task.id);
@@ -0,0 +1,33 @@
1
+ // *****************************************************************************
2
+ // Copyright (C) 2022 Ericsson and others.
3
+ //
4
+ // This program and the accompanying materials are made available under the
5
+ // terms of the Eclipse Public License v. 2.0 which is available at
6
+ // http://www.eclipse.org/legal/epl-2.0.
7
+ //
8
+ // This Source Code may also be made available under the following Secondary
9
+ // Licenses when the conditions for such availability set forth in the Eclipse
10
+ // Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ // with the GNU Classpath Exception which is available at
12
+ // https://www.gnu.org/software/classpath/license.html.
13
+ //
14
+ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
+ // *****************************************************************************
16
+
17
+ import { TaskConfiguration } from '../common';
18
+ import { Task } from './task';
19
+
20
+ export const TaskRunner = Symbol('TaskRunner');
21
+ /**
22
+ * A {@link TaskRunner} knows how to run a task configuration of a particular type.
23
+ */
24
+ export interface TaskRunner {
25
+ /**
26
+ * Runs a task based on the given `TaskConfiguration`.
27
+ * @param taskConfig the task configuration that should be executed.
28
+ * @param ctx the execution context.
29
+ *
30
+ * @returns a promise of the (currently running) {@link Task}.
31
+ */
32
+ run(tskConfig: TaskConfiguration, ctx?: string): Promise<Task>;
33
+ }
@@ -17,8 +17,8 @@
17
17
  import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
18
18
  import { Disposable } from '@theia/core/lib/common/disposable';
19
19
  import { ProcessTaskRunner } from './process/process-task-runner';
20
- import { Task } from './task';
21
- import { TaskConfiguration } from '../common/task-protocol';
20
+ import { TaskRunner } from './task-runner-protocol';
21
+ export { TaskRunner };
22
22
 
23
23
  export const TaskRunnerContribution = Symbol('TaskRunnerContribution');
24
24
 
@@ -31,21 +31,6 @@ export interface TaskRunnerContribution {
31
31
  registerRunner(runners: TaskRunnerRegistry): void;
32
32
  }
33
33
 
34
- export const TaskRunner = Symbol('TaskRunner');
35
- /**
36
- * A {@link TaskRunner} knows how to run a task configuration of a particular type.
37
- */
38
- export interface TaskRunner {
39
- /**
40
- * Runs a task based on the given `TaskConfiguration`.
41
- * @param taskConfig the task configuration that should be executed.
42
- * @param ctx the execution context.
43
- *
44
- * @returns a promise of the (currently running) {@link Task}.
45
- */
46
- run(tskConfig: TaskConfiguration, ctx?: string): Promise<Task>;
47
- }
48
-
49
34
  /**
50
35
  * The {@link TaskRunnerRegistry} is the common component for the registration and provisioning of
51
36
  * {@link TaskRunner}s. Theia will collect all {@link TaskRunner}s and invoke {@link TaskRunnerContribution#registerRunner}
package/src/node/task.ts CHANGED
@@ -16,8 +16,7 @@
16
16
 
17
17
  import { injectable } from '@theia/core/shared/inversify';
18
18
  import { ILogger, Disposable, DisposableCollection, Emitter, Event, MaybePromise } from '@theia/core/lib/common/';
19
- import { TaskManager } from './task-manager';
20
- import { TaskInfo, TaskExitedEvent, TaskConfiguration, TaskOutputEvent } from '../common/task-protocol';
19
+ import { TaskInfo, TaskExitedEvent, TaskConfiguration, TaskOutputEvent, ManagedTask, ManagedTaskManager } from '../common/task-protocol';
21
20
  /**
22
21
  * Represents the options used for running a task.
23
22
  */
@@ -36,7 +35,7 @@ export interface TaskOptions {
36
35
  * whenever a new output occurs during the execution.
37
36
  */
38
37
  @injectable()
39
- export abstract class Task implements Disposable {
38
+ export abstract class Task implements Disposable, ManagedTask {
40
39
 
41
40
  protected taskId: number;
42
41
  protected readonly toDispose: DisposableCollection = new DisposableCollection();
@@ -44,7 +43,7 @@ export abstract class Task implements Disposable {
44
43
  readonly outputEmitter: Emitter<TaskOutputEvent>;
45
44
 
46
45
  constructor(
47
- protected readonly taskManager: TaskManager,
46
+ protected readonly taskManager: ManagedTaskManager<Task>,
48
47
  protected readonly logger: ILogger,
49
48
  protected readonly options: TaskOptions
50
49
  ) {