azalea/fixminer_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the bug of reading diff entries.

Browse Source
This commit is contained in:
Kui LIU
2017-12-22 14:08:46 +01:00
parent fcb7a3d101
commit cb0472f72b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/edu/lu/uni/serval/diffentry/DiffEntryReader.java
+6 -2
View File
@@ -23,9 +23,11 @@ public class DiffEntryReader {
int startLine2 = 0; int startLine2 = 0;
int range2 = 0; int range2 = 0;
StringBuilder hunk = new StringBuilder(); StringBuilder hunk = new StringBuilder();
boolean sourceCode = false;
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
if (RegExp.filterSignal(line.trim())) { if (RegExp.filterSignal(line.trim())) {
sourceCode = true;
if (hunk.length() > 0) { if (hunk.length() > 0) {
if ((range < 7 && range2 < 7) || range == 0 || range2 == 0) { // filter out big hunks if ((range < 7 && range2 < 7) || range == 0 || range2 == 0) { // filter out big hunks
DiffEntryHunk diffEntryHunk = new DiffEntryHunk(startLine, startLine2, range, range2); DiffEntryHunk diffEntryHunk = new DiffEntryHunk(startLine, startLine2, range, range2);
@@ -51,7 +53,7 @@ public class DiffEntryReader {
} }
continue; continue;
} }
hunk.append(line + "\n"); if (sourceCode) hunk.append(line + "\n");
} }
if ((range < 7 && range2 < 7) || range == 0 || range2 == 0) { // filter out big hunks if ((range < 7 && range2 < 7) || range == 0 || range2 == 0) { // filter out big hunks
@@ -95,9 +97,11 @@ public class DiffEntryReader {
int startLine2 = 0; int startLine2 = 0;
int range2 = 0; int range2 = 0;
StringBuilder hunk = new StringBuilder(); StringBuilder hunk = new StringBuilder();
boolean sourceCode = false;
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
if (RegExp.filterSignal(line.trim())) { if (RegExp.filterSignal(line.trim())) {
sourceCode = true;
if (hunk.length() > 0) { if (hunk.length() > 0) {
if (startLine > 0) { if (startLine > 0) {
DiffEntryHunk diffEntryHunk = new DiffEntryHunk(startLine, startLine2, range, range2); DiffEntryHunk diffEntryHunk = new DiffEntryHunk(startLine, startLine2, range, range2);
@@ -123,7 +127,7 @@ public class DiffEntryReader {
} }
continue; continue;
} }
hunk.append(line + "\n"); if (sourceCode) hunk.append(line + "\n");
} }
if (startLine > 0) { if (startLine > 0) {