Do not add import statement for java.lang classes when replacing fqn with import (IDEA-134529)

This commit is contained in:
Yaroslav Lepenkin
2015-01-14 13:28:59 +02:00
parent 16d1c3709b
commit 8b15310d0f
2 changed files with 31 additions and 4 deletions
@@ -289,7 +289,33 @@ class Test {
assert !myFixture.filterAvailableIntentions("Import class")
}
public void "test allow to add import from javadoc"() {
public void "test allow to add import from javadoc"() {
myFixture.configureByText 'a.java', '''
class Test {
/**
* {@link java.util.Ma<caret>p}
*/
void run() {
}
}
'''
reimportClass()
myFixture.checkResult '''\
import java.util.Map;
class Test {
/**
* {@link Map}
*/
void run() {
}
}
'''
}
public void "test do not add import for default package"() {
myFixture.configureByText 'a.java', '''
class Test {
@@ -301,9 +327,7 @@ class Test {
}
'''
reimportClass()
myFixture.checkResult '''\
import java.lang.Math;
myFixture.checkResult '''
class Test {
/**
@@ -60,6 +60,9 @@ public final class ImportUtils {
}
final String containingPackageName = javaFile.getPackageName();
@NonNls final String packageName = ClassUtil.extractPackageName(qualifiedName);
if (CommonClassNames.DEFAULT_PACKAGE.equals(packageName)) {
return;
}
if (containingPackageName.equals(packageName) || importList.findSingleClassImportStatement(qualifiedName) != null) {
return;
}