opendev/gerrit
Code Issues Proposed changes

Merge "Improve file sorting for C and C++ projects"

Browse Source
This commit is contained in:
Shawn Pearce
2015-01-30 05:50:51 +00:00
committed by Gerrit Code Review
parent ad84028093 bb32b9aa30
commit e0fb18b95c
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/FileInfo.java
View File

@@ -43,6 +43,20 @@ public class FileInfo extends JavaScriptObject {
} else if (Patch.COMMIT_MSG.equals(b.path())) { } else if (Patch.COMMIT_MSG.equals(b.path())) {
return 1; return 1;
} }
// Look at file suffixes to check if it makes sense to use a different order
int s1 = a.path().lastIndexOf('.');
int s2 = b.path().lastIndexOf('.');
if (s1 > 0 && s2 > 0 &&
a.path().substring(0, s1).equals(b.path().substring(0, s2))) {
String suffixA = a.path().substring(s1);
String suffixB = b.path().substring(s2);
// C++ and C: give priority to header files (.h/.hpp/...)
if (suffixA.indexOf(".h") == 0) {
return -1;
} else if (suffixB.indexOf(".h") == 0) {
return 1;
}
}
return a.path().compareTo(b.path()); return a.path().compareTo(b.path());
} }
}); });