@theia/scm 1.53.0-next.5 → 1.53.0-next.55

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);
+    }
+
+}

package/src/browser/dirty-diff/content-lines.spec.ts

@@ -1,42 +1,42 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox 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 * as chai from 'chai';
-import { ContentLines } from './content-lines';
-import { expect } from 'chai';
-chai.use(require('chai-string'));
-
-describe('content-lines', () => {
-
-    it('array-like access of lines without splitting', () => {
-        const raw = 'abc\ndef\n123\n456';
-        const linesArray = ContentLines.arrayLike(ContentLines.fromString(raw));
-        expect(linesArray[0]).to.be.equal('abc');
-        expect(linesArray[1]).to.be.equal('def');
-        expect(linesArray[2]).to.be.equal('123');
-        expect(linesArray[3]).to.be.equal('456');
-    });
-
-    it('works with CRLF', () => {
-        const raw = 'abc\ndef\r\n123\r456';
-        const linesArray = ContentLines.arrayLike(ContentLines.fromString(raw));
-        expect(linesArray[0]).to.be.equal('abc');
-        expect(linesArray[1]).to.be.equal('def');
-        expect(linesArray[2]).to.be.equal('123');
-        expect(linesArray[3]).to.be.equal('456');
-    });
-
-});
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox 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 * as chai from 'chai';
+import { ContentLines } from './content-lines';
+import { expect } from 'chai';
+chai.use(require('chai-string'));
+
+describe('content-lines', () => {
+
+    it('array-like access of lines without splitting', () => {
+        const raw = 'abc\ndef\n123\n456';
+        const linesArray = ContentLines.arrayLike(ContentLines.fromString(raw));
+        expect(linesArray[0]).to.be.equal('abc');
+        expect(linesArray[1]).to.be.equal('def');
+        expect(linesArray[2]).to.be.equal('123');
+        expect(linesArray[3]).to.be.equal('456');
+    });
+
+    it('works with CRLF', () => {
+        const raw = 'abc\ndef\r\n123\r456';
+        const linesArray = ContentLines.arrayLike(ContentLines.fromString(raw));
+        expect(linesArray[0]).to.be.equal('abc');
+        expect(linesArray[1]).to.be.equal('def');
+        expect(linesArray[2]).to.be.equal('123');
+        expect(linesArray[3]).to.be.equal('456');
+    });
+
+});

package/src/browser/dirty-diff/content-lines.ts

@@ -1,121 +1,121 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox 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 { TextEditorDocument } from '@theia/editor/lib/browser';
-
-export interface ContentLines extends ArrayLike<string> {
-    readonly length: number,
-    getLineContent: (line: number) => string,
-}
-
-export interface ContentLinesArrayLike extends ContentLines, ArrayLike<string> {
-    [Symbol.iterator]: () => IterableIterator<string>,
-    readonly [n: number]: string;
-}
-
-export namespace ContentLines {
-    const NL = '\n'.charCodeAt(0);
-    const CR = '\r'.charCodeAt(0);
-
-    export function fromString(content: string): ContentLines {
-        const computeLineStarts: (s: string) => number[] = s => {
-            const result: number[] = [0];
-            for (let i = 0; i < s.length; i++) {
-                const chr = s.charCodeAt(i);
-                if (chr === CR) {
-                    if (i + 1 < s.length && s.charCodeAt(i + 1) === NL) {
-                        result[result.length] = i + 2;
-                        i++;
-                    } else {
-                        result[result.length] = i + 1;
-                    }
-                } else if (chr === NL) {
-                    result[result.length] = i + 1;
-                }
-            }
-            return result;
-        };
-        const lineStarts = computeLineStarts(content);
-
-        return {
-            length: lineStarts.length,
-            getLineContent: line => {
-                if (line >= lineStarts.length) {
-                    throw new Error('line index out of bounds');
-                }
-                const start = lineStarts[line];
-                let end = (line === lineStarts.length - 1) ? undefined : lineStarts[line + 1] - 1;
-                if (!!end && content.charCodeAt(end - 1) === CR) {
-                    end--; // ignore CR at the end
-                }
-                const lineContent = content.substring(start, end);
-                return lineContent;
-            }
-        };
-    }
-
-    export function fromTextEditorDocument(document: TextEditorDocument): ContentLines {
-        return {
-            length: document.lineCount,
-            getLineContent: line => document.getLineContent(line + 1),
-        };
-    }
-
-    export function arrayLike(lines: ContentLines): ContentLinesArrayLike {
-        return new Proxy(lines as ContentLines, getProxyHandler()) as ContentLinesArrayLike;
-    }
-
-    function getProxyHandler(): ProxyHandler<ContentLinesArrayLike> {
-        return {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            get(target: ContentLines, p: PropertyKey): any {
-                switch (p) {
-                    case 'prototype':
-                        return undefined;
-                    case 'length':
-                        return target.length;
-                    case 'slice':
-                        return (start?: number, end?: number) => {
-                            if (start !== undefined) {
-                                return [start, (end !== undefined ? end - 1 : target.length - 1)];
-                            }
-                            return [0, target.length - 1];
-                        };
-                    case Symbol.iterator:
-                        return function* (): IterableIterator<string> {
-                            for (let i = 0; i < target.length; i++) {
-                                yield target.getLineContent(i);
-                            }
-                        };
-                }
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                const index = Number.parseInt(p as any);
-                if (Number.isInteger(index)) {
-                    if (index >= 0 && index < target.length) {
-                        const value = target.getLineContent(index);
-                        if (value === undefined) {
-                            console.log(target);
-                        }
-                        return value;
-                    } else {
-                        return undefined;
-                    }
-                }
-                throw new Error(`get ${String(p)} not implemented`);
-            }
-        };
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox 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 { TextEditorDocument } from '@theia/editor/lib/browser';
+
+export interface ContentLines extends ArrayLike<string> {
+    readonly length: number,
+    getLineContent: (line: number) => string,
+}
+
+export interface ContentLinesArrayLike extends ContentLines, ArrayLike<string> {
+    [Symbol.iterator]: () => IterableIterator<string>,
+    readonly [n: number]: string;
+}
+
+export namespace ContentLines {
+    const NL = '\n'.charCodeAt(0);
+    const CR = '\r'.charCodeAt(0);
+
+    export function fromString(content: string): ContentLines {
+        const computeLineStarts: (s: string) => number[] = s => {
+            const result: number[] = [0];
+            for (let i = 0; i < s.length; i++) {
+                const chr = s.charCodeAt(i);
+                if (chr === CR) {
+                    if (i + 1 < s.length && s.charCodeAt(i + 1) === NL) {
+                        result[result.length] = i + 2;
+                        i++;
+                    } else {
+                        result[result.length] = i + 1;
+                    }
+                } else if (chr === NL) {
+                    result[result.length] = i + 1;
+                }
+            }
+            return result;
+        };
+        const lineStarts = computeLineStarts(content);
+
+        return {
+            length: lineStarts.length,
+            getLineContent: line => {
+                if (line >= lineStarts.length) {
+                    throw new Error('line index out of bounds');
+                }
+                const start = lineStarts[line];
+                let end = (line === lineStarts.length - 1) ? undefined : lineStarts[line + 1] - 1;
+                if (!!end && content.charCodeAt(end - 1) === CR) {
+                    end--; // ignore CR at the end
+                }
+                const lineContent = content.substring(start, end);
+                return lineContent;
+            }
+        };
+    }
+
+    export function fromTextEditorDocument(document: TextEditorDocument): ContentLines {
+        return {
+            length: document.lineCount,
+            getLineContent: line => document.getLineContent(line + 1),
+        };
+    }
+
+    export function arrayLike(lines: ContentLines): ContentLinesArrayLike {
+        return new Proxy(lines as ContentLines, getProxyHandler()) as ContentLinesArrayLike;
+    }
+
+    function getProxyHandler(): ProxyHandler<ContentLinesArrayLike> {
+        return {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            get(target: ContentLines, p: PropertyKey): any {
+                switch (p) {
+                    case 'prototype':
+                        return undefined;
+                    case 'length':
+                        return target.length;
+                    case 'slice':
+                        return (start?: number, end?: number) => {
+                            if (start !== undefined) {
+                                return [start, (end !== undefined ? end - 1 : target.length - 1)];
+                            }
+                            return [0, target.length - 1];
+                        };
+                    case Symbol.iterator:
+                        return function* (): IterableIterator<string> {
+                            for (let i = 0; i < target.length; i++) {
+                                yield target.getLineContent(i);
+                            }
+                        };
+                }
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                const index = Number.parseInt(p as any);
+                if (Number.isInteger(index)) {
+                    if (index >= 0 && index < target.length) {
+                        const value = target.getLineContent(index);
+                        if (value === undefined) {
+                            console.log(target);
+                        }
+                        return value;
+                    } else {
+                        return undefined;
+                    }
+                }
+                throw new Error(`get ${String(p)} not implemented`);
+            }
+        };
+    }
+}