This repository has been archived by the owner on Jul 15, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 646
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes #13 Rename using diffs and parse diffs using diff-parse/diff np…
…m modules (#477) * Rename and Format using diffs if diff tool is available
- Loading branch information
1 parent
a443750
commit a0fa2d2
Showing
10 changed files
with
477 additions
and
171 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| /*--------------------------------------------------------- | ||
| * Copyright (C) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. See License.txt in the project root for license information. | ||
| *--------------------------------------------------------*/ | ||
|
|
||
| import { TextDocument, Position, Range, TextEdit, Uri, WorkspaceEdit, TextEditorEdit } from 'vscode'; | ||
| import { getBinPathFromEnvVar } from '../src/goPath'; | ||
| import jsDiff = require('diff'); | ||
|
|
||
| let diffToolAvailable: boolean = null; | ||
|
|
||
| export function isDiffToolAvailable(): boolean { | ||
| if (diffToolAvailable == null) { | ||
| diffToolAvailable = getBinPathFromEnvVar('diff', 'PATH', false) != null; | ||
| } | ||
| return diffToolAvailable; | ||
| } | ||
|
|
||
| export enum EditTypes { EDIT_DELETE, EDIT_INSERT, EDIT_REPLACE}; | ||
|
|
||
| export class Edit { | ||
| action: number; | ||
| start: Position; | ||
| end: Position; | ||
| text: string; | ||
|
|
||
| constructor(action: number, start: Position) { | ||
| this.action = action; | ||
| this.start = start; | ||
| this.text = ''; | ||
| } | ||
|
|
||
| // Creates TextEdit for current Edit | ||
| apply(): TextEdit { | ||
| switch (this.action) { | ||
| case EditTypes.EDIT_INSERT: | ||
| return TextEdit.insert(this.start, this.text); | ||
|
|
||
| case EditTypes.EDIT_DELETE: | ||
| return TextEdit.delete(new Range(this.start, this.end)); | ||
|
|
||
| case EditTypes.EDIT_REPLACE: | ||
| return TextEdit.replace(new Range(this.start, this.end), this.text); | ||
| } | ||
| } | ||
|
|
||
| // Applies Edit using given TextEditorEdit | ||
| applyUsingTextEditorEdit(editBuilder: TextEditorEdit): void { | ||
| switch (this.action) { | ||
| case EditTypes.EDIT_INSERT: | ||
| editBuilder.insert(this.start, this.text); | ||
| break; | ||
|
|
||
| case EditTypes.EDIT_DELETE: | ||
| editBuilder.delete(new Range(this.start, this.end)); | ||
| break; | ||
|
|
||
| case EditTypes.EDIT_REPLACE: | ||
| editBuilder.replace(new Range(this.start, this.end), this.text); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| // Applies Edits to given WorkspaceEdit | ||
| applyUsingWorkspaceEdit(workspaceEdit: WorkspaceEdit, fileUri: Uri): void { | ||
| switch (this.action) { | ||
| case EditTypes.EDIT_INSERT: | ||
| workspaceEdit.insert(fileUri, this.start, this.text); | ||
| break; | ||
|
|
||
| case EditTypes.EDIT_DELETE: | ||
| workspaceEdit.delete(fileUri, new Range(this.start, this.end)); | ||
| break; | ||
|
|
||
| case EditTypes.EDIT_REPLACE: | ||
| workspaceEdit.replace(fileUri, new Range(this.start, this.end), this.text); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| export interface FilePatch { | ||
| fileName: string; | ||
| edits: Edit[]; | ||
| } | ||
|
|
||
| /** | ||
| * Uses diff module to parse given array of IUniDiff objects and returns edits for files | ||
| * | ||
| * @param diffOutput jsDiff.IUniDiff[] | ||
| * | ||
| * @returns Array of FilePatch objects, one for each file | ||
| */ | ||
| function parseUniDiffs(diffOutput: jsDiff.IUniDiff[]): FilePatch[] { | ||
| let filePatches: FilePatch[] = []; | ||
| diffOutput.forEach((uniDiff: jsDiff.IUniDiff) => { | ||
| let edit: Edit = null; | ||
| let edits: Edit[] = []; | ||
| uniDiff.hunks.forEach((hunk: jsDiff.IHunk) => { | ||
| let startLine = hunk.oldStart; | ||
| hunk.lines.forEach((line) => { | ||
| switch (line.substr(0, 1)) { | ||
| case '-': | ||
| if (edit == null) { | ||
| edit = new Edit(EditTypes.EDIT_DELETE, new Position(startLine - 1, 0)); | ||
| } | ||
| edit.end = new Position(startLine, 0); | ||
| startLine++; | ||
| break; | ||
| case '+': | ||
| if (edit == null) { | ||
| edit = new Edit(EditTypes.EDIT_INSERT, new Position(startLine - 1, 0)); | ||
| } else if (edit.action === EditTypes.EDIT_DELETE) { | ||
| edit.action = EditTypes.EDIT_REPLACE; | ||
| } | ||
| edit.text += line.substr(1) + '\n'; | ||
| break; | ||
| case ' ': | ||
| startLine++; | ||
| if (edit != null) { | ||
| edits.push(edit); | ||
| } | ||
| edit = null; | ||
| break; | ||
| } | ||
| }); | ||
| if (edit != null) { | ||
| edits.push(edit); | ||
| } | ||
| }); | ||
| filePatches.push({fileName: uniDiff.oldFileName, edits: edits}); | ||
| }); | ||
|
|
||
| return filePatches; | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * Returns a FilePatch object by generating diffs between given oldStr and newStr using the diff module | ||
| * | ||
| * @param fileName string: Name of the file to which edits should be applied | ||
| * @param oldStr string | ||
| * @param newStr string | ||
| * | ||
| * @returns A single FilePatch object | ||
| */ | ||
| export function getEdits(fileName: string, oldStr: string, newStr: string): FilePatch { | ||
| if (process.platform === 'win32') { | ||
| oldStr = oldStr.split('\r\n').join('\n'); | ||
| newStr = newStr.split('\r\n').join('\n'); | ||
| } | ||
| let unifiedDiffs: jsDiff.IUniDiff = jsDiff.structuredPatch(fileName, fileName, oldStr, newStr, '', ''); | ||
| let filePatches: FilePatch[] = parseUniDiffs([unifiedDiffs]); | ||
| return filePatches[0]; | ||
| } | ||
|
|
||
| /** | ||
| * Uses diff module to parse given diff string and returns edits for files | ||
| * | ||
| * @param diffStr : Diff string in unified format. http://www.gnu.org/software/diffutils/manual/diffutils.html#Unified-Format | ||
| * | ||
| * @returns Array of FilePatch objects, one for each file | ||
| */ | ||
| export function getEditsFromUnifiedDiffStr(diffstr: string): FilePatch[] { | ||
| // Workaround for the bug https://github.com/kpdecker/jsdiff/issues/135 | ||
| if (diffstr.startsWith('---')) { | ||
| diffstr = diffstr.split('---').join('Index\n---'); | ||
| } | ||
| let unifiedDiffs: jsDiff.IUniDiff[] = jsDiff.parsePatch(diffstr); | ||
| let filePatches: FilePatch[] = parseUniDiffs(unifiedDiffs); | ||
| return filePatches; | ||
| } |
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
Oops, something went wrong.