azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KotlinUnusedImportInspection: support unresolved references

Browse Source 
#KT-31331 Fixed
This commit is contained in:
Dmitry Gridin
2020-06-17 22:02:30 +07:00
parent 10c62b8d77
commit 2610dedcbd
12 changed files with 194 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt
+4 -2
View File
@@ -100,8 +100,11 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() {
val importPath = directive.importPath ?: continue
val isUsed = when {
importPath.importedName in optimizerData.unresolvedNames &&
directive.targetDescriptors(resolutionFacade).isEmpty() -> true
!importPaths.add(importPath) -> false
importPath.isAllUnder -> importPath.fqName in parentFqNames
importPath.isAllUnder -> optimizerData.unresolvedNames.isNotEmpty() || importPath.fqName in parentFqNames
importPath.fqName in fqNames -> importPath.importedName?.let { it in fqNames.getValue(importPath.fqName) } ?: false
importPath.fqName in invokeFunctionCallFqNames -> true
// case for type alias
@@ -109,7 +112,6 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() {
}
if (!isUsed) {
if (directive.targetDescriptors(resolutionFacade).isEmpty()) continue // do not highlight unresolved imports as unused
unusedImports += directive
}
}
idea/testData/inspections/unusedImport/file.kt
Vendored
+3 -3
View File
@@ -4,8 +4,8 @@ import java.sql.* // used
import java.util.HashMap // unused
import java.util.ArrayList // used
import java.unresolved.* // unused but unresolved
import java.net.Unresolved // unused but unresolved
import java.unresolved.* // unresolved and unused
import java.net.Unresolved // unresolved and unused
import java.net.ConnectException as CE // unused
import java.net.ConnectException as ConExc // used
@@ -14,7 +14,7 @@ import RootPackageClass // unused because it's in the current package
fun foo(list: ArrayList<String>, p: RootPackageClass, e: ConExc) {
list.add("")
Date()
Date(4)
}
class RootPackageClass
idea/testData/inspections/unusedImport/inspectionData/expected.xml
Vendored
+170 -105
View File
@@ -1,118 +1,183 @@
<problems>
<problem>
<file>file.kt</file>
<line>1</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="simple.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>file.kt</file>
<line>1</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="simple.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>file.kt</file>
<line>4</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="simple.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>file.kt</file>
<line>4</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="simple.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>file.kt</file>
<line>10</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="simple.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>file.kt</file>
<line>10</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="simple.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>fileInPack1.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="fileInPack1.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>fileInPack1.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="fileInPack1.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>fileInPack2.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="fileInPack2.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>unusedStarWhenExplicit.kt</file>
<line>2</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="unusedStarWhenExplicit.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>fileInPack2.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="fileInPack2.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>unusedStarWhenExplicit.kt</file>
<line>4</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="unusedStarWhenExplicit.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>unusedStarWhenExplicit.kt</file>
<line>2</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="unusedStarWhenExplicit.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>duplicatedImports.kt</file>
<line>2</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="duplicatedImports.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>unusedStarWhenExplicit.kt</file>
<line>4</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="unusedStarWhenExplicit.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>duplicatedImports.kt</file>
<line>5</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="duplicatedImports.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>duplicatedImports.kt</file>
<line>2</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="duplicatedImports.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>duplicatedImports.kt</file>
<line>7</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="duplicatedImports.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>duplicatedImports.kt</file>
<line>5</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="duplicatedImports.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>duplicatedImports.kt</file>
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="duplicatedImports.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>duplicatedImports.kt</file>
<line>7</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="duplicatedImports.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>kDocReferences.kt</file>
<line>2</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="kDocReferences.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>duplicatedImports.kt</file>
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="duplicatedImports.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>provideDelegate.kt</file>
<line>2</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="provideDelegate.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>kDocReferences.kt</file>
<line>2</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="kDocReferences.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>provideDelegate.kt</file>
<line>2</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="provideDelegate.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
</problem>
<problem>
<file>file.kt</file>
<line>7</line>
<module>light_idea_test_case</module>
<package>file</package>
<entry_point TYPE="file" FQNAME="file.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
<highlighted_element>import java.unresolved.* // unused but unresolved</highlighted_element>
<offset>0</offset>
<length>49</length>
</problem>
<problem>
<file>file.kt</file>
<line>8</line>
<module>light_idea_test_case</module>
<package>file</package>
<entry_point TYPE="file" FQNAME="file.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
<highlighted_element>import java.net.Unresolved // unused but unresolved</highlighted_element>
<offset>0</offset>
<length>51</length>
</problem>
<problem>
<file>file.kt</file>
<line>13</line>
<module>light_idea_test_case</module>
<package>file</package>
<entry_point TYPE="file" FQNAME="file.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
<highlighted_element>import RootPackageClass // unused because it's in the current package</highlighted_element>
<offset>0</offset>
<length>69</length>
</problem>
<problem>
<file>noUnusedImportForImportsWithSameName.kt</file>
<line>2</line>
<module>light_idea_test_case</module>
<package>noUnusedImportForImportsWithSameName</package>
<entry_point TYPE="file" FQNAME="noUnusedImportForImportsWithSameName.kt"/>
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
<highlighted_element>import name as names</highlighted_element>
<offset>0</offset>
<length>20</length>
</problem>
<problem>
<file>unresolvedAndUsed.kt</file>
<line>3</line>
<module>light_idea_test_case</module>
<package>unresolvedAndUsed</package>
<entry_point TYPE="file" FQNAME="unresolvedAndUsed.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused import directive</problem_class>
<description>Unused import directive</description>
<highlighted_element>import test.B // unresolved and unused</highlighted_element>
<offset>0</offset>
<length>38</length>
</problem>
</problems>
idea/testData/inspections/unusedImport/unresolvedAndUsed.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
import test.* // unresolved and used
import test.A // unresolved and used
import test.B // unresolved and unused
fun a(p: A) {
}
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/moveFileWithPackageRename.test
Vendored
+2 -1
View File
@@ -1,5 +1,6 @@
{
"mainFile": "a/main.kt",
"type": "MOVE_FILES",
"targetPackage": "b"
"targetPackage": "b",
"withRuntime": "true"
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/shortenCompanionObject2/after/b/foo.kt
Vendored
-2
View File
@@ -1,4 +1,2 @@
package b
import java.util.function.IntPredicate
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/main.kt
Vendored
+1 -1
View File
@@ -4,6 +4,6 @@ import b.test
class Test {
fun foo() {
test()
test
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/main.kt
Vendored
+1 -1
View File
@@ -25,6 +25,6 @@ var <caret>test: String
class Test {
fun foo() {
test()
test
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/movePropertyToFile.test
Vendored
+2 -1
View File
@@ -1,5 +1,6 @@
{
"mainFile": "a/main.kt",
"type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
"targetFile": "b/dependency.kt"
"targetFile": "b/dependency.kt",
"withRuntime": "true"
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/main.kt
Vendored
+1 -1
View File
@@ -4,6 +4,6 @@ import b.test
class Test {
fun foo() {
test()
test
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/before/a/main.kt
Vendored
+1 -1
View File
@@ -25,6 +25,6 @@ var <caret>test: String
class Test {
fun foo() {
test()
test
}
}
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/movePropertyToPackage.test
Vendored
+2 -1
View File
@@ -1,5 +1,6 @@
{
"mainFile": "a/main.kt",
"type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
"targetPackage": "b"
"targetPackage": "b",
"withRuntime": "true"
}