-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: use codiff to get better diff result
- Loading branch information
Showing
5 changed files
with
120 additions
and
141 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,52 +1,84 @@ | ||
| import { Position, Range } from "vscode-languageserver"; | ||
| import { diffChars } from "diff"; | ||
| import { Range } from "vscode-languageserver"; | ||
| import { linesDiffComputers } from "codiff"; | ||
|
|
||
| export function calcCharDiffRange(originText: string, editText: string, editTextRanges: Range[]): Range[] { | ||
| const diffRanges: Range[] = []; | ||
| const changes = diffChars(originText, editText); | ||
| let index = 0; | ||
| changes.forEach((item) => { | ||
| if (item.added) { | ||
| const position = getPositionFromIndex(index, editTextRanges); | ||
| const addedRange: Range = { | ||
| start: position, | ||
| end: { line: position.line, character: position.character + (item.count ?? 0) }, | ||
| }; | ||
| diffRanges.push(addedRange); | ||
| index += item.count ?? 0; | ||
| } else if (item.removed) { | ||
| // nothing | ||
| } else { | ||
| index += item.count ?? 0; | ||
| } | ||
| }); | ||
| return diffRanges; | ||
| interface CodeDiffResult { | ||
| originRanges: Range[]; | ||
| modifiedRanges: Range[]; | ||
| } | ||
|
|
||
| export function getPositionFromIndex(index: number, ranges: Range[]): Position { | ||
| let line = 0; | ||
| let character = 0; | ||
| let length = 0; | ||
| for (let i = 0; i < ranges.length; i++) { | ||
| const range = ranges[i]; | ||
| if (!range) { | ||
| continue; | ||
| } | ||
| const rangeLength = range.end.character - range.start.character + length + 1; | ||
| if (index >= length && index < rangeLength) { | ||
| line = range.start.line; | ||
| character = index - length; | ||
| return { | ||
| line, | ||
| character, | ||
| }; | ||
| } else { | ||
| length = rangeLength; | ||
| } | ||
| } | ||
| /** | ||
| * Diff code and mapping the result range to editor range | ||
| */ | ||
| export function codeDiff( | ||
| originCode: string[], | ||
| originCodeRanges: Range[], | ||
| modifiedCode: string[], | ||
| modifiedCodeRanges: Range[], | ||
| ): CodeDiffResult { | ||
| const originRanges: Range[] = []; | ||
| const modifiedRanges: Range[] = []; | ||
|
|
||
| const diffResult = linesDiffComputers.getDefault().computeDiff(originCode, modifiedCode, { | ||
| computeMoves: false, | ||
| ignoreTrimWhitespace: true, | ||
| maxComputationTimeMs: 100, | ||
| }); | ||
|
|
||
| diffResult.changes.forEach((change) => { | ||
| change.innerChanges?.forEach((innerChange) => { | ||
| /** | ||
| * In most case, stat line and end line are equal in diff change. | ||
| * when start line and end line are different in change, it usually means a range that include a whole line. | ||
| * { | ||
| * "startLineNumber": 2, | ||
| * "startColumn": 1, | ||
| * "endLineNumber": 3, | ||
| * "endColumn": 1 | ||
| * } | ||
| * | ||
| * In our case, the origin code and modified code are mixed tegather. so we should translate range to below to avoid wrong range mapping. | ||
| * { | ||
| * "startLineNumber": 2, | ||
| * "startColumn": 1, | ||
| * "endLineNumber": 2, | ||
| * "endColumn": // end of line 2 | ||
| * } | ||
| * | ||
| */ | ||
| let originEndChar = innerChange.originalRange.endColumn - 1; | ||
| if (innerChange.originalRange.endLineNumber !== innerChange.originalRange.startLineNumber) { | ||
| originEndChar = originCodeRanges[innerChange.originalRange.startLineNumber - 1]?.end.character ?? 0; | ||
| } | ||
| originRanges.push({ | ||
| start: { | ||
| line: originCodeRanges[innerChange.originalRange.startLineNumber - 1]?.start.line ?? 0, | ||
| character: innerChange.originalRange.startColumn - 1, | ||
| }, | ||
| end: { | ||
| line: originCodeRanges[innerChange.originalRange.startLineNumber - 1]?.start.line ?? 0, | ||
| character: originEndChar, | ||
| }, | ||
| }); | ||
|
|
||
| let modifiedEndChar = innerChange.modifiedRange.endColumn - 1; | ||
| if (innerChange.modifiedRange.endLineNumber !== innerChange.modifiedRange.startLineNumber) { | ||
| modifiedEndChar = modifiedCodeRanges[innerChange.modifiedRange.startLineNumber - 1]?.end.character ?? 0; | ||
| } | ||
| modifiedRanges.push({ | ||
| start: { | ||
| line: modifiedCodeRanges[innerChange.modifiedRange.startLineNumber - 1]?.start.line ?? 0, | ||
| character: innerChange.modifiedRange.startColumn - 1, | ||
| }, | ||
| end: { | ||
| line: modifiedCodeRanges[innerChange.modifiedRange.startLineNumber - 1]?.start.line ?? 0, | ||
| character: modifiedEndChar, | ||
| }, | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| return { | ||
| line, | ||
| character, | ||
| modifiedRanges, | ||
| originRanges, | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters