@theia/task 1.34.2 → 1.34.3

package/src/node/task-backend-application-contribution.ts

@@ -1,36 +1,36 @@
-// *****************************************************************************
-// Copyright (C) 2018 Red Hat, Inc. and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject, named } from '@theia/core/shared/inversify';
-import { ContributionProvider } from '@theia/core';
-import { BackendApplicationContribution } from '@theia/core/lib/node';
-import { TaskRunnerContribution, TaskRunnerRegistry } from './task-runner';
-
-@injectable()
-export class TaskBackendApplicationContribution implements BackendApplicationContribution {
-
-    @inject(ContributionProvider) @named(TaskRunnerContribution)
-    protected readonly contributionProvider: ContributionProvider<TaskRunnerContribution>;
-
-    @inject(TaskRunnerRegistry)
-    protected readonly taskRunnerRegistry: TaskRunnerRegistry;
-
-    onStart(): void {
-        this.contributionProvider.getContributions().forEach(contrib =>
-            contrib.registerRunner(this.taskRunnerRegistry)
-        );
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018 Red Hat, Inc. and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject, named } from '@theia/core/shared/inversify';
+import { ContributionProvider } from '@theia/core';
+import { BackendApplicationContribution } from '@theia/core/lib/node';
+import { TaskRunnerContribution, TaskRunnerRegistry } from './task-runner';
+
+@injectable()
+export class TaskBackendApplicationContribution implements BackendApplicationContribution {
+
+    @inject(ContributionProvider) @named(TaskRunnerContribution)
+    protected readonly contributionProvider: ContributionProvider<TaskRunnerContribution>;
+
+    @inject(TaskRunnerRegistry)
+    protected readonly taskRunnerRegistry: TaskRunnerRegistry;
+
+    onStart(): void {
+        this.contributionProvider.getContributions().forEach(contrib =>
+            contrib.registerRunner(this.taskRunnerRegistry)
+        );
+    }
+}

package/src/node/task-backend-module.ts

@@ -1,57 +1,57 @@
-// *****************************************************************************
-// Copyright (C) 2017 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { ContainerModule } from '@theia/core/shared/inversify';
-import { bindContributionProvider } from '@theia/core';
-import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core/lib/common/messaging';
-import { BackendApplicationContribution } from '@theia/core/lib/node';
-import { bindProcessTaskRunnerModule } from './process/process-task-runner-backend-module';
-import { bindCustomTaskRunnerModule } from './custom/custom-task-runner-backend-module';
-import { TaskBackendApplicationContribution } from './task-backend-application-contribution';
-import { TaskManager } from './task-manager';
-import { TaskRunnerContribution, TaskRunnerRegistry } from './task-runner';
-import { TaskServerImpl } from './task-server';
-import { createCommonBindings } from '../common/task-common-module';
-import { TaskClient, TaskServer, taskPath } from '../common';
-
-export default new ContainerModule(bind => {
-
-    bind(TaskManager).toSelf().inSingletonScope();
-    bind(BackendApplicationContribution).toService(TaskManager);
-
-    bind(TaskServer).to(TaskServerImpl).inSingletonScope();
-    bind(ConnectionHandler).toDynamicValue(ctx =>
-        new JsonRpcConnectionHandler<TaskClient>(taskPath, client => {
-            const taskServer = ctx.container.get<TaskServer>(TaskServer);
-            taskServer.setClient(client);
-            // when connection closes, cleanup that client of task-server
-            client.onDidCloseConnection(() => {
-                taskServer.disconnectClient(client);
-            });
-            return taskServer;
-        })
-    ).inSingletonScope();
-
-    createCommonBindings(bind);
-
-    bind(TaskRunnerRegistry).toSelf().inSingletonScope();
-    bindContributionProvider(bind, TaskRunnerContribution);
-    bind(TaskBackendApplicationContribution).toSelf().inSingletonScope();
-    bind(BackendApplicationContribution).toService(TaskBackendApplicationContribution);
-
-    bindProcessTaskRunnerModule(bind);
-    bindCustomTaskRunnerModule(bind);
-});
+// *****************************************************************************
+// Copyright (C) 2017 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { ContainerModule } from '@theia/core/shared/inversify';
+import { bindContributionProvider } from '@theia/core';
+import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core/lib/common/messaging';
+import { BackendApplicationContribution } from '@theia/core/lib/node';
+import { bindProcessTaskRunnerModule } from './process/process-task-runner-backend-module';
+import { bindCustomTaskRunnerModule } from './custom/custom-task-runner-backend-module';
+import { TaskBackendApplicationContribution } from './task-backend-application-contribution';
+import { TaskManager } from './task-manager';
+import { TaskRunnerContribution, TaskRunnerRegistry } from './task-runner';
+import { TaskServerImpl } from './task-server';
+import { createCommonBindings } from '../common/task-common-module';
+import { TaskClient, TaskServer, taskPath } from '../common';
+
+export default new ContainerModule(bind => {
+
+    bind(TaskManager).toSelf().inSingletonScope();
+    bind(BackendApplicationContribution).toService(TaskManager);
+
+    bind(TaskServer).to(TaskServerImpl).inSingletonScope();
+    bind(ConnectionHandler).toDynamicValue(ctx =>
+        new JsonRpcConnectionHandler<TaskClient>(taskPath, client => {
+            const taskServer = ctx.container.get<TaskServer>(TaskServer);
+            taskServer.setClient(client);
+            // when connection closes, cleanup that client of task-server
+            client.onDidCloseConnection(() => {
+                taskServer.disconnectClient(client);
+            });
+            return taskServer;
+        })
+    ).inSingletonScope();
+
+    createCommonBindings(bind);
+
+    bind(TaskRunnerRegistry).toSelf().inSingletonScope();
+    bindContributionProvider(bind, TaskRunnerContribution);
+    bind(TaskBackendApplicationContribution).toSelf().inSingletonScope();
+    bind(BackendApplicationContribution).toService(TaskBackendApplicationContribution);
+
+    bindProcessTaskRunnerModule(bind);
+    bindCustomTaskRunnerModule(bind);
+});

package/src/node/task-line-matchers.ts

@@ -1,127 +1,127 @@
-// *****************************************************************************
-// Copyright (C) 2019 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { AbstractLineMatcher } from './task-abstract-line-matcher';
-import { ProblemMatcher, ProblemMatch, WatchingPattern } from '../common/problem-matcher-protocol';
-
-export class StartStopLineMatcher extends AbstractLineMatcher {
-
-    constructor(matcher: ProblemMatcher) {
-        super(matcher);
-    }
-
-    /**
-     * Finds the problem identified by this line matcher.
-     *
-     * @param line the line of text to find the problem from
-     * @return the identified problem. If the problem is not found, `undefined` is returned.
-     */
-    match(line: string): ProblemMatch | undefined {
-        if (!this.activePattern) {
-            this.resetActivePatternIndex();
-        }
-        if (this.activePattern) {
-            const originalProblemData = Object.assign(this.getEmptyProblemData(), this.cachedProblemData);
-            const foundMatch = this.doOneLineMatch(line);
-            if (foundMatch) {
-                if (this.isUsingTheLastPattern()) {
-                    const matchResult = this.getMarkerMatch(this.cachedProblemData);
-                    if (this.isLastPatternLoop()) {
-                        this.cachedProblemData = originalProblemData;
-                    } else {
-                        this.resetCachedProblemData();
-                        this.resetActivePatternIndex();
-                    }
-                    return matchResult;
-                } else {
-                    this.nextProblemPattern();
-                }
-            } else {
-                this.resetCachedProblemData();
-                if (this.activePatternIndex !== 0) { // if no match, use the first pattern to parse the same line
-                    this.resetActivePatternIndex();
-                    return this.match(line);
-                }
-            }
-        }
-        return undefined;
-    }
-}
-
-export class WatchModeLineMatcher extends StartStopLineMatcher {
-
-    private beginsPattern: WatchingPattern;
-    private endsPattern: WatchingPattern;
-    activeOnStart: boolean = false;
-
-    constructor(matcher: ProblemMatcher) {
-        super(matcher);
-        this.beginsPattern = matcher.watching!.beginsPattern;
-        this.endsPattern = matcher.watching!.endsPattern;
-        this.activeOnStart = matcher.watching!.activeOnStart === true;
-        this.resetActivePatternIndex(this.activeOnStart ? 0 : -1);
-    }
-
-    /**
-     * Finds the problem identified by this line matcher.
-     *
-     * @param line the line of text to find the problem from
-     * @return the identified problem. If the problem is not found, `undefined` is returned.
-     */
-    override match(line: string): ProblemMatch | undefined {
-        if (this.activeOnStart) {
-            this.activeOnStart = false;
-            this.resetActivePatternIndex(0);
-            this.resetCachedProblemData();
-            return super.match(line);
-        }
-
-        if (this.matchBegin(line)) {
-            const beginsPatternMatch = this.getMarkerMatch(this.cachedProblemData);
-            this.resetCachedProblemData();
-            return beginsPatternMatch;
-        }
-        if (this.matchEnd(line)) {
-            this.resetCachedProblemData();
-            return undefined;
-        }
-        if (this.activePattern) {
-            return super.match(line);
-        }
-        return undefined;
-    }
-
-    matchBegin(line: string): boolean {
-        const beginRegexp = new RegExp(this.beginsPattern.regexp);
-        const regexMatches = beginRegexp.exec(line);
-        if (regexMatches) {
-            this.fillProblemData(this.cachedProblemData, this.beginsPattern, regexMatches);
-            this.resetActivePatternIndex(0);
-            return true;
-        }
-        return false;
-    }
-
-    matchEnd(line: string): boolean {
-        const endRegexp = new RegExp(this.endsPattern.regexp);
-        const match = endRegexp.exec(line);
-        if (match) {
-            this.resetActivePatternIndex(-1);
-            return true;
-        }
-        return false;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2019 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { AbstractLineMatcher } from './task-abstract-line-matcher';
+import { ProblemMatcher, ProblemMatch, WatchingPattern } from '../common/problem-matcher-protocol';
+
+export class StartStopLineMatcher extends AbstractLineMatcher {
+
+    constructor(matcher: ProblemMatcher) {
+        super(matcher);
+    }
+
+    /**
+     * Finds the problem identified by this line matcher.
+     *
+     * @param line the line of text to find the problem from
+     * @return the identified problem. If the problem is not found, `undefined` is returned.
+     */
+    match(line: string): ProblemMatch | undefined {
+        if (!this.activePattern) {
+            this.resetActivePatternIndex();
+        }
+        if (this.activePattern) {
+            const originalProblemData = Object.assign(this.getEmptyProblemData(), this.cachedProblemData);
+            const foundMatch = this.doOneLineMatch(line);
+            if (foundMatch) {
+                if (this.isUsingTheLastPattern()) {
+                    const matchResult = this.getMarkerMatch(this.cachedProblemData);
+                    if (this.isLastPatternLoop()) {
+                        this.cachedProblemData = originalProblemData;
+                    } else {
+                        this.resetCachedProblemData();
+                        this.resetActivePatternIndex();
+                    }
+                    return matchResult;
+                } else {
+                    this.nextProblemPattern();
+                }
+            } else {
+                this.resetCachedProblemData();
+                if (this.activePatternIndex !== 0) { // if no match, use the first pattern to parse the same line
+                    this.resetActivePatternIndex();
+                    return this.match(line);
+                }
+            }
+        }
+        return undefined;
+    }
+}
+
+export class WatchModeLineMatcher extends StartStopLineMatcher {
+
+    private beginsPattern: WatchingPattern;
+    private endsPattern: WatchingPattern;
+    activeOnStart: boolean = false;
+
+    constructor(matcher: ProblemMatcher) {
+        super(matcher);
+        this.beginsPattern = matcher.watching!.beginsPattern;
+        this.endsPattern = matcher.watching!.endsPattern;
+        this.activeOnStart = matcher.watching!.activeOnStart === true;
+        this.resetActivePatternIndex(this.activeOnStart ? 0 : -1);
+    }
+
+    /**
+     * Finds the problem identified by this line matcher.
+     *
+     * @param line the line of text to find the problem from
+     * @return the identified problem. If the problem is not found, `undefined` is returned.
+     */
+    override match(line: string): ProblemMatch | undefined {
+        if (this.activeOnStart) {
+            this.activeOnStart = false;
+            this.resetActivePatternIndex(0);
+            this.resetCachedProblemData();
+            return super.match(line);
+        }
+
+        if (this.matchBegin(line)) {
+            const beginsPatternMatch = this.getMarkerMatch(this.cachedProblemData);
+            this.resetCachedProblemData();
+            return beginsPatternMatch;
+        }
+        if (this.matchEnd(line)) {
+            this.resetCachedProblemData();
+            return undefined;
+        }
+        if (this.activePattern) {
+            return super.match(line);
+        }
+        return undefined;
+    }
+
+    matchBegin(line: string): boolean {
+        const beginRegexp = new RegExp(this.beginsPattern.regexp);
+        const regexMatches = beginRegexp.exec(line);
+        if (regexMatches) {
+            this.fillProblemData(this.cachedProblemData, this.beginsPattern, regexMatches);
+            this.resetActivePatternIndex(0);
+            return true;
+        }
+        return false;
+    }
+
+    matchEnd(line: string): boolean {
+        const endRegexp = new RegExp(this.endsPattern.regexp);
+        const match = endRegexp.exec(line);
+        if (match) {
+            this.resetActivePatternIndex(-1);
+            return true;
+        }
+        return false;
+    }
+}