@theia/scm 1.45.1 → 1.46.0-next.72

package/src/browser/dirty-diff/diff-computer.ts

@@ -1,129 +1,129 @@
-// *****************************************************************************
-// 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 jsdiff from 'diff';
-import { ContentLinesArrayLike } from './content-lines';
-
-export class DiffComputer {
-
-    computeDiff(previous: ContentLinesArrayLike, current: ContentLinesArrayLike): DiffResult[] {
-        const diffResult = diffArrays(previous, current);
-        return diffResult;
-    }
-
-    computeDirtyDiff(previous: ContentLinesArrayLike, current: ContentLinesArrayLike): DirtyDiff {
-        const added: LineRange[] = [];
-        const removed: number[] = [];
-        const modified: LineRange[] = [];
-        const changes = this.computeDiff(previous, current);
-        let lastLine = -1;
-        for (let i = 0; i < changes.length; i++) {
-            const change = changes[i];
-            const next = changes[i + 1];
-            if (change.added) {
-                // case: addition
-                const start = lastLine + 1;
-                const end = lastLine + change.count!;
-                added.push(<LineRange>{ start, end });
-                lastLine = end;
-            } else if (change.removed && next && next.added) {
-                const isFirstChange = i === 0;
-                const isLastChange = i === changes.length - 2;
-                const isNextEmptyLine = next.value.length > 0 && current[next.value[0]].length === 0;
-                const isPrevEmptyLine = change.value.length > 0 && previous[change.value[0]].length === 0;
-
-                if (isFirstChange && isNextEmptyLine) {
-                    // special case: removing at the beginning
-                    removed.push(0);
-                } else if (isFirstChange && isPrevEmptyLine) {
-                    // special case: adding at the beginning
-                    const start = 0;
-                    const end = next.count! - 1;
-                    added.push(<LineRange>{ start, end });
-                    lastLine = end;
-                } else if (isLastChange && isNextEmptyLine) {
-                    removed.push(lastLine + 1 /* = empty line */);
-                } else {
-                    // default case is a modification
-                    const start = lastLine + 1;
-                    const end = lastLine + next.count!;
-                    modified.push(<LineRange>{ start, end });
-                    lastLine = end;
-                }
-                i++; // consume next eagerly
-            } else if (change.removed && !(next && next.added)) {
-                removed.push(Math.max(0, lastLine));
-            } else {
-                lastLine += change.count!;
-            }
-        }
-        return <DirtyDiff>{ added, removed, modified };
-    }
-
-}
-
-class ArrayDiff extends jsdiff.Diff {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    override tokenize(value: any): any {
-        return value;
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    override join(value: any): any {
-        return value;
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    override removeEmpty(value: any): any {
-        return value;
-    }
-}
-
-const arrayDiff = new ArrayDiff();
-
-/**
- * Computes diff without copying data.
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function diffArrays(oldArr: ContentLinesArrayLike, newArr: ContentLinesArrayLike): DiffResult[] {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return arrayDiff.diff(oldArr as any, newArr as any) as any;
-}
-
-export interface DiffResult {
-    value: [number, number];
-    count?: number;
-    added?: boolean;
-    removed?: boolean;
-}
-
-export interface DirtyDiff {
-    /**
-     * Lines added by comparison to previous revision.
-     */
-    readonly added: LineRange[];
-    /**
-     * Lines, after which lines were removed by comparison to previous revision.
-     */
-    readonly removed: number[];
-    /**
-     * Lines modified by comparison to previous revision.
-     */
-    readonly modified: LineRange[];
-}
-
-export interface LineRange {
-    start: number;
-    end: number;
-}
+// *****************************************************************************
+// 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 jsdiff from 'diff';
+import { ContentLinesArrayLike } from './content-lines';
+
+export class DiffComputer {
+
+    computeDiff(previous: ContentLinesArrayLike, current: ContentLinesArrayLike): DiffResult[] {
+        const diffResult = diffArrays(previous, current);
+        return diffResult;
+    }
+
+    computeDirtyDiff(previous: ContentLinesArrayLike, current: ContentLinesArrayLike): DirtyDiff {
+        const added: LineRange[] = [];
+        const removed: number[] = [];
+        const modified: LineRange[] = [];
+        const changes = this.computeDiff(previous, current);
+        let lastLine = -1;
+        for (let i = 0; i < changes.length; i++) {
+            const change = changes[i];
+            const next = changes[i + 1];
+            if (change.added) {
+                // case: addition
+                const start = lastLine + 1;
+                const end = lastLine + change.count!;
+                added.push(<LineRange>{ start, end });
+                lastLine = end;
+            } else if (change.removed && next && next.added) {
+                const isFirstChange = i === 0;
+                const isLastChange = i === changes.length - 2;
+                const isNextEmptyLine = next.value.length > 0 && current[next.value[0]].length === 0;
+                const isPrevEmptyLine = change.value.length > 0 && previous[change.value[0]].length === 0;
+
+                if (isFirstChange && isNextEmptyLine) {
+                    // special case: removing at the beginning
+                    removed.push(0);
+                } else if (isFirstChange && isPrevEmptyLine) {
+                    // special case: adding at the beginning
+                    const start = 0;
+                    const end = next.count! - 1;
+                    added.push(<LineRange>{ start, end });
+                    lastLine = end;
+                } else if (isLastChange && isNextEmptyLine) {
+                    removed.push(lastLine + 1 /* = empty line */);
+                } else {
+                    // default case is a modification
+                    const start = lastLine + 1;
+                    const end = lastLine + next.count!;
+                    modified.push(<LineRange>{ start, end });
+                    lastLine = end;
+                }
+                i++; // consume next eagerly
+            } else if (change.removed && !(next && next.added)) {
+                removed.push(Math.max(0, lastLine));
+            } else {
+                lastLine += change.count!;
+            }
+        }
+        return <DirtyDiff>{ added, removed, modified };
+    }
+
+}
+
+class ArrayDiff extends jsdiff.Diff {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    override tokenize(value: any): any {
+        return value;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    override join(value: any): any {
+        return value;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    override removeEmpty(value: any): any {
+        return value;
+    }
+}
+
+const arrayDiff = new ArrayDiff();
+
+/**
+ * Computes diff without copying data.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function diffArrays(oldArr: ContentLinesArrayLike, newArr: ContentLinesArrayLike): DiffResult[] {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return arrayDiff.diff(oldArr as any, newArr as any) as any;
+}
+
+export interface DiffResult {
+    value: [number, number];
+    count?: number;
+    added?: boolean;
+    removed?: boolean;
+}
+
+export interface DirtyDiff {
+    /**
+     * Lines added by comparison to previous revision.
+     */
+    readonly added: LineRange[];
+    /**
+     * Lines, after which lines were removed by comparison to previous revision.
+     */
+    readonly removed: number[];
+    /**
+     * Lines modified by comparison to previous revision.
+     */
+    readonly modified: LineRange[];
+}
+
+export interface LineRange {
+    start: number;
+    end: number;
+}

package/src/browser/dirty-diff/dirty-diff-decorator.ts

@@ -1,107 +1,107 @@
-// *****************************************************************************
-// 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 { injectable } from '@theia/core/shared/inversify';
-import {
-    Range,
-    Position,
-    EditorDecoration,
-    EditorDecorationOptions,
-    OverviewRulerLane,
-    EditorDecorator,
-    TextEditor,
-    MinimapPosition
-} from '@theia/editor/lib/browser';
-import { DirtyDiff, LineRange } from './diff-computer';
-
-export enum DirtyDiffDecorationType {
-    AddedLine = 'dirty-diff-added-line',
-    RemovedLine = 'dirty-diff-removed-line',
-    ModifiedLine = 'dirty-diff-modified-line',
-}
-
-const AddedLineDecoration = <EditorDecorationOptions>{
-    linesDecorationsClassName: 'dirty-diff-glyph dirty-diff-added-line',
-    overviewRuler: {
-        color: {
-            id: 'editorOverviewRuler.addedForeground'
-        },
-        position: OverviewRulerLane.Left,
-    },
-    minimap: {
-        color: {
-            id: 'minimapGutter.addedBackground'
-        },
-        position: MinimapPosition.Gutter
-    },
-    isWholeLine: true
-};
-
-const RemovedLineDecoration = <EditorDecorationOptions>{
-    linesDecorationsClassName: 'dirty-diff-glyph dirty-diff-removed-line',
-    overviewRuler: {
-        color: {
-            id: 'editorOverviewRuler.deletedForeground'
-        },
-        position: OverviewRulerLane.Left,
-    },
-    minimap: {
-        color: {
-            id: 'minimapGutter.deletedBackground'
-        },
-        position: MinimapPosition.Gutter
-    },
-    isWholeLine: false
-};
-
-const ModifiedLineDecoration = <EditorDecorationOptions>{
-    linesDecorationsClassName: 'dirty-diff-glyph dirty-diff-modified-line',
-    overviewRuler: {
-        color: {
-            id: 'editorOverviewRuler.modifiedForeground'
-        },
-        position: OverviewRulerLane.Left,
-    },
-    minimap: {
-        color: {
-            id: 'minimapGutter.modifiedBackground'
-        },
-        position: MinimapPosition.Gutter
-    },
-    isWholeLine: true
-};
-
-export interface DirtyDiffUpdate extends DirtyDiff {
-    readonly editor: TextEditor;
-}
-
-@injectable()
-export class DirtyDiffDecorator extends EditorDecorator {
-
-    applyDecorations(update: DirtyDiffUpdate): void {
-        const modifications = update.modified.map(range => this.toDeltaDecoration(range, ModifiedLineDecoration));
-        const additions = update.added.map(range => this.toDeltaDecoration(range, AddedLineDecoration));
-        const removals = update.removed.map(line => this.toDeltaDecoration(line, RemovedLineDecoration));
-        const decorations = [...modifications, ...additions, ...removals];
-        this.setDecorations(update.editor, decorations);
-    }
-
-    protected toDeltaDecoration(from: LineRange | number, options: EditorDecorationOptions): EditorDecoration {
-        const [start, end] = (typeof from === 'number') ? [from, from] : [from.start, from.end];
-        const range = Range.create(Position.create(start, 0), Position.create(end, 0));
-        return { range, options };
-    }
-}
+// *****************************************************************************
+// 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 { injectable } from '@theia/core/shared/inversify';
+import {
+    Range,
+    Position,
+    EditorDecoration,
+    EditorDecorationOptions,
+    OverviewRulerLane,
+    EditorDecorator,
+    TextEditor,
+    MinimapPosition
+} from '@theia/editor/lib/browser';
+import { DirtyDiff, LineRange } from './diff-computer';
+
+export enum DirtyDiffDecorationType {
+    AddedLine = 'dirty-diff-added-line',
+    RemovedLine = 'dirty-diff-removed-line',
+    ModifiedLine = 'dirty-diff-modified-line',
+}
+
+const AddedLineDecoration = <EditorDecorationOptions>{
+    linesDecorationsClassName: 'dirty-diff-glyph dirty-diff-added-line',
+    overviewRuler: {
+        color: {
+            id: 'editorOverviewRuler.addedForeground'
+        },
+        position: OverviewRulerLane.Left,
+    },
+    minimap: {
+        color: {
+            id: 'minimapGutter.addedBackground'
+        },
+        position: MinimapPosition.Gutter
+    },
+    isWholeLine: true
+};
+
+const RemovedLineDecoration = <EditorDecorationOptions>{
+    linesDecorationsClassName: 'dirty-diff-glyph dirty-diff-removed-line',
+    overviewRuler: {
+        color: {
+            id: 'editorOverviewRuler.deletedForeground'
+        },
+        position: OverviewRulerLane.Left,
+    },
+    minimap: {
+        color: {
+            id: 'minimapGutter.deletedBackground'
+        },
+        position: MinimapPosition.Gutter
+    },
+    isWholeLine: false
+};
+
+const ModifiedLineDecoration = <EditorDecorationOptions>{
+    linesDecorationsClassName: 'dirty-diff-glyph dirty-diff-modified-line',
+    overviewRuler: {
+        color: {
+            id: 'editorOverviewRuler.modifiedForeground'
+        },
+        position: OverviewRulerLane.Left,
+    },
+    minimap: {
+        color: {
+            id: 'minimapGutter.modifiedBackground'
+        },
+        position: MinimapPosition.Gutter
+    },
+    isWholeLine: true
+};
+
+export interface DirtyDiffUpdate extends DirtyDiff {
+    readonly editor: TextEditor;
+}
+
+@injectable()
+export class DirtyDiffDecorator extends EditorDecorator {
+
+    applyDecorations(update: DirtyDiffUpdate): void {
+        const modifications = update.modified.map(range => this.toDeltaDecoration(range, ModifiedLineDecoration));
+        const additions = update.added.map(range => this.toDeltaDecoration(range, AddedLineDecoration));
+        const removals = update.removed.map(line => this.toDeltaDecoration(line, RemovedLineDecoration));
+        const decorations = [...modifications, ...additions, ...removals];
+        this.setDecorations(update.editor, decorations);
+    }
+
+    protected toDeltaDecoration(from: LineRange | number, options: EditorDecorationOptions): EditorDecoration {
+        const [start, end] = (typeof from === 'number') ? [from, from] : [from.start, from.end];
+        const range = Range.create(Position.create(start, 0), Position.create(end, 0));
+        return { range, options };
+    }
+}

package/src/browser/dirty-diff/dirty-diff-module.ts

@@ -1,24 +1,24 @@
-// *****************************************************************************
-// 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 { interfaces } from '@theia/core/shared/inversify';
-import { DirtyDiffDecorator } from './dirty-diff-decorator';
-
-import '../../../src/browser/style/dirty-diff.css';
-
-export function bindDirtyDiff(bind: interfaces.Bind): void {
-    bind(DirtyDiffDecorator).toSelf().inSingletonScope();
-}
+// *****************************************************************************
+// 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 { interfaces } from '@theia/core/shared/inversify';
+import { DirtyDiffDecorator } from './dirty-diff-decorator';
+
+import '../../../src/browser/style/dirty-diff.css';
+
+export function bindDirtyDiff(bind: interfaces.Bind): void {
+    bind(DirtyDiffDecorator).toSelf().inSingletonScope();
+}