Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed removing unused import statements. #667

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed removing unused import statements. #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 33 additions & 0 deletions core/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import java.io.IOError;
import java.io.IOException;
import java.net.URI;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -241,9 +242,11 @@ private static RangeMap<Integer, String> buildReplacements(
Set<String> usedNames,
Multimap<String, Range<Integer>> usedInJavadoc) {
RangeMap<Integer, String> replacements = TreeRangeMap.create();
boolean isAllUnused = true;
for (JCImport importTree : unit.getImports()) {
String simpleName = getSimpleName(importTree);
if (!isUnused(unit, usedNames, usedInJavadoc, importTree, simpleName)) {
isAllUnused = false;
continue;
}
// delete the import
Expand All @@ -256,6 +259,36 @@ private static RangeMap<Integer, String> buildReplacements(
}
replacements.put(Range.closedOpen(importTree.getStartPosition(), endPosition), "");
}

// If after deleting all import statements, there are blank lines before or after,
// delete one blank line.
if (isAllUnused && replacements.asMapOfRanges().size() > 0) {
Iterator<Range<Integer>> iterator = replacements.asMapOfRanges().keySet().iterator();
Range<Integer> range = iterator.next();
int startPosition = range.lowerEndpoint();
int endPosition;
boolean isDuplicateRange = true;
while (iterator.hasNext()) {
int endPositionOfPrevious = range.upperEndpoint();
range = iterator.next();
if (endPositionOfPrevious != range.lowerEndpoint()) {
isDuplicateRange = false;
break;
}
}
endPosition = range.upperEndpoint();
if (isDuplicateRange) {
String sep = Newlines.guessLineSeparator(contents);
if (startPosition - sep.length() * 2 >= 0
&& contents.subSequence(startPosition - sep.length(), startPosition).toString().equals(sep)
&& contents.subSequence(startPosition - sep.length() * 2, startPosition - sep.length()).toString().equals(sep)) {
replacements.put(Range.closedOpen(startPosition - sep.length(), startPosition), "");
} else if (endPosition + sep.length() < contents.length()
&& contents.subSequence(endPosition, endPosition + sep.length()).toString().equals(sep)) {
replacements.put(Range.closedOpen(endPosition, endPosition + sep.length()), "");
}
}
}
return replacements;
}

Expand Down
66 changes: 66 additions & 0 deletions core/src/test/java/com/google/googlejavaformat/java/RemoveUnusedImportsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,72 @@ public static Collection<Object[]> parameters() {
"interface Test { private static void foo() {} }",
},
},
{
{
"package com.foo;",
"",
"import com.bar.A;",
"",
"class Test {",
"}",
},
{
"package com.foo;",
"",
"class Test {",
"}",
},
},
{
{
"package com.sun.something;",
"",
"import com.x;",
"import com.y;",
"import com.z;",
"",
"class Test {",
"}",
},
{
"package com.sun.something;",
"",
"class Test {",
"}",
},
},
{
{
"package com.foo;",
"// hello",
"import com.bar.A;",
"",
"class Test {",
"}",
},
{
"package com.foo;",
"// hello",
"class Test {",
"}",
},
},
{
{
"package com.foo;",
"",
"import com.bar.A;",
"// hello",
"class Test {",
"}"
},
{
"package com.foo;",
"// hello",
"class Test {",
"}"
},
}
};
ImmutableList.Builder<Object[]> builder = ImmutableList.builder();
for (String[][] inputAndOutput : inputsOutputs) {
Expand Down