@theia/scm 1.46.0-next.153 → 1.46.0-next.196

package/lib/browser/decorations/scm-decorations-service.d.ts

@@ -1,5 +1,5 @@
-import { ResourceProvider } from '@theia/core';
-import { DirtyDiffDecorator } from '../dirty-diff/dirty-diff-decorator';
+import { Emitter, Event, ResourceProvider } from '@theia/core';
+import { DirtyDiffDecorator, DirtyDiffUpdate } from '../dirty-diff/dirty-diff-decorator';
 import { EditorManager, TextEditor } from '@theia/editor/lib/browser';
 import { ScmService } from '../scm-service';
 export declare class ScmDecorationsService {
@@ -8,8 +8,14 @@ export declare class ScmDecorationsService {
     protected readonly editorManager: EditorManager;
     protected readonly resourceProvider: ResourceProvider;
     private readonly diffComputer;
-    private dirtyState;
+    protected readonly onDirtyDiffUpdateEmitter: Emitter<DirtyDiffUpdate>;
+    readonly onDirtyDiffUpdate: Event<DirtyDiffUpdate>;
     constructor(decorator: DirtyDiffDecorator, scmService: ScmService, editorManager: EditorManager, resourceProvider: ResourceProvider);
     applyEditorDecorations(editor: TextEditor): Promise<void>;
+    protected supportsDirtyDiff(editor: TextEditor): boolean;
+    protected createUpdateTask(editor: TextEditor): {
+        (): void;
+        cancel(): void;
+    };
 }
 //# sourceMappingURL=scm-decorations-service.d.ts.map

package/lib/browser/decorations/scm-decorations-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scm-decorations-service.d.ts","sourceRoot":"","sources":["../../../src/browser/decorations/scm-decorations-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAGxE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,qBACa,qBAAqB;IAIU,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,kBAAkB;IAChE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU;IACtC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC5C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IANnF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,UAAU,CAAiB;gBAEwB,SAAS,EAAE,kBAAkB,EAC7C,UAAU,EAAE,UAAU,EACnB,aAAa,EAAE,aAAa,EACzB,gBAAgB,EAAE,gBAAgB;IAyB7E,sBAAsB,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAoBlE"}
+{"version":3,"file":"scm-decorations-service.d.ts","sourceRoot":"","sources":["../../../src/browser/decorations/scm-decorations-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAwB,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAGzF,OAAO,EAAE,aAAa,EAAgB,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAI5C,qBACa,qBAAqB;IAOE,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,kBAAkB;IACxD,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU;IACtC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC5C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IATnF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IAEnD,SAAS,CAAC,QAAQ,CAAC,wBAAwB,2BAAkC;IAC7E,QAAQ,CAAC,iBAAiB,EAAE,KAAK,CAAC,eAAe,CAAC,CAAuC;gBAGtC,SAAS,EAAE,kBAAkB,EACrC,UAAU,EAAE,UAAU,EACnB,aAAa,EAAE,aAAa,EACzB,gBAAgB,EAAE,gBAAgB;IA+B7E,sBAAsB,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B/D,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO;IAIxD,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG;QAAE,IAAI,IAAI,CAAC;QAAC,MAAM,IAAI,IAAI,CAAC;KAAE;CAGhF"}

package/lib/browser/decorations/scm-decorations-service.js

@@ -24,58 +24,78 @@ const diff_computer_1 = require("../dirty-diff/diff-computer");
 const content_lines_1 = require("../dirty-diff/content-lines");
 const browser_1 = require("@theia/editor/lib/browser");
 const scm_service_1 = require("../scm-service");
+const throttle = require("@theia/core/shared/lodash.throttle");
 let ScmDecorationsService = class ScmDecorationsService {
     constructor(decorator, scmService, editorManager, resourceProvider) {
         this.decorator = decorator;
         this.scmService = scmService;
         this.editorManager = editorManager;
         this.resourceProvider = resourceProvider;
-        this.dirtyState = true;
         this.diffComputer = new diff_computer_1.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.onDirtyDiffUpdateEmitter = new core_1.Emitter();
+        this.onDirtyDiffUpdate = this.onDirtyDiffUpdateEmitter.event;
+        const updateTasks = new Map();
+        this.editorManager.onCreated(editorWidget => {
+            const { editor } = editorWidget;
+            if (!this.supportsDirtyDiff(editor)) {
+                return;
             }
-        }));
-        this.scmService.onDidChangeSelectedRepository(() => {
-            const editor = this.editorManager.currentEditor;
-            if (editor) {
-                this.applyEditorDecorations(editor.editor);
+            const toDispose = new core_1.DisposableCollection();
+            const updateTask = this.createUpdateTask(editor);
+            updateTasks.set(editorWidget, updateTask);
+            toDispose.push(editor.onDocumentContentChanged(() => updateTask()));
+            editorWidget.disposed.connect(() => {
+                updateTask.cancel();
+                updateTasks.delete(editorWidget);
+                toDispose.dispose();
+            });
+            updateTask();
+        });
+        const runUpdateTasks = () => {
+            for (const updateTask of updateTasks.values()) {
+                updateTask();
             }
+        };
+        this.scmService.onDidAddRepository(({ provider }) => {
+            var _a;
+            provider.onDidChange(runUpdateTasks);
+            (_a = provider.onDidChangeResources) === null || _a === void 0 ? void 0 : _a.call(provider, runUpdateTasks);
         });
+        this.scmService.onDidChangeSelectedRepository(runUpdateTasks);
     }
     async applyEditorDecorations(editor) {
         const currentRepo = this.scmService.selectedRepository;
         if (currentRepo) {
             try {
-                const uri = editor.uri.withScheme(currentRepo.provider.id).withQuery(`{"ref":"", "path":"${editor.uri.path.toString()}"}`);
+                // Currently, the uri used here is specific to vscode.git; other SCM providers are thus not supported.
+                // See https://github.com/eclipse-theia/theia/pull/13104#discussion_r1494540628 for a detailed discussion.
+                const query = { path: editor.uri['codeUri'].fsPath, ref: '~' };
+                const uri = editor.uri.withScheme(currentRepo.provider.id).withQuery(JSON.stringify(query));
                 const previousResource = await this.resourceProvider(uri);
-                const previousContent = await previousResource.readContents();
-                const previousLines = content_lines_1.ContentLines.fromString(previousContent);
-                const currentResource = await this.resourceProvider(editor.uri);
-                const currentContent = await currentResource.readContents();
-                const currentLines = content_lines_1.ContentLines.fromString(currentContent);
-                const { added, removed, modified } = this.diffComputer.computeDirtyDiff(content_lines_1.ContentLines.arrayLike(previousLines), content_lines_1.ContentLines.arrayLike(currentLines));
-                this.decorator.applyDecorations({ editor: editor, added, removed, modified });
-                currentResource.dispose();
-                previousResource.dispose();
+                try {
+                    const previousContent = await previousResource.readContents();
+                    const previousLines = content_lines_1.ContentLines.fromString(previousContent);
+                    const currentLines = content_lines_1.ContentLines.fromTextEditorDocument(editor.document);
+                    const dirtyDiff = this.diffComputer.computeDirtyDiff(content_lines_1.ContentLines.arrayLike(previousLines), content_lines_1.ContentLines.arrayLike(currentLines));
+                    const update = { editor, previousRevisionUri: uri, ...dirtyDiff };
+                    this.decorator.applyDecorations(update);
+                    this.onDirtyDiffUpdateEmitter.fire(update);
+                }
+                finally {
+                    previousResource.dispose();
+                }
             }
             catch (e) {
                 // Scm resource may not be found, do nothing.
             }
         }
     }
+    supportsDirtyDiff(editor) {
+        return editor.shouldDisplayDirtyDiff();
+    }
+    createUpdateTask(editor) {
+        return throttle(() => this.applyEditorDecorations(editor), 500);
+    }
 };
 ScmDecorationsService = (0, tslib_1.__decorate)([
     (0, inversify_1.injectable)(),

package/lib/browser/decorations/scm-decorations-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"scm-decorations-service.js","sourceRoot":"","sources":["../../../src/browser/decorations/scm-decorations-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scm-decorations-service.js","sourceRoot":"","sources":["../../../src/browser/decorations/scm-decorations-service.ts"],"names":[],"mappings":"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"}

package/lib/browser/dirty-diff/content-lines.d.ts

@@ -1,3 +1,4 @@
+import { TextEditorDocument } from '@theia/editor/lib/browser';
 export interface ContentLines extends ArrayLike<string> {
     readonly length: number;
     getLineContent: (line: number) => string;
@@ -8,6 +9,7 @@ export interface ContentLinesArrayLike extends ContentLines, ArrayLike<string> {
 }
 export declare namespace ContentLines {
     function fromString(content: string): ContentLines;
+    function fromTextEditorDocument(document: TextEditorDocument): ContentLines;
     function arrayLike(lines: ContentLines): ContentLinesArrayLike;
 }
 //# sourceMappingURL=content-lines.d.ts.map

package/lib/browser/dirty-diff/content-lines.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"content-lines.d.ts","sourceRoot":"","sources":["../../../src/browser/dirty-diff/content-lines.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,YAAa,SAAQ,SAAS,CAAC,MAAM,CAAC;IACnD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CAC5C;AAED,MAAM,WAAW,qBAAsB,SAAQ,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC;IAC1E,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAClD,QAAQ,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;AAED,yBAAiB,YAAY,CAAC;IAI1B,SAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAmCxD;IAED,SAAgB,SAAS,CAAC,KAAK,EAAE,YAAY,GAAG,qBAAqB,CAEpE;CA0CJ"}
+{"version":3,"file":"content-lines.d.ts","sourceRoot":"","sources":["../../../src/browser/dirty-diff/content-lines.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,MAAM,WAAW,YAAa,SAAQ,SAAS,CAAC,MAAM,CAAC;IACnD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CAC5C;AAED,MAAM,WAAW,qBAAsB,SAAQ,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC;IAC1E,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAClD,QAAQ,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;AAED,yBAAiB,YAAY,CAAC;IAI1B,SAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAmCxD;IAED,SAAgB,sBAAsB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,YAAY,CAKjF;IAED,SAAgB,SAAS,CAAC,KAAK,EAAE,YAAY,GAAG,qBAAqB,CAEpE;CA0CJ"}

package/lib/browser/dirty-diff/content-lines.js

@@ -58,6 +58,13 @@ var ContentLines;
         };
     }
     ContentLines.fromString = fromString;
+    function fromTextEditorDocument(document) {
+        return {
+            length: document.lineCount,
+            getLineContent: line => document.getLineContent(line + 1),
+        };
+    }
+    ContentLines.fromTextEditorDocument = fromTextEditorDocument;
     function arrayLike(lines) {
         return new Proxy(lines, getProxyHandler());
     }

package/lib/browser/dirty-diff/content-lines.js.map

@@ -1 +1 @@
-{"version":3,"file":"content-lines.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/content-lines.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"content-lines.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/content-lines.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,5 @@
 import { ContentLinesArrayLike } from './content-lines';
+import { Position, Range } from '@theia/core/shared/vscode-languageserver-protocol';
 export declare class DiffComputer {
     computeDiff(previous: ContentLinesArrayLike, current: ContentLinesArrayLike): DiffResult[];
     computeDirtyDiff(previous: ContentLinesArrayLike, current: ContentLinesArrayLike): DirtyDiff;
@@ -10,21 +11,29 @@ export interface DiffResult {
     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[];
+    readonly changes: readonly Change[];
+}
+export interface Change {
+    readonly previousRange: LineRange;
+    readonly currentRange: LineRange;
+}
+export declare namespace Change {
+    function isAddition(change: Change): boolean;
+    function isRemoval(change: Change): boolean;
+    function isModification(change: Change): boolean;
 }
 export interface LineRange {
-    start: number;
-    end: number;
+    readonly start: number;
+    readonly end: number;
+}
+export declare namespace LineRange {
+    function create(start: number, end: number): LineRange;
+    function createSingleLineRange(line: number): LineRange;
+    function createEmptyLineRange(line: number): LineRange;
+    function isEmpty(range: LineRange): boolean;
+    function getStartPosition(range: LineRange): Position;
+    function getEndPosition(range: LineRange): Position;
+    function toRange(range: LineRange): Range;
+    function getLineCount(range: LineRange): number;
 }
 //# sourceMappingURL=diff-computer.d.ts.map

package/lib/browser/dirty-diff/diff-computer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diff-computer.d.ts","sourceRoot":"","sources":["../../../src/browser/dirty-diff/diff-computer.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,qBAAa,YAAY;IAErB,WAAW,CAAC,QAAQ,EAAE,qBAAqB,EAAE,OAAO,EAAE,qBAAqB,GAAG,UAAU,EAAE;IAK1F,gBAAgB,CAAC,QAAQ,EAAE,qBAAqB,EAAE,OAAO,EAAE,qBAAqB,GAAG,SAAS;CAiD/F;AA4BD,MAAM,WAAW,UAAU;IACvB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,SAAS;IACtB;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC;IAC5B;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAC3B;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC;CAClC;AAED,MAAM,WAAW,SAAS;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACf"}
+{"version":3,"file":"diff-computer.d.ts","sourceRoot":"","sources":["../../../src/browser/dirty-diff/diff-computer.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAY,MAAM,mDAAmD,CAAC;AAE9F,qBAAa,YAAY;IAErB,WAAW,CAAC,QAAQ,EAAE,qBAAqB,EAAE,OAAO,EAAE,qBAAqB,GAAG,UAAU,EAAE;IAK1F,gBAAgB,CAAC,QAAQ,EAAE,qBAAqB,EAAE,OAAO,EAAE,qBAAqB,GAAG,SAAS;CAiD/F;AAiCD,MAAM,WAAW,UAAU;IACvB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,SAAS;IACtB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,MAAM;IACnB,QAAQ,CAAC,aAAa,EAAE,SAAS,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC;CACpC;AAED,yBAAiB,MAAM,CAAC;IACpB,SAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAElD;IACD,SAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEjD;IACD,SAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEtD;CACJ;AAED,MAAM,WAAW,SAAS;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;CACxB;AAED,yBAAiB,SAAS,CAAC;IACvB,SAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,CAK5D;IACD,SAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAE7D;IACD,SAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAE5D;IACD,SAAgB,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAEjD;IACD,SAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,QAAQ,CAK3D;IACD,SAAgB,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG,QAAQ,CAKzD;IACD,SAAgB,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,KAAK,CAE/C;IACD,SAAgB,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAErD;CACJ"}

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

@@ -15,65 +15,66 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DiffComputer = void 0;
+exports.LineRange = exports.Change = exports.DiffComputer = void 0;
 const jsdiff = require("diff");
+const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
 class DiffComputer {
     computeDiff(previous, current) {
         const diffResult = diffArrays(previous, current);
         return diffResult;
     }
     computeDirtyDiff(previous, current) {
-        const added = [];
-        const removed = [];
-        const modified = [];
-        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];
+        const changes = [];
+        const diffResult = this.computeDiff(previous, current);
+        let currentRevisionLine = -1;
+        let previousRevisionLine = -1;
+        for (let i = 0; i < diffResult.length; i++) {
+            const change = diffResult[i];
+            const next = diffResult[i + 1];
             if (change.added) {
                 // case: addition
-                const start = lastLine + 1;
-                const end = lastLine + change.count;
-                added.push({ start, end });
-                lastLine = end;
+                changes.push({ previousRange: LineRange.createEmptyLineRange(previousRevisionLine + 1), currentRange: toLineRange(change) });
+                currentRevisionLine += change.count;
             }
             else if (change.removed && next && next.added) {
                 const isFirstChange = i === 0;
-                const isLastChange = i === changes.length - 2;
+                const isLastChange = i === diffResult.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);
+                    changes.push({ previousRange: toLineRange(change), currentRange: LineRange.createEmptyLineRange(0) });
+                    previousRevisionLine += change.count;
                 }
                 else if (isFirstChange && isPrevEmptyLine) {
                     // special case: adding at the beginning
-                    const start = 0;
-                    const end = next.count - 1;
-                    added.push({ start, end });
-                    lastLine = end;
+                    changes.push({ previousRange: LineRange.createEmptyLineRange(0), currentRange: toLineRange(next) });
+                    currentRevisionLine += next.count;
                 }
                 else if (isLastChange && isNextEmptyLine) {
-                    removed.push(lastLine + 1 /* = empty line */);
+                    changes.push({ previousRange: toLineRange(change), currentRange: LineRange.createEmptyLineRange(currentRevisionLine + 2) });
+                    previousRevisionLine += change.count;
                 }
                 else {
                     // default case is a modification
-                    const start = lastLine + 1;
-                    const end = lastLine + next.count;
-                    modified.push({ start, end });
-                    lastLine = end;
+                    changes.push({ previousRange: toLineRange(change), currentRange: toLineRange(next) });
+                    currentRevisionLine += next.count;
+                    previousRevisionLine += change.count;
                 }
                 i++; // consume next eagerly
             }
             else if (change.removed && !(next && next.added)) {
-                removed.push(Math.max(0, lastLine));
+                // case: removal
+                changes.push({ previousRange: toLineRange(change), currentRange: LineRange.createEmptyLineRange(currentRevisionLine + 1) });
+                previousRevisionLine += change.count;
             }
             else {
-                lastLine += change.count;
+                // case: unchanged region
+                currentRevisionLine += change.count;
+                previousRevisionLine += change.count;
             }
         }
-        return { added, removed, modified };
+        return { changes };
     }
 }
 exports.DiffComputer = DiffComputer;
@@ -100,4 +101,67 @@ function diffArrays(oldArr, newArr) {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return arrayDiff.diff(oldArr, newArr);
 }
+function toLineRange({ value }) {
+    const [start, end] = value;
+    return LineRange.create(start, end + 1);
+}
+var Change;
+(function (Change) {
+    function isAddition(change) {
+        return LineRange.isEmpty(change.previousRange);
+    }
+    Change.isAddition = isAddition;
+    function isRemoval(change) {
+        return LineRange.isEmpty(change.currentRange);
+    }
+    Change.isRemoval = isRemoval;
+    function isModification(change) {
+        return !isAddition(change) && !isRemoval(change);
+    }
+    Change.isModification = isModification;
+})(Change = exports.Change || (exports.Change = {}));
+var LineRange;
+(function (LineRange) {
+    function create(start, end) {
+        if (start < 0 || end < 0 || start > end) {
+            throw new Error(`Invalid line range: { start: ${start}, end: ${end} }`);
+        }
+        return { start, end };
+    }
+    LineRange.create = create;
+    function createSingleLineRange(line) {
+        return create(line, line + 1);
+    }
+    LineRange.createSingleLineRange = createSingleLineRange;
+    function createEmptyLineRange(line) {
+        return create(line, line);
+    }
+    LineRange.createEmptyLineRange = createEmptyLineRange;
+    function isEmpty(range) {
+        return range.start === range.end;
+    }
+    LineRange.isEmpty = isEmpty;
+    function getStartPosition(range) {
+        if (isEmpty(range)) {
+            return getEndPosition(range);
+        }
+        return vscode_languageserver_protocol_1.Position.create(range.start, 0);
+    }
+    LineRange.getStartPosition = getStartPosition;
+    function getEndPosition(range) {
+        if (range.end < 1) {
+            return vscode_languageserver_protocol_1.Position.create(0, 0);
+        }
+        return vscode_languageserver_protocol_1.Position.create(range.end - 1, vscode_languageserver_protocol_1.uinteger.MAX_VALUE);
+    }
+    LineRange.getEndPosition = getEndPosition;
+    function toRange(range) {
+        return vscode_languageserver_protocol_1.Range.create(getStartPosition(range), getEndPosition(range));
+    }
+    LineRange.toRange = toRange;
+    function getLineCount(range) {
+        return range.end - range.start;
+    }
+    LineRange.getLineCount = getLineCount;
+})(LineRange = exports.LineRange || (exports.LineRange = {}));
 //# sourceMappingURL=diff-computer.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"diff-computer.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/diff-computer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"diff-computer.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/diff-computer.ts"],"names":[],"mappings":"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"}