Merge branch 'git_line_fix' of https://github.com/Jeyanthinath/vscode into Jeyanthinath-git_line_fix

joaomoreno · joaomoreno · commit 5eb9a10932dc · 2017-12-11T17:05:16.000+01:00
diff --git a/extensions/git/src/staging.ts b/extensions/git/src/staging.ts
@@ -73,9 +73,15 @@ export function toLineRanges(selections: Selection[], textDocument: TextDocument
 }
 
 function getModifiedRange(textDocument: TextDocument, diff: LineChange): Range {
-	return diff.modifiedEndLineNumber === 0
-		? new Range(textDocument.lineAt(diff.modifiedStartLineNumber - 1).range.end, textDocument.lineAt(diff.modifiedStartLineNumber).range.start)
-		: new Range(textDocument.lineAt(diff.modifiedStartLineNumber - 1).range.start, textDocument.lineAt(diff.modifiedEndLineNumber - 1).range.end);
+	if (diff.modifiedEndLineNumber === 0) {
+		if (diff.modifiedStartLineNumber === 0) {
+			return new Range(textDocument.lineAt(diff.modifiedStartLineNumber).range.end, textDocument.lineAt(diff.modifiedStartLineNumber).range.start);
+		} else {
+			return new Range(textDocument.lineAt(diff.modifiedStartLineNumber - 1).range.end, textDocument.lineAt(diff.modifiedStartLineNumber).range.start);
+		}
+	} else {
+		return new Range(textDocument.lineAt(diff.modifiedStartLineNumber - 1).range.start, textDocument.lineAt(diff.modifiedEndLineNumber - 1).range.end);
+	}
 }
 
 export function intersectDiffWithRange(textDocument: TextDocument, diff: LineChange, range: Range): LineChange | null {
