From 9813b748eb3c8974a20ada5dd8811913fb2468d7 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 11 Mar 2019 22:33:29 +0300 Subject: [PATCH] Fix android linting tests due to added external annotations support --- idea/testData/android/lint/closeCursor.kt | 2 +- idea/testData/android/lint/javaPerformance.kt | 2 +- idea/testData/android/lint/javaPerformance.kt.181 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/testData/android/lint/closeCursor.kt b/idea/testData/android/lint/closeCursor.kt index a9046c86ed4..8b0dddbfc24 100644 --- a/idea/testData/android/lint/closeCursor.kt +++ b/idea/testData/android/lint/closeCursor.kt @@ -1,6 +1,6 @@ // INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintRecycleInspection -@file:Suppress("UNUSED_VARIABLE") +@file:Suppress("UNUSED_VARIABLE", "NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS", "RECEIVER_NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS") import android.app.Activity import android.os.Bundle diff --git a/idea/testData/android/lint/javaPerformance.kt b/idea/testData/android/lint/javaPerformance.kt index cd2f66d551f..f2629ea0847 100644 --- a/idea/testData/android/lint/javaPerformance.kt +++ b/idea/testData/android/lint/javaPerformance.kt @@ -11,7 +11,7 @@ import android.util.SparseArray import android.widget.Button @SuppressWarnings("unused") -@Suppress("UsePropertyAccessSyntax", "UNUSED_VARIABLE", "unused", "UNUSED_PARAMETER", "DEPRECATION") +@Suppress("UsePropertyAccessSyntax", "UNUSED_VARIABLE", "unused", "UNUSED_PARAMETER", "DEPRECATION", "UNNECESSARY_NOT_NULL_ASSERTION", "NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS") class JavaPerformanceTest(context: Context, attrs: AttributeSet, defStyle: Int) : Button(context, attrs, defStyle) { private var cachedRect: Rect? = null diff --git a/idea/testData/android/lint/javaPerformance.kt.181 b/idea/testData/android/lint/javaPerformance.kt.181 index 0bf3b5f0957..454ea4ac4e8 100644 --- a/idea/testData/android/lint/javaPerformance.kt.181 +++ b/idea/testData/android/lint/javaPerformance.kt.181 @@ -11,7 +11,7 @@ import android.util.SparseArray import android.widget.Button @SuppressWarnings("unused") -@Suppress("UsePropertyAccessSyntax", "UNUSED_VARIABLE", "unused", "UNUSED_PARAMETER", "DEPRECATION") +@Suppress("UsePropertyAccessSyntax", "UNUSED_VARIABLE", "unused", "UNUSED_PARAMETER", "DEPRECATION", "UNNECESSARY_NOT_NULL_ASSERTION", "NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS") class JavaPerformanceTest(context: Context, attrs: AttributeSet, defStyle: Int) : Button(context, attrs, defStyle) { private var cachedRect: Rect? = null