Fixed bugs in Kotlin Android Lint CleanupDetector

#KT-14780 Fixed #KT-14677 Fixed (cherry picked from commit f591b4958e4a836d37d70c2ad8ff15e626c6342a)
2017-01-24 13:27:00 +03:00
parent 68b223211c
commit d0f1b81bfa
7 changed files with 307 additions and 126 deletions
@@ -0,0 +1,36 @@
+// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintRecycleInspection
+
+@file:Suppress("UNUSED_VARIABLE")
+
+import android.app.Activity
+import android.os.Bundle
+
+class MainActivity : Activity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val cursor = contentResolver.<warning descr="This `Cursor` should be freed up after use with `#close()`">query</warning>(null, null, null, null, null)
+
+        // WARNING
+        contentResolver.<warning descr="This `Cursor` should be freed up after use with `#close()`">query</warning>(null, null, null, null, null)
+
+        // OK, closed in chained call
+        contentResolver.query(null, null, null, null, null).close()
+
+        // KT-14677: Kotlin Lint: "Missing recycle() calls" report cursor with `use()` call
+        val cursorUsed = contentResolver.query(null, null, null, null, null)
+        cursorUsed.use {  }
+
+        // OK, used in chained call
+        contentResolver.query(null, null, null, null, null).use {
+
+        }
+
+        // KT-13372: Android Lint for Kotlin: false positive "Cursor should be freed" inside 'if' expression
+        if (true) {
+            val c = contentResolver.query(null, null, null, null, null)
+            c.close()
+        }
+    }
+}