MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

revert of IDEA-26580 Last symbol in a line can be not displayed in diff view

Browse Source
This commit is contained in:
irengrig
2010-12-07 18:17:12 +03:00
parent fa9f239134
commit b7526ef091
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTracker.java
+6 -6
View File
@@ -474,7 +474,7 @@ public class LineStatusTracker {
myApplication.assertWriteAccessAllowed();
synchronized (myLock) {
TextRange currentTextRange = getCurrentTextRange(range, false);
TextRange currentTextRange = getCurrentTextRange(range);
if (range.getType() == Range.INSERTED) {
myDocument
@@ -495,7 +495,7 @@ public class LineStatusTracker {
public String getUpToDateContent(Range range) {
synchronized (myLock) {
TextRange textRange = getUpToDateRange(range, false);
TextRange textRange = getUpToDateRange(range);
final int startOffset = textRange.getStartOffset();
final int endOffset = Math.min(textRange.getEndOffset() + 1, myUpToDateDocument.getTextLength());
return myUpToDateDocument.getCharsSequence().subSequence(startOffset, endOffset).toString();
@@ -506,12 +506,12 @@ public class LineStatusTracker {
return myProject;
}
TextRange getCurrentTextRange(Range range, final boolean keepEnd) {
return getRange(range.getType(), range.getOffset1(), range.getOffset2(), Range.DELETED, myDocument, keepEnd);
TextRange getCurrentTextRange(Range range) {
return getRange(range.getType(), range.getOffset1(), range.getOffset2(), Range.DELETED, myDocument, false);
}
TextRange getUpToDateRange(Range range, final boolean keepEnd) {
return getRange(range.getType(), range.getUOffset1(), range.getUOffset2(), Range.INSERTED, myUpToDateDocument, keepEnd);
TextRange getUpToDateRange(Range range) {
return getRange(range.getType(), range.getUOffset1(), range.getUOffset2(), Range.INSERTED, myUpToDateDocument, false);
}
// a hack
platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ShowLineStatusRangeDiffAction.java
+2 -3
View File
@@ -50,9 +50,8 @@ public class ShowLineStatusRangeDiffAction extends BaseLineStatusRangeAction {
return new DiffRequest(myLineStatusTracker.getProject()) {
public DiffContent[] getContents() {
return new DiffContent[]{createDiffContent(myLineStatusTracker.getUpToDateDocument(),
myLineStatusTracker.getUpToDateRange(myRange, true), null),
createDiffContent(myLineStatusTracker.getDocument(),
myLineStatusTracker.getCurrentTextRange(myRange, true),
myLineStatusTracker.getUpToDateRangeWithEndSymbol(myRange), null),
createDiffContent(myLineStatusTracker.getDocument(), myLineStatusTracker.getCurrentTextRange(myRange),
myLineStatusTracker.getVirtualFile())};
}