Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,8 @@ private static RangeMap<Integer, String> buildReplacements(
Set<String> usedNames,
Multimap<String, Range<Integer>> usedInJavadoc) {
RangeMap<Integer, String> replacements = TreeRangeMap.create();
int size = unit.getImports().size();
JCTree lastImport = size > 0 ? unit.getImports().get(size - 1) : null;
for (JCTree importTree : unit.getImports()) {
String simpleName = getSimpleName(importTree);
if (!isUnused(unit, usedNames, usedInJavadoc, importTree, simpleName)) {
Expand All @@ -286,6 +288,12 @@ private static RangeMap<Integer, String> buildReplacements(
&& contents.subSequence(endPosition, endPosition + sep.length()).toString().equals(sep)) {
endPosition += sep.length();
}
if (size == 1 || importTree != lastImport) {
while (endPosition + sep.length() <= contents.length()
&& contents.regionMatches(endPosition, sep, 0, sep.length())) {
endPosition += sep.length();
}
}
replacements.put(Range.closedOpen(importTree.getStartPosition(), endPosition), "");
}
return replacements;
Expand All @@ -306,10 +314,13 @@ private static boolean isUnused(
if (qualifier.equals("java.lang")) {
return true;
}
if(usedNames.contains(simpleName)){
return false;
}
if (unit.getPackageName() != null && unit.getPackageName().toString().equals(qualifier)) {
return true;
}
if (qualifiedIdentifier.getIdentifier().contentEquals("*")) {
if (qualifiedIdentifier.getIdentifier().contentEquals("*") && !((JCImport) importTree).isStatic()) {
return false;
}

Expand Down
Loading