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

IDEA-125272 git: do not fail to annotate file with "CR" separators

Browse Source 
* git doesn't treat them as line separators
* remove support of "LFCR" separators that in not a thing
This commit is contained in:
Aleksey Pivovarov
2016-11-30 17:05:31 +03:00
parent 74458aa5f5
commit d010d44d30
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/util/StringScanner.java
+2 -2
View File
@@ -55,7 +55,7 @@ public class StringScanner {
return true;
}
final char ch = myText.charAt(myPosition);
return ch == '\n' || ch == '\r';
return ch == '\n';
}
/**
@@ -69,7 +69,7 @@ public class StringScanner {
final char ch = myText.charAt(myPosition++);
if (hasMoreData()) {
final char ch2 = myText.charAt(myPosition);
if (ch == '\n' && ch2 == '\r' || ch == '\r' && ch2 == '\n') {
if (ch == '\r' && ch2 == '\n') {
myPosition++;
}
}