@theia/scm 1.45.0 → 1.46.0-next.72

package/lib/browser/dirty-diff/diff-computer.spec.js

@@ -1,316 +1,316 @@
-"use strict";
-// *****************************************************************************
-// 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
-// *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-const chai = require("chai");
-const chai_1 = require("chai");
-chai.use(require('chai-string'));
-const diff_computer_1 = require("./diff-computer");
-const content_lines_1 = require("./content-lines");
-let diffComputer;
-before(() => {
-    diffComputer = new diff_computer_1.DiffComputer();
-});
-describe('dirty-diff-computer', () => {
-    it('remove single line', () => {
-        const dirtyDiff = computeDirtyDiff([
-            'FIRST',
-            'SECOND TO-BE-REMOVED',
-            'THIRD'
-        ], [
-            'FIRST',
-            'THIRD'
-        ]);
-        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-            added: [],
-            modified: [],
-            removed: [0],
-        });
-    });
-    [1, 2, 3, 20].forEach(lines => {
-        it(`remove ${formatLines(lines)} at the end`, () => {
-            const dirtyDiff = computeDirtyDiff(sequenceOfN(2)
-                .concat(sequenceOfN(lines, () => 'TO-BE-REMOVED')), sequenceOfN(2));
-            (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-                modified: [],
-                removed: [1],
-                added: [],
-            });
-        });
-    });
-    it('remove all lines', () => {
-        const dirtyDiff = computeDirtyDiff(sequenceOfN(10, () => 'TO-BE-REMOVED'), ['']);
-        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-            added: [],
-            modified: [],
-            removed: [0],
-        });
-    });
-    [1, 2, 3, 20].forEach(lines => {
-        it(`remove ${formatLines(lines)} at the beginning`, () => {
-            const dirtyDiff = computeDirtyDiff(sequenceOfN(lines, () => 'TO-BE-REMOVED')
-                .concat(sequenceOfN(2)), sequenceOfN(2));
-            (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-                modified: [],
-                removed: [0],
-                added: [],
-            });
-        });
-    });
-    [1, 2, 3, 20].forEach(lines => {
-        it(`add ${formatLines(lines)}`, () => {
-            const previous = sequenceOfN(3);
-            const modified = insertIntoArray(previous, 2, ...sequenceOfN(lines, () => 'ADDED LINE'));
-            const dirtyDiff = computeDirtyDiff(previous, modified);
-            (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-                modified: [],
-                removed: [],
-                added: [{ start: 2, end: 2 + lines - 1 }],
-            });
-        });
-    });
-    [1, 2, 3, 20].forEach(lines => {
-        it(`add ${formatLines(lines)} at the beginning`, () => {
-            const dirtyDiff = computeDirtyDiff(sequenceOfN(2), sequenceOfN(lines, () => 'ADDED LINE')
-                .concat(sequenceOfN(2)));
-            (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-                modified: [],
-                removed: [],
-                added: [{ start: 0, end: lines - 1 }],
-            });
-        });
-    });
-    it('add lines to empty file', () => {
-        const numberOfLines = 3;
-        const dirtyDiff = computeDirtyDiff([''], sequenceOfN(numberOfLines, () => 'ADDED LINE'));
-        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-            modified: [],
-            removed: [],
-            added: [{ start: 0, end: numberOfLines - 1 }],
-        });
-    });
-    it('add empty lines', () => {
-        const dirtyDiff = computeDirtyDiff([
-            '1',
-            '2'
-        ], [
-            '1',
-            '',
-            '',
-            '2'
-        ]);
-        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-            modified: [],
-            removed: [],
-            added: [{ start: 1, end: 2 }],
-        });
-    });
-    it('add empty line after single line', () => {
-        const dirtyDiff = computeDirtyDiff([
-            '1'
-        ], [
-            '1',
-            ''
-        ]);
-        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-            modified: [],
-            removed: [],
-            added: [{ start: 1, end: 1 }],
-        });
-    });
-    [1, 2, 3, 20].forEach(lines => {
-        it(`add ${formatLines(lines)} (empty) at the end`, () => {
-            const dirtyDiff = computeDirtyDiff(sequenceOfN(2), sequenceOfN(2)
-                .concat(new Array(lines).map(() => '')));
-            (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-                modified: [],
-                removed: [],
-                added: [{ start: 2, end: 1 + lines }],
-            });
-        });
-    });
-    it('add empty and non-empty lines', () => {
-        const dirtyDiff = computeDirtyDiff([
-            'FIRST',
-            'LAST'
-        ], [
-            'FIRST',
-            '1. ADDED',
-            '2. ADDED',
-            '3. ADDED',
-            '4. ADDED',
-            '5. ADDED',
-            'LAST'
-        ]);
-        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-            modified: [],
-            removed: [],
-            added: [{ start: 1, end: 5 }],
-        });
-    });
-    [1, 2, 3, 4, 5].forEach(lines => {
-        it(`add ${formatLines(lines)} after single line`, () => {
-            const dirtyDiff = computeDirtyDiff(['0'], ['0'].concat(sequenceOfN(lines, () => 'ADDED LINE')));
-            (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-                modified: [],
-                removed: [],
-                added: [{ start: 1, end: lines }],
-            });
-        });
-    });
-    it('modify single line', () => {
-        const dirtyDiff = computeDirtyDiff([
-            'FIRST',
-            'TO-BE-MODIFIED',
-            'LAST'
-        ], [
-            'FIRST',
-            'MODIFIED',
-            'LAST'
-        ]);
-        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-            removed: [],
-            added: [],
-            modified: [{ start: 1, end: 1 }],
-        });
-    });
-    it('modify all lines', () => {
-        const numberOfLines = 10;
-        const dirtyDiff = computeDirtyDiff(sequenceOfN(numberOfLines, () => 'TO-BE-MODIFIED'), sequenceOfN(numberOfLines, () => 'MODIFIED'));
-        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-            removed: [],
-            added: [],
-            modified: [{ start: 0, end: numberOfLines - 1 }],
-        });
-    });
-    it('modify lines at the end', () => {
-        const dirtyDiff = computeDirtyDiff([
-            '1',
-            '2',
-            '3',
-            '4'
-        ], [
-            '1',
-            '2-changed',
-            '3-changed'
-        ]);
-        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-            removed: [],
-            added: [],
-            modified: [{ start: 1, end: 2 }],
-        });
-    });
-    it('multiple diffs', () => {
-        const dirtyDiff = computeDirtyDiff([
-            'TO-BE-CHANGED',
-            '1',
-            '2',
-            '3',
-            'TO-BE-REMOVED',
-            '4',
-            '5',
-            '6',
-            '7',
-            '8',
-            '9'
-        ], [
-            'CHANGED',
-            '1',
-            '2',
-            '3',
-            '4',
-            '5',
-            '6',
-            '7',
-            '8',
-            '9',
-            'ADDED',
-            ''
-        ]);
-        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-            removed: [3],
-            added: [{ start: 10, end: 11 }],
-            modified: [{ start: 0, end: 0 }],
-        });
-    });
-    it('multiple additions', () => {
-        const dirtyDiff = computeDirtyDiff([
-            'first line',
-            '',
-            'foo changed on master',
-            'bar changed on master',
-            '',
-            '',
-            '',
-            '',
-            '',
-            'last line'
-        ], [
-            'first line',
-            '',
-            'foo changed on master',
-            'bar changed on master',
-            '',
-            'NEW TEXT',
-            '',
-            '',
-            '',
-            'last line',
-            '',
-            ''
-        ]);
-        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
-            removed: [11],
-            added: [{ start: 5, end: 5 }, { start: 9, end: 9 }],
-            modified: [],
-        });
-    });
-});
-function computeDirtyDiff(previous, modified) {
-    const a = content_lines_1.ContentLines.arrayLike({
-        length: previous.length,
-        getLineContent: line => {
-            const value = previous[line];
-            if (value === undefined) {
-                console.log(undefined);
-            }
-            return value;
-        },
-    });
-    const b = content_lines_1.ContentLines.arrayLike({
-        length: modified.length,
-        getLineContent: line => {
-            const value = modified[line];
-            if (value === undefined) {
-                console.log(undefined);
-            }
-            return value;
-        },
-    });
-    return diffComputer.computeDirtyDiff(a, b);
-}
-function sequenceOfN(n, mapFn = i => i.toString()) {
-    return Array.from(new Array(n).keys()).map((value, index) => mapFn(index));
-}
-function formatLines(n) {
-    return n + ' line' + (n > 1 ? 's' : '');
-}
-function insertIntoArray(target, start, ...items) {
-    const copy = target.slice(0);
-    copy.splice(start, 0, ...items);
-    return copy;
-}
+"use strict";
+// *****************************************************************************
+// 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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai = require("chai");
+const chai_1 = require("chai");
+chai.use(require('chai-string'));
+const diff_computer_1 = require("./diff-computer");
+const content_lines_1 = require("./content-lines");
+let diffComputer;
+before(() => {
+    diffComputer = new diff_computer_1.DiffComputer();
+});
+describe('dirty-diff-computer', () => {
+    it('remove single line', () => {
+        const dirtyDiff = computeDirtyDiff([
+            'FIRST',
+            'SECOND TO-BE-REMOVED',
+            'THIRD'
+        ], [
+            'FIRST',
+            'THIRD'
+        ]);
+        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+            added: [],
+            modified: [],
+            removed: [0],
+        });
+    });
+    [1, 2, 3, 20].forEach(lines => {
+        it(`remove ${formatLines(lines)} at the end`, () => {
+            const dirtyDiff = computeDirtyDiff(sequenceOfN(2)
+                .concat(sequenceOfN(lines, () => 'TO-BE-REMOVED')), sequenceOfN(2));
+            (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+                modified: [],
+                removed: [1],
+                added: [],
+            });
+        });
+    });
+    it('remove all lines', () => {
+        const dirtyDiff = computeDirtyDiff(sequenceOfN(10, () => 'TO-BE-REMOVED'), ['']);
+        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+            added: [],
+            modified: [],
+            removed: [0],
+        });
+    });
+    [1, 2, 3, 20].forEach(lines => {
+        it(`remove ${formatLines(lines)} at the beginning`, () => {
+            const dirtyDiff = computeDirtyDiff(sequenceOfN(lines, () => 'TO-BE-REMOVED')
+                .concat(sequenceOfN(2)), sequenceOfN(2));
+            (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+                modified: [],
+                removed: [0],
+                added: [],
+            });
+        });
+    });
+    [1, 2, 3, 20].forEach(lines => {
+        it(`add ${formatLines(lines)}`, () => {
+            const previous = sequenceOfN(3);
+            const modified = insertIntoArray(previous, 2, ...sequenceOfN(lines, () => 'ADDED LINE'));
+            const dirtyDiff = computeDirtyDiff(previous, modified);
+            (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+                modified: [],
+                removed: [],
+                added: [{ start: 2, end: 2 + lines - 1 }],
+            });
+        });
+    });
+    [1, 2, 3, 20].forEach(lines => {
+        it(`add ${formatLines(lines)} at the beginning`, () => {
+            const dirtyDiff = computeDirtyDiff(sequenceOfN(2), sequenceOfN(lines, () => 'ADDED LINE')
+                .concat(sequenceOfN(2)));
+            (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+                modified: [],
+                removed: [],
+                added: [{ start: 0, end: lines - 1 }],
+            });
+        });
+    });
+    it('add lines to empty file', () => {
+        const numberOfLines = 3;
+        const dirtyDiff = computeDirtyDiff([''], sequenceOfN(numberOfLines, () => 'ADDED LINE'));
+        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+            modified: [],
+            removed: [],
+            added: [{ start: 0, end: numberOfLines - 1 }],
+        });
+    });
+    it('add empty lines', () => {
+        const dirtyDiff = computeDirtyDiff([
+            '1',
+            '2'
+        ], [
+            '1',
+            '',
+            '',
+            '2'
+        ]);
+        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+            modified: [],
+            removed: [],
+            added: [{ start: 1, end: 2 }],
+        });
+    });
+    it('add empty line after single line', () => {
+        const dirtyDiff = computeDirtyDiff([
+            '1'
+        ], [
+            '1',
+            ''
+        ]);
+        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+            modified: [],
+            removed: [],
+            added: [{ start: 1, end: 1 }],
+        });
+    });
+    [1, 2, 3, 20].forEach(lines => {
+        it(`add ${formatLines(lines)} (empty) at the end`, () => {
+            const dirtyDiff = computeDirtyDiff(sequenceOfN(2), sequenceOfN(2)
+                .concat(new Array(lines).map(() => '')));
+            (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+                modified: [],
+                removed: [],
+                added: [{ start: 2, end: 1 + lines }],
+            });
+        });
+    });
+    it('add empty and non-empty lines', () => {
+        const dirtyDiff = computeDirtyDiff([
+            'FIRST',
+            'LAST'
+        ], [
+            'FIRST',
+            '1. ADDED',
+            '2. ADDED',
+            '3. ADDED',
+            '4. ADDED',
+            '5. ADDED',
+            'LAST'
+        ]);
+        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+            modified: [],
+            removed: [],
+            added: [{ start: 1, end: 5 }],
+        });
+    });
+    [1, 2, 3, 4, 5].forEach(lines => {
+        it(`add ${formatLines(lines)} after single line`, () => {
+            const dirtyDiff = computeDirtyDiff(['0'], ['0'].concat(sequenceOfN(lines, () => 'ADDED LINE')));
+            (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+                modified: [],
+                removed: [],
+                added: [{ start: 1, end: lines }],
+            });
+        });
+    });
+    it('modify single line', () => {
+        const dirtyDiff = computeDirtyDiff([
+            'FIRST',
+            'TO-BE-MODIFIED',
+            'LAST'
+        ], [
+            'FIRST',
+            'MODIFIED',
+            'LAST'
+        ]);
+        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+            removed: [],
+            added: [],
+            modified: [{ start: 1, end: 1 }],
+        });
+    });
+    it('modify all lines', () => {
+        const numberOfLines = 10;
+        const dirtyDiff = computeDirtyDiff(sequenceOfN(numberOfLines, () => 'TO-BE-MODIFIED'), sequenceOfN(numberOfLines, () => 'MODIFIED'));
+        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+            removed: [],
+            added: [],
+            modified: [{ start: 0, end: numberOfLines - 1 }],
+        });
+    });
+    it('modify lines at the end', () => {
+        const dirtyDiff = computeDirtyDiff([
+            '1',
+            '2',
+            '3',
+            '4'
+        ], [
+            '1',
+            '2-changed',
+            '3-changed'
+        ]);
+        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+            removed: [],
+            added: [],
+            modified: [{ start: 1, end: 2 }],
+        });
+    });
+    it('multiple diffs', () => {
+        const dirtyDiff = computeDirtyDiff([
+            'TO-BE-CHANGED',
+            '1',
+            '2',
+            '3',
+            'TO-BE-REMOVED',
+            '4',
+            '5',
+            '6',
+            '7',
+            '8',
+            '9'
+        ], [
+            'CHANGED',
+            '1',
+            '2',
+            '3',
+            '4',
+            '5',
+            '6',
+            '7',
+            '8',
+            '9',
+            'ADDED',
+            ''
+        ]);
+        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+            removed: [3],
+            added: [{ start: 10, end: 11 }],
+            modified: [{ start: 0, end: 0 }],
+        });
+    });
+    it('multiple additions', () => {
+        const dirtyDiff = computeDirtyDiff([
+            'first line',
+            '',
+            'foo changed on master',
+            'bar changed on master',
+            '',
+            '',
+            '',
+            '',
+            '',
+            'last line'
+        ], [
+            'first line',
+            '',
+            'foo changed on master',
+            'bar changed on master',
+            '',
+            'NEW TEXT',
+            '',
+            '',
+            '',
+            'last line',
+            '',
+            ''
+        ]);
+        (0, chai_1.expect)(dirtyDiff).to.be.deep.equal({
+            removed: [11],
+            added: [{ start: 5, end: 5 }, { start: 9, end: 9 }],
+            modified: [],
+        });
+    });
+});
+function computeDirtyDiff(previous, modified) {
+    const a = content_lines_1.ContentLines.arrayLike({
+        length: previous.length,
+        getLineContent: line => {
+            const value = previous[line];
+            if (value === undefined) {
+                console.log(undefined);
+            }
+            return value;
+        },
+    });
+    const b = content_lines_1.ContentLines.arrayLike({
+        length: modified.length,
+        getLineContent: line => {
+            const value = modified[line];
+            if (value === undefined) {
+                console.log(undefined);
+            }
+            return value;
+        },
+    });
+    return diffComputer.computeDirtyDiff(a, b);
+}
+function sequenceOfN(n, mapFn = i => i.toString()) {
+    return Array.from(new Array(n).keys()).map((value, index) => mapFn(index));
+}
+function formatLines(n) {
+    return n + ' line' + (n > 1 ? 's' : '');
+}
+function insertIntoArray(target, start, ...items) {
+    const copy = target.slice(0);
+    copy.splice(start, 0, ...items);
+    return copy;
+}
 //# sourceMappingURL=diff-computer.spec.js.map

package/lib/browser/dirty-diff/dirty-diff-decorator.d.ts

@@ -1,15 +1,15 @@
-import { EditorDecoration, EditorDecorationOptions, EditorDecorator, TextEditor } from '@theia/editor/lib/browser';
-import { DirtyDiff, LineRange } from './diff-computer';
-export declare enum DirtyDiffDecorationType {
-    AddedLine = "dirty-diff-added-line",
-    RemovedLine = "dirty-diff-removed-line",
-    ModifiedLine = "dirty-diff-modified-line"
-}
-export interface DirtyDiffUpdate extends DirtyDiff {
-    readonly editor: TextEditor;
-}
-export declare class DirtyDiffDecorator extends EditorDecorator {
-    applyDecorations(update: DirtyDiffUpdate): void;
-    protected toDeltaDecoration(from: LineRange | number, options: EditorDecorationOptions): EditorDecoration;
-}
+import { EditorDecoration, EditorDecorationOptions, EditorDecorator, TextEditor } from '@theia/editor/lib/browser';
+import { DirtyDiff, LineRange } from './diff-computer';
+export declare enum DirtyDiffDecorationType {
+    AddedLine = "dirty-diff-added-line",
+    RemovedLine = "dirty-diff-removed-line",
+    ModifiedLine = "dirty-diff-modified-line"
+}
+export interface DirtyDiffUpdate extends DirtyDiff {
+    readonly editor: TextEditor;
+}
+export declare class DirtyDiffDecorator extends EditorDecorator {
+    applyDecorations(update: DirtyDiffUpdate): void;
+    protected toDeltaDecoration(from: LineRange | number, options: EditorDecorationOptions): EditorDecoration;
+}
 //# sourceMappingURL=dirty-diff-decorator.d.ts.map