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

KT-13536 related: correct handling of objects

Browse Source 
(cherry picked from commit 7ae9b6b)
This commit is contained in:
Mikhail Glukhikh
2016-08-24 19:13:17 +03:00
committed by Mikhail Glukhikh
parent 6ac4bf3f17
commit 0ee1102e24
5 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt
+2 -2
View File
@@ -265,8 +265,8 @@ class UnusedSymbolInspection : AbstractKotlinInspection() {
if (import.importedFqName != declaration.fqName) {
val importedDeclaration =
import.importedReference?.getQualifiedElementSelector()?.mainReference?.resolve() as? KtNamedDeclaration
return importedDeclaration == null ||
(importedDeclaration != declaration && !hasNonTrivialUsages(importedDeclaration))
?: return true
return declaration !in importedDeclaration.parentsWithSelf && !hasNonTrivialUsages(importedDeclaration)
}
}
}
idea/testData/inspections/unusedSymbol/enum/inspectionData/expected.xml
Vendored
-9
View File
@@ -8,15 +8,6 @@
<description>Function 'f' is never used</description>
</problem>
<problem>
<file>usedViaMemberImport.kt</file>
<line>16</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="usedViaMemberImport.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused symbol</problem_class>
<description>Class 'E3' is never used</description>
</problem>
<problem>
<file>usedViaMemberImport.kt</file>
<line>20</line>
idea/testData/inspections/unusedSymbol/object/inspectionData/expected.xml
Vendored
-9
View File
@@ -44,15 +44,6 @@
<description>Function 'bar' is never used</description>
</problem>
<problem>
<file>usedViaMemberImport.kt</file>
<line>10</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="usedViaMemberImport.kt" />
<problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused symbol</problem_class>
<description>Object 'O2' is never used</description>
</problem>
<problem>
<file>usedViaMemberImport.kt</file>
<line>14</line>
idea/testData/quickfix/removeUnused/importObjectFun.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// "Safe delete 'MyObj'" "false"
// ACTION: Create test
import MyObj.foo
object <caret>MyObj {
fun foo() {}
}
idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+6
View File
@@ -6934,6 +6934,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
doTest(fileName);
}
@TestMetadata("importObjectFun.kt")
public void testImportObjectFun() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/importObjectFun.kt");
doTest(fileName);
}
@TestMetadata("notTriangle.kt")
public void testNotTriangle() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/notTriangle.kt");