@theia/scm 1.45.1 → 1.46.0-next.72

package/src/browser/decorations/scm-decorations-service.ts

@@ -1,78 +1,78 @@
-// *****************************************************************************
-// Copyright (C) 2019 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { ResourceProvider } from '@theia/core';
-import { DirtyDiffDecorator } from '../dirty-diff/dirty-diff-decorator';
-import { DiffComputer } from '../dirty-diff/diff-computer';
-import { ContentLines } from '../dirty-diff/content-lines';
-import { EditorManager, TextEditor } from '@theia/editor/lib/browser';
-import { ScmService } from '../scm-service';
-
-@injectable()
-export class ScmDecorationsService {
-    private readonly diffComputer: DiffComputer;
-    private dirtyState: boolean = true;
-
-    constructor(@inject(DirtyDiffDecorator) protected readonly decorator: DirtyDiffDecorator,
-        @inject(ScmService) protected readonly scmService: ScmService,
-        @inject(EditorManager) protected readonly editorManager: EditorManager,
-        @inject(ResourceProvider) protected readonly resourceProvider: ResourceProvider) {
-        this.diffComputer = new DiffComputer();
-        this.editorManager.onCreated(async editor => this.applyEditorDecorations(editor.editor));
-        this.scmService.onDidAddRepository(repository => repository.provider.onDidChange(() => {
-            const editor = this.editorManager.currentEditor;
-            if (editor) {
-                if (this.dirtyState) {
-                    this.applyEditorDecorations(editor.editor);
-                    this.dirtyState = false;
-                } else {
-                    /** onDidChange event might be called several times one after another, so need to prevent repeated events. */
-                    setTimeout(() => {
-                        this.dirtyState = true;
-                    }, 500);
-                }
-            }
-        }));
-        this.scmService.onDidChangeSelectedRepository(() => {
-            const editor = this.editorManager.currentEditor;
-            if (editor) {
-                this.applyEditorDecorations(editor.editor);
-            }
-        });
-    }
-
-    async applyEditorDecorations(editor: TextEditor): Promise<void> {
-        const currentRepo = this.scmService.selectedRepository;
-        if (currentRepo) {
-            try {
-                const uri = editor.uri.withScheme(currentRepo.provider.id).withQuery(`{"ref":"", "path":"${editor.uri.path.toString()}"}`);
-                const previousResource = await this.resourceProvider(uri);
-                const previousContent = await previousResource.readContents();
-                const previousLines = ContentLines.fromString(previousContent);
-                const currentResource = await this.resourceProvider(editor.uri);
-                const currentContent = await currentResource.readContents();
-                const currentLines = ContentLines.fromString(currentContent);
-                const { added, removed, modified } = this.diffComputer.computeDirtyDiff(ContentLines.arrayLike(previousLines), ContentLines.arrayLike(currentLines));
-                this.decorator.applyDecorations({ editor: editor, added, removed, modified });
-                currentResource.dispose();
-                previousResource.dispose();
-            } catch (e) {
-                // Scm resource may not be found, do nothing.
-            }
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2019 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { ResourceProvider } from '@theia/core';
+import { DirtyDiffDecorator } from '../dirty-diff/dirty-diff-decorator';
+import { DiffComputer } from '../dirty-diff/diff-computer';
+import { ContentLines } from '../dirty-diff/content-lines';
+import { EditorManager, TextEditor } from '@theia/editor/lib/browser';
+import { ScmService } from '../scm-service';
+
+@injectable()
+export class ScmDecorationsService {
+    private readonly diffComputer: DiffComputer;
+    private dirtyState: boolean = true;
+
+    constructor(@inject(DirtyDiffDecorator) protected readonly decorator: DirtyDiffDecorator,
+        @inject(ScmService) protected readonly scmService: ScmService,
+        @inject(EditorManager) protected readonly editorManager: EditorManager,
+        @inject(ResourceProvider) protected readonly resourceProvider: ResourceProvider) {
+        this.diffComputer = new DiffComputer();
+        this.editorManager.onCreated(async editor => this.applyEditorDecorations(editor.editor));
+        this.scmService.onDidAddRepository(repository => repository.provider.onDidChange(() => {
+            const editor = this.editorManager.currentEditor;
+            if (editor) {
+                if (this.dirtyState) {
+                    this.applyEditorDecorations(editor.editor);
+                    this.dirtyState = false;
+                } else {
+                    /** onDidChange event might be called several times one after another, so need to prevent repeated events. */
+                    setTimeout(() => {
+                        this.dirtyState = true;
+                    }, 500);
+                }
+            }
+        }));
+        this.scmService.onDidChangeSelectedRepository(() => {
+            const editor = this.editorManager.currentEditor;
+            if (editor) {
+                this.applyEditorDecorations(editor.editor);
+            }
+        });
+    }
+
+    async applyEditorDecorations(editor: TextEditor): Promise<void> {
+        const currentRepo = this.scmService.selectedRepository;
+        if (currentRepo) {
+            try {
+                const uri = editor.uri.withScheme(currentRepo.provider.id).withQuery(`{"ref":"", "path":"${editor.uri.path.toString()}"}`);
+                const previousResource = await this.resourceProvider(uri);
+                const previousContent = await previousResource.readContents();
+                const previousLines = ContentLines.fromString(previousContent);
+                const currentResource = await this.resourceProvider(editor.uri);
+                const currentContent = await currentResource.readContents();
+                const currentLines = ContentLines.fromString(currentContent);
+                const { added, removed, modified } = this.diffComputer.computeDirtyDiff(ContentLines.arrayLike(previousLines), ContentLines.arrayLike(currentLines));
+                this.decorator.applyDecorations({ editor: editor, added, removed, modified });
+                currentResource.dispose();
+                previousResource.dispose();
+            } catch (e) {
+                // Scm resource may not be found, do nothing.
+            }
+        }
+    }
+}

package/src/browser/decorations/scm-navigator-decorator.ts

@@ -1,121 +1,121 @@
-// *****************************************************************************
-// Copyright (C) 2019 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { ILogger } from '@theia/core/lib/common/logger';
-import { Event, Emitter } from '@theia/core/lib/common/event';
-import { Tree } from '@theia/core/lib/browser/tree/tree';
-import { TreeDecorator, TreeDecoration } from '@theia/core/lib/browser/tree/tree-decorator';
-import { DepthFirstTreeIterator } from '@theia/core/lib/browser';
-import { FileStatNode } from '@theia/filesystem/lib/browser';
-import URI from '@theia/core/lib/common/uri';
-import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
-import { Decoration, DecorationsService } from '@theia/core/lib/browser/decorations-service';
-
-/**
- * @deprecated since 1.25.0
- * URI-based decorators should implement `DecorationsProvider` and contribute decorations via the `DecorationsService`.
- */
-@injectable()
-export class ScmNavigatorDecorator implements TreeDecorator {
-
-    readonly id = 'theia-scm-decorator';
-    private decorationsMap: Map<string, Decoration> | undefined;
-
-    @inject(ILogger) protected readonly logger: ILogger;
-
-    @inject(ColorRegistry)
-    protected readonly colors: ColorRegistry;
-
-    constructor(@inject(DecorationsService) protected readonly decorationsService: DecorationsService) {
-        this.decorationsService.onDidChangeDecorations(data => {
-            this.decorationsMap = data;
-            this.fireDidChangeDecorations((tree: Tree) => this.collectDecorators(tree));
-        });
-    }
-
-    protected collectDecorators(tree: Tree): Map<string, TreeDecoration.Data> {
-        const result = new Map();
-        if (tree.root === undefined || !this.decorationsMap) {
-            return result;
-        }
-        const markers = this.appendContainerChanges(this.decorationsMap);
-        for (const treeNode of new DepthFirstTreeIterator(tree.root)) {
-            const uri = FileStatNode.getUri(treeNode);
-            if (uri) {
-                const marker = markers.get(uri);
-                if (marker) {
-                    result.set(treeNode.id, marker);
-                }
-            }
-        }
-        return new Map(Array.from(result.entries()).map(m => [m[0], this.toDecorator(m[1])] as [string, TreeDecoration.Data]));
-    }
-
-    protected toDecorator(change: Decoration): TreeDecoration.Data {
-        const colorVariable = change.colorId && this.colors.toCssVariableName(change.colorId);
-        return {
-            tailDecorations: [
-                {
-                    data: change.letter ? change.letter : '',
-                    fontData: {
-                        color: colorVariable && `var(${colorVariable})`
-                    },
-                    tooltip: change.tooltip ? change.tooltip : ''
-                }
-            ]
-        };
-    }
-
-    protected readonly emitter = new Emitter<(tree: Tree) => Map<string, TreeDecoration.Data>>();
-
-    async decorations(tree: Tree): Promise<Map<string, TreeDecoration.Data>> {
-        if (this.decorationsMap) {
-            return this.collectDecorators(tree);
-        } else {
-            return new Map();
-        }
-    }
-
-    protected appendContainerChanges(decorationsMap: Map<string, Decoration>): Map<string, Decoration> {
-        const result: Map<string, Decoration> = new Map();
-        for (const [uri, data] of decorationsMap.entries()) {
-            const uriString = uri.toString();
-            result.set(uriString, data);
-            let parentUri: URI | undefined = new URI(uri).parent;
-            while (parentUri && !parentUri.path.isRoot) {
-                const parentUriString = parentUri.toString();
-                const existing = result.get(parentUriString);
-                if (existing === undefined) {
-                    result.set(parentUriString, data);
-                    parentUri = parentUri.parent;
-                } else {
-                    parentUri = undefined;
-                }
-            }
-        }
-        return result;
-    }
-
-    get onDidChangeDecorations(): Event<(tree: Tree) => Map<string, TreeDecoration.Data>> {
-        return this.emitter.event;
-    }
-
-    fireDidChangeDecorations(event: (tree: Tree) => Map<string, TreeDecoration.Data>): void {
-        this.emitter.fire(event);
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2019 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { ILogger } from '@theia/core/lib/common/logger';
+import { Event, Emitter } from '@theia/core/lib/common/event';
+import { Tree } from '@theia/core/lib/browser/tree/tree';
+import { TreeDecorator, TreeDecoration } from '@theia/core/lib/browser/tree/tree-decorator';
+import { DepthFirstTreeIterator } from '@theia/core/lib/browser';
+import { FileStatNode } from '@theia/filesystem/lib/browser';
+import URI from '@theia/core/lib/common/uri';
+import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
+import { Decoration, DecorationsService } from '@theia/core/lib/browser/decorations-service';
+
+/**
+ * @deprecated since 1.25.0
+ * URI-based decorators should implement `DecorationsProvider` and contribute decorations via the `DecorationsService`.
+ */
+@injectable()
+export class ScmNavigatorDecorator implements TreeDecorator {
+
+    readonly id = 'theia-scm-decorator';
+    private decorationsMap: Map<string, Decoration> | undefined;
+
+    @inject(ILogger) protected readonly logger: ILogger;
+
+    @inject(ColorRegistry)
+    protected readonly colors: ColorRegistry;
+
+    constructor(@inject(DecorationsService) protected readonly decorationsService: DecorationsService) {
+        this.decorationsService.onDidChangeDecorations(data => {
+            this.decorationsMap = data;
+            this.fireDidChangeDecorations((tree: Tree) => this.collectDecorators(tree));
+        });
+    }
+
+    protected collectDecorators(tree: Tree): Map<string, TreeDecoration.Data> {
+        const result = new Map();
+        if (tree.root === undefined || !this.decorationsMap) {
+            return result;
+        }
+        const markers = this.appendContainerChanges(this.decorationsMap);
+        for (const treeNode of new DepthFirstTreeIterator(tree.root)) {
+            const uri = FileStatNode.getUri(treeNode);
+            if (uri) {
+                const marker = markers.get(uri);
+                if (marker) {
+                    result.set(treeNode.id, marker);
+                }
+            }
+        }
+        return new Map(Array.from(result.entries()).map(m => [m[0], this.toDecorator(m[1])] as [string, TreeDecoration.Data]));
+    }
+
+    protected toDecorator(change: Decoration): TreeDecoration.Data {
+        const colorVariable = change.colorId && this.colors.toCssVariableName(change.colorId);
+        return {
+            tailDecorations: [
+                {
+                    data: change.letter ? change.letter : '',
+                    fontData: {
+                        color: colorVariable && `var(${colorVariable})`
+                    },
+                    tooltip: change.tooltip ? change.tooltip : ''
+                }
+            ]
+        };
+    }
+
+    protected readonly emitter = new Emitter<(tree: Tree) => Map<string, TreeDecoration.Data>>();
+
+    async decorations(tree: Tree): Promise<Map<string, TreeDecoration.Data>> {
+        if (this.decorationsMap) {
+            return this.collectDecorators(tree);
+        } else {
+            return new Map();
+        }
+    }
+
+    protected appendContainerChanges(decorationsMap: Map<string, Decoration>): Map<string, Decoration> {
+        const result: Map<string, Decoration> = new Map();
+        for (const [uri, data] of decorationsMap.entries()) {
+            const uriString = uri.toString();
+            result.set(uriString, data);
+            let parentUri: URI | undefined = new URI(uri).parent;
+            while (parentUri && !parentUri.path.isRoot) {
+                const parentUriString = parentUri.toString();
+                const existing = result.get(parentUriString);
+                if (existing === undefined) {
+                    result.set(parentUriString, data);
+                    parentUri = parentUri.parent;
+                } else {
+                    parentUri = undefined;
+                }
+            }
+        }
+        return result;
+    }
+
+    get onDidChangeDecorations(): Event<(tree: Tree) => Map<string, TreeDecoration.Data>> {
+        return this.emitter.event;
+    }
+
+    fireDidChangeDecorations(event: (tree: Tree) => Map<string, TreeDecoration.Data>): void {
+        this.emitter.fire(event);
+    }
+
+}

package/src/browser/decorations/scm-tab-bar-decorator.ts

@@ -1,83 +1,83 @@
-// *****************************************************************************
-// Copyright (C) 2020 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { Event, Emitter } from '@theia/core/lib/common/event';
-import { ScmService } from '../scm-service';
-import { TabBarDecorator } from '@theia/core/lib/browser/shell/tab-bar-decorator';
-import { Title, ViewContainer, Widget } from '@theia/core/lib/browser';
-import { WidgetDecoration } from '@theia/core/lib/browser/widget-decoration';
-import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { ScmWidget } from '../scm-widget';
-
-@injectable()
-export class ScmTabBarDecorator implements TabBarDecorator {
-
-    readonly id = 'theia-scm-tabbar-decorator';
-    protected readonly emitter = new Emitter<void>();
-
-    private readonly toDispose = new DisposableCollection();
-    private readonly toDisposeOnDidChange = new DisposableCollection();
-
-    @inject(ScmService)
-    protected readonly scmService: ScmService;
-
-    @postConstruct()
-    protected init(): void {
-        this.toDispose.push(this.scmService.onDidChangeSelectedRepository(repository => {
-            this.toDisposeOnDidChange.dispose();
-            if (repository) {
-                this.toDisposeOnDidChange.push(
-                    repository.provider.onDidChange(() => this.fireDidChangeDecorations())
-                );
-            }
-            this.fireDidChangeDecorations();
-        }));
-    }
-
-    decorate(title: Title<Widget>): WidgetDecoration.Data[] {
-        const { owner } = title;
-        if (owner instanceof ViewContainer && owner.getParts().find(part => part.wrapped instanceof ScmWidget)) {
-            const changes = this.collectChangesCount();
-            return changes > 0 ? [{ badge: changes }] : [];
-        } else {
-            return [];
-        }
-    }
-
-    protected collectChangesCount(): number {
-        const repository = this.scmService.selectedRepository;
-        let changes = 0;
-        if (!repository) {
-            return 0;
-        }
-        repository.provider.groups.map(group => {
-            if (group.id === 'index' || group.id === 'workingTree') {
-                changes += group.resources.length;
-            }
-        });
-        return changes;
-    }
-
-    get onDidChangeDecorations(): Event<void> {
-        return this.emitter.event;
-    }
-
-    protected fireDidChangeDecorations(): void {
-        this.emitter.fire(undefined);
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2020 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { Event, Emitter } from '@theia/core/lib/common/event';
+import { ScmService } from '../scm-service';
+import { TabBarDecorator } from '@theia/core/lib/browser/shell/tab-bar-decorator';
+import { Title, ViewContainer, Widget } from '@theia/core/lib/browser';
+import { WidgetDecoration } from '@theia/core/lib/browser/widget-decoration';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { ScmWidget } from '../scm-widget';
+
+@injectable()
+export class ScmTabBarDecorator implements TabBarDecorator {
+
+    readonly id = 'theia-scm-tabbar-decorator';
+    protected readonly emitter = new Emitter<void>();
+
+    private readonly toDispose = new DisposableCollection();
+    private readonly toDisposeOnDidChange = new DisposableCollection();
+
+    @inject(ScmService)
+    protected readonly scmService: ScmService;
+
+    @postConstruct()
+    protected init(): void {
+        this.toDispose.push(this.scmService.onDidChangeSelectedRepository(repository => {
+            this.toDisposeOnDidChange.dispose();
+            if (repository) {
+                this.toDisposeOnDidChange.push(
+                    repository.provider.onDidChange(() => this.fireDidChangeDecorations())
+                );
+            }
+            this.fireDidChangeDecorations();
+        }));
+    }
+
+    decorate(title: Title<Widget>): WidgetDecoration.Data[] {
+        const { owner } = title;
+        if (owner instanceof ViewContainer && owner.getParts().find(part => part.wrapped instanceof ScmWidget)) {
+            const changes = this.collectChangesCount();
+            return changes > 0 ? [{ badge: changes }] : [];
+        } else {
+            return [];
+        }
+    }
+
+    protected collectChangesCount(): number {
+        const repository = this.scmService.selectedRepository;
+        let changes = 0;
+        if (!repository) {
+            return 0;
+        }
+        repository.provider.groups.map(group => {
+            if (group.id === 'index' || group.id === 'workingTree') {
+                changes += group.resources.length;
+            }
+        });
+        return changes;
+    }
+
+    get onDidChangeDecorations(): Event<void> {
+        return this.emitter.event;
+    }
+
+    protected fireDidChangeDecorations(): void {
+        this.emitter.fire(undefined);
+    }
+
+}