diff --git a/ChangeLog.md b/ChangeLog.md index 2ab6a05bffb..c80116d3077 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -125,6 +125,12 @@ These artifacts include extensions for the types available in the latter JDKs, s - [`KT-13155`](https://youtrack.jetbrains.com/issue/KT-13155) Implement "Introduce Type Parameter" refactoring +#### Android Lint + +###### Issues fixed + +- [`KT-12022`](https://youtrack.jetbrains.com/issue/KT-12022) Report lint warnings even when file contains errors + ## 1.0.4 ### Compiler diff --git a/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidLintExternalAnnotator.java b/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidLintExternalAnnotator.java index fc4d8d698bd..be8c57a7110 100644 --- a/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidLintExternalAnnotator.java +++ b/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/AndroidLintExternalAnnotator.java @@ -62,6 +62,12 @@ import static com.android.tools.klint.detector.api.TextFormat.RAW; public class AndroidLintExternalAnnotator extends ExternalAnnotator { static final boolean INCLUDE_IDEA_SUPPRESS_ACTIONS = false; + @Nullable + @Override + public State collectInformation(@NotNull PsiFile file, @NotNull Editor editor, boolean hasErrors) { + return collectInformation(file); + } + @Override public State collectInformation(@NotNull PsiFile file) { final Module module = ModuleUtilCore.findModuleForPsiElement(file); diff --git a/plugins/uast-kotlin/test/org/jetbrains/kotlin/uast/KotlinLintTestGenerated.java b/plugins/uast-kotlin/test/org/jetbrains/kotlin/uast/KotlinLintTestGenerated.java index c31feeb24d2..6dad3a81cb2 100644 --- a/plugins/uast-kotlin/test/org/jetbrains/kotlin/uast/KotlinLintTestGenerated.java +++ b/plugins/uast-kotlin/test/org/jetbrains/kotlin/uast/KotlinLintTestGenerated.java @@ -119,6 +119,12 @@ public class KotlinLintTestGenerated extends AbstractKotlinLintTest { doTest(fileName); } + @TestMetadata("showDiagnosticsWhenFileIsRed.kt") + public void testShowDiagnosticsWhenFileIsRed() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("plugins/uast-kotlin/testData/lint/showDiagnosticsWhenFileIsRed.kt"); + doTest(fileName); + } + @TestMetadata("sqlite.kt") public void testSqlite() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("plugins/uast-kotlin/testData/lint/sqlite.kt"); diff --git a/plugins/uast-kotlin/testData/lint/showDiagnosticsWhenFileIsRed.kt b/plugins/uast-kotlin/testData/lint/showDiagnosticsWhenFileIsRed.kt new file mode 100644 index 00000000000..e750c6bd63a --- /dev/null +++ b/plugins/uast-kotlin/testData/lint/showDiagnosticsWhenFileIsRed.kt @@ -0,0 +1,9 @@ +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintSQLiteStringInspection + +import android.database.sqlite.SQLiteDatabase + +fun test(db: SQLiteDatabase) { + val a: String = 1 + + db.execSQL("CREATE TABLE COMPANY(NAME STRING)") +} \ No newline at end of file