Fixed #204 - Unused import false positive (x.y.zNNN import inside x.y…

….z package)
pinterest · May 2, 2018 · c9181df · c9181df
1 parent 4385ea5
commit c9181df
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/...standard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/NoUnusedImportsRule.kt b/...standard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/NoUnusedImportsRule.kt
@@ -68,7 +68,7 @@ class NoUnusedImportsRule : Rule("no-unused-imports") {
  val name = importDirective.importPath?.importedName?.asString()
  val importPath = importDirective.importPath?.pathStr!!
  if (importDirective.aliasName == null &&
- importPath.startsWith(packageName) &&
+ (packageName.isEmpty() || importPath.startsWith("$packageName.")) &&
  importPath.substring(packageName.length + 1).indexOf('.') == -1) {
  emit(importDirective.startOffset, "Unnecessary import", true)
  if (autoCorrect) {

diff --git a/...dard/src/test/kotlin/com/github/shyiko/ktlint/ruleset/standard/NoUnusedImportsRuleTest.kt b/...dard/src/test/kotlin/com/github/shyiko/ktlint/ruleset/standard/NoUnusedImportsRuleTest.kt
@@ -47,6 +47,21 @@ class NoUnusedImportsRuleTest {
  )).isEmpty()
  }
 
+ @Test
+ fun testLintIssue204() {
+ assertThat(NoUnusedImportsRule().lint(
+ """
+ package com.example.another
+
+ import com.example.anotherThing
+
+ class Foo {
+ val bar = anotherThing
+ }
+ """.trimIndent()
+ )).isEmpty()
+ }
+
  @Test
  fun testLintDestructuringAssignment() {
  assertThat(NoUnusedImportsRule().lint(